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

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

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - **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]

packages/eth-json-rpc-middleware/src/retryOnEmpty.ts

@@ -21,11 +21,7 @@ import { timeout } from './utils/timeout';
 const log = createModuleLogger(projectLogger, 'retry-on-empty');
 // empty values used to determine if a request should be retried
 // `<nil>` comes from https://github.com/ethereum/go-ethereum/issues/16925
-const emptyValues: (string | null | undefined)[] = [
-  undefined,
-  null,
-  '\u003cnil\u003e',
-];
+const emptyValues = [null, '\u003cnil\u003e'];
 
 /**
  * Creates a middleware that retries requests with empty responses.

packages/eth-json-rpc-middleware/test/util/helpers.ts

@@ -1,8 +1,5 @@
 import { PollingBlockTracker } from '@metamask/eth-block-tracker';
-import {
-  providerFromEngine,
-  type InternalProvider,
-} from '@metamask/eth-json-rpc-provider';
+import { InternalProvider } from '@metamask/eth-json-rpc-provider';
 import {
   JsonRpcEngine,
   type JsonRpcMiddleware,
@@ -96,7 +93,7 @@ export function createFinalMiddlewareWithDefaultResult<
  */
 export function createProviderAndBlockTracker() {
   const engine = new JsonRpcEngine();
-  const provider = providerFromEngine(engine);
+  const provider = new InternalProvider({ engine });
 
   const blockTracker = new PollingBlockTracker({
     provider,

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

@@ -7,11 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `providerFromMiddlewareV2` ([#7001](https://github.com/MetaMask/core/pull/7001))
+  - This accepts the new middleware from `@metamask/json-rpc-engine/v2`.
+
 ### Changed
 
 - **BREAKING:** Replace `SafeEventEmitterProvider` with `InternalProvider` ([#6796](https://github.com/MetaMask/core/pull/6796))
   - The new class is behaviorally equivalent to the previous version except it does not extend `SafeEventEmitter`.
   - `SafeEventEmitterProvider` is for now still exported as a deprecated alias of `InternalProvider` for backwards compatibility.
+- **BREAKING:** Migrate from `JsonRpcEngine` to `JsonRpcEngineV2` ([#7001](https://github.com/MetaMask/core/pull/7001))
+  - Legacy `JsonRpcEngine` instances are wrapped in a `JsonRpcEngineV2` internally wherever they appear.
+    This change should mostly be unobservable. However, due to differences in error handling, this may be breaking for consumers.
+
+### Deprecated
+
+- Deprecate `providerFromMiddleware` ([#7001](https://github.com/MetaMask/core/pull/7001))
+  - Use `providerFromMiddlewareV2` instead, which supports the new middleware from `@metamask/json-rpc-engine/v2`.
+
+### Removed
+
+- **BREAKING:** Remove `providerFromEngine` ([#7001](https://github.com/MetaMask/core/pull/7001))
+  - Use `InternalProvider` directly instead.
 
 ## [5.0.1]
 

packages/eth-json-rpc-provider/package.json

@@ -56,7 +56,7 @@
     "@metamask/json-rpc-engine": "^10.1.1",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/utils": "^11.8.1",
-    "uuid": "^8.3.2"
+    "nanoid": "^3.3.8"
   },
   "devDependencies": {
     "@ethersproject/providers": "^5.7.0",

packages/eth-json-rpc-provider/src/index.test.ts

@@ -2,12 +2,12 @@ import * as allExports from '.';
 
 describe('Package exports', () => {
   it('has expected exports', () => {
-    expect(Object.keys(allExports)).toMatchInlineSnapshot(`
+    expect(Object.keys(allExports).sort()).toMatchInlineSnapshot(`
       Array [
         "InternalProvider",
         "SafeEventEmitterProvider",
-        "providerFromEngine",
         "providerFromMiddleware",
+        "providerFromMiddlewareV2",
       ]
     `);
   });

packages/eth-json-rpc-provider/src/index.ts

@@ -1,6 +1,5 @@
 import { InternalProvider } from './internal-provider';
 
-export * from './provider-from-engine';
 export * from './provider-from-middleware';
 
 /**