@metamask-previews/eth-json-rpc-provider 5.0.1-preview-5e4e26a6 → 5.0.1-preview-c0feb25

package/CHANGELOG.md

@@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **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:** Use `JsonRpcServer` instead of `JsonRpcEngine` ([#7001](https://github.com/MetaMask/core/pull/7001))
+  - Adds a new `server` constructor option to the `InternalProvider` class, mutually exclusive with the now deprecated `engine` option.
+  - Legacy `JsonRpcEngine` instances are wrapped in a `JsonRpcServer` internally
+    wherever they appear. Due to differences in error serialization, this may be
+    breaking for consumers.
 
 ## [5.0.1]
 

package/dist/internal-provider.cjs

@@ -10,33 +10,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _InternalProvider_engine;
+var _InternalProvider_server, _InternalProvider_handle, _InternalProvider_handleWithCallback;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InternalProvider = exports.convertEip1193RequestToJsonRpcRequest = void 0;
+exports.convertEip1193RequestToJsonRpcRequest = exports.InternalProvider = void 0;
+const json_rpc_engine_1 = require("@metamask/json-rpc-engine");
+const v2_1 = require("@metamask/json-rpc-engine/v2");
 const rpc_errors_1 = require("@metamask/rpc-errors");
+const utils_1 = require("@metamask/utils");
 const uuid_1 = require("uuid");
-/**
- * Converts an EIP-1193 request to a JSON-RPC request.
- *
- * @param eip1193Request - The EIP-1193 request to convert.
- * @returns The corresponding JSON-RPC request.
- */
-function convertEip1193RequestToJsonRpcRequest(eip1193Request) {
-    const { id = (0, uuid_1.v4)(), jsonrpc = '2.0', method, params } = eip1193Request;
-    return params
-        ? {
-            id,
-            jsonrpc,
-            method,
-            params,
-        }
-        : {
-            id,
-            jsonrpc,
-            method,
-        };
-}
-exports.convertEip1193RequestToJsonRpcRequest = convertEip1193RequestToJsonRpcRequest;
 /**
  * An Ethereum provider.
  *
@@ -45,13 +26,14 @@ exports.convertEip1193RequestToJsonRpcRequest = convertEip1193RequestToJsonRpcRe
  */
 class InternalProvider {
     /**
-     * Construct a InternalProvider from a JSON-RPC engine.
+     * Construct a InternalProvider from a JSON-RPC server or legacy engine.
      *
      * @param options - Options.
-     * @param options.engine - The JSON-RPC engine used to process requests.
+     * @param options.engine - **Deprecated:** The JSON-RPC engine used to process requests. Mutually exclusive with `server`.
+     * @param options.server - The JSON-RPC server used to process requests. Mutually exclusive with `engine`.
      */
-    constructor({ engine }) {
-        _InternalProvider_engine.set(this, void 0);
+    constructor(options) {
+        _InternalProvider_server.set(this, void 0);
         /**
          * Send a provider request asynchronously.
          *
@@ -60,14 +42,14 @@ class InternalProvider {
          *
          * @param eip1193Request - The request to send.
          * @param callback - A function that is called upon the success or failure of the request.
-         * @deprecated Please use `request` instead.
+         * @deprecated Use {@link request} instead.
          */
         this.sendAsync = (eip1193Request, 
-        // TODO: Replace `any` with type
+        // Non-polluting `any` that acts like a constraint.
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         callback) => {
             const jsonRpcRequest = convertEip1193RequestToJsonRpcRequest(eip1193Request);
-            __classPrivateFieldGet(this, _InternalProvider_engine, "f").handle(jsonRpcRequest, callback);
+            __classPrivateFieldGet(this, _InternalProvider_handleWithCallback, "f").call(this, jsonRpcRequest, callback);
         };
         /**
          * Send a provider request asynchronously.
@@ -77,7 +59,7 @@ class InternalProvider {
          *
          * @param eip1193Request - The request to send.
          * @param callback - A function that is called upon the success or failure of the request.
-         * @deprecated Please use `request` instead.
+         * @deprecated Use {@link request} instead.
          */
         this.send = (eip1193Request, 
         // TODO: Replace `any` with type
@@ -87,9 +69,35 @@ class InternalProvider {
                 throw new Error('Must provide callback to "send" method.');
             }
             const jsonRpcRequest = convertEip1193RequestToJsonRpcRequest(eip1193Request);
-            __classPrivateFieldGet(this, _InternalProvider_engine, "f").handle(jsonRpcRequest, callback);
+            __classPrivateFieldGet(this, _InternalProvider_handleWithCallback, "f").call(this, jsonRpcRequest, callback);
         };
-        __classPrivateFieldSet(this, _InternalProvider_engine, engine, "f");
+        _InternalProvider_handle.set(this, async (jsonRpcRequest) => {
+            // @ts-expect-error - The signatures are incompatible between the legacy engine
+            // and server, but this works at runtime.
+            return await __classPrivateFieldGet(this, _InternalProvider_server, "f").handle(jsonRpcRequest);
+        });
+        _InternalProvider_handleWithCallback.set(this, (jsonRpcRequest, callback) => {
+            /* eslint-disable promise/always-return,promise/no-callback-in-promise */
+            __classPrivateFieldGet(this, _InternalProvider_handle, "f").call(this, jsonRpcRequest)
+                .then((response) => {
+                if ((0, utils_1.hasProperty)(response, 'result')) {
+                    callback(null, response);
+                }
+                else {
+                    callback(deserializeError(response.error));
+                }
+            })
+                .catch((error) => {
+                callback(error);
+            });
+            /* eslint-enable promise/always-return,promise/no-callback-in-promise */
+        });
+        const serverOrLegacyEngine = 'server' in options ? options.server : options.engine;
+        __classPrivateFieldSet(this, _InternalProvider_server, 'push' in serverOrLegacyEngine
+            ? new v2_1.JsonRpcServer({
+                middleware: [(0, json_rpc_engine_1.asV2Middleware)(serverOrLegacyEngine)],
+            })
+            : serverOrLegacyEngine, "f");
     }
     /**
      * Send a provider request asynchronously.
@@ -99,17 +107,45 @@ class InternalProvider {
      */
     async request(eip1193Request) {
         const jsonRpcRequest = convertEip1193RequestToJsonRpcRequest(eip1193Request);
-        const response = await __classPrivateFieldGet(this, _InternalProvider_engine, "f").handle(jsonRpcRequest);
+        const response = await __classPrivateFieldGet(this, _InternalProvider_handle, "f").call(this, jsonRpcRequest);
         if ('result' in response) {
             return response.result;
         }
-        const error = new rpc_errors_1.JsonRpcError(response.error.code, response.error.message, response.error.data);
-        if ('stack' in response.error) {
-            error.stack = response.error.stack;
-        }
-        throw error;
+        throw deserializeError(response.error);
     }
 }
 exports.InternalProvider = InternalProvider;
-_InternalProvider_engine = new WeakMap();
+_InternalProvider_server = new WeakMap(), _InternalProvider_handle = new WeakMap(), _InternalProvider_handleWithCallback = new WeakMap();
+/**
+ * Convert an EIP-1193 request to a JSON-RPC request.
+ *
+ * @param eip1193Request - The EIP-1193 request to convert.
+ * @returns The JSON-RPC request.
+ */
+function convertEip1193RequestToJsonRpcRequest(eip1193Request) {
+    const { id = (0, uuid_1.v4)(), jsonrpc = '2.0', method, params } = eip1193Request;
+    return params
+        ? {
+            id,
+            jsonrpc,
+            method,
+            params,
+        }
+        : {
+            id,
+            jsonrpc,
+            method,
+        };
+}
+exports.convertEip1193RequestToJsonRpcRequest = convertEip1193RequestToJsonRpcRequest;
+/**
+ * Deserialize a JSON-RPC error. Ignores the possibility of `stack` property, since this is
+ * stripped by `JsonRpcServer`.
+ *
+ * @param error - The JSON-RPC error to deserialize.
+ * @returns The deserialized error.
+ */
+function deserializeError(error) {
+    return new rpc_errors_1.JsonRpcError(error.code, error.message, error.data);
+}
 //# sourceMappingURL=internal-provider.cjs.map

package/dist/internal-provider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"internal-provider.cjs","sourceRoot":"","sources":["../src/internal-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qDAAoD;AAQpD,+BAAoC;AAYpC;;;;;GAKG;AACH,SAAgB,qCAAqC,CAGnD,cAAsC;IAEtC,MAAM,EAAE,EAAE,GAAG,IAAA,SAAM,GAAE,EAAE,OAAO,GAAG,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IAC1E,OAAO,MAAM;QACX,CAAC,CAAC;YACE,EAAE;YACF,OAAO;YACP,MAAM;YACN,MAAM;SACP;QACH,CAAC,CAAC;YACE,EAAE;YACF,OAAO;YACP,MAAM;SACP,CAAC;AACR,CAAC;AAlBD,sFAkBC;AAED;;;;;GAKG;AACH,MAAa,gBAAgB;IAG3B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAA6B;QARxC,2CAAuB;QA2ChC;;;;;;;;;WASG;QACH,cAAS,GAAG,CACV,cAAsC;QACtC,gCAAgC;QAChC,8DAA8D;QAC9D,QAAqD,EACrD,EAAE;YACF,MAAM,cAAc,GAClB,qCAAqC,CAAC,cAAc,CAAC,CAAC;YACxD,uBAAA,IAAI,gCAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC,CAAC;QAEF;;;;;;;;;WASG;QACH,SAAI,GAAG,CACL,cAAsC;QACtC,gCAAgC;QAChC,8DAA8D;QAC9D,QAAqD,EACrD,EAAE;YACF,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;aAC5D;YACD,MAAM,cAAc,GAClB,qCAAqC,CAAC,cAAc,CAAC,CAAC;YACxD,uBAAA,IAAI,gCAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC,CAAC;QA7EA,uBAAA,IAAI,4BAAW,MAAM,MAAA,CAAC;IACxB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CACX,cAAsC;QAEtC,MAAM,cAAc,GAClB,qCAAqC,CAAC,cAAc,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,MAAM,uBAAA,IAAI,gCAAQ,CAAC,MAAM,CAGxC,cAAc,CAAC,CAAC;QAElB,IAAI,QAAQ,IAAI,QAAQ,EAAE;YACxB,OAAO,QAAQ,CAAC,MAAM,CAAC;SACxB;QAED,MAAM,KAAK,GAAG,IAAI,yBAAY,CAC5B,QAAQ,CAAC,KAAK,CAAC,IAAI,EACnB,QAAQ,CAAC,KAAK,CAAC,OAAO,EACtB,QAAQ,CAAC,KAAK,CAAC,IAAI,CACpB,CAAC;QACF,IAAI,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE;YAC7B,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;SACpC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;CA8CF;AAxFD,4CAwFC","sourcesContent":["import type { JsonRpcEngine } from '@metamask/json-rpc-engine';\nimport { JsonRpcError } from '@metamask/rpc-errors';\nimport type {\n  Json,\n  JsonRpcId,\n  JsonRpcParams,\n  JsonRpcRequest,\n  JsonRpcVersion2,\n} from '@metamask/utils';\nimport { v4 as uuidV4 } from 'uuid';\n\n/**\n * A JSON-RPC request conforming to the EIP-1193 specification.\n */\ntype Eip1193Request<Params extends JsonRpcParams> = {\n  id?: JsonRpcId;\n  jsonrpc?: JsonRpcVersion2;\n  method: string;\n  params?: Params;\n};\n\n/**\n * Converts an EIP-1193 request to a JSON-RPC request.\n *\n * @param eip1193Request - The EIP-1193 request to convert.\n * @returns The corresponding JSON-RPC request.\n */\nexport function convertEip1193RequestToJsonRpcRequest<\n  Params extends JsonRpcParams,\n>(\n  eip1193Request: Eip1193Request<Params>,\n): JsonRpcRequest<Params | Record<never, never>> {\n  const { id = uuidV4(), jsonrpc = '2.0', method, params } = eip1193Request;\n  return params\n    ? {\n        id,\n        jsonrpc,\n        method,\n        params,\n      }\n    : {\n        id,\n        jsonrpc,\n        method,\n      };\n}\n\n/**\n * An Ethereum provider.\n *\n * This provider loosely follows conventions that pre-date EIP-1193.\n * It is not compliant with any Ethereum provider standard.\n */\nexport class InternalProvider {\n  readonly #engine: JsonRpcEngine;\n\n  /**\n   * Construct a InternalProvider from a JSON-RPC engine.\n   *\n   * @param options - Options.\n   * @param options.engine - The JSON-RPC engine used to process requests.\n   */\n  constructor({ engine }: { engine: JsonRpcEngine }) {\n    this.#engine = engine;\n  }\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * @param eip1193Request - The request to send.\n   * @returns The JSON-RPC response.\n   */\n  async request<Params extends JsonRpcParams, Result extends Json>(\n    eip1193Request: Eip1193Request<Params>,\n  ): Promise<Result> {\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    const response = await this.#engine.handle<\n      Params | Record<never, never>,\n      Result\n    >(jsonRpcRequest);\n\n    if ('result' in response) {\n      return response.result;\n    }\n\n    const error = new JsonRpcError(\n      response.error.code,\n      response.error.message,\n      response.error.data,\n    );\n    if ('stack' in response.error) {\n      error.stack = response.error.stack;\n    }\n    throw error;\n  }\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * This method serves the same purpose as `request`. It only exists for\n   * legacy reasons.\n   *\n   * @param eip1193Request - The request to send.\n   * @param callback - A function that is called upon the success or failure of the request.\n   * @deprecated Please use `request` instead.\n   */\n  sendAsync = <Params extends JsonRpcParams>(\n    eip1193Request: Eip1193Request<Params>,\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    callback: (error: unknown, providerRes?: any) => void,\n  ) => {\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    this.#engine.handle(jsonRpcRequest, callback);\n  };\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * This method serves the same purpose as `request`. It only exists for\n   * legacy reasons.\n   *\n   * @param eip1193Request - The request to send.\n   * @param callback - A function that is called upon the success or failure of the request.\n   * @deprecated Please use `request` instead.\n   */\n  send = <Params extends JsonRpcParams>(\n    eip1193Request: Eip1193Request<Params>,\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    callback: (error: unknown, providerRes?: any) => void,\n  ) => {\n    if (typeof callback !== 'function') {\n      throw new Error('Must provide callback to \"send\" method.');\n    }\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    this.#engine.handle(jsonRpcRequest, callback);\n  };\n}\n"]}
+{"version":3,"file":"internal-provider.cjs","sourceRoot":"","sources":["../src/internal-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { asV2Middleware, type JsonRpcEngine } from '@metamask/json-rpc-engine';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';\nimport { JsonRpcServer } from '@metamask/json-rpc-engine/v2';\nimport { JsonRpcError } from '@metamask/rpc-errors';\nimport type { JsonRpcFailure } from '@metamask/utils';\nimport {\n  hasProperty,\n  type Json,\n  type JsonRpcId,\n  type JsonRpcParams,\n  type JsonRpcRequest,\n  type JsonRpcResponse,\n  type JsonRpcVersion2,\n} from '@metamask/utils';\nimport { v4 as uuidV4 } from 'uuid';\n\n/**\n * A JSON-RPC request conforming to the EIP-1193 specification.\n */\ntype Eip1193Request<Params extends JsonRpcParams> = {\n  id?: JsonRpcId;\n  jsonrpc?: JsonRpcVersion2;\n  method: string;\n  params?: Params;\n};\n\n/**\n * The {@link JsonRpcMiddleware} constraint and default type for the {@link InternalProvider}.\n * We care that the middleware can handle JSON-RPC requests, but do not care about the context,\n * the validity of which is enforced by the {@link JsonRpcServer}.\n */\nexport type InternalProviderMiddleware = JsonRpcMiddleware<\n  JsonRpcRequest,\n  Json,\n  // Non-polluting `any` constraint.\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  any\n>;\n\ntype Options<Middleware extends InternalProviderMiddleware> =\n  | {\n      /**\n       * @deprecated Use `server` instead.\n       */\n      engine: JsonRpcEngine;\n    }\n  | {\n      server: JsonRpcServer<Middleware>;\n    };\n\n/**\n * An Ethereum provider.\n *\n * This provider loosely follows conventions that pre-date EIP-1193.\n * It is not compliant with any Ethereum provider standard.\n */\nexport class InternalProvider<\n  Middleware extends InternalProviderMiddleware = InternalProviderMiddleware,\n> {\n  readonly #server: JsonRpcServer<Middleware>;\n\n  /**\n   * Construct a InternalProvider from a JSON-RPC server or legacy engine.\n   *\n   * @param options - Options.\n   * @param options.engine - **Deprecated:** The JSON-RPC engine used to process requests. Mutually exclusive with `server`.\n   * @param options.server - The JSON-RPC server used to process requests. Mutually exclusive with `engine`.\n   */\n  constructor(options: Options<Middleware>) {\n    const serverOrLegacyEngine =\n      'server' in options ? options.server : options.engine;\n    this.#server =\n      'push' in serverOrLegacyEngine\n        ? new JsonRpcServer({\n            middleware: [asV2Middleware(serverOrLegacyEngine)],\n          })\n        : serverOrLegacyEngine;\n  }\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * @param eip1193Request - The request to send.\n   * @returns The JSON-RPC response.\n   */\n  async request<Params extends JsonRpcParams, Result extends Json>(\n    eip1193Request: Eip1193Request<Params>,\n  ): Promise<Result> {\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    const response: JsonRpcResponse<Result> =\n      await this.#handle(jsonRpcRequest);\n\n    if ('result' in response) {\n      return response.result;\n    }\n    throw deserializeError(response.error);\n  }\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * This method serves the same purpose as `request`. It only exists for\n   * legacy reasons.\n   *\n   * @param eip1193Request - The request to send.\n   * @param callback - A function that is called upon the success or failure of the request.\n   * @deprecated Use {@link request} instead.\n   */\n  sendAsync = <Params extends JsonRpcParams>(\n    eip1193Request: Eip1193Request<Params>,\n    // Non-polluting `any` that acts like a constraint.\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    callback: (error: unknown, providerRes?: any) => void,\n  ) => {\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    this.#handleWithCallback(jsonRpcRequest, callback);\n  };\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * This method serves the same purpose as `request`. It only exists for\n   * legacy reasons.\n   *\n   * @param eip1193Request - The request to send.\n   * @param callback - A function that is called upon the success or failure of the request.\n   * @deprecated Use {@link request} instead.\n   */\n  send = <Params extends JsonRpcParams>(\n    eip1193Request: Eip1193Request<Params>,\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    callback: (error: unknown, providerRes?: any) => void,\n  ) => {\n    if (typeof callback !== 'function') {\n      throw new Error('Must provide callback to \"send\" method.');\n    }\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    this.#handleWithCallback(jsonRpcRequest, callback);\n  };\n\n  readonly #handle = async <Result extends Json>(\n    jsonRpcRequest: JsonRpcRequest,\n  ): Promise<JsonRpcResponse<Result>> => {\n    // @ts-expect-error - The signatures are incompatible between the legacy engine\n    // and server, but this works at runtime.\n    return await this.#server.handle(jsonRpcRequest);\n  };\n\n  readonly #handleWithCallback = (\n    jsonRpcRequest: JsonRpcRequest,\n    callback: (error: unknown, providerRes?: unknown) => void,\n  ): void => {\n    /* eslint-disable promise/always-return,promise/no-callback-in-promise */\n    this.#handle(jsonRpcRequest)\n      .then((response) => {\n        if (hasProperty(response, 'result')) {\n          callback(null, response);\n        } else {\n          callback(deserializeError(response.error));\n        }\n      })\n      .catch((error) => {\n        callback(error);\n      });\n    /* eslint-enable promise/always-return,promise/no-callback-in-promise */\n  };\n}\n\n/**\n * Convert an EIP-1193 request to a JSON-RPC request.\n *\n * @param eip1193Request - The EIP-1193 request to convert.\n * @returns The JSON-RPC request.\n */\nexport function convertEip1193RequestToJsonRpcRequest<\n  Params extends JsonRpcParams,\n>(\n  eip1193Request: Eip1193Request<Params>,\n): JsonRpcRequest<Params | Record<never, never>> {\n  const { id = uuidV4(), jsonrpc = '2.0', method, params } = eip1193Request;\n  return params\n    ? {\n        id,\n        jsonrpc,\n        method,\n        params,\n      }\n    : {\n        id,\n        jsonrpc,\n        method,\n      };\n}\n\n/**\n * Deserialize a JSON-RPC error. Ignores the possibility of `stack` property, since this is\n * stripped by `JsonRpcServer`.\n *\n * @param error - The JSON-RPC error to deserialize.\n * @returns The deserialized error.\n */\nfunction deserializeError(error: JsonRpcFailure['error']): JsonRpcError<Json> {\n  return new JsonRpcError(error.code, error.message, error.data);\n}\n"]}

package/dist/internal-provider.d.cts

@@ -1,5 +1,7 @@
-import type { JsonRpcEngine } from "@metamask/json-rpc-engine";
-import type { Json, JsonRpcId, JsonRpcParams, JsonRpcRequest, JsonRpcVersion2 } from "@metamask/utils";
+import { type JsonRpcEngine } from "@metamask/json-rpc-engine";
+import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine/v2";
+import { JsonRpcServer } from "@metamask/json-rpc-engine/v2";
+import { type Json, type JsonRpcId, type JsonRpcParams, type JsonRpcRequest, type JsonRpcVersion2 } from "@metamask/utils";
 /**
  * A JSON-RPC request conforming to the EIP-1193 specification.
  */
@@ -10,29 +12,35 @@ type Eip1193Request<Params extends JsonRpcParams> = {
     params?: Params;
 };
 /**
- * Converts an EIP-1193 request to a JSON-RPC request.
- *
- * @param eip1193Request - The EIP-1193 request to convert.
- * @returns The corresponding JSON-RPC request.
+ * The {@link JsonRpcMiddleware} constraint and default type for the {@link InternalProvider}.
+ * We care that the middleware can handle JSON-RPC requests, but do not care about the context,
+ * the validity of which is enforced by the {@link JsonRpcServer}.
  */
-export declare function convertEip1193RequestToJsonRpcRequest<Params extends JsonRpcParams>(eip1193Request: Eip1193Request<Params>): JsonRpcRequest<Params | Record<never, never>>;
+export type InternalProviderMiddleware = JsonRpcMiddleware<JsonRpcRequest, Json, any>;
+type Options<Middleware extends InternalProviderMiddleware> = {
+    /**
+     * @deprecated Use `server` instead.
+     */
+    engine: JsonRpcEngine;
+} | {
+    server: JsonRpcServer<Middleware>;
+};
 /**
  * An Ethereum provider.
  *
  * This provider loosely follows conventions that pre-date EIP-1193.
  * It is not compliant with any Ethereum provider standard.
  */
-export declare class InternalProvider {
+export declare class InternalProvider<Middleware extends InternalProviderMiddleware = InternalProviderMiddleware> {
     #private;
     /**
-     * Construct a InternalProvider from a JSON-RPC engine.
+     * Construct a InternalProvider from a JSON-RPC server or legacy engine.
      *
      * @param options - Options.
-     * @param options.engine - The JSON-RPC engine used to process requests.
+     * @param options.engine - **Deprecated:** The JSON-RPC engine used to process requests. Mutually exclusive with `server`.
+     * @param options.server - The JSON-RPC server used to process requests. Mutually exclusive with `engine`.
      */
-    constructor({ engine }: {
-        engine: JsonRpcEngine;
-    });
+    constructor(options: Options<Middleware>);
     /**
      * Send a provider request asynchronously.
      *
@@ -48,7 +56,7 @@ export declare class InternalProvider {
      *
      * @param eip1193Request - The request to send.
      * @param callback - A function that is called upon the success or failure of the request.
-     * @deprecated Please use `request` instead.
+     * @deprecated Use {@link request} instead.
      */
     sendAsync: <Params extends JsonRpcParams>(eip1193Request: Eip1193Request<Params>, callback: (error: unknown, providerRes?: any) => void) => void;
     /**
@@ -59,9 +67,16 @@ export declare class InternalProvider {
      *
      * @param eip1193Request - The request to send.
      * @param callback - A function that is called upon the success or failure of the request.
-     * @deprecated Please use `request` instead.
+     * @deprecated Use {@link request} instead.
      */
     send: <Params extends JsonRpcParams>(eip1193Request: Eip1193Request<Params>, callback: (error: unknown, providerRes?: any) => void) => void;
 }
+/**
+ * Convert an EIP-1193 request to a JSON-RPC request.
+ *
+ * @param eip1193Request - The EIP-1193 request to convert.
+ * @returns The JSON-RPC request.
+ */
+export declare function convertEip1193RequestToJsonRpcRequest<Params extends JsonRpcParams>(eip1193Request: Eip1193Request<Params>): JsonRpcRequest<Params | Record<never, never>>;
 export {};
 //# sourceMappingURL=internal-provider.d.cts.map

package/dist/internal-provider.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-provider.d.cts","sourceRoot":"","sources":["../src/internal-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kCAAkC;AAE/D,OAAO,KAAK,EACV,IAAI,EACJ,SAAS,EACT,aAAa,EACb,cAAc,EACd,eAAe,EAChB,wBAAwB;AAGzB;;GAEG;AACH,KAAK,cAAc,CAAC,MAAM,SAAS,aAAa,IAAI;IAClD,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,qCAAqC,CACnD,MAAM,SAAS,aAAa,EAE5B,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,GACrC,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAc/C;AAED;;;;;GAKG;AACH,qBAAa,gBAAgB;;IAG3B;;;;;OAKG;gBACS,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,aAAa,CAAA;KAAE;IAIjD;;;;;OAKG;IACG,OAAO,CAAC,MAAM,SAAS,aAAa,EAAE,MAAM,SAAS,IAAI,EAC7D,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,GACrC,OAAO,CAAC,MAAM,CAAC;IAuBlB;;;;;;;;;OASG;IACH,SAAS,2FAIW,OAAO,gBAAgB,GAAG,KAAK,IAAI,UAKrD;IAEF;;;;;;;;;OASG;IACH,IAAI,2FAIgB,OAAO,gBAAgB,GAAG,KAAK,IAAI,UAQrD;CACH"}
+{"version":3,"file":"internal-provider.d.cts","sourceRoot":"","sources":["../src/internal-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,aAAa,EAAE,kCAAkC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AACtE,OAAO,EAAE,aAAa,EAAE,qCAAqC;AAG7D,OAAO,EAEL,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,cAAc,EAEnB,KAAK,eAAe,EACrB,wBAAwB;AAGzB;;GAEG;AACH,KAAK,cAAc,CAAC,MAAM,SAAS,aAAa,IAAI;IAClD,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,0BAA0B,GAAG,iBAAiB,CACxD,cAAc,EACd,IAAI,EAGJ,GAAG,CACJ,CAAC;AAEF,KAAK,OAAO,CAAC,UAAU,SAAS,0BAA0B,IACtD;IACE;;OAEG;IACH,MAAM,EAAE,aAAa,CAAC;CACvB,GACD;IACE,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACnC,CAAC;AAEN;;;;;GAKG;AACH,qBAAa,gBAAgB,CAC3B,UAAU,SAAS,0BAA0B,GAAG,0BAA0B;;IAI1E;;;;;;OAMG;gBACS,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC;IAWxC;;;;;OAKG;IACG,OAAO,CAAC,MAAM,SAAS,aAAa,EAAE,MAAM,SAAS,IAAI,EAC7D,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,GACrC,OAAO,CAAC,MAAM,CAAC;IAYlB;;;;;;;;;OASG;IACH,SAAS,2FAIW,OAAO,gBAAgB,GAAG,KAAK,IAAI,UAKrD;IAEF;;;;;;;;;OASG;IACH,IAAI,2FAIgB,OAAO,gBAAgB,GAAG,KAAK,IAAI,UAQrD;CA4BH;AAED;;;;;GAKG;AACH,wBAAgB,qCAAqC,CACnD,MAAM,SAAS,aAAa,EAE5B,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,GACrC,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAc/C"}

package/dist/internal-provider.d.mts

@@ -1,5 +1,7 @@
-import type { JsonRpcEngine } from "@metamask/json-rpc-engine";
-import type { Json, JsonRpcId, JsonRpcParams, JsonRpcRequest, JsonRpcVersion2 } from "@metamask/utils";
+import { type JsonRpcEngine } from "@metamask/json-rpc-engine";
+import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine/v2";
+import { JsonRpcServer } from "@metamask/json-rpc-engine/v2";
+import { type Json, type JsonRpcId, type JsonRpcParams, type JsonRpcRequest, type JsonRpcVersion2 } from "@metamask/utils";
 /**
  * A JSON-RPC request conforming to the EIP-1193 specification.
  */
@@ -10,29 +12,35 @@ type Eip1193Request<Params extends JsonRpcParams> = {
     params?: Params;
 };
 /**
- * Converts an EIP-1193 request to a JSON-RPC request.
- *
- * @param eip1193Request - The EIP-1193 request to convert.
- * @returns The corresponding JSON-RPC request.
+ * The {@link JsonRpcMiddleware} constraint and default type for the {@link InternalProvider}.
+ * We care that the middleware can handle JSON-RPC requests, but do not care about the context,
+ * the validity of which is enforced by the {@link JsonRpcServer}.
  */
-export declare function convertEip1193RequestToJsonRpcRequest<Params extends JsonRpcParams>(eip1193Request: Eip1193Request<Params>): JsonRpcRequest<Params | Record<never, never>>;
+export type InternalProviderMiddleware = JsonRpcMiddleware<JsonRpcRequest, Json, any>;
+type Options<Middleware extends InternalProviderMiddleware> = {
+    /**
+     * @deprecated Use `server` instead.
+     */
+    engine: JsonRpcEngine;
+} | {
+    server: JsonRpcServer<Middleware>;
+};
 /**
  * An Ethereum provider.
  *
  * This provider loosely follows conventions that pre-date EIP-1193.
  * It is not compliant with any Ethereum provider standard.
  */
-export declare class InternalProvider {
+export declare class InternalProvider<Middleware extends InternalProviderMiddleware = InternalProviderMiddleware> {
     #private;
     /**
-     * Construct a InternalProvider from a JSON-RPC engine.
+     * Construct a InternalProvider from a JSON-RPC server or legacy engine.
      *
      * @param options - Options.
-     * @param options.engine - The JSON-RPC engine used to process requests.
+     * @param options.engine - **Deprecated:** The JSON-RPC engine used to process requests. Mutually exclusive with `server`.
+     * @param options.server - The JSON-RPC server used to process requests. Mutually exclusive with `engine`.
      */
-    constructor({ engine }: {
-        engine: JsonRpcEngine;
-    });
+    constructor(options: Options<Middleware>);
     /**
      * Send a provider request asynchronously.
      *
@@ -48,7 +56,7 @@ export declare class InternalProvider {
      *
      * @param eip1193Request - The request to send.
      * @param callback - A function that is called upon the success or failure of the request.
-     * @deprecated Please use `request` instead.
+     * @deprecated Use {@link request} instead.
      */
     sendAsync: <Params extends JsonRpcParams>(eip1193Request: Eip1193Request<Params>, callback: (error: unknown, providerRes?: any) => void) => void;
     /**
@@ -59,9 +67,16 @@ export declare class InternalProvider {
      *
      * @param eip1193Request - The request to send.
      * @param callback - A function that is called upon the success or failure of the request.
-     * @deprecated Please use `request` instead.
+     * @deprecated Use {@link request} instead.
      */
     send: <Params extends JsonRpcParams>(eip1193Request: Eip1193Request<Params>, callback: (error: unknown, providerRes?: any) => void) => void;
 }
+/**
+ * Convert an EIP-1193 request to a JSON-RPC request.
+ *
+ * @param eip1193Request - The EIP-1193 request to convert.
+ * @returns The JSON-RPC request.
+ */
+export declare function convertEip1193RequestToJsonRpcRequest<Params extends JsonRpcParams>(eip1193Request: Eip1193Request<Params>): JsonRpcRequest<Params | Record<never, never>>;
 export {};
 //# sourceMappingURL=internal-provider.d.mts.map

package/dist/internal-provider.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-provider.d.mts","sourceRoot":"","sources":["../src/internal-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kCAAkC;AAE/D,OAAO,KAAK,EACV,IAAI,EACJ,SAAS,EACT,aAAa,EACb,cAAc,EACd,eAAe,EAChB,wBAAwB;AAGzB;;GAEG;AACH,KAAK,cAAc,CAAC,MAAM,SAAS,aAAa,IAAI;IAClD,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,qCAAqC,CACnD,MAAM,SAAS,aAAa,EAE5B,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,GACrC,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAc/C;AAED;;;;;GAKG;AACH,qBAAa,gBAAgB;;IAG3B;;;;;OAKG;gBACS,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,aAAa,CAAA;KAAE;IAIjD;;;;;OAKG;IACG,OAAO,CAAC,MAAM,SAAS,aAAa,EAAE,MAAM,SAAS,IAAI,EAC7D,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,GACrC,OAAO,CAAC,MAAM,CAAC;IAuBlB;;;;;;;;;OASG;IACH,SAAS,2FAIW,OAAO,gBAAgB,GAAG,KAAK,IAAI,UAKrD;IAEF;;;;;;;;;OASG;IACH,IAAI,2FAIgB,OAAO,gBAAgB,GAAG,KAAK,IAAI,UAQrD;CACH"}
+{"version":3,"file":"internal-provider.d.mts","sourceRoot":"","sources":["../src/internal-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,aAAa,EAAE,kCAAkC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AACtE,OAAO,EAAE,aAAa,EAAE,qCAAqC;AAG7D,OAAO,EAEL,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,cAAc,EAEnB,KAAK,eAAe,EACrB,wBAAwB;AAGzB;;GAEG;AACH,KAAK,cAAc,CAAC,MAAM,SAAS,aAAa,IAAI;IAClD,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,0BAA0B,GAAG,iBAAiB,CACxD,cAAc,EACd,IAAI,EAGJ,GAAG,CACJ,CAAC;AAEF,KAAK,OAAO,CAAC,UAAU,SAAS,0BAA0B,IACtD;IACE;;OAEG;IACH,MAAM,EAAE,aAAa,CAAC;CACvB,GACD;IACE,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACnC,CAAC;AAEN;;;;;GAKG;AACH,qBAAa,gBAAgB,CAC3B,UAAU,SAAS,0BAA0B,GAAG,0BAA0B;;IAI1E;;;;;;OAMG;gBACS,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC;IAWxC;;;;;OAKG;IACG,OAAO,CAAC,MAAM,SAAS,aAAa,EAAE,MAAM,SAAS,IAAI,EAC7D,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,GACrC,OAAO,CAAC,MAAM,CAAC;IAYlB;;;;;;;;;OASG;IACH,SAAS,2FAIW,OAAO,gBAAgB,GAAG,KAAK,IAAI,UAKrD;IAEF;;;;;;;;;OASG;IACH,IAAI,2FAIgB,OAAO,gBAAgB,GAAG,KAAK,IAAI,UAQrD;CA4BH;AAED;;;;;GAKG;AACH,wBAAgB,qCAAqC,CACnD,MAAM,SAAS,aAAa,EAE5B,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,GACrC,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAc/C"}

package/dist/internal-provider.mjs

@@ -9,30 +9,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _InternalProvider_engine;
+var _InternalProvider_server, _InternalProvider_handle, _InternalProvider_handleWithCallback;
+import { asV2Middleware } from "@metamask/json-rpc-engine";
+import { JsonRpcServer } from "@metamask/json-rpc-engine/v2";
 import { JsonRpcError } from "@metamask/rpc-errors";
+import { hasProperty } from "@metamask/utils";
 import { v4 as uuidV4 } from "uuid";
-/**
- * Converts an EIP-1193 request to a JSON-RPC request.
- *
- * @param eip1193Request - The EIP-1193 request to convert.
- * @returns The corresponding JSON-RPC request.
- */
-export function convertEip1193RequestToJsonRpcRequest(eip1193Request) {
-    const { id = uuidV4(), jsonrpc = '2.0', method, params } = eip1193Request;
-    return params
-        ? {
-            id,
-            jsonrpc,
-            method,
-            params,
-        }
-        : {
-            id,
-            jsonrpc,
-            method,
-        };
-}
 /**
  * An Ethereum provider.
  *
@@ -41,13 +23,14 @@ export function convertEip1193RequestToJsonRpcRequest(eip1193Request) {
  */
 export class InternalProvider {
     /**
-     * Construct a InternalProvider from a JSON-RPC engine.
+     * Construct a InternalProvider from a JSON-RPC server or legacy engine.
      *
      * @param options - Options.
-     * @param options.engine - The JSON-RPC engine used to process requests.
+     * @param options.engine - **Deprecated:** The JSON-RPC engine used to process requests. Mutually exclusive with `server`.
+     * @param options.server - The JSON-RPC server used to process requests. Mutually exclusive with `engine`.
      */
-    constructor({ engine }) {
-        _InternalProvider_engine.set(this, void 0);
+    constructor(options) {
+        _InternalProvider_server.set(this, void 0);
         /**
          * Send a provider request asynchronously.
          *
@@ -56,14 +39,14 @@ export class InternalProvider {
          *
          * @param eip1193Request - The request to send.
          * @param callback - A function that is called upon the success or failure of the request.
-         * @deprecated Please use `request` instead.
+         * @deprecated Use {@link request} instead.
          */
         this.sendAsync = (eip1193Request, 
-        // TODO: Replace `any` with type
+        // Non-polluting `any` that acts like a constraint.
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         callback) => {
             const jsonRpcRequest = convertEip1193RequestToJsonRpcRequest(eip1193Request);
-            __classPrivateFieldGet(this, _InternalProvider_engine, "f").handle(jsonRpcRequest, callback);
+            __classPrivateFieldGet(this, _InternalProvider_handleWithCallback, "f").call(this, jsonRpcRequest, callback);
         };
         /**
          * Send a provider request asynchronously.
@@ -73,7 +56,7 @@ export class InternalProvider {
          *
          * @param eip1193Request - The request to send.
          * @param callback - A function that is called upon the success or failure of the request.
-         * @deprecated Please use `request` instead.
+         * @deprecated Use {@link request} instead.
          */
         this.send = (eip1193Request, 
         // TODO: Replace `any` with type
@@ -83,9 +66,35 @@ export class InternalProvider {
                 throw new Error('Must provide callback to "send" method.');
             }
             const jsonRpcRequest = convertEip1193RequestToJsonRpcRequest(eip1193Request);
-            __classPrivateFieldGet(this, _InternalProvider_engine, "f").handle(jsonRpcRequest, callback);
+            __classPrivateFieldGet(this, _InternalProvider_handleWithCallback, "f").call(this, jsonRpcRequest, callback);
         };
-        __classPrivateFieldSet(this, _InternalProvider_engine, engine, "f");
+        _InternalProvider_handle.set(this, async (jsonRpcRequest) => {
+            // @ts-expect-error - The signatures are incompatible between the legacy engine
+            // and server, but this works at runtime.
+            return await __classPrivateFieldGet(this, _InternalProvider_server, "f").handle(jsonRpcRequest);
+        });
+        _InternalProvider_handleWithCallback.set(this, (jsonRpcRequest, callback) => {
+            /* eslint-disable promise/always-return,promise/no-callback-in-promise */
+            __classPrivateFieldGet(this, _InternalProvider_handle, "f").call(this, jsonRpcRequest)
+                .then((response) => {
+                if (hasProperty(response, 'result')) {
+                    callback(null, response);
+                }
+                else {
+                    callback(deserializeError(response.error));
+                }
+            })
+                .catch((error) => {
+                callback(error);
+            });
+            /* eslint-enable promise/always-return,promise/no-callback-in-promise */
+        });
+        const serverOrLegacyEngine = 'server' in options ? options.server : options.engine;
+        __classPrivateFieldSet(this, _InternalProvider_server, 'push' in serverOrLegacyEngine
+            ? new JsonRpcServer({
+                middleware: [asV2Middleware(serverOrLegacyEngine)],
+            })
+            : serverOrLegacyEngine, "f");
     }
     /**
      * Send a provider request asynchronously.
@@ -95,16 +104,43 @@ export class InternalProvider {
      */
     async request(eip1193Request) {
         const jsonRpcRequest = convertEip1193RequestToJsonRpcRequest(eip1193Request);
-        const response = await __classPrivateFieldGet(this, _InternalProvider_engine, "f").handle(jsonRpcRequest);
+        const response = await __classPrivateFieldGet(this, _InternalProvider_handle, "f").call(this, jsonRpcRequest);
         if ('result' in response) {
             return response.result;
         }
-        const error = new JsonRpcError(response.error.code, response.error.message, response.error.data);
-        if ('stack' in response.error) {
-            error.stack = response.error.stack;
-        }
-        throw error;
+        throw deserializeError(response.error);
     }
 }
-_InternalProvider_engine = new WeakMap();
+_InternalProvider_server = new WeakMap(), _InternalProvider_handle = new WeakMap(), _InternalProvider_handleWithCallback = new WeakMap();
+/**
+ * Convert an EIP-1193 request to a JSON-RPC request.
+ *
+ * @param eip1193Request - The EIP-1193 request to convert.
+ * @returns The JSON-RPC request.
+ */
+export function convertEip1193RequestToJsonRpcRequest(eip1193Request) {
+    const { id = uuidV4(), jsonrpc = '2.0', method, params } = eip1193Request;
+    return params
+        ? {
+            id,
+            jsonrpc,
+            method,
+            params,
+        }
+        : {
+            id,
+            jsonrpc,
+            method,
+        };
+}
+/**
+ * Deserialize a JSON-RPC error. Ignores the possibility of `stack` property, since this is
+ * stripped by `JsonRpcServer`.
+ *
+ * @param error - The JSON-RPC error to deserialize.
+ * @returns The deserialized error.
+ */
+function deserializeError(error) {
+    return new JsonRpcError(error.code, error.message, error.data);
+}
 //# sourceMappingURL=internal-provider.mjs.map

package/dist/internal-provider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"internal-provider.mjs","sourceRoot":"","sources":["../src/internal-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,YAAY,EAAE,6BAA6B;AAQpD,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,aAAa;AAYpC;;;;;GAKG;AACH,MAAM,UAAU,qCAAqC,CAGnD,cAAsC;IAEtC,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,EAAE,OAAO,GAAG,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IAC1E,OAAO,MAAM;QACX,CAAC,CAAC;YACE,EAAE;YACF,OAAO;YACP,MAAM;YACN,MAAM;SACP;QACH,CAAC,CAAC;YACE,EAAE;YACF,OAAO;YACP,MAAM;SACP,CAAC;AACR,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,gBAAgB;IAG3B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAA6B;QARxC,2CAAuB;QA2ChC;;;;;;;;;WASG;QACH,cAAS,GAAG,CACV,cAAsC;QACtC,gCAAgC;QAChC,8DAA8D;QAC9D,QAAqD,EACrD,EAAE;YACF,MAAM,cAAc,GAClB,qCAAqC,CAAC,cAAc,CAAC,CAAC;YACxD,uBAAA,IAAI,gCAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC,CAAC;QAEF;;;;;;;;;WASG;QACH,SAAI,GAAG,CACL,cAAsC;QACtC,gCAAgC;QAChC,8DAA8D;QAC9D,QAAqD,EACrD,EAAE;YACF,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;aAC5D;YACD,MAAM,cAAc,GAClB,qCAAqC,CAAC,cAAc,CAAC,CAAC;YACxD,uBAAA,IAAI,gCAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC,CAAC;QA7EA,uBAAA,IAAI,4BAAW,MAAM,MAAA,CAAC;IACxB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CACX,cAAsC;QAEtC,MAAM,cAAc,GAClB,qCAAqC,CAAC,cAAc,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,MAAM,uBAAA,IAAI,gCAAQ,CAAC,MAAM,CAGxC,cAAc,CAAC,CAAC;QAElB,IAAI,QAAQ,IAAI,QAAQ,EAAE;YACxB,OAAO,QAAQ,CAAC,MAAM,CAAC;SACxB;QAED,MAAM,KAAK,GAAG,IAAI,YAAY,CAC5B,QAAQ,CAAC,KAAK,CAAC,IAAI,EACnB,QAAQ,CAAC,KAAK,CAAC,OAAO,EACtB,QAAQ,CAAC,KAAK,CAAC,IAAI,CACpB,CAAC;QACF,IAAI,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE;YAC7B,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;SACpC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;CA8CF","sourcesContent":["import type { JsonRpcEngine } from '@metamask/json-rpc-engine';\nimport { JsonRpcError } from '@metamask/rpc-errors';\nimport type {\n  Json,\n  JsonRpcId,\n  JsonRpcParams,\n  JsonRpcRequest,\n  JsonRpcVersion2,\n} from '@metamask/utils';\nimport { v4 as uuidV4 } from 'uuid';\n\n/**\n * A JSON-RPC request conforming to the EIP-1193 specification.\n */\ntype Eip1193Request<Params extends JsonRpcParams> = {\n  id?: JsonRpcId;\n  jsonrpc?: JsonRpcVersion2;\n  method: string;\n  params?: Params;\n};\n\n/**\n * Converts an EIP-1193 request to a JSON-RPC request.\n *\n * @param eip1193Request - The EIP-1193 request to convert.\n * @returns The corresponding JSON-RPC request.\n */\nexport function convertEip1193RequestToJsonRpcRequest<\n  Params extends JsonRpcParams,\n>(\n  eip1193Request: Eip1193Request<Params>,\n): JsonRpcRequest<Params | Record<never, never>> {\n  const { id = uuidV4(), jsonrpc = '2.0', method, params } = eip1193Request;\n  return params\n    ? {\n        id,\n        jsonrpc,\n        method,\n        params,\n      }\n    : {\n        id,\n        jsonrpc,\n        method,\n      };\n}\n\n/**\n * An Ethereum provider.\n *\n * This provider loosely follows conventions that pre-date EIP-1193.\n * It is not compliant with any Ethereum provider standard.\n */\nexport class InternalProvider {\n  readonly #engine: JsonRpcEngine;\n\n  /**\n   * Construct a InternalProvider from a JSON-RPC engine.\n   *\n   * @param options - Options.\n   * @param options.engine - The JSON-RPC engine used to process requests.\n   */\n  constructor({ engine }: { engine: JsonRpcEngine }) {\n    this.#engine = engine;\n  }\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * @param eip1193Request - The request to send.\n   * @returns The JSON-RPC response.\n   */\n  async request<Params extends JsonRpcParams, Result extends Json>(\n    eip1193Request: Eip1193Request<Params>,\n  ): Promise<Result> {\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    const response = await this.#engine.handle<\n      Params | Record<never, never>,\n      Result\n    >(jsonRpcRequest);\n\n    if ('result' in response) {\n      return response.result;\n    }\n\n    const error = new JsonRpcError(\n      response.error.code,\n      response.error.message,\n      response.error.data,\n    );\n    if ('stack' in response.error) {\n      error.stack = response.error.stack;\n    }\n    throw error;\n  }\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * This method serves the same purpose as `request`. It only exists for\n   * legacy reasons.\n   *\n   * @param eip1193Request - The request to send.\n   * @param callback - A function that is called upon the success or failure of the request.\n   * @deprecated Please use `request` instead.\n   */\n  sendAsync = <Params extends JsonRpcParams>(\n    eip1193Request: Eip1193Request<Params>,\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    callback: (error: unknown, providerRes?: any) => void,\n  ) => {\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    this.#engine.handle(jsonRpcRequest, callback);\n  };\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * This method serves the same purpose as `request`. It only exists for\n   * legacy reasons.\n   *\n   * @param eip1193Request - The request to send.\n   * @param callback - A function that is called upon the success or failure of the request.\n   * @deprecated Please use `request` instead.\n   */\n  send = <Params extends JsonRpcParams>(\n    eip1193Request: Eip1193Request<Params>,\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    callback: (error: unknown, providerRes?: any) => void,\n  ) => {\n    if (typeof callback !== 'function') {\n      throw new Error('Must provide callback to \"send\" method.');\n    }\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    this.#engine.handle(jsonRpcRequest, callback);\n  };\n}\n"]}
+{"version":3,"file":"internal-provider.mjs","sourceRoot":"","sources":["../src/internal-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { asV2Middleware, type JsonRpcEngine } from '@metamask/json-rpc-engine';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';\nimport { JsonRpcServer } from '@metamask/json-rpc-engine/v2';\nimport { JsonRpcError } from '@metamask/rpc-errors';\nimport type { JsonRpcFailure } from '@metamask/utils';\nimport {\n  hasProperty,\n  type Json,\n  type JsonRpcId,\n  type JsonRpcParams,\n  type JsonRpcRequest,\n  type JsonRpcResponse,\n  type JsonRpcVersion2,\n} from '@metamask/utils';\nimport { v4 as uuidV4 } from 'uuid';\n\n/**\n * A JSON-RPC request conforming to the EIP-1193 specification.\n */\ntype Eip1193Request<Params extends JsonRpcParams> = {\n  id?: JsonRpcId;\n  jsonrpc?: JsonRpcVersion2;\n  method: string;\n  params?: Params;\n};\n\n/**\n * The {@link JsonRpcMiddleware} constraint and default type for the {@link InternalProvider}.\n * We care that the middleware can handle JSON-RPC requests, but do not care about the context,\n * the validity of which is enforced by the {@link JsonRpcServer}.\n */\nexport type InternalProviderMiddleware = JsonRpcMiddleware<\n  JsonRpcRequest,\n  Json,\n  // Non-polluting `any` constraint.\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  any\n>;\n\ntype Options<Middleware extends InternalProviderMiddleware> =\n  | {\n      /**\n       * @deprecated Use `server` instead.\n       */\n      engine: JsonRpcEngine;\n    }\n  | {\n      server: JsonRpcServer<Middleware>;\n    };\n\n/**\n * An Ethereum provider.\n *\n * This provider loosely follows conventions that pre-date EIP-1193.\n * It is not compliant with any Ethereum provider standard.\n */\nexport class InternalProvider<\n  Middleware extends InternalProviderMiddleware = InternalProviderMiddleware,\n> {\n  readonly #server: JsonRpcServer<Middleware>;\n\n  /**\n   * Construct a InternalProvider from a JSON-RPC server or legacy engine.\n   *\n   * @param options - Options.\n   * @param options.engine - **Deprecated:** The JSON-RPC engine used to process requests. Mutually exclusive with `server`.\n   * @param options.server - The JSON-RPC server used to process requests. Mutually exclusive with `engine`.\n   */\n  constructor(options: Options<Middleware>) {\n    const serverOrLegacyEngine =\n      'server' in options ? options.server : options.engine;\n    this.#server =\n      'push' in serverOrLegacyEngine\n        ? new JsonRpcServer({\n            middleware: [asV2Middleware(serverOrLegacyEngine)],\n          })\n        : serverOrLegacyEngine;\n  }\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * @param eip1193Request - The request to send.\n   * @returns The JSON-RPC response.\n   */\n  async request<Params extends JsonRpcParams, Result extends Json>(\n    eip1193Request: Eip1193Request<Params>,\n  ): Promise<Result> {\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    const response: JsonRpcResponse<Result> =\n      await this.#handle(jsonRpcRequest);\n\n    if ('result' in response) {\n      return response.result;\n    }\n    throw deserializeError(response.error);\n  }\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * This method serves the same purpose as `request`. It only exists for\n   * legacy reasons.\n   *\n   * @param eip1193Request - The request to send.\n   * @param callback - A function that is called upon the success or failure of the request.\n   * @deprecated Use {@link request} instead.\n   */\n  sendAsync = <Params extends JsonRpcParams>(\n    eip1193Request: Eip1193Request<Params>,\n    // Non-polluting `any` that acts like a constraint.\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    callback: (error: unknown, providerRes?: any) => void,\n  ) => {\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    this.#handleWithCallback(jsonRpcRequest, callback);\n  };\n\n  /**\n   * Send a provider request asynchronously.\n   *\n   * This method serves the same purpose as `request`. It only exists for\n   * legacy reasons.\n   *\n   * @param eip1193Request - The request to send.\n   * @param callback - A function that is called upon the success or failure of the request.\n   * @deprecated Use {@link request} instead.\n   */\n  send = <Params extends JsonRpcParams>(\n    eip1193Request: Eip1193Request<Params>,\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    callback: (error: unknown, providerRes?: any) => void,\n  ) => {\n    if (typeof callback !== 'function') {\n      throw new Error('Must provide callback to \"send\" method.');\n    }\n    const jsonRpcRequest =\n      convertEip1193RequestToJsonRpcRequest(eip1193Request);\n    this.#handleWithCallback(jsonRpcRequest, callback);\n  };\n\n  readonly #handle = async <Result extends Json>(\n    jsonRpcRequest: JsonRpcRequest,\n  ): Promise<JsonRpcResponse<Result>> => {\n    // @ts-expect-error - The signatures are incompatible between the legacy engine\n    // and server, but this works at runtime.\n    return await this.#server.handle(jsonRpcRequest);\n  };\n\n  readonly #handleWithCallback = (\n    jsonRpcRequest: JsonRpcRequest,\n    callback: (error: unknown, providerRes?: unknown) => void,\n  ): void => {\n    /* eslint-disable promise/always-return,promise/no-callback-in-promise */\n    this.#handle(jsonRpcRequest)\n      .then((response) => {\n        if (hasProperty(response, 'result')) {\n          callback(null, response);\n        } else {\n          callback(deserializeError(response.error));\n        }\n      })\n      .catch((error) => {\n        callback(error);\n      });\n    /* eslint-enable promise/always-return,promise/no-callback-in-promise */\n  };\n}\n\n/**\n * Convert an EIP-1193 request to a JSON-RPC request.\n *\n * @param eip1193Request - The EIP-1193 request to convert.\n * @returns The JSON-RPC request.\n */\nexport function convertEip1193RequestToJsonRpcRequest<\n  Params extends JsonRpcParams,\n>(\n  eip1193Request: Eip1193Request<Params>,\n): JsonRpcRequest<Params | Record<never, never>> {\n  const { id = uuidV4(), jsonrpc = '2.0', method, params } = eip1193Request;\n  return params\n    ? {\n        id,\n        jsonrpc,\n        method,\n        params,\n      }\n    : {\n        id,\n        jsonrpc,\n        method,\n      };\n}\n\n/**\n * Deserialize a JSON-RPC error. Ignores the possibility of `stack` property, since this is\n * stripped by `JsonRpcServer`.\n *\n * @param error - The JSON-RPC error to deserialize.\n * @returns The deserialized error.\n */\nfunction deserializeError(error: JsonRpcFailure['error']): JsonRpcError<Json> {\n  return new JsonRpcError(error.code, error.message, error.data);\n}\n"]}

package/dist/provider-from-engine.cjs

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.providerFromEngine = void 0;
 const internal_provider_1 = require("./internal-provider.cjs");
 /**
- * Construct an Ethereum provider from the given JSON-RPC engine.
+ * Construct an Ethereum provider from a JSON-RPC engine.
  *
  * @param engine - The JSON-RPC engine to construct a provider from.
  * @returns An Ethereum provider.
+ * @deprecated Just use {@link InternalProvider} directly instead.
  */
 function providerFromEngine(engine) {
     return new internal_provider_1.InternalProvider({ engine });

package/dist/provider-from-engine.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"provider-from-engine.cjs","sourceRoot":"","sources":["../src/provider-from-engine.ts"],"names":[],"mappings":";;;AAEA,+DAAuD;AAEvD;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,MAAqB;IACtD,OAAO,IAAI,oCAAgB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC1C,CAAC;AAFD,gDAEC","sourcesContent":["import type { JsonRpcEngine } from '@metamask/json-rpc-engine';\n\nimport { InternalProvider } from './internal-provider';\n\n/**\n * Construct an Ethereum provider from the given JSON-RPC engine.\n *\n * @param engine - The JSON-RPC engine to construct a provider from.\n * @returns An Ethereum provider.\n */\nexport function providerFromEngine(engine: JsonRpcEngine): InternalProvider {\n  return new InternalProvider({ engine });\n}\n"]}
+{"version":3,"file":"provider-from-engine.cjs","sourceRoot":"","sources":["../src/provider-from-engine.ts"],"names":[],"mappings":";;;AAEA,+DAAuD;AAEvD;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,MAAqB;IACtD,OAAO,IAAI,oCAAgB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC1C,CAAC;AAFD,gDAEC","sourcesContent":["import type { JsonRpcEngine } from '@metamask/json-rpc-engine';\n\nimport { InternalProvider } from './internal-provider';\n\n/**\n * Construct an Ethereum provider from a JSON-RPC engine.\n *\n * @param engine - The JSON-RPC engine to construct a provider from.\n * @returns An Ethereum provider.\n * @deprecated Just use {@link InternalProvider} directly instead.\n */\nexport function providerFromEngine(engine: JsonRpcEngine): InternalProvider {\n  return new InternalProvider({ engine });\n}\n"]}

package/dist/provider-from-engine.d.cts

@@ -1,10 +1,11 @@
 import type { JsonRpcEngine } from "@metamask/json-rpc-engine";
 import { InternalProvider } from "./internal-provider.cjs";
 /**
- * Construct an Ethereum provider from the given JSON-RPC engine.
+ * Construct an Ethereum provider from a JSON-RPC engine.
  *
  * @param engine - The JSON-RPC engine to construct a provider from.
  * @returns An Ethereum provider.
+ * @deprecated Just use {@link InternalProvider} directly instead.
  */
 export declare function providerFromEngine(engine: JsonRpcEngine): InternalProvider;
 //# sourceMappingURL=provider-from-engine.d.cts.map

package/dist/provider-from-engine.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-from-engine.d.cts","sourceRoot":"","sources":["../src/provider-from-engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kCAAkC;AAE/D,OAAO,EAAE,gBAAgB,EAAE,gCAA4B;AAEvD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB,CAE1E"}
+{"version":3,"file":"provider-from-engine.d.cts","sourceRoot":"","sources":["../src/provider-from-engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kCAAkC;AAE/D,OAAO,EAAE,gBAAgB,EAAE,gCAA4B;AAEvD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB,CAE1E"}

package/dist/provider-from-engine.d.mts

@@ -1,10 +1,11 @@
 import type { JsonRpcEngine } from "@metamask/json-rpc-engine";
 import { InternalProvider } from "./internal-provider.mjs";
 /**
- * Construct an Ethereum provider from the given JSON-RPC engine.
+ * Construct an Ethereum provider from a JSON-RPC engine.
  *
  * @param engine - The JSON-RPC engine to construct a provider from.
  * @returns An Ethereum provider.
+ * @deprecated Just use {@link InternalProvider} directly instead.
  */
 export declare function providerFromEngine(engine: JsonRpcEngine): InternalProvider;
 //# sourceMappingURL=provider-from-engine.d.mts.map

package/dist/provider-from-engine.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-from-engine.d.mts","sourceRoot":"","sources":["../src/provider-from-engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kCAAkC;AAE/D,OAAO,EAAE,gBAAgB,EAAE,gCAA4B;AAEvD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB,CAE1E"}
+{"version":3,"file":"provider-from-engine.d.mts","sourceRoot":"","sources":["../src/provider-from-engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kCAAkC;AAE/D,OAAO,EAAE,gBAAgB,EAAE,gCAA4B;AAEvD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB,CAE1E"}

package/dist/provider-from-engine.mjs

@@ -1,9 +1,10 @@
 import { InternalProvider } from "./internal-provider.mjs";
 /**
- * Construct an Ethereum provider from the given JSON-RPC engine.
+ * Construct an Ethereum provider from a JSON-RPC engine.
  *
  * @param engine - The JSON-RPC engine to construct a provider from.
  * @returns An Ethereum provider.
+ * @deprecated Just use {@link InternalProvider} directly instead.
  */
 export function providerFromEngine(engine) {
     return new InternalProvider({ engine });

package/dist/provider-from-engine.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"provider-from-engine.mjs","sourceRoot":"","sources":["../src/provider-from-engine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,gCAA4B;AAEvD;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAqB;IACtD,OAAO,IAAI,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC1C,CAAC","sourcesContent":["import type { JsonRpcEngine } from '@metamask/json-rpc-engine';\n\nimport { InternalProvider } from './internal-provider';\n\n/**\n * Construct an Ethereum provider from the given JSON-RPC engine.\n *\n * @param engine - The JSON-RPC engine to construct a provider from.\n * @returns An Ethereum provider.\n */\nexport function providerFromEngine(engine: JsonRpcEngine): InternalProvider {\n  return new InternalProvider({ engine });\n}\n"]}
+{"version":3,"file":"provider-from-engine.mjs","sourceRoot":"","sources":["../src/provider-from-engine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,gCAA4B;AAEvD;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAqB;IACtD,OAAO,IAAI,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC1C,CAAC","sourcesContent":["import type { JsonRpcEngine } from '@metamask/json-rpc-engine';\n\nimport { InternalProvider } from './internal-provider';\n\n/**\n * Construct an Ethereum provider from a JSON-RPC engine.\n *\n * @param engine - The JSON-RPC engine to construct a provider from.\n * @returns An Ethereum provider.\n * @deprecated Just use {@link InternalProvider} directly instead.\n */\nexport function providerFromEngine(engine: JsonRpcEngine): InternalProvider {\n  return new InternalProvider({ engine });\n}\n"]}

package/dist/provider-from-middleware.cjs

@@ -1,19 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.providerFromMiddleware = void 0;
+exports.providerFromMiddlewareV2 = exports.providerFromMiddleware = void 0;
 const json_rpc_engine_1 = require("@metamask/json-rpc-engine");
-const provider_from_engine_1 = require("./provider-from-engine.cjs");
+const v2_1 = require("@metamask/json-rpc-engine/v2");
+const internal_provider_1 = require("./internal-provider.cjs");
 /**
  * Construct an Ethereum provider from the given middleware.
  *
  * @param middleware - The middleware to construct a provider from.
  * @returns An Ethereum provider.
+ * @deprecated Use {@link providerFromMiddlewareV2} instead.
  */
 function providerFromMiddleware(middleware) {
-    const engine = new json_rpc_engine_1.JsonRpcEngine();
-    engine.push(middleware);
-    const provider = (0, provider_from_engine_1.providerFromEngine)(engine);
-    return provider;
+    return providerFromMiddlewareV2((0, json_rpc_engine_1.asV2Middleware)(middleware));
 }
 exports.providerFromMiddleware = providerFromMiddleware;
+/**
+ * Construct an Ethereum provider from the given middleware.
+ *
+ * @param middleware - The middleware to construct a provider from.
+ * @returns An Ethereum provider.
+ */
+function providerFromMiddlewareV2(middleware) {
+    return new internal_provider_1.InternalProvider({
+        server: new v2_1.JsonRpcServer({ middleware: [middleware] }),
+    });
+}
+exports.providerFromMiddlewareV2 = providerFromMiddlewareV2;
 //# sourceMappingURL=provider-from-middleware.cjs.map

package/dist/provider-from-middleware.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"provider-from-middleware.cjs","sourceRoot":"","sources":["../src/provider-from-middleware.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAK1D,qEAA4D;AAE5D;;;;;GAKG;AACH,SAAgB,sBAAsB,CAGpC,UAA6C;IAC7C,MAAM,MAAM,GAAkB,IAAI,+BAAa,EAAE,CAAC;IAClD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxB,MAAM,QAAQ,GAAqB,IAAA,yCAAkB,EAAC,MAAM,CAAC,CAAC;IAC9D,OAAO,QAAQ,CAAC;AAClB,CAAC;AARD,wDAQC","sourcesContent":["import { JsonRpcEngine } from '@metamask/json-rpc-engine';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport type { Json, JsonRpcParams } from '@metamask/utils';\n\nimport type { InternalProvider } from './internal-provider';\nimport { providerFromEngine } from './provider-from-engine';\n\n/**\n * Construct an Ethereum provider from the given middleware.\n *\n * @param middleware - The middleware to construct a provider from.\n * @returns An Ethereum provider.\n */\nexport function providerFromMiddleware<\n  Params extends JsonRpcParams,\n  Result extends Json,\n>(middleware: JsonRpcMiddleware<Params, Result>): InternalProvider {\n  const engine: JsonRpcEngine = new JsonRpcEngine();\n  engine.push(middleware);\n  const provider: InternalProvider = providerFromEngine(engine);\n  return provider;\n}\n"]}
+{"version":3,"file":"provider-from-middleware.cjs","sourceRoot":"","sources":["../src/provider-from-middleware.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAE3D,qDAA6D;AAI7D,+DAAuD;AAEvD;;;;;;GAMG;AACH,SAAgB,sBAAsB,CAGpC,UAAmD;IACnD,OAAO,wBAAwB,CAC7B,IAAA,gCAAc,EAAC,UAAU,CAA+B,CACzD,CAAC;AACJ,CAAC;AAPD,wDAOC;AAED;;;;;GAKG;AACH,SAAgB,wBAAwB,CAEtC,UAAsB;IACtB,OAAO,IAAI,oCAAgB,CAAC;QAC1B,MAAM,EAAE,IAAI,kBAAa,CAAC,EAAE,UAAU,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;KACxD,CAAC,CAAC;AACL,CAAC;AAND,4DAMC","sourcesContent":["import { asV2Middleware } from '@metamask/json-rpc-engine';\nimport type { JsonRpcMiddleware as LegacyJsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport { JsonRpcServer } from '@metamask/json-rpc-engine/v2';\nimport type { Json, JsonRpcParams } from '@metamask/utils';\n\nimport type { InternalProviderMiddleware } from './internal-provider';\nimport { InternalProvider } from './internal-provider';\n\n/**\n * Construct an Ethereum provider from the given middleware.\n *\n * @param middleware - The middleware to construct a provider from.\n * @returns An Ethereum provider.\n * @deprecated Use {@link providerFromMiddlewareV2} instead.\n */\nexport function providerFromMiddleware<\n  Params extends JsonRpcParams,\n  Result extends Json,\n>(middleware: LegacyJsonRpcMiddleware<Params, Result>): InternalProvider {\n  return providerFromMiddlewareV2(\n    asV2Middleware(middleware) as InternalProviderMiddleware,\n  );\n}\n\n/**\n * Construct an Ethereum provider from the given middleware.\n *\n * @param middleware - The middleware to construct a provider from.\n * @returns An Ethereum provider.\n */\nexport function providerFromMiddlewareV2<\n  Middleware extends InternalProviderMiddleware,\n>(middleware: Middleware): InternalProvider {\n  return new InternalProvider({\n    server: new JsonRpcServer({ middleware: [middleware] }),\n  });\n}\n"]}

package/dist/provider-from-middleware.d.cts

@@ -1,11 +1,20 @@
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
+import type { JsonRpcMiddleware as LegacyJsonRpcMiddleware } from "@metamask/json-rpc-engine";
 import type { Json, JsonRpcParams } from "@metamask/utils";
-import type { InternalProvider } from "./internal-provider.cjs";
+import type { InternalProviderMiddleware } from "./internal-provider.cjs";
+import { InternalProvider } from "./internal-provider.cjs";
 /**
  * Construct an Ethereum provider from the given middleware.
  *
  * @param middleware - The middleware to construct a provider from.
  * @returns An Ethereum provider.
+ * @deprecated Use {@link providerFromMiddlewareV2} instead.
  */
-export declare function providerFromMiddleware<Params extends JsonRpcParams, Result extends Json>(middleware: JsonRpcMiddleware<Params, Result>): InternalProvider;
+export declare function providerFromMiddleware<Params extends JsonRpcParams, Result extends Json>(middleware: LegacyJsonRpcMiddleware<Params, Result>): InternalProvider;
+/**
+ * Construct an Ethereum provider from the given middleware.
+ *
+ * @param middleware - The middleware to construct a provider from.
+ * @returns An Ethereum provider.
+ */
+export declare function providerFromMiddlewareV2<Middleware extends InternalProviderMiddleware>(middleware: Middleware): InternalProvider;
 //# sourceMappingURL=provider-from-middleware.d.cts.map

package/dist/provider-from-middleware.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-from-middleware.d.cts","sourceRoot":"","sources":["../src/provider-from-middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AACnE,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,wBAAwB;AAE3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,gCAA4B;AAG5D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,SAAS,aAAa,EAC5B,MAAM,SAAS,IAAI,EACnB,UAAU,EAAE,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,gBAAgB,CAKjE"}
+{"version":3,"file":"provider-from-middleware.d.cts","sourceRoot":"","sources":["../src/provider-from-middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,kCAAkC;AAE9F,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,wBAAwB;AAE3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,gCAA4B;AACtE,OAAO,EAAE,gBAAgB,EAAE,gCAA4B;AAEvD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,SAAS,aAAa,EAC5B,MAAM,SAAS,IAAI,EACnB,UAAU,EAAE,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,gBAAgB,CAIvE;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,SAAS,0BAA0B,EAC7C,UAAU,EAAE,UAAU,GAAG,gBAAgB,CAI1C"}

package/dist/provider-from-middleware.d.mts

@@ -1,11 +1,20 @@
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
+import type { JsonRpcMiddleware as LegacyJsonRpcMiddleware } from "@metamask/json-rpc-engine";
 import type { Json, JsonRpcParams } from "@metamask/utils";
-import type { InternalProvider } from "./internal-provider.mjs";
+import type { InternalProviderMiddleware } from "./internal-provider.mjs";
+import { InternalProvider } from "./internal-provider.mjs";
 /**
  * Construct an Ethereum provider from the given middleware.
  *
  * @param middleware - The middleware to construct a provider from.
  * @returns An Ethereum provider.
+ * @deprecated Use {@link providerFromMiddlewareV2} instead.
  */
-export declare function providerFromMiddleware<Params extends JsonRpcParams, Result extends Json>(middleware: JsonRpcMiddleware<Params, Result>): InternalProvider;
+export declare function providerFromMiddleware<Params extends JsonRpcParams, Result extends Json>(middleware: LegacyJsonRpcMiddleware<Params, Result>): InternalProvider;
+/**
+ * Construct an Ethereum provider from the given middleware.
+ *
+ * @param middleware - The middleware to construct a provider from.
+ * @returns An Ethereum provider.
+ */
+export declare function providerFromMiddlewareV2<Middleware extends InternalProviderMiddleware>(middleware: Middleware): InternalProvider;
 //# sourceMappingURL=provider-from-middleware.d.mts.map

package/dist/provider-from-middleware.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-from-middleware.d.mts","sourceRoot":"","sources":["../src/provider-from-middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AACnE,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,wBAAwB;AAE3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,gCAA4B;AAG5D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,SAAS,aAAa,EAC5B,MAAM,SAAS,IAAI,EACnB,UAAU,EAAE,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,gBAAgB,CAKjE"}
+{"version":3,"file":"provider-from-middleware.d.mts","sourceRoot":"","sources":["../src/provider-from-middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,kCAAkC;AAE9F,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,wBAAwB;AAE3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,gCAA4B;AACtE,OAAO,EAAE,gBAAgB,EAAE,gCAA4B;AAEvD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,SAAS,aAAa,EAC5B,MAAM,SAAS,IAAI,EACnB,UAAU,EAAE,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,gBAAgB,CAIvE;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,SAAS,0BAA0B,EAC7C,UAAU,EAAE,UAAU,GAAG,gBAAgB,CAI1C"}

package/dist/provider-from-middleware.mjs

@@ -1,15 +1,25 @@
-import { JsonRpcEngine } from "@metamask/json-rpc-engine";
-import { providerFromEngine } from "./provider-from-engine.mjs";
+import { asV2Middleware } from "@metamask/json-rpc-engine";
+import { JsonRpcServer } from "@metamask/json-rpc-engine/v2";
+import { InternalProvider } from "./internal-provider.mjs";
 /**
  * Construct an Ethereum provider from the given middleware.
  *
  * @param middleware - The middleware to construct a provider from.
  * @returns An Ethereum provider.
+ * @deprecated Use {@link providerFromMiddlewareV2} instead.
  */
 export function providerFromMiddleware(middleware) {
-    const engine = new JsonRpcEngine();
-    engine.push(middleware);
-    const provider = providerFromEngine(engine);
-    return provider;
+    return providerFromMiddlewareV2(asV2Middleware(middleware));
+}
+/**
+ * Construct an Ethereum provider from the given middleware.
+ *
+ * @param middleware - The middleware to construct a provider from.
+ * @returns An Ethereum provider.
+ */
+export function providerFromMiddlewareV2(middleware) {
+    return new InternalProvider({
+        server: new JsonRpcServer({ middleware: [middleware] }),
+    });
 }
 //# sourceMappingURL=provider-from-middleware.mjs.map

package/dist/provider-from-middleware.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"provider-from-middleware.mjs","sourceRoot":"","sources":["../src/provider-from-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kCAAkC;AAK1D,OAAO,EAAE,kBAAkB,EAAE,mCAA+B;AAE5D;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAGpC,UAA6C;IAC7C,MAAM,MAAM,GAAkB,IAAI,aAAa,EAAE,CAAC;IAClD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxB,MAAM,QAAQ,GAAqB,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC9D,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import { JsonRpcEngine } from '@metamask/json-rpc-engine';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport type { Json, JsonRpcParams } from '@metamask/utils';\n\nimport type { InternalProvider } from './internal-provider';\nimport { providerFromEngine } from './provider-from-engine';\n\n/**\n * Construct an Ethereum provider from the given middleware.\n *\n * @param middleware - The middleware to construct a provider from.\n * @returns An Ethereum provider.\n */\nexport function providerFromMiddleware<\n  Params extends JsonRpcParams,\n  Result extends Json,\n>(middleware: JsonRpcMiddleware<Params, Result>): InternalProvider {\n  const engine: JsonRpcEngine = new JsonRpcEngine();\n  engine.push(middleware);\n  const provider: InternalProvider = providerFromEngine(engine);\n  return provider;\n}\n"]}
+{"version":3,"file":"provider-from-middleware.mjs","sourceRoot":"","sources":["../src/provider-from-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAE3D,OAAO,EAAE,aAAa,EAAE,qCAAqC;AAI7D,OAAO,EAAE,gBAAgB,EAAE,gCAA4B;AAEvD;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAGpC,UAAmD;IACnD,OAAO,wBAAwB,CAC7B,cAAc,CAAC,UAAU,CAA+B,CACzD,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CAEtC,UAAsB;IACtB,OAAO,IAAI,gBAAgB,CAAC;QAC1B,MAAM,EAAE,IAAI,aAAa,CAAC,EAAE,UAAU,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;KACxD,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { asV2Middleware } from '@metamask/json-rpc-engine';\nimport type { JsonRpcMiddleware as LegacyJsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport { JsonRpcServer } from '@metamask/json-rpc-engine/v2';\nimport type { Json, JsonRpcParams } from '@metamask/utils';\n\nimport type { InternalProviderMiddleware } from './internal-provider';\nimport { InternalProvider } from './internal-provider';\n\n/**\n * Construct an Ethereum provider from the given middleware.\n *\n * @param middleware - The middleware to construct a provider from.\n * @returns An Ethereum provider.\n * @deprecated Use {@link providerFromMiddlewareV2} instead.\n */\nexport function providerFromMiddleware<\n  Params extends JsonRpcParams,\n  Result extends Json,\n>(middleware: LegacyJsonRpcMiddleware<Params, Result>): InternalProvider {\n  return providerFromMiddlewareV2(\n    asV2Middleware(middleware) as InternalProviderMiddleware,\n  );\n}\n\n/**\n * Construct an Ethereum provider from the given middleware.\n *\n * @param middleware - The middleware to construct a provider from.\n * @returns An Ethereum provider.\n */\nexport function providerFromMiddlewareV2<\n  Middleware extends InternalProviderMiddleware,\n>(middleware: Middleware): InternalProvider {\n  return new InternalProvider({\n    server: new JsonRpcServer({ middleware: [middleware] }),\n  });\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/eth-json-rpc-provider",
-  "version": "5.0.1-preview-5e4e26a6",
+  "version": "5.0.1-preview-c0feb25",
   "description": "Create an Ethereum provider using a JSON-RPC engine or middleware",
   "keywords": [
     "MetaMask",