From 41f66271db08544cb8fa5050b02d5cb6d7b9661a Mon Sep 17 00:00:00 2001 From: legobeat <109787230+legobeat@users.noreply.github.com> Date: Wed, 26 Jul 2023 22:01:31 +0000 Subject: [PATCH] Dedupe bn.js (#20199) * force latest version of dependency bn.js to @5.2.1 * test - fix broken standin data given to bn.js --------- Co-authored-by: kumavis Co-authored-by: Brad Decker --- lavamoat/browserify/beta/policy.json | 110 ++++-------------------- lavamoat/browserify/desktop/policy.json | 110 ++++-------------------- lavamoat/browserify/flask/policy.json | 110 ++++-------------------- lavamoat/browserify/main/policy.json | 110 ++++-------------------- lavamoat/browserify/mmi/policy.json | 110 ++++-------------------- package.json | 3 +- ui/ducks/send/send.test.js | 83 +++++++++--------- yarn.lock | 18 +--- 8 files changed, 142 insertions(+), 512 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index ad251a165e5e..92127e7ccfb5 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -308,15 +308,7 @@ "packages": { "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, - "@ethersproject/bignumber>bn.js": true - } - }, - "@ethersproject/bignumber>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true } }, "@ethersproject/contracts": { @@ -1200,11 +1192,11 @@ "setInterval": true }, "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, "@metamask/eth-token-tracker>ethjs>ethjs-abi": true, "@metamask/eth-token-tracker>ethjs>ethjs-contract": true, "@metamask/eth-token-tracker>ethjs>ethjs-query": true, "@metamask/eth-token-tracker>ethjs>ethjs-util": true, + "bn.js": true, "browserify>buffer": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -1215,7 +1207,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1233,7 +1225,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-contract>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1595,7 +1587,7 @@ }, "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": { "packages": { - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": true, + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, @@ -1604,14 +1596,6 @@ "ethereumjs-util>rlp": true } }, - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@metamask/logo": { "globals": { "addEventListener": true, @@ -2271,11 +2255,11 @@ "@truffle/codec>@truffle/abi-utils": true, "@truffle/codec>@truffle/compile-common": true, "@truffle/codec>big.js": true, - "@truffle/codec>bn.js": true, "@truffle/codec>cbor": true, "@truffle/codec>semver": true, "@truffle/codec>utf8": true, "@truffle/codec>web3-utils": true, + "bn.js": true, "browserify>buffer": true, "browserify>os-browserify": true, "browserify>util": true, @@ -2432,14 +2416,6 @@ "define": true } }, - "@truffle/codec>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>cbor": { "globals": { "TextDecoder": true @@ -2482,8 +2458,8 @@ }, "packages": { "@truffle/codec>utf8": true, - "@truffle/codec>web3-utils>bn.js": true, "@truffle/codec>web3-utils>ethereum-bloom-filters": true, + "bn.js": true, "browserify>buffer": true, "ethereumjs-util": true, "ethereumjs-wallet>randombytes": true, @@ -2491,14 +2467,6 @@ "ethjs>number-to-bn": true } }, - "@truffle/codec>web3-utils>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>web3-utils>ethereum-bloom-filters": { "packages": { "@truffle/codec>web3-utils>ethereum-bloom-filters>js-sha3": true @@ -2520,7 +2488,7 @@ "@truffle/codec>web3-utils": true, "@truffle/decoder>@truffle/encoder": true, "@truffle/decoder>@truffle/source-map-utils": true, - "@truffle/decoder>bn.js": true, + "bn.js": true, "nock>debug": true } }, @@ -2742,14 +2710,6 @@ "@truffle/decoder>@truffle/source-map-utils>node-interval-tree>shallowequal": true } }, - "@truffle/decoder>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@zxing/browser": { "globals": { "HTMLElement": true, @@ -3289,11 +3249,11 @@ }, "packages": { "@ethereumjs/tx>@ethereumjs/util": true, + "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, "eth-lattice-keyring>@ethereumjs/tx": true, - "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, "eth-lattice-keyring>rlp": true } @@ -3341,14 +3301,6 @@ "crypto": true } }, - "eth-lattice-keyring>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk": { "globals": { "AbortController": true, @@ -3469,19 +3421,11 @@ "intToBuffer": true }, "packages": { - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": true, + "bn.js": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>js-sha3": true } }, - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": { "globals": { "console": true @@ -3613,23 +3557,15 @@ }, "ethereumjs-util": { "packages": { + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util>bn.js": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true } }, - "ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "ethereumjs-util>create-hash": { "packages": { "addons-linter>sha.js": true, @@ -3746,16 +3682,8 @@ }, "ethereumjs-util>rlp": { "packages": { - "browserify>buffer": true, - "ethereumjs-util>rlp>bn.js": true - } - }, - "ethereumjs-util>rlp>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true, + "browserify>buffer": true } }, "ethereumjs-wallet": { @@ -3843,10 +3771,10 @@ "setInterval": true }, "packages": { + "bn.js": true, "browserify>buffer": true, "ethjs-contract": true, "ethjs-query": true, - "ethjs>bn.js": true, "ethjs>ethjs-abi": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -3868,8 +3796,8 @@ }, "ethjs-contract>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs-contract>ethjs-abi>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -3930,8 +3858,8 @@ }, "ethjs>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -3954,7 +3882,7 @@ }, "ethjs>ethjs-unit": { "packages": { - "ethjs>ethjs-unit>bn.js": true, + "bn.js": true, "ethjs>number-to-bn": true } }, @@ -3977,8 +3905,8 @@ }, "ethjs>number-to-bn": { "packages": { - "ethjs>ethjs-util>strip-hex-prefix": true, - "ethjs>number-to-bn>bn.js": true + "bn.js": true, + "ethjs>ethjs-util>strip-hex-prefix": true } }, "extension-port-stream": { diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index e4327b938c12..90ab19338e07 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -308,15 +308,7 @@ "packages": { "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, - "@ethersproject/bignumber>bn.js": true - } - }, - "@ethersproject/bignumber>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true } }, "@ethersproject/contracts": { @@ -1328,11 +1320,11 @@ "setInterval": true }, "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, "@metamask/eth-token-tracker>ethjs>ethjs-abi": true, "@metamask/eth-token-tracker>ethjs>ethjs-contract": true, "@metamask/eth-token-tracker>ethjs>ethjs-query": true, "@metamask/eth-token-tracker>ethjs>ethjs-util": true, + "bn.js": true, "browserify>buffer": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -1343,7 +1335,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1361,7 +1353,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-contract>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1746,7 +1738,7 @@ }, "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": { "packages": { - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": true, + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, @@ -1755,14 +1747,6 @@ "ethereumjs-util>rlp": true } }, - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@metamask/logo": { "globals": { "addEventListener": true, @@ -2767,11 +2751,11 @@ "@truffle/codec>@truffle/abi-utils": true, "@truffle/codec>@truffle/compile-common": true, "@truffle/codec>big.js": true, - "@truffle/codec>bn.js": true, "@truffle/codec>cbor": true, "@truffle/codec>semver": true, "@truffle/codec>utf8": true, "@truffle/codec>web3-utils": true, + "bn.js": true, "browserify>buffer": true, "browserify>os-browserify": true, "browserify>util": true, @@ -2928,14 +2912,6 @@ "define": true } }, - "@truffle/codec>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>cbor": { "globals": { "TextDecoder": true @@ -2978,8 +2954,8 @@ }, "packages": { "@truffle/codec>utf8": true, - "@truffle/codec>web3-utils>bn.js": true, "@truffle/codec>web3-utils>ethereum-bloom-filters": true, + "bn.js": true, "browserify>buffer": true, "ethereumjs-util": true, "ethereumjs-wallet>randombytes": true, @@ -2987,14 +2963,6 @@ "ethjs>number-to-bn": true } }, - "@truffle/codec>web3-utils>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>web3-utils>ethereum-bloom-filters": { "packages": { "@truffle/codec>web3-utils>ethereum-bloom-filters>js-sha3": true @@ -3016,7 +2984,7 @@ "@truffle/codec>web3-utils": true, "@truffle/decoder>@truffle/encoder": true, "@truffle/decoder>@truffle/source-map-utils": true, - "@truffle/decoder>bn.js": true, + "bn.js": true, "nock>debug": true } }, @@ -3238,14 +3206,6 @@ "@truffle/decoder>@truffle/source-map-utils>node-interval-tree>shallowequal": true } }, - "@truffle/decoder>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@zxing/browser": { "globals": { "HTMLElement": true, @@ -3785,11 +3745,11 @@ }, "packages": { "@ethereumjs/tx>@ethereumjs/util": true, + "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, "eth-lattice-keyring>@ethereumjs/tx": true, - "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, "eth-lattice-keyring>rlp": true } @@ -3837,14 +3797,6 @@ "crypto": true } }, - "eth-lattice-keyring>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk": { "globals": { "AbortController": true, @@ -3965,19 +3917,11 @@ "intToBuffer": true }, "packages": { - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": true, + "bn.js": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>js-sha3": true } }, - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": { "globals": { "console": true @@ -4109,23 +4053,15 @@ }, "ethereumjs-util": { "packages": { + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util>bn.js": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true } }, - "ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "ethereumjs-util>create-hash": { "packages": { "addons-linter>sha.js": true, @@ -4242,16 +4178,8 @@ }, "ethereumjs-util>rlp": { "packages": { - "browserify>buffer": true, - "ethereumjs-util>rlp>bn.js": true - } - }, - "ethereumjs-util>rlp>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true, + "browserify>buffer": true } }, "ethereumjs-wallet": { @@ -4339,10 +4267,10 @@ "setInterval": true }, "packages": { + "bn.js": true, "browserify>buffer": true, "ethjs-contract": true, "ethjs-query": true, - "ethjs>bn.js": true, "ethjs>ethjs-abi": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -4364,8 +4292,8 @@ }, "ethjs-contract>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs-contract>ethjs-abi>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -4426,8 +4354,8 @@ }, "ethjs>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -4450,7 +4378,7 @@ }, "ethjs>ethjs-unit": { "packages": { - "ethjs>ethjs-unit>bn.js": true, + "bn.js": true, "ethjs>number-to-bn": true } }, @@ -4473,8 +4401,8 @@ }, "ethjs>number-to-bn": { "packages": { - "ethjs>ethjs-util>strip-hex-prefix": true, - "ethjs>number-to-bn>bn.js": true + "bn.js": true, + "ethjs>ethjs-util>strip-hex-prefix": true } }, "extension-port-stream": { diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index e4327b938c12..90ab19338e07 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -308,15 +308,7 @@ "packages": { "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, - "@ethersproject/bignumber>bn.js": true - } - }, - "@ethersproject/bignumber>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true } }, "@ethersproject/contracts": { @@ -1328,11 +1320,11 @@ "setInterval": true }, "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, "@metamask/eth-token-tracker>ethjs>ethjs-abi": true, "@metamask/eth-token-tracker>ethjs>ethjs-contract": true, "@metamask/eth-token-tracker>ethjs>ethjs-query": true, "@metamask/eth-token-tracker>ethjs>ethjs-util": true, + "bn.js": true, "browserify>buffer": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -1343,7 +1335,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1361,7 +1353,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-contract>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1746,7 +1738,7 @@ }, "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": { "packages": { - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": true, + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, @@ -1755,14 +1747,6 @@ "ethereumjs-util>rlp": true } }, - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@metamask/logo": { "globals": { "addEventListener": true, @@ -2767,11 +2751,11 @@ "@truffle/codec>@truffle/abi-utils": true, "@truffle/codec>@truffle/compile-common": true, "@truffle/codec>big.js": true, - "@truffle/codec>bn.js": true, "@truffle/codec>cbor": true, "@truffle/codec>semver": true, "@truffle/codec>utf8": true, "@truffle/codec>web3-utils": true, + "bn.js": true, "browserify>buffer": true, "browserify>os-browserify": true, "browserify>util": true, @@ -2928,14 +2912,6 @@ "define": true } }, - "@truffle/codec>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>cbor": { "globals": { "TextDecoder": true @@ -2978,8 +2954,8 @@ }, "packages": { "@truffle/codec>utf8": true, - "@truffle/codec>web3-utils>bn.js": true, "@truffle/codec>web3-utils>ethereum-bloom-filters": true, + "bn.js": true, "browserify>buffer": true, "ethereumjs-util": true, "ethereumjs-wallet>randombytes": true, @@ -2987,14 +2963,6 @@ "ethjs>number-to-bn": true } }, - "@truffle/codec>web3-utils>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>web3-utils>ethereum-bloom-filters": { "packages": { "@truffle/codec>web3-utils>ethereum-bloom-filters>js-sha3": true @@ -3016,7 +2984,7 @@ "@truffle/codec>web3-utils": true, "@truffle/decoder>@truffle/encoder": true, "@truffle/decoder>@truffle/source-map-utils": true, - "@truffle/decoder>bn.js": true, + "bn.js": true, "nock>debug": true } }, @@ -3238,14 +3206,6 @@ "@truffle/decoder>@truffle/source-map-utils>node-interval-tree>shallowequal": true } }, - "@truffle/decoder>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@zxing/browser": { "globals": { "HTMLElement": true, @@ -3785,11 +3745,11 @@ }, "packages": { "@ethereumjs/tx>@ethereumjs/util": true, + "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, "eth-lattice-keyring>@ethereumjs/tx": true, - "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, "eth-lattice-keyring>rlp": true } @@ -3837,14 +3797,6 @@ "crypto": true } }, - "eth-lattice-keyring>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk": { "globals": { "AbortController": true, @@ -3965,19 +3917,11 @@ "intToBuffer": true }, "packages": { - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": true, + "bn.js": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>js-sha3": true } }, - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": { "globals": { "console": true @@ -4109,23 +4053,15 @@ }, "ethereumjs-util": { "packages": { + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util>bn.js": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true } }, - "ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "ethereumjs-util>create-hash": { "packages": { "addons-linter>sha.js": true, @@ -4242,16 +4178,8 @@ }, "ethereumjs-util>rlp": { "packages": { - "browserify>buffer": true, - "ethereumjs-util>rlp>bn.js": true - } - }, - "ethereumjs-util>rlp>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true, + "browserify>buffer": true } }, "ethereumjs-wallet": { @@ -4339,10 +4267,10 @@ "setInterval": true }, "packages": { + "bn.js": true, "browserify>buffer": true, "ethjs-contract": true, "ethjs-query": true, - "ethjs>bn.js": true, "ethjs>ethjs-abi": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -4364,8 +4292,8 @@ }, "ethjs-contract>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs-contract>ethjs-abi>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -4426,8 +4354,8 @@ }, "ethjs>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -4450,7 +4378,7 @@ }, "ethjs>ethjs-unit": { "packages": { - "ethjs>ethjs-unit>bn.js": true, + "bn.js": true, "ethjs>number-to-bn": true } }, @@ -4473,8 +4401,8 @@ }, "ethjs>number-to-bn": { "packages": { - "ethjs>ethjs-util>strip-hex-prefix": true, - "ethjs>number-to-bn>bn.js": true + "bn.js": true, + "ethjs>ethjs-util>strip-hex-prefix": true } }, "extension-port-stream": { diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index ad251a165e5e..92127e7ccfb5 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -308,15 +308,7 @@ "packages": { "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, - "@ethersproject/bignumber>bn.js": true - } - }, - "@ethersproject/bignumber>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true } }, "@ethersproject/contracts": { @@ -1200,11 +1192,11 @@ "setInterval": true }, "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, "@metamask/eth-token-tracker>ethjs>ethjs-abi": true, "@metamask/eth-token-tracker>ethjs>ethjs-contract": true, "@metamask/eth-token-tracker>ethjs>ethjs-query": true, "@metamask/eth-token-tracker>ethjs>ethjs-util": true, + "bn.js": true, "browserify>buffer": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -1215,7 +1207,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1233,7 +1225,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-contract>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1595,7 +1587,7 @@ }, "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": { "packages": { - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": true, + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, @@ -1604,14 +1596,6 @@ "ethereumjs-util>rlp": true } }, - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@metamask/logo": { "globals": { "addEventListener": true, @@ -2271,11 +2255,11 @@ "@truffle/codec>@truffle/abi-utils": true, "@truffle/codec>@truffle/compile-common": true, "@truffle/codec>big.js": true, - "@truffle/codec>bn.js": true, "@truffle/codec>cbor": true, "@truffle/codec>semver": true, "@truffle/codec>utf8": true, "@truffle/codec>web3-utils": true, + "bn.js": true, "browserify>buffer": true, "browserify>os-browserify": true, "browserify>util": true, @@ -2432,14 +2416,6 @@ "define": true } }, - "@truffle/codec>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>cbor": { "globals": { "TextDecoder": true @@ -2482,8 +2458,8 @@ }, "packages": { "@truffle/codec>utf8": true, - "@truffle/codec>web3-utils>bn.js": true, "@truffle/codec>web3-utils>ethereum-bloom-filters": true, + "bn.js": true, "browserify>buffer": true, "ethereumjs-util": true, "ethereumjs-wallet>randombytes": true, @@ -2491,14 +2467,6 @@ "ethjs>number-to-bn": true } }, - "@truffle/codec>web3-utils>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>web3-utils>ethereum-bloom-filters": { "packages": { "@truffle/codec>web3-utils>ethereum-bloom-filters>js-sha3": true @@ -2520,7 +2488,7 @@ "@truffle/codec>web3-utils": true, "@truffle/decoder>@truffle/encoder": true, "@truffle/decoder>@truffle/source-map-utils": true, - "@truffle/decoder>bn.js": true, + "bn.js": true, "nock>debug": true } }, @@ -2742,14 +2710,6 @@ "@truffle/decoder>@truffle/source-map-utils>node-interval-tree>shallowequal": true } }, - "@truffle/decoder>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@zxing/browser": { "globals": { "HTMLElement": true, @@ -3289,11 +3249,11 @@ }, "packages": { "@ethereumjs/tx>@ethereumjs/util": true, + "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, "eth-lattice-keyring>@ethereumjs/tx": true, - "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, "eth-lattice-keyring>rlp": true } @@ -3341,14 +3301,6 @@ "crypto": true } }, - "eth-lattice-keyring>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk": { "globals": { "AbortController": true, @@ -3469,19 +3421,11 @@ "intToBuffer": true }, "packages": { - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": true, + "bn.js": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>js-sha3": true } }, - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": { "globals": { "console": true @@ -3613,23 +3557,15 @@ }, "ethereumjs-util": { "packages": { + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util>bn.js": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true } }, - "ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "ethereumjs-util>create-hash": { "packages": { "addons-linter>sha.js": true, @@ -3746,16 +3682,8 @@ }, "ethereumjs-util>rlp": { "packages": { - "browserify>buffer": true, - "ethereumjs-util>rlp>bn.js": true - } - }, - "ethereumjs-util>rlp>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true, + "browserify>buffer": true } }, "ethereumjs-wallet": { @@ -3843,10 +3771,10 @@ "setInterval": true }, "packages": { + "bn.js": true, "browserify>buffer": true, "ethjs-contract": true, "ethjs-query": true, - "ethjs>bn.js": true, "ethjs>ethjs-abi": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -3868,8 +3796,8 @@ }, "ethjs-contract>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs-contract>ethjs-abi>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -3930,8 +3858,8 @@ }, "ethjs>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -3954,7 +3882,7 @@ }, "ethjs>ethjs-unit": { "packages": { - "ethjs>ethjs-unit>bn.js": true, + "bn.js": true, "ethjs>number-to-bn": true } }, @@ -3977,8 +3905,8 @@ }, "ethjs>number-to-bn": { "packages": { - "ethjs>ethjs-util>strip-hex-prefix": true, - "ethjs>number-to-bn>bn.js": true + "bn.js": true, + "ethjs>ethjs-util>strip-hex-prefix": true } }, "extension-port-stream": { diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 77416d570319..abf1cead9dd1 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -308,15 +308,7 @@ "packages": { "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, - "@ethersproject/bignumber>bn.js": true - } - }, - "@ethersproject/bignumber>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true } }, "@ethersproject/contracts": { @@ -1428,11 +1420,11 @@ "setInterval": true }, "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, "@metamask/eth-token-tracker>ethjs>ethjs-abi": true, "@metamask/eth-token-tracker>ethjs>ethjs-contract": true, "@metamask/eth-token-tracker>ethjs>ethjs-query": true, "@metamask/eth-token-tracker>ethjs>ethjs-util": true, + "bn.js": true, "browserify>buffer": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -1443,7 +1435,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1461,7 +1453,7 @@ }, "@metamask/eth-token-tracker>ethjs>ethjs-contract>ethjs-abi": { "packages": { - "@metamask/eth-token-tracker>ethjs>bn.js": true, + "bn.js": true, "browserify>buffer": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true @@ -1823,7 +1815,7 @@ }, "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": { "packages": { - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": true, + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, @@ -1832,14 +1824,6 @@ "ethereumjs-util>rlp": true } }, - "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@metamask/logo": { "globals": { "addEventListener": true, @@ -2499,11 +2483,11 @@ "@truffle/codec>@truffle/abi-utils": true, "@truffle/codec>@truffle/compile-common": true, "@truffle/codec>big.js": true, - "@truffle/codec>bn.js": true, "@truffle/codec>cbor": true, "@truffle/codec>semver": true, "@truffle/codec>utf8": true, "@truffle/codec>web3-utils": true, + "bn.js": true, "browserify>buffer": true, "browserify>os-browserify": true, "browserify>util": true, @@ -2660,14 +2644,6 @@ "define": true } }, - "@truffle/codec>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>cbor": { "globals": { "TextDecoder": true @@ -2710,8 +2686,8 @@ }, "packages": { "@truffle/codec>utf8": true, - "@truffle/codec>web3-utils>bn.js": true, "@truffle/codec>web3-utils>ethereum-bloom-filters": true, + "bn.js": true, "browserify>buffer": true, "ethereumjs-util": true, "ethereumjs-wallet>randombytes": true, @@ -2719,14 +2695,6 @@ "ethjs>number-to-bn": true } }, - "@truffle/codec>web3-utils>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@truffle/codec>web3-utils>ethereum-bloom-filters": { "packages": { "@truffle/codec>web3-utils>ethereum-bloom-filters>js-sha3": true @@ -2748,7 +2716,7 @@ "@truffle/codec>web3-utils": true, "@truffle/decoder>@truffle/encoder": true, "@truffle/decoder>@truffle/source-map-utils": true, - "@truffle/decoder>bn.js": true, + "bn.js": true, "nock>debug": true } }, @@ -2970,14 +2938,6 @@ "@truffle/decoder>@truffle/source-map-utils>node-interval-tree>shallowequal": true } }, - "@truffle/decoder>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@zxing/browser": { "globals": { "HTMLElement": true, @@ -3517,11 +3477,11 @@ }, "packages": { "@ethereumjs/tx>@ethereumjs/util": true, + "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, "eth-lattice-keyring>@ethereumjs/tx": true, - "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, "eth-lattice-keyring>rlp": true } @@ -3569,14 +3529,6 @@ "crypto": true } }, - "eth-lattice-keyring>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk": { "globals": { "AbortController": true, @@ -3697,19 +3649,11 @@ "intToBuffer": true }, "packages": { - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": true, + "bn.js": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": true, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>js-sha3": true } }, - "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser>buffer": { "globals": { "console": true @@ -3841,23 +3785,15 @@ }, "ethereumjs-util": { "packages": { + "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util>bn.js": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true } }, - "ethereumjs-util>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "ethereumjs-util>create-hash": { "packages": { "addons-linter>sha.js": true, @@ -3974,16 +3910,8 @@ }, "ethereumjs-util>rlp": { "packages": { - "browserify>buffer": true, - "ethereumjs-util>rlp>bn.js": true - } - }, - "ethereumjs-util>rlp>bn.js": { - "globals": { - "Buffer": true - }, - "packages": { - "browserify>browser-resolve": true + "bn.js": true, + "browserify>buffer": true } }, "ethereumjs-wallet": { @@ -4071,10 +3999,10 @@ "setInterval": true }, "packages": { + "bn.js": true, "browserify>buffer": true, "ethjs-contract": true, "ethjs-query": true, - "ethjs>bn.js": true, "ethjs>ethjs-abi": true, "ethjs>ethjs-filter": true, "ethjs>ethjs-provider-http": true, @@ -4096,8 +4024,8 @@ }, "ethjs-contract>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs-contract>ethjs-abi>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -4158,8 +4086,8 @@ }, "ethjs>ethjs-abi": { "packages": { + "bn.js": true, "browserify>buffer": true, - "ethjs>bn.js": true, "ethjs>js-sha3": true, "ethjs>number-to-bn": true } @@ -4182,7 +4110,7 @@ }, "ethjs>ethjs-unit": { "packages": { - "ethjs>ethjs-unit>bn.js": true, + "bn.js": true, "ethjs>number-to-bn": true } }, @@ -4205,8 +4133,8 @@ }, "ethjs>number-to-bn": { "packages": { - "ethjs>ethjs-util>strip-hex-prefix": true, - "ethjs>number-to-bn>bn.js": true + "bn.js": true, + "ethjs>ethjs-util>strip-hex-prefix": true } }, "extension-port-stream": { diff --git a/package.json b/package.json index a32cbf37d566..40052b245dbe 100644 --- a/package.json +++ b/package.json @@ -103,6 +103,7 @@ "@metamask/approval-controller": "^3.4.0", "@types/react": "^16.9.53", "analytics-node/axios": "^0.21.2", + "bn.js": "^5.2.1", "ganache-core/lodash": "^4.17.21", "git-url-parse@^12.0.0": "^13.1.0", "glob-parent": "^6.0.2", @@ -289,7 +290,7 @@ "base32-encode": "^1.2.0", "base64-js": "^1.5.1", "bignumber.js": "^4.1.0", - "bn.js": "^4.11.7", + "bn.js": "^5.2.1", "bowser": "^2.11.0", "classnames": "^2.2.6", "copy-to-clipboard": "^3.3.3", diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js index 904a181abed0..340d447db710 100644 --- a/ui/ducks/send/send.test.js +++ b/ui/ducks/send/send.test.js @@ -77,6 +77,9 @@ import { draftTransactionInitialState, editExistingTransaction } from '.'; const mockStore = createMockStore([thunk]); +const mockAddress1 = '0xdafea492d9c6733ae3d56b7ed1adb60692c98123'; +const mockNftAddress1 = 'f4831105676a5fc024684d056390b8bc529daf51c7'; + jest.mock('./send', () => { const actual = jest.requireActual('./send'); return { @@ -541,7 +544,7 @@ describe('Send Slice', () => { const action = { type: 'send/updateRecipient', payload: { - address: '0xNewAddress', + address: mockNftAddress1, }, }; @@ -1063,7 +1066,7 @@ describe('Send Slice', () => { describe('QR Code Detected', () => { const qrCodestate = getInitialSendStateWithExistingTxState({ recipient: { - address: '0xAddress', + address: mockAddress1, }, }); @@ -1102,7 +1105,7 @@ describe('Send Slice', () => { const draftTransaction = getTestUUIDTx(result); - expect(draftTransaction.recipient.address).toStrictEqual('0xAddress'); + expect(draftTransaction.recipient.address).toStrictEqual(mockAddress1); expect(draftTransaction.recipient.error).toStrictEqual( INVALID_RECIPIENT_ADDRESS_ERROR, ); @@ -1115,7 +1118,7 @@ describe('Send Slice', () => { ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT, selectedAccount: { balance: '0x0', - address: '0xAddress', + address: mockAddress1, }, }; @@ -1144,7 +1147,7 @@ describe('Send Slice', () => { ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT, selectedAccount: { balance: '0x0', - address: '0xAddress', + address: mockAddress1, }, }; @@ -1158,7 +1161,7 @@ describe('Send Slice', () => { const result = sendReducer(olderState, action); expect(result.selectedAccount.balance).toStrictEqual('0x0'); - expect(result.selectedAccount.address).toStrictEqual('0xAddress'); + expect(result.selectedAccount.address).toStrictEqual(mockAddress1); }); }); @@ -1167,13 +1170,13 @@ describe('Send Slice', () => { const accountsChangedState = { ...getInitialSendStateWithExistingTxState({ fromAccount: { - address: '0xAddress', + address: mockAddress1, balance: '0x0', }, }), stage: SEND_STAGES.EDIT, selectedAccount: { - address: '0xAddress', + address: mockAddress1, balance: '0x0', }, }; @@ -1182,7 +1185,7 @@ describe('Send Slice', () => { type: 'ACCOUNT_CHANGED', payload: { account: { - address: '0xAddress', + address: mockAddress1, balance: '0x1', }, }, @@ -1201,13 +1204,13 @@ describe('Send Slice', () => { const accountsChangedState = { ...getInitialSendStateWithExistingTxState({ fromAccount: { - address: '0xAddress', + address: mockAddress1, balance: '0x0', }, }), stage: SEND_STAGES.EDIT, selectedAccount: { - address: '0xAddress', + address: mockAddress1, balance: '0x0', }, }; @@ -1231,7 +1234,7 @@ describe('Send Slice', () => { ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT, stage: SEND_STAGES.EDIT, selectedAccount: { - address: '0xAddress', + address: mockAddress1, balance: '0x0', }, }; @@ -1274,23 +1277,23 @@ describe('Send Slice', () => { 1559: true, }, }, - selectedAddress: '0xAddress', - identities: { '0xAddress': { address: '0xAddress' } }, + selectedAddress: mockAddress1, + identities: { [mockAddress1]: { address: mockAddress1 } }, keyrings: [ { type: KeyringType.hdKeyTree, - accounts: ['0xAddress'], + accounts: [mockAddress1], }, ], accounts: { - '0xAddress': { - address: '0xAddress', + [mockAddress1]: { + address: mockAddress1, balance: '0x0', }, }, cachedBalances: { 0x5: { - '0xAddress': '0x0', + [mockAddress1]: '0x0', }, }, providerConfig: { @@ -1580,12 +1583,12 @@ describe('Send Slice', () => { }, cachedBalances: { [CHAIN_IDS.GOERLI]: { - '0xAddress': '0x0', + [mockAddress1]: '0x0', }, }, accounts: { - '0xAddress': { - address: '0xAddress', + [mockAddress1]: { + address: mockAddress1, }, }, }, @@ -1607,7 +1610,7 @@ describe('Send Slice', () => { userInputHexData: '', }), selectedAccount: { - address: '0xAddress', + address: mockAddress1, }, }, }; @@ -2379,14 +2382,14 @@ describe('Send Slice', () => { }, identities: {}, accounts: { - '0xAddress': { - address: '0xAddress', + [mockAddress1]: { + address: mockAddress1, balance: '0x0', }, }, cachedBalances: { [CHAIN_IDS.GOERLI]: { - '0xAddress': '0x0', + [mockAddress1]: '0x0', }, }, tokenList: {}, @@ -2395,7 +2398,7 @@ describe('Send Slice', () => { id: 1, txParams: { data: '', - from: '0xAddress', + from: mockAddress1, to: '0xRecipientAddress', gas: GAS_LIMITS.SIMPLE, gasPrice: '0x3b9aca00', // 1000000000 @@ -2412,7 +2415,7 @@ describe('Send Slice', () => { ...getInitialSendStateWithExistingTxState({ id: 1, fromAccount: { - address: '0xAddress', + address: mockAddress1, }, }), }, @@ -2441,7 +2444,7 @@ describe('Send Slice', () => { type: AssetType.native, }, fromAccount: { - address: '0xAddress', + address: mockAddress1, balance: '0x0', }, gas: { @@ -2514,14 +2517,14 @@ describe('Send Slice', () => { }, identities: {}, accounts: { - '0xAddress': { - address: '0xAddress', + [mockAddress1]: { + address: mockAddress1, balance: '0x0', }, }, cachedBalances: { [CHAIN_IDS.GOERLI]: { - '0xAddress': '0x0', + [mockAddress1]: '0x0', }, }, tokenList: {}, @@ -2531,10 +2534,10 @@ describe('Send Slice', () => { txParams: { data: generateERC721TransferData({ toAddress: BURN_ADDRESS, - fromAddress: '0xAddress', + fromAddress: mockAddress1, tokenId: BigNumber.from(15000).toString(), }), - from: '0xAddress', + from: mockAddress1, to: '0xNftAddress', gas: GAS_LIMITS.BASE_TOKEN_ESTIMATE, gasPrice: '0x3b9aca00', // 1000000000 @@ -2584,7 +2587,7 @@ describe('Send Slice', () => { type: AssetType.native, }, fromAccount: { - address: '0xAddress', + address: mockAddress1, balance: '0x0', }, gas: { @@ -2697,14 +2700,14 @@ describe('Send Slice', () => { }, identities: {}, accounts: { - '0xAddress': { - address: '0xAddress', + [mockAddress1]: { + address: mockAddress1, balance: '0x0', }, }, cachedBalances: { [CHAIN_IDS.GOERLI]: { - '0xAddress': '0x0', + [mockAddress1]: '0x0', }, }, unapprovedTxs: { @@ -2720,7 +2723,7 @@ describe('Send Slice', () => { decimals: 18, }, }), - from: '0xAddress', + from: mockAddress1, to: '0xTokenAddress', gas: GAS_LIMITS.BASE_TOKEN_ESTIMATE, gasPrice: '0x3b9aca00', // 1000000000 @@ -2738,7 +2741,7 @@ describe('Send Slice', () => { }, }), selectedAccount: { - address: '0xAddress', + address: mockAddress1, balance: '0x0', }, stage: SEND_STAGES.EDIT, @@ -2775,7 +2778,7 @@ describe('Send Slice', () => { type: AssetType.native, }, fromAccount: { - address: '0xAddress', + address: mockAddress1, balance: '0x0', }, gas: { diff --git a/yarn.lock b/yarn.lock index 2296708eca9e..28a10012b1fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10868,27 +10868,13 @@ __metadata: languageName: node linkType: hard -"bn.js@npm:4.11.6": - version: 4.11.6 - resolution: "bn.js@npm:4.11.6" - checksum: db23047bf06fdf9cf74401c8e76bca9f55313c81df382247d2c753868b368562e69171716b81b7038ada8860af18346fd4bcd1cf9d4963f923fe8e54e61cb58a - languageName: node - linkType: hard - -"bn.js@npm:>4.0.0, bn.js@npm:^5.1.1, bn.js@npm:^5.1.2, bn.js@npm:^5.1.3, bn.js@npm:^5.2.0, bn.js@npm:^5.2.1": +"bn.js@npm:^5.2.1": version: 5.2.1 resolution: "bn.js@npm:5.2.1" checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3 languageName: node linkType: hard -"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.1.1, bn.js@npm:^4.11.0, bn.js@npm:^4.11.7, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9, bn.js@npm:^4.12.0": - version: 4.12.0 - resolution: "bn.js@npm:4.12.0" - checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12 - languageName: node - linkType: hard - "bo-selector@npm:0.0.10": version: 0.0.10 resolution: "bo-selector@npm:0.0.10" @@ -24338,7 +24324,7 @@ __metadata: base64-js: ^1.5.1 bify-module-groups: ^2.0.0 bignumber.js: ^4.1.0 - bn.js: ^4.11.7 + bn.js: ^5.2.1 bowser: ^2.11.0 brfs: ^2.0.2 browser-util-inspect: ^0.2.0