refactor!(eth-json-rpc-middleware): Migrate to JsonRpcEngineV2

eslint-warning-thresholds.json

@@ -154,7 +154,6 @@
     "@typescript-eslint/no-explicit-any": 1
   },
   "packages/eth-json-rpc-middleware/src/block-cache.ts": {
-    "@typescript-eslint/no-explicit-any": 1,
     "jsdoc/require-jsdoc": 1,
     "no-restricted-syntax": 1
   },
@@ -165,11 +164,10 @@
     "jest/expect-expect": 2
   },
   "packages/eth-json-rpc-middleware/src/block-ref.ts": {
-    "jsdoc/require-jsdoc": 1
+    "jsdoc/match-description": 1
   },
   "packages/eth-json-rpc-middleware/src/block-tracker-inspector.ts": {
-    "jsdoc/match-description": 1,
-    "jsdoc/require-jsdoc": 1
+    "jsdoc/match-description": 2
   },
   "packages/eth-json-rpc-middleware/src/fetch.test.ts": {
     "jsdoc/match-description": 1
@@ -178,8 +176,7 @@
     "jsdoc/match-description": 1
   },
   "packages/eth-json-rpc-middleware/src/inflight-cache.ts": {
-    "@typescript-eslint/no-explicit-any": 1,
-    "jsdoc/require-jsdoc": 4
+    "jsdoc/match-description": 4
   },
   "packages/eth-json-rpc-middleware/src/methods/wallet-request-execution-permissions.ts": {
     "jsdoc/require-jsdoc": 1
@@ -188,7 +185,7 @@
     "jsdoc/require-jsdoc": 1
   },
   "packages/eth-json-rpc-middleware/src/providerAsMiddleware.ts": {
-    "jsdoc/require-jsdoc": 1
+    "jsdoc/require-jsdoc": 2
   },
   "packages/eth-json-rpc-middleware/src/retryOnEmpty.test.ts": {
     "jsdoc/match-description": 3
@@ -215,7 +212,6 @@
     "jsdoc/require-jsdoc": 4
   },
   "packages/eth-json-rpc-middleware/src/wallet.ts": {
-    "@typescript-eslint/no-explicit-any": 2,
     "@typescript-eslint/prefer-nullish-coalescing": 5,
     "jsdoc/match-description": 3,
     "jsdoc/require-jsdoc": 12
@@ -226,7 +222,7 @@
   },
   "packages/eth-json-rpc-middleware/test/util/helpers.ts": {
     "@typescript-eslint/no-explicit-any": 5,
-    "jsdoc/match-description": 11
+    "jsdoc/match-description": 10
   },
   "packages/gas-fee-controller/src/GasFeeController.test.ts": {
     "import-x/namespace": 2,

jest.config.packages.js

@@ -80,6 +80,9 @@ module.exports = {
   // Here we ensure that Jest resolves `@metamask/*` imports to the uncompiled source code for packages that live in this repo.
   // NOTE: This must be synchronized with the `paths` option in `tsconfig.packages.json`.
   moduleNameMapper: {
+    '^@metamask/json-rpc-engine/v2$': [
+      '<rootDir>/../json-rpc-engine/src/v2/index.ts',
+    ],
     '^@metamask/(.+)$': [
       '<rootDir>/../$1/src',
       // Some @metamask/* packages we are referencing aren't in this monorepo,

packages/eth-block-tracker/tests/withBlockTracker.ts

@@ -1,8 +1,4 @@
-import { providerFromEngine } from '@metamask/eth-json-rpc-provider';
-import type {
-  // Eip1193Request,
-  InternalProvider,
-} from '@metamask/eth-json-rpc-provider';
+import { InternalProvider } from '@metamask/eth-json-rpc-provider';
 import { JsonRpcEngine } from '@metamask/json-rpc-engine';
 import type { Json } from '@metamask/utils';
 import util from 'util';
@@ -98,7 +94,7 @@ function getFakeProvider({
     });
   }
 
-  const provider = providerFromEngine(new JsonRpcEngine());
+  const provider = new InternalProvider({ engine: new JsonRpcEngine() });
   jest
     .spyOn(provider, 'request')
     .mockImplementation(async (eip1193Request): Promise<Json> => {

packages/eth-json-rpc-middleware/CHANGELOG.md

@@ -9,8 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- **BREAKING:** Migrate to `JsonRpcEngineV2` ([#6976](https://github.com/MetaMask/core/pull/6976))
+  - Migrates all middleware from `JsonRpcEngine` to `JsonRpcEngineV2`.
+  - To continue using this package with the legacy `JsonRpcEngine`, use the `asLegacyMiddleware` backwards compatibility function.
 - **BREAKING:** Use `InternalProvider` instead of `SafeEventEmitterProvider` ([#6796](https://github.com/MetaMask/core/pull/6796))
   - Wherever a `SafeEventEmitterProvider` was expected, an `InternalProvider` is now expected instead.
+- **BREAKING:** Stop retrying `undefined` results for methods that include a block tag parameter ([#7001](https://github.com/MetaMask/core/pull/7001))
+  - The `retryOnEmpty` middleware will now throw an error if it encounters an `undefined` result when dispatching
+    a request with a later block number than the originally requested block number.
+  - In practice, this should happen rarely if ever.
 - Migrate all uses of `interface` to `type` ([#6885](https://github.com/MetaMask/core/pull/6885))
 
 ## [21.0.0]