From 4c5391d2a29753db7fd25598120d49d77a5e811c Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Wed, 21 Feb 2024 23:29:45 +0100
Subject: [PATCH 1/5] test: disable ppom e2e tests temporarily (#23103)

Disable ppom tests until cdn responses are mocked.
This unblocks ci.
---
 .../e2e/tests/ppom-blockaid-alert-erc20-approval.spec.js | 3 ++-
 .../e2e/tests/ppom-blockaid-alert-erc20-transfer.spec.js | 3 ++-
 .../tests/ppom-blockaid-alert-networks-support.spec.js   | 3 ++-
 test/e2e/tests/ppom-blockaid-alert-simple-send.spec.js   | 9 ++++++---
 .../ppom-blockaid-alert-trade-order-farming.spec.js      | 3 ++-
 .../ppom-blockaid-setApprovalForAll-farming.spec.js      | 3 ++-
 test/e2e/tests/ppom-blockaid-toggle-metrics.spec.js      | 3 ++-
 test/e2e/tests/ppom-toggle-settings.spec.js              | 6 ++++--
 8 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/test/e2e/tests/ppom-blockaid-alert-erc20-approval.spec.js b/test/e2e/tests/ppom-blockaid-alert-erc20-approval.spec.js
index b3391121bb5b..5346a1fd67ad 100644
--- a/test/e2e/tests/ppom-blockaid-alert-erc20-approval.spec.js
+++ b/test/e2e/tests/ppom-blockaid-alert-erc20-approval.spec.js
@@ -210,7 +210,8 @@ async function mockInfura(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Malicious ERC20 Approval @no-mmi', function () {
-  it('should show banner alert', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert', async function () {
     await withFixtures(
       {
         dapp: true,
diff --git a/test/e2e/tests/ppom-blockaid-alert-erc20-transfer.spec.js b/test/e2e/tests/ppom-blockaid-alert-erc20-transfer.spec.js
index 4891e510b053..2cedb98ebd51 100644
--- a/test/e2e/tests/ppom-blockaid-alert-erc20-transfer.spec.js
+++ b/test/e2e/tests/ppom-blockaid-alert-erc20-transfer.spec.js
@@ -161,7 +161,8 @@ async function mockInfura(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Malicious ERC20 Transfer @no-mmi', function () {
-  it('should show banner alert', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert', async function () {
     await withFixtures(
       {
         dapp: true,
diff --git a/test/e2e/tests/ppom-blockaid-alert-networks-support.spec.js b/test/e2e/tests/ppom-blockaid-alert-networks-support.spec.js
index d5adeba44fb7..f3ae72240a3a 100644
--- a/test/e2e/tests/ppom-blockaid-alert-networks-support.spec.js
+++ b/test/e2e/tests/ppom-blockaid-alert-networks-support.spec.js
@@ -47,7 +47,8 @@ async function mockInfuraWithMaliciousResponses(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Multiple Networks Support @no-mmi', function () {
-  it('should show banner alert after switchinig to another supported network', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert after switchinig to another supported network', async function () {
     await withFixtures(
       {
         dapp: true,
diff --git a/test/e2e/tests/ppom-blockaid-alert-simple-send.spec.js b/test/e2e/tests/ppom-blockaid-alert-simple-send.spec.js
index cb4dce5ba29c..1dbebfea3c66 100644
--- a/test/e2e/tests/ppom-blockaid-alert-simple-send.spec.js
+++ b/test/e2e/tests/ppom-blockaid-alert-simple-send.spec.js
@@ -126,7 +126,8 @@ async function mockInfuraWithFailedResponses(mockServer) {
  * @see {@link https://wobbly-nutmeg-8a5.notion.site/MM-E2E-Testing-1e51b617f79240a49cd3271565c6e12d}
  */
 describe('Simple Send Security Alert - Blockaid @no-mmi', function () {
-  it('should not show security alerts for benign requests', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should not show security alerts for benign requests', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -158,7 +159,8 @@ describe('Simple Send Security Alert - Blockaid @no-mmi', function () {
    * 'malicious_domain'. Some other tests are found in other files:
    * e.g. test/e2e/flask/ppom-blockaid-alert-<name>.spec.js
    */
-  it('should show security alerts for malicious requests', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show security alerts for malicious requests', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -201,7 +203,8 @@ describe('Simple Send Security Alert - Blockaid @no-mmi', function () {
     );
   });
 
-  it('should show "Request may not be safe" if the PPOM request fails to check transaction', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show "Request may not be safe" if the PPOM request fails to check transaction', async function () {
     await withFixtures(
       {
         dapp: true,
diff --git a/test/e2e/tests/ppom-blockaid-alert-trade-order-farming.spec.js b/test/e2e/tests/ppom-blockaid-alert-trade-order-farming.spec.js
index 39a6093741d6..26d67a999a56 100644
--- a/test/e2e/tests/ppom-blockaid-alert-trade-order-farming.spec.js
+++ b/test/e2e/tests/ppom-blockaid-alert-trade-order-farming.spec.js
@@ -90,7 +90,8 @@ async function mockInfura(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Set Trade farming order @no-mmi', function () {
-  it('should show banner alert', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert', async function () {
     await withFixtures(
       {
         dapp: true,
diff --git a/test/e2e/tests/ppom-blockaid-setApprovalForAll-farming.spec.js b/test/e2e/tests/ppom-blockaid-setApprovalForAll-farming.spec.js
index 97a8653ab3c7..d794c877bf81 100644
--- a/test/e2e/tests/ppom-blockaid-setApprovalForAll-farming.spec.js
+++ b/test/e2e/tests/ppom-blockaid-setApprovalForAll-farming.spec.js
@@ -248,7 +248,8 @@ async function mockInfura(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Set Approval to All @no-mmi', function () {
-  it('should show banner alert', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert', async function () {
     await withFixtures(
       {
         dapp: true,
diff --git a/test/e2e/tests/ppom-blockaid-toggle-metrics.spec.js b/test/e2e/tests/ppom-blockaid-toggle-metrics.spec.js
index ec763422c112..fd4d3b6c9f05 100644
--- a/test/e2e/tests/ppom-blockaid-toggle-metrics.spec.js
+++ b/test/e2e/tests/ppom-blockaid-toggle-metrics.spec.js
@@ -52,7 +52,8 @@ async function mockServerCalls(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Metrics @no-mmi', function () {
-  it('Successfully track button toggle on/off', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('Successfully track button toggle on/off', async function () {
     await withFixtures(
       {
         dapp: true,
diff --git a/test/e2e/tests/ppom-toggle-settings.spec.js b/test/e2e/tests/ppom-toggle-settings.spec.js
index a355abed98a7..195d55654b7f 100644
--- a/test/e2e/tests/ppom-toggle-settings.spec.js
+++ b/test/e2e/tests/ppom-toggle-settings.spec.js
@@ -9,7 +9,8 @@ const {
 const FixtureBuilder = require('../fixture-builder');
 
 describe('PPOM Settings @no-mmi', function () {
-  it('should not show the PPOM warning when toggle is off', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should not show the PPOM warning when toggle is off', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -47,7 +48,8 @@ describe('PPOM Settings @no-mmi', function () {
     );
   });
 
-  it('should show the PPOM warning when the toggle is on', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show the PPOM warning when the toggle is on', async function () {
     await withFixtures(
       {
         dapp: true,

From 4d2c1ffca232cc7206555627074d4d7c64600010 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Wed, 21 Feb 2024 14:55:45 -0800
Subject: [PATCH 2/5] chore: disabling static color hex stylelint rule for
 specific files (#23098)

## **Description**

This PR addresses the need to refine our linting process by excluding
specific files from the 'color-no-hex' rule, as outlined in [Issue
#23097](https://github.com/MetaMask/metamask-extension/issues/23097).
The motivation behind this change is to prevent lint warning blindness
among developers by focusing on meaningful lint warnings that are
relevant to the main application. By updating our lint configuration to
ignore certain files where static hex color values are permissible, we
aim to maintain the effectiveness of our linting process while
acknowledging the unique requirements of standalone or external parts of
our project.

### **Improvement/Solution**
- Updated the lint configuration to exclude specific files from the
'color-no-hex' rule.
- Identified files where static hex color values are permissible due to
their standalone nature or external usage.

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/23097

---------

Co-authored-by: Howard Braham <howrad@gmail.com>
---
 .../ts-migration-dashboard/app/styles/custom-elements.scss   | 4 ++++
 development/ts-migration-dashboard/app/styles/tippy.scss     | 4 ++++
 ui/css/design-system/pending-colors.scss                     | 3 +++
 ui/css/utilities/colors.scss                                 | 5 +++++
 4 files changed, 16 insertions(+)

diff --git a/development/ts-migration-dashboard/app/styles/custom-elements.scss b/development/ts-migration-dashboard/app/styles/custom-elements.scss
index e53562024291..8eec70c9c810 100644
--- a/development/ts-migration-dashboard/app/styles/custom-elements.scss
+++ b/development/ts-migration-dashboard/app/styles/custom-elements.scss
@@ -1,3 +1,7 @@
+/*
+Disabling Stylelint's hex color rule here because the TypeScript migration dashboard, being external to the main app, doesn't use design tokens.
+*/
+/* stylelint-disable color-no-hex */
 :root {
   --blue-gray-350: hsl(209deg 13.7% 62.4%);
   --blue-gray-100: hsl(209.8deg 16.5% 89%);
diff --git a/development/ts-migration-dashboard/app/styles/tippy.scss b/development/ts-migration-dashboard/app/styles/tippy.scss
index 0ce28c5ea40d..40902536811e 100644
--- a/development/ts-migration-dashboard/app/styles/tippy.scss
+++ b/development/ts-migration-dashboard/app/styles/tippy.scss
@@ -1,3 +1,7 @@
+/*
+Disabling Stylelint's hex color rule here because the TypeScript migration dashboard, being external to the main app, doesn't use design tokens.
+*/
+/* stylelint-disable color-no-hex */
 .tippy-touch {
   cursor: pointer !important;
 }
diff --git a/ui/css/design-system/pending-colors.scss b/ui/css/design-system/pending-colors.scss
index cbbe52d6db52..322823d1dfb1 100644
--- a/ui/css/design-system/pending-colors.scss
+++ b/ui/css/design-system/pending-colors.scss
@@ -1,6 +1,9 @@
 /**
   These colors are pending to be approved for the design system's design-token package
+  Disabling Stylelint's hex color rule so this file is ignored.
+  Before adding a color here make sure that there isn't a design token available.
 **/
+/* stylelint-disable color-no-hex */
 
 /**
  * Dark Theme Colors
diff --git a/ui/css/utilities/colors.scss b/ui/css/utilities/colors.scss
index a127746e81ca..d625b155e640 100644
--- a/ui/css/utilities/colors.scss
+++ b/ui/css/utilities/colors.scss
@@ -1,3 +1,8 @@
+/*
+Disabling Stylelint's hex color rule so this file is ignored.
+Before adding a color here make sure that there isn't a design token available.
+*/
+/* stylelint-disable color-no-hex */
 :root {
   // Accents
   // Everything below this line is part of the new color system

From b0660c04de84ef7aa02a4c2015a134b49226fe68 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Wed, 21 Feb 2024 18:50:35 -0800
Subject: [PATCH 3/5] chore: upgrading design tokens package that includes
 dynamic theming (#23101)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR upgrades the `@metamask/design-tokens` package to version 2.1.1,
which introduces an enhancement for dynamic theming support. With this
update, components can now be wrapped in parent containers tagged with
`data-theme="light"` or `data-theme="dark"` attributes, allowing for
seamless theme changes that respect the specified theme at any level of
nesting. This improvement addresses the need for more flexible theming
options within our application, ensuring that theme consistency is
maintained across different UI components regardless of their
hierarchical structure.

## **Related issues**

Related: https://github.com/MetaMask/design-tokens/issues/626

## **Manual testing steps**

1. Pull this branch
2. Implement a component structure similar to the provided template,
with nested `Box` components having different `data-theme` attributes.
3. Verify that each `Box` component correctly displays its theme
according to the `data-theme` attribute, demonstrating the dynamic
theming capability.

Provided template in
`ui/components/component-library/text/text.stories.tsx`

```
const Template: StoryFn<typeof Text> = (args) => (
  <Box data-theme="dark" padding={4} backgroundColor={BackgroundColor.backgroundDefault}>
    <Text>dark theme</Text>
    <Box data-theme="light" padding={4} backgroundColor={BackgroundColor.backgroundDefault}>
      <Text>light theme</Text>
      <Box data-theme="dark" padding={4} backgroundColor={BackgroundColor.backgroundDefault}>
        <Text>dark theme</Text>
      </Box>
    </Box>
  </Box>
);
```

## **Screenshots/Recordings**

### **Before**

https://github.com/MetaMask/metamask-extension/assets/8112138/8f38b071-6649-40d4-b8a2-8d4be8452dd7

### **After**

https://github.com/MetaMask/metamask-extension/assets/8112138/cd9282fb-c731-49dd-a331-580d9b894d51

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained what problem this PR is solving and how it
is solved.
- [x] I've linked related issues.
- [x] I've included manual testing steps.
- [x] I've included screenshots/recordings if applicable.
- [x] I’ve included tests if applicable.
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable.
- [x] I’ve applied the right labels on the PR.
- [x] I’ve properly set the pull request status to "ready for review".

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g., pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 667e72817eb8..78ee7042f7a1 100644
--- a/package.json
+++ b/package.json
@@ -256,7 +256,7 @@
     "@metamask/browser-passworder": "^4.3.0",
     "@metamask/contract-metadata": "^2.3.1",
     "@metamask/controller-utils": "^8.0.1",
-    "@metamask/design-tokens": "^2.0.3",
+    "@metamask/design-tokens": "^2.1.1",
     "@metamask/desktop": "^0.3.0",
     "@metamask/eth-json-rpc-middleware": "^12.1.0",
     "@metamask/eth-keyring-controller": "^15.1.0",
diff --git a/yarn.lock b/yarn.lock
index 0334714ff621..7ba0b40eb13d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4008,10 +4008,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/design-tokens@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "@metamask/design-tokens@npm:2.0.3"
-  checksum: 83dc20a911981050719861319837c5945d48668d21efe0e6b508f485f914fb2793415df8b32ec8e4ebde29f73cb4d489460b4b477e0fd4eed679abc5095bed04
+"@metamask/design-tokens@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "@metamask/design-tokens@npm:2.1.1"
+  checksum: 0f219d7568fbdab4278994dc1e10a77aaab8f6edabbecf0e9cfa3e3593d457aea7c65d5b9ec9973d123246f335d96f4145b5109d7760148052269e2e4c7568a0
   languageName: node
   linkType: hard
 
@@ -24390,7 +24390,7 @@ __metadata:
     "@metamask/build-utils": "npm:^1.0.0"
     "@metamask/contract-metadata": "npm:^2.3.1"
     "@metamask/controller-utils": "npm:^8.0.1"
-    "@metamask/design-tokens": "npm:^2.0.3"
+    "@metamask/design-tokens": "npm:^2.1.1"
     "@metamask/desktop": "npm:^0.3.0"
     "@metamask/eslint-config": "npm:^9.0.0"
     "@metamask/eslint-config-jest": "npm:^9.0.0"

From b46ff032d74c652bb23f5520555db2e49f1878e7 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Wed, 21 Feb 2024 19:09:19 -0800
Subject: [PATCH 4/5] fix: removing opacity from deprecated popover overlay
 (#23102)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR updates the deprecated popover(modal) overlay by removing the
CSS opacity property and relying solely on the CSS design token variable
to handle the overlay opacity. This change aims to enhance the visual
hierarchy of modals across both light and dark modes by making the
overlay darker, thus improving focus on the modal content.
- Removed the CSS opacity property from the modal overlay styling.
- Adjusted the modal overlay to utilize the opacity defined in the CSS
design token variable, ensuring consistency and improved visual
hierarchy.

## **Related issues**

Fixes: N/A
https://consensys.slack.com/archives/C0354T27M5M/p1708550530267829?thread_ts=1708546286.489159&cid=C0354T27M5M

## **Manual testing steps**

1. Open the application and trigger a modal to appear.
2. Observe the modal overlay in both light and dark modes.
3. Verify that the overlay is appropriately darker, enhancing the focus
on the modal content.

## **Screenshots/Recordings**

### **Before**

<img width="1512" alt="Screenshot 2024-02-22 at 10 00 00 AM"
src="https://github.com/MetaMask/metamask-extension/assets/8112138/9ceeb5a3-86a8-4dc2-9709-f8f1ee010115">

<img width="1512" alt="Screenshot 2024-02-22 at 10 00 36 AM"
src="https://github.com/MetaMask/metamask-extension/assets/8112138/21361874-7a89-4fca-90cb-7439ab2d95b0">

### **After**

<img width="1512" alt="Screenshot 2024-02-22 at 9 59 19 AM"
src="https://github.com/MetaMask/metamask-extension/assets/8112138/ef925b52-8326-41ad-abf4-d7da7f7e92b6">

<img width="1512" alt="Screenshot 2024-02-22 at 10 01 06 AM"
src="https://github.com/MetaMask/metamask-extension/assets/8112138/a943fcfc-2b1b-41cd-9701-8677c98fb0a2">

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained what problem this PR is solving and how it
is solved.
- [x] I've linked related issues.
- [x] I've included manual testing steps.
- [x] I've included screenshots/recordings if applicable.
- [x] I’ve included tests if applicable.
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable.
- [x] I’ve applied the right labels on the PR.
- [x] I’ve properly set the pull request status to "ready for review".

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g., pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/components/ui/popover/index.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/components/ui/popover/index.scss b/ui/components/ui/popover/index.scss
index 4097588129ff..062cb042f96a 100644
--- a/ui/components/ui/popover/index.scss
+++ b/ui/components/ui/popover/index.scss
@@ -31,8 +31,7 @@
   &-bg {
     width: 100%;
     height: 100%;
-    background: var(--color-overlay-alternative);
-    opacity: 0.2;
+    background: var(--color-overlay-default);
   }
 
   &-content {

From 3687b18feb5bc0cceecdb559fef5334d269b51ac Mon Sep 17 00:00:00 2001
From: legobeat <109787230+legobeat@users.noreply.github.com>
Date: Thu, 22 Feb 2024 12:28:37 +0900
Subject: [PATCH 5/5] deps: update ethjs packages to remove babel-runtime
 dependency (#22859)

---
 lavamoat/browserify/beta/policy.json    |  70 ++++----
 lavamoat/browserify/desktop/policy.json |  70 ++++----
 lavamoat/browserify/flask/policy.json   |  70 ++++----
 lavamoat/browserify/main/policy.json    |  70 ++++----
 lavamoat/browserify/mmi/policy.json     |  70 ++++----
 package.json                            |  14 +-
 yarn.lock                               | 213 ++++++++++++++++++++----
 7 files changed, 325 insertions(+), 252 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 36c8cc479675..0db3c8c0f642 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -759,7 +759,7 @@
     },
     "@metamask/address-book-controller>@metamask/controller-utils>ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "bn.js": true
       }
     },
@@ -1206,16 +1206,16 @@
         "@metamask/ethjs>@metamask/ethjs-provider-http": true,
         "@metamask/ethjs>@metamask/ethjs-unit": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "@metamask/ethjs>ethjs-abi": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
     "@metamask/ethjs-contract": {
       "packages": {
-        "@metamask/ethjs-query>babel-runtime": true,
+        "@babel/runtime": true,
         "@metamask/ethjs>@metamask/ethjs-filter": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
         "@metamask/ethjs>ethjs-abi": true,
@@ -1237,8 +1237,8 @@
       "packages": {
         "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>number-to-bn": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true
       }
     },
     "@metamask/ethjs-query>@metamask/ethjs-rpc": {
@@ -1246,27 +1246,6 @@
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs-query>babel-runtime": {
-      "packages": {
-        "@metamask/ethjs-query>babel-runtime>core-js": true,
-        "@metamask/ethjs-query>babel-runtime>regenerator-runtime": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>core-js": {
-      "globals": {
-        "PromiseRejectionEvent": true,
-        "__e": "write",
-        "__g": "write",
-        "document.createTextNode": true,
-        "postMessage": true,
-        "setTimeout": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
-      }
-    },
     "@metamask/ethjs>@metamask/ethjs-filter": {
       "globals": {
         "clearInterval": true,
@@ -1285,25 +1264,42 @@
     },
     "@metamask/ethjs>@metamask/ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "bn.js": true
       }
     },
     "@metamask/ethjs>@metamask/ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
+      }
+    },
+    "@metamask/ethjs>@metamask/number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>ethjs-abi": {
       "packages": {
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>ethjs-abi>number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>js-sha3": {
       "globals": {
         "define": true
@@ -1312,17 +1308,6 @@
         "browserify>process": true
       }
     },
-    "@metamask/ethjs>number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>number-to-bn>strip-hex-prefix": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
-      }
-    },
     "@metamask/gas-fee-controller": {
       "globals": {
         "clearInterval": true,
@@ -3169,7 +3154,8 @@
     },
     "eth-method-registry": {
       "packages": {
-        "@metamask/ethjs": true
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true
       }
     },
     "eth-rpc-errors": {
@@ -3210,7 +3196,7 @@
     "eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index d792a0114e82..2e6e627662e6 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -759,7 +759,7 @@
     },
     "@metamask/address-book-controller>@metamask/controller-utils>ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "bn.js": true
       }
     },
@@ -1283,16 +1283,16 @@
         "@metamask/ethjs>@metamask/ethjs-provider-http": true,
         "@metamask/ethjs>@metamask/ethjs-unit": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "@metamask/ethjs>ethjs-abi": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
     "@metamask/ethjs-contract": {
       "packages": {
-        "@metamask/ethjs-query>babel-runtime": true,
+        "@babel/runtime": true,
         "@metamask/ethjs>@metamask/ethjs-filter": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
         "@metamask/ethjs>ethjs-abi": true,
@@ -1314,8 +1314,8 @@
       "packages": {
         "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>number-to-bn": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true
       }
     },
     "@metamask/ethjs-query>@metamask/ethjs-rpc": {
@@ -1323,27 +1323,6 @@
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs-query>babel-runtime": {
-      "packages": {
-        "@metamask/ethjs-query>babel-runtime>core-js": true,
-        "@metamask/ethjs-query>babel-runtime>regenerator-runtime": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>core-js": {
-      "globals": {
-        "PromiseRejectionEvent": true,
-        "__e": "write",
-        "__g": "write",
-        "document.createTextNode": true,
-        "postMessage": true,
-        "setTimeout": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
-      }
-    },
     "@metamask/ethjs>@metamask/ethjs-filter": {
       "globals": {
         "clearInterval": true,
@@ -1362,25 +1341,42 @@
     },
     "@metamask/ethjs>@metamask/ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "bn.js": true
       }
     },
     "@metamask/ethjs>@metamask/ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
+      }
+    },
+    "@metamask/ethjs>@metamask/number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>ethjs-abi": {
       "packages": {
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>ethjs-abi>number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>js-sha3": {
       "globals": {
         "define": true
@@ -1389,17 +1385,6 @@
         "browserify>process": true
       }
     },
-    "@metamask/ethjs>number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>number-to-bn>strip-hex-prefix": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
-      }
-    },
     "@metamask/gas-fee-controller": {
       "globals": {
         "clearInterval": true,
@@ -3426,7 +3411,8 @@
     },
     "eth-method-registry": {
       "packages": {
-        "@metamask/ethjs": true
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true
       }
     },
     "eth-rpc-errors": {
@@ -3467,7 +3453,7 @@
     "eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 9250120ac60f..d66bc97c4c50 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -759,7 +759,7 @@
     },
     "@metamask/address-book-controller>@metamask/controller-utils>ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "bn.js": true
       }
     },
@@ -1283,16 +1283,16 @@
         "@metamask/ethjs>@metamask/ethjs-provider-http": true,
         "@metamask/ethjs>@metamask/ethjs-unit": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "@metamask/ethjs>ethjs-abi": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
     "@metamask/ethjs-contract": {
       "packages": {
-        "@metamask/ethjs-query>babel-runtime": true,
+        "@babel/runtime": true,
         "@metamask/ethjs>@metamask/ethjs-filter": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
         "@metamask/ethjs>ethjs-abi": true,
@@ -1314,8 +1314,8 @@
       "packages": {
         "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>number-to-bn": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true
       }
     },
     "@metamask/ethjs-query>@metamask/ethjs-rpc": {
@@ -1323,27 +1323,6 @@
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs-query>babel-runtime": {
-      "packages": {
-        "@metamask/ethjs-query>babel-runtime>core-js": true,
-        "@metamask/ethjs-query>babel-runtime>regenerator-runtime": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>core-js": {
-      "globals": {
-        "PromiseRejectionEvent": true,
-        "__e": "write",
-        "__g": "write",
-        "document.createTextNode": true,
-        "postMessage": true,
-        "setTimeout": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
-      }
-    },
     "@metamask/ethjs>@metamask/ethjs-filter": {
       "globals": {
         "clearInterval": true,
@@ -1362,25 +1341,42 @@
     },
     "@metamask/ethjs>@metamask/ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "bn.js": true
       }
     },
     "@metamask/ethjs>@metamask/ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
+      }
+    },
+    "@metamask/ethjs>@metamask/number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>ethjs-abi": {
       "packages": {
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>ethjs-abi>number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>js-sha3": {
       "globals": {
         "define": true
@@ -1389,17 +1385,6 @@
         "browserify>process": true
       }
     },
-    "@metamask/ethjs>number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>number-to-bn>strip-hex-prefix": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
-      }
-    },
     "@metamask/gas-fee-controller": {
       "globals": {
         "clearInterval": true,
@@ -3462,7 +3447,8 @@
     },
     "eth-method-registry": {
       "packages": {
-        "@metamask/ethjs": true
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true
       }
     },
     "eth-rpc-errors": {
@@ -3503,7 +3489,7 @@
     "eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 6987a8dea4ff..1c2e2cc855c3 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -759,7 +759,7 @@
     },
     "@metamask/address-book-controller>@metamask/controller-utils>ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "bn.js": true
       }
     },
@@ -1206,16 +1206,16 @@
         "@metamask/ethjs>@metamask/ethjs-provider-http": true,
         "@metamask/ethjs>@metamask/ethjs-unit": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "@metamask/ethjs>ethjs-abi": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
     "@metamask/ethjs-contract": {
       "packages": {
-        "@metamask/ethjs-query>babel-runtime": true,
+        "@babel/runtime": true,
         "@metamask/ethjs>@metamask/ethjs-filter": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
         "@metamask/ethjs>ethjs-abi": true,
@@ -1237,8 +1237,8 @@
       "packages": {
         "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>number-to-bn": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true
       }
     },
     "@metamask/ethjs-query>@metamask/ethjs-rpc": {
@@ -1246,27 +1246,6 @@
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs-query>babel-runtime": {
-      "packages": {
-        "@metamask/ethjs-query>babel-runtime>core-js": true,
-        "@metamask/ethjs-query>babel-runtime>regenerator-runtime": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>core-js": {
-      "globals": {
-        "PromiseRejectionEvent": true,
-        "__e": "write",
-        "__g": "write",
-        "document.createTextNode": true,
-        "postMessage": true,
-        "setTimeout": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
-      }
-    },
     "@metamask/ethjs>@metamask/ethjs-filter": {
       "globals": {
         "clearInterval": true,
@@ -1285,25 +1264,42 @@
     },
     "@metamask/ethjs>@metamask/ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "bn.js": true
       }
     },
     "@metamask/ethjs>@metamask/ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
+      }
+    },
+    "@metamask/ethjs>@metamask/number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>ethjs-abi": {
       "packages": {
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>ethjs-abi>number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>js-sha3": {
       "globals": {
         "define": true
@@ -1312,17 +1308,6 @@
         "browserify>process": true
       }
     },
-    "@metamask/ethjs>number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>number-to-bn>strip-hex-prefix": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
-      }
-    },
     "@metamask/gas-fee-controller": {
       "globals": {
         "clearInterval": true,
@@ -3385,7 +3370,8 @@
     },
     "eth-method-registry": {
       "packages": {
-        "@metamask/ethjs": true
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true
       }
     },
     "eth-rpc-errors": {
@@ -3426,7 +3412,7 @@
     "eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index f8dce4372499..d8820cba1ccd 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -891,7 +891,7 @@
     },
     "@metamask/address-book-controller>@metamask/controller-utils>ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "bn.js": true
       }
     },
@@ -1338,16 +1338,16 @@
         "@metamask/ethjs>@metamask/ethjs-provider-http": true,
         "@metamask/ethjs>@metamask/ethjs-unit": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "@metamask/ethjs>ethjs-abi": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
     "@metamask/ethjs-contract": {
       "packages": {
-        "@metamask/ethjs-query>babel-runtime": true,
+        "@babel/runtime": true,
         "@metamask/ethjs>@metamask/ethjs-filter": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
         "@metamask/ethjs>ethjs-abi": true,
@@ -1369,8 +1369,8 @@
       "packages": {
         "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>number-to-bn": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true
       }
     },
     "@metamask/ethjs-query>@metamask/ethjs-rpc": {
@@ -1378,27 +1378,6 @@
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs-query>babel-runtime": {
-      "packages": {
-        "@metamask/ethjs-query>babel-runtime>core-js": true,
-        "@metamask/ethjs-query>babel-runtime>regenerator-runtime": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>core-js": {
-      "globals": {
-        "PromiseRejectionEvent": true,
-        "__e": "write",
-        "__g": "write",
-        "document.createTextNode": true,
-        "postMessage": true,
-        "setTimeout": true
-      }
-    },
-    "@metamask/ethjs-query>babel-runtime>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
-      }
-    },
     "@metamask/ethjs>@metamask/ethjs-filter": {
       "globals": {
         "clearInterval": true,
@@ -1417,25 +1396,42 @@
     },
     "@metamask/ethjs>@metamask/ethjs-unit": {
       "packages": {
-        "@metamask/ethjs>number-to-bn": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
         "bn.js": true
       }
     },
     "@metamask/ethjs>@metamask/ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
+      }
+    },
+    "@metamask/ethjs>@metamask/number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>ethjs-abi": {
       "packages": {
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
         "@metamask/ethjs>js-sha3": true,
-        "@metamask/ethjs>number-to-bn": true,
         "bn.js": true,
         "browserify>buffer": true
       }
     },
+    "@metamask/ethjs>ethjs-abi>number-to-bn": {
+      "packages": {
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
+        "bn.js": true
+      }
+    },
     "@metamask/ethjs>js-sha3": {
       "globals": {
         "define": true
@@ -1444,17 +1440,6 @@
         "browserify>process": true
       }
     },
-    "@metamask/ethjs>number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>number-to-bn>strip-hex-prefix": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
-      }
-    },
     "@metamask/gas-fee-controller": {
       "globals": {
         "clearInterval": true,
@@ -3481,7 +3466,8 @@
     },
     "eth-method-registry": {
       "packages": {
-        "@metamask/ethjs": true
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true
       }
     },
     "eth-rpc-errors": {
@@ -3522,7 +3508,7 @@
     "eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
         "browserify>buffer": true
       }
     },
diff --git a/package.json b/package.json
index 78ee7042f7a1..70c2777c328b 100644
--- a/package.json
+++ b/package.json
@@ -263,12 +263,12 @@
     "@metamask/eth-ledger-bridge-keyring": "^2.0.1",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/eth-snap-keyring": "^2.1.2",
-    "@metamask/eth-token-tracker": "^7.0.1",
+    "@metamask/eth-token-tracker": "^7.0.2",
     "@metamask/eth-trezor-keyring": "^3.0.0",
     "@metamask/etherscan-link": "^3.0.0",
-    "@metamask/ethjs": "^0.5.1",
-    "@metamask/ethjs-contract": "^0.3.4",
-    "@metamask/ethjs-query": "^0.5.3",
+    "@metamask/ethjs": "^0.6.0",
+    "@metamask/ethjs-contract": "^0.4.1",
+    "@metamask/ethjs-query": "^0.7.1",
     "@metamask/gas-fee-controller": "^13.0.0",
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/keyring-api": "^3.0.0",
@@ -298,7 +298,7 @@
     "@metamask/snaps-rpc-methods": "^5.0.0",
     "@metamask/snaps-sdk": "^1.4.0",
     "@metamask/snaps-utils": "^5.2.0",
-    "@metamask/transaction-controller": "^21.1.0",
+    "@metamask/transaction-controller": "^22.0.0",
     "@metamask/user-operation-controller": "^1.0.0",
     "@metamask/utils": "^8.2.1",
     "@ngraveio/bc-ur": "^1.1.6",
@@ -328,7 +328,7 @@
     "eth-ens-namehash": "^2.0.8",
     "eth-json-rpc-filters": "^6.0.0",
     "eth-lattice-keyring": "^0.12.4",
-    "eth-method-registry": "^3.0.0",
+    "eth-method-registry": "^4.0.0",
     "eth-rpc-errors": "^4.0.2",
     "eth-sig-util": "^3.0.0",
     "ethereum-ens-network-map": "^1.0.2",
@@ -659,7 +659,7 @@
       "@trezor/connect-web>@trezor/connect>@trezor/utxo-lib>blake-hash": false,
       "@trezor/connect-web>@trezor/connect>@trezor/utxo-lib>tiny-secp256k1": false,
       "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>usb": false,
-      "@metamask/ethjs-query>babel-runtime>core-js": false,
+      "@metamask/transaction-controller>babel-runtime>core-js": false,
       "@storybook/test-runner>@swc/core": false,
       "@lavamoat/lavadome-react>@lavamoat/preinstall-always-fail": false,
       "tsx>esbuild": false
diff --git a/yarn.lock b/yarn.lock
index 7ba0b40eb13d..df884bf69a5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3986,18 +3986,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/controller-utils@npm:^8.0.1, @metamask/controller-utils@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "@metamask/controller-utils@npm:8.0.2"
+"@metamask/controller-utils@npm:^8.0.1, @metamask/controller-utils@npm:^8.0.2, @metamask/controller-utils@npm:^8.0.3":
+  version: 8.0.3
+  resolution: "@metamask/controller-utils@npm:8.0.3"
   dependencies:
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/ethjs-unit": "npm:^0.2.1"
+    "@metamask/ethjs-unit": "npm:^0.3.0"
     "@metamask/utils": "npm:^8.3.0"
     "@spruceid/siwe-parser": "npm:1.1.3"
     eth-ens-namehash: "npm:^2.0.8"
     ethereumjs-util: "npm:^7.0.10"
     fast-deep-equal: "npm:^3.1.3"
-  checksum: 6a8099b883c51b47494678998fb14291cd0ea9904823b8e3a8cd1621dfc321b59b071e0f264225901177e4826499c32243d5b18388c521bbef351ab87a9d332b
+  checksum: 01c0fbddc3d1fbc56b72b9ea234104e81394efbb4487f60cf0a8316e1a3b79e2d0e6ccf071ea8e4d35a84a34004a4e654f3007e3c4151ac3dbe69dd280969af4
   languageName: node
   linkType: hard
 
@@ -4256,18 +4256,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-token-tracker@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "@metamask/eth-token-tracker@npm:7.0.1"
+"@metamask/eth-token-tracker@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "@metamask/eth-token-tracker@npm:7.0.2"
   dependencies:
-    "@metamask/ethjs-contract": "npm:^0.3.4"
-    "@metamask/ethjs-query": "npm:^0.5.2"
+    "@metamask/ethjs-contract": "npm:^0.4.1"
+    "@metamask/ethjs-query": "npm:^0.7.1"
     "@metamask/safe-event-emitter": "npm:^3.0.0"
-    bn.js: "npm:^4.12.0"
+    bn.js: "npm:^5.2.1"
     deep-equal: "npm:^2.2.0"
     eth-block-tracker: "npm:^8.0.0"
     human-standard-token-abi: "npm:^2.0.0"
-  checksum: 5ce697ba2eae9dc8df942b5cee477cce4e4a1d5dbbe5f7e2268c8880135b45dc7cd86d888595a692c35d257586b950b9474caa62db49357452b22f3744d83b9e
+  peerDependencies:
+    "@babel/runtime": ^7.21.0
+  checksum: eec5b953de3449344107408ea820f95e95a1921da34259a80a6b6ae201fe0d7a4e87abf028b91aa865e904c88c96e7a39407386d89904076e7f1fd632960a86f
   languageName: node
   linkType: hard
 
@@ -4292,7 +4294,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/ethjs-contract@npm:^0.3.3, @metamask/ethjs-contract@npm:^0.3.4":
+"@metamask/ethjs-contract@npm:^0.3.3":
   version: 0.3.4
   resolution: "@metamask/ethjs-contract@npm:0.3.4"
   dependencies:
@@ -4306,6 +4308,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/ethjs-contract@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "@metamask/ethjs-contract@npm:0.4.1"
+  dependencies:
+    "@metamask/ethjs-filter": "npm:^0.3.0"
+    "@metamask/ethjs-util": "npm:^0.3.0"
+    ethjs-abi: "npm:^0.2.0"
+    js-sha3: "npm:^0.9.2"
+    promise-to-callback: "npm:^1.0.0"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: 2187f62336c2afd46b51bda87b96e1537dd7dfe0f621defc3cb5ccb68add482004674f3c11ced95c65b7ecbe845592541f1b268c97b0b42c939d8d5677523097
+  languageName: node
+  linkType: hard
+
 "@metamask/ethjs-filter@npm:^0.2.0":
   version: 0.2.0
   resolution: "@metamask/ethjs-filter@npm:0.2.0"
@@ -4313,6 +4330,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/ethjs-filter@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@metamask/ethjs-filter@npm:0.3.0"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: 1b7565045e638f60d39ae8d8ca020b6e3ac2e4e91f220f343e499b09a7adeb9e4273249e3c3f7366acc2e44bc0b7fe3dd3ac84c66e9a0853352bfb0e116c1d87
+  languageName: node
+  linkType: hard
+
 "@metamask/ethjs-format@npm:^0.2.9":
   version: 0.2.9
   resolution: "@metamask/ethjs-format@npm:0.2.9"
@@ -4327,6 +4353,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/ethjs-format@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@metamask/ethjs-format@npm:0.3.0"
+  dependencies:
+    "@metamask/ethjs-util": "npm:^0.3.0"
+    "@metamask/number-to-bn": "npm:^1.7.1"
+    bn.js: "npm:^5.2.1"
+    ethjs-schema: "npm:0.2.1"
+    is-hex-prefixed: "npm:1.0.0"
+    strip-hex-prefix: "npm:1.0.0"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: 4ae73716e0dd76f7b780ede79b3989d241ee8654b7aa9ec23678529a1916f77ab101552f7aabe56c8e26506a33f34181f40624a68a317e7cd3ae45fb0da2fa73
+  languageName: node
+  linkType: hard
+
 "@metamask/ethjs-provider-http@npm:^0.2.0":
   version: 0.2.0
   resolution: "@metamask/ethjs-provider-http@npm:0.2.0"
@@ -4336,7 +4378,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/ethjs-query@npm:^0.5.2, @metamask/ethjs-query@npm:^0.5.3":
+"@metamask/ethjs-provider-http@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@metamask/ethjs-provider-http@npm:0.3.0"
+  dependencies:
+    xhr2: "npm:0.2.1"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: cece5d20836dadbe31f0c7118f26bd5330465c28f9a39ab8ac4a3fbce25094ae53fe8b737e3d95ae0cf4c7e075c9349127cf8bd066f138278ffc9fd7f9a8a101
+  languageName: node
+  linkType: hard
+
+"@metamask/ethjs-query@npm:^0.5.2":
   version: 0.5.3
   resolution: "@metamask/ethjs-query@npm:0.5.3"
   dependencies:
@@ -4348,6 +4401,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/ethjs-query@npm:^0.7.1":
+  version: 0.7.1
+  resolution: "@metamask/ethjs-query@npm:0.7.1"
+  dependencies:
+    "@metamask/ethjs-format": "npm:^0.3.0"
+    "@metamask/ethjs-rpc": "npm:^0.4.0"
+    promise-to-callback: "npm:^1.0.0"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: a9d54677cf062267f7e781996edfadfc2a5a2f3589266b7f20386e8109b7cecdfdc47c6aba4bb68d0c4cb387cfdb463d6316d506c06138531ca1e81ab201e5dc
+  languageName: node
+  linkType: hard
+
 "@metamask/ethjs-rpc@npm:0.3.0 || ^0.3.2":
   version: 0.3.2
   resolution: "@metamask/ethjs-rpc@npm:0.3.2"
@@ -4357,6 +4423,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/ethjs-rpc@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@metamask/ethjs-rpc@npm:0.4.0"
+  dependencies:
+    promise-to-callback: "npm:^1.0.0"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: e126535ff7599ef584b0084dae846294d505b69141a143543d7580cdce4b297646e796fbd0cecc5a824dce8b5e3b179bb177ceff06fd50ad584e7fce00ab081f
+  languageName: node
+  linkType: hard
+
 "@metamask/ethjs-unit@npm:^0.2.1":
   version: 0.2.1
   resolution: "@metamask/ethjs-unit@npm:0.2.1"
@@ -4367,6 +4444,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/ethjs-unit@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@metamask/ethjs-unit@npm:0.3.0"
+  dependencies:
+    "@metamask/number-to-bn": "npm:^1.7.1"
+    bn.js: "npm:^5.2.1"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: a027d69d66b7eb45666c3bffbedd76dc25dbdd11b177a6b0a7c6735a06d1f123cd4c4c2e301149f6068450a49d41c24c6f93d665552757408fafefbd8720346e
+  languageName: node
+  linkType: hard
+
 "@metamask/ethjs-util@npm:^0.2.0":
   version: 0.2.0
   resolution: "@metamask/ethjs-util@npm:0.2.0"
@@ -4377,7 +4466,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/ethjs@npm:^0.5.0, @metamask/ethjs@npm:^0.5.1":
+"@metamask/ethjs-util@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@metamask/ethjs-util@npm:0.3.0"
+  dependencies:
+    is-hex-prefixed: "npm:1.0.0"
+    strip-hex-prefix: "npm:1.0.0"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: aaecae091dd16362f048cbba27629d67d10530c704facf80f430db546c8ea32fa627cd9560bd3eca1e6ce651d2b7a7df9fdc3677e0ae2814954e3c950cee70da
+  languageName: node
+  linkType: hard
+
+"@metamask/ethjs@npm:^0.5.0":
   version: 0.5.1
   resolution: "@metamask/ethjs@npm:0.5.1"
   dependencies:
@@ -4395,6 +4496,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/ethjs@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@metamask/ethjs@npm:0.6.0"
+  dependencies:
+    "@metamask/ethjs-contract": "npm:^0.4.1"
+    "@metamask/ethjs-filter": "npm:^0.3.0"
+    "@metamask/ethjs-provider-http": "npm:^0.3.0"
+    "@metamask/ethjs-query": "npm:^0.7.1"
+    "@metamask/ethjs-unit": "npm:^0.3.0"
+    "@metamask/ethjs-util": "npm:^0.3.0"
+    "@metamask/number-to-bn": "npm:1.7.1"
+    bn.js: "npm:5.2.1"
+    ethjs-abi: "npm:0.2.1"
+    js-sha3: "npm:^0.9.2"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: 11379cb4a1151fc8f8e939eb38c15ea6cfce042bc10a580a3fbe87b7e0234fb5cdf5b2458a7bbc8db3502032ac42054bf393154cfe967352b129fe8115719a91
+  languageName: node
+  linkType: hard
+
 "@metamask/forwarder@npm:^1.1.0":
   version: 1.1.0
   resolution: "@metamask/forwarder@npm:1.1.0"
@@ -4422,14 +4543,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/gas-fee-controller@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "@metamask/gas-fee-controller@npm:13.0.0"
+"@metamask/gas-fee-controller@npm:^13.0.0, @metamask/gas-fee-controller@npm:^13.0.1":
+  version: 13.0.1
+  resolution: "@metamask/gas-fee-controller@npm:13.0.1"
   dependencies:
     "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/controller-utils": "npm:^8.0.2"
+    "@metamask/controller-utils": "npm:^8.0.3"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/ethjs-unit": "npm:^0.2.1"
+    "@metamask/ethjs-unit": "npm:^0.3.0"
     "@metamask/network-controller": "npm:^17.2.0"
     "@metamask/polling-controller": "npm:^5.0.0"
     "@metamask/utils": "npm:^8.3.0"
@@ -4438,7 +4559,7 @@ __metadata:
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@metamask/network-controller": ^17.2.0
-  checksum: 8edbe4412a1bf80eb3a3c6305c35b45ee38f9262a4dd3b38c30d2e81e0f84d2f8ee261e3548fb25a049f53cf76ccf8238c4aca31ec6cd0c5b46ba9c58a705bc8
+  checksum: c50617702b455f6314ea76f72a130f5bca6142586169f050c26ab1da3d2ea54fac358bc33ed7a01898a9c2927e729edf22b5a716dad84ccad0789e3f5cb199b6
   languageName: node
   linkType: hard
 
@@ -4654,6 +4775,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/number-to-bn@npm:1.7.1, @metamask/number-to-bn@npm:^1.7.1":
+  version: 1.7.1
+  resolution: "@metamask/number-to-bn@npm:1.7.1"
+  dependencies:
+    bn.js: "npm:5.2.1"
+    strip-hex-prefix: "npm:1.0.0"
+  checksum: 0c8fbdf2c9df0e2070206b7c4ea7dfa771ec660604b408b183fff20e54d933371f8e7fc5ebdf89b3439e6e3bee97a00caf0e268ccc936052ccae2f639eac411d
+  languageName: node
+  linkType: hard
+
 "@metamask/object-multiplex@npm:^2.0.0":
   version: 2.0.0
   resolution: "@metamask/object-multiplex@npm:2.0.0"
@@ -5173,35 +5304,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^21.1.0":
-  version: 21.1.0
-  resolution: "@metamask/transaction-controller@npm:21.1.0"
+"@metamask/transaction-controller@npm:^22.0.0":
+  version: 22.0.0
+  resolution: "@metamask/transaction-controller@npm:22.0.0"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
     "@ethersproject/abi": "npm:^5.7.0"
     "@metamask/approval-controller": "npm:^5.1.2"
     "@metamask/base-controller": "npm:^4.1.1"
-    "@metamask/controller-utils": "npm:^8.0.2"
+    "@metamask/controller-utils": "npm:^8.0.3"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/gas-fee-controller": "npm:^13.0.0"
+    "@metamask/gas-fee-controller": "npm:^13.0.1"
     "@metamask/metamask-eth-abis": "npm:^3.0.0"
     "@metamask/network-controller": "npm:^17.2.0"
     "@metamask/rpc-errors": "npm:^6.1.0"
     "@metamask/utils": "npm:^8.3.0"
     async-mutex: "npm:^0.2.6"
-    eth-method-registry: "npm:^3.0.0"
+    eth-method-registry: "npm:^4.0.0"
     ethereumjs-util: "npm:^7.0.10"
     fast-json-patch: "npm:^3.1.1"
     lodash: "npm:^4.17.21"
     nonce-tracker: "npm:^3.0.0"
     uuid: "npm:^8.3.2"
   peerDependencies:
+    "@babel/runtime": ^7.23.9
     "@metamask/approval-controller": ^5.1.2
     "@metamask/gas-fee-controller": ^13.0.0
     "@metamask/network-controller": ^17.2.0
-    babel-runtime: ^6.26.0
-  checksum: 5dbe811870fb0775d017470ec4529fbf46969f072527e3ac7ce18370faafffda32056eeec02ff8b56ed35463aec8ceaeb667c64362db90529faf4b8e2c9c2631
+  checksum: 58c212278bcb0abcfb9114f56f5d5167bd1b1a6873811583e327aa89008ff67a9362d1cd0a4481d503b1f81a25495c3c05cbd666502e35e48a45b54d82b740c9
   languageName: node
   linkType: hard
 
@@ -17023,6 +17154,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eth-method-registry@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "eth-method-registry@npm:4.0.0"
+  dependencies:
+    "@metamask/ethjs-contract": "npm:^0.4.1"
+    "@metamask/ethjs-query": "npm:^0.7.1"
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: 959e833327960f40fab8693997e071def75103a694e931ab11313e642b6958d4f2878000d91ddfd6ba3c158bdc3f381c63eae0dd26738790e2aca5004ceb0387
+  languageName: node
+  linkType: hard
+
 "eth-phishing-detect@npm:^1.2.0":
   version: 1.2.0
   resolution: "eth-phishing-detect@npm:1.2.0"
@@ -24402,12 +24545,12 @@ __metadata:
     "@metamask/eth-ledger-bridge-keyring": "npm:^2.0.1"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/eth-snap-keyring": "npm:^2.1.2"
-    "@metamask/eth-token-tracker": "npm:^7.0.1"
+    "@metamask/eth-token-tracker": "npm:^7.0.2"
     "@metamask/eth-trezor-keyring": "npm:^3.0.0"
     "@metamask/etherscan-link": "npm:^3.0.0"
-    "@metamask/ethjs": "npm:^0.5.1"
-    "@metamask/ethjs-contract": "npm:^0.3.4"
-    "@metamask/ethjs-query": "npm:^0.5.3"
+    "@metamask/ethjs": "npm:^0.6.0"
+    "@metamask/ethjs-contract": "npm:^0.4.1"
+    "@metamask/ethjs-query": "npm:^0.7.1"
     "@metamask/forwarder": "npm:^1.1.0"
     "@metamask/gas-fee-controller": "npm:^13.0.0"
     "@metamask/jazzicon": "npm:^2.0.0"
@@ -24440,7 +24583,7 @@ __metadata:
     "@metamask/snaps-sdk": "npm:^1.4.0"
     "@metamask/snaps-utils": "npm:^5.2.0"
     "@metamask/test-dapp": "npm:^7.3.1"
-    "@metamask/transaction-controller": "npm:^21.1.0"
+    "@metamask/transaction-controller": "npm:^22.0.0"
     "@metamask/user-operation-controller": "npm:^1.0.0"
     "@metamask/utils": "npm:^8.2.1"
     "@ngraveio/bc-ur": "npm:^1.1.6"
@@ -24561,7 +24704,7 @@ __metadata:
     eth-ens-namehash: "npm:^2.0.8"
     eth-json-rpc-filters: "npm:^6.0.0"
     eth-lattice-keyring: "npm:^0.12.4"
-    eth-method-registry: "npm:^3.0.0"
+    eth-method-registry: "npm:^4.0.0"
     eth-rpc-errors: "npm:^4.0.2"
     eth-sig-util: "npm:^3.0.0"
     ethereum-ens-network-map: "npm:^1.0.2"