mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge branch 'master' into Version-v10.23.0
This commit is contained in:
seaona
commit
dbf49b1fe2
16
CHANGELOG.md
16
CHANGELOG.md
@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [10.22.2]
|
||||
### Changed
|
||||
- Restore changes from v10.22.0
|
||||
- Fix deadlock encountered while performing Swaps on unsupported testnets ([#16511](https://github.com/MetaMask/metamask-extension/pull/16511))
|
||||
|
||||
## [10.22.1]
|
||||
### Changed
|
||||
- Temporarily revert v10.22.0
|
||||
|
||||
### Fixed
|
||||
- Prevent user from editing a contract interaction initiated by a dapp ([#16498](https://github.com/MetaMask/metamask-extension/pull/16498))
|
||||
|
||||
## [10.22.0]
|
||||
### Added
|
||||
- Add Aurora network to the Popular Custom Network list ([#16039](https://github.com/MetaMask/metamask-extension/pull/16039))
|
||||
@ -3289,7 +3301,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
### Uncategorized
|
||||
- Added the ability to restore accounts from seed words.
|
||||
|
||||
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.22.0...HEAD
|
||||
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.22.2...HEAD
|
||||
[10.22.2]: https://github.com/MetaMask/metamask-extension/compare/v10.22.1...v10.22.2
|
||||
[10.22.1]: https://github.com/MetaMask/metamask-extension/compare/v10.22.0...v10.22.1
|
||||
[10.22.0]: https://github.com/MetaMask/metamask-extension/compare/v10.21.2...v10.22.0
|
||||
[10.21.2]: https://github.com/MetaMask/metamask-extension/compare/v10.21.1...v10.21.2
|
||||
[10.21.1]: https://github.com/MetaMask/metamask-extension/compare/v10.21.0...v10.21.1
|
||||
|
||||
@ -1014,7 +1014,9 @@ export default class MetamaskController extends EventEmitter {
|
||||
this.metaMetricsController,
|
||||
),
|
||||
},
|
||||
undefined,
|
||||
{
|
||||
supportedChainIds: [CHAIN_IDS.MAINNET, CHAIN_IDS.GOERLI],
|
||||
},
|
||||
initState.SmartTransactionsController,
|
||||
);
|
||||
|
||||
|
||||
@ -250,13 +250,27 @@
|
||||
"packages": {
|
||||
"@ethereumjs/tx": true,
|
||||
"@keystonehq/bc-ur-registry-eth": true,
|
||||
"@keystonehq/bc-ur-registry-eth>hdkey": true,
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": true,
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
|
||||
"browserify>buffer": true,
|
||||
"eth-lattice-keyring>@ethereumjs/util": true,
|
||||
"uuid": true
|
||||
}
|
||||
},
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": {
|
||||
"packages": {
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": true,
|
||||
"browserify>assert": true,
|
||||
"browserify>crypto-browserify": true,
|
||||
"ethereumjs-wallet>bs58check": true,
|
||||
"ethereumjs-wallet>safe-buffer": true
|
||||
}
|
||||
},
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": {
|
||||
"packages": {
|
||||
"ethers>@ethersproject/signing-key>elliptic": true
|
||||
}
|
||||
},
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
|
||||
"globals": {
|
||||
"TextEncoder": true
|
||||
@ -999,9 +1013,9 @@
|
||||
"packages": {
|
||||
"@ethereumjs/tx": true,
|
||||
"@metamask/eth-ledger-bridge-keyring>eth-sig-util": true,
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey": true,
|
||||
"browserify>buffer": true,
|
||||
"browserify>events": true,
|
||||
"eth-trezor-keyring>hdkey": true,
|
||||
"ethereumjs-util": true
|
||||
}
|
||||
},
|
||||
@ -1034,25 +1048,6 @@
|
||||
"ethjs>ethjs-util>strip-hex-prefix": true
|
||||
}
|
||||
},
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey": {
|
||||
"packages": {
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true,
|
||||
"browserify>assert": true,
|
||||
"browserify>crypto-browserify": true,
|
||||
"eth-trezor-keyring>hdkey>coinstring": true,
|
||||
"ethereumjs-wallet>safe-buffer": true
|
||||
}
|
||||
},
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": {
|
||||
"packages": {
|
||||
"bn.js": true,
|
||||
"browserify>insert-module-globals>is-buffer": true,
|
||||
"eth-trezor-keyring>hdkey>secp256k1>bip66": true,
|
||||
"ethereumjs-util>create-hash": true,
|
||||
"ethereumjs-wallet>safe-buffer": true,
|
||||
"ethers>@ethersproject/signing-key>elliptic": true
|
||||
}
|
||||
},
|
||||
"@metamask/eth-token-tracker": {
|
||||
"globals": {
|
||||
"console.warn": true
|
||||
@ -1243,143 +1238,14 @@
|
||||
"packages": {
|
||||
"@ethersproject/bignumber": true,
|
||||
"@ethersproject/bignumber>@ethersproject/bytes": true,
|
||||
"@metamask/controllers": true,
|
||||
"@metamask/controllers>@ethersproject/providers": true,
|
||||
"@metamask/controllers>isomorphic-fetch": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers": true,
|
||||
"@metamask/smart-transactions-controller>bignumber.js": true,
|
||||
"@metamask/smart-transactions-controller>fast-json-patch": true,
|
||||
"lodash": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers": {
|
||||
"globals": {
|
||||
"Headers": true,
|
||||
"URL": true,
|
||||
"clearInterval": true,
|
||||
"clearTimeout": true,
|
||||
"console.error": true,
|
||||
"console.log": true,
|
||||
"fetch": true,
|
||||
"setInterval": true,
|
||||
"setTimeout": true
|
||||
},
|
||||
"packages": {
|
||||
"@ethereumjs/common": true,
|
||||
"@ethereumjs/tx": true,
|
||||
"@metamask/contract-metadata": true,
|
||||
"@metamask/controllers>abort-controller": true,
|
||||
"@metamask/controllers>async-mutex": true,
|
||||
"@metamask/controllers>eth-json-rpc-infura": true,
|
||||
"@metamask/controllers>eth-phishing-detect": true,
|
||||
"@metamask/controllers>isomorphic-fetch": true,
|
||||
"@metamask/controllers>multiformats": true,
|
||||
"@metamask/controllers>web3": true,
|
||||
"@metamask/controllers>web3-provider-engine": true,
|
||||
"@metamask/metamask-eth-abis": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
|
||||
"browserify>buffer": true,
|
||||
"browserify>events": true,
|
||||
"deep-freeze-strict": true,
|
||||
"eslint>fast-deep-equal": true,
|
||||
"eth-ens-namehash": true,
|
||||
"eth-keyring-controller": true,
|
||||
"eth-query": true,
|
||||
"eth-rpc-errors": true,
|
||||
"eth-sig-util": true,
|
||||
"ethereumjs-util": true,
|
||||
"ethers": true,
|
||||
"ethjs>ethjs-unit": true,
|
||||
"immer": true,
|
||||
"json-rpc-engine": true,
|
||||
"jsonschema": true,
|
||||
"punycode": true,
|
||||
"single-call-balance-checker-abi": true,
|
||||
"uuid": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": {
|
||||
"globals": {
|
||||
"clearInterval": true,
|
||||
"setInterval": true
|
||||
},
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
|
||||
"browserify>buffer": true,
|
||||
"ethjs>ethjs-filter": true,
|
||||
"ethjs>ethjs-provider-http": true,
|
||||
"ethjs>ethjs-unit": true,
|
||||
"ethjs>ethjs-util": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"ethjs>number-to-bn": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
|
||||
"browserify>buffer": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"ethjs>number-to-bn": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
|
||||
"ethjs-query>babel-runtime": true,
|
||||
"ethjs>ethjs-filter": true,
|
||||
"ethjs>ethjs-util": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"promise-to-callback": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
|
||||
"browserify>buffer": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"ethjs>number-to-bn": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
|
||||
"globals": {
|
||||
"console": true
|
||||
},
|
||||
"packages": {
|
||||
"ethjs-query>babel-runtime": true,
|
||||
"ethjs-query>ethjs-format": true,
|
||||
"ethjs-query>ethjs-rpc": true,
|
||||
"promise-to-callback": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": true,
|
||||
"@truffle/codec>utf8": true,
|
||||
"browserify>buffer": true,
|
||||
"browserify>crypto-browserify": true,
|
||||
"ethereumjs-util": true,
|
||||
"ethereumjs-util>ethereum-cryptography": true,
|
||||
"ethereumjs-wallet>aes-js": true,
|
||||
"ethereumjs-wallet>bs58check": true,
|
||||
"ethereumjs-wallet>randombytes": true,
|
||||
"ethers>@ethersproject/json-wallets>scrypt-js": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": {
|
||||
"globals": {
|
||||
"crypto": true,
|
||||
"msCrypto": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
|
||||
"globals": {
|
||||
"crypto.getRandomValues": true
|
||||
|
||||
@ -395,13 +395,27 @@
|
||||
"packages": {
|
||||
"@ethereumjs/tx": true,
|
||||
"@keystonehq/bc-ur-registry-eth": true,
|
||||
"@keystonehq/bc-ur-registry-eth>hdkey": true,
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": true,
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
|
||||
"browserify>buffer": true,
|
||||
"eth-lattice-keyring>@ethereumjs/util": true,
|
||||
"uuid": true
|
||||
}
|
||||
},
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": {
|
||||
"packages": {
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": true,
|
||||
"browserify>assert": true,
|
||||
"browserify>crypto-browserify": true,
|
||||
"ethereumjs-wallet>bs58check": true,
|
||||
"ethereumjs-wallet>safe-buffer": true
|
||||
}
|
||||
},
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": {
|
||||
"packages": {
|
||||
"ethers>@ethersproject/signing-key>elliptic": true
|
||||
}
|
||||
},
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
|
||||
"globals": {
|
||||
"TextEncoder": true
|
||||
@ -1144,9 +1158,9 @@
|
||||
"packages": {
|
||||
"@ethereumjs/tx": true,
|
||||
"@metamask/eth-ledger-bridge-keyring>eth-sig-util": true,
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey": true,
|
||||
"browserify>buffer": true,
|
||||
"browserify>events": true,
|
||||
"eth-trezor-keyring>hdkey": true,
|
||||
"ethereumjs-util": true
|
||||
}
|
||||
},
|
||||
@ -1179,25 +1193,6 @@
|
||||
"ethjs>ethjs-util>strip-hex-prefix": true
|
||||
}
|
||||
},
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey": {
|
||||
"packages": {
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true,
|
||||
"browserify>assert": true,
|
||||
"browserify>crypto-browserify": true,
|
||||
"eth-trezor-keyring>hdkey>coinstring": true,
|
||||
"ethereumjs-wallet>safe-buffer": true
|
||||
}
|
||||
},
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": {
|
||||
"packages": {
|
||||
"bn.js": true,
|
||||
"browserify>insert-module-globals>is-buffer": true,
|
||||
"eth-trezor-keyring>hdkey>secp256k1>bip66": true,
|
||||
"ethereumjs-util>create-hash": true,
|
||||
"ethereumjs-wallet>safe-buffer": true,
|
||||
"ethers>@ethersproject/signing-key>elliptic": true
|
||||
}
|
||||
},
|
||||
"@metamask/eth-token-tracker": {
|
||||
"globals": {
|
||||
"console.warn": true
|
||||
@ -1488,143 +1483,14 @@
|
||||
"packages": {
|
||||
"@ethersproject/bignumber": true,
|
||||
"@ethersproject/bignumber>@ethersproject/bytes": true,
|
||||
"@metamask/controllers": true,
|
||||
"@metamask/controllers>@ethersproject/providers": true,
|
||||
"@metamask/controllers>isomorphic-fetch": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers": true,
|
||||
"@metamask/smart-transactions-controller>bignumber.js": true,
|
||||
"@metamask/smart-transactions-controller>fast-json-patch": true,
|
||||
"lodash": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers": {
|
||||
"globals": {
|
||||
"Headers": true,
|
||||
"URL": true,
|
||||
"clearInterval": true,
|
||||
"clearTimeout": true,
|
||||
"console.error": true,
|
||||
"console.log": true,
|
||||
"fetch": true,
|
||||
"setInterval": true,
|
||||
"setTimeout": true
|
||||
},
|
||||
"packages": {
|
||||
"@ethereumjs/common": true,
|
||||
"@ethereumjs/tx": true,
|
||||
"@metamask/contract-metadata": true,
|
||||
"@metamask/controllers>abort-controller": true,
|
||||
"@metamask/controllers>async-mutex": true,
|
||||
"@metamask/controllers>eth-json-rpc-infura": true,
|
||||
"@metamask/controllers>eth-phishing-detect": true,
|
||||
"@metamask/controllers>isomorphic-fetch": true,
|
||||
"@metamask/controllers>multiformats": true,
|
||||
"@metamask/controllers>web3": true,
|
||||
"@metamask/controllers>web3-provider-engine": true,
|
||||
"@metamask/metamask-eth-abis": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
|
||||
"browserify>buffer": true,
|
||||
"browserify>events": true,
|
||||
"deep-freeze-strict": true,
|
||||
"eslint>fast-deep-equal": true,
|
||||
"eth-ens-namehash": true,
|
||||
"eth-keyring-controller": true,
|
||||
"eth-query": true,
|
||||
"eth-rpc-errors": true,
|
||||
"eth-sig-util": true,
|
||||
"ethereumjs-util": true,
|
||||
"ethers": true,
|
||||
"ethjs>ethjs-unit": true,
|
||||
"immer": true,
|
||||
"json-rpc-engine": true,
|
||||
"jsonschema": true,
|
||||
"punycode": true,
|
||||
"single-call-balance-checker-abi": true,
|
||||
"uuid": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": {
|
||||
"globals": {
|
||||
"clearInterval": true,
|
||||
"setInterval": true
|
||||
},
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
|
||||
"browserify>buffer": true,
|
||||
"ethjs>ethjs-filter": true,
|
||||
"ethjs>ethjs-provider-http": true,
|
||||
"ethjs>ethjs-unit": true,
|
||||
"ethjs>ethjs-util": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"ethjs>number-to-bn": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
|
||||
"browserify>buffer": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"ethjs>number-to-bn": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
|
||||
"ethjs-query>babel-runtime": true,
|
||||
"ethjs>ethjs-filter": true,
|
||||
"ethjs>ethjs-util": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"promise-to-callback": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
|
||||
"browserify>buffer": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"ethjs>number-to-bn": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
|
||||
"globals": {
|
||||
"console": true
|
||||
},
|
||||
"packages": {
|
||||
"ethjs-query>babel-runtime": true,
|
||||
"ethjs-query>ethjs-format": true,
|
||||
"ethjs-query>ethjs-rpc": true,
|
||||
"promise-to-callback": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": true,
|
||||
"@truffle/codec>utf8": true,
|
||||
"browserify>buffer": true,
|
||||
"browserify>crypto-browserify": true,
|
||||
"ethereumjs-util": true,
|
||||
"ethereumjs-util>ethereum-cryptography": true,
|
||||
"ethereumjs-wallet>aes-js": true,
|
||||
"ethereumjs-wallet>bs58check": true,
|
||||
"ethereumjs-wallet>randombytes": true,
|
||||
"ethers>@ethersproject/json-wallets>scrypt-js": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": {
|
||||
"globals": {
|
||||
"crypto": true,
|
||||
"msCrypto": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
|
||||
"globals": {
|
||||
"crypto.getRandomValues": true
|
||||
|
||||
@ -250,13 +250,27 @@
|
||||
"packages": {
|
||||
"@ethereumjs/tx": true,
|
||||
"@keystonehq/bc-ur-registry-eth": true,
|
||||
"@keystonehq/bc-ur-registry-eth>hdkey": true,
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": true,
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
|
||||
"browserify>buffer": true,
|
||||
"eth-lattice-keyring>@ethereumjs/util": true,
|
||||
"uuid": true
|
||||
}
|
||||
},
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": {
|
||||
"packages": {
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": true,
|
||||
"browserify>assert": true,
|
||||
"browserify>crypto-browserify": true,
|
||||
"ethereumjs-wallet>bs58check": true,
|
||||
"ethereumjs-wallet>safe-buffer": true
|
||||
}
|
||||
},
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": {
|
||||
"packages": {
|
||||
"ethers>@ethersproject/signing-key>elliptic": true
|
||||
}
|
||||
},
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
|
||||
"globals": {
|
||||
"TextEncoder": true
|
||||
@ -999,9 +1013,9 @@
|
||||
"packages": {
|
||||
"@ethereumjs/tx": true,
|
||||
"@metamask/eth-ledger-bridge-keyring>eth-sig-util": true,
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey": true,
|
||||
"browserify>buffer": true,
|
||||
"browserify>events": true,
|
||||
"eth-trezor-keyring>hdkey": true,
|
||||
"ethereumjs-util": true
|
||||
}
|
||||
},
|
||||
@ -1034,25 +1048,6 @@
|
||||
"ethjs>ethjs-util>strip-hex-prefix": true
|
||||
}
|
||||
},
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey": {
|
||||
"packages": {
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true,
|
||||
"browserify>assert": true,
|
||||
"browserify>crypto-browserify": true,
|
||||
"eth-trezor-keyring>hdkey>coinstring": true,
|
||||
"ethereumjs-wallet>safe-buffer": true
|
||||
}
|
||||
},
|
||||
"@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": {
|
||||
"packages": {
|
||||
"bn.js": true,
|
||||
"browserify>insert-module-globals>is-buffer": true,
|
||||
"eth-trezor-keyring>hdkey>secp256k1>bip66": true,
|
||||
"ethereumjs-util>create-hash": true,
|
||||
"ethereumjs-wallet>safe-buffer": true,
|
||||
"ethers>@ethersproject/signing-key>elliptic": true
|
||||
}
|
||||
},
|
||||
"@metamask/eth-token-tracker": {
|
||||
"globals": {
|
||||
"console.warn": true
|
||||
@ -1243,143 +1238,14 @@
|
||||
"packages": {
|
||||
"@ethersproject/bignumber": true,
|
||||
"@ethersproject/bignumber>@ethersproject/bytes": true,
|
||||
"@metamask/controllers": true,
|
||||
"@metamask/controllers>@ethersproject/providers": true,
|
||||
"@metamask/controllers>isomorphic-fetch": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers": true,
|
||||
"@metamask/smart-transactions-controller>bignumber.js": true,
|
||||
"@metamask/smart-transactions-controller>fast-json-patch": true,
|
||||
"lodash": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers": {
|
||||
"globals": {
|
||||
"Headers": true,
|
||||
"URL": true,
|
||||
"clearInterval": true,
|
||||
"clearTimeout": true,
|
||||
"console.error": true,
|
||||
"console.log": true,
|
||||
"fetch": true,
|
||||
"setInterval": true,
|
||||
"setTimeout": true
|
||||
},
|
||||
"packages": {
|
||||
"@ethereumjs/common": true,
|
||||
"@ethereumjs/tx": true,
|
||||
"@metamask/contract-metadata": true,
|
||||
"@metamask/controllers>abort-controller": true,
|
||||
"@metamask/controllers>async-mutex": true,
|
||||
"@metamask/controllers>eth-json-rpc-infura": true,
|
||||
"@metamask/controllers>eth-phishing-detect": true,
|
||||
"@metamask/controllers>isomorphic-fetch": true,
|
||||
"@metamask/controllers>multiformats": true,
|
||||
"@metamask/controllers>web3": true,
|
||||
"@metamask/controllers>web3-provider-engine": true,
|
||||
"@metamask/metamask-eth-abis": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
|
||||
"browserify>buffer": true,
|
||||
"browserify>events": true,
|
||||
"deep-freeze-strict": true,
|
||||
"eslint>fast-deep-equal": true,
|
||||
"eth-ens-namehash": true,
|
||||
"eth-keyring-controller": true,
|
||||
"eth-query": true,
|
||||
"eth-rpc-errors": true,
|
||||
"eth-sig-util": true,
|
||||
"ethereumjs-util": true,
|
||||
"ethers": true,
|
||||
"ethjs>ethjs-unit": true,
|
||||
"immer": true,
|
||||
"json-rpc-engine": true,
|
||||
"jsonschema": true,
|
||||
"punycode": true,
|
||||
"single-call-balance-checker-abi": true,
|
||||
"uuid": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": {
|
||||
"globals": {
|
||||
"clearInterval": true,
|
||||
"setInterval": true
|
||||
},
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
|
||||
"browserify>buffer": true,
|
||||
"ethjs>ethjs-filter": true,
|
||||
"ethjs>ethjs-provider-http": true,
|
||||
"ethjs>ethjs-unit": true,
|
||||
"ethjs>ethjs-util": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"ethjs>number-to-bn": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
|
||||
"browserify>buffer": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"ethjs>number-to-bn": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
|
||||
"ethjs-query>babel-runtime": true,
|
||||
"ethjs>ethjs-filter": true,
|
||||
"ethjs>ethjs-util": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"promise-to-callback": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
|
||||
"browserify>buffer": true,
|
||||
"ethjs>js-sha3": true,
|
||||
"ethjs>number-to-bn": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
|
||||
"globals": {
|
||||
"console": true
|
||||
},
|
||||
"packages": {
|
||||
"ethjs-query>babel-runtime": true,
|
||||
"ethjs-query>ethjs-format": true,
|
||||
"ethjs-query>ethjs-rpc": true,
|
||||
"promise-to-callback": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": {
|
||||
"packages": {
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": true,
|
||||
"@truffle/codec>utf8": true,
|
||||
"browserify>buffer": true,
|
||||
"browserify>crypto-browserify": true,
|
||||
"ethereumjs-util": true,
|
||||
"ethereumjs-util>ethereum-cryptography": true,
|
||||
"ethereumjs-wallet>aes-js": true,
|
||||
"ethereumjs-wallet>bs58check": true,
|
||||
"ethereumjs-wallet>randombytes": true,
|
||||
"ethers>@ethersproject/json-wallets>scrypt-js": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": {
|
||||
"globals": {
|
||||
"crypto": true,
|
||||
"msCrypto": true
|
||||
}
|
||||
},
|
||||
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
|
||||
"globals": {
|
||||
"crypto.getRandomValues": true
|
||||
|
||||
@ -126,7 +126,7 @@
|
||||
"@metamask/providers": "^10.0.0",
|
||||
"@metamask/rpc-methods": "^0.23.0",
|
||||
"@metamask/slip44": "^2.1.0",
|
||||
"@metamask/smart-transactions-controller": "^2.3.2",
|
||||
"@metamask/smart-transactions-controller": "^3.0.0",
|
||||
"@metamask/snap-controllers": "^0.23.0",
|
||||
"@metamask/snap-utils": "^0.23.0",
|
||||
"@ngraveio/bc-ur": "^1.1.6",
|
||||
@ -454,7 +454,8 @@
|
||||
"web3>web3-core>web3-core-requestmanager>web3-providers-ws>websocket>bufferutil": false,
|
||||
"web3>web3-core>web3-core-requestmanager>web3-providers-ws>websocket>es5-ext": false,
|
||||
"web3>web3-core>web3-core-requestmanager>web3-providers-ws>websocket>utf-8-validate": false,
|
||||
"web3>web3-shh": false
|
||||
"web3>web3-shh": false,
|
||||
"@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -76,6 +76,23 @@ async function setupMocking(server, testSpecificMock) {
|
||||
};
|
||||
});
|
||||
|
||||
await server
|
||||
.forGet('https://swap.metaswap.codefi.network/networks/1/token')
|
||||
.withQuery({ address: '0x72c9Fb7ED19D3ce51cea5C56B3e023cd918baaDf' })
|
||||
.thenCallback(() => {
|
||||
return {
|
||||
statusCode: 200,
|
||||
json: {
|
||||
symbol: 'AGLT',
|
||||
type: 'erc20',
|
||||
decimals: '18',
|
||||
address: '0x72c9fb7ed19d3ce51cea5c56b3e023cd918baadf',
|
||||
occurences: 1,
|
||||
aggregators: ['dynamic'],
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
await server
|
||||
.forGet(
|
||||
'https://gas-api.metaswap.codefi.network/networks/1/suggestedGasFees',
|
||||
@ -180,6 +197,116 @@ async function setupMocking(server, testSpecificMock) {
|
||||
};
|
||||
});
|
||||
|
||||
await server
|
||||
.forGet('https://swap.metaswap.codefi.network/networks/1/tokens')
|
||||
.thenCallback(() => {
|
||||
return {
|
||||
statusCode: 200,
|
||||
json: [
|
||||
{
|
||||
name: 'Ethereum',
|
||||
symbol: 'ETH',
|
||||
decimals: 18,
|
||||
type: 'native',
|
||||
iconUrl:
|
||||
'https://token.metaswap.codefi.network/assets/nativeCurrencyLogos/ethereum.svg',
|
||||
coingeckoId: 'ethereum',
|
||||
address: '0x0000000000000000000000000000000000000000',
|
||||
occurrences: 100,
|
||||
aggregators: [],
|
||||
},
|
||||
{
|
||||
address: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
||||
symbol: 'DAI',
|
||||
decimals: 18,
|
||||
name: 'Dai Stablecoin',
|
||||
iconUrl:
|
||||
'https://crypto.com/price/coin-data/icon/DAI/color_icon.png',
|
||||
type: 'erc20',
|
||||
aggregators: [
|
||||
'aave',
|
||||
'bancor',
|
||||
'cmc',
|
||||
'cryptocom',
|
||||
'coinGecko',
|
||||
'oneInch',
|
||||
'pmm',
|
||||
'zerion',
|
||||
'lifi',
|
||||
],
|
||||
occurrences: 9,
|
||||
fees: {
|
||||
'0xb0da5965d43369968574d399dbe6374683773a65': 0,
|
||||
},
|
||||
storage: {
|
||||
balance: 2,
|
||||
},
|
||||
},
|
||||
{
|
||||
address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
|
||||
symbol: 'USDC',
|
||||
decimals: 6,
|
||||
name: 'USD Coin',
|
||||
iconUrl:
|
||||
'https://crypto.com/price/coin-data/icon/USDC/color_icon.png',
|
||||
type: 'erc20',
|
||||
aggregators: [
|
||||
'aave',
|
||||
'bancor',
|
||||
'cryptocom',
|
||||
'coinGecko',
|
||||
'oneInch',
|
||||
'pmm',
|
||||
'zerion',
|
||||
'lifi',
|
||||
],
|
||||
occurrences: 8,
|
||||
fees: {},
|
||||
storage: {
|
||||
balance: 9,
|
||||
},
|
||||
},
|
||||
{
|
||||
address: '0xc6bdb96e29c38dc43f014eed44de4106a6a8eb5f',
|
||||
symbol: 'INUINU',
|
||||
decimals: 18,
|
||||
name: 'Inu Inu',
|
||||
iconUrl:
|
||||
'https://assets.coingecko.com/coins/images/26391/thumb/logo_square_200.png?1657752596',
|
||||
type: 'erc20',
|
||||
aggregators: ['coinGecko'],
|
||||
occurrences: 1,
|
||||
},
|
||||
],
|
||||
};
|
||||
});
|
||||
|
||||
await server
|
||||
.forGet('https://swap.metaswap.codefi.network/networks/1/topAssets')
|
||||
.thenCallback(() => {
|
||||
return {
|
||||
statusCode: 200,
|
||||
json: [
|
||||
{
|
||||
address: '0x0000000000000000000000000000000000000000',
|
||||
symbol: 'ETH',
|
||||
},
|
||||
{
|
||||
address: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
||||
symbol: 'DAI',
|
||||
},
|
||||
{
|
||||
address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
|
||||
symbol: 'USDC',
|
||||
},
|
||||
{
|
||||
address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
|
||||
symbol: 'USDT',
|
||||
},
|
||||
],
|
||||
};
|
||||
});
|
||||
|
||||
await server
|
||||
.forGet('https://token-api.metaswap.codefi.network/token/0x539')
|
||||
.thenCallback(() => {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
const FixtureBuilder = require('../fixture-builder');
|
||||
const { veryLargeDelayMs } = require('../helpers');
|
||||
|
||||
const ganacheOptions = {
|
||||
accounts: [
|
||||
@ -25,10 +26,8 @@ const loadSwaps = async (driver) => {
|
||||
};
|
||||
|
||||
const buildQuote = async (driver, options) => {
|
||||
await driver.clickElement(
|
||||
'[class*="dropdown-search-list"] + div[class*="MuiFormControl-root MuiTextField-root"]',
|
||||
);
|
||||
await driver.fill('input[placeholder*="0"]', options.amount);
|
||||
await driver.delay(veryLargeDelayMs); // Need an extra delay after typing an amount.
|
||||
await driver.clickElement(
|
||||
'[class="dropdown-search-list__closed-primary-label dropdown-search-list__select-default"]',
|
||||
);
|
||||
|
||||
@ -305,8 +305,10 @@ describe('Stores custom RPC history', function () {
|
||||
'.button.btn-danger-primary.modal-container__footer-button',
|
||||
);
|
||||
|
||||
// wait for confirm delete modal to be removed from DOM.
|
||||
await confirmDeleteModal.waitForElementState('hidden');
|
||||
if (await driver.isElementPresent('span .modal')) {
|
||||
// wait for confirm delete modal to be removed from DOM.
|
||||
await confirmDeleteModal.waitForElementState('hidden');
|
||||
}
|
||||
|
||||
const newNetworkListItems = await driver.findElements(
|
||||
'.networks-tab__networks-list-name',
|
||||
|
||||
107
test/e2e/tests/dapp-tx-edit.spec.js
Normal file
107
test/e2e/tests/dapp-tx-edit.spec.js
Normal file
@ -0,0 +1,107 @@
|
||||
const { strict: assert } = require('assert');
|
||||
const { convertToHexValue, withFixtures } = require('../helpers');
|
||||
const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
|
||||
const FixtureBuilder = require('../fixture-builder');
|
||||
|
||||
describe('Editing confirmations of dapp initiated contract interactions', function () {
|
||||
const ganacheOptions = {
|
||||
accounts: [
|
||||
{
|
||||
secretKey:
|
||||
'0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
|
||||
balance: convertToHexValue(25000000000000000000),
|
||||
},
|
||||
],
|
||||
};
|
||||
const smartContract = SMART_CONTRACTS.PIGGYBANK;
|
||||
it('should NOT show an edit button on a contract interaction confirmation iniated by a dapp', async function () {
|
||||
await withFixtures(
|
||||
{
|
||||
dapp: true,
|
||||
fixtures: new FixtureBuilder()
|
||||
.withPermissionControllerConnectedToTestDapp()
|
||||
.build(),
|
||||
ganacheOptions,
|
||||
smartContract,
|
||||
title: this.test.title,
|
||||
},
|
||||
async ({ driver, contractRegistry }) => {
|
||||
const contractAddress = await contractRegistry.getContractAddress(
|
||||
smartContract,
|
||||
);
|
||||
await driver.navigate();
|
||||
await driver.fill('#password', 'correct horse battery staple');
|
||||
await driver.press('#password', driver.Key.ENTER);
|
||||
|
||||
// deploy contract
|
||||
await driver.openNewPage(
|
||||
`http://127.0.0.1:8080/?contract=${contractAddress}`,
|
||||
);
|
||||
|
||||
// wait for deployed contract, calls and confirms a contract method where ETH is sent
|
||||
await driver.findClickableElement('#deployButton');
|
||||
await driver.clickElement('#depositButton');
|
||||
await driver.waitUntilXWindowHandles(3);
|
||||
const windowHandles = await driver.getAllWindowHandles();
|
||||
|
||||
await driver.switchToWindowWithTitle(
|
||||
'MetaMask Notification',
|
||||
windowHandles,
|
||||
);
|
||||
await driver.waitForSelector({
|
||||
css: '.confirm-page-container-summary__action__name',
|
||||
text: 'Deposit',
|
||||
});
|
||||
const editTransactionButton = await driver.isElementPresentAndVisible(
|
||||
'[data-testid="confirm-page-back-edit-button"]',
|
||||
);
|
||||
assert.equal(
|
||||
editTransactionButton,
|
||||
false,
|
||||
`Edit transaction button should not be visible on a contract interaction created by a dapp`,
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
it('should show an edit button on a simple ETH send iniated by a dapp', async function () {
|
||||
await withFixtures(
|
||||
{
|
||||
dapp: true,
|
||||
fixtures: new FixtureBuilder()
|
||||
.withPermissionControllerConnectedToTestDapp()
|
||||
.build(),
|
||||
ganacheOptions,
|
||||
smartContract,
|
||||
title: this.test.title,
|
||||
},
|
||||
async ({ driver }) => {
|
||||
await driver.navigate();
|
||||
await driver.fill('#password', 'correct horse battery staple');
|
||||
await driver.press('#password', driver.Key.ENTER);
|
||||
|
||||
await driver.openNewPage(`http://127.0.0.1:8080/`);
|
||||
await driver.clickElement('#sendButton');
|
||||
await driver.waitUntilXWindowHandles(3);
|
||||
const windowHandles = await driver.getAllWindowHandles();
|
||||
|
||||
await driver.switchToWindowWithTitle(
|
||||
'MetaMask Notification',
|
||||
windowHandles,
|
||||
);
|
||||
await driver.waitForSelector({
|
||||
css: '.confirm-page-container-summary__action__name',
|
||||
text: 'Sending ETH',
|
||||
});
|
||||
const editTransactionButton = await driver.isElementPresentAndVisible(
|
||||
'[data-testid="confirm-page-back-edit-button"]',
|
||||
);
|
||||
assert.equal(
|
||||
editTransactionButton,
|
||||
true,
|
||||
`Edit transaction button should be visible on a contract interaction created by a dapp`,
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
});
|
||||
@ -272,6 +272,15 @@ class Driver {
|
||||
}
|
||||
}
|
||||
|
||||
async isElementPresentAndVisible(rawLocator) {
|
||||
try {
|
||||
await this.findVisibleElement(rawLocator);
|
||||
return true;
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Paste a string into a field.
|
||||
*
|
||||
|
||||
@ -26,6 +26,7 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = `
|
||||
</svg>
|
||||
<span
|
||||
class="confirm-page-container-header__back-button"
|
||||
data-testid="confirm-page-back-edit-button"
|
||||
>
|
||||
Edit
|
||||
</span>
|
||||
|
||||
@ -56,6 +56,7 @@ export default function ConfirmPageContainerHeader({
|
||||
>
|
||||
<IconCaretLeft />
|
||||
<span
|
||||
data-testid="confirm-page-back-edit-button"
|
||||
className="confirm-page-container-header__back-button"
|
||||
onClick={() => onEdit()}
|
||||
>
|
||||
|
||||
@ -1157,11 +1157,11 @@ export default class ConfirmTransactionBase extends Component {
|
||||
requestsWaitingText,
|
||||
} = this.getNavigateTxData();
|
||||
|
||||
let functionType;
|
||||
if (
|
||||
const isContractInteractionFromDapp =
|
||||
txData.type === TRANSACTION_TYPES.CONTRACT_INTERACTION &&
|
||||
txData.origin !== 'metamask'
|
||||
) {
|
||||
txData.origin !== 'metamask';
|
||||
let functionType;
|
||||
if (isContractInteractionFromDapp) {
|
||||
functionType = getMethodName(name);
|
||||
}
|
||||
|
||||
@ -1183,7 +1183,7 @@ export default class ConfirmTransactionBase extends Component {
|
||||
toAddress={toAddress}
|
||||
toEns={toEns}
|
||||
toNickname={toNickname}
|
||||
showEdit={Boolean(onEdit)}
|
||||
showEdit={!isContractInteractionFromDapp && Boolean(onEdit)}
|
||||
action={functionType}
|
||||
title={title}
|
||||
image={image}
|
||||
|
||||
104
yarn.lock
104
yarn.lock
@ -1398,7 +1398,7 @@
|
||||
crc-32 "^1.2.0"
|
||||
ethereumjs-util "^7.1.0"
|
||||
|
||||
"@ethereumjs/common@^2.0.0", "@ethereumjs/common@^2.3.1", "@ethereumjs/common@^2.4.0", "@ethereumjs/common@^2.6.3":
|
||||
"@ethereumjs/common@^2.3.1", "@ethereumjs/common@^2.4.0", "@ethereumjs/common@^2.6.3":
|
||||
version "2.6.5"
|
||||
resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.6.5.tgz#0a75a22a046272579d91919cb12d84f2756e8d30"
|
||||
integrity sha512-lRyVQOeCDaIVtgfbowla32pzeDv2Obr8oR8Put5RdUBNRGr1VGPGQNGP6elWIpgK3YdpzqTOh4GyUGOureVeeA==
|
||||
@ -1411,14 +1411,6 @@
|
||||
resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.0.tgz#66719891bd727251a7f233f9ca80212d1994f8c8"
|
||||
integrity sha512-LM4jS5n33bJN60fM5EC8VeyhUgga6/DjCPBV2vWjnfVtobqtOiNC4SQ1MRFqyBSmJGGdB533JZWewyvlcdJtkQ==
|
||||
|
||||
"@ethereumjs/tx@3.0.0":
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.0.0.tgz#8dfd91ed6e91e63996e37b3ddc340821ebd48c81"
|
||||
integrity sha512-H9tfy6qgYxPXvt1TSObfVmVjlF43OoQqoPQ3PJsG2JiuqaMHj5ettV1pGFEC3FamENDBkl6vD6niQEvIlXv/VQ==
|
||||
dependencies:
|
||||
"@ethereumjs/common" "^2.0.0"
|
||||
ethereumjs-util "^7.0.7"
|
||||
|
||||
"@ethereumjs/tx@3.3.0":
|
||||
version "3.3.0"
|
||||
resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.0.tgz#14ed1b7fa0f28e1cd61e3ecbdab824205f6a4378"
|
||||
@ -2494,17 +2486,6 @@
|
||||
"@jridgewell/resolve-uri" "^3.0.3"
|
||||
"@jridgewell/sourcemap-codec" "^1.4.10"
|
||||
|
||||
"@keystonehq/base-eth-keyring@^0.4.0":
|
||||
version "0.4.0"
|
||||
resolved "https://registry.yarnpkg.com/@keystonehq/base-eth-keyring/-/base-eth-keyring-0.4.0.tgz#7667d2b6e38fc90553ce934c0c60c89329315b92"
|
||||
integrity sha512-CDlRNGdrHDHtBS0pAdrsjNNbyi7tn7mGrwmgiGQ6F8rhYXDZ/TcvYV1AXlzCe0eFyjPdMGdl+PgZRwBpVRtpQQ==
|
||||
dependencies:
|
||||
"@ethereumjs/tx" "3.0.0"
|
||||
"@keystonehq/bc-ur-registry-eth" "^0.9.0"
|
||||
ethereumjs-util "^7.0.8"
|
||||
hdkey "^2.0.1"
|
||||
uuid "^8.3.2"
|
||||
|
||||
"@keystonehq/base-eth-keyring@^0.7.1":
|
||||
version "0.7.1"
|
||||
resolved "https://registry.yarnpkg.com/@keystonehq/base-eth-keyring/-/base-eth-keyring-0.7.1.tgz#64517d1b2a032679d81c35e37815c27bbed6c537"
|
||||
@ -2527,16 +2508,6 @@
|
||||
hdkey "^2.0.1"
|
||||
uuid "^8.3.2"
|
||||
|
||||
"@keystonehq/bc-ur-registry-eth@^0.9.0":
|
||||
version "0.9.0"
|
||||
resolved "https://registry.yarnpkg.com/@keystonehq/bc-ur-registry-eth/-/bc-ur-registry-eth-0.9.0.tgz#607428945029a06ec17ce3288caf53a0cbd8cc22"
|
||||
integrity sha512-OVRT8Op+ZlOU9EBMxPBtQLrQZKzsV3DlfLq8P1T+Dq7WmGQNsRmQPchgju9qOlIIvmuAKaKdGXNN9W2qpTBAfA==
|
||||
dependencies:
|
||||
"@keystonehq/bc-ur-registry" "^0.5.0-alpha.5"
|
||||
ethereumjs-util "^7.0.8"
|
||||
hdkey "^2.0.1"
|
||||
uuid "^8.3.2"
|
||||
|
||||
"@keystonehq/bc-ur-registry@^0.5.0-alpha.5":
|
||||
version "0.5.0-alpha.5"
|
||||
resolved "https://registry.yarnpkg.com/@keystonehq/bc-ur-registry/-/bc-ur-registry-0.5.0-alpha.5.tgz#3d1a7eab980e8445c1596cdde704215c96d6b88a"
|
||||
@ -2546,18 +2517,6 @@
|
||||
base58check "^2.0.0"
|
||||
tslib "^2.3.0"
|
||||
|
||||
"@keystonehq/metamask-airgapped-keyring@^0.3.0":
|
||||
version "0.3.0"
|
||||
resolved "https://registry.yarnpkg.com/@keystonehq/metamask-airgapped-keyring/-/metamask-airgapped-keyring-0.3.0.tgz#3de02b268b28d9f2e2e728a10cad8cfc17870c3c"
|
||||
integrity sha512-CkiQGRPYM8CBeb8GsrrsTXpdHACl9NnoeWGQDY7DXGiy3s6u7WQ6TXal7K+wAHdU4asBzTaK2SNPZ/eIvGiAfg==
|
||||
dependencies:
|
||||
"@ethereumjs/tx" "^3.3.0"
|
||||
"@keystonehq/base-eth-keyring" "^0.4.0"
|
||||
"@keystonehq/bc-ur-registry-eth" "^0.9.0"
|
||||
"@metamask/obs-store" "^7.0.0"
|
||||
rlp "^2.2.6"
|
||||
uuid "^8.3.2"
|
||||
|
||||
"@keystonehq/metamask-airgapped-keyring@^0.6.1":
|
||||
version "0.6.1"
|
||||
resolved "https://registry.yarnpkg.com/@keystonehq/metamask-airgapped-keyring/-/metamask-airgapped-keyring-0.6.1.tgz#e4858586e054d10dcf6b03827225ac0ee0f6563f"
|
||||
@ -2825,47 +2784,6 @@
|
||||
resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-1.36.0.tgz#8e277190195e9c26733752457d2004d149fd7e0e"
|
||||
integrity sha512-weTsrXfDQHOgYaiI5giMcOAsD3ChcwnoryasT7xmAfLSKIbKP3RTTUu63VWYBoFCBZugHrhKD6z+N+nm8qAWBQ==
|
||||
|
||||
"@metamask/controllers@^30.0.0":
|
||||
version "30.3.0"
|
||||
resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-30.3.0.tgz#64ad8be538b75226a14f667db05c4ca02c75533f"
|
||||
integrity sha512-6KtRIEBAcXeF/ozsP2I7T7hFv1X0mf30ygWcgApKdQEYXAERAaBz0S9ENC8OsFULUj5MFPBfUKIDaeGNOq6MvQ==
|
||||
dependencies:
|
||||
"@ethereumjs/common" "^2.3.1"
|
||||
"@ethereumjs/tx" "^3.2.1"
|
||||
"@keystonehq/metamask-airgapped-keyring" "^0.3.0"
|
||||
"@metamask/contract-metadata" "^1.35.0"
|
||||
"@metamask/metamask-eth-abis" "3.0.0"
|
||||
"@metamask/types" "^1.1.0"
|
||||
"@types/uuid" "^8.3.0"
|
||||
abort-controller "^3.0.0"
|
||||
async-mutex "^0.2.6"
|
||||
babel-runtime "^6.26.0"
|
||||
deep-freeze-strict "^1.1.1"
|
||||
eth-ens-namehash "^2.0.8"
|
||||
eth-json-rpc-infura "^5.1.0"
|
||||
eth-keyring-controller "^7.0.2"
|
||||
eth-method-registry "1.1.0"
|
||||
eth-phishing-detect "^1.2.0"
|
||||
eth-query "^2.1.2"
|
||||
eth-rpc-errors "^4.0.0"
|
||||
eth-sig-util "^3.0.0"
|
||||
ethereumjs-util "^7.0.10"
|
||||
ethereumjs-wallet "^1.0.1"
|
||||
ethers "^5.4.1"
|
||||
ethjs-unit "^0.1.6"
|
||||
fast-deep-equal "^3.1.3"
|
||||
immer "^9.0.6"
|
||||
isomorphic-fetch "^3.0.0"
|
||||
json-rpc-engine "^6.1.0"
|
||||
jsonschema "^1.2.4"
|
||||
multiformats "^9.5.2"
|
||||
nanoid "^3.1.31"
|
||||
punycode "^2.1.1"
|
||||
single-call-balance-checker-abi "^1.0.0"
|
||||
uuid "^8.3.2"
|
||||
web3 "^0.20.7"
|
||||
web3-provider-engine "^16.0.3"
|
||||
|
||||
"@metamask/controllers@^32.0.2":
|
||||
version "32.0.2"
|
||||
resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-32.0.2.tgz#4841e4b8622c0e9a2cc948ef5f7e8a00473055e8"
|
||||
@ -3181,15 +3099,15 @@
|
||||
resolved "https://registry.yarnpkg.com/@metamask/slip44/-/slip44-2.1.0.tgz#f76764ca54afc162fbfe563f1994b79ed4711bba"
|
||||
integrity sha512-wkFDdY4XtpF+XCqbgwhsrLRgEM/bYfIt47927JTQZQ2QxQYRbSZ6u0QygnVjIR1eqMteRGx2jtUUZ+bxYQTo/w==
|
||||
|
||||
"@metamask/smart-transactions-controller@^2.3.2":
|
||||
version "2.3.2"
|
||||
resolved "https://registry.yarnpkg.com/@metamask/smart-transactions-controller/-/smart-transactions-controller-2.3.2.tgz#c7969f07c180e30a96c2631a8c856a9f41c894e7"
|
||||
integrity sha512-7WDAiaSaY7aeBSghX1RFjdeeLh0Ce+K5r1jtzvN7RW8WUWGqhL095PVSUkCAUjbLCPdQUM94ASY9s2c9EUyq8Q==
|
||||
"@metamask/smart-transactions-controller@^3.0.0":
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/@metamask/smart-transactions-controller/-/smart-transactions-controller-3.0.0.tgz#fc878ace43d581614e8ef802467f8d542b1cf2f8"
|
||||
integrity sha512-zvkywRv8Xe/+SPGuSbceiNHiSlszVLPStqmabKK/S6Haw/7SOYk18PPhN1WLQgk+NvsgaIa4hrX7ibleEeqViA==
|
||||
dependencies:
|
||||
"@ethersproject/bignumber" "^5.7.0"
|
||||
"@ethersproject/bytes" "^5.7.0"
|
||||
"@ethersproject/providers" "^5.7.0"
|
||||
"@metamask/controllers" "^30.0.0"
|
||||
"@metamask/controllers" "^32.0.2"
|
||||
"@types/lodash" "^4.14.176"
|
||||
bignumber.js "^9.0.1"
|
||||
fast-json-patch "^3.1.0"
|
||||
@ -3269,9 +3187,9 @@
|
||||
fast-deep-equal "^3.1.3"
|
||||
|
||||
"@metamask/utils@^3.0.1", "@metamask/utils@^3.0.3", "@metamask/utils@^3.3.0":
|
||||
version "3.3.0"
|
||||
resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-3.3.0.tgz#e5e7885c72a30f50f9e2b29690f543da1d6ab496"
|
||||
integrity sha512-GT8jMTCiGl3z9L1lvALjgW/6urJsl5Cwnix4C65NzJInF0cK2GxqpLkEMQJ50Mdky2qc2P7+F5++d4utvx2TtA==
|
||||
version "3.3.1"
|
||||
resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-3.3.1.tgz#04a00a24469e3eb03bde111432053c05afb45326"
|
||||
integrity sha512-r65Swl91wQ2YDkEQXZah1l7it0iBJK+trTeX9uPHplLQ0lzWZ/yODbEMFZVrStRQxDU8RARXryDyfUX5CLVvLA==
|
||||
dependencies:
|
||||
"@types/debug" "^4.1.7"
|
||||
debug "^4.3.4"
|
||||
@ -11494,7 +11412,7 @@ ethereumjs-util@^6.0.0, ethereumjs-util@^6.2.1:
|
||||
ethjs-util "0.1.6"
|
||||
rlp "^2.2.3"
|
||||
|
||||
ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.0.7, ethereumjs-util@^7.0.8, ethereumjs-util@^7.0.9, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.4, ethereumjs-util@^7.1.5:
|
||||
ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.0.9, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.4, ethereumjs-util@^7.1.5:
|
||||
version "7.1.5"
|
||||
resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181"
|
||||
integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg==
|
||||
@ -11551,7 +11469,7 @@ ethereumjs-wallet@^1.0.1:
|
||||
utf8 "^3.0.0"
|
||||
uuid "^3.3.2"
|
||||
|
||||
ethers@^5.4.0, ethers@^5.4.1, ethers@^5.4.5, ethers@^5.6.4:
|
||||
ethers@^5.4.0, ethers@^5.4.5, ethers@^5.6.4:
|
||||
version "5.6.5"
|
||||
resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.5.tgz#3185ac7815dc640993408adf6f133ffabfbcbb63"
|
||||
integrity sha512-9CTmplO9bv0s/aPw3HB3txGzKz3tUSI2EfO4dJo0W2WvaEq1ArgsEX6obV+bj5X3yY+Zgb1kAux8TDtJKe1FaA==
|
||||
|
||||
Loading…
Reference in New Issue
Block a user