bump smart-transactions-controller verion (#15818)

2 years ago · 34fe20126a
parent a8189ba253
commit 34fe20126a
6 changed files with 442 additions and 333 deletions
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@ -2312,15 +2312,34 @@
    },
    "@eth-optimism/contracts>@ethersproject/abstract-provider": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "ethers>@ethersproject/wallet>@ethersproject/properties": true
+      }
+    },
+    "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/networks": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/logger": true
+      }
+    },
+    "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/web": {
+      "globals": {
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": true,
+        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "@eth-optimism/contracts>@ethersproject/abstract-signer": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
@ -2346,6 +2365,31 @@
        "ethereumjs-util": true
      }
    },
+    "@ethersproject/bignumber": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@ethersproject/bignumber>bn.js": true
+      }
+    },
+    "@ethersproject/bignumber>@ethersproject/bytes": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/logger": true
+      }
+    },
+    "@ethersproject/bignumber>@ethersproject/logger": {
+      "globals": {
+        "console": true
+      }
+    },
+    "@ethersproject/bignumber>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
    "@formatjs/intl-relativetimeformat": {
      "globals": {
        "Intl": true
@ -3343,12 +3387,12 @@
        "console.log": true
      },
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
@ -3378,14 +3422,62 @@
        "setInterval": true
      },
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
        "@metamask/controllers": true,
        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers": true,
        "@metamask/smart-transactions-controller>bignumber.js": true,
        "@metamask/smart-transactions-controller>fast-json-patch": true,
-        "ethers": true,
        "lodash": true
      }
    },
+    "@metamask/smart-transactions-controller>@ethersproject/providers": {
+      "globals": {
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@eth-optimism/contracts>@ethersproject/abstract-provider": true,
+        "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/networks": true,
+        "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/web": true,
+        "@eth-optimism/contracts>@ethersproject/abstract-signer": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": true,
+        "ethers>@ethersproject/hdnode>@ethersproject/basex": true,
+        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
+        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
+        "ethers>@ethersproject/providers>bech32": true,
+        "ethers>@ethersproject/units>@ethersproject/constants": true,
+        "ethers>@ethersproject/wallet>@ethersproject/address": true,
+        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
+        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
+        "ethers>@ethersproject/wallet>@ethersproject/random": true,
+        "ethers>@ethersproject/wallet>@ethersproject/transactions": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/rlp": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true
+      }
+    },
    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
      "globals": {
        "crypto.getRandomValues": true
@ -5749,13 +5841,13 @@
    },
    "ethers>@ethersproject/hdnode": {
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/basex": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/pbkdf2": true,
        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/signing-key": true,
        "ethers>@ethersproject/wallet>@ethersproject/transactions": true,
@ -5764,27 +5856,27 @@
    },
    "ethers>@ethersproject/hdnode>@ethersproject/basex": {
      "packages": {
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "ethers>@ethersproject/hdnode>@ethersproject/strings": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "ethers>@ethersproject/units>@ethersproject/constants": true
      }
    },
    "ethers>@ethersproject/json-wallets": {
      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/json-wallets>aes-js": true,
        "ethers>@ethersproject/json-wallets>scrypt-js": true,
        "ethers>@ethersproject/pbkdf2": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/random": true,
@ -5836,15 +5928,15 @@
    },
    "ethers>@ethersproject/pbkdf2": {
      "packages": {
-        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true
      }
    },
    "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": {
      "packages": {
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
      }
    },
    "ethers>@ethersproject/properties": {
@ -6128,11 +6220,11 @@
    },
    "ethers>@ethersproject/solidity": {
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true
      }
    },
@ -6255,44 +6347,24 @@
    },
    "ethers>@ethersproject/units": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true
-      }
-    },
-    "ethers>@ethersproject/units>@ethersproject/bignumber": {
-      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber>bn.js": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
-      }
-    },
-    "ethers>@ethersproject/units>@ethersproject/bignumber>bn.js": {
-      "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "ethers>@ethersproject/units>@ethersproject/constants": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true
-      }
-    },
-    "ethers>@ethersproject/units>@ethersproject/logger": {
-      "globals": {
-        "console": true
+        "@ethersproject/bignumber": true
      }
    },
    "ethers>@ethersproject/wallet": {
      "packages": {
        "@eth-optimism/contracts>@ethersproject/abstract-provider": true,
        "@eth-optimism/contracts>@ethersproject/abstract-signer": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode": true,
        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
@ -6303,78 +6375,58 @@
    },
    "ethers>@ethersproject/wallet>@ethersproject/address": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/address>@ethersproject/rlp": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/rlp": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true
      }
    },
-    "ethers>@ethersproject/wallet>@ethersproject/address>@ethersproject/rlp": {
-      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
-      }
-    },
-    "ethers>@ethersproject/wallet>@ethersproject/bytes": {
-      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true
-      }
-    },
    "ethers>@ethersproject/wallet>@ethersproject/hash": {
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
-        "ethers>@ethersproject/wallet>@ethersproject/hash>@ethersproject/base64": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
-    "ethers>@ethersproject/wallet>@ethersproject/hash>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
-      }
-    },
    "ethers>@ethersproject/wallet>@ethersproject/keccak256": {
      "packages": {
-        "ethers>@ethersproject/keccak256>js-sha3": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256>js-sha3": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/properties": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/random": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/signing-key": {
      "packages": {
        "3box>ethers>elliptic": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/transactions": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/rlp": true,
        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/address>@ethersproject/rlp": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/signing-key": true
@ -6447,9 +6499,9 @@
    },
    "ethers>@ethersproject/wordlists": {
      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@ -2457,15 +2457,15 @@
    },
    "@eth-optimism/contracts>@ethersproject/abstract-provider": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/networks": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/web": {
@ -2475,16 +2475,16 @@
        "setTimeout": true
      },
      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
-        "ethers>@ethersproject/wallet>@ethersproject/hash>@ethersproject/base64": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "@eth-optimism/contracts>@ethersproject/abstract-signer": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
@ -2495,11 +2495,11 @@
      "packages": {
        "@eth-optimism/contracts>@ethersproject/abstract-provider": true,
        "@eth-optimism/contracts>@ethersproject/abstract-signer": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "@metamask/rpc-methods>@metamask/controllers>@ethersproject/abi": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/transactions": true
      }
@ -2526,6 +2526,31 @@
        "ethereumjs-util": true
      }
    },
+    "@ethersproject/bignumber": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@ethersproject/bignumber>bn.js": true
+      }
+    },
+    "@ethersproject/bignumber>@ethersproject/bytes": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/logger": true
+      }
+    },
+    "@ethersproject/bignumber>@ethersproject/logger": {
+      "globals": {
+        "console": true
+      }
+    },
+    "@ethersproject/bignumber>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
    "@formatjs/intl-relativetimeformat": {
      "globals": {
        "Intl": true
@ -3564,10 +3589,10 @@
        "@metamask/controllers>web3-provider-engine": true,
        "@metamask/metamask-eth-abis": true,
        "@metamask/rpc-methods>@metamask/controllers>@ethersproject/abi": true,
-        "@metamask/rpc-methods>@metamask/controllers>@ethersproject/providers": true,
        "@metamask/rpc-methods>@metamask/controllers>eth-method-registry": true,
        "@metamask/rpc-methods>@metamask/controllers>ethereumjs-wallet": true,
        "@metamask/rpc-methods>@metamask/controllers>nanoid": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers": true,
        "browserify>buffer": true,
        "browserify>events": true,
        "deep-freeze-strict": true,
@ -3592,48 +3617,17 @@
        "console.log": true
      },
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
-    "@metamask/rpc-methods>@metamask/controllers>@ethersproject/providers": {
-      "globals": {
-        "WebSocket": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.log": true,
-        "console.warn": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@eth-optimism/contracts>@ethersproject/abstract-provider": true,
-        "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/networks": true,
-        "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/web": true,
-        "@eth-optimism/contracts>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/hdnode>@ethersproject/basex": true,
-        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/providers>bech32": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
-        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
-        "ethers>@ethersproject/wallet>@ethersproject/hash>@ethersproject/base64": true,
-        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
-        "ethers>@ethersproject/wallet>@ethersproject/random": true,
-        "ethers>@ethersproject/wallet>@ethersproject/transactions": true
-      }
-    },
    "@metamask/rpc-methods>@metamask/controllers>eth-method-registry": {
      "packages": {
        "@metamask/rpc-methods>@metamask/controllers>eth-method-registry>ethjs": true
@ -3774,14 +3768,62 @@
        "setInterval": true
      },
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
        "@metamask/controllers": true,
        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers": true,
        "@metamask/smart-transactions-controller>bignumber.js": true,
        "@metamask/smart-transactions-controller>fast-json-patch": true,
-        "ethers": true,
        "lodash": true
      }
    },
+    "@metamask/smart-transactions-controller>@ethersproject/providers": {
+      "globals": {
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@eth-optimism/contracts>@ethersproject/abstract-provider": true,
+        "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/networks": true,
+        "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/web": true,
+        "@eth-optimism/contracts>@ethersproject/abstract-signer": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": true,
+        "ethers>@ethersproject/hdnode>@ethersproject/basex": true,
+        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
+        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
+        "ethers>@ethersproject/providers>bech32": true,
+        "ethers>@ethersproject/units>@ethersproject/constants": true,
+        "ethers>@ethersproject/wallet>@ethersproject/address": true,
+        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
+        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
+        "ethers>@ethersproject/wallet>@ethersproject/random": true,
+        "ethers>@ethersproject/wallet>@ethersproject/transactions": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/rlp": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true
+      }
+    },
    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
      "globals": {
        "crypto.getRandomValues": true
@ -3875,7 +3917,7 @@
        "@metamask/controllers>web3-provider-engine": true,
        "@metamask/metamask-eth-abis": true,
        "@metamask/rpc-methods>@metamask/controllers>@ethersproject/abi": true,
-        "@metamask/rpc-methods>@metamask/controllers>@ethersproject/providers": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers": true,
        "@metamask/snap-controllers>@metamask/controllers>eth-method-registry": true,
        "@metamask/snap-controllers>@metamask/controllers>ethereumjs-wallet": true,
        "@metamask/snap-controllers>nanoid": true,
@ -6611,13 +6653,13 @@
    },
    "ethers>@ethersproject/hdnode": {
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/basex": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/pbkdf2": true,
        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/signing-key": true,
        "ethers>@ethersproject/wallet>@ethersproject/transactions": true,
@ -6626,27 +6668,27 @@
    },
    "ethers>@ethersproject/hdnode>@ethersproject/basex": {
      "packages": {
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "ethers>@ethersproject/hdnode>@ethersproject/strings": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "ethers>@ethersproject/units>@ethersproject/constants": true
      }
    },
    "ethers>@ethersproject/json-wallets": {
      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/json-wallets>aes-js": true,
        "ethers>@ethersproject/json-wallets>scrypt-js": true,
        "ethers>@ethersproject/pbkdf2": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/random": true,
@ -6698,15 +6740,15 @@
    },
    "ethers>@ethersproject/pbkdf2": {
      "packages": {
-        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true
      }
    },
    "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": {
      "packages": {
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
      }
    },
    "ethers>@ethersproject/properties": {
@ -6990,11 +7032,11 @@
    },
    "ethers>@ethersproject/solidity": {
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true
      }
    },
@ -7117,44 +7159,24 @@
    },
    "ethers>@ethersproject/units": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true
-      }
-    },
-    "ethers>@ethersproject/units>@ethersproject/bignumber": {
-      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber>bn.js": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
-      }
-    },
-    "ethers>@ethersproject/units>@ethersproject/bignumber>bn.js": {
-      "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "ethers>@ethersproject/units>@ethersproject/constants": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true
-      }
-    },
-    "ethers>@ethersproject/units>@ethersproject/logger": {
-      "globals": {
-        "console": true
+        "@ethersproject/bignumber": true
      }
    },
    "ethers>@ethersproject/wallet": {
      "packages": {
        "@eth-optimism/contracts>@ethersproject/abstract-provider": true,
        "@eth-optimism/contracts>@ethersproject/abstract-signer": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode": true,
        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
@ -7165,78 +7187,58 @@
    },
    "ethers>@ethersproject/wallet>@ethersproject/address": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/address>@ethersproject/rlp": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/rlp": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true
      }
    },
-    "ethers>@ethersproject/wallet>@ethersproject/address>@ethersproject/rlp": {
-      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
-      }
-    },
-    "ethers>@ethersproject/wallet>@ethersproject/bytes": {
-      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true
-      }
-    },
    "ethers>@ethersproject/wallet>@ethersproject/hash": {
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
-        "ethers>@ethersproject/wallet>@ethersproject/hash>@ethersproject/base64": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
-    "ethers>@ethersproject/wallet>@ethersproject/hash>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
-      }
-    },
    "ethers>@ethersproject/wallet>@ethersproject/keccak256": {
      "packages": {
-        "ethers>@ethersproject/keccak256>js-sha3": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256>js-sha3": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/properties": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/random": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/signing-key": {
      "packages": {
        "3box>ethers>elliptic": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/transactions": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/rlp": true,
        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/address>@ethersproject/rlp": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/signing-key": true
@ -7309,9 +7311,9 @@
    },
    "ethers>@ethersproject/wordlists": {
      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@ -2312,15 +2312,34 @@
    },
    "@eth-optimism/contracts>@ethersproject/abstract-provider": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "ethers>@ethersproject/wallet>@ethersproject/properties": true
+      }
+    },
+    "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/networks": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/logger": true
+      }
+    },
+    "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/web": {
+      "globals": {
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": true,
+        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "@eth-optimism/contracts>@ethersproject/abstract-signer": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
@ -2346,6 +2365,31 @@
        "ethereumjs-util": true
      }
    },
+    "@ethersproject/bignumber": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@ethersproject/bignumber>bn.js": true
+      }
+    },
+    "@ethersproject/bignumber>@ethersproject/bytes": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/logger": true
+      }
+    },
+    "@ethersproject/bignumber>@ethersproject/logger": {
+      "globals": {
+        "console": true
+      }
+    },
+    "@ethersproject/bignumber>bn.js": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
    "@formatjs/intl-relativetimeformat": {
      "globals": {
        "Intl": true
@ -3343,12 +3387,12 @@
        "console.log": true
      },
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
@ -3378,14 +3422,62 @@
        "setInterval": true
      },
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
        "@metamask/controllers": true,
        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers": true,
        "@metamask/smart-transactions-controller>bignumber.js": true,
        "@metamask/smart-transactions-controller>fast-json-patch": true,
-        "ethers": true,
        "lodash": true
      }
    },
+    "@metamask/smart-transactions-controller>@ethersproject/providers": {
+      "globals": {
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@eth-optimism/contracts>@ethersproject/abstract-provider": true,
+        "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/networks": true,
+        "@eth-optimism/contracts>@ethersproject/abstract-provider>@ethersproject/web": true,
+        "@eth-optimism/contracts>@ethersproject/abstract-signer": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": true,
+        "ethers>@ethersproject/hdnode>@ethersproject/basex": true,
+        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
+        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
+        "ethers>@ethersproject/providers>bech32": true,
+        "ethers>@ethersproject/units>@ethersproject/constants": true,
+        "ethers>@ethersproject/wallet>@ethersproject/address": true,
+        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
+        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
+        "ethers>@ethersproject/wallet>@ethersproject/random": true,
+        "ethers>@ethersproject/wallet>@ethersproject/transactions": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/rlp": {
+      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true
+      }
+    },
    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
      "globals": {
        "crypto.getRandomValues": true
@ -5749,13 +5841,13 @@
    },
    "ethers>@ethersproject/hdnode": {
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/basex": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/pbkdf2": true,
        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/signing-key": true,
        "ethers>@ethersproject/wallet>@ethersproject/transactions": true,
@ -5764,27 +5856,27 @@
    },
    "ethers>@ethersproject/hdnode>@ethersproject/basex": {
      "packages": {
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "ethers>@ethersproject/hdnode>@ethersproject/strings": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "ethers>@ethersproject/units>@ethersproject/constants": true
      }
    },
    "ethers>@ethersproject/json-wallets": {
      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/json-wallets>aes-js": true,
        "ethers>@ethersproject/json-wallets>scrypt-js": true,
        "ethers>@ethersproject/pbkdf2": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/random": true,
@ -5836,15 +5928,15 @@
    },
    "ethers>@ethersproject/pbkdf2": {
      "packages": {
-        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true
      }
    },
    "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": {
      "packages": {
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
      }
    },
    "ethers>@ethersproject/properties": {
@ -6128,11 +6220,11 @@
    },
    "ethers>@ethersproject/solidity": {
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
        "ethers>@ethersproject/pbkdf2>@ethersproject/sha2": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true
      }
    },
@ -6255,44 +6347,24 @@
    },
    "ethers>@ethersproject/units": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true
-      }
-    },
-    "ethers>@ethersproject/units>@ethersproject/bignumber": {
-      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber>bn.js": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
-      }
-    },
-    "ethers>@ethersproject/units>@ethersproject/bignumber>bn.js": {
-      "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "ethers>@ethersproject/units>@ethersproject/constants": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true
-      }
-    },
-    "ethers>@ethersproject/units>@ethersproject/logger": {
-      "globals": {
-        "console": true
+        "@ethersproject/bignumber": true
      }
    },
    "ethers>@ethersproject/wallet": {
      "packages": {
        "@eth-optimism/contracts>@ethersproject/abstract-provider": true,
        "@eth-optimism/contracts>@ethersproject/abstract-signer": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode": true,
        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
@ -6303,78 +6375,58 @@
    },
    "ethers>@ethersproject/wallet>@ethersproject/address": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/address>@ethersproject/rlp": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/rlp": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true
      }
    },
-    "ethers>@ethersproject/wallet>@ethersproject/address>@ethersproject/rlp": {
-      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
-      }
-    },
-    "ethers>@ethersproject/wallet>@ethersproject/bytes": {
-      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true
-      }
-    },
    "ethers>@ethersproject/wallet>@ethersproject/hash": {
      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/base64": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
-        "ethers>@ethersproject/wallet>@ethersproject/hash>@ethersproject/base64": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
-    "ethers>@ethersproject/wallet>@ethersproject/hash>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
-      }
-    },
    "ethers>@ethersproject/wallet>@ethersproject/keccak256": {
      "packages": {
-        "ethers>@ethersproject/keccak256>js-sha3": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256>js-sha3": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/properties": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/random": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/signing-key": {
      "packages": {
        "3box>ethers>elliptic": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
    },
    "ethers>@ethersproject/wallet>@ethersproject/transactions": {
      "packages": {
-        "ethers>@ethersproject/units>@ethersproject/bignumber": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
+        "@metamask/smart-transactions-controller>@ethersproject/providers>@ethersproject/rlp": true,
        "ethers>@ethersproject/units>@ethersproject/constants": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
        "ethers>@ethersproject/wallet>@ethersproject/address": true,
-        "ethers>@ethersproject/wallet>@ethersproject/address>@ethersproject/rlp": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/keccak256": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true,
        "ethers>@ethersproject/wallet>@ethersproject/signing-key": true
@ -6447,9 +6499,9 @@
    },
    "ethers>@ethersproject/wordlists": {
      "packages": {
+        "@ethersproject/bignumber>@ethersproject/bytes": true,
+        "@ethersproject/bignumber>@ethersproject/logger": true,
        "ethers>@ethersproject/hdnode>@ethersproject/strings": true,
-        "ethers>@ethersproject/units>@ethersproject/logger": true,
-        "ethers>@ethersproject/wallet>@ethersproject/bytes": true,
        "ethers>@ethersproject/wallet>@ethersproject/hash": true,
        "ethers>@ethersproject/wallet>@ethersproject/properties": true
      }
--- a/package.json
+++ b/package.json
@ -135,9 +135,9 @@
    "@metamask/providers": "^9.0.0",
    "@metamask/rpc-methods": "^0.21.0",
    "@metamask/slip44": "^2.1.0",
-    "@metamask/smart-transactions-controller": "^2.3.1",
    "@metamask/snap-controllers": "^0.21.0",
    "@metamask/snap-utils": "^0.21.0",
+    "@metamask/smart-transactions-controller": "^2.3.2",
    "@ngraveio/bc-ur": "^1.1.6",
    "@popperjs/core": "^2.4.0",
    "@reduxjs/toolkit": "^1.6.2",
@ -245,6 +245,7 @@
    "@babel/preset-react": "^7.0.0",
    "@babel/preset-typescript": "^7.16.7",
    "@babel/register": "^7.5.5",
+    "@ethersproject/bignumber": "^5.7.0",
    "@lavamoat/allow-scripts": "^2.0.3",
    "@lavamoat/lavapack": "^3.1.0",
    "@metamask/auto-changelog": "^2.1.0",
--- a/ui/hooks/useTokenData.test.js
+++ b/ui/hooks/useTokenData.test.js
@ -1,5 +1,5 @@
 /* eslint-disable jest/no-conditional-expect */
-import { ethers } from 'ethers';
+import { BigNumber } from '@ethersproject/bignumber';
 import { renderHook } from '@testing-library/react-hooks';
 import { TRANSACTION_TYPES } from '../../shared/constants/transaction';
 import { useTokenData } from './useTokenData';
@ -11,7 +11,7 @@ const tests = [
      name: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
      args: [
        '0xffe5bc4e8f1f969934d773fa67da095d2e491a97',
-        ethers.BigNumber.from(15000),
+        BigNumber.from(15000),
      ],
    },
  },
@ -21,7 +21,7 @@ const tests = [
      name: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
      args: [
        '0xffe5bc4e8f1f969934d773fa67da095d2e491a97',
-        ethers.BigNumber.from(25000),
+        BigNumber.from(25000),
      ],
    },
  },
@ -31,7 +31,7 @@ const tests = [
      name: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
      args: [
        '0xffe5bc4e8f1f969934d773fa67da095d2e491a97',
-        ethers.BigNumber.from(10000),
+        BigNumber.from(10000),
      ],
    },
  },
--- a/yarn.lock
+++ b/yarn.lock
@ -1808,9 +1808,9 @@
    "@ethersproject/logger" "^5.6.0"

 "@ethersproject/networks@^5.6.0", "@ethersproject/networks@^5.7.0":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6"
-  integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.0.tgz#df72a392f1a63a57f87210515695a31a245845ad"
+  integrity sha512-MG6oHSQHd4ebvJrleEQQ4HhVu8Ichr0RDYEfHzsVAVjHNM+w36x9wp9r+hf1JstMXtseXDtkiVoARAG6M959AA==
  dependencies:
    "@ethersproject/logger" "^5.7.0"

@ -1862,9 +1862,9 @@
    ws "7.4.6"

 "@ethersproject/providers@^5.4.5", "@ethersproject/providers@^5.7.0":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.1.tgz#b0799b616d5579cd1067a8ebf1fc1ec74c1e122c"
-  integrity sha512-vZveG/DLyo+wk4Ga1yx6jSEHrLPgmTt+dFv0dv8URpVCRf0jVhalps1jq/emN/oXnMRsC7cQgAF32DcXLL7BPQ==
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.0.tgz#a885cfc7650a64385e7b03ac86fe9c2d4a9c2c63"
+  integrity sha512-+TTrrINMzZ0aXtlwO/95uhAggKm4USLm1PbeCBR/3XZ7+Oey+3pMyddzZEyRhizHpy1HXV0FRWRMI1O3EGYibA==
  dependencies:
    "@ethersproject/abstract-provider" "^5.7.0"
    "@ethersproject/abstract-signer" "^5.7.0"
@ -2063,9 +2063,9 @@
    "@ethersproject/strings" "^5.6.0"

 "@ethersproject/web@^5.6.0", "@ethersproject/web@^5.7.0":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.1.tgz#de1f285b373149bee5928f4eb7bcb87ee5fbb4ae"
-  integrity sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.0.tgz#40850c05260edad8b54827923bbad23d96aac0bc"
+  integrity sha512-ApHcbbj+muRASVDSCl/tgxaH2LBkRMEYfLOLVa0COipx0+nlu0QKet7U2lEg0vdkh8XRSLf2nd1f1Uk9SrVSGA==
  dependencies:
    "@ethersproject/base64" "^5.7.0"
    "@ethersproject/bytes" "^5.7.0"
@ -3476,15 +3476,17 @@
  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.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@metamask/smart-transactions-controller/-/smart-transactions-controller-2.3.1.tgz#01f3d5e7b1a59782749ee17f19a400434dbbd2c9"
-  integrity sha512-nfMNtXxs/1JEfPomc7P4NuuUCWW2sRxzmKEJZPW1TdSk/Ey1jcf2az42uhYN6brzpt+YEXJFWfS3q6syi1PRmQ==
+"@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==
  dependencies:
+    "@ethersproject/bignumber" "^5.7.0"
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/providers" "^5.7.0"
    "@metamask/controllers" "^30.0.0"
    "@types/lodash" "^4.14.176"
    bignumber.js "^9.0.1"
-    ethers "^5.5.1"
    fast-json-patch "^3.1.0"
    isomorphic-fetch "^3.0.0"
    lodash "^4.17.21"
@ -12464,7 +12466,7 @@ ethers@^4.0.20, ethers@^4.0.28:
    uuid "2.0.1"
    xmlhttprequest "1.8.0"

-ethers@^5.4.0, ethers@^5.4.1, ethers@^5.4.5, ethers@^5.5.1, ethers@^5.6.4:
+ethers@^5.4.0, ethers@^5.4.1, 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==