@metamask-previews/eth-json-rpc-middleware 21.0.0-preview-70abd50a → 21.0.0-preview-536ed51

package/dist/block-ref-rewrite.mjs

@@ -1,4 +1,3 @@
-import { createAsyncMiddleware } from "@metamask/json-rpc-engine";
 import { blockTagParamIndex } from "./utils/cache.mjs";
 /**
  * Creates a middleware that rewrites "latest" block references to the known
@@ -12,13 +11,13 @@ export function createBlockRefRewriteMiddleware({ blockTracker, } = {}) {
     if (!blockTracker) {
         throw Error('BlockRefRewriteMiddleware - mandatory "blockTracker" option is missing.');
     }
-    return createAsyncMiddleware(async (req, _res, next) => {
-        const blockRefIndex = blockTagParamIndex(req.method);
+    return async ({ request, next }) => {
+        const blockRefIndex = blockTagParamIndex(request.method);
         if (blockRefIndex === undefined) {
             return next();
         }
-        const blockRef = Array.isArray(req.params) && req.params[blockRefIndex]
-            ? req.params[blockRefIndex]
+        const blockRef = Array.isArray(request.params) && request.params[blockRefIndex]
+            ? request.params[blockRefIndex]
             : // omitted blockRef implies "latest"
                 'latest';
         if (blockRef !== 'latest') {
@@ -26,10 +25,15 @@ export function createBlockRefRewriteMiddleware({ blockTracker, } = {}) {
         }
         // rewrite blockRef to block-tracker's block number
         const latestBlockNumber = await blockTracker.getLatestBlock();
-        if (Array.isArray(req.params)) {
-            req.params[blockRefIndex] = latestBlockNumber;
+        if (Array.isArray(request.params)) {
+            const params = request.params.slice();
+            params[blockRefIndex] = latestBlockNumber;
+            return next({
+                ...request,
+                params,
+            });
         }
         return next();
-    });
+    };
 }
 //# sourceMappingURL=block-ref-rewrite.mjs.map

package/dist/block-ref-rewrite.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"block-ref-rewrite.mjs","sourceRoot":"","sources":["../src/block-ref-rewrite.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,kCAAkC;AAGlE,OAAO,EAAE,kBAAkB,EAAE,0BAAsB;AAMnD;;;;;;;GAOG;AACH,MAAM,UAAU,+BAA+B,CAAC,EAC9C,YAAY,MACwB,EAAE;IAItC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,KAAK,CACT,yEAAyE,CAC1E,CAAC;KACH;IAED,OAAO,qBAAqB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QACrD,MAAM,aAAa,GAAuB,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzE,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;YACpD,CAAC,CAAE,GAAG,CAAC,MAAM,CAAC,aAAa,CAAY;YACvC,CAAC,CAAC,oCAAoC;gBACpC,QAAQ,CAAC;QAEf,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,OAAO,IAAI,EAAE,CAAC;SACf;QAED,mDAAmD;QACnD,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;QAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC7B,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,iBAAiB,CAAC;SAC/C;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport { createAsyncMiddleware } from '@metamask/json-rpc-engine';\nimport type { Json, JsonRpcParams } from '@metamask/utils';\n\nimport { blockTagParamIndex } from './utils/cache';\n\ntype BlockRefRewriteMiddlewareOptions = {\n  blockTracker?: PollingBlockTracker;\n};\n\n/**\n * Creates a middleware that rewrites \"latest\" block references to the known\n * latest block number from a block tracker.\n *\n * @param options - The options for the middleware.\n * @param options.blockTracker - The block tracker to use.\n * @returns The middleware.\n */\nexport function createBlockRefRewriteMiddleware({\n  blockTracker,\n}: BlockRefRewriteMiddlewareOptions = {}): JsonRpcMiddleware<\n  JsonRpcParams,\n  Json\n> {\n  if (!blockTracker) {\n    throw Error(\n      'BlockRefRewriteMiddleware - mandatory \"blockTracker\" option is missing.',\n    );\n  }\n\n  return createAsyncMiddleware(async (req, _res, next) => {\n    const blockRefIndex: number | undefined = blockTagParamIndex(req.method);\n    if (blockRefIndex === undefined) {\n      return next();\n    }\n\n    const blockRef: string | undefined =\n      Array.isArray(req.params) && req.params[blockRefIndex]\n        ? (req.params[blockRefIndex] as string)\n        : // omitted blockRef implies \"latest\"\n          'latest';\n\n    if (blockRef !== 'latest') {\n      return next();\n    }\n\n    // rewrite blockRef to block-tracker's block number\n    const latestBlockNumber = await blockTracker.getLatestBlock();\n    if (Array.isArray(req.params)) {\n      req.params[blockRefIndex] = latestBlockNumber;\n    }\n    return next();\n  });\n}\n"]}
+{"version":3,"file":"block-ref-rewrite.mjs","sourceRoot":"","sources":["../src/block-ref-rewrite.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,0BAAsB;AAMnD;;;;;;;GAOG;AACH,MAAM,UAAU,+BAA+B,CAAC,EAC9C,YAAY,MACwB,EAAE;IAItC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,KAAK,CACT,yEAAyE,CAC1E,CAAC;KACH;IAED,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACjC,MAAM,aAAa,GAAuB,kBAAkB,CAC1D,OAAO,CAAC,MAAM,CACf,CAAC;QACF,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;YAC5D,CAAC,CAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAY;YAC3C,CAAC,CAAC,oCAAoC;gBACpC,QAAQ,CAAC;QAEf,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,OAAO,IAAI,EAAE,CAAC;SACf;QAED,mDAAmD;QACnD,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;QAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACjC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtC,MAAM,CAAC,aAAa,CAAC,GAAG,iBAAiB,CAAC;YAC1C,OAAO,IAAI,CAAC;gBACV,GAAG,OAAO;gBACV,MAAM;aACP,CAAC,CAAC;SACJ;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport { blockTagParamIndex } from './utils/cache';\n\ntype BlockRefRewriteMiddlewareOptions = {\n  blockTracker?: PollingBlockTracker;\n};\n\n/**\n * Creates a middleware that rewrites \"latest\" block references to the known\n * latest block number from a block tracker.\n *\n * @param options - The options for the middleware.\n * @param options.blockTracker - The block tracker to use.\n * @returns The middleware.\n */\nexport function createBlockRefRewriteMiddleware({\n  blockTracker,\n}: BlockRefRewriteMiddlewareOptions = {}): JsonRpcMiddleware<\n  JsonRpcRequest,\n  Json\n> {\n  if (!blockTracker) {\n    throw Error(\n      'BlockRefRewriteMiddleware - mandatory \"blockTracker\" option is missing.',\n    );\n  }\n\n  return async ({ request, next }) => {\n    const blockRefIndex: number | undefined = blockTagParamIndex(\n      request.method,\n    );\n    if (blockRefIndex === undefined) {\n      return next();\n    }\n\n    const blockRef: string | undefined =\n      Array.isArray(request.params) && request.params[blockRefIndex]\n        ? (request.params[blockRefIndex] as string)\n        : // omitted blockRef implies \"latest\"\n          'latest';\n\n    if (blockRef !== 'latest') {\n      return next();\n    }\n\n    // rewrite blockRef to block-tracker's block number\n    const latestBlockNumber = await blockTracker.getLatestBlock();\n    if (Array.isArray(request.params)) {\n      const params = request.params.slice();\n      params[blockRefIndex] = latestBlockNumber;\n      return next({\n        ...request,\n        params,\n      });\n    }\n    return next();\n  };\n}\n"]}

package/dist/block-ref.cjs

@@ -1,11 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBlockRefMiddleware = void 0;
-const json_rpc_engine_1 = require("@metamask/json-rpc-engine");
-const full_1 = require("klona/full");
+const klona_1 = require("klona");
 const logging_utils_1 = require("./logging-utils.cjs");
 const cache_1 = require("./utils/cache.cjs");
 const log = (0, logging_utils_1.createModuleLogger)(logging_utils_1.projectLogger, 'block-ref');
+/**
+ * Creates a middleware that rewrites "latest" block references to the known
+ * latest block number from a block tracker.
+ *
+ * @param options - The options for the middleware.
+ * @param options.provider - The provider to use.
+ * @param options.blockTracker - The block tracker to use.
+ * @returns The middleware.
+ */
 function createBlockRefMiddleware({ provider, blockTracker, } = {}) {
     if (!provider) {
         throw Error('BlockRefMiddleware - mandatory "provider" option is missing.');
@@ -13,14 +21,14 @@ function createBlockRefMiddleware({ provider, blockTracker, } = {}) {
     if (!blockTracker) {
         throw Error('BlockRefMiddleware - mandatory "blockTracker" option is missing.');
     }
-    return (0, json_rpc_engine_1.createAsyncMiddleware)(async (req, res, next) => {
-        const blockRefIndex = (0, cache_1.blockTagParamIndex)(req.method);
+    return async ({ request, next }) => {
+        const blockRefIndex = (0, cache_1.blockTagParamIndex)(request.method);
         // skip if method does not include blockRef
         if (blockRefIndex === undefined) {
             return next();
         }
-        const blockRef = Array.isArray(req.params)
-            ? (req.params[blockRefIndex] ?? 'latest')
+        const blockRef = Array.isArray(request.params)
+            ? (request.params[blockRefIndex] ?? 'latest')
             : 'latest';
         // skip if not "latest"
         if (blockRef !== 'latest') {
@@ -31,16 +39,15 @@ function createBlockRefMiddleware({ provider, blockTracker, } = {}) {
         const latestBlockNumber = await blockTracker.getLatestBlock();
         log(`blockRef is "latest", setting param ${blockRefIndex} to latest block ${latestBlockNumber}`);
         // create child request with specific block-ref
-        const childRequest = (0, full_1.klona)(req);
+        const childRequest = (0, klona_1.klona)(request);
         if (Array.isArray(childRequest.params)) {
             childRequest.params[blockRefIndex] = latestBlockNumber;
         }
         // perform child request
         log('Performing another request %o', childRequest);
         // copy child result onto original response
-        res.result = await provider.request(childRequest);
-        return undefined;
-    });
+        return await provider.request(childRequest);
+    };
 }
 exports.createBlockRefMiddleware = createBlockRefMiddleware;
 //# sourceMappingURL=block-ref.cjs.map

package/dist/block-ref.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"block-ref.cjs","sourceRoot":"","sources":["../src/block-ref.ts"],"names":[],"mappings":";;;AAGA,+DAAkE;AAElE,qCAAmC;AAEnC,uDAAoE;AAEpE,6CAAmD;AAOnD,MAAM,GAAG,GAAG,IAAA,kCAAkB,EAAC,6BAAa,EAAE,WAAW,CAAC,CAAC;AAE3D,SAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,YAAY,MACiB,EAAE;IAC/B,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,KAAK,CAAC,8DAA8D,CAAC,CAAC;KAC7E;IAED,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,KAAK,CACT,kEAAkE,CACnE,CAAC;KACH;IAED,OAAO,IAAA,uCAAqB,EAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACpD,MAAM,aAAa,GAAG,IAAA,0BAAkB,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAErD,2CAA2C;QAC3C,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;YACxC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;YACzC,CAAC,CAAC,QAAQ,CAAC;QAEb,uBAAuB;QACvB,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAC1D,OAAO,IAAI,EAAE,CAAC;SACf;QAED,sBAAsB;QACtB,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;QAC9D,GAAG,CACD,uCAAuC,aAAa,oBAAoB,iBAAiB,EAAE,CAC5F,CAAC;QAEF,+CAA+C;QAC/C,MAAM,YAAY,GAAG,IAAA,YAAK,EAAC,GAAG,CAAC,CAAC;QAEhC,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;YACtC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,iBAAiB,CAAC;SACxD;QAED,wBAAwB;QACxB,GAAG,CAAC,+BAA+B,EAAE,YAAY,CAAC,CAAC;QACnD,2CAA2C;QAC3C,GAAG,CAAC,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAuB,YAAY,CAAC,CAAC;QAExE,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AApDD,4DAoDC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { InternalProvider } from '@metamask/eth-json-rpc-provider';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport { createAsyncMiddleware } from '@metamask/json-rpc-engine';\nimport type { Json, JsonRpcParams } from '@metamask/utils';\nimport { klona } from 'klona/full';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\nimport type { Block } from './types';\nimport { blockTagParamIndex } from './utils/cache';\n\ntype BlockRefMiddlewareOptions = {\n  blockTracker?: PollingBlockTracker;\n  provider?: InternalProvider;\n};\n\nconst log = createModuleLogger(projectLogger, 'block-ref');\n\nexport function createBlockRefMiddleware({\n  provider,\n  blockTracker,\n}: BlockRefMiddlewareOptions = {}): JsonRpcMiddleware<JsonRpcParams, Json> {\n  if (!provider) {\n    throw Error('BlockRefMiddleware - mandatory \"provider\" option is missing.');\n  }\n\n  if (!blockTracker) {\n    throw Error(\n      'BlockRefMiddleware - mandatory \"blockTracker\" option is missing.',\n    );\n  }\n\n  return createAsyncMiddleware(async (req, res, next) => {\n    const blockRefIndex = blockTagParamIndex(req.method);\n\n    // skip if method does not include blockRef\n    if (blockRefIndex === undefined) {\n      return next();\n    }\n\n    const blockRef = Array.isArray(req.params)\n      ? (req.params[blockRefIndex] ?? 'latest')\n      : 'latest';\n\n    // skip if not \"latest\"\n    if (blockRef !== 'latest') {\n      log('blockRef is not \"latest\", carrying request forward');\n      return next();\n    }\n\n    // lookup latest block\n    const latestBlockNumber = await blockTracker.getLatestBlock();\n    log(\n      `blockRef is \"latest\", setting param ${blockRefIndex} to latest block ${latestBlockNumber}`,\n    );\n\n    // create child request with specific block-ref\n    const childRequest = klona(req);\n\n    if (Array.isArray(childRequest.params)) {\n      childRequest.params[blockRefIndex] = latestBlockNumber;\n    }\n\n    // perform child request\n    log('Performing another request %o', childRequest);\n    // copy child result onto original response\n    res.result = await provider.request<JsonRpcParams, Block>(childRequest);\n\n    return undefined;\n  });\n}\n"]}
+{"version":3,"file":"block-ref.cjs","sourceRoot":"","sources":["../src/block-ref.ts"],"names":[],"mappings":";;;AAIA,iCAA8B;AAE9B,uDAAoE;AAEpE,6CAAmD;AAOnD,MAAM,GAAG,GAAG,IAAA,kCAAkB,EAAC,6BAAa,EAAE,WAAW,CAAC,CAAC;AAE3D;;;;;;;;GAQG;AACH,SAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,YAAY,MACiB,EAAE;IAC/B,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,KAAK,CAAC,8DAA8D,CAAC,CAAC;KAC7E;IAED,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,KAAK,CACT,kEAAkE,CACnE,CAAC;KACH;IAED,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACjC,MAAM,aAAa,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAEzD,2CAA2C;QAC3C,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC5C,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;YAC7C,CAAC,CAAC,QAAQ,CAAC;QAEb,uBAAuB;QACvB,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAC1D,OAAO,IAAI,EAAE,CAAC;SACf;QAED,sBAAsB;QACtB,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;QAC9D,GAAG,CACD,uCAAuC,aAAa,oBAAoB,iBAAiB,EAAE,CAC5F,CAAC;QAEF,+CAA+C;QAC/C,MAAM,YAAY,GAAG,IAAA,aAAK,EAAC,OAAO,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;YACtC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,iBAAiB,CAAC;SACxD;QAED,wBAAwB;QACxB,GAAG,CAAC,+BAA+B,EAAE,YAAY,CAAC,CAAC;QACnD,2CAA2C;QAC3C,OAAO,MAAM,QAAQ,CAAC,OAAO,CAAuB,YAAY,CAAC,CAAC;IACpE,CAAC,CAAC;AACJ,CAAC;AAlDD,4DAkDC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { InternalProvider } from '@metamask/eth-json-rpc-provider';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';\nimport type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';\nimport { klona } from 'klona';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\nimport type { Block } from './types';\nimport { blockTagParamIndex } from './utils/cache';\n\ntype BlockRefMiddlewareOptions = {\n  blockTracker?: PollingBlockTracker;\n  provider?: InternalProvider;\n};\n\nconst log = createModuleLogger(projectLogger, 'block-ref');\n\n/**\n * Creates a middleware that rewrites \"latest\" block references to the known\n * latest block number from a block tracker.\n *\n * @param options - The options for the middleware.\n * @param options.provider - The provider to use.\n * @param options.blockTracker - The block tracker to use.\n * @returns The middleware.\n */\nexport function createBlockRefMiddleware({\n  provider,\n  blockTracker,\n}: BlockRefMiddlewareOptions = {}): JsonRpcMiddleware<JsonRpcRequest, Json> {\n  if (!provider) {\n    throw Error('BlockRefMiddleware - mandatory \"provider\" option is missing.');\n  }\n\n  if (!blockTracker) {\n    throw Error(\n      'BlockRefMiddleware - mandatory \"blockTracker\" option is missing.',\n    );\n  }\n\n  return async ({ request, next }) => {\n    const blockRefIndex = blockTagParamIndex(request.method);\n\n    // skip if method does not include blockRef\n    if (blockRefIndex === undefined) {\n      return next();\n    }\n\n    const blockRef = Array.isArray(request.params)\n      ? (request.params[blockRefIndex] ?? 'latest')\n      : 'latest';\n\n    // skip if not \"latest\"\n    if (blockRef !== 'latest') {\n      log('blockRef is not \"latest\", carrying request forward');\n      return next();\n    }\n\n    // lookup latest block\n    const latestBlockNumber = await blockTracker.getLatestBlock();\n    log(\n      `blockRef is \"latest\", setting param ${blockRefIndex} to latest block ${latestBlockNumber}`,\n    );\n\n    // create child request with specific block-ref\n    const childRequest = klona(request);\n\n    if (Array.isArray(childRequest.params)) {\n      childRequest.params[blockRefIndex] = latestBlockNumber;\n    }\n\n    // perform child request\n    log('Performing another request %o', childRequest);\n    // copy child result onto original response\n    return await provider.request<JsonRpcParams, Block>(childRequest);\n  };\n}\n"]}

package/dist/block-ref.d.cts

@@ -1,11 +1,20 @@
 import type { PollingBlockTracker } from "@metamask/eth-block-tracker";
 import type { InternalProvider } from "@metamask/eth-json-rpc-provider";
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
-import type { Json, JsonRpcParams } from "@metamask/utils";
+import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine/v2";
+import type { Json, JsonRpcRequest } from "@metamask/utils";
 type BlockRefMiddlewareOptions = {
     blockTracker?: PollingBlockTracker;
     provider?: InternalProvider;
 };
-export declare function createBlockRefMiddleware({ provider, blockTracker, }?: BlockRefMiddlewareOptions): JsonRpcMiddleware<JsonRpcParams, Json>;
+/**
+ * Creates a middleware that rewrites "latest" block references to the known
+ * latest block number from a block tracker.
+ *
+ * @param options - The options for the middleware.
+ * @param options.provider - The provider to use.
+ * @param options.blockTracker - The block tracker to use.
+ * @returns The middleware.
+ */
+export declare function createBlockRefMiddleware({ provider, blockTracker, }?: BlockRefMiddlewareOptions): JsonRpcMiddleware<JsonRpcRequest, Json>;
 export {};
 //# sourceMappingURL=block-ref.d.cts.map

package/dist/block-ref.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"block-ref.d.cts","sourceRoot":"","sources":["../src/block-ref.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oCAAoC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,wCAAwC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AAEnE,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,wBAAwB;AAO3D,KAAK,yBAAyB,GAAG;IAC/B,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B,CAAC;AAIF,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,YAAY,GACb,GAAE,yBAA8B,GAAG,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,CAiDzE"}
+{"version":3,"file":"block-ref.d.cts","sourceRoot":"","sources":["../src/block-ref.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oCAAoC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,wCAAwC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAiB,cAAc,EAAE,wBAAwB;AAO3E,KAAK,yBAAyB,GAAG;IAC/B,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B,CAAC;AAIF;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,YAAY,GACb,GAAE,yBAA8B,GAAG,iBAAiB,CAAC,cAAc,EAAE,IAAI,CAAC,CA+C1E"}

package/dist/block-ref.d.mts

@@ -1,11 +1,20 @@
 import type { PollingBlockTracker } from "@metamask/eth-block-tracker";
 import type { InternalProvider } from "@metamask/eth-json-rpc-provider";
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
-import type { Json, JsonRpcParams } from "@metamask/utils";
+import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine/v2";
+import type { Json, JsonRpcRequest } from "@metamask/utils";
 type BlockRefMiddlewareOptions = {
     blockTracker?: PollingBlockTracker;
     provider?: InternalProvider;
 };
-export declare function createBlockRefMiddleware({ provider, blockTracker, }?: BlockRefMiddlewareOptions): JsonRpcMiddleware<JsonRpcParams, Json>;
+/**
+ * Creates a middleware that rewrites "latest" block references to the known
+ * latest block number from a block tracker.
+ *
+ * @param options - The options for the middleware.
+ * @param options.provider - The provider to use.
+ * @param options.blockTracker - The block tracker to use.
+ * @returns The middleware.
+ */
+export declare function createBlockRefMiddleware({ provider, blockTracker, }?: BlockRefMiddlewareOptions): JsonRpcMiddleware<JsonRpcRequest, Json>;
 export {};
 //# sourceMappingURL=block-ref.d.mts.map

package/dist/block-ref.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"block-ref.d.mts","sourceRoot":"","sources":["../src/block-ref.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oCAAoC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,wCAAwC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AAEnE,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,wBAAwB;AAO3D,KAAK,yBAAyB,GAAG;IAC/B,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B,CAAC;AAIF,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,YAAY,GACb,GAAE,yBAA8B,GAAG,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,CAiDzE"}
+{"version":3,"file":"block-ref.d.mts","sourceRoot":"","sources":["../src/block-ref.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oCAAoC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,wCAAwC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAiB,cAAc,EAAE,wBAAwB;AAO3E,KAAK,yBAAyB,GAAG;IAC/B,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B,CAAC;AAIF;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,YAAY,GACb,GAAE,yBAA8B,GAAG,iBAAiB,CAAC,cAAc,EAAE,IAAI,CAAC,CA+C1E"}

package/dist/block-ref.mjs

@@ -1,8 +1,16 @@
-import { createAsyncMiddleware } from "@metamask/json-rpc-engine";
-import { klona } from "klona/full";
+import { klona } from "klona";
 import { projectLogger, createModuleLogger } from "./logging-utils.mjs";
 import { blockTagParamIndex } from "./utils/cache.mjs";
 const log = createModuleLogger(projectLogger, 'block-ref');
+/**
+ * Creates a middleware that rewrites "latest" block references to the known
+ * latest block number from a block tracker.
+ *
+ * @param options - The options for the middleware.
+ * @param options.provider - The provider to use.
+ * @param options.blockTracker - The block tracker to use.
+ * @returns The middleware.
+ */
 export function createBlockRefMiddleware({ provider, blockTracker, } = {}) {
     if (!provider) {
         throw Error('BlockRefMiddleware - mandatory "provider" option is missing.');
@@ -10,14 +18,14 @@ export function createBlockRefMiddleware({ provider, blockTracker, } = {}) {
     if (!blockTracker) {
         throw Error('BlockRefMiddleware - mandatory "blockTracker" option is missing.');
     }
-    return createAsyncMiddleware(async (req, res, next) => {
-        const blockRefIndex = blockTagParamIndex(req.method);
+    return async ({ request, next }) => {
+        const blockRefIndex = blockTagParamIndex(request.method);
         // skip if method does not include blockRef
         if (blockRefIndex === undefined) {
             return next();
         }
-        const blockRef = Array.isArray(req.params)
-            ? (req.params[blockRefIndex] ?? 'latest')
+        const blockRef = Array.isArray(request.params)
+            ? (request.params[blockRefIndex] ?? 'latest')
             : 'latest';
         // skip if not "latest"
         if (blockRef !== 'latest') {
@@ -28,15 +36,14 @@ export function createBlockRefMiddleware({ provider, blockTracker, } = {}) {
         const latestBlockNumber = await blockTracker.getLatestBlock();
         log(`blockRef is "latest", setting param ${blockRefIndex} to latest block ${latestBlockNumber}`);
         // create child request with specific block-ref
-        const childRequest = klona(req);
+        const childRequest = klona(request);
         if (Array.isArray(childRequest.params)) {
             childRequest.params[blockRefIndex] = latestBlockNumber;
         }
         // perform child request
         log('Performing another request %o', childRequest);
         // copy child result onto original response
-        res.result = await provider.request(childRequest);
-        return undefined;
-    });
+        return await provider.request(childRequest);
+    };
 }
 //# sourceMappingURL=block-ref.mjs.map

package/dist/block-ref.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"block-ref.mjs","sourceRoot":"","sources":["../src/block-ref.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,kCAAkC;AAElE,OAAO,EAAE,KAAK,EAAE,mBAAmB;AAEnC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,4BAAwB;AAEpE,OAAO,EAAE,kBAAkB,EAAE,0BAAsB;AAOnD,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AAE3D,MAAM,UAAU,wBAAwB,CAAC,EACvC,QAAQ,EACR,YAAY,MACiB,EAAE;IAC/B,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,KAAK,CAAC,8DAA8D,CAAC,CAAC;KAC7E;IAED,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,KAAK,CACT,kEAAkE,CACnE,CAAC;KACH;IAED,OAAO,qBAAqB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACpD,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAErD,2CAA2C;QAC3C,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;YACxC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;YACzC,CAAC,CAAC,QAAQ,CAAC;QAEb,uBAAuB;QACvB,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAC1D,OAAO,IAAI,EAAE,CAAC;SACf;QAED,sBAAsB;QACtB,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;QAC9D,GAAG,CACD,uCAAuC,aAAa,oBAAoB,iBAAiB,EAAE,CAC5F,CAAC;QAEF,+CAA+C;QAC/C,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAEhC,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;YACtC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,iBAAiB,CAAC;SACxD;QAED,wBAAwB;QACxB,GAAG,CAAC,+BAA+B,EAAE,YAAY,CAAC,CAAC;QACnD,2CAA2C;QAC3C,GAAG,CAAC,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAuB,YAAY,CAAC,CAAC;QAExE,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { InternalProvider } from '@metamask/eth-json-rpc-provider';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport { createAsyncMiddleware } from '@metamask/json-rpc-engine';\nimport type { Json, JsonRpcParams } from '@metamask/utils';\nimport { klona } from 'klona/full';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\nimport type { Block } from './types';\nimport { blockTagParamIndex } from './utils/cache';\n\ntype BlockRefMiddlewareOptions = {\n  blockTracker?: PollingBlockTracker;\n  provider?: InternalProvider;\n};\n\nconst log = createModuleLogger(projectLogger, 'block-ref');\n\nexport function createBlockRefMiddleware({\n  provider,\n  blockTracker,\n}: BlockRefMiddlewareOptions = {}): JsonRpcMiddleware<JsonRpcParams, Json> {\n  if (!provider) {\n    throw Error('BlockRefMiddleware - mandatory \"provider\" option is missing.');\n  }\n\n  if (!blockTracker) {\n    throw Error(\n      'BlockRefMiddleware - mandatory \"blockTracker\" option is missing.',\n    );\n  }\n\n  return createAsyncMiddleware(async (req, res, next) => {\n    const blockRefIndex = blockTagParamIndex(req.method);\n\n    // skip if method does not include blockRef\n    if (blockRefIndex === undefined) {\n      return next();\n    }\n\n    const blockRef = Array.isArray(req.params)\n      ? (req.params[blockRefIndex] ?? 'latest')\n      : 'latest';\n\n    // skip if not \"latest\"\n    if (blockRef !== 'latest') {\n      log('blockRef is not \"latest\", carrying request forward');\n      return next();\n    }\n\n    // lookup latest block\n    const latestBlockNumber = await blockTracker.getLatestBlock();\n    log(\n      `blockRef is \"latest\", setting param ${blockRefIndex} to latest block ${latestBlockNumber}`,\n    );\n\n    // create child request with specific block-ref\n    const childRequest = klona(req);\n\n    if (Array.isArray(childRequest.params)) {\n      childRequest.params[blockRefIndex] = latestBlockNumber;\n    }\n\n    // perform child request\n    log('Performing another request %o', childRequest);\n    // copy child result onto original response\n    res.result = await provider.request<JsonRpcParams, Block>(childRequest);\n\n    return undefined;\n  });\n}\n"]}
+{"version":3,"file":"block-ref.mjs","sourceRoot":"","sources":["../src/block-ref.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,cAAc;AAE9B,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,4BAAwB;AAEpE,OAAO,EAAE,kBAAkB,EAAE,0BAAsB;AAOnD,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AAE3D;;;;;;;;GAQG;AACH,MAAM,UAAU,wBAAwB,CAAC,EACvC,QAAQ,EACR,YAAY,MACiB,EAAE;IAC/B,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,KAAK,CAAC,8DAA8D,CAAC,CAAC;KAC7E;IAED,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,KAAK,CACT,kEAAkE,CACnE,CAAC;KACH;IAED,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACjC,MAAM,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAEzD,2CAA2C;QAC3C,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC5C,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;YAC7C,CAAC,CAAC,QAAQ,CAAC;QAEb,uBAAuB;QACvB,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAC1D,OAAO,IAAI,EAAE,CAAC;SACf;QAED,sBAAsB;QACtB,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;QAC9D,GAAG,CACD,uCAAuC,aAAa,oBAAoB,iBAAiB,EAAE,CAC5F,CAAC;QAEF,+CAA+C;QAC/C,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;YACtC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,iBAAiB,CAAC;SACxD;QAED,wBAAwB;QACxB,GAAG,CAAC,+BAA+B,EAAE,YAAY,CAAC,CAAC;QACnD,2CAA2C;QAC3C,OAAO,MAAM,QAAQ,CAAC,OAAO,CAAuB,YAAY,CAAC,CAAC;IACpE,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { InternalProvider } from '@metamask/eth-json-rpc-provider';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';\nimport type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';\nimport { klona } from 'klona';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\nimport type { Block } from './types';\nimport { blockTagParamIndex } from './utils/cache';\n\ntype BlockRefMiddlewareOptions = {\n  blockTracker?: PollingBlockTracker;\n  provider?: InternalProvider;\n};\n\nconst log = createModuleLogger(projectLogger, 'block-ref');\n\n/**\n * Creates a middleware that rewrites \"latest\" block references to the known\n * latest block number from a block tracker.\n *\n * @param options - The options for the middleware.\n * @param options.provider - The provider to use.\n * @param options.blockTracker - The block tracker to use.\n * @returns The middleware.\n */\nexport function createBlockRefMiddleware({\n  provider,\n  blockTracker,\n}: BlockRefMiddlewareOptions = {}): JsonRpcMiddleware<JsonRpcRequest, Json> {\n  if (!provider) {\n    throw Error('BlockRefMiddleware - mandatory \"provider\" option is missing.');\n  }\n\n  if (!blockTracker) {\n    throw Error(\n      'BlockRefMiddleware - mandatory \"blockTracker\" option is missing.',\n    );\n  }\n\n  return async ({ request, next }) => {\n    const blockRefIndex = blockTagParamIndex(request.method);\n\n    // skip if method does not include blockRef\n    if (blockRefIndex === undefined) {\n      return next();\n    }\n\n    const blockRef = Array.isArray(request.params)\n      ? (request.params[blockRefIndex] ?? 'latest')\n      : 'latest';\n\n    // skip if not \"latest\"\n    if (blockRef !== 'latest') {\n      log('blockRef is not \"latest\", carrying request forward');\n      return next();\n    }\n\n    // lookup latest block\n    const latestBlockNumber = await blockTracker.getLatestBlock();\n    log(\n      `blockRef is \"latest\", setting param ${blockRefIndex} to latest block ${latestBlockNumber}`,\n    );\n\n    // create child request with specific block-ref\n    const childRequest = klona(request);\n\n    if (Array.isArray(childRequest.params)) {\n      childRequest.params[blockRefIndex] = latestBlockNumber;\n    }\n\n    // perform child request\n    log('Performing another request %o', childRequest);\n    // copy child result onto original response\n    return await provider.request<JsonRpcParams, Block>(childRequest);\n  };\n}\n"]}

package/dist/block-tracker-inspector.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBlockTrackerInspectorMiddleware = void 0;
-const json_rpc_engine_1 = require("@metamask/json-rpc-engine");
 const utils_1 = require("@metamask/utils");
 const logging_utils_1 = require("./logging-utils.cjs");
 const log = (0, logging_utils_1.createModuleLogger)(logging_utils_1.projectLogger, 'block-tracker-inspector');
@@ -18,39 +17,43 @@ const futureBlockRefRequests = [
  * @returns The middleware.
  */
 function createBlockTrackerInspectorMiddleware({ blockTracker, }) {
-    return (0, json_rpc_engine_1.createAsyncMiddleware)(async (req, res, next) => {
-        if (!futureBlockRefRequests.includes(req.method)) {
+    return async ({ request, next }) => {
+        if (!futureBlockRefRequests.includes(request.method)) {
             return next();
         }
-        await next();
-        const responseBlockNumber = getResultBlockNumber(res);
-        if (!responseBlockNumber) {
-            return undefined;
+        const result = await next();
+        const responseBlockNumber = getResultBlockNumber(result);
+        if (responseBlockNumber) {
+            log('res.result.blockNumber exists, proceeding. res = %o', result);
+            // If number is higher, suggest block-tracker check for a new block
+            const blockNumber = Number.parseInt(responseBlockNumber, 16);
+            const currentBlockNumber = Number.parseInt(
+            // Typecast: If getCurrentBlock returns null, currentBlockNumber will be NaN, which is fine.
+            blockTracker.getCurrentBlock(), 16);
+            if (blockNumber > currentBlockNumber) {
+                log('blockNumber from response is greater than current block number, refreshing current block number');
+                await blockTracker.checkForLatestBlock();
+            }
         }
-        log('res.result.blockNumber exists, proceeding. res = %o', res);
-        // If number is higher, suggest block-tracker check for a new block
-        const blockNumber = Number.parseInt(responseBlockNumber, 16);
-        const currentBlockNumber = Number.parseInt(
-        // Typecast: If getCurrentBlock returns null, currentBlockNumber will be NaN, which is fine.
-        blockTracker.getCurrentBlock(), 16);
-        if (blockNumber > currentBlockNumber) {
-            log('blockNumber from response is greater than current block number, refreshing current block number');
-            await blockTracker.checkForLatestBlock();
-        }
-        return undefined;
-    });
+        return result;
+    };
 }
 exports.createBlockTrackerInspectorMiddleware = createBlockTrackerInspectorMiddleware;
-function getResultBlockNumber(response) {
-    const { result } = response;
+/**
+ * Extracts the block number from the result.
+ *
+ * @param result - The result to extract the block number from.
+ * @returns The block number, or undefined if the result is not an object with a
+ * `blockNumber` property.
+ */
+function getResultBlockNumber(result) {
     if (!result ||
         typeof result !== 'object' ||
         !(0, utils_1.hasProperty)(result, 'blockNumber')) {
         return undefined;
     }
-    if (typeof result.blockNumber === 'string') {
-        return result.blockNumber;
-    }
-    return undefined;
+    return typeof result.blockNumber === 'string'
+        ? result.blockNumber
+        : undefined;
 }
 //# sourceMappingURL=block-tracker-inspector.cjs.map

package/dist/block-tracker-inspector.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"block-tracker-inspector.cjs","sourceRoot":"","sources":["../src/block-tracker-inspector.ts"],"names":[],"mappings":";;;AAEA,+DAAkE;AAClE,2CAA8C;AAO9C,uDAAoE;AAEpE,MAAM,GAAG,GAAG,IAAA,kCAAkB,EAAC,6BAAa,EAAE,yBAAyB,CAAC,CAAC;AACzE,MAAM,sBAAsB,GAAsB;IAChD,0BAA0B;IAC1B,2BAA2B;CAC5B,CAAC;AAEF;;;;;;;GAOG;AACH,SAAgB,qCAAqC,CAAC,EACpD,YAAY,GAGb;IACC,OAAO,IAAA,uCAAqB,EAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACpD,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAChD,OAAO,IAAI,EAAE,CAAC;SACf;QACD,MAAM,IAAI,EAAE,CAAC;QAEb,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAO,SAAS,CAAC;SAClB;QAED,GAAG,CAAC,qDAAqD,EAAE,GAAG,CAAC,CAAC;QAEhE,mEAAmE;QACnE,MAAM,WAAW,GAAW,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QACrE,MAAM,kBAAkB,GAAW,MAAM,CAAC,QAAQ;QAChD,4FAA4F;QAC5F,YAAY,CAAC,eAAe,EAAY,EACxC,EAAE,CACH,CAAC;QACF,IAAI,WAAW,GAAG,kBAAkB,EAAE;YACpC,GAAG,CACD,iGAAiG,CAClG,CAAC;YACF,MAAM,YAAY,CAAC,mBAAmB,EAAE,CAAC;SAC1C;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAjCD,sFAiCC;AAED,SAAS,oBAAoB,CAC3B,QAAgC;IAEhC,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAC5B,IACE,CAAC,MAAM;QACP,OAAO,MAAM,KAAK,QAAQ;QAC1B,CAAC,IAAA,mBAAW,EAAC,MAAM,EAAE,aAAa,CAAC,EACnC;QACA,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,EAAE;QAC1C,OAAO,MAAM,CAAC,WAAW,CAAC;KAC3B;IACD,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport { createAsyncMiddleware } from '@metamask/json-rpc-engine';\nimport { hasProperty } from '@metamask/utils';\nimport type {\n  Json,\n  JsonRpcParams,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\n\nconst log = createModuleLogger(projectLogger, 'block-tracker-inspector');\nconst futureBlockRefRequests: readonly string[] = [\n  'eth_getTransactionByHash',\n  'eth_getTransactionReceipt',\n];\n\n/**\n * Creates a middleware that checks whether response block references are higher than the current block.\n * If the block reference is higher, the middleware will make the block tracker check for a new block.\n *\n * @param options - The options for the middleware.\n * @param options.blockTracker - The block tracker to use.\n * @returns The middleware.\n */\nexport function createBlockTrackerInspectorMiddleware({\n  blockTracker,\n}: {\n  blockTracker: PollingBlockTracker;\n}): JsonRpcMiddleware<JsonRpcParams, Json> {\n  return createAsyncMiddleware(async (req, res, next) => {\n    if (!futureBlockRefRequests.includes(req.method)) {\n      return next();\n    }\n    await next();\n\n    const responseBlockNumber = getResultBlockNumber(res);\n    if (!responseBlockNumber) {\n      return undefined;\n    }\n\n    log('res.result.blockNumber exists, proceeding. res = %o', res);\n\n    // If number is higher, suggest block-tracker check for a new block\n    const blockNumber: number = Number.parseInt(responseBlockNumber, 16);\n    const currentBlockNumber: number = Number.parseInt(\n      // Typecast: If getCurrentBlock returns null, currentBlockNumber will be NaN, which is fine.\n      blockTracker.getCurrentBlock() as string,\n      16,\n    );\n    if (blockNumber > currentBlockNumber) {\n      log(\n        'blockNumber from response is greater than current block number, refreshing current block number',\n      );\n      await blockTracker.checkForLatestBlock();\n    }\n    return undefined;\n  });\n}\n\nfunction getResultBlockNumber(\n  response: PendingJsonRpcResponse,\n): string | undefined {\n  const { result } = response;\n  if (\n    !result ||\n    typeof result !== 'object' ||\n    !hasProperty(result, 'blockNumber')\n  ) {\n    return undefined;\n  }\n\n  if (typeof result.blockNumber === 'string') {\n    return result.blockNumber;\n  }\n  return undefined;\n}\n"]}
+{"version":3,"file":"block-tracker-inspector.cjs","sourceRoot":"","sources":["../src/block-tracker-inspector.ts"],"names":[],"mappings":";;;AAEA,2CAA8C;AAG9C,uDAAoE;AAEpE,MAAM,GAAG,GAAG,IAAA,kCAAkB,EAAC,6BAAa,EAAE,yBAAyB,CAAC,CAAC;AACzE,MAAM,sBAAsB,GAAsB;IAChD,0BAA0B;IAC1B,2BAA2B;CAC5B,CAAC;AAEF;;;;;;;GAOG;AACH,SAAgB,qCAAqC,CAAC,EACpD,YAAY,GAGb;IACC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACjC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACpD,OAAO,IAAI,EAAE,CAAC;SACf;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAE5B,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,mBAAmB,EAAE;YACvB,GAAG,CAAC,qDAAqD,EAAE,MAAM,CAAC,CAAC;YAEnE,mEAAmE;YACnE,MAAM,WAAW,GAAW,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;YACrE,MAAM,kBAAkB,GAAW,MAAM,CAAC,QAAQ;YAChD,4FAA4F;YAC5F,YAAY,CAAC,eAAe,EAAY,EACxC,EAAE,CACH,CAAC;YAEF,IAAI,WAAW,GAAG,kBAAkB,EAAE;gBACpC,GAAG,CACD,iGAAiG,CAClG,CAAC;gBACF,MAAM,YAAY,CAAC,mBAAmB,EAAE,CAAC;aAC1C;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAhCD,sFAgCC;AAED;;;;;;GAMG;AACH,SAAS,oBAAoB,CAC3B,MAAkC;IAElC,IACE,CAAC,MAAM;QACP,OAAO,MAAM,KAAK,QAAQ;QAC1B,CAAC,IAAA,mBAAW,EAAC,MAAM,EAAE,aAAa,CAAC,EACnC;QACA,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ;QAC3C,CAAC,CAAC,MAAM,CAAC,WAAW;QACpB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';\nimport { hasProperty } from '@metamask/utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\n\nconst log = createModuleLogger(projectLogger, 'block-tracker-inspector');\nconst futureBlockRefRequests: readonly string[] = [\n  'eth_getTransactionByHash',\n  'eth_getTransactionReceipt',\n];\n\n/**\n * Creates a middleware that checks whether response block references are higher than the current block.\n * If the block reference is higher, the middleware will make the block tracker check for a new block.\n *\n * @param options - The options for the middleware.\n * @param options.blockTracker - The block tracker to use.\n * @returns The middleware.\n */\nexport function createBlockTrackerInspectorMiddleware({\n  blockTracker,\n}: {\n  blockTracker: PollingBlockTracker;\n}): JsonRpcMiddleware<JsonRpcRequest, Json> {\n  return async ({ request, next }) => {\n    if (!futureBlockRefRequests.includes(request.method)) {\n      return next();\n    }\n    const result = await next();\n\n    const responseBlockNumber = getResultBlockNumber(result);\n    if (responseBlockNumber) {\n      log('res.result.blockNumber exists, proceeding. res = %o', result);\n\n      // If number is higher, suggest block-tracker check for a new block\n      const blockNumber: number = Number.parseInt(responseBlockNumber, 16);\n      const currentBlockNumber: number = Number.parseInt(\n        // Typecast: If getCurrentBlock returns null, currentBlockNumber will be NaN, which is fine.\n        blockTracker.getCurrentBlock() as string,\n        16,\n      );\n\n      if (blockNumber > currentBlockNumber) {\n        log(\n          'blockNumber from response is greater than current block number, refreshing current block number',\n        );\n        await blockTracker.checkForLatestBlock();\n      }\n    }\n    return result;\n  };\n}\n\n/**\n * Extracts the block number from the result.\n *\n * @param result - The result to extract the block number from.\n * @returns The block number, or undefined if the result is not an object with a\n * `blockNumber` property.\n */\nfunction getResultBlockNumber(\n  result: Readonly<Json> | undefined,\n): string | undefined {\n  if (\n    !result ||\n    typeof result !== 'object' ||\n    !hasProperty(result, 'blockNumber')\n  ) {\n    return undefined;\n  }\n\n  return typeof result.blockNumber === 'string'\n    ? result.blockNumber\n    : undefined;\n}\n"]}

package/dist/block-tracker-inspector.d.cts

@@ -1,6 +1,6 @@
 import type { PollingBlockTracker } from "@metamask/eth-block-tracker";
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
-import type { Json, JsonRpcParams } from "@metamask/utils";
+import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine/v2";
+import type { Json, JsonRpcRequest } from "@metamask/utils";
 /**
  * Creates a middleware that checks whether response block references are higher than the current block.
  * If the block reference is higher, the middleware will make the block tracker check for a new block.
@@ -11,5 +11,5 @@ import type { Json, JsonRpcParams } from "@metamask/utils";
  */
 export declare function createBlockTrackerInspectorMiddleware({ blockTracker, }: {
     blockTracker: PollingBlockTracker;
-}): JsonRpcMiddleware<JsonRpcParams, Json>;
+}): JsonRpcMiddleware<JsonRpcRequest, Json>;
 //# sourceMappingURL=block-tracker-inspector.d.cts.map

package/dist/block-tracker-inspector.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"block-tracker-inspector.d.cts","sourceRoot":"","sources":["../src/block-tracker-inspector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oCAAoC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AAGnE,OAAO,KAAK,EACV,IAAI,EACJ,aAAa,EAEd,wBAAwB;AAUzB;;;;;;;GAOG;AACH,wBAAgB,qCAAqC,CAAC,EACpD,YAAY,GACb,EAAE;IACD,YAAY,EAAE,mBAAmB,CAAC;CACnC,GAAG,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,CA6BzC"}
+{"version":3,"file":"block-tracker-inspector.d.cts","sourceRoot":"","sources":["../src/block-tracker-inspector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oCAAoC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AAEtE,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,wBAAwB;AAU5D;;;;;;;GAOG;AACH,wBAAgB,qCAAqC,CAAC,EACpD,YAAY,GACb,EAAE;IACD,YAAY,EAAE,mBAAmB,CAAC;CACnC,GAAG,iBAAiB,CAAC,cAAc,EAAE,IAAI,CAAC,CA4B1C"}

package/dist/block-tracker-inspector.d.mts

@@ -1,6 +1,6 @@
 import type { PollingBlockTracker } from "@metamask/eth-block-tracker";
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
-import type { Json, JsonRpcParams } from "@metamask/utils";
+import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine/v2";
+import type { Json, JsonRpcRequest } from "@metamask/utils";
 /**
  * Creates a middleware that checks whether response block references are higher than the current block.
  * If the block reference is higher, the middleware will make the block tracker check for a new block.
@@ -11,5 +11,5 @@ import type { Json, JsonRpcParams } from "@metamask/utils";
  */
 export declare function createBlockTrackerInspectorMiddleware({ blockTracker, }: {
     blockTracker: PollingBlockTracker;
-}): JsonRpcMiddleware<JsonRpcParams, Json>;
+}): JsonRpcMiddleware<JsonRpcRequest, Json>;
 //# sourceMappingURL=block-tracker-inspector.d.mts.map

package/dist/block-tracker-inspector.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"block-tracker-inspector.d.mts","sourceRoot":"","sources":["../src/block-tracker-inspector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oCAAoC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AAGnE,OAAO,KAAK,EACV,IAAI,EACJ,aAAa,EAEd,wBAAwB;AAUzB;;;;;;;GAOG;AACH,wBAAgB,qCAAqC,CAAC,EACpD,YAAY,GACb,EAAE;IACD,YAAY,EAAE,mBAAmB,CAAC;CACnC,GAAG,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,CA6BzC"}
+{"version":3,"file":"block-tracker-inspector.d.mts","sourceRoot":"","sources":["../src/block-tracker-inspector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oCAAoC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AAEtE,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,wBAAwB;AAU5D;;;;;;;GAOG;AACH,wBAAgB,qCAAqC,CAAC,EACpD,YAAY,GACb,EAAE;IACD,YAAY,EAAE,mBAAmB,CAAC;CACnC,GAAG,iBAAiB,CAAC,cAAc,EAAE,IAAI,CAAC,CA4B1C"}

package/dist/block-tracker-inspector.mjs

@@ -1,4 +1,3 @@
-import { createAsyncMiddleware } from "@metamask/json-rpc-engine";
 import { hasProperty } from "@metamask/utils";
 import { projectLogger, createModuleLogger } from "./logging-utils.mjs";
 const log = createModuleLogger(projectLogger, 'block-tracker-inspector');
@@ -15,38 +14,42 @@ const futureBlockRefRequests = [
  * @returns The middleware.
  */
 export function createBlockTrackerInspectorMiddleware({ blockTracker, }) {
-    return createAsyncMiddleware(async (req, res, next) => {
-        if (!futureBlockRefRequests.includes(req.method)) {
+    return async ({ request, next }) => {
+        if (!futureBlockRefRequests.includes(request.method)) {
             return next();
         }
-        await next();
-        const responseBlockNumber = getResultBlockNumber(res);
-        if (!responseBlockNumber) {
-            return undefined;
+        const result = await next();
+        const responseBlockNumber = getResultBlockNumber(result);
+        if (responseBlockNumber) {
+            log('res.result.blockNumber exists, proceeding. res = %o', result);
+            // If number is higher, suggest block-tracker check for a new block
+            const blockNumber = Number.parseInt(responseBlockNumber, 16);
+            const currentBlockNumber = Number.parseInt(
+            // Typecast: If getCurrentBlock returns null, currentBlockNumber will be NaN, which is fine.
+            blockTracker.getCurrentBlock(), 16);
+            if (blockNumber > currentBlockNumber) {
+                log('blockNumber from response is greater than current block number, refreshing current block number');
+                await blockTracker.checkForLatestBlock();
+            }
         }
-        log('res.result.blockNumber exists, proceeding. res = %o', res);
-        // If number is higher, suggest block-tracker check for a new block
-        const blockNumber = Number.parseInt(responseBlockNumber, 16);
-        const currentBlockNumber = Number.parseInt(
-        // Typecast: If getCurrentBlock returns null, currentBlockNumber will be NaN, which is fine.
-        blockTracker.getCurrentBlock(), 16);
-        if (blockNumber > currentBlockNumber) {
-            log('blockNumber from response is greater than current block number, refreshing current block number');
-            await blockTracker.checkForLatestBlock();
-        }
-        return undefined;
-    });
+        return result;
+    };
 }
-function getResultBlockNumber(response) {
-    const { result } = response;
+/**
+ * Extracts the block number from the result.
+ *
+ * @param result - The result to extract the block number from.
+ * @returns The block number, or undefined if the result is not an object with a
+ * `blockNumber` property.
+ */
+function getResultBlockNumber(result) {
     if (!result ||
         typeof result !== 'object' ||
         !hasProperty(result, 'blockNumber')) {
         return undefined;
     }
-    if (typeof result.blockNumber === 'string') {
-        return result.blockNumber;
-    }
-    return undefined;
+    return typeof result.blockNumber === 'string'
+        ? result.blockNumber
+        : undefined;
 }
 //# sourceMappingURL=block-tracker-inspector.mjs.map

package/dist/block-tracker-inspector.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"block-tracker-inspector.mjs","sourceRoot":"","sources":["../src/block-tracker-inspector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,kCAAkC;AAClE,OAAO,EAAE,WAAW,EAAE,wBAAwB;AAO9C,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,4BAAwB;AAEpE,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC;AACzE,MAAM,sBAAsB,GAAsB;IAChD,0BAA0B;IAC1B,2BAA2B;CAC5B,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,UAAU,qCAAqC,CAAC,EACpD,YAAY,GAGb;IACC,OAAO,qBAAqB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACpD,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAChD,OAAO,IAAI,EAAE,CAAC;SACf;QACD,MAAM,IAAI,EAAE,CAAC;QAEb,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAO,SAAS,CAAC;SAClB;QAED,GAAG,CAAC,qDAAqD,EAAE,GAAG,CAAC,CAAC;QAEhE,mEAAmE;QACnE,MAAM,WAAW,GAAW,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QACrE,MAAM,kBAAkB,GAAW,MAAM,CAAC,QAAQ;QAChD,4FAA4F;QAC5F,YAAY,CAAC,eAAe,EAAY,EACxC,EAAE,CACH,CAAC;QACF,IAAI,WAAW,GAAG,kBAAkB,EAAE;YACpC,GAAG,CACD,iGAAiG,CAClG,CAAC;YACF,MAAM,YAAY,CAAC,mBAAmB,EAAE,CAAC;SAC1C;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAC3B,QAAgC;IAEhC,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAC5B,IACE,CAAC,MAAM;QACP,OAAO,MAAM,KAAK,QAAQ;QAC1B,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,EACnC;QACA,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,EAAE;QAC1C,OAAO,MAAM,CAAC,WAAW,CAAC;KAC3B;IACD,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport { createAsyncMiddleware } from '@metamask/json-rpc-engine';\nimport { hasProperty } from '@metamask/utils';\nimport type {\n  Json,\n  JsonRpcParams,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\n\nconst log = createModuleLogger(projectLogger, 'block-tracker-inspector');\nconst futureBlockRefRequests: readonly string[] = [\n  'eth_getTransactionByHash',\n  'eth_getTransactionReceipt',\n];\n\n/**\n * Creates a middleware that checks whether response block references are higher than the current block.\n * If the block reference is higher, the middleware will make the block tracker check for a new block.\n *\n * @param options - The options for the middleware.\n * @param options.blockTracker - The block tracker to use.\n * @returns The middleware.\n */\nexport function createBlockTrackerInspectorMiddleware({\n  blockTracker,\n}: {\n  blockTracker: PollingBlockTracker;\n}): JsonRpcMiddleware<JsonRpcParams, Json> {\n  return createAsyncMiddleware(async (req, res, next) => {\n    if (!futureBlockRefRequests.includes(req.method)) {\n      return next();\n    }\n    await next();\n\n    const responseBlockNumber = getResultBlockNumber(res);\n    if (!responseBlockNumber) {\n      return undefined;\n    }\n\n    log('res.result.blockNumber exists, proceeding. res = %o', res);\n\n    // If number is higher, suggest block-tracker check for a new block\n    const blockNumber: number = Number.parseInt(responseBlockNumber, 16);\n    const currentBlockNumber: number = Number.parseInt(\n      // Typecast: If getCurrentBlock returns null, currentBlockNumber will be NaN, which is fine.\n      blockTracker.getCurrentBlock() as string,\n      16,\n    );\n    if (blockNumber > currentBlockNumber) {\n      log(\n        'blockNumber from response is greater than current block number, refreshing current block number',\n      );\n      await blockTracker.checkForLatestBlock();\n    }\n    return undefined;\n  });\n}\n\nfunction getResultBlockNumber(\n  response: PendingJsonRpcResponse,\n): string | undefined {\n  const { result } = response;\n  if (\n    !result ||\n    typeof result !== 'object' ||\n    !hasProperty(result, 'blockNumber')\n  ) {\n    return undefined;\n  }\n\n  if (typeof result.blockNumber === 'string') {\n    return result.blockNumber;\n  }\n  return undefined;\n}\n"]}
+{"version":3,"file":"block-tracker-inspector.mjs","sourceRoot":"","sources":["../src/block-tracker-inspector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,wBAAwB;AAG9C,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,4BAAwB;AAEpE,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC;AACzE,MAAM,sBAAsB,GAAsB;IAChD,0BAA0B;IAC1B,2BAA2B;CAC5B,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,UAAU,qCAAqC,CAAC,EACpD,YAAY,GAGb;IACC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACjC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACpD,OAAO,IAAI,EAAE,CAAC;SACf;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAE5B,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,mBAAmB,EAAE;YACvB,GAAG,CAAC,qDAAqD,EAAE,MAAM,CAAC,CAAC;YAEnE,mEAAmE;YACnE,MAAM,WAAW,GAAW,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;YACrE,MAAM,kBAAkB,GAAW,MAAM,CAAC,QAAQ;YAChD,4FAA4F;YAC5F,YAAY,CAAC,eAAe,EAAY,EACxC,EAAE,CACH,CAAC;YAEF,IAAI,WAAW,GAAG,kBAAkB,EAAE;gBACpC,GAAG,CACD,iGAAiG,CAClG,CAAC;gBACF,MAAM,YAAY,CAAC,mBAAmB,EAAE,CAAC;aAC1C;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,oBAAoB,CAC3B,MAAkC;IAElC,IACE,CAAC,MAAM;QACP,OAAO,MAAM,KAAK,QAAQ;QAC1B,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,EACnC;QACA,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ;QAC3C,CAAC,CAAC,MAAM,CAAC,WAAW;QACpB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC","sourcesContent":["import type { PollingBlockTracker } from '@metamask/eth-block-tracker';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';\nimport { hasProperty } from '@metamask/utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\n\nconst log = createModuleLogger(projectLogger, 'block-tracker-inspector');\nconst futureBlockRefRequests: readonly string[] = [\n  'eth_getTransactionByHash',\n  'eth_getTransactionReceipt',\n];\n\n/**\n * Creates a middleware that checks whether response block references are higher than the current block.\n * If the block reference is higher, the middleware will make the block tracker check for a new block.\n *\n * @param options - The options for the middleware.\n * @param options.blockTracker - The block tracker to use.\n * @returns The middleware.\n */\nexport function createBlockTrackerInspectorMiddleware({\n  blockTracker,\n}: {\n  blockTracker: PollingBlockTracker;\n}): JsonRpcMiddleware<JsonRpcRequest, Json> {\n  return async ({ request, next }) => {\n    if (!futureBlockRefRequests.includes(request.method)) {\n      return next();\n    }\n    const result = await next();\n\n    const responseBlockNumber = getResultBlockNumber(result);\n    if (responseBlockNumber) {\n      log('res.result.blockNumber exists, proceeding. res = %o', result);\n\n      // If number is higher, suggest block-tracker check for a new block\n      const blockNumber: number = Number.parseInt(responseBlockNumber, 16);\n      const currentBlockNumber: number = Number.parseInt(\n        // Typecast: If getCurrentBlock returns null, currentBlockNumber will be NaN, which is fine.\n        blockTracker.getCurrentBlock() as string,\n        16,\n      );\n\n      if (blockNumber > currentBlockNumber) {\n        log(\n          'blockNumber from response is greater than current block number, refreshing current block number',\n        );\n        await blockTracker.checkForLatestBlock();\n      }\n    }\n    return result;\n  };\n}\n\n/**\n * Extracts the block number from the result.\n *\n * @param result - The result to extract the block number from.\n * @returns The block number, or undefined if the result is not an object with a\n * `blockNumber` property.\n */\nfunction getResultBlockNumber(\n  result: Readonly<Json> | undefined,\n): string | undefined {\n  if (\n    !result ||\n    typeof result !== 'object' ||\n    !hasProperty(result, 'blockNumber')\n  ) {\n    return undefined;\n  }\n\n  return typeof result.blockNumber === 'string'\n    ? result.blockNumber\n    : undefined;\n}\n"]}

package/dist/fetch.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFetchMiddleware = void 0;
-const json_rpc_engine_1 = require("@metamask/json-rpc-engine");
 const rpc_errors_1 = require("@metamask/rpc-errors");
+const klona_1 = require("klona");
 /**
  * Creates middleware for sending a JSON-RPC request through the given RPC
  * service.
@@ -16,18 +16,14 @@ const rpc_errors_1 = require("@metamask/rpc-errors");
  * @returns The fetch middleware.
  */
 function createFetchMiddleware({ rpcService, options = {}, }) {
-    return (0, json_rpc_engine_1.createAsyncMiddleware)(async (req, res) => {
+    return async ({ request, context }) => {
+        const origin = context.get('origin');
         const headers = 'originHttpHeaderKey' in options &&
             options.originHttpHeaderKey !== undefined &&
-            req.origin !== undefined
-            ? { [options.originHttpHeaderKey]: req.origin }
+            origin !== undefined
+            ? { [options.originHttpHeaderKey]: origin }
             : {};
-        const jsonRpcResponse = await rpcService.request({
-            id: req.id,
-            jsonrpc: req.jsonrpc,
-            method: req.method,
-            params: req.params,
-        }, {
+        const jsonRpcResponse = await rpcService.request((0, klona_1.klona)(request), {
             headers,
         });
         // NOTE: We intentionally do not test to see if `jsonRpcResponse.error` is
@@ -41,8 +37,8 @@ function createFetchMiddleware({ rpcService, options = {}, }) {
         }
         // Discard the `id` and `jsonrpc` fields in the response body
         // (the JSON-RPC engine will fill those in)
-        res.result = jsonRpcResponse.result;
-    });
+        return jsonRpcResponse.result;
+    };
 }
 exports.createFetchMiddleware = createFetchMiddleware;
 //# sourceMappingURL=fetch.cjs.map

package/dist/fetch.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.cjs","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;AACA,+DAAkE;AAClE,qDAAiD;AAcjD;;;;;;;;;;;GAWG;AACH,SAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,OAAO,GAAG,EAAE,GAMb;IACC,OAAO,IAAA,uCAAqB,EAC1B,KAAK,EAAE,GAA4C,EAAE,GAAG,EAAE,EAAE;QAC1D,MAAM,OAAO,GACX,qBAAqB,IAAI,OAAO;YAChC,OAAO,CAAC,mBAAmB,KAAK,SAAS;YACzC,GAAG,CAAC,MAAM,KAAK,SAAS;YACtB,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE;YAC/C,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,OAAO,CAC9C;YACE,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,EACD;YACE,OAAO;SACR,CACF,CAAC;QAEF,0EAA0E;QAC1E,4CAA4C;QAC5C,sEAAsE;QACtE,uEAAuE;QACvE,IAAI,OAAO,IAAI,eAAe,EAAE;YAC9B,MAAM,sBAAS,CAAC,QAAQ,CAAC;gBACvB,IAAI,EAAE,eAAe,CAAC,KAAK;aAC5B,CAAC,CAAC;SACJ;QAED,6DAA6D;QAC7D,2CAA2C;QAC3C,GAAG,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;IACtC,CAAC,CACF,CAAC;AACJ,CAAC;AA7CD,sDA6CC","sourcesContent":["import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport { createAsyncMiddleware } from '@metamask/json-rpc-engine';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';\n\nimport type { AbstractRpcServiceLike } from './types';\n\n/**\n * Like a JSON-RPC request, but includes an optional `origin` property.\n * This will be included in the request as a header if specified.\n */\ntype JsonRpcRequestWithOrigin<Params extends JsonRpcParams> =\n  JsonRpcRequest<Params> & {\n    origin?: string;\n  };\n\n/**\n * Creates middleware for sending a JSON-RPC request through the given RPC\n * service.\n *\n * @param args - The arguments to this function.\n * @param args.rpcService - The RPC service to use.\n * @param args.options - Options.\n * @param args.options.originHttpHeaderKey - If provided, the origin field for\n * each JSON-RPC request will be attached to each outgoing fetch request under\n * this header.\n * @returns The fetch middleware.\n */\nexport function createFetchMiddleware({\n  rpcService,\n  options = {},\n}: {\n  rpcService: AbstractRpcServiceLike;\n  options?: {\n    originHttpHeaderKey?: string;\n  };\n}): JsonRpcMiddleware<JsonRpcParams, Json> {\n  return createAsyncMiddleware(\n    async (req: JsonRpcRequestWithOrigin<JsonRpcParams>, res) => {\n      const headers =\n        'originHttpHeaderKey' in options &&\n        options.originHttpHeaderKey !== undefined &&\n        req.origin !== undefined\n          ? { [options.originHttpHeaderKey]: req.origin }\n          : {};\n\n      const jsonRpcResponse = await rpcService.request(\n        {\n          id: req.id,\n          jsonrpc: req.jsonrpc,\n          method: req.method,\n          params: req.params,\n        },\n        {\n          headers,\n        },\n      );\n\n      // NOTE: We intentionally do not test to see if `jsonRpcResponse.error` is\n      // strictly a JSON-RPC error response as per\n      // <https://www.jsonrpc.org/specification#error_object> to account for\n      // Ganache returning error objects with extra properties such as `name`\n      if ('error' in jsonRpcResponse) {\n        throw rpcErrors.internal({\n          data: jsonRpcResponse.error,\n        });\n      }\n\n      // Discard the `id` and `jsonrpc` fields in the response body\n      // (the JSON-RPC engine will fill those in)\n      res.result = jsonRpcResponse.result;\n    },\n  );\n}\n"]}
+{"version":3,"file":"fetch.cjs","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;AAIA,qDAAiD;AAEjD,iCAA8B;AAI9B;;;;;;;;;;;GAWG;AACH,SAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,OAAO,GAAG,EAAE,GAMb;IAKC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrC,MAAM,OAAO,GACX,qBAAqB,IAAI,OAAO;YAChC,OAAO,CAAC,mBAAmB,KAAK,SAAS;YACzC,MAAM,KAAK,SAAS;YAClB,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE;YAC3C,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAA,aAAK,EAAC,OAAO,CAAC,EAAE;YAC/D,OAAO;SACR,CAAC,CAAC;QAEH,0EAA0E;QAC1E,4CAA4C;QAC5C,sEAAsE;QACtE,uEAAuE;QACvE,IAAI,OAAO,IAAI,eAAe,EAAE;YAC9B,MAAM,sBAAS,CAAC,QAAQ,CAAC;gBACvB,IAAI,EAAE,eAAe,CAAC,KAAK;aAC5B,CAAC,CAAC;SACJ;QAED,6DAA6D;QAC7D,2CAA2C;QAC3C,OAAO,eAAe,CAAC,MAAM,CAAC;IAChC,CAAC,CAAC;AACJ,CAAC;AAxCD,sDAwCC","sourcesContent":["import type {\n  JsonRpcMiddleware,\n  MiddlewareContext,\n} from '@metamask/json-rpc-engine/v2';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\nimport { klona } from 'klona';\n\nimport type { AbstractRpcServiceLike } from './types';\n\n/**\n * Creates middleware for sending a JSON-RPC request through the given RPC\n * service.\n *\n * @param args - The arguments to this function.\n * @param args.rpcService - The RPC service to use.\n * @param args.options - Options.\n * @param args.options.originHttpHeaderKey - If provided, the origin field for\n * each JSON-RPC request will be attached to each outgoing fetch request under\n * this header.\n * @returns The fetch middleware.\n */\nexport function createFetchMiddleware({\n  rpcService,\n  options = {},\n}: {\n  rpcService: AbstractRpcServiceLike;\n  options?: {\n    originHttpHeaderKey?: string;\n  };\n}): JsonRpcMiddleware<\n  JsonRpcRequest,\n  Json,\n  MiddlewareContext<{ origin: string }>\n> {\n  return async ({ request, context }) => {\n    const origin = context.get('origin');\n    const headers =\n      'originHttpHeaderKey' in options &&\n      options.originHttpHeaderKey !== undefined &&\n      origin !== undefined\n        ? { [options.originHttpHeaderKey]: origin }\n        : {};\n\n    const jsonRpcResponse = await rpcService.request(klona(request), {\n      headers,\n    });\n\n    // NOTE: We intentionally do not test to see if `jsonRpcResponse.error` is\n    // strictly a JSON-RPC error response as per\n    // <https://www.jsonrpc.org/specification#error_object> to account for\n    // Ganache returning error objects with extra properties such as `name`\n    if ('error' in jsonRpcResponse) {\n      throw rpcErrors.internal({\n        data: jsonRpcResponse.error,\n      });\n    }\n\n    // Discard the `id` and `jsonrpc` fields in the response body\n    // (the JSON-RPC engine will fill those in)\n    return jsonRpcResponse.result;\n  };\n}\n"]}

package/dist/fetch.d.cts

@@ -1,5 +1,5 @@
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
-import type { Json, JsonRpcParams } from "@metamask/utils";
+import type { JsonRpcMiddleware, MiddlewareContext } from "@metamask/json-rpc-engine/v2";
+import type { Json, JsonRpcRequest } from "@metamask/utils";
 import type { AbstractRpcServiceLike } from "./types.cjs";
 /**
  * Creates middleware for sending a JSON-RPC request through the given RPC
@@ -18,5 +18,7 @@ export declare function createFetchMiddleware({ rpcService, options, }: {
     options?: {
         originHttpHeaderKey?: string;
     };
-}): JsonRpcMiddleware<JsonRpcParams, Json>;
+}): JsonRpcMiddleware<JsonRpcRequest, Json, MiddlewareContext<{
+    origin: string;
+}>>;
 //# sourceMappingURL=fetch.d.cts.map