@metamask/transaction-controller 63.3.1 → 64.0.0

package/dist/helpers/MethodDataHelper.mjs

@@ -9,7 +9,7 @@ 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 _MethodDataHelper_instances, _MethodDataHelper_getProvider, _MethodDataHelper_getState, _MethodDataHelper_methodRegistryByNetworkClientId, _MethodDataHelper_mutex, _MethodDataHelper_registryLookup;
+var _MethodDataHelper_instances, _MethodDataHelper_getState, _MethodDataHelper_messenger, _MethodDataHelper_methodRegistryByNetworkClientId, _MethodDataHelper_mutex, _MethodDataHelper_registryLookup;
 import { createModuleLogger } from "@metamask/utils";
 import { Mutex } from "async-mutex";
 import { MethodRegistry } from "eth-method-registry";
@@ -17,16 +17,17 @@ import { MethodRegistry } from "eth-method-registry";
 // eslint-disable-next-line import-x/no-nodejs-modules
 import EventEmitter from "events";
 import { projectLogger } from "../logger.mjs";
+import { getProvider } from "../utils/provider.mjs";
 const log = createModuleLogger(projectLogger, 'method-data');
 export class MethodDataHelper {
-    constructor({ getProvider, getState, }) {
+    constructor({ messenger, getState, }) {
         _MethodDataHelper_instances.add(this);
-        _MethodDataHelper_getProvider.set(this, void 0);
         _MethodDataHelper_getState.set(this, void 0);
+        _MethodDataHelper_messenger.set(this, void 0);
         _MethodDataHelper_methodRegistryByNetworkClientId.set(this, void 0);
         _MethodDataHelper_mutex.set(this, new Mutex());
         this.hub = new EventEmitter();
-        __classPrivateFieldSet(this, _MethodDataHelper_getProvider, getProvider, "f");
+        __classPrivateFieldSet(this, _MethodDataHelper_messenger, messenger, "f");
         __classPrivateFieldSet(this, _MethodDataHelper_getState, getState, "f");
         __classPrivateFieldSet(this, _MethodDataHelper_methodRegistryByNetworkClientId, new Map(), "f");
     }
@@ -41,7 +42,10 @@ export class MethodDataHelper {
             }
             let registry = __classPrivateFieldGet(this, _MethodDataHelper_methodRegistryByNetworkClientId, "f").get(networkClientId);
             if (!registry) {
-                const provider = __classPrivateFieldGet(this, _MethodDataHelper_getProvider, "f").call(this, networkClientId);
+                const provider = getProvider({
+                    messenger: __classPrivateFieldGet(this, _MethodDataHelper_messenger, "f"),
+                    networkClientId,
+                });
                 // @ts-expect-error Type in eth-method-registry is inappropriate and should be changed
                 registry = new MethodRegistry({ provider });
                 __classPrivateFieldGet(this, _MethodDataHelper_methodRegistryByNetworkClientId, "f").set(networkClientId, registry);
@@ -57,7 +61,7 @@ export class MethodDataHelper {
         }
     }
 }
-_MethodDataHelper_getProvider = new WeakMap(), _MethodDataHelper_getState = new WeakMap(), _MethodDataHelper_methodRegistryByNetworkClientId = new WeakMap(), _MethodDataHelper_mutex = new WeakMap(), _MethodDataHelper_instances = new WeakSet(), _MethodDataHelper_registryLookup = async function _MethodDataHelper_registryLookup(fourBytePrefix, methodRegistry) {
+_MethodDataHelper_getState = new WeakMap(), _MethodDataHelper_messenger = new WeakMap(), _MethodDataHelper_methodRegistryByNetworkClientId = new WeakMap(), _MethodDataHelper_mutex = new WeakMap(), _MethodDataHelper_instances = new WeakSet(), _MethodDataHelper_registryLookup = async function _MethodDataHelper_registryLookup(fourBytePrefix, methodRegistry) {
     const registryMethod = await methodRegistry.lookup(fourBytePrefix);
     if (!registryMethod) {
         log('No method found', fourBytePrefix);

package/dist/helpers/MethodDataHelper.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"MethodDataHelper.mjs","sourceRoot":"","sources":["../../src/helpers/MethodDataHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NetworkClientId, Provider } from '@metamask/network-controller';\nimport { createModuleLogger } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\nimport { MethodRegistry } from 'eth-method-registry';\n// This package purposefully relies on Node's EventEmitter module.\n// eslint-disable-next-line import-x/no-nodejs-modules\nimport EventEmitter from 'events';\n\nimport { projectLogger } from '../logger';\nimport type { MethodData } from '../TransactionController';\n\nconst log = createModuleLogger(projectLogger, 'method-data');\n\nexport class MethodDataHelper {\n  hub: EventEmitter;\n\n  readonly #getProvider: (networkClientId: NetworkClientId) => Provider;\n\n  readonly #getState: () => Record<string, MethodData>;\n\n  readonly #methodRegistryByNetworkClientId: Map<\n    NetworkClientId,\n    MethodRegistry\n  >;\n\n  readonly #mutex = new Mutex();\n\n  constructor({\n    getProvider,\n    getState,\n  }: {\n    getProvider: (networkClientId: NetworkClientId) => Provider;\n    getState: () => Record<string, MethodData>;\n  }) {\n    this.hub = new EventEmitter();\n\n    this.#getProvider = getProvider;\n    this.#getState = getState;\n    this.#methodRegistryByNetworkClientId = new Map();\n  }\n\n  async lookup(\n    fourBytePrefix: string,\n    networkClientId: NetworkClientId,\n  ): Promise<MethodData> {\n    log('lookup', fourBytePrefix, networkClientId);\n\n    const releaseLock = await this.#mutex.acquire();\n\n    try {\n      const cachedResult = this.#getState()[fourBytePrefix];\n\n      if (cachedResult) {\n        log('Cached', cachedResult);\n        return cachedResult;\n      }\n\n      let registry = this.#methodRegistryByNetworkClientId.get(networkClientId);\n\n      if (!registry) {\n        const provider = this.#getProvider(networkClientId);\n\n        // @ts-expect-error Type in eth-method-registry is inappropriate and should be changed\n        registry = new MethodRegistry({ provider });\n\n        this.#methodRegistryByNetworkClientId.set(networkClientId, registry);\n\n        log('Created registry', networkClientId);\n      }\n\n      const methodData = await this.#registryLookup(fourBytePrefix, registry);\n\n      log('Result', methodData);\n\n      this.hub.emit('update', { fourBytePrefix, methodData });\n\n      return methodData;\n    } finally {\n      releaseLock();\n    }\n  }\n\n  async #registryLookup(\n    fourBytePrefix: string,\n    methodRegistry: MethodRegistry,\n  ): Promise<MethodData> {\n    const registryMethod = await methodRegistry.lookup(fourBytePrefix);\n\n    if (!registryMethod) {\n      log('No method found', fourBytePrefix);\n\n      return {\n        registryMethod: '',\n        parsedRegistryMethod: { name: undefined, args: undefined },\n      };\n    }\n\n    log('Parsing', registryMethod);\n\n    const parsedRegistryMethod = methodRegistry.parse(registryMethod);\n\n    return { registryMethod, parsedRegistryMethod };\n  }\n}\n"]}
+{"version":3,"file":"MethodDataHelper.mjs","sourceRoot":"","sources":["../../src/helpers/MethodDataHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NetworkClientId } from '@metamask/network-controller';\nimport { createModuleLogger } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\nimport { MethodRegistry } from 'eth-method-registry';\n// This package purposefully relies on Node's EventEmitter module.\n// eslint-disable-next-line import-x/no-nodejs-modules\nimport EventEmitter from 'events';\n\nimport { projectLogger } from '../logger';\nimport type {\n  MethodData,\n  TransactionControllerMessenger,\n} from '../TransactionController';\nimport { getProvider } from '../utils/provider';\n\nconst log = createModuleLogger(projectLogger, 'method-data');\n\nexport class MethodDataHelper {\n  hub: EventEmitter;\n\n  readonly #getState: () => Record<string, MethodData>;\n\n  readonly #messenger: TransactionControllerMessenger;\n\n  readonly #methodRegistryByNetworkClientId: Map<\n    NetworkClientId,\n    MethodRegistry\n  >;\n\n  readonly #mutex = new Mutex();\n\n  constructor({\n    messenger,\n    getState,\n  }: {\n    messenger: TransactionControllerMessenger;\n    getState: () => Record<string, MethodData>;\n  }) {\n    this.hub = new EventEmitter();\n\n    this.#messenger = messenger;\n    this.#getState = getState;\n    this.#methodRegistryByNetworkClientId = new Map();\n  }\n\n  async lookup(\n    fourBytePrefix: string,\n    networkClientId: NetworkClientId,\n  ): Promise<MethodData> {\n    log('lookup', fourBytePrefix, networkClientId);\n\n    const releaseLock = await this.#mutex.acquire();\n\n    try {\n      const cachedResult = this.#getState()[fourBytePrefix];\n\n      if (cachedResult) {\n        log('Cached', cachedResult);\n        return cachedResult;\n      }\n\n      let registry = this.#methodRegistryByNetworkClientId.get(networkClientId);\n\n      if (!registry) {\n        const provider = getProvider({\n          messenger: this.#messenger,\n          networkClientId,\n        });\n\n        // @ts-expect-error Type in eth-method-registry is inappropriate and should be changed\n        registry = new MethodRegistry({ provider });\n\n        this.#methodRegistryByNetworkClientId.set(networkClientId, registry);\n\n        log('Created registry', networkClientId);\n      }\n\n      const methodData = await this.#registryLookup(fourBytePrefix, registry);\n\n      log('Result', methodData);\n\n      this.hub.emit('update', { fourBytePrefix, methodData });\n\n      return methodData;\n    } finally {\n      releaseLock();\n    }\n  }\n\n  async #registryLookup(\n    fourBytePrefix: string,\n    methodRegistry: MethodRegistry,\n  ): Promise<MethodData> {\n    const registryMethod = await methodRegistry.lookup(fourBytePrefix);\n\n    if (!registryMethod) {\n      log('No method found', fourBytePrefix);\n\n      return {\n        registryMethod: '',\n        parsedRegistryMethod: { name: undefined, args: undefined },\n      };\n    }\n\n    log('Parsing', registryMethod);\n\n    const parsedRegistryMethod = methodRegistry.parse(registryMethod);\n\n    return { registryMethod, parsedRegistryMethod };\n  }\n}\n"]}

package/dist/helpers/MultichainTrackingHelper.cjs

@@ -188,9 +188,7 @@ _MultichainTrackingHelper_findNetworkClientIdByChainId = new WeakMap(), _Multich
         chainId,
     });
     const pendingTransactionTracker = __classPrivateFieldGet(this, _MultichainTrackingHelper_createPendingTransactionTracker, "f").call(this, {
-        provider,
         blockTracker,
-        chainId,
         networkClientId,
     });
     __classPrivateFieldGet(this, _MultichainTrackingHelper_trackingMap, "f").set(networkClientId, {

package/dist/helpers/MultichainTrackingHelper.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainTrackingHelper.cjs","sourceRoot":"","sources":["../../src/helpers/MultichainTrackingHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAUA,6CAAoC;AAGpC,0CAA8D;AAS9D,MAAM,GAAG,GAAG,IAAA,2BAAkB,EAAC,sBAAa,EAAE,qBAAqB,CAAC,CAAC;AA4BrE,MAAa,wBAAwB;IAkCnC,YAAY,EACV,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,EACxB,wCAAwC,EACxC,kBAAkB,EAClB,+BAA+B,EAC/B,oBAAoB,GACY;;QAzCzB,yEAAiF;QAEjF,iEAAiE;QAEjE,qEAAyE;QAEzE,qFAEC;QAED,+DAIU;QAEV,4EAKuB;QAEvB,0DAAyB,IAAI,GAAG,EAA2B,EAAC;QAE5D,gDAML,IAAI,GAAG,EAAE,EAAC;QA4Hd,8CAAyC,GAAG,GAAS,EAAE;YACrD,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,uBAAA,IAAI,6CAAa,EAAE,CAAC;gBAC7C,QAAQ,CAAC,yBAAyB,CAAC,0BAA0B,EAAE,CAAC;YAClE,CAAC;QACH,CAAC,CAAC;QA+CO,uDAAsB,CAC7B,cAAqC,EAC/B,EAAE;YACR,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACrD,MAAM,wBAAwB,GAAG,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,6CAAa,CAAC,IAAI,EAAE,CAAC,CAAC;YAEtE,4DAA4D;YAC5D,MAAM,wBAAwB,GAAG,wBAAwB,CAAC,MAAM,CAC9D,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CACvC,CAAC;YAEF,wBAAwB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBACtC,uBAAA,IAAI,oGAA+B,MAAnC,IAAI,EAAgC,EAAE,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YAEH,wDAAwD;YACxD,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,MAAM,CACnD,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,wBAAwB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAC/C,CAAC;YAEF,qBAAqB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBACnC,uBAAA,IAAI,qGAAgC,MAApC,IAAI,EAAiC,EAAE,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;YAEH,IAAI,qBAAqB,CAAC,MAAM,EAAE,CAAC;gBACjC,GAAG,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAAC;YAC/C,CAAC;YAED,IAAI,wBAAwB,CAAC,MAAM,EAAE,CAAC;gBACpC,GAAG,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,CAAC;YACpD,CAAC;QACH,CAAC,EAAC;QAnMA,uBAAA,IAAI,0DAAiC,4BAA4B,MAAA,CAAC;QAClE,uBAAA,IAAI,kDAAyB,oBAAoB,MAAA,CAAC;QAClD,uBAAA,IAAI,sDAA6B,wBAAwB,MAAA,CAAC;QAE1D,uBAAA,IAAI,sEACF,wCAAwC,MAAA,CAAC;QAC3C,uBAAA,IAAI,gDAAuB,kBAAkB,MAAA,CAAC;QAC9C,uBAAA,IAAI,6DAAoC,+BAA+B,MAAA,CAAC;QAExE,oBAAoB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;YAClC,MAAM,cAAc,GAAG,uBAAA,IAAI,0DAA0B,MAA9B,IAAI,CAA4B,CAAC;YAExD,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBAC/B,IAAI,EAAE,KAAK,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,uBAAuB,EAAE,CAAC;oBAC3D,MAAM,eAAe,GAAG,IAAI,CAAC,CAAC,CAAoB,CAAC;oBACnD,OAAO,cAAc,CAAC,eAAe,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,uBAAA,IAAI,oDAAoB,MAAxB,IAAI,EAAqB,cAAc,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU;QACR,MAAM,cAAc,GAAG,uBAAA,IAAI,0DAA0B,MAA9B,IAAI,CAA4B,CAAC;QAExD,uBAAA,IAAI,oDAAoB,MAAxB,IAAI,EAAqB,cAAc,CAAC,CAAC;QAEzC,GAAG,CAAC,aAAa,CAAC,CAAC;IACrB,CAAC;IAED,GAAG,CAAC,eAAgC;QAClC,OAAO,uBAAA,IAAI,6CAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,6BAA6B,CAAC,EAClC,OAAO,EACP,GAAG,GAAG,QAAQ,GAIf;QACC,IAAI,sBAAsB,GAAG,uBAAA,IAAI,uDAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC5B,sBAAsB,GAAG,IAAI,GAAG,EAAiB,CAAC;YAClD,uBAAA,IAAI,uDAAuB,CAAC,GAAG,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,gBAAgB,GAAG,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,gBAAgB,GAAG,IAAI,mBAAK,EAAE,CAAC;YAC/B,sBAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAC1C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,YAAY,CAChB,OAAe,EACf,eAAgC;QAEhC,MAAM,aAAa,GAAG,uBAAA,IAAI,sDAAsB,MAA1B,IAAI,EAAuB,eAAe,CAAC,CAAC;QAElE,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC;YACxE,OAAO,EAAE,aAAa,CAAC,aAAa,CAAC,OAAO;YAC5C,GAAG,EAAE,OAAO;SACb,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,uBAAA,IAAI,6CAAa,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,YAAY,CAAC;QAE1E,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACb,iDAAiD,eAAe,EAAE,CACnE,CAAC;QACJ,CAAC;QAED,4FAA4F;QAC5F,6EAA6E;QAC7E,gFAAgF;QAChF,wBAAwB;QACxB,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAE3D,MAAM,WAAW,GAAG,GAAS,EAAE;gBAC7B,SAAS,CAAC,WAAW,EAAE,CAAC;gBACxB,wBAAwB,EAAE,EAAE,CAAC;YAC/B,CAAC,CAAC;YAEF,OAAO;gBACL,GAAG,SAAS;gBACZ,WAAW;aACZ,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,wBAAwB,EAAE,EAAE,CAAC;YAC7B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAQD,eAAe;QACb,KAAK,MAAM,CAAC,eAAe,CAAC,IAAI,uBAAA,IAAI,6CAAa,EAAE,CAAC;YAClD,uBAAA,IAAI,oGAA+B,MAAnC,IAAI,EAAgC,eAAe,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,EACf,OAAO,EACP,eAAe,EAAE,sBAAsB,GAIxC;QACC,IAAI,CAAC,sBAAsB,IAAI,CAAC,OAAO,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;QACJ,CAAC;QAED,IAAI,aAAwC,CAAC;QAC7C,IAAI,eAAe,GAAG,sBAAsB,CAAC;QAE7C,IAAI,CAAC;YACH,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,aAAa,GAAG,uBAAA,IAAI,sDAAsB,MAA1B,IAAI,EAAuB,sBAAsB,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,iCAAiC,EAAE,sBAAsB,CAAC,CAAC;YAE/D,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QAED,IAAI,CAAC,aAAa,IAAI,OAAO,EAAE,CAAC;YAC9B,eAAe,GAAG,uBAAA,IAAI,8DAA8B,MAAlC,IAAI,EAA+B,OAAO,CAAC,CAAC;YAC9D,aAAa,GAAG,uBAAA,IAAI,sDAAsB,MAA1B,IAAI,EAAuB,eAAe,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO;YACL,GAAI,aAA+B;YACnC,EAAE,EAAE,eAAkC;SACvC,CAAC;IACJ,CAAC;CA4EF;AAzRD,4DAyRC;+wBAzCgC,eAAgC;IAC7D,MAAM,QAAQ,GAAG,uBAAA,IAAI,6CAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACxD,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;QAC1C,uBAAA,IAAI,0EAA0C,MAA9C,IAAI,EACF,QAAQ,CAAC,yBAAyB,CACnC,CAAC;QACF,uBAAA,IAAI,6CAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC,+HAE+B,eAAgC;IAC9D,MAAM,QAAQ,GAAG,uBAAA,IAAI,6CAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACxD,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,MAAM,EACJ,QAAQ,EACR,YAAY,EACZ,aAAa,EAAE,EAAE,OAAO,EAAE,GAC3B,GAAG,uBAAA,IAAI,sDAAsB,MAA1B,IAAI,EAAuB,eAAe,CAAC,CAAC;IAEhD,MAAM,YAAY,GAAG,uBAAA,IAAI,oDAAoB,MAAxB,IAAI,EAAqB;QAC5C,QAAQ;QACR,YAAY;QACZ,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,yBAAyB,GAAG,uBAAA,IAAI,iEAAiC,MAArC,IAAI,EAAkC;QACtE,QAAQ;QACR,YAAY;QACZ,OAAO;QACP,eAAe;KAChB,CAAC,CAAC;IAEH,uBAAA,IAAI,6CAAa,CAAC,GAAG,CAAC,eAAe,EAAE;QACrC,YAAY;QACZ,yBAAyB;KAC1B,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type {\n  NetworkClientId,\n  NetworkController,\n  NetworkClient,\n  BlockTracker,\n  Provider,\n  NetworkControllerStateChangeEvent,\n} from '@metamask/network-controller';\nimport type { NonceLock, NonceTracker } from '@metamask/nonce-tracker';\nimport type { Hex } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport type { PendingTransactionTracker } from './PendingTransactionTracker';\nimport { createModuleLogger, projectLogger } from '../logger';\n\n/**\n * Registry of network clients provided by the NetworkController\n */\ntype NetworkClientRegistry = ReturnType<\n  NetworkController['getNetworkClientRegistry']\n>;\n\nconst log = createModuleLogger(projectLogger, 'multichain-tracking');\n\nexport type MultichainTrackingHelperOptions = {\n  findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n  getNetworkClientById: NetworkController['getNetworkClientById'];\n  getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  removePendingTransactionTrackerListeners: (\n    pendingTransactionTracker: PendingTransactionTracker,\n  ) => void;\n  createNonceTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n  }) => NonceTracker;\n  createPendingTransactionTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n    networkClientId: NetworkClientId;\n  }) => PendingTransactionTracker;\n  onNetworkStateChange: (\n    listener: (\n      ...payload: NetworkControllerStateChangeEvent['payload']\n    ) => void,\n  ) => void;\n};\n\nexport class MultichainTrackingHelper {\n  readonly #findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n\n  readonly #getNetworkClientById: NetworkController['getNetworkClientById'];\n\n  readonly #getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  readonly #removePendingTransactionTrackerListeners: (\n    pendingTransactionTracker: PendingTransactionTracker,\n  ) => void;\n\n  readonly #createNonceTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n  }) => NonceTracker;\n\n  readonly #createPendingTransactionTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n    networkClientId: NetworkClientId;\n  }) => PendingTransactionTracker;\n\n  readonly #nonceMutexesByChainId = new Map<Hex, Map<string, Mutex>>();\n\n  readonly #trackingMap: Map<\n    NetworkClientId,\n    {\n      nonceTracker: NonceTracker;\n      pendingTransactionTracker: PendingTransactionTracker;\n    }\n  > = new Map();\n\n  constructor({\n    findNetworkClientIdByChainId,\n    getNetworkClientById,\n    getNetworkClientRegistry,\n    removePendingTransactionTrackerListeners,\n    createNonceTracker,\n    createPendingTransactionTracker,\n    onNetworkStateChange,\n  }: MultichainTrackingHelperOptions) {\n    this.#findNetworkClientIdByChainId = findNetworkClientIdByChainId;\n    this.#getNetworkClientById = getNetworkClientById;\n    this.#getNetworkClientRegistry = getNetworkClientRegistry;\n\n    this.#removePendingTransactionTrackerListeners =\n      removePendingTransactionTrackerListeners;\n    this.#createNonceTracker = createNonceTracker;\n    this.#createPendingTransactionTracker = createPendingTransactionTracker;\n\n    onNetworkStateChange((_, patches) => {\n      const networkClients = this.#getNetworkClientRegistry();\n\n      patches.forEach(({ op, path }) => {\n        if (op === 'remove' && path[0] === 'networkConfigurations') {\n          const networkClientId = path[1] as NetworkClientId;\n          delete networkClients[networkClientId];\n        }\n      });\n\n      this.#refreshTrackingMap(networkClients);\n    });\n  }\n\n  initialize(): void {\n    const networkClients = this.#getNetworkClientRegistry();\n\n    this.#refreshTrackingMap(networkClients);\n\n    log('Initialized');\n  }\n\n  has(networkClientId: NetworkClientId): boolean {\n    return this.#trackingMap.has(networkClientId);\n  }\n\n  /**\n   * Gets the mutex intended to guard the nonceTracker for a particular chainId and key .\n   *\n   * @param opts - The options object.\n   * @param opts.chainId - The hex chainId.\n   * @param opts.key - The hex address (or constant) pertaining to the chainId\n   * @returns Mutex instance for the given chainId and key pair\n   */\n  async acquireNonceLockForChainIdKey({\n    chainId,\n    key = 'global',\n  }: {\n    chainId: Hex;\n    key?: string;\n  }): Promise<() => void> {\n    let nonceMutexesForChainId = this.#nonceMutexesByChainId.get(chainId);\n    if (!nonceMutexesForChainId) {\n      nonceMutexesForChainId = new Map<string, Mutex>();\n      this.#nonceMutexesByChainId.set(chainId, nonceMutexesForChainId);\n    }\n    let nonceMutexForKey = nonceMutexesForChainId.get(key);\n    if (!nonceMutexForKey) {\n      nonceMutexForKey = new Mutex();\n      nonceMutexesForChainId.set(key, nonceMutexForKey);\n    }\n\n    return await nonceMutexForKey.acquire();\n  }\n\n  /**\n   * Gets the next nonce according to the nonce-tracker.\n   * Ensure `releaseLock` is called once processing of the `nonce` value is complete.\n   *\n   * @param address - The hex string address for the transaction.\n   * @param networkClientId - The network client ID for the transaction, used to fetch the correct nonce tracker.\n   * @returns object with the `nextNonce` `nonceDetails`, and the releaseLock.\n   */\n  async getNonceLock(\n    address: string,\n    networkClientId: NetworkClientId,\n  ): Promise<NonceLock> {\n    const networkClient = this.#getNetworkClientById(networkClientId);\n\n    const releaseLockForChainIdKey = await this.acquireNonceLockForChainIdKey({\n      chainId: networkClient.configuration.chainId,\n      key: address,\n    });\n\n    const nonceTracker = this.#trackingMap.get(networkClientId)?.nonceTracker;\n\n    if (!nonceTracker) {\n      throw new Error(\n        `Missing nonce tracker for network client ID - ${networkClientId}`,\n      );\n    }\n\n    // Acquires the lock for the chainId + address and the nonceLock from the nonceTracker, then\n    // couples them together by replacing the nonceLock's releaseLock method with\n    // an anonymous function that calls releases both the original nonceLock and the\n    // lock for the chainId.\n    try {\n      const nonceLock = await nonceTracker.getNonceLock(address);\n\n      const releaseLock = (): void => {\n        nonceLock.releaseLock();\n        releaseLockForChainIdKey?.();\n      };\n\n      return {\n        ...nonceLock,\n        releaseLock,\n      };\n    } catch (error) {\n      releaseLockForChainIdKey?.();\n      throw error;\n    }\n  }\n\n  checkForPendingTransactionAndStartPolling = (): void => {\n    for (const [, trackers] of this.#trackingMap) {\n      trackers.pendingTransactionTracker.startIfPendingTransactions();\n    }\n  };\n\n  stopAllTracking(): void {\n    for (const [networkClientId] of this.#trackingMap) {\n      this.#stopTrackingByNetworkClientId(networkClientId);\n    }\n  }\n\n  getNetworkClient({\n    chainId,\n    networkClientId: requestNetworkClientId,\n  }: {\n    chainId?: Hex;\n    networkClientId?: NetworkClientId;\n  }): NetworkClient & { id: NetworkClientId } {\n    if (!requestNetworkClientId && !chainId) {\n      throw new Error(\n        'Cannot locate network client without networkClientId or chainId',\n      );\n    }\n\n    let networkClient: NetworkClient | undefined;\n    let networkClientId = requestNetworkClientId;\n\n    try {\n      if (requestNetworkClientId) {\n        networkClient = this.#getNetworkClientById(requestNetworkClientId);\n      }\n    } catch (error) {\n      log('No network client found with ID', requestNetworkClientId);\n\n      if (!chainId) {\n        throw error;\n      }\n    }\n\n    if (!networkClient && chainId) {\n      networkClientId = this.#findNetworkClientIdByChainId(chainId);\n      networkClient = this.#getNetworkClientById(networkClientId);\n    }\n\n    return {\n      ...(networkClient as NetworkClient),\n      id: networkClientId as NetworkClientId,\n    };\n  }\n\n  readonly #refreshTrackingMap = (\n    networkClients: NetworkClientRegistry,\n  ): void => {\n    const networkClientIds = Object.keys(networkClients);\n    const existingNetworkClientIds = Array.from(this.#trackingMap.keys());\n\n    // Remove tracking for NetworkClientIds that no longer exist\n    const networkClientIdsToRemove = existingNetworkClientIds.filter(\n      (id) => !networkClientIds.includes(id),\n    );\n\n    networkClientIdsToRemove.forEach((id) => {\n      this.#stopTrackingByNetworkClientId(id);\n    });\n\n    // Start tracking new NetworkClientIds from the registry\n    const networkClientIdsToAdd = networkClientIds.filter(\n      (id) => !existingNetworkClientIds.includes(id),\n    );\n\n    networkClientIdsToAdd.forEach((id) => {\n      this.#startTrackingByNetworkClientId(id);\n    });\n\n    if (networkClientIdsToAdd.length) {\n      log('Added trackers', networkClientIdsToAdd);\n    }\n\n    if (networkClientIdsToRemove.length) {\n      log('Removed trackers', networkClientIdsToRemove);\n    }\n  };\n\n  #stopTrackingByNetworkClientId(networkClientId: NetworkClientId): void {\n    const trackers = this.#trackingMap.get(networkClientId);\n    if (trackers) {\n      trackers.pendingTransactionTracker.stop();\n      this.#removePendingTransactionTrackerListeners(\n        trackers.pendingTransactionTracker,\n      );\n      this.#trackingMap.delete(networkClientId);\n    }\n  }\n\n  #startTrackingByNetworkClientId(networkClientId: NetworkClientId): void {\n    const trackers = this.#trackingMap.get(networkClientId);\n    if (trackers) {\n      return;\n    }\n\n    const {\n      provider,\n      blockTracker,\n      configuration: { chainId },\n    } = this.#getNetworkClientById(networkClientId);\n\n    const nonceTracker = this.#createNonceTracker({\n      provider,\n      blockTracker,\n      chainId,\n    });\n\n    const pendingTransactionTracker = this.#createPendingTransactionTracker({\n      provider,\n      blockTracker,\n      chainId,\n      networkClientId,\n    });\n\n    this.#trackingMap.set(networkClientId, {\n      nonceTracker,\n      pendingTransactionTracker,\n    });\n  }\n}\n"]}
+{"version":3,"file":"MultichainTrackingHelper.cjs","sourceRoot":"","sources":["../../src/helpers/MultichainTrackingHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  NetworkClientId,\n  NetworkController,\n  NetworkClient,\n  BlockTracker,\n  Provider,\n  NetworkControllerStateChangeEvent,\n} from '@metamask/network-controller';\nimport type { NonceLock, NonceTracker } from '@metamask/nonce-tracker';\nimport type { Hex } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport type { PendingTransactionTracker } from './PendingTransactionTracker';\nimport { createModuleLogger, projectLogger } from '../logger';\n\n/**\n * Registry of network clients provided by the NetworkController\n */\ntype NetworkClientRegistry = ReturnType<\n  NetworkController['getNetworkClientRegistry']\n>;\n\nconst log = createModuleLogger(projectLogger, 'multichain-tracking');\n\nexport type MultichainTrackingHelperOptions = {\n  findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n  getNetworkClientById: NetworkController['getNetworkClientById'];\n  getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  removePendingTransactionTrackerListeners: (\n    pendingTransactionTracker: PendingTransactionTracker,\n  ) => void;\n  createNonceTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n  }) => NonceTracker;\n  createPendingTransactionTracker: (opts: {\n    blockTracker: BlockTracker;\n    networkClientId: NetworkClientId;\n  }) => PendingTransactionTracker;\n  onNetworkStateChange: (\n    listener: (\n      ...payload: NetworkControllerStateChangeEvent['payload']\n    ) => void,\n  ) => void;\n};\n\nexport class MultichainTrackingHelper {\n  readonly #findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n\n  readonly #getNetworkClientById: NetworkController['getNetworkClientById'];\n\n  readonly #getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  readonly #removePendingTransactionTrackerListeners: (\n    pendingTransactionTracker: PendingTransactionTracker,\n  ) => void;\n\n  readonly #createNonceTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n  }) => NonceTracker;\n\n  readonly #createPendingTransactionTracker: (opts: {\n    blockTracker: BlockTracker;\n    networkClientId: NetworkClientId;\n  }) => PendingTransactionTracker;\n\n  readonly #nonceMutexesByChainId = new Map<Hex, Map<string, Mutex>>();\n\n  readonly #trackingMap: Map<\n    NetworkClientId,\n    {\n      nonceTracker: NonceTracker;\n      pendingTransactionTracker: PendingTransactionTracker;\n    }\n  > = new Map();\n\n  constructor({\n    findNetworkClientIdByChainId,\n    getNetworkClientById,\n    getNetworkClientRegistry,\n    removePendingTransactionTrackerListeners,\n    createNonceTracker,\n    createPendingTransactionTracker,\n    onNetworkStateChange,\n  }: MultichainTrackingHelperOptions) {\n    this.#findNetworkClientIdByChainId = findNetworkClientIdByChainId;\n    this.#getNetworkClientById = getNetworkClientById;\n    this.#getNetworkClientRegistry = getNetworkClientRegistry;\n\n    this.#removePendingTransactionTrackerListeners =\n      removePendingTransactionTrackerListeners;\n    this.#createNonceTracker = createNonceTracker;\n    this.#createPendingTransactionTracker = createPendingTransactionTracker;\n\n    onNetworkStateChange((_, patches) => {\n      const networkClients = this.#getNetworkClientRegistry();\n\n      patches.forEach(({ op, path }) => {\n        if (op === 'remove' && path[0] === 'networkConfigurations') {\n          const networkClientId = path[1] as NetworkClientId;\n          delete networkClients[networkClientId];\n        }\n      });\n\n      this.#refreshTrackingMap(networkClients);\n    });\n  }\n\n  initialize(): void {\n    const networkClients = this.#getNetworkClientRegistry();\n\n    this.#refreshTrackingMap(networkClients);\n\n    log('Initialized');\n  }\n\n  has(networkClientId: NetworkClientId): boolean {\n    return this.#trackingMap.has(networkClientId);\n  }\n\n  /**\n   * Gets the mutex intended to guard the nonceTracker for a particular chainId and key .\n   *\n   * @param opts - The options object.\n   * @param opts.chainId - The hex chainId.\n   * @param opts.key - The hex address (or constant) pertaining to the chainId\n   * @returns Mutex instance for the given chainId and key pair\n   */\n  async acquireNonceLockForChainIdKey({\n    chainId,\n    key = 'global',\n  }: {\n    chainId: Hex;\n    key?: string;\n  }): Promise<() => void> {\n    let nonceMutexesForChainId = this.#nonceMutexesByChainId.get(chainId);\n    if (!nonceMutexesForChainId) {\n      nonceMutexesForChainId = new Map<string, Mutex>();\n      this.#nonceMutexesByChainId.set(chainId, nonceMutexesForChainId);\n    }\n    let nonceMutexForKey = nonceMutexesForChainId.get(key);\n    if (!nonceMutexForKey) {\n      nonceMutexForKey = new Mutex();\n      nonceMutexesForChainId.set(key, nonceMutexForKey);\n    }\n\n    return await nonceMutexForKey.acquire();\n  }\n\n  /**\n   * Gets the next nonce according to the nonce-tracker.\n   * Ensure `releaseLock` is called once processing of the `nonce` value is complete.\n   *\n   * @param address - The hex string address for the transaction.\n   * @param networkClientId - The network client ID for the transaction, used to fetch the correct nonce tracker.\n   * @returns object with the `nextNonce` `nonceDetails`, and the releaseLock.\n   */\n  async getNonceLock(\n    address: string,\n    networkClientId: NetworkClientId,\n  ): Promise<NonceLock> {\n    const networkClient = this.#getNetworkClientById(networkClientId);\n\n    const releaseLockForChainIdKey = await this.acquireNonceLockForChainIdKey({\n      chainId: networkClient.configuration.chainId,\n      key: address,\n    });\n\n    const nonceTracker = this.#trackingMap.get(networkClientId)?.nonceTracker;\n\n    if (!nonceTracker) {\n      throw new Error(\n        `Missing nonce tracker for network client ID - ${networkClientId}`,\n      );\n    }\n\n    // Acquires the lock for the chainId + address and the nonceLock from the nonceTracker, then\n    // couples them together by replacing the nonceLock's releaseLock method with\n    // an anonymous function that calls releases both the original nonceLock and the\n    // lock for the chainId.\n    try {\n      const nonceLock = await nonceTracker.getNonceLock(address);\n\n      const releaseLock = (): void => {\n        nonceLock.releaseLock();\n        releaseLockForChainIdKey?.();\n      };\n\n      return {\n        ...nonceLock,\n        releaseLock,\n      };\n    } catch (error) {\n      releaseLockForChainIdKey?.();\n      throw error;\n    }\n  }\n\n  checkForPendingTransactionAndStartPolling = (): void => {\n    for (const [, trackers] of this.#trackingMap) {\n      trackers.pendingTransactionTracker.startIfPendingTransactions();\n    }\n  };\n\n  stopAllTracking(): void {\n    for (const [networkClientId] of this.#trackingMap) {\n      this.#stopTrackingByNetworkClientId(networkClientId);\n    }\n  }\n\n  getNetworkClient({\n    chainId,\n    networkClientId: requestNetworkClientId,\n  }: {\n    chainId?: Hex;\n    networkClientId?: NetworkClientId;\n  }): NetworkClient & { id: NetworkClientId } {\n    if (!requestNetworkClientId && !chainId) {\n      throw new Error(\n        'Cannot locate network client without networkClientId or chainId',\n      );\n    }\n\n    let networkClient: NetworkClient | undefined;\n    let networkClientId = requestNetworkClientId;\n\n    try {\n      if (requestNetworkClientId) {\n        networkClient = this.#getNetworkClientById(requestNetworkClientId);\n      }\n    } catch (error) {\n      log('No network client found with ID', requestNetworkClientId);\n\n      if (!chainId) {\n        throw error;\n      }\n    }\n\n    if (!networkClient && chainId) {\n      networkClientId = this.#findNetworkClientIdByChainId(chainId);\n      networkClient = this.#getNetworkClientById(networkClientId);\n    }\n\n    return {\n      ...(networkClient as NetworkClient),\n      id: networkClientId as NetworkClientId,\n    };\n  }\n\n  readonly #refreshTrackingMap = (\n    networkClients: NetworkClientRegistry,\n  ): void => {\n    const networkClientIds = Object.keys(networkClients);\n    const existingNetworkClientIds = Array.from(this.#trackingMap.keys());\n\n    // Remove tracking for NetworkClientIds that no longer exist\n    const networkClientIdsToRemove = existingNetworkClientIds.filter(\n      (id) => !networkClientIds.includes(id),\n    );\n\n    networkClientIdsToRemove.forEach((id) => {\n      this.#stopTrackingByNetworkClientId(id);\n    });\n\n    // Start tracking new NetworkClientIds from the registry\n    const networkClientIdsToAdd = networkClientIds.filter(\n      (id) => !existingNetworkClientIds.includes(id),\n    );\n\n    networkClientIdsToAdd.forEach((id) => {\n      this.#startTrackingByNetworkClientId(id);\n    });\n\n    if (networkClientIdsToAdd.length) {\n      log('Added trackers', networkClientIdsToAdd);\n    }\n\n    if (networkClientIdsToRemove.length) {\n      log('Removed trackers', networkClientIdsToRemove);\n    }\n  };\n\n  #stopTrackingByNetworkClientId(networkClientId: NetworkClientId): void {\n    const trackers = this.#trackingMap.get(networkClientId);\n    if (trackers) {\n      trackers.pendingTransactionTracker.stop();\n      this.#removePendingTransactionTrackerListeners(\n        trackers.pendingTransactionTracker,\n      );\n      this.#trackingMap.delete(networkClientId);\n    }\n  }\n\n  #startTrackingByNetworkClientId(networkClientId: NetworkClientId): void {\n    const trackers = this.#trackingMap.get(networkClientId);\n    if (trackers) {\n      return;\n    }\n\n    const {\n      provider,\n      blockTracker,\n      configuration: { chainId },\n    } = this.#getNetworkClientById(networkClientId);\n\n    const nonceTracker = this.#createNonceTracker({\n      provider,\n      blockTracker,\n      chainId,\n    });\n\n    const pendingTransactionTracker = this.#createPendingTransactionTracker({\n      blockTracker,\n      networkClientId,\n    });\n\n    this.#trackingMap.set(networkClientId, {\n      nonceTracker,\n      pendingTransactionTracker,\n    });\n  }\n}\n"]}

package/dist/helpers/MultichainTrackingHelper.d.cts

@@ -13,9 +13,7 @@ export type MultichainTrackingHelperOptions = {
         chainId: Hex;
     }) => NonceTracker;
     createPendingTransactionTracker: (opts: {
-        provider: Provider;
         blockTracker: BlockTracker;
-        chainId: Hex;
         networkClientId: NetworkClientId;
     }) => PendingTransactionTracker;
     onNetworkStateChange: (listener: (...payload: NetworkControllerStateChangeEvent['payload']) => void) => void;

package/dist/helpers/MultichainTrackingHelper.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainTrackingHelper.d.cts","sourceRoot":"","sources":["../../src/helpers/MultichainTrackingHelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,iCAAiC,EAClC,qCAAqC;AACtC,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,gCAAgC;AACvE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,yBAAyB,EAAE,wCAAoC;AAY7E,MAAM,MAAM,+BAA+B,GAAG;IAC5C,4BAA4B,EAAE,iBAAiB,CAAC,8BAA8B,CAAC,CAAC;IAChF,oBAAoB,EAAE,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;IAChE,wBAAwB,EAAE,iBAAiB,CAAC,0BAA0B,CAAC,CAAC;IAExE,wCAAwC,EAAE,CACxC,yBAAyB,EAAE,yBAAyB,KACjD,IAAI,CAAC;IACV,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,GAAG,CAAC;KACd,KAAK,YAAY,CAAC;IACnB,+BAA+B,EAAE,CAAC,IAAI,EAAE;QACtC,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,GAAG,CAAC;QACb,eAAe,EAAE,eAAe,CAAC;KAClC,KAAK,yBAAyB,CAAC;IAChC,oBAAoB,EAAE,CACpB,QAAQ,EAAE,CACR,GAAG,OAAO,EAAE,iCAAiC,CAAC,SAAS,CAAC,KACrD,IAAI,KACN,IAAI,CAAC;CACX,CAAC;AAEF,qBAAa,wBAAwB;;gBAkCvB,EACV,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,EACxB,wCAAwC,EACxC,kBAAkB,EAClB,+BAA+B,EAC/B,oBAAoB,GACrB,EAAE,+BAA+B;IAwBlC,UAAU,IAAI,IAAI;IAQlB,GAAG,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAI9C;;;;;;;OAOG;IACG,6BAA6B,CAAC,EAClC,OAAO,EACP,GAAc,GACf,EAAE;QACD,OAAO,EAAE,GAAG,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC;IAevB;;;;;;;OAOG;IACG,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,SAAS,CAAC;IAsCrB,yCAAyC,QAAO,IAAI,CAIlD;IAEF,eAAe,IAAI,IAAI;IAMvB,gBAAgB,CAAC,EACf,OAAO,EACP,eAAe,EAAE,sBAAsB,GACxC,EAAE;QACD,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,GAAG,aAAa,GAAG;QAAE,EAAE,EAAE,eAAe,CAAA;KAAE;CA2G5C"}
+{"version":3,"file":"MultichainTrackingHelper.d.cts","sourceRoot":"","sources":["../../src/helpers/MultichainTrackingHelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,iCAAiC,EAClC,qCAAqC;AACtC,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,gCAAgC;AACvE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,yBAAyB,EAAE,wCAAoC;AAY7E,MAAM,MAAM,+BAA+B,GAAG;IAC5C,4BAA4B,EAAE,iBAAiB,CAAC,8BAA8B,CAAC,CAAC;IAChF,oBAAoB,EAAE,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;IAChE,wBAAwB,EAAE,iBAAiB,CAAC,0BAA0B,CAAC,CAAC;IAExE,wCAAwC,EAAE,CACxC,yBAAyB,EAAE,yBAAyB,KACjD,IAAI,CAAC;IACV,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,GAAG,CAAC;KACd,KAAK,YAAY,CAAC;IACnB,+BAA+B,EAAE,CAAC,IAAI,EAAE;QACtC,YAAY,EAAE,YAAY,CAAC;QAC3B,eAAe,EAAE,eAAe,CAAC;KAClC,KAAK,yBAAyB,CAAC;IAChC,oBAAoB,EAAE,CACpB,QAAQ,EAAE,CACR,GAAG,OAAO,EAAE,iCAAiC,CAAC,SAAS,CAAC,KACrD,IAAI,KACN,IAAI,CAAC;CACX,CAAC;AAEF,qBAAa,wBAAwB;;gBAgCvB,EACV,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,EACxB,wCAAwC,EACxC,kBAAkB,EAClB,+BAA+B,EAC/B,oBAAoB,GACrB,EAAE,+BAA+B;IAwBlC,UAAU,IAAI,IAAI;IAQlB,GAAG,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAI9C;;;;;;;OAOG;IACG,6BAA6B,CAAC,EAClC,OAAO,EACP,GAAc,GACf,EAAE;QACD,OAAO,EAAE,GAAG,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC;IAevB;;;;;;;OAOG;IACG,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,SAAS,CAAC;IAsCrB,yCAAyC,QAAO,IAAI,CAIlD;IAEF,eAAe,IAAI,IAAI;IAMvB,gBAAgB,CAAC,EACf,OAAO,EACP,eAAe,EAAE,sBAAsB,GACxC,EAAE;QACD,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,GAAG,aAAa,GAAG;QAAE,EAAE,EAAE,eAAe,CAAA;KAAE;CAyG5C"}

package/dist/helpers/MultichainTrackingHelper.d.mts

@@ -13,9 +13,7 @@ export type MultichainTrackingHelperOptions = {
         chainId: Hex;
     }) => NonceTracker;
     createPendingTransactionTracker: (opts: {
-        provider: Provider;
         blockTracker: BlockTracker;
-        chainId: Hex;
         networkClientId: NetworkClientId;
     }) => PendingTransactionTracker;
     onNetworkStateChange: (listener: (...payload: NetworkControllerStateChangeEvent['payload']) => void) => void;

package/dist/helpers/MultichainTrackingHelper.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainTrackingHelper.d.mts","sourceRoot":"","sources":["../../src/helpers/MultichainTrackingHelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,iCAAiC,EAClC,qCAAqC;AACtC,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,gCAAgC;AACvE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,yBAAyB,EAAE,wCAAoC;AAY7E,MAAM,MAAM,+BAA+B,GAAG;IAC5C,4BAA4B,EAAE,iBAAiB,CAAC,8BAA8B,CAAC,CAAC;IAChF,oBAAoB,EAAE,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;IAChE,wBAAwB,EAAE,iBAAiB,CAAC,0BAA0B,CAAC,CAAC;IAExE,wCAAwC,EAAE,CACxC,yBAAyB,EAAE,yBAAyB,KACjD,IAAI,CAAC;IACV,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,GAAG,CAAC;KACd,KAAK,YAAY,CAAC;IACnB,+BAA+B,EAAE,CAAC,IAAI,EAAE;QACtC,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,GAAG,CAAC;QACb,eAAe,EAAE,eAAe,CAAC;KAClC,KAAK,yBAAyB,CAAC;IAChC,oBAAoB,EAAE,CACpB,QAAQ,EAAE,CACR,GAAG,OAAO,EAAE,iCAAiC,CAAC,SAAS,CAAC,KACrD,IAAI,KACN,IAAI,CAAC;CACX,CAAC;AAEF,qBAAa,wBAAwB;;gBAkCvB,EACV,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,EACxB,wCAAwC,EACxC,kBAAkB,EAClB,+BAA+B,EAC/B,oBAAoB,GACrB,EAAE,+BAA+B;IAwBlC,UAAU,IAAI,IAAI;IAQlB,GAAG,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAI9C;;;;;;;OAOG;IACG,6BAA6B,CAAC,EAClC,OAAO,EACP,GAAc,GACf,EAAE;QACD,OAAO,EAAE,GAAG,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC;IAevB;;;;;;;OAOG;IACG,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,SAAS,CAAC;IAsCrB,yCAAyC,QAAO,IAAI,CAIlD;IAEF,eAAe,IAAI,IAAI;IAMvB,gBAAgB,CAAC,EACf,OAAO,EACP,eAAe,EAAE,sBAAsB,GACxC,EAAE;QACD,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,GAAG,aAAa,GAAG;QAAE,EAAE,EAAE,eAAe,CAAA;KAAE;CA2G5C"}
+{"version":3,"file":"MultichainTrackingHelper.d.mts","sourceRoot":"","sources":["../../src/helpers/MultichainTrackingHelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,iCAAiC,EAClC,qCAAqC;AACtC,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,gCAAgC;AACvE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,yBAAyB,EAAE,wCAAoC;AAY7E,MAAM,MAAM,+BAA+B,GAAG;IAC5C,4BAA4B,EAAE,iBAAiB,CAAC,8BAA8B,CAAC,CAAC;IAChF,oBAAoB,EAAE,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;IAChE,wBAAwB,EAAE,iBAAiB,CAAC,0BAA0B,CAAC,CAAC;IAExE,wCAAwC,EAAE,CACxC,yBAAyB,EAAE,yBAAyB,KACjD,IAAI,CAAC;IACV,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,GAAG,CAAC;KACd,KAAK,YAAY,CAAC;IACnB,+BAA+B,EAAE,CAAC,IAAI,EAAE;QACtC,YAAY,EAAE,YAAY,CAAC;QAC3B,eAAe,EAAE,eAAe,CAAC;KAClC,KAAK,yBAAyB,CAAC;IAChC,oBAAoB,EAAE,CACpB,QAAQ,EAAE,CACR,GAAG,OAAO,EAAE,iCAAiC,CAAC,SAAS,CAAC,KACrD,IAAI,KACN,IAAI,CAAC;CACX,CAAC;AAEF,qBAAa,wBAAwB;;gBAgCvB,EACV,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,EACxB,wCAAwC,EACxC,kBAAkB,EAClB,+BAA+B,EAC/B,oBAAoB,GACrB,EAAE,+BAA+B;IAwBlC,UAAU,IAAI,IAAI;IAQlB,GAAG,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAI9C;;;;;;;OAOG;IACG,6BAA6B,CAAC,EAClC,OAAO,EACP,GAAc,GACf,EAAE;QACD,OAAO,EAAE,GAAG,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC;IAevB;;;;;;;OAOG;IACG,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,SAAS,CAAC;IAsCrB,yCAAyC,QAAO,IAAI,CAIlD;IAEF,eAAe,IAAI,IAAI;IAMvB,gBAAgB,CAAC,EACf,OAAO,EACP,eAAe,EAAE,sBAAsB,GACxC,EAAE;QACD,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,GAAG,aAAa,GAAG;QAAE,EAAE,EAAE,eAAe,CAAA;KAAE;CAyG5C"}

package/dist/helpers/MultichainTrackingHelper.mjs

@@ -184,9 +184,7 @@ _MultichainTrackingHelper_findNetworkClientIdByChainId = new WeakMap(), _Multich
         chainId,
     });
     const pendingTransactionTracker = __classPrivateFieldGet(this, _MultichainTrackingHelper_createPendingTransactionTracker, "f").call(this, {
-        provider,
         blockTracker,
-        chainId,
         networkClientId,
     });
     __classPrivateFieldGet(this, _MultichainTrackingHelper_trackingMap, "f").set(networkClientId, {

package/dist/helpers/MultichainTrackingHelper.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainTrackingHelper.mjs","sourceRoot":"","sources":["../../src/helpers/MultichainTrackingHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  NetworkClientId,\n  NetworkController,\n  NetworkClient,\n  BlockTracker,\n  Provider,\n  NetworkControllerStateChangeEvent,\n} from '@metamask/network-controller';\nimport type { NonceLock, NonceTracker } from '@metamask/nonce-tracker';\nimport type { Hex } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport type { PendingTransactionTracker } from './PendingTransactionTracker';\nimport { createModuleLogger, projectLogger } from '../logger';\n\n/**\n * Registry of network clients provided by the NetworkController\n */\ntype NetworkClientRegistry = ReturnType<\n  NetworkController['getNetworkClientRegistry']\n>;\n\nconst log = createModuleLogger(projectLogger, 'multichain-tracking');\n\nexport type MultichainTrackingHelperOptions = {\n  findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n  getNetworkClientById: NetworkController['getNetworkClientById'];\n  getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  removePendingTransactionTrackerListeners: (\n    pendingTransactionTracker: PendingTransactionTracker,\n  ) => void;\n  createNonceTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n  }) => NonceTracker;\n  createPendingTransactionTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n    networkClientId: NetworkClientId;\n  }) => PendingTransactionTracker;\n  onNetworkStateChange: (\n    listener: (\n      ...payload: NetworkControllerStateChangeEvent['payload']\n    ) => void,\n  ) => void;\n};\n\nexport class MultichainTrackingHelper {\n  readonly #findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n\n  readonly #getNetworkClientById: NetworkController['getNetworkClientById'];\n\n  readonly #getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  readonly #removePendingTransactionTrackerListeners: (\n    pendingTransactionTracker: PendingTransactionTracker,\n  ) => void;\n\n  readonly #createNonceTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n  }) => NonceTracker;\n\n  readonly #createPendingTransactionTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n    networkClientId: NetworkClientId;\n  }) => PendingTransactionTracker;\n\n  readonly #nonceMutexesByChainId = new Map<Hex, Map<string, Mutex>>();\n\n  readonly #trackingMap: Map<\n    NetworkClientId,\n    {\n      nonceTracker: NonceTracker;\n      pendingTransactionTracker: PendingTransactionTracker;\n    }\n  > = new Map();\n\n  constructor({\n    findNetworkClientIdByChainId,\n    getNetworkClientById,\n    getNetworkClientRegistry,\n    removePendingTransactionTrackerListeners,\n    createNonceTracker,\n    createPendingTransactionTracker,\n    onNetworkStateChange,\n  }: MultichainTrackingHelperOptions) {\n    this.#findNetworkClientIdByChainId = findNetworkClientIdByChainId;\n    this.#getNetworkClientById = getNetworkClientById;\n    this.#getNetworkClientRegistry = getNetworkClientRegistry;\n\n    this.#removePendingTransactionTrackerListeners =\n      removePendingTransactionTrackerListeners;\n    this.#createNonceTracker = createNonceTracker;\n    this.#createPendingTransactionTracker = createPendingTransactionTracker;\n\n    onNetworkStateChange((_, patches) => {\n      const networkClients = this.#getNetworkClientRegistry();\n\n      patches.forEach(({ op, path }) => {\n        if (op === 'remove' && path[0] === 'networkConfigurations') {\n          const networkClientId = path[1] as NetworkClientId;\n          delete networkClients[networkClientId];\n        }\n      });\n\n      this.#refreshTrackingMap(networkClients);\n    });\n  }\n\n  initialize(): void {\n    const networkClients = this.#getNetworkClientRegistry();\n\n    this.#refreshTrackingMap(networkClients);\n\n    log('Initialized');\n  }\n\n  has(networkClientId: NetworkClientId): boolean {\n    return this.#trackingMap.has(networkClientId);\n  }\n\n  /**\n   * Gets the mutex intended to guard the nonceTracker for a particular chainId and key .\n   *\n   * @param opts - The options object.\n   * @param opts.chainId - The hex chainId.\n   * @param opts.key - The hex address (or constant) pertaining to the chainId\n   * @returns Mutex instance for the given chainId and key pair\n   */\n  async acquireNonceLockForChainIdKey({\n    chainId,\n    key = 'global',\n  }: {\n    chainId: Hex;\n    key?: string;\n  }): Promise<() => void> {\n    let nonceMutexesForChainId = this.#nonceMutexesByChainId.get(chainId);\n    if (!nonceMutexesForChainId) {\n      nonceMutexesForChainId = new Map<string, Mutex>();\n      this.#nonceMutexesByChainId.set(chainId, nonceMutexesForChainId);\n    }\n    let nonceMutexForKey = nonceMutexesForChainId.get(key);\n    if (!nonceMutexForKey) {\n      nonceMutexForKey = new Mutex();\n      nonceMutexesForChainId.set(key, nonceMutexForKey);\n    }\n\n    return await nonceMutexForKey.acquire();\n  }\n\n  /**\n   * Gets the next nonce according to the nonce-tracker.\n   * Ensure `releaseLock` is called once processing of the `nonce` value is complete.\n   *\n   * @param address - The hex string address for the transaction.\n   * @param networkClientId - The network client ID for the transaction, used to fetch the correct nonce tracker.\n   * @returns object with the `nextNonce` `nonceDetails`, and the releaseLock.\n   */\n  async getNonceLock(\n    address: string,\n    networkClientId: NetworkClientId,\n  ): Promise<NonceLock> {\n    const networkClient = this.#getNetworkClientById(networkClientId);\n\n    const releaseLockForChainIdKey = await this.acquireNonceLockForChainIdKey({\n      chainId: networkClient.configuration.chainId,\n      key: address,\n    });\n\n    const nonceTracker = this.#trackingMap.get(networkClientId)?.nonceTracker;\n\n    if (!nonceTracker) {\n      throw new Error(\n        `Missing nonce tracker for network client ID - ${networkClientId}`,\n      );\n    }\n\n    // Acquires the lock for the chainId + address and the nonceLock from the nonceTracker, then\n    // couples them together by replacing the nonceLock's releaseLock method with\n    // an anonymous function that calls releases both the original nonceLock and the\n    // lock for the chainId.\n    try {\n      const nonceLock = await nonceTracker.getNonceLock(address);\n\n      const releaseLock = (): void => {\n        nonceLock.releaseLock();\n        releaseLockForChainIdKey?.();\n      };\n\n      return {\n        ...nonceLock,\n        releaseLock,\n      };\n    } catch (error) {\n      releaseLockForChainIdKey?.();\n      throw error;\n    }\n  }\n\n  checkForPendingTransactionAndStartPolling = (): void => {\n    for (const [, trackers] of this.#trackingMap) {\n      trackers.pendingTransactionTracker.startIfPendingTransactions();\n    }\n  };\n\n  stopAllTracking(): void {\n    for (const [networkClientId] of this.#trackingMap) {\n      this.#stopTrackingByNetworkClientId(networkClientId);\n    }\n  }\n\n  getNetworkClient({\n    chainId,\n    networkClientId: requestNetworkClientId,\n  }: {\n    chainId?: Hex;\n    networkClientId?: NetworkClientId;\n  }): NetworkClient & { id: NetworkClientId } {\n    if (!requestNetworkClientId && !chainId) {\n      throw new Error(\n        'Cannot locate network client without networkClientId or chainId',\n      );\n    }\n\n    let networkClient: NetworkClient | undefined;\n    let networkClientId = requestNetworkClientId;\n\n    try {\n      if (requestNetworkClientId) {\n        networkClient = this.#getNetworkClientById(requestNetworkClientId);\n      }\n    } catch (error) {\n      log('No network client found with ID', requestNetworkClientId);\n\n      if (!chainId) {\n        throw error;\n      }\n    }\n\n    if (!networkClient && chainId) {\n      networkClientId = this.#findNetworkClientIdByChainId(chainId);\n      networkClient = this.#getNetworkClientById(networkClientId);\n    }\n\n    return {\n      ...(networkClient as NetworkClient),\n      id: networkClientId as NetworkClientId,\n    };\n  }\n\n  readonly #refreshTrackingMap = (\n    networkClients: NetworkClientRegistry,\n  ): void => {\n    const networkClientIds = Object.keys(networkClients);\n    const existingNetworkClientIds = Array.from(this.#trackingMap.keys());\n\n    // Remove tracking for NetworkClientIds that no longer exist\n    const networkClientIdsToRemove = existingNetworkClientIds.filter(\n      (id) => !networkClientIds.includes(id),\n    );\n\n    networkClientIdsToRemove.forEach((id) => {\n      this.#stopTrackingByNetworkClientId(id);\n    });\n\n    // Start tracking new NetworkClientIds from the registry\n    const networkClientIdsToAdd = networkClientIds.filter(\n      (id) => !existingNetworkClientIds.includes(id),\n    );\n\n    networkClientIdsToAdd.forEach((id) => {\n      this.#startTrackingByNetworkClientId(id);\n    });\n\n    if (networkClientIdsToAdd.length) {\n      log('Added trackers', networkClientIdsToAdd);\n    }\n\n    if (networkClientIdsToRemove.length) {\n      log('Removed trackers', networkClientIdsToRemove);\n    }\n  };\n\n  #stopTrackingByNetworkClientId(networkClientId: NetworkClientId): void {\n    const trackers = this.#trackingMap.get(networkClientId);\n    if (trackers) {\n      trackers.pendingTransactionTracker.stop();\n      this.#removePendingTransactionTrackerListeners(\n        trackers.pendingTransactionTracker,\n      );\n      this.#trackingMap.delete(networkClientId);\n    }\n  }\n\n  #startTrackingByNetworkClientId(networkClientId: NetworkClientId): void {\n    const trackers = this.#trackingMap.get(networkClientId);\n    if (trackers) {\n      return;\n    }\n\n    const {\n      provider,\n      blockTracker,\n      configuration: { chainId },\n    } = this.#getNetworkClientById(networkClientId);\n\n    const nonceTracker = this.#createNonceTracker({\n      provider,\n      blockTracker,\n      chainId,\n    });\n\n    const pendingTransactionTracker = this.#createPendingTransactionTracker({\n      provider,\n      blockTracker,\n      chainId,\n      networkClientId,\n    });\n\n    this.#trackingMap.set(networkClientId, {\n      nonceTracker,\n      pendingTransactionTracker,\n    });\n  }\n}\n"]}
+{"version":3,"file":"MultichainTrackingHelper.mjs","sourceRoot":"","sources":["../../src/helpers/MultichainTrackingHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  NetworkClientId,\n  NetworkController,\n  NetworkClient,\n  BlockTracker,\n  Provider,\n  NetworkControllerStateChangeEvent,\n} from '@metamask/network-controller';\nimport type { NonceLock, NonceTracker } from '@metamask/nonce-tracker';\nimport type { Hex } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport type { PendingTransactionTracker } from './PendingTransactionTracker';\nimport { createModuleLogger, projectLogger } from '../logger';\n\n/**\n * Registry of network clients provided by the NetworkController\n */\ntype NetworkClientRegistry = ReturnType<\n  NetworkController['getNetworkClientRegistry']\n>;\n\nconst log = createModuleLogger(projectLogger, 'multichain-tracking');\n\nexport type MultichainTrackingHelperOptions = {\n  findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n  getNetworkClientById: NetworkController['getNetworkClientById'];\n  getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  removePendingTransactionTrackerListeners: (\n    pendingTransactionTracker: PendingTransactionTracker,\n  ) => void;\n  createNonceTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n  }) => NonceTracker;\n  createPendingTransactionTracker: (opts: {\n    blockTracker: BlockTracker;\n    networkClientId: NetworkClientId;\n  }) => PendingTransactionTracker;\n  onNetworkStateChange: (\n    listener: (\n      ...payload: NetworkControllerStateChangeEvent['payload']\n    ) => void,\n  ) => void;\n};\n\nexport class MultichainTrackingHelper {\n  readonly #findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n\n  readonly #getNetworkClientById: NetworkController['getNetworkClientById'];\n\n  readonly #getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  readonly #removePendingTransactionTrackerListeners: (\n    pendingTransactionTracker: PendingTransactionTracker,\n  ) => void;\n\n  readonly #createNonceTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId: Hex;\n  }) => NonceTracker;\n\n  readonly #createPendingTransactionTracker: (opts: {\n    blockTracker: BlockTracker;\n    networkClientId: NetworkClientId;\n  }) => PendingTransactionTracker;\n\n  readonly #nonceMutexesByChainId = new Map<Hex, Map<string, Mutex>>();\n\n  readonly #trackingMap: Map<\n    NetworkClientId,\n    {\n      nonceTracker: NonceTracker;\n      pendingTransactionTracker: PendingTransactionTracker;\n    }\n  > = new Map();\n\n  constructor({\n    findNetworkClientIdByChainId,\n    getNetworkClientById,\n    getNetworkClientRegistry,\n    removePendingTransactionTrackerListeners,\n    createNonceTracker,\n    createPendingTransactionTracker,\n    onNetworkStateChange,\n  }: MultichainTrackingHelperOptions) {\n    this.#findNetworkClientIdByChainId = findNetworkClientIdByChainId;\n    this.#getNetworkClientById = getNetworkClientById;\n    this.#getNetworkClientRegistry = getNetworkClientRegistry;\n\n    this.#removePendingTransactionTrackerListeners =\n      removePendingTransactionTrackerListeners;\n    this.#createNonceTracker = createNonceTracker;\n    this.#createPendingTransactionTracker = createPendingTransactionTracker;\n\n    onNetworkStateChange((_, patches) => {\n      const networkClients = this.#getNetworkClientRegistry();\n\n      patches.forEach(({ op, path }) => {\n        if (op === 'remove' && path[0] === 'networkConfigurations') {\n          const networkClientId = path[1] as NetworkClientId;\n          delete networkClients[networkClientId];\n        }\n      });\n\n      this.#refreshTrackingMap(networkClients);\n    });\n  }\n\n  initialize(): void {\n    const networkClients = this.#getNetworkClientRegistry();\n\n    this.#refreshTrackingMap(networkClients);\n\n    log('Initialized');\n  }\n\n  has(networkClientId: NetworkClientId): boolean {\n    return this.#trackingMap.has(networkClientId);\n  }\n\n  /**\n   * Gets the mutex intended to guard the nonceTracker for a particular chainId and key .\n   *\n   * @param opts - The options object.\n   * @param opts.chainId - The hex chainId.\n   * @param opts.key - The hex address (or constant) pertaining to the chainId\n   * @returns Mutex instance for the given chainId and key pair\n   */\n  async acquireNonceLockForChainIdKey({\n    chainId,\n    key = 'global',\n  }: {\n    chainId: Hex;\n    key?: string;\n  }): Promise<() => void> {\n    let nonceMutexesForChainId = this.#nonceMutexesByChainId.get(chainId);\n    if (!nonceMutexesForChainId) {\n      nonceMutexesForChainId = new Map<string, Mutex>();\n      this.#nonceMutexesByChainId.set(chainId, nonceMutexesForChainId);\n    }\n    let nonceMutexForKey = nonceMutexesForChainId.get(key);\n    if (!nonceMutexForKey) {\n      nonceMutexForKey = new Mutex();\n      nonceMutexesForChainId.set(key, nonceMutexForKey);\n    }\n\n    return await nonceMutexForKey.acquire();\n  }\n\n  /**\n   * Gets the next nonce according to the nonce-tracker.\n   * Ensure `releaseLock` is called once processing of the `nonce` value is complete.\n   *\n   * @param address - The hex string address for the transaction.\n   * @param networkClientId - The network client ID for the transaction, used to fetch the correct nonce tracker.\n   * @returns object with the `nextNonce` `nonceDetails`, and the releaseLock.\n   */\n  async getNonceLock(\n    address: string,\n    networkClientId: NetworkClientId,\n  ): Promise<NonceLock> {\n    const networkClient = this.#getNetworkClientById(networkClientId);\n\n    const releaseLockForChainIdKey = await this.acquireNonceLockForChainIdKey({\n      chainId: networkClient.configuration.chainId,\n      key: address,\n    });\n\n    const nonceTracker = this.#trackingMap.get(networkClientId)?.nonceTracker;\n\n    if (!nonceTracker) {\n      throw new Error(\n        `Missing nonce tracker for network client ID - ${networkClientId}`,\n      );\n    }\n\n    // Acquires the lock for the chainId + address and the nonceLock from the nonceTracker, then\n    // couples them together by replacing the nonceLock's releaseLock method with\n    // an anonymous function that calls releases both the original nonceLock and the\n    // lock for the chainId.\n    try {\n      const nonceLock = await nonceTracker.getNonceLock(address);\n\n      const releaseLock = (): void => {\n        nonceLock.releaseLock();\n        releaseLockForChainIdKey?.();\n      };\n\n      return {\n        ...nonceLock,\n        releaseLock,\n      };\n    } catch (error) {\n      releaseLockForChainIdKey?.();\n      throw error;\n    }\n  }\n\n  checkForPendingTransactionAndStartPolling = (): void => {\n    for (const [, trackers] of this.#trackingMap) {\n      trackers.pendingTransactionTracker.startIfPendingTransactions();\n    }\n  };\n\n  stopAllTracking(): void {\n    for (const [networkClientId] of this.#trackingMap) {\n      this.#stopTrackingByNetworkClientId(networkClientId);\n    }\n  }\n\n  getNetworkClient({\n    chainId,\n    networkClientId: requestNetworkClientId,\n  }: {\n    chainId?: Hex;\n    networkClientId?: NetworkClientId;\n  }): NetworkClient & { id: NetworkClientId } {\n    if (!requestNetworkClientId && !chainId) {\n      throw new Error(\n        'Cannot locate network client without networkClientId or chainId',\n      );\n    }\n\n    let networkClient: NetworkClient | undefined;\n    let networkClientId = requestNetworkClientId;\n\n    try {\n      if (requestNetworkClientId) {\n        networkClient = this.#getNetworkClientById(requestNetworkClientId);\n      }\n    } catch (error) {\n      log('No network client found with ID', requestNetworkClientId);\n\n      if (!chainId) {\n        throw error;\n      }\n    }\n\n    if (!networkClient && chainId) {\n      networkClientId = this.#findNetworkClientIdByChainId(chainId);\n      networkClient = this.#getNetworkClientById(networkClientId);\n    }\n\n    return {\n      ...(networkClient as NetworkClient),\n      id: networkClientId as NetworkClientId,\n    };\n  }\n\n  readonly #refreshTrackingMap = (\n    networkClients: NetworkClientRegistry,\n  ): void => {\n    const networkClientIds = Object.keys(networkClients);\n    const existingNetworkClientIds = Array.from(this.#trackingMap.keys());\n\n    // Remove tracking for NetworkClientIds that no longer exist\n    const networkClientIdsToRemove = existingNetworkClientIds.filter(\n      (id) => !networkClientIds.includes(id),\n    );\n\n    networkClientIdsToRemove.forEach((id) => {\n      this.#stopTrackingByNetworkClientId(id);\n    });\n\n    // Start tracking new NetworkClientIds from the registry\n    const networkClientIdsToAdd = networkClientIds.filter(\n      (id) => !existingNetworkClientIds.includes(id),\n    );\n\n    networkClientIdsToAdd.forEach((id) => {\n      this.#startTrackingByNetworkClientId(id);\n    });\n\n    if (networkClientIdsToAdd.length) {\n      log('Added trackers', networkClientIdsToAdd);\n    }\n\n    if (networkClientIdsToRemove.length) {\n      log('Removed trackers', networkClientIdsToRemove);\n    }\n  };\n\n  #stopTrackingByNetworkClientId(networkClientId: NetworkClientId): void {\n    const trackers = this.#trackingMap.get(networkClientId);\n    if (trackers) {\n      trackers.pendingTransactionTracker.stop();\n      this.#removePendingTransactionTrackerListeners(\n        trackers.pendingTransactionTracker,\n      );\n      this.#trackingMap.delete(networkClientId);\n    }\n  }\n\n  #startTrackingByNetworkClientId(networkClientId: NetworkClientId): void {\n    const trackers = this.#trackingMap.get(networkClientId);\n    if (trackers) {\n      return;\n    }\n\n    const {\n      provider,\n      blockTracker,\n      configuration: { chainId },\n    } = this.#getNetworkClientById(networkClientId);\n\n    const nonceTracker = this.#createNonceTracker({\n      provider,\n      blockTracker,\n      chainId,\n    });\n\n    const pendingTransactionTracker = this.#createPendingTransactionTracker({\n      blockTracker,\n      networkClientId,\n    });\n\n    this.#trackingMap.set(networkClientId, {\n      nonceTracker,\n      pendingTransactionTracker,\n    });\n  }\n}\n"]}

package/dist/helpers/PendingTransactionTracker.cjs

@@ -13,10 +13,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _PendingTransactionTracker_instances, _PendingTransactionTracker_beforeCheckPendingTransaction, _PendingTransactionTracker_droppedBlockCountByHash, _PendingTransactionTracker_isTimeoutEnabled, _PendingTransactionTracker_getChainId, _PendingTransactionTracker_getEthQuery, _PendingTransactionTracker_getGlobalLock, _PendingTransactionTracker_getNetworkClientId, _PendingTransactionTracker_getTransactions, _PendingTransactionTracker_isResubmitEnabled, _PendingTransactionTracker_lastSeenTimestampByHash, _PendingTransactionTracker_listener, _PendingTransactionTracker_log, _PendingTransactionTracker_messenger, _PendingTransactionTracker_publishTransaction, _PendingTransactionTracker_running, _PendingTransactionTracker_transactionPoller, _PendingTransactionTracker_transactionToForcePoll, _PendingTransactionTracker_start, _PendingTransactionTracker_onLatestBlock, _PendingTransactionTracker_checkTransactions, _PendingTransactionTracker_resubmitTransactions, _PendingTransactionTracker_isKnownTransactionError, _PendingTransactionTracker_resubmitTransaction, _PendingTransactionTracker_isResubmitDue, _PendingTransactionTracker_cleanTransaction, _PendingTransactionTracker_checkTransaction, _PendingTransactionTracker_onTransactionConfirmed, _PendingTransactionTracker_isTransactionTimeout, _PendingTransactionTracker_isTransactionDropped, _PendingTransactionTracker_isNonceTaken, _PendingTransactionTracker_getPendingTransactions, _PendingTransactionTracker_warnTransaction, _PendingTransactionTracker_failTransaction, _PendingTransactionTracker_dropTransaction, _PendingTransactionTracker_updateTransaction, _PendingTransactionTracker_getTransactionReceipt, _PendingTransactionTracker_getTransactionByHash, _PendingTransactionTracker_getBlockByHash, _PendingTransactionTracker_getNetworkTransactionCount, _PendingTransactionTracker_getChainTransactions, _PendingTransactionTracker_getNetworkClientTransactions;
+var _PendingTransactionTracker_instances, _PendingTransactionTracker_beforeCheckPendingTransaction, _PendingTransactionTracker_droppedBlockCountByHash, _PendingTransactionTracker_isTimeoutEnabled, _PendingTransactionTracker_getGlobalLock, _PendingTransactionTracker_chainId, _PendingTransactionTracker_networkClientId, _PendingTransactionTracker_getTransactions, _PendingTransactionTracker_isResubmitEnabled, _PendingTransactionTracker_lastSeenTimestampByHash, _PendingTransactionTracker_listener, _PendingTransactionTracker_log, _PendingTransactionTracker_messenger, _PendingTransactionTracker_publishTransaction, _PendingTransactionTracker_running, _PendingTransactionTracker_transactionPoller, _PendingTransactionTracker_transactionToForcePoll, _PendingTransactionTracker_start, _PendingTransactionTracker_onLatestBlock, _PendingTransactionTracker_checkTransactions, _PendingTransactionTracker_resubmitTransactions, _PendingTransactionTracker_isKnownTransactionError, _PendingTransactionTracker_resubmitTransaction, _PendingTransactionTracker_isResubmitDue, _PendingTransactionTracker_cleanTransaction, _PendingTransactionTracker_checkTransaction, _PendingTransactionTracker_onTransactionConfirmed, _PendingTransactionTracker_isTransactionTimeout, _PendingTransactionTracker_isTransactionDropped, _PendingTransactionTracker_isNonceTaken, _PendingTransactionTracker_getPendingTransactions, _PendingTransactionTracker_warnTransaction, _PendingTransactionTracker_failTransaction, _PendingTransactionTracker_dropTransaction, _PendingTransactionTracker_updateTransaction, _PendingTransactionTracker_getTransactionReceipt, _PendingTransactionTracker_getTransactionByHash, _PendingTransactionTracker_getBlockByHash, _PendingTransactionTracker_getNetworkTransactionCount, _PendingTransactionTracker_getChainTransactions, _PendingTransactionTracker_getNetworkClientTransactions;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PendingTransactionTracker = void 0;
-const controller_utils_1 = require("@metamask/controller-utils");
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
 const events_1 = __importDefault(require("events"));
@@ -25,6 +24,7 @@ const TransactionPoller_1 = require("./TransactionPoller.cjs");
 const logger_1 = require("../logger.cjs");
 const types_1 = require("../types.cjs");
 const feature_flags_1 = require("../utils/feature-flags.cjs");
+const provider_1 = require("../utils/provider.cjs");
 /**
  * We wait this many blocks before emitting a 'transaction-dropped' event
  * This is because we could be talking to a node that is out of sync
@@ -43,15 +43,14 @@ const KNOWN_TRANSACTION_ERRORS = [
 ];
 const log = (0, logger_1.createModuleLogger)(logger_1.projectLogger, 'pending-transactions');
 class PendingTransactionTracker {
-    constructor({ blockTracker, getChainId, getEthQuery, getGlobalLock, getNetworkClientId, getTransactions, isTimeoutEnabled, hooks, isResubmitEnabled, messenger, publishTransaction, }) {
+    constructor({ blockTracker, getGlobalLock, getTransactions, isTimeoutEnabled, hooks, isResubmitEnabled, messenger, networkClientId, publishTransaction, }) {
         _PendingTransactionTracker_instances.add(this);
         _PendingTransactionTracker_beforeCheckPendingTransaction.set(this, void 0);
         _PendingTransactionTracker_droppedBlockCountByHash.set(this, void 0);
         _PendingTransactionTracker_isTimeoutEnabled.set(this, void 0);
-        _PendingTransactionTracker_getChainId.set(this, void 0);
-        _PendingTransactionTracker_getEthQuery.set(this, void 0);
         _PendingTransactionTracker_getGlobalLock.set(this, void 0);
-        _PendingTransactionTracker_getNetworkClientId.set(this, void 0);
+        _PendingTransactionTracker_chainId.set(this, void 0);
+        _PendingTransactionTracker_networkClientId.set(this, void 0);
         _PendingTransactionTracker_getTransactions.set(this, void 0);
         _PendingTransactionTracker_isResubmitEnabled.set(this, void 0);
         _PendingTransactionTracker_lastSeenTimestampByHash.set(this, void 0);
@@ -74,11 +73,11 @@ class PendingTransactionTracker {
             }
         };
         this.hub = new events_1.default();
+        const chainId = (0, provider_1.getChainId)({ messenger, networkClientId });
+        __classPrivateFieldSet(this, _PendingTransactionTracker_chainId, chainId, "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_droppedBlockCountByHash, new Map(), "f");
-        __classPrivateFieldSet(this, _PendingTransactionTracker_getChainId, getChainId, "f");
-        __classPrivateFieldSet(this, _PendingTransactionTracker_getEthQuery, getEthQuery, "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_getGlobalLock, getGlobalLock, "f");
-        __classPrivateFieldSet(this, _PendingTransactionTracker_getNetworkClientId, getNetworkClientId, "f");
+        __classPrivateFieldSet(this, _PendingTransactionTracker_networkClientId, networkClientId, "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_getTransactions, getTransactions, "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_isResubmitEnabled, isResubmitEnabled ?? (() => true), "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_lastSeenTimestampByHash, new Map(), "f");
@@ -89,14 +88,14 @@ class PendingTransactionTracker {
         __classPrivateFieldSet(this, _PendingTransactionTracker_transactionToForcePoll, undefined, "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_transactionPoller, new TransactionPoller_1.TransactionPoller({
             blockTracker,
-            chainId: getChainId(),
+            chainId,
             messenger,
         }), "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_beforeCheckPendingTransaction, hooks?.beforeCheckPendingTransaction ??
             /* istanbul ignore next */
             (() => Promise.resolve(true)), "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_isTimeoutEnabled, isTimeoutEnabled, "f");
-        __classPrivateFieldSet(this, _PendingTransactionTracker_log, (0, logger_1.createModuleLogger)(log, `${getChainId()}:${getNetworkClientId()}`), "f");
+        __classPrivateFieldSet(this, _PendingTransactionTracker_log, (0, logger_1.createModuleLogger)(log, `${chainId}:${networkClientId}`), "f");
     }
     /**
      * Adds a transaction to the polling mechanism for monitoring its status.
@@ -141,7 +140,7 @@ class PendingTransactionTracker {
     }
 }
 exports.PendingTransactionTracker = PendingTransactionTracker;
-_PendingTransactionTracker_beforeCheckPendingTransaction = new WeakMap(), _PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTransactionTracker_isTimeoutEnabled = new WeakMap(), _PendingTransactionTracker_getChainId = new WeakMap(), _PendingTransactionTracker_getEthQuery = new WeakMap(), _PendingTransactionTracker_getGlobalLock = new WeakMap(), _PendingTransactionTracker_getNetworkClientId = new WeakMap(), _PendingTransactionTracker_getTransactions = new WeakMap(), _PendingTransactionTracker_isResubmitEnabled = new WeakMap(), _PendingTransactionTracker_lastSeenTimestampByHash = new WeakMap(), _PendingTransactionTracker_listener = new WeakMap(), _PendingTransactionTracker_log = new WeakMap(), _PendingTransactionTracker_messenger = new WeakMap(), _PendingTransactionTracker_publishTransaction = new WeakMap(), _PendingTransactionTracker_running = new WeakMap(), _PendingTransactionTracker_transactionPoller = new WeakMap(), _PendingTransactionTracker_transactionToForcePoll = new WeakMap(), _PendingTransactionTracker_instances = new WeakSet(), _PendingTransactionTracker_start = function _PendingTransactionTracker_start(pendingTransactions) {
+_PendingTransactionTracker_beforeCheckPendingTransaction = new WeakMap(), _PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTransactionTracker_isTimeoutEnabled = new WeakMap(), _PendingTransactionTracker_getGlobalLock = new WeakMap(), _PendingTransactionTracker_chainId = new WeakMap(), _PendingTransactionTracker_networkClientId = new WeakMap(), _PendingTransactionTracker_getTransactions = new WeakMap(), _PendingTransactionTracker_isResubmitEnabled = new WeakMap(), _PendingTransactionTracker_lastSeenTimestampByHash = new WeakMap(), _PendingTransactionTracker_listener = new WeakMap(), _PendingTransactionTracker_log = new WeakMap(), _PendingTransactionTracker_messenger = new WeakMap(), _PendingTransactionTracker_publishTransaction = new WeakMap(), _PendingTransactionTracker_running = new WeakMap(), _PendingTransactionTracker_transactionPoller = new WeakMap(), _PendingTransactionTracker_transactionToForcePoll = new WeakMap(), _PendingTransactionTracker_instances = new WeakSet(), _PendingTransactionTracker_start = function _PendingTransactionTracker_start(pendingTransactions) {
     __classPrivateFieldGet(this, _PendingTransactionTracker_transactionPoller, "f").setPendingTransactions(pendingTransactions);
     if (__classPrivateFieldGet(this, _PendingTransactionTracker_running, "f")) {
         return;
@@ -224,8 +223,7 @@ _PendingTransactionTracker_beforeCheckPendingTransaction = new WeakMap(), _Pendi
     if (!(await __classPrivateFieldGet(this, _PendingTransactionTracker_beforeCheckPendingTransaction, "f").call(this, txMeta))) {
         return;
     }
-    const ethQuery = __classPrivateFieldGet(this, _PendingTransactionTracker_getEthQuery, "f").call(this, txMeta.networkClientId);
-    await __classPrivateFieldGet(this, _PendingTransactionTracker_publishTransaction, "f").call(this, ethQuery, txMeta);
+    await __classPrivateFieldGet(this, _PendingTransactionTracker_publishTransaction, "f").call(this, txMeta);
     const retryCount = (txMeta.retryCount ?? 0) + 1;
     __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_updateTransaction).call(this, (0, lodash_1.merge)({}, txMeta, { retryCount }), 'PendingTransactionTracker:transaction-retry - Retry count increased');
 }, _PendingTransactionTracker_isResubmitDue = function _PendingTransactionTracker_isResubmitDue(txMeta, latestBlockNumber) {
@@ -440,21 +438,37 @@ _PendingTransactionTracker_beforeCheckPendingTransaction = new WeakMap(), _Pendi
 }, _PendingTransactionTracker_updateTransaction = function _PendingTransactionTracker_updateTransaction(txMeta, note) {
     this.hub.emit('transaction-updated', txMeta, note);
 }, _PendingTransactionTracker_getTransactionReceipt = async function _PendingTransactionTracker_getTransactionReceipt(txHash) {
-    return await (0, controller_utils_1.query)(__classPrivateFieldGet(this, _PendingTransactionTracker_getEthQuery, "f").call(this), 'getTransactionReceipt', [txHash]);
+    return (await (0, provider_1.rpcRequest)({
+        messenger: __classPrivateFieldGet(this, _PendingTransactionTracker_messenger, "f"),
+        networkClientId: __classPrivateFieldGet(this, _PendingTransactionTracker_networkClientId, "f"),
+        method: 'eth_getTransactionReceipt',
+        params: [txHash],
+    }));
 }, _PendingTransactionTracker_getTransactionByHash = async function _PendingTransactionTracker_getTransactionByHash(txHash) {
-    return await (0, controller_utils_1.query)(__classPrivateFieldGet(this, _PendingTransactionTracker_getEthQuery, "f").call(this), 'getTransactionByHash', [txHash]);
+    return (await (0, provider_1.rpcRequest)({
+        messenger: __classPrivateFieldGet(this, _PendingTransactionTracker_messenger, "f"),
+        networkClientId: __classPrivateFieldGet(this, _PendingTransactionTracker_networkClientId, "f"),
+        method: 'eth_getTransactionByHash',
+        params: [txHash],
+    }));
 }, _PendingTransactionTracker_getBlockByHash = async function _PendingTransactionTracker_getBlockByHash(blockHash, includeTransactionDetails) {
-    return await (0, controller_utils_1.query)(__classPrivateFieldGet(this, _PendingTransactionTracker_getEthQuery, "f").call(this), 'getBlockByHash', [
-        blockHash,
-        includeTransactionDetails,
-    ]);
+    return await (0, provider_1.rpcRequest)({
+        messenger: __classPrivateFieldGet(this, _PendingTransactionTracker_messenger, "f"),
+        networkClientId: __classPrivateFieldGet(this, _PendingTransactionTracker_networkClientId, "f"),
+        method: 'eth_getBlockByHash',
+        params: [blockHash, includeTransactionDetails],
+    });
 }, _PendingTransactionTracker_getNetworkTransactionCount = async function _PendingTransactionTracker_getNetworkTransactionCount(address) {
-    return await (0, controller_utils_1.query)(__classPrivateFieldGet(this, _PendingTransactionTracker_getEthQuery, "f").call(this), 'getTransactionCount', [address]);
+    return (await (0, provider_1.rpcRequest)({
+        messenger: __classPrivateFieldGet(this, _PendingTransactionTracker_messenger, "f"),
+        networkClientId: __classPrivateFieldGet(this, _PendingTransactionTracker_networkClientId, "f"),
+        method: 'eth_getTransactionCount',
+        params: [address, 'latest'],
+    }));
 }, _PendingTransactionTracker_getChainTransactions = function _PendingTransactionTracker_getChainTransactions() {
-    const chainId = __classPrivateFieldGet(this, _PendingTransactionTracker_getChainId, "f").call(this);
-    return __classPrivateFieldGet(this, _PendingTransactionTracker_getTransactions, "f").call(this).filter((tx) => tx.chainId === chainId);
+    return __classPrivateFieldGet(this, _PendingTransactionTracker_getTransactions, "f").call(this).filter((tx) => tx.chainId === __classPrivateFieldGet(this, _PendingTransactionTracker_chainId, "f"));
 }, _PendingTransactionTracker_getNetworkClientTransactions = function _PendingTransactionTracker_getNetworkClientTransactions() {
-    const networkClientId = __classPrivateFieldGet(this, _PendingTransactionTracker_getNetworkClientId, "f").call(this);
+    const networkClientId = __classPrivateFieldGet(this, _PendingTransactionTracker_networkClientId, "f");
     return __classPrivateFieldGet(this, _PendingTransactionTracker_getTransactions, "f").call(this).filter((tx) => tx.networkClientId === networkClientId);
 };
 //# sourceMappingURL=PendingTransactionTracker.cjs.map