From 9262daf33b9fbcd8a8d3907bea2a57b20c949cc7 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 09:17:35 -0700
Subject: [PATCH 01/20] chore: Move package to packages/, update root tsconfig
 files

---
 .../eth-json-rpc-middleware/CHANGELOG.md      |   0
 .../eth-json-rpc-middleware/LICENSE           |   0
 .../eth-json-rpc-middleware/README.md         |   0
 .../eth-json-rpc-middleware/jest.config.js    |   0
 .../eth-json-rpc-middleware/package.json      |   0
 .../src/block-cache.test.ts                   |   0
 .../src/block-cache.ts                        |   0
 .../src/block-ref-rewrite.ts                  |   0
 .../src/block-ref.test.ts                     |   0
 .../eth-json-rpc-middleware/src/block-ref.ts  |   0
 .../src/block-tracker-inspector.ts            |   0
 .../eth-json-rpc-middleware/src/fetch.test.ts |   0
 .../eth-json-rpc-middleware/src/fetch.ts      |   0
 .../eth-json-rpc-middleware/src/index.ts      |   0
 .../src/inflight-cache.test.ts                |   0
 .../src/inflight-cache.ts                     |   0
 .../src/logging-utils.ts                      |   0
 ...llet-request-execution-permissions.test.ts |   0
 .../wallet-request-execution-permissions.ts   |   0
 ...wallet-revoke-execution-permission.test.ts |   0
 .../wallet-revoke-execution-permission.ts     |   0
 .../src/providerAsMiddleware.ts               |   0
 .../src/retryOnEmpty.test.ts                  |   0
 .../src/retryOnEmpty.ts                       |   0
 .../src/types.test-d.ts                       |   0
 .../eth-json-rpc-middleware/src/types.ts      |   0
 .../src/utils/cache.test.ts                   |   0
 .../src/utils/cache.ts                        |   0
 .../src/utils/common.test.ts                  |   0
 .../src/utils/common.ts                       |   0
 .../src/utils/error.test.ts                   |   0
 .../src/utils/error.ts                        |   0
 .../src/utils/normalize.test.ts               |   0
 .../src/utils/normalize.ts                    |   0
 .../src/utils/timeout.test.ts                 |   0
 .../src/utils/timeout.ts                      |   0
 .../src/utils/validation.test.ts              |   0
 .../src/utils/validation.ts                   |   0
 .../src/wallet.test.ts                        |   0
 .../eth-json-rpc-middleware/src/wallet.ts     |   0
 .../test/setupAfterEnv.ts                     |   0
 .../test/util/createHitTrackerMiddleware.ts   |   0
 .../test/util/helpers.ts                      |   0
 .../tsconfig.build.json                       |   3 -
 .../eth-json-rpc-middleware/tsconfig.json     |   3 -
 .../eth-json-rpc-middleware/typedoc.json      |   0
 .../eth-json-rpc-middleware/types/global.d.ts |   0
 tsconfig.build.json                           |   1 +
 tsconfig.json                                 |   1 +
 yarn.lock                                     | 459 +++++++++++++++++-
 50 files changed, 457 insertions(+), 10 deletions(-)
 rename {merged-packages => packages}/eth-json-rpc-middleware/CHANGELOG.md (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/LICENSE (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/README.md (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/jest.config.js (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/package.json (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/block-cache.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/block-cache.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/block-ref-rewrite.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/block-ref.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/block-ref.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/block-tracker-inspector.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/fetch.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/fetch.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/index.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/inflight-cache.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/inflight-cache.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/logging-utils.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/providerAsMiddleware.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/retryOnEmpty.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/retryOnEmpty.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/types.test-d.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/types.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/cache.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/cache.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/common.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/common.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/error.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/error.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/normalize.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/normalize.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/timeout.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/timeout.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/validation.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/utils/validation.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/wallet.test.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/src/wallet.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/test/setupAfterEnv.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/test/util/createHitTrackerMiddleware.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/test/util/helpers.ts (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/tsconfig.build.json (88%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/tsconfig.json (89%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/typedoc.json (100%)
 rename {merged-packages => packages}/eth-json-rpc-middleware/types/global.d.ts (100%)

diff --git a/merged-packages/eth-json-rpc-middleware/CHANGELOG.md b/packages/eth-json-rpc-middleware/CHANGELOG.md
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/CHANGELOG.md
rename to packages/eth-json-rpc-middleware/CHANGELOG.md
diff --git a/merged-packages/eth-json-rpc-middleware/LICENSE b/packages/eth-json-rpc-middleware/LICENSE
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/LICENSE
rename to packages/eth-json-rpc-middleware/LICENSE
diff --git a/merged-packages/eth-json-rpc-middleware/README.md b/packages/eth-json-rpc-middleware/README.md
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/README.md
rename to packages/eth-json-rpc-middleware/README.md
diff --git a/merged-packages/eth-json-rpc-middleware/jest.config.js b/packages/eth-json-rpc-middleware/jest.config.js
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/jest.config.js
rename to packages/eth-json-rpc-middleware/jest.config.js
diff --git a/merged-packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/package.json
rename to packages/eth-json-rpc-middleware/package.json
diff --git a/merged-packages/eth-json-rpc-middleware/src/block-cache.test.ts b/packages/eth-json-rpc-middleware/src/block-cache.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/block-cache.test.ts
rename to packages/eth-json-rpc-middleware/src/block-cache.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/block-cache.ts b/packages/eth-json-rpc-middleware/src/block-cache.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/block-cache.ts
rename to packages/eth-json-rpc-middleware/src/block-cache.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/block-ref-rewrite.ts b/packages/eth-json-rpc-middleware/src/block-ref-rewrite.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/block-ref-rewrite.ts
rename to packages/eth-json-rpc-middleware/src/block-ref-rewrite.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/block-ref.test.ts b/packages/eth-json-rpc-middleware/src/block-ref.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/block-ref.test.ts
rename to packages/eth-json-rpc-middleware/src/block-ref.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/block-ref.ts b/packages/eth-json-rpc-middleware/src/block-ref.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/block-ref.ts
rename to packages/eth-json-rpc-middleware/src/block-ref.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/block-tracker-inspector.ts b/packages/eth-json-rpc-middleware/src/block-tracker-inspector.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/block-tracker-inspector.ts
rename to packages/eth-json-rpc-middleware/src/block-tracker-inspector.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/fetch.test.ts b/packages/eth-json-rpc-middleware/src/fetch.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/fetch.test.ts
rename to packages/eth-json-rpc-middleware/src/fetch.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/fetch.ts b/packages/eth-json-rpc-middleware/src/fetch.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/fetch.ts
rename to packages/eth-json-rpc-middleware/src/fetch.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/index.ts b/packages/eth-json-rpc-middleware/src/index.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/index.ts
rename to packages/eth-json-rpc-middleware/src/index.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/inflight-cache.test.ts b/packages/eth-json-rpc-middleware/src/inflight-cache.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/inflight-cache.test.ts
rename to packages/eth-json-rpc-middleware/src/inflight-cache.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/inflight-cache.ts b/packages/eth-json-rpc-middleware/src/inflight-cache.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/inflight-cache.ts
rename to packages/eth-json-rpc-middleware/src/inflight-cache.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/logging-utils.ts b/packages/eth-json-rpc-middleware/src/logging-utils.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/logging-utils.ts
rename to packages/eth-json-rpc-middleware/src/logging-utils.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.test.ts b/packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.test.ts
rename to packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.ts b/packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.ts
rename to packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.test.ts b/packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.test.ts
rename to packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.ts b/packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.ts
rename to packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/providerAsMiddleware.ts b/packages/eth-json-rpc-middleware/src/providerAsMiddleware.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/providerAsMiddleware.ts
rename to packages/eth-json-rpc-middleware/src/providerAsMiddleware.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts b/packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts
rename to packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/retryOnEmpty.ts b/packages/eth-json-rpc-middleware/src/retryOnEmpty.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/retryOnEmpty.ts
rename to packages/eth-json-rpc-middleware/src/retryOnEmpty.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/types.test-d.ts b/packages/eth-json-rpc-middleware/src/types.test-d.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/types.test-d.ts
rename to packages/eth-json-rpc-middleware/src/types.test-d.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/types.ts b/packages/eth-json-rpc-middleware/src/types.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/types.ts
rename to packages/eth-json-rpc-middleware/src/types.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/cache.test.ts b/packages/eth-json-rpc-middleware/src/utils/cache.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/cache.test.ts
rename to packages/eth-json-rpc-middleware/src/utils/cache.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/cache.ts b/packages/eth-json-rpc-middleware/src/utils/cache.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/cache.ts
rename to packages/eth-json-rpc-middleware/src/utils/cache.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/common.test.ts b/packages/eth-json-rpc-middleware/src/utils/common.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/common.test.ts
rename to packages/eth-json-rpc-middleware/src/utils/common.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/common.ts b/packages/eth-json-rpc-middleware/src/utils/common.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/common.ts
rename to packages/eth-json-rpc-middleware/src/utils/common.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/error.test.ts b/packages/eth-json-rpc-middleware/src/utils/error.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/error.test.ts
rename to packages/eth-json-rpc-middleware/src/utils/error.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/error.ts b/packages/eth-json-rpc-middleware/src/utils/error.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/error.ts
rename to packages/eth-json-rpc-middleware/src/utils/error.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/normalize.test.ts b/packages/eth-json-rpc-middleware/src/utils/normalize.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/normalize.test.ts
rename to packages/eth-json-rpc-middleware/src/utils/normalize.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/normalize.ts b/packages/eth-json-rpc-middleware/src/utils/normalize.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/normalize.ts
rename to packages/eth-json-rpc-middleware/src/utils/normalize.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/timeout.test.ts b/packages/eth-json-rpc-middleware/src/utils/timeout.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/timeout.test.ts
rename to packages/eth-json-rpc-middleware/src/utils/timeout.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/timeout.ts b/packages/eth-json-rpc-middleware/src/utils/timeout.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/timeout.ts
rename to packages/eth-json-rpc-middleware/src/utils/timeout.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/validation.test.ts b/packages/eth-json-rpc-middleware/src/utils/validation.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/validation.test.ts
rename to packages/eth-json-rpc-middleware/src/utils/validation.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/utils/validation.ts b/packages/eth-json-rpc-middleware/src/utils/validation.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/utils/validation.ts
rename to packages/eth-json-rpc-middleware/src/utils/validation.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/wallet.test.ts b/packages/eth-json-rpc-middleware/src/wallet.test.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/wallet.test.ts
rename to packages/eth-json-rpc-middleware/src/wallet.test.ts
diff --git a/merged-packages/eth-json-rpc-middleware/src/wallet.ts b/packages/eth-json-rpc-middleware/src/wallet.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/src/wallet.ts
rename to packages/eth-json-rpc-middleware/src/wallet.ts
diff --git a/merged-packages/eth-json-rpc-middleware/test/setupAfterEnv.ts b/packages/eth-json-rpc-middleware/test/setupAfterEnv.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/test/setupAfterEnv.ts
rename to packages/eth-json-rpc-middleware/test/setupAfterEnv.ts
diff --git a/merged-packages/eth-json-rpc-middleware/test/util/createHitTrackerMiddleware.ts b/packages/eth-json-rpc-middleware/test/util/createHitTrackerMiddleware.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/test/util/createHitTrackerMiddleware.ts
rename to packages/eth-json-rpc-middleware/test/util/createHitTrackerMiddleware.ts
diff --git a/merged-packages/eth-json-rpc-middleware/test/util/helpers.ts b/packages/eth-json-rpc-middleware/test/util/helpers.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/test/util/helpers.ts
rename to packages/eth-json-rpc-middleware/test/util/helpers.ts
diff --git a/merged-packages/eth-json-rpc-middleware/tsconfig.build.json b/packages/eth-json-rpc-middleware/tsconfig.build.json
similarity index 88%
rename from merged-packages/eth-json-rpc-middleware/tsconfig.build.json
rename to packages/eth-json-rpc-middleware/tsconfig.build.json
index d2caa1040a..c8e3a94221 100644
--- a/merged-packages/eth-json-rpc-middleware/tsconfig.build.json
+++ b/packages/eth-json-rpc-middleware/tsconfig.build.json
@@ -6,9 +6,6 @@
     "rootDir": "./src"
   },
   "references": [
-    {
-      "path": "../eth-block-tracker/tsconfig.build.json"
-    },
     {
       "path": "../../packages/error-reporting-service/tsconfig.build.json"
     },
diff --git a/merged-packages/eth-json-rpc-middleware/tsconfig.json b/packages/eth-json-rpc-middleware/tsconfig.json
similarity index 89%
rename from merged-packages/eth-json-rpc-middleware/tsconfig.json
rename to packages/eth-json-rpc-middleware/tsconfig.json
index f338c19ca1..063389352e 100644
--- a/merged-packages/eth-json-rpc-middleware/tsconfig.json
+++ b/packages/eth-json-rpc-middleware/tsconfig.json
@@ -4,9 +4,6 @@
     "baseUrl": "./"
   },
   "references": [
-    {
-      "path": "../eth-block-tracker"
-    },
     {
       "path": "../../packages/error-reporting-service"
     },
diff --git a/merged-packages/eth-json-rpc-middleware/typedoc.json b/packages/eth-json-rpc-middleware/typedoc.json
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/typedoc.json
rename to packages/eth-json-rpc-middleware/typedoc.json
diff --git a/merged-packages/eth-json-rpc-middleware/types/global.d.ts b/packages/eth-json-rpc-middleware/types/global.d.ts
similarity index 100%
rename from merged-packages/eth-json-rpc-middleware/types/global.d.ts
rename to packages/eth-json-rpc-middleware/types/global.d.ts
diff --git a/tsconfig.build.json b/tsconfig.build.json
index 712eded094..85d80f74ee 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -21,6 +21,7 @@
     { "path": "./packages/eip1193-permission-middleware/tsconfig.build.json" },
     { "path": "./packages/ens-controller/tsconfig.build.json" },
     { "path": "./packages/error-reporting-service/tsconfig.build.json" },
+    { "path": "./packages/eth-json-rpc-middleware/tsconfig.build.json" },
     { "path": "./packages/eth-json-rpc-provider/tsconfig.build.json" },
     { "path": "./packages/foundryup/tsconfig.build.json" },
     { "path": "./packages/gas-fee-controller/tsconfig.build.json" },
diff --git a/tsconfig.json b/tsconfig.json
index 12cd1a2432..297859c623 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,6 +26,7 @@
     { "path": "./packages/eip1193-permission-middleware" },
     { "path": "./packages/ens-controller" },
     { "path": "./packages/error-reporting-service" },
+    { "path": "./packages/eth-json-rpc-middleware" },
     { "path": "./packages/eth-json-rpc-provider" },
     { "path": "./packages/foundryup" },
     { "path": "./packages/gas-fee-controller" },
diff --git a/yarn.lock b/yarn.lock
index bcd7b2db2a..aad5750226 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3426,6 +3426,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/eth-block-tracker@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "@metamask/eth-block-tracker@npm:13.0.0"
+  dependencies:
+    "@metamask/eth-json-rpc-provider": "npm:^5.0.0"
+    "@metamask/safe-event-emitter": "npm:^3.1.1"
+    "@metamask/utils": "npm:^11.0.1"
+    json-rpc-random-id: "npm:^1.0.1"
+  checksum: 10/e2b84d5bf3ef36939ea98755cd9515355a34b164c3d9e071237e18cef6300b4e150657f7d6ed1ba03b56000c01b8b1a4edf829558546f5e2a9a1cac2f03fc6ee
+  languageName: node
+  linkType: hard
+
 "@metamask/eth-hd-keyring@npm:^13.0.0":
   version: 13.0.0
   resolution: "@metamask/eth-hd-keyring@npm:13.0.0"
@@ -3486,6 +3498,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/eth-json-rpc-middleware@workspace:packages/eth-json-rpc-middleware":
+  version: 0.0.0-use.local
+  resolution: "@metamask/eth-json-rpc-middleware@workspace:packages/eth-json-rpc-middleware"
+  dependencies:
+    "@metamask/auto-changelog": "npm:^3.4.4"
+    "@metamask/error-reporting-service": "npm:^2.2.1"
+    "@metamask/eth-block-tracker": "npm:^13.0.0"
+    "@metamask/eth-json-rpc-provider": "npm:^5.0.1"
+    "@metamask/eth-sig-util": "npm:^8.2.0"
+    "@metamask/json-rpc-engine": "npm:^10.1.1"
+    "@metamask/network-controller": "npm:^24.2.2"
+    "@metamask/rpc-errors": "npm:^7.0.2"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^11.8.1"
+    "@types/jest": "npm:^27.4.1"
+    "@types/pify": "npm:^5.0.2"
+    deepmerge: "npm:^4.2.2"
+    jest: "npm:^27.5.1"
+    klona: "npm:^2.0.6"
+    pify: "npm:^5.0.0"
+    safe-stable-stringify: "npm:^2.4.3"
+    tsd: "npm:^0.31.2"
+    typedoc: "npm:^0.24.8"
+    typescript: "npm:~5.2.2"
+  languageName: unknown
+  linkType: soft
+
 "@metamask/eth-json-rpc-provider@npm:^5.0.0, @metamask/eth-json-rpc-provider@npm:^5.0.1, @metamask/eth-json-rpc-provider@workspace:packages/eth-json-rpc-provider":
   version: 0.0.0-use.local
   resolution: "@metamask/eth-json-rpc-provider@workspace:packages/eth-json-rpc-provider"
@@ -5729,6 +5768,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tsd/typescript@npm:~5.4.3":
+  version: 5.4.5
+  resolution: "@tsd/typescript@npm:5.4.5"
+  checksum: 10/d53a377d489c51737796ae0d65e8a5e118c6b9e2f860e017c68abec4f9bc8214652d4b51e345c230df0d2e40770f938ffa02c6342fd104566f9941c47cce4a9b
+  languageName: node
+  linkType: hard
+
 "@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14":
   version: 7.20.5
   resolution: "@types/babel__core@npm:7.20.5"
@@ -5830,6 +5876,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/eslint@npm:^7.2.13":
+  version: 7.29.0
+  resolution: "@types/eslint@npm:7.29.0"
+  dependencies:
+    "@types/estree": "npm:*"
+    "@types/json-schema": "npm:*"
+  checksum: 10/43e2de0ed1f0290ef9143cc379ffacc1053f415a46ed2b781c1f22c0d6e94c0ece8a9a23339b0903e519637d3d0ea6a006e16ef8dfa72f2758c7ba5025bca960
+  languageName: node
+  linkType: hard
+
 "@types/eslint@npm:^8.44.7":
   version: 8.56.12
   resolution: "@types/eslint@npm:8.56.12"
@@ -5954,6 +6010,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/minimist@npm:^1.2.0":
+  version: 1.2.5
+  resolution: "@types/minimist@npm:1.2.5"
+  checksum: 10/477047b606005058ab0263c4f58097136268007f320003c348794f74adedc3166ffc47c80ec3e94687787f2ab7f4e72c468223946e79892cf0fd9e25e9970a90
+  languageName: node
+  linkType: hard
+
 "@types/ms@npm:*":
   version: 0.7.34
   resolution: "@types/ms@npm:0.7.34"
@@ -6003,6 +6066,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/normalize-package-data@npm:^2.4.0":
+  version: 2.4.4
+  resolution: "@types/normalize-package-data@npm:2.4.4"
+  checksum: 10/65dff72b543997b7be8b0265eca7ace0e34b75c3e5fee31de11179d08fa7124a7a5587265d53d0409532ecb7f7fba662c2012807963e1f9b059653ec2c83ee05
+  languageName: node
+  linkType: hard
+
 "@types/parse-json@npm:^4.0.0":
   version: 4.0.2
   resolution: "@types/parse-json@npm:4.0.2"
@@ -6019,6 +6089,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/pify@npm:^5.0.2":
+  version: 5.0.4
+  resolution: "@types/pify@npm:5.0.4"
+  checksum: 10/765a4f130fac9eb4ca2fb14d95a218d605f671ddd1ed4ebeb6ee0e0fa937ec59cf91fd55a9bb702c0472ca1296cb00ab081bdf9e908ee4abb8105068994f309f
+  languageName: node
+  linkType: hard
+
 "@types/prettier@npm:^2.1.5":
   version: 2.7.3
   resolution: "@types/prettier@npm:2.7.3"
@@ -7185,6 +7262,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"arrify@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "arrify@npm:1.0.1"
+  checksum: 10/745075dd4a4624ff0225c331dacb99be501a515d39bcb7c84d24660314a6ec28e68131b137e6f7e16318170842ce97538cd298fc4cd6b2cc798e0b957f2747e7
+  languageName: node
+  linkType: hard
+
 "arrify@npm:^2.0.1":
   version: 2.0.1
   resolution: "arrify@npm:2.0.1"
@@ -7763,6 +7847,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"camelcase-keys@npm:^6.2.2":
+  version: 6.2.2
+  resolution: "camelcase-keys@npm:6.2.2"
+  dependencies:
+    camelcase: "npm:^5.3.1"
+    map-obj: "npm:^4.0.0"
+    quick-lru: "npm:^4.0.1"
+  checksum: 10/c1999f5b6d03bee7be9a36e48eef3da9e93e51b000677348ec8d15d51fc4418375890fb6c7155e387322d2ebb2a2cdebf9cd96607a6753d1d6c170d9b1e2eed5
+  languageName: node
+  linkType: hard
+
 "camelcase@npm:^5.3.1":
   version: 5.3.1
   resolution: "camelcase@npm:5.3.1"
@@ -8310,6 +8405,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"decamelize-keys@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "decamelize-keys@npm:1.1.1"
+  dependencies:
+    decamelize: "npm:^1.1.0"
+    map-obj: "npm:^1.0.0"
+  checksum: 10/71d5898174f17a8d2303cecc98ba0236e842948c4d042a8180d5e749be8442220bca2d16dd93bebd7b49e86c807814273212e4da0fae67be7c58c282ff76057a
+  languageName: node
+  linkType: hard
+
+"decamelize@npm:^1.1.0, decamelize@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "decamelize@npm:1.2.0"
+  checksum: 10/ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa
+  languageName: node
+  linkType: hard
+
 "decimal.js@npm:^10.2.1":
   version: 10.4.3
   resolution: "decimal.js@npm:10.4.3"
@@ -8907,6 +9019,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-formatter-pretty@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "eslint-formatter-pretty@npm:4.1.0"
+  dependencies:
+    "@types/eslint": "npm:^7.2.13"
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.1.0"
+    eslint-rule-docs: "npm:^1.1.5"
+    log-symbols: "npm:^4.0.0"
+    plur: "npm:^4.0.0"
+    string-width: "npm:^4.2.0"
+    supports-hyperlinks: "npm:^2.0.0"
+  checksum: 10/e8e0cd3843513fff32a70b036dd349fdab81d73b5e522f23685181c907a1faf2b2ebcae1688dc71d0fc026184011792f7e39b833d349df18fe2baea00d017901
+  languageName: node
+  linkType: hard
+
 "eslint-import-resolver-node@npm:^0.3.9":
   version: 0.3.9
   resolution: "eslint-import-resolver-node@npm:0.3.9"
@@ -9067,6 +9195,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-rule-docs@npm:^1.1.5":
+  version: 1.1.235
+  resolution: "eslint-rule-docs@npm:1.1.235"
+  checksum: 10/38af5ab724eb8108c7918826bc19f5e9902e39fc7fb018e9c6fe70f8a010fa3c3ea589a1527c53a68f2d41c4406db9195e042580a618a6d3027021abe5f4b014
+  languageName: node
+  linkType: hard
+
 "eslint-scope@npm:^8.2.0":
   version: 8.2.0
   resolution: "eslint-scope@npm:8.2.0"
@@ -9521,7 +9656,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.2, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.2":
+"fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.2":
   version: 3.3.3
   resolution: "fast-glob@npm:3.3.3"
   dependencies:
@@ -10096,6 +10231,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globby@npm:^11.0.1":
+  version: 11.1.0
+  resolution: "globby@npm:11.1.0"
+  dependencies:
+    array-union: "npm:^2.1.0"
+    dir-glob: "npm:^3.0.1"
+    fast-glob: "npm:^3.2.9"
+    ignore: "npm:^5.2.0"
+    merge2: "npm:^1.4.1"
+    slash: "npm:^3.0.0"
+  checksum: 10/288e95e310227bbe037076ea81b7c2598ccbc3122d87abc6dab39e1eec309aa14f0e366a98cdc45237ffcfcbad3db597778c0068217dcb1950fef6249104e1b1
+  languageName: node
+  linkType: hard
+
 "globby@npm:^13.1.2":
   version: 13.2.2
   resolution: "globby@npm:13.2.2"
@@ -10163,6 +10312,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hard-rejection@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "hard-rejection@npm:2.1.0"
+  checksum: 10/7baaf80a0c7fff4ca79687b4060113f1529589852152fa935e6787a2bc96211e784ad4588fb3048136ff8ffc9dfcf3ae385314a5b24db32de20bea0d1597f9dc
+  languageName: node
+  linkType: hard
+
 "has-flag@npm:^4.0.0":
   version: 4.0.0
   resolution: "has-flag@npm:4.0.0"
@@ -10236,6 +10392,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hosted-git-info@npm:^2.1.4":
+  version: 2.8.9
+  resolution: "hosted-git-info@npm:2.8.9"
+  checksum: 10/96da7d412303704af41c3819207a09ea2cab2de97951db4cf336bb8bce8d8e36b9a6821036ad2e55e67d3be0af8f967a7b57981203fbfb88bc05cd803407b8c3
+  languageName: node
+  linkType: hard
+
+"hosted-git-info@npm:^4.0.1":
+  version: 4.1.0
+  resolution: "hosted-git-info@npm:4.1.0"
+  dependencies:
+    lru-cache: "npm:^6.0.0"
+  checksum: 10/4dc67022b7ecb12829966bd731fb9a5f14d351547aafc6520ef3c8e7211f4f0e69452d24e29eae3d9b17df924d660052e53d8ca321cf3008418fb7e6c7c47d6f
+  languageName: node
+  linkType: hard
+
 "hosted-git-info@npm:^7.0.0":
   version: 7.0.2
   resolution: "hosted-git-info@npm:7.0.2"
@@ -10542,6 +10714,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"irregular-plurals@npm:^3.2.0":
+  version: 3.5.0
+  resolution: "irregular-plurals@npm:3.5.0"
+  checksum: 10/27f04e66402264b78251c03973dd4866aba58b851579b2f1870f3610494a163c20c5161a3eae8fdd49a61a5379ee611460a1781aadc891ce0203bcd7a52e4850
+  languageName: node
+  linkType: hard
+
 "is-arrayish@npm:^0.2.1":
   version: 0.2.1
   resolution: "is-arrayish@npm:0.2.1"
@@ -10578,6 +10757,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-core-module@npm:^2.16.0, is-core-module@npm:^2.5.0":
+  version: 2.16.1
+  resolution: "is-core-module@npm:2.16.1"
+  dependencies:
+    hasown: "npm:^2.0.2"
+  checksum: 10/452b2c2fb7f889cbbf7e54609ef92cf6c24637c568acc7e63d166812a0fb365ae8a504c333a29add8bdb1686704068caa7f4e4b639b650dde4f00a038b8941fb
+  languageName: node
+  linkType: hard
+
 "is-docker@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-docker@npm:3.0.0"
@@ -10656,6 +10844,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-plain-obj@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "is-plain-obj@npm:1.1.0"
+  checksum: 10/0ee04807797aad50859652a7467481816cbb57e5cc97d813a7dcd8915da8195dc68c436010bf39d195226cde6a2d352f4b815f16f26b7bf486a5754290629931
+  languageName: node
+  linkType: hard
+
 "is-plain-obj@npm:^4.1.0":
   version: 4.1.0
   resolution: "is-plain-obj@npm:4.1.0"
@@ -10700,6 +10895,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-unicode-supported@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "is-unicode-supported@npm:0.1.0"
+  checksum: 10/a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52
+  languageName: node
+  linkType: hard
+
 "is-url@npm:^1.2.4":
   version: 1.2.4
   resolution: "is-url@npm:1.2.4"
@@ -10940,7 +11142,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^29.7.0":
+"jest-diff@npm:^29.0.3, jest-diff@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-diff@npm:29.7.0"
   dependencies:
@@ -11708,6 +11910,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"kind-of@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "kind-of@npm:6.0.3"
+  checksum: 10/5873d303fb36aad875b7538798867da2ae5c9e328d67194b0162a3659a627d22f742fc9c4ae95cd1704132a24b00cae5041fc00c0f6ef937dc17080dc4dbb962
+  languageName: node
+  linkType: hard
+
 "kleur@npm:^3.0.3":
   version: 3.0.3
   resolution: "kleur@npm:3.0.3"
@@ -11813,6 +12022,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"log-symbols@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "log-symbols@npm:4.1.0"
+  dependencies:
+    chalk: "npm:^4.1.0"
+    is-unicode-supported: "npm:^0.1.0"
+  checksum: 10/fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74
+  languageName: node
+  linkType: hard
+
 "loglevel@npm:^1.8.1, loglevel@npm:^1.9.2":
   version: 1.9.2
   resolution: "loglevel@npm:1.9.2"
@@ -11861,6 +12080,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "lru-cache@npm:6.0.0"
+  dependencies:
+    yallist: "npm:^4.0.0"
+  checksum: 10/fc1fe2ee205f7c8855fa0f34c1ab0bcf14b6229e35579ec1fd1079f31d6fc8ef8eb6fd17f2f4d99788d7e339f50e047555551ebd5e434dda503696e7c6591825
+  languageName: node
+  linkType: hard
+
 "lunr@npm:^2.3.9":
   version: 2.3.9
   resolution: "lunr@npm:2.3.9"
@@ -11929,6 +12157,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"map-obj@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "map-obj@npm:1.0.1"
+  checksum: 10/f8e6fc7f6137329c376c4524f6d25b3c243c17019bc8f621d15a2dcb855919e482a9298a78ae58b00dbd0e76b640bf6533aa343a9e993cfc16e0346a2507e7f8
+  languageName: node
+  linkType: hard
+
+"map-obj@npm:^4.0.0":
+  version: 4.3.0
+  resolution: "map-obj@npm:4.3.0"
+  checksum: 10/fbc554934d1a27a1910e842bc87b177b1a556609dd803747c85ece420692380827c6ae94a95cce4407c054fa0964be3bf8226f7f2cb2e9eeee432c7c1985684e
+  languageName: node
+  linkType: hard
+
 "marked@npm:^12.0.1":
   version: 12.0.2
   resolution: "marked@npm:12.0.2"
@@ -11972,6 +12214,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"meow@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "meow@npm:9.0.0"
+  dependencies:
+    "@types/minimist": "npm:^1.2.0"
+    camelcase-keys: "npm:^6.2.2"
+    decamelize: "npm:^1.2.0"
+    decamelize-keys: "npm:^1.1.0"
+    hard-rejection: "npm:^2.1.0"
+    minimist-options: "npm:4.1.0"
+    normalize-package-data: "npm:^3.0.0"
+    read-pkg-up: "npm:^7.0.1"
+    redent: "npm:^3.0.0"
+    trim-newlines: "npm:^3.0.0"
+    type-fest: "npm:^0.18.0"
+    yargs-parser: "npm:^20.2.3"
+  checksum: 10/3d0f199b9ccd81856a112f651290676f6816833626df53cee72b8e2c9acbd95beea4fa1f9fa729a553b5a0e74b18954f9fbc74c3ab837b3fc44e57de98f6c18f
+  languageName: node
+  linkType: hard
+
 "merge-descriptors@npm:1.0.3":
   version: 1.0.3
   resolution: "merge-descriptors@npm:1.0.3"
@@ -12070,6 +12332,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"min-indent@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "min-indent@npm:1.0.1"
+  checksum: 10/bfc6dd03c5eaf623a4963ebd94d087f6f4bbbfd8c41329a7f09706b0cb66969c4ddd336abeb587bc44bc6f08e13bf90f0b374f9d71f9f01e04adc2cd6f083ef1
+  languageName: node
+  linkType: hard
+
 "minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
   version: 1.0.1
   resolution: "minimalistic-assert@npm:1.0.1"
@@ -12111,6 +12380,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimist-options@npm:4.1.0":
+  version: 4.1.0
+  resolution: "minimist-options@npm:4.1.0"
+  dependencies:
+    arrify: "npm:^1.0.1"
+    is-plain-obj: "npm:^1.1.0"
+    kind-of: "npm:^6.0.3"
+  checksum: 10/8c040b3068811e79de1140ca2b708d3e203c8003eb9a414c1ab3cd467fc5f17c9ca02a5aef23bedc51a7f8bfbe77f87e9a7e31ec81fba304cda675b019496f4e
+  languageName: node
+  linkType: hard
+
 "minipass-collect@npm:^2.0.1":
   version: 2.0.1
   resolution: "minipass-collect@npm:2.0.1"
@@ -12405,6 +12685,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"normalize-package-data@npm:^2.5.0":
+  version: 2.5.0
+  resolution: "normalize-package-data@npm:2.5.0"
+  dependencies:
+    hosted-git-info: "npm:^2.1.4"
+    resolve: "npm:^1.10.0"
+    semver: "npm:2 || 3 || 4 || 5"
+    validate-npm-package-license: "npm:^3.0.1"
+  checksum: 10/644f830a8bb9b7cc9bf2f6150618727659ee27cdd0840d1c1f97e8e6cab0803a098a2c19f31c6247ad9d3a0792e61521a13a6e8cd87cc6bb676e3150612c03d4
+  languageName: node
+  linkType: hard
+
+"normalize-package-data@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "normalize-package-data@npm:3.0.3"
+  dependencies:
+    hosted-git-info: "npm:^4.0.1"
+    is-core-module: "npm:^2.5.0"
+    semver: "npm:^7.3.4"
+    validate-npm-package-license: "npm:^3.0.1"
+  checksum: 10/3cd3b438c9c7b15d72ed2d1bbf0f8cc2d07bfe27702fc9e95d039f0af4e069dc75c0646e75068f9f9255a8aae64b59aa4fe2177e65787145fb996c3d38d48acb
+  languageName: node
+  linkType: hard
+
 "normalize-package-data@npm:^6.0.0":
   version: 6.0.2
   resolution: "normalize-package-data@npm:6.0.2"
@@ -12858,6 +13162,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"plur@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "plur@npm:4.0.0"
+  dependencies:
+    irregular-plurals: "npm:^3.2.0"
+  checksum: 10/fea2e903efca67cc5c7a8952fca3db46ae8d9e9353373b406714977e601a5d3b628bcb043c3ad2126c6ff0e73d8020bf43af30a72dd087eff1ec240eb13b90e1
+  languageName: node
+  linkType: hard
+
 "pony-cause@npm:^2.1.10, pony-cause@npm:^2.1.9":
   version: 2.1.11
   resolution: "pony-cause@npm:2.1.11"
@@ -13117,6 +13430,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"quick-lru@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "quick-lru@npm:4.0.1"
+  checksum: 10/5c7c75f1c696750f619b165cc9957382f919e4207dabf04597a64f0298861391cdc5ee91a1dde1a5d460ecf7ee1af7fc36fef6d155bef2be66f05d43fd63d4f0
+  languageName: node
+  linkType: hard
+
 "quick-lru@npm:^5.1.1":
   version: 5.1.1
   resolution: "quick-lru@npm:5.1.1"
@@ -13219,6 +13539,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"read-pkg-up@npm:^7.0.0, read-pkg-up@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "read-pkg-up@npm:7.0.1"
+  dependencies:
+    find-up: "npm:^4.1.0"
+    read-pkg: "npm:^5.2.0"
+    type-fest: "npm:^0.8.1"
+  checksum: 10/e4e93ce70e5905b490ca8f883eb9e48b5d3cebc6cd4527c25a0d8f3ae2903bd4121c5ab9c5a3e217ada0141098eeb661313c86fa008524b089b8ed0b7f165e44
+  languageName: node
+  linkType: hard
+
+"read-pkg@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "read-pkg@npm:5.2.0"
+  dependencies:
+    "@types/normalize-package-data": "npm:^2.4.0"
+    normalize-package-data: "npm:^2.5.0"
+    parse-json: "npm:^5.0.0"
+    type-fest: "npm:^0.6.0"
+  checksum: 10/eb696e60528b29aebe10e499ba93f44991908c57d70f2d26f369e46b8b9afc208ef11b4ba64f67630f31df8b6872129e0a8933c8c53b7b4daf0eace536901222
+  languageName: node
+  linkType: hard
+
 "readable-stream@npm:3.6.2, readable-stream@npm:^3.0.2, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0, readable-stream@npm:^3.6.2":
   version: 3.6.2
   resolution: "readable-stream@npm:3.6.2"
@@ -13283,6 +13626,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"redent@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "redent@npm:3.0.0"
+  dependencies:
+    indent-string: "npm:^4.0.0"
+    strip-indent: "npm:^3.0.0"
+  checksum: 10/fa1ef20404a2d399235e83cc80bd55a956642e37dd197b4b612ba7327bf87fa32745aeb4a1634b2bab25467164ab4ed9c15be2c307923dd08b0fe7c52431ae6b
+  languageName: node
+  linkType: hard
+
 "regenerator-runtime@npm:^0.11.0":
   version: 0.11.1
   resolution: "regenerator-runtime@npm:0.11.1"
@@ -13392,6 +13745,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve@npm:^1.10.0":
+  version: 1.22.10
+  resolution: "resolve@npm:1.22.10"
+  dependencies:
+    is-core-module: "npm:^2.16.0"
+    path-parse: "npm:^1.0.7"
+    supports-preserve-symlinks-flag: "npm:^1.0.0"
+  bin:
+    resolve: bin/resolve
+  checksum: 10/0a398b44da5c05e6e421d70108822c327675febb880eebe905587628de401854c61d5df02866ff34fc4cb1173a51c9f0e84a94702738df3611a62e2acdc68181
+  languageName: node
+  linkType: hard
+
 "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.3#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
@@ -13405,6 +13771,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>":
+  version: 1.22.10
+  resolution: "resolve@patch:resolve@npm%3A1.22.10#optional!builtin<compat/resolve>::version=1.22.10&hash=c3c19d"
+  dependencies:
+    is-core-module: "npm:^2.16.0"
+    path-parse: "npm:^1.0.7"
+    supports-preserve-symlinks-flag: "npm:^1.0.0"
+  bin:
+    resolve: bin/resolve
+  checksum: 10/d4d878bfe3702d215ea23e75e0e9caf99468e3db76f5ca100d27ebdc527366fee3877e54bce7d47cc72ca8952fc2782a070d238bfa79a550eeb0082384c3b81a
+  languageName: node
+  linkType: hard
+
 "responselike@npm:^2.0.0":
   version: 2.0.1
   resolution: "responselike@npm:2.0.1"
@@ -13584,6 +13963,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:2 || 3 || 4 || 5":
+  version: 5.7.2
+  resolution: "semver@npm:5.7.2"
+  bin:
+    semver: bin/semver
+  checksum: 10/fca14418a174d4b4ef1fecb32c5941e3412d52a4d3d85165924ce3a47fbc7073372c26faf7484ceb4bbc2bde25880c6b97e492473dc7e9708fdfb1c6a02d546e
+  languageName: node
+  linkType: hard
+
 "semver@npm:7.x, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3":
   version: 7.6.3
   resolution: "semver@npm:7.6.3"
@@ -13602,6 +13990,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.3.4":
+  version: 7.7.3
+  resolution: "semver@npm:7.7.3"
+  bin:
+    semver: bin/semver.js
+  checksum: 10/8dbc3168e057a38fc322af909c7f5617483c50caddba135439ff09a754b20bdd6482a5123ff543dad4affa488ecf46ec5fb56d61312ad20bb140199b88dfaea9
+  languageName: node
+  linkType: hard
+
 "send@npm:0.19.0":
   version: 0.19.0
   resolution: "send@npm:0.19.0"
@@ -14139,6 +14536,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-indent@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "strip-indent@npm:3.0.0"
+  dependencies:
+    min-indent: "npm:^1.0.0"
+  checksum: 10/18f045d57d9d0d90cd16f72b2313d6364fd2cb4bf85b9f593523ad431c8720011a4d5f08b6591c9d580f446e78855c5334a30fb91aa1560f5d9f95ed1b4a0530
+  languageName: node
+  linkType: hard
+
 "strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
@@ -14396,6 +14802,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"trim-newlines@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "trim-newlines@npm:3.0.1"
+  checksum: 10/b530f3fadf78e570cf3c761fb74fef655beff6b0f84b29209bac6c9622db75ad1417f4a7b5d54c96605dcd72734ad44526fef9f396807b90839449eb543c6206
+  languageName: node
+  linkType: hard
+
 "ts-api-utils@npm:^2.0.0":
   version: 2.0.0
   resolution: "ts-api-utils@npm:2.0.0"
@@ -14438,6 +14851,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tsd@npm:^0.31.2":
+  version: 0.31.2
+  resolution: "tsd@npm:0.31.2"
+  dependencies:
+    "@tsd/typescript": "npm:~5.4.3"
+    eslint-formatter-pretty: "npm:^4.1.0"
+    globby: "npm:^11.0.1"
+    jest-diff: "npm:^29.0.3"
+    meow: "npm:^9.0.0"
+    path-exists: "npm:^4.0.0"
+    read-pkg-up: "npm:^7.0.0"
+  bin:
+    tsd: dist/cli.js
+  checksum: 10/544995fc4c9a9d558da354420a4fb9b23bc0f3220a5f8011ca2e7a68086489e3edb738e59027100a5f6a983dc6da53fd9e03d97fd2a63d44af39c063537b626d
+  languageName: node
+  linkType: hard
+
 "tslib@npm:2.4.0":
   version: 2.4.0
   resolution: "tslib@npm:2.4.0"
@@ -14526,6 +14956,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^0.18.0":
+  version: 0.18.1
+  resolution: "type-fest@npm:0.18.1"
+  checksum: 10/08844377058435c2b0e633ba01bab6102dba0ed63d85417d8e18feff265eed6f5c9f8f9a25d405ea9db88a41a569be73a3c4c0d4e29150bf89fb145bb23114a2
+  languageName: node
+  linkType: hard
+
 "type-fest@npm:^0.21.3":
   version: 0.21.3
   resolution: "type-fest@npm:0.21.3"
@@ -14533,6 +14970,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "type-fest@npm:0.6.0"
+  checksum: 10/9ecbf4ba279402b14c1a0614b6761bbe95626fab11377291fecd7e32b196109551e0350dcec6af74d97ced1b000ba8060a23eca33157091e642b409c2054ba82
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^0.8.1":
+  version: 0.8.1
+  resolution: "type-fest@npm:0.8.1"
+  checksum: 10/fd4a91bfb706aeeb0d326ebd2e9a8ea5263979e5dec8d16c3e469a5bd3a946e014a062ef76c02e3086d3d1c7209a56a20a4caafd0e9f9a5c2ab975084ea3d388
+  languageName: node
+  linkType: hard
+
 "type-fest@npm:^4.0.0":
   version: 4.25.0
   resolution: "type-fest@npm:4.25.0"
@@ -14790,7 +15241,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"validate-npm-package-license@npm:^3.0.4":
+"validate-npm-package-license@npm:^3.0.1, validate-npm-package-license@npm:^3.0.4":
   version: 3.0.4
   resolution: "validate-npm-package-license@npm:3.0.4"
   dependencies:
@@ -15195,7 +15646,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:20.x, yargs-parser@npm:^20.2.2":
+"yargs-parser@npm:20.x, yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3":
   version: 20.2.9
   resolution: "yargs-parser@npm:20.2.9"
   checksum: 10/0188f430a0f496551d09df6719a9132a3469e47fe2747208b1dd0ab2bb0c512a95d0b081628bbca5400fb20dbf2fabe63d22badb346cecadffdd948b049f3fcc

From 7b65547ab43d4925bbc862fedb28c4f364e2bec4 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 09:24:43 -0700
Subject: [PATCH 02/20] chore: Update coverage

---
 packages/eth-json-rpc-middleware/jest.config.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/eth-json-rpc-middleware/jest.config.js b/packages/eth-json-rpc-middleware/jest.config.js
index fdd5dacf57..6da408fe7d 100644
--- a/packages/eth-json-rpc-middleware/jest.config.js
+++ b/packages/eth-json-rpc-middleware/jest.config.js
@@ -20,10 +20,10 @@ module.exports = merge(baseConfig, {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 77.19,
-      functions: 82.45,
-      lines: 83.89,
-      statements: 83.89,
+      branches: 67.25,
+      functions: 81.57,
+      lines: 79.71,
+      statements: 79.83,
     },
   },
 });

From e969889a794921bd0d4be9b166787ebacfdb8dcb Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 09:26:18 -0700
Subject: [PATCH 03/20] chore: Harmonize package scripts

---
 packages/eth-json-rpc-middleware/package.json | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json
index b5adb4b4d7..2fdf696b55 100644
--- a/packages/eth-json-rpc-middleware/package.json
+++ b/packages/eth-json-rpc-middleware/package.json
@@ -32,21 +32,22 @@
     "dist"
   ],
   "scripts": {
-    "build": "ts-bridge --project tsconfig.build.json --clean",
-    "build:clean": "rimraf dist && yarn build",
+    "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
     "build:docs": "typedoc",
-    "lint": "yarn lint:eslint && yarn lint:constraints && yarn lint:misc --check && yarn lint:dependencies --check && yarn lint:changelog",
-    "lint:changelog": "auto-changelog validate --prettier",
-    "lint:constraints": "yarn constraints",
-    "lint:dependencies": "depcheck && yarn dedupe --check",
-    "lint:dependencies:fix": "depcheck && yarn dedupe",
-    "lint:eslint": "eslint . --cache",
-    "lint:fix": "yarn lint:eslint --fix && yarn lint:constraints --fix && yarn lint:misc --write && yarn lint:dependencies:fix && yarn lint:changelog",
-    "lint:misc": "prettier '**/*.json' '**/*.md' '**/*.yml' '!.yarnrc.yml' --ignore-path .gitignore --no-error-on-unmatched-pattern",
-    "prepack": "./scripts/prepack.sh",
-    "test": "jest && yarn build:clean && yarn test:types",
-    "test:types": "tsd --files 'src/**/*.test-d.ts' && attw --pack",
-    "test:watch": "jest --watch"
+    "changelog:update": "../../scripts/update-changelog.sh @metamask/json-rpc-engine --tag-prefix-before-package-rename json-rpc-engine@ --version-before-package-rename 6.1.0",
+    "changelog:validate": "../../scripts/validate-changelog.sh @metamask/json-rpc-engine --tag-prefix-before-package-rename json-rpc-engine@ --version-before-package-rename 6.1.0",
+    "lint": "yarn lint:eslint && yarn lint:misc --check && yarn lint:dependencies && yarn lint:changelog",
+    "lint:changelog": "auto-changelog validate",
+    "lint:dependencies": "depcheck",
+    "lint:eslint": "eslint . --cache --ext js,ts",
+    "lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write && yarn lint:dependencies && yarn lint:changelog",
+    "lint:misc": "prettier '**/*.json' '**/*.md' '!CHANGELOG.md' '**/*.yml' '!.yarnrc.yml' --ignore-path .gitignore --no-error-on-unmatched-pattern",
+    "publish:preview": "yarn npm publish --tag preview",
+    "since-latest-release": "../../scripts/since-latest-release.sh",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
+    "test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
+    "test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
     "@metamask/eth-block-tracker": "^13.0.0",

From 235e8add9d47d2ed20f4305f419eeeff93ba87a1 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 09:35:31 -0700
Subject: [PATCH 04/20] chore: yarn dedupe

---
 yarn.lock | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index aad5750226..ee9f8ed8ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10748,16 +10748,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.12.0, is-core-module@npm:^2.13.0":
-  version: 2.15.1
-  resolution: "is-core-module@npm:2.15.1"
-  dependencies:
-    hasown: "npm:^2.0.2"
-  checksum: 10/77316d5891d5743854bcef2cd2f24c5458fb69fbc9705c12ca17d54a2017a67d0693bbf1ba8c77af376c0eef6bf6d1b27a4ab08e4db4e69914c3789bdf2ceec5
-  languageName: node
-  linkType: hard
-
-"is-core-module@npm:^2.16.0, is-core-module@npm:^2.5.0":
+"is-core-module@npm:^2.12.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.16.0, is-core-module@npm:^2.5.0":
   version: 2.16.1
   resolution: "is-core-module@npm:2.16.1"
   dependencies:
@@ -13732,7 +13723,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:1.22.8, resolve@npm:^1.20.0, resolve@npm:^1.22.3, resolve@npm:^1.22.4":
+"resolve@npm:1.22.8":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -13745,7 +13736,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.10.0":
+"resolve@npm:^1.10.0, resolve@npm:^1.20.0, resolve@npm:^1.22.3, resolve@npm:^1.22.4":
   version: 1.22.10
   resolution: "resolve@npm:1.22.10"
   dependencies:
@@ -13758,7 +13749,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.3#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -13771,7 +13762,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.3#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
   version: 1.22.10
   resolution: "resolve@patch:resolve@npm%3A1.22.10#optional!builtin<compat/resolve>::version=1.22.10&hash=c3c19d"
   dependencies:
@@ -13972,12 +13963,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.x, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3":
-  version: 7.6.3
-  resolution: "semver@npm:7.6.3"
+"semver@npm:7.x, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3":
+  version: 7.7.3
+  resolution: "semver@npm:7.7.3"
   bin:
     semver: bin/semver.js
-  checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10
+  checksum: 10/8dbc3168e057a38fc322af909c7f5617483c50caddba135439ff09a754b20bdd6482a5123ff543dad4affa488ecf46ec5fb56d61312ad20bb140199b88dfaea9
   languageName: node
   linkType: hard
 
@@ -13990,15 +13981,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.4":
-  version: 7.7.3
-  resolution: "semver@npm:7.7.3"
-  bin:
-    semver: bin/semver.js
-  checksum: 10/8dbc3168e057a38fc322af909c7f5617483c50caddba135439ff09a754b20bdd6482a5123ff543dad4affa488ecf46ec5fb56d61312ad20bb140199b88dfaea9
-  languageName: node
-  linkType: hard
-
 "send@npm:0.19.0":
   version: 0.19.0
   resolution: "send@npm:0.19.0"

From 98857a35ef8db78356b2f51707e36857b94c5de8 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 09:47:09 -0700
Subject: [PATCH 05/20] chore: Update eslint config, lint

---
 eslint.config.mjs                             | 29 +++++++++++++++++++
 .../src/retryOnEmpty.test.ts                  | 13 +++++----
 .../src/utils/timeout.test.ts                 |  2 +-
 .../eth-json-rpc-middleware/src/wallet.ts     |  1 -
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index fc9c9fbb43..92e792c13f 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -218,6 +218,35 @@ const config = createConfig([
       sourceType: 'module',
     },
   },
+  {
+    files: ['packages/*/test/**/*.{js,ts}'],
+    rules: {
+      'import-x/no-nodejs-modules': 'off',
+    },
+  },
+  {
+    files: ['packages/eth-json-rpc-middleware/**/*.ts'],
+    rules: {
+      // TODO: Review and re-enable these rules
+      '@typescript-eslint/consistent-type-definitions': 'off',
+      '@typescript-eslint/explicit-function-return-type': 'warn',
+      '@typescript-eslint/naming-convention': 'off',
+      '@typescript-eslint/no-explicit-any': 'warn',
+      '@typescript-eslint/prefer-nullish-coalescing': 'warn',
+      '@typescript-eslint/prefer-optional-chain': 'warn',
+      '@typescript-eslint/restrict-template-expressions': 'off',
+      'id-denylist': 'off',
+      'id-length': 'off',
+      'import/no-nodejs-modules': 'off',
+      'jsdoc/match-description': 'warn',
+      'jsdoc/no-types': 'warn',
+      'jsdoc/require-hyphen-before-param-description': 'warn',
+      'jsdoc/require-jsdoc': 'off',
+      'jsdoc/require-param-description': 'warn',
+      'no-restricted-globals': 'off',
+      'no-restricted-syntax': 'warn',
+    },
+  },
   {
     files: ['packages/foundryup/**/*.{js,ts}'],
     rules: {
diff --git a/packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts b/packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts
index 0d82072633..9434f34ba5 100644
--- a/packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts
+++ b/packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts
@@ -717,10 +717,11 @@ function stubGenericRequest<T extends JsonRpcParams, U extends Json>(
  * will error for the first N instances and then succeed on the last instance.
  * Intended to be used in conjunction with `stubProviderRequests`.
  *
- * @param request - The request matcher for the stub.
- * @param numberOfTimesToFail - The number of times the request is expected to
+ * @param args - The arguments.
+ * @param args.request - The request matcher for the stub.
+ * @param args.numberOfTimesToFail - The number of times the request is expected to
  * be called until it returns a successful result.
- * @param successfulResult - The result that `provider.request` will
+ * @param args.successfulResult - The result that `provider.request` will
  * return when called past `numberOfTimesToFail`.
  * @returns The request/result pair, properly typed.
  */
@@ -763,10 +764,10 @@ function stubRequestThatFailsThenFinallySucceeds<
  * `provider.request` has been called the given number of times.
  *
  * @param args - The arguments.
- * @param requestSpy - The Jest spy object that represents
+ * @param args.requestSpy - The Jest spy object that represents
  * `provider.request`.
- * @param request - The request object.
- * @param numberOfTimes - The number of times that we expect
+ * @param args.request - The request object.
+ * @param args.numberOfTimes - The number of times that we expect
  * `provider.request` to be called with `request`.
  */
 async function waitForRequestToBeRetried({
diff --git a/packages/eth-json-rpc-middleware/src/utils/timeout.test.ts b/packages/eth-json-rpc-middleware/src/utils/timeout.test.ts
index 61cfb4b661..5999aac4cb 100644
--- a/packages/eth-json-rpc-middleware/src/utils/timeout.test.ts
+++ b/packages/eth-json-rpc-middleware/src/utils/timeout.test.ts
@@ -53,7 +53,7 @@ describe('timeout', () => {
 
       jest.advanceTimersByTime(50);
 
-      expect(promise).toNeverResolve();
+      await expect(promise).toNeverResolve();
     });
 
     it('resolves after the given duration', async () => {
diff --git a/packages/eth-json-rpc-middleware/src/wallet.ts b/packages/eth-json-rpc-middleware/src/wallet.ts
index b760e874d3..6b918c1a06 100644
--- a/packages/eth-json-rpc-middleware/src/wallet.ts
+++ b/packages/eth-json-rpc-middleware/src/wallet.ts
@@ -374,7 +374,6 @@ WalletMiddlewareOptions): JsonRpcMiddleware<any, Block> {
       signatureMethod: 'personal_sign',
     };
 
-    // eslint-disable-next-line require-atomic-updates
     res.result = await processPersonalMessage(msgParams, req);
   }
 

From 78bcb1b82a43b5a267ff96d8e2e1000127cafbfe Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 09:50:29 -0700
Subject: [PATCH 06/20] chore: Harmonize dependencies again

---
 packages/eth-json-rpc-middleware/package.json |  2 +-
 packages/network-controller/package.json      |  2 +-
 .../network-controller/tsconfig.build.json    |  1 +
 packages/network-controller/tsconfig.json     |  1 +
 yarn.lock                                     | 42 +++----------------
 5 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json
index 2fdf696b55..e2ea5aee18 100644
--- a/packages/eth-json-rpc-middleware/package.json
+++ b/packages/eth-json-rpc-middleware/package.json
@@ -50,7 +50,7 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/eth-block-tracker": "^13.0.0",
+    "@metamask/eth-block-tracker": "^12.2.1",
     "@metamask/eth-json-rpc-provider": "^5.0.1",
     "@metamask/eth-sig-util": "^8.2.0",
     "@metamask/json-rpc-engine": "^10.1.1",
diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json
index 410f8efe0c..092209ed41 100644
--- a/packages/network-controller/package.json
+++ b/packages/network-controller/package.json
@@ -51,7 +51,7 @@
     "@metamask/controller-utils": "^11.14.1",
     "@metamask/eth-block-tracker": "^12.2.1",
     "@metamask/eth-json-rpc-infura": "^10.3.0",
-    "@metamask/eth-json-rpc-middleware": "^19.0.1",
+    "@metamask/eth-json-rpc-middleware": "^20.0.0",
     "@metamask/eth-json-rpc-provider": "^5.0.1",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/json-rpc-engine": "^10.1.1",
diff --git a/packages/network-controller/tsconfig.build.json b/packages/network-controller/tsconfig.build.json
index fb5b1cb08e..582b31570b 100644
--- a/packages/network-controller/tsconfig.build.json
+++ b/packages/network-controller/tsconfig.build.json
@@ -8,6 +8,7 @@
   "references": [
     { "path": "../base-controller/tsconfig.build.json" },
     { "path": "../controller-utils/tsconfig.build.json" },
+    { "path": "../eth-json-rpc-middleware/tsconfig.build.json" },
     { "path": "../eth-json-rpc-provider/tsconfig.build.json" },
     { "path": "../json-rpc-engine/tsconfig.build.json" },
     { "path": "../error-reporting-service/tsconfig.build.json" }
diff --git a/packages/network-controller/tsconfig.json b/packages/network-controller/tsconfig.json
index cc0926fbd0..6442a10c96 100644
--- a/packages/network-controller/tsconfig.json
+++ b/packages/network-controller/tsconfig.json
@@ -7,6 +7,7 @@
   "references": [
     { "path": "../base-controller" },
     { "path": "../controller-utils" },
+    { "path": "../eth-json-rpc-middleware" },
     { "path": "../eth-json-rpc-provider" },
     { "path": "../json-rpc-engine" },
     { "path": "../error-reporting-service" }
diff --git a/yarn.lock b/yarn.lock
index ee9f8ed8ac..d5e7a61a89 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3426,18 +3426,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-block-tracker@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "@metamask/eth-block-tracker@npm:13.0.0"
-  dependencies:
-    "@metamask/eth-json-rpc-provider": "npm:^5.0.0"
-    "@metamask/safe-event-emitter": "npm:^3.1.1"
-    "@metamask/utils": "npm:^11.0.1"
-    json-rpc-random-id: "npm:^1.0.1"
-  checksum: 10/e2b84d5bf3ef36939ea98755cd9515355a34b164c3d9e071237e18cef6300b4e150657f7d6ed1ba03b56000c01b8b1a4edf829558546f5e2a9a1cac2f03fc6ee
-  languageName: node
-  linkType: hard
-
 "@metamask/eth-hd-keyring@npm:^13.0.0":
   version: 13.0.0
   resolution: "@metamask/eth-hd-keyring@npm:13.0.0"
@@ -3478,33 +3466,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-middleware@npm:^19.0.1":
-  version: 19.0.1
-  resolution: "@metamask/eth-json-rpc-middleware@npm:19.0.1"
-  dependencies:
-    "@metamask/eth-block-tracker": "npm:^12.2.1"
-    "@metamask/eth-json-rpc-provider": "npm:^5.0.0"
-    "@metamask/eth-sig-util": "npm:^8.1.2"
-    "@metamask/json-rpc-engine": "npm:^10.1.0"
-    "@metamask/rpc-errors": "npm:^7.0.2"
-    "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^11.7.0"
-    "@types/bn.js": "npm:^5.1.5"
-    bn.js: "npm:^5.2.1"
-    klona: "npm:^2.0.6"
-    pify: "npm:^5.0.0"
-    safe-stable-stringify: "npm:^2.4.3"
-  checksum: 10/13e93b51c477c62cfd6719b84dee0c8f6b0660cf09c30ce9c0e32dcad0298957b17b3556f2df5ceb33fc115a0261f93ab8a7f37d398bb3832d20e6189f39b259
-  languageName: node
-  linkType: hard
-
-"@metamask/eth-json-rpc-middleware@workspace:packages/eth-json-rpc-middleware":
+"@metamask/eth-json-rpc-middleware@npm:^20.0.0, @metamask/eth-json-rpc-middleware@workspace:packages/eth-json-rpc-middleware":
   version: 0.0.0-use.local
   resolution: "@metamask/eth-json-rpc-middleware@workspace:packages/eth-json-rpc-middleware"
   dependencies:
     "@metamask/auto-changelog": "npm:^3.4.4"
     "@metamask/error-reporting-service": "npm:^2.2.1"
-    "@metamask/eth-block-tracker": "npm:^13.0.0"
+    "@metamask/eth-block-tracker": "npm:^12.2.1"
     "@metamask/eth-json-rpc-provider": "npm:^5.0.1"
     "@metamask/eth-sig-util": "npm:^8.2.0"
     "@metamask/json-rpc-engine": "npm:^10.1.1"
@@ -3559,7 +3527,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-sig-util@npm:^8.1.2, @metamask/eth-sig-util@npm:^8.2.0":
+"@metamask/eth-sig-util@npm:^8.2.0":
   version: 8.2.0
   resolution: "@metamask/eth-sig-util@npm:8.2.0"
   dependencies:
@@ -4231,7 +4199,7 @@ __metadata:
     "@metamask/error-reporting-service": "npm:^2.2.1"
     "@metamask/eth-block-tracker": "npm:^12.2.1"
     "@metamask/eth-json-rpc-infura": "npm:^10.3.0"
-    "@metamask/eth-json-rpc-middleware": "npm:^19.0.1"
+    "@metamask/eth-json-rpc-middleware": "npm:^20.0.0"
     "@metamask/eth-json-rpc-provider": "npm:^5.0.1"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/json-rpc-engine": "npm:^10.1.1"
@@ -5081,7 +5049,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@metamask/utils@npm:^11.0.1, @metamask/utils@npm:^11.1.0, @metamask/utils@npm:^11.4.0, @metamask/utils@npm:^11.7.0, @metamask/utils@npm:^11.8.1":
+"@metamask/utils@npm:^11.0.1, @metamask/utils@npm:^11.1.0, @metamask/utils@npm:^11.4.0, @metamask/utils@npm:^11.8.1":
   version: 11.8.1
   resolution: "@metamask/utils@npm:11.8.1"
   dependencies:

From 0bc3dee2bc6d8576e8467227721d413d09d02263 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:02:10 -0700
Subject: [PATCH 07/20] chore: Get builds passing

---
 packages/eth-json-rpc-middleware/tsconfig.build.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/eth-json-rpc-middleware/tsconfig.build.json b/packages/eth-json-rpc-middleware/tsconfig.build.json
index c8e3a94221..21664c44fe 100644
--- a/packages/eth-json-rpc-middleware/tsconfig.build.json
+++ b/packages/eth-json-rpc-middleware/tsconfig.build.json
@@ -14,10 +14,8 @@
     },
     {
       "path": "../../packages/json-rpc-engine/tsconfig.build.json"
-    },
-    {
-      "path": "../../packages/network-controller/tsconfig.build.json"
     }
   ],
-  "include": ["../../types", "./src"]
+  "include": ["../../types", "./src"],
+  "exclude": ["**/*.test.ts", "**/*.test-d.ts"]
 }

From 03c8bb87a66a1555e73bf1cc30d562d24af197a8 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:05:28 -0700
Subject: [PATCH 08/20] chore: Update eslint warning thresholds

---
 eslint-warning-thresholds.json | 98 ++++++++++++++++++++++++++++++----
 1 file changed, 87 insertions(+), 11 deletions(-)

diff --git a/eslint-warning-thresholds.json b/eslint-warning-thresholds.json
index 254e13963d..2d777b5c9a 100644
--- a/eslint-warning-thresholds.json
+++ b/eslint-warning-thresholds.json
@@ -133,14 +133,99 @@
     "@typescript-eslint/prefer-promise-reject-errors": 1,
     "promise/param-names": 3
   },
+  "packages/eip-5792-middleware/src/hooks/processSendCalls.ts": {
+    "@typescript-eslint/no-misused-promises": 1
+  },
   "packages/ens-controller/src/EnsController.test.ts": {
     "import-x/order": 2
   },
   "packages/ens-controller/src/EnsController.ts": {
     "jsdoc/check-tag-names": 6
   },
-  "packages/eip-5792-middleware/src/hooks/processSendCalls.ts": {
-    "@typescript-eslint/no-misused-promises": 1
+  "packages/eth-json-rpc-middleware/src/block-cache.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1
+  },
+  "packages/eth-json-rpc-middleware/src/block-cache.ts": {
+    "@typescript-eslint/no-explicit-any": 1,
+    "no-restricted-syntax": 1
+  },
+  "packages/eth-json-rpc-middleware/src/block-ref.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1,
+    "@typescript-eslint/no-explicit-any": 4,
+    "jest/expect-expect": 2,
+    "jsdoc/match-description": 1
+  },
+  "packages/eth-json-rpc-middleware/src/block-tracker-inspector.ts": {
+    "@typescript-eslint/no-explicit-any": 1,
+    "jsdoc/match-description": 1
+  },
+  "packages/eth-json-rpc-middleware/src/fetch.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1,
+    "jsdoc/match-description": 1
+  },
+  "packages/eth-json-rpc-middleware/src/fetch.ts": {
+    "jsdoc/match-description": 1
+  },
+  "packages/eth-json-rpc-middleware/src/inflight-cache.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1
+  },
+  "packages/eth-json-rpc-middleware/src/inflight-cache.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1,
+    "@typescript-eslint/no-explicit-any": 1
+  },
+  "packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1
+  },
+  "packages/eth-json-rpc-middleware/src/methods/wallet-revoke-execution-permission.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1
+  },
+  "packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 4,
+    "@typescript-eslint/no-explicit-any": 4,
+    "jest/expect-expect": 5,
+    "jsdoc/match-description": 4
+  },
+  "packages/eth-json-rpc-middleware/src/utils/cache.ts": {
+    "jsdoc/match-description": 6
+  },
+  "packages/eth-json-rpc-middleware/src/utils/common.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1,
+    "jsdoc/match-description": 1
+  },
+  "packages/eth-json-rpc-middleware/src/utils/normalize.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1
+  },
+  "packages/eth-json-rpc-middleware/src/utils/normalize.ts": {
+    "@typescript-eslint/explicit-function-return-type": 2,
+    "jsdoc/match-description": 3
+  },
+  "packages/eth-json-rpc-middleware/src/utils/timeout.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 4
+  },
+  "packages/eth-json-rpc-middleware/src/utils/timeout.ts": {
+    "jsdoc/match-description": 1
+  },
+  "packages/eth-json-rpc-middleware/src/wallet.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 53
+  },
+  "packages/eth-json-rpc-middleware/src/wallet.ts": {
+    "@typescript-eslint/explicit-function-return-type": 2,
+    "@typescript-eslint/no-explicit-any": 2,
+    "@typescript-eslint/prefer-nullish-coalescing": 5,
+    "jsdoc/match-description": 3
+  },
+  "packages/eth-json-rpc-middleware/test/setupAfterEnv.ts": {
+    "@typescript-eslint/explicit-function-return-type": 2,
+    "@typescript-eslint/no-explicit-any": 3,
+    "jsdoc/match-description": 2
+  },
+  "packages/eth-json-rpc-middleware/test/util/createHitTrackerMiddleware.ts": {
+    "@typescript-eslint/explicit-function-return-type": 2
+  },
+  "packages/eth-json-rpc-middleware/test/util/helpers.ts": {
+    "@typescript-eslint/explicit-function-return-type": 4,
+    "@typescript-eslint/no-explicit-any": 1,
+    "jsdoc/match-description": 9
   },
   "packages/eth-json-rpc-provider/src/safe-event-emitter-provider.test.ts": {
     "import-x/namespace": 1
@@ -256,15 +341,6 @@
     "@typescript-eslint/no-unused-vars": 1,
     "@typescript-eslint/prefer-promise-reject-errors": 1
   },
-  "packages/network-controller/tests/create-network-client.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/network-controller/tests/provider-api-tests/helpers.ts": {
-    "@typescript-eslint/prefer-promise-reject-errors": 1,
-    "import-x/namespace": 1,
-    "import-x/no-named-as-default-member": 1,
-    "promise/catch-or-return": 1
-  },
   "packages/permission-controller/src/Permission.ts": {
     "prettier/prettier": 11
   },

From 12011b621dc63280d9b99cad0b41a29c2cc5a96c Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:14:38 -0700
Subject: [PATCH 09/20] chore: Update network-controller changelog

---
 packages/network-controller/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/network-controller/CHANGELOG.md b/packages/network-controller/CHANGELOG.md
index 62b6db5d7a..4070fff5bf 100644
--- a/packages/network-controller/CHANGELOG.md
+++ b/packages/network-controller/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Bump `@metamask/eth-json-rpc-middleware` from `^19.0.1` to `^20.0.0` ([#6866](https://github.com/MetaMask/core/pull/6866))
+
 ## [24.2.2]
 
 ### Changed

From 50163dc1fe0f299a53976b774e8f1f71fcc4e1fb Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:14:48 -0700
Subject: [PATCH 10/20] refactor: Please the linter

---
 packages/eth-json-rpc-middleware/src/inflight-cache.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/eth-json-rpc-middleware/src/inflight-cache.test.ts b/packages/eth-json-rpc-middleware/src/inflight-cache.test.ts
index 2938c2f766..6c0cd9361b 100644
--- a/packages/eth-json-rpc-middleware/src/inflight-cache.test.ts
+++ b/packages/eth-json-rpc-middleware/src/inflight-cache.test.ts
@@ -25,7 +25,7 @@ describe('inflight cache', () => {
       res.result = true;
       // eslint-disable-next-line jest/no-conditional-in-test
       if (hitCount === 1) {
-        setTimeout(end, 100);
+        setTimeout(() => end(), 100);
       }
     });
 

From 1f73aaeda419829faedaf60d8d74b63a7abe2bdb Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:16:02 -0700
Subject: [PATCH 11/20] docs: Fix changelog

---
 packages/eth-json-rpc-middleware/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/eth-json-rpc-middleware/CHANGELOG.md b/packages/eth-json-rpc-middleware/CHANGELOG.md
index 85b00a5cca..57b89b05b4 100644
--- a/packages/eth-json-rpc-middleware/CHANGELOG.md
+++ b/packages/eth-json-rpc-middleware/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
 - This package was migrated from `MetaMask/eth-json-rpc-middleware` to the
   `MetaMask/core` monorepo.
   - See [`MetaMask/eth-json-rpc-middleware`](https://github.com/MetaMask/eth-json-rpc-middleware/blob/main/CHANGELOG.md)

From 9d9d619f62dff3abbf2d3098e0eab275d6c215ce Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:18:42 -0700
Subject: [PATCH 12/20] docs: Fix network-controller changelog

---
 packages/network-controller/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/network-controller/CHANGELOG.md b/packages/network-controller/CHANGELOG.md
index 4070fff5bf..10f25bee59 100644
--- a/packages/network-controller/CHANGELOG.md
+++ b/packages/network-controller/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
 - Bump `@metamask/eth-json-rpc-middleware` from `^19.0.1` to `^20.0.0` ([#6866](https://github.com/MetaMask/core/pull/6866))
 
 ## [24.2.2]

From 026985f44f24ad5ed836945f6e909c1470cebf79 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:31:22 -0700
Subject: [PATCH 13/20] chore: yarn constraints --fix

---
 .github/CODEOWNERS                            | 25 +++++++++++--------
 packages/eth-json-rpc-middleware/package.json | 19 ++++++++------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 59861240ba..540d33acde 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -67,6 +67,7 @@
 /packages/composable-controller        @MetaMask/core-platform
 /packages/controller-utils             @MetaMask/core-platform
 /packages/error-reporting-service      @MetaMask/core-platform
+/packages/eth-json-rpc-middleware      @MetaMask/core-platform
 /packages/messenger                    @MetaMask/core-platform
 /packages/sample-controllers           @MetaMask/core-platform
 /packages/polling-controller           @MetaMask/core-platform
@@ -82,17 +83,19 @@
 /packages/subscription-controller        @MetaMask/web3auth
 
 ## Joint team ownership
-/packages/eth-json-rpc-provider        @MetaMask/wallet-integrations @MetaMask/core-platform
-/packages/json-rpc-engine              @MetaMask/wallet-integrations @MetaMask/core-platform
-/packages/json-rpc-middleware-stream   @MetaMask/wallet-integrations @MetaMask/core-platform
-/packages/keyring-controller           @MetaMask/accounts-engineers @MetaMask/core-platform
-/packages/multichain-network-controller  @MetaMask/core-platform @MetaMask/accounts-engineers @MetaMask/metamask-assets
-/packages/network-controller           @MetaMask/core-platform @MetaMask/metamask-assets
-/packages/permission-controller        @MetaMask/wallet-integrations @MetaMask/core-platform
-/packages/permission-log-controller    @MetaMask/wallet-integrations @MetaMask/core-platform
-/packages/remote-feature-flag-controller @MetaMask/extension-platform @MetaMask/mobile-platform
-/packages/foundryup                    @MetaMask/mobile-platform @MetaMask/extension-platform
-/packages/core-backend                 @MetaMask/core-platform @MetaMask/metamask-assets
+/packages/core-backend                          @MetaMask/core-platform @MetaMask/metamask-assets
+/packages/eth-json-rpc-middleware/src/methods   @MetaMask/confirmations @MetaMask/wallet-api-platform-engineers
+/packages/eth-json-rpc-middleware/src/wallet.*  @MetaMask/confirmations @MetaMask/wallet-api-platform-engineers
+/packages/eth-json-rpc-provider                 @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/foundryup                             @MetaMask/mobile-platform @MetaMask/extension-platform
+/packages/json-rpc-engine                       @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/json-rpc-middleware-stream            @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/keyring-controller                    @MetaMask/accounts-engineers @MetaMask/core-platform
+/packages/multichain-network-controller         @MetaMask/core-platform @MetaMask/accounts-engineers @MetaMask/metamask-assets
+/packages/network-controller                    @MetaMask/core-platform @MetaMask/metamask-assets
+/packages/permission-controller                 @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/permission-log-controller             @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/remote-feature-flag-controller        @MetaMask/extension-platform @MetaMask/mobile-platform @MetaMask/core-platform
 
 ## Package Release related
 /packages/account-tree-controller/package.json  @MetaMask/accounts-engineers @MetaMask/core-platform
diff --git a/packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json
index e2ea5aee18..349a05097e 100644
--- a/packages/eth-json-rpc-middleware/package.json
+++ b/packages/eth-json-rpc-middleware/package.json
@@ -2,9 +2,9 @@
   "name": "@metamask/eth-json-rpc-middleware",
   "version": "20.0.0",
   "description": "Ethereum-related json-rpc-engine middleware",
-  "homepage": "https://github.com/MetaMask/eth-json-rpc-middleware#readme",
+  "homepage": "https://github.com/MetaMask/core/tree/main/packages/eth-json-rpc-middleware#readme",
   "bugs": {
-    "url": "https://github.com/MetaMask/eth-json-rpc-middleware/issues"
+    "url": "https://github.com/MetaMask/core/issues"
   },
   "repository": {
     "type": "git",
@@ -29,13 +29,13 @@
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",
   "files": [
-    "dist"
+    "dist/"
   ],
   "scripts": {
     "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
     "build:docs": "typedoc",
-    "changelog:update": "../../scripts/update-changelog.sh @metamask/json-rpc-engine --tag-prefix-before-package-rename json-rpc-engine@ --version-before-package-rename 6.1.0",
-    "changelog:validate": "../../scripts/validate-changelog.sh @metamask/json-rpc-engine --tag-prefix-before-package-rename json-rpc-engine@ --version-before-package-rename 6.1.0",
+    "changelog:update": "../../scripts/update-changelog.sh @metamask/eth-json-rpc-middleware --tag-prefix-before-package-rename eth-json-rpc-middleware@ --version-before-package-rename 6.1.0",
+    "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eth-json-rpc-middleware --tag-prefix-before-package-rename eth-json-rpc-middleware@ --version-before-package-rename 6.1.0",
     "lint": "yarn lint:eslint && yarn lint:misc --check && yarn lint:dependencies && yarn lint:changelog",
     "lint:changelog": "auto-changelog validate",
     "lint:dependencies": "depcheck",
@@ -73,9 +73,8 @@
     "typedoc": "^0.24.8",
     "typescript": "~5.2.2"
   },
-  "packageManager": "yarn@4.1.1",
   "engines": {
-    "node": "^18.16 || ^20 || >=22"
+    "node": "^18.18 || >=20"
   },
   "publishConfig": {
     "access": "public",
@@ -88,5 +87,9 @@
       "@metamask/eth-sig-util>ethereumjs-util>ethereum-cryptography>secp256k1": false,
       "eslint-plugin-import-x>unrs-resolver": false
     }
-  }
+  },
+  "keywords": [
+    "MetaMask",
+    "Ethereum"
+  ]
 }

From 59801d012d8a5aacb77b2679304488ae76eaf5cf Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:34:28 -0700
Subject: [PATCH 14/20] chore: Lint package.json

---
 packages/eth-json-rpc-middleware/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json
index 349a05097e..87d907a911 100644
--- a/packages/eth-json-rpc-middleware/package.json
+++ b/packages/eth-json-rpc-middleware/package.json
@@ -2,6 +2,10 @@
   "name": "@metamask/eth-json-rpc-middleware",
   "version": "20.0.0",
   "description": "Ethereum-related json-rpc-engine middleware",
+  "keywords": [
+    "MetaMask",
+    "Ethereum"
+  ],
   "homepage": "https://github.com/MetaMask/core/tree/main/packages/eth-json-rpc-middleware#readme",
   "bugs": {
     "url": "https://github.com/MetaMask/core/issues"
@@ -87,9 +91,5 @@
       "@metamask/eth-sig-util>ethereumjs-util>ethereum-cryptography>secp256k1": false,
       "eslint-plugin-import-x>unrs-resolver": false
     }
-  },
-  "keywords": [
-    "MetaMask",
-    "Ethereum"
-  ]
+  }
 }

From ce3d3e0455395fb25e0f39947080463e984e4aa7 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:37:22 -0700
Subject: [PATCH 15/20] chore: Update teams.json

---
 teams.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/teams.json b/teams.json
index 15b053fb6b..583095e62e 100644
--- a/teams.json
+++ b/teams.json
@@ -18,6 +18,7 @@
   "metamask/eip-5792-middleware": "team-wallet-api-platform",
   "metamask/eip1193-permission-middleware": "team-wallet-api-platform",
   "metamask/ens-controller": "team-confirmations",
+  "metamask/eth-json-rpc-middleware": "team-wallet-api-platform,team-wallet-framework",
   "metamask/eth-json-rpc-provider": "team-wallet-api-platform,team-wallet-framework",
   "metamask/gas-fee-controller": "team-confirmations",
   "metamask/gator-permissions-controller": "team-delegation",

From 57c812483ae9718428dc2450a1c9a401dd7d725e Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:39:21 -0700
Subject: [PATCH 16/20] chore: Add license field exception

---
 yarn.config.cjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yarn.config.cjs b/yarn.config.cjs
index d97a61ff06..ffb1669c3f 100644
--- a/yarn.config.cjs
+++ b/yarn.config.cjs
@@ -500,6 +500,7 @@ async function expectWorkspaceLicense(workspace) {
       '@metamask/json-rpc-engine',
       '@metamask/json-rpc-middleware-stream',
       '@metamask/permission-log-controller',
+      '@metamask/eth-json-rpc-middleware',
       '@metamask/eth-json-rpc-provider',
     ].includes(workspace.manifest.name)
   ) {

From 7b9c1b228b3d3fe64f39c7bb7f86907ffa56cb3a Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:40:58 -0700
Subject: [PATCH 17/20] docs: Update changelog again

---
 packages/eth-json-rpc-middleware/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/eth-json-rpc-middleware/CHANGELOG.md b/packages/eth-json-rpc-middleware/CHANGELOG.md
index 57b89b05b4..b677318649 100644
--- a/packages/eth-json-rpc-middleware/CHANGELOG.md
+++ b/packages/eth-json-rpc-middleware/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- **BREAKING:** Increase minimum Node.js version from `^18.16` to `^18.18` ([#6866](https://github.com/MetaMask/core/pull/6866))
 - This package was migrated from `MetaMask/eth-json-rpc-middleware` to the
   `MetaMask/core` monorepo.
   - See [`MetaMask/eth-json-rpc-middleware`](https://github.com/MetaMask/eth-json-rpc-middleware/blob/main/CHANGELOG.md)

From f62569470a0271d81ba15fa8d4d0c282647e8958 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:52:14 -0700
Subject: [PATCH 18/20] chore: Tweak eslint config

---
 eslint.config.mjs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 92e792c13f..887ec466ca 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -62,6 +62,7 @@ const config = createConfig([
     files: [
       '**/*.{js,cjs,mjs}',
       '**/*.test.{js,ts}',
+      '**/test/**/*.{js,ts}',
       '**/tests/**/*.{js,ts}',
       'scripts/*.ts',
       'scripts/create-package/**/*.ts',
@@ -218,12 +219,6 @@ const config = createConfig([
       sourceType: 'module',
     },
   },
-  {
-    files: ['packages/*/test/**/*.{js,ts}'],
-    rules: {
-      'import-x/no-nodejs-modules': 'off',
-    },
-  },
   {
     files: ['packages/eth-json-rpc-middleware/**/*.ts'],
     rules: {
@@ -237,7 +232,6 @@ const config = createConfig([
       '@typescript-eslint/restrict-template-expressions': 'off',
       'id-denylist': 'off',
       'id-length': 'off',
-      'import/no-nodejs-modules': 'off',
       'jsdoc/match-description': 'warn',
       'jsdoc/no-types': 'warn',
       'jsdoc/require-hyphen-before-param-description': 'warn',

From efd2d67d967169e5447a356244cee27dc9bec337 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 11:01:16 -0700
Subject: [PATCH 19/20] chore: Update per migrated eth-block-tracker

---
 packages/eth-json-rpc-middleware/CHANGELOG.md     |  1 +
 packages/eth-json-rpc-middleware/package.json     |  2 +-
 .../eth-json-rpc-middleware/tsconfig.build.json   |  3 +++
 packages/eth-json-rpc-middleware/tsconfig.json    |  3 +++
 yarn.lock                                         | 15 +--------------
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/eth-json-rpc-middleware/CHANGELOG.md b/packages/eth-json-rpc-middleware/CHANGELOG.md
index b677318649..b563883dc0 100644
--- a/packages/eth-json-rpc-middleware/CHANGELOG.md
+++ b/packages/eth-json-rpc-middleware/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - **BREAKING:** Increase minimum Node.js version from `^18.16` to `^18.18` ([#6866](https://github.com/MetaMask/core/pull/6866))
+- Bump `@metamask/eth-block-tracker` from `^12.2.1` to `^13.0.0` ([#6866](https://github.com/MetaMask/core/pull/6866))
 - This package was migrated from `MetaMask/eth-json-rpc-middleware` to the
   `MetaMask/core` monorepo.
   - See [`MetaMask/eth-json-rpc-middleware`](https://github.com/MetaMask/eth-json-rpc-middleware/blob/main/CHANGELOG.md)
diff --git a/packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json
index 87d907a911..99efb845a5 100644
--- a/packages/eth-json-rpc-middleware/package.json
+++ b/packages/eth-json-rpc-middleware/package.json
@@ -54,7 +54,7 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/eth-block-tracker": "^12.2.1",
+    "@metamask/eth-block-tracker": "^13.0.0",
     "@metamask/eth-json-rpc-provider": "^5.0.1",
     "@metamask/eth-sig-util": "^8.2.0",
     "@metamask/json-rpc-engine": "^10.1.1",
diff --git a/packages/eth-json-rpc-middleware/tsconfig.build.json b/packages/eth-json-rpc-middleware/tsconfig.build.json
index 21664c44fe..737aadd1ef 100644
--- a/packages/eth-json-rpc-middleware/tsconfig.build.json
+++ b/packages/eth-json-rpc-middleware/tsconfig.build.json
@@ -9,6 +9,9 @@
     {
       "path": "../../packages/error-reporting-service/tsconfig.build.json"
     },
+    {
+      "path": "../../packages/eth-block-tracker/tsconfig.build.json"
+    },
     {
       "path": "../../packages/eth-json-rpc-provider/tsconfig.build.json"
     },
diff --git a/packages/eth-json-rpc-middleware/tsconfig.json b/packages/eth-json-rpc-middleware/tsconfig.json
index 063389352e..9ba2128a4c 100644
--- a/packages/eth-json-rpc-middleware/tsconfig.json
+++ b/packages/eth-json-rpc-middleware/tsconfig.json
@@ -7,6 +7,9 @@
     {
       "path": "../../packages/error-reporting-service"
     },
+    {
+      "path": "../../packages/eth-block-tracker"
+    },
     {
       "path": "../../packages/eth-json-rpc-provider"
     },
diff --git a/yarn.lock b/yarn.lock
index 73f6469c10..4ba07d4a08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3413,19 +3413,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-block-tracker@npm:^12.2.1":
-  version: 12.2.1
-  resolution: "@metamask/eth-block-tracker@npm:12.2.1"
-  dependencies:
-    "@metamask/eth-json-rpc-provider": "npm:^5.0.0"
-    "@metamask/safe-event-emitter": "npm:^3.1.1"
-    "@metamask/utils": "npm:^11.0.1"
-    json-rpc-random-id: "npm:^1.0.1"
-    pify: "npm:^5.0.0"
-  checksum: 10/70f0f4179bb7d0d9d64d54887ea03302e74221c92971a7081db05811d97cc85b8d75d95cf00ea09b10a0188c1c3cde34896d97d1952623e99ea124ac5e5eeb67
-  languageName: node
-  linkType: hard
-
 "@metamask/eth-block-tracker@npm:^13.0.0, @metamask/eth-block-tracker@workspace:packages/eth-block-tracker":
   version: 0.0.0-use.local
   resolution: "@metamask/eth-block-tracker@workspace:packages/eth-block-tracker"
@@ -3493,7 +3480,7 @@ __metadata:
   dependencies:
     "@metamask/auto-changelog": "npm:^3.4.4"
     "@metamask/error-reporting-service": "npm:^2.2.1"
-    "@metamask/eth-block-tracker": "npm:^12.2.1"
+    "@metamask/eth-block-tracker": "npm:^13.0.0"
     "@metamask/eth-json-rpc-provider": "npm:^5.0.1"
     "@metamask/eth-sig-util": "npm:^8.2.0"
     "@metamask/json-rpc-engine": "npm:^10.1.1"

From adc1d209d52309d3d53ecd1ea5b4d3bd5563c8c4 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Thu, 16 Oct 2025 11:08:08 -0700
Subject: [PATCH 20/20] chore: Fix paths in tsconfig files

---
 packages/eth-json-rpc-middleware/tsconfig.build.json |  8 ++++----
 packages/eth-json-rpc-middleware/tsconfig.json       | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/eth-json-rpc-middleware/tsconfig.build.json b/packages/eth-json-rpc-middleware/tsconfig.build.json
index 737aadd1ef..f3452fcd99 100644
--- a/packages/eth-json-rpc-middleware/tsconfig.build.json
+++ b/packages/eth-json-rpc-middleware/tsconfig.build.json
@@ -7,16 +7,16 @@
   },
   "references": [
     {
-      "path": "../../packages/error-reporting-service/tsconfig.build.json"
+      "path": "../error-reporting-service/tsconfig.build.json"
     },
     {
-      "path": "../../packages/eth-block-tracker/tsconfig.build.json"
+      "path": "../eth-block-tracker/tsconfig.build.json"
     },
     {
-      "path": "../../packages/eth-json-rpc-provider/tsconfig.build.json"
+      "path": "../eth-json-rpc-provider/tsconfig.build.json"
     },
     {
-      "path": "../../packages/json-rpc-engine/tsconfig.build.json"
+      "path": "../json-rpc-engine/tsconfig.build.json"
     }
   ],
   "include": ["../../types", "./src"],
diff --git a/packages/eth-json-rpc-middleware/tsconfig.json b/packages/eth-json-rpc-middleware/tsconfig.json
index 9ba2128a4c..34cc1ee35b 100644
--- a/packages/eth-json-rpc-middleware/tsconfig.json
+++ b/packages/eth-json-rpc-middleware/tsconfig.json
@@ -5,19 +5,19 @@
   },
   "references": [
     {
-      "path": "../../packages/error-reporting-service"
+      "path": "../error-reporting-service"
     },
     {
-      "path": "../../packages/eth-block-tracker"
+      "path": "../eth-block-tracker"
     },
     {
-      "path": "../../packages/eth-json-rpc-provider"
+      "path": "../eth-json-rpc-provider"
     },
     {
-      "path": "../../packages/json-rpc-engine"
+      "path": "../json-rpc-engine"
     },
     {
-      "path": "../../packages/network-controller"
+      "path": "../network-controller"
     }
   ],
   "include": ["../../types", "./src", "./types"]