@metamask-previews/transaction-controller 43.0.0-preview-009eef6b → 43.0.0-preview-bd04b248

package/dist/helpers/MethodDataHelper.cjs

@@ -13,96 +13,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _MethodDataHelper_instances, _MethodDataHelper_getState, _MethodDataHelper_interfaceByNetworkClientId, _MethodDataHelper_mutex, _MethodDataHelper_interfaceLookup;
+var _MethodDataHelper_instances, _MethodDataHelper_getProvider, _MethodDataHelper_getState, _MethodDataHelper_methodRegistryByNetworkClientId, _MethodDataHelper_mutex, _MethodDataHelper_registryLookup;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodDataHelper = void 0;
-const abi_1 = require("@ethersproject/abi");
 const utils_1 = require("@metamask/utils");
 const async_mutex_1 = require("async-mutex");
+const eth_method_registry_1 = require("eth-method-registry");
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
 const events_1 = __importDefault(require("events"));
 const logger_1 = require("../logger.cjs");
 const log = (0, utils_1.createModuleLogger)(logger_1.projectLogger, 'method-data');
-const methodRegistryAbi = [
-    {
-        constant: false,
-        inputs: [{ name: '_new', type: 'address' }],
-        name: 'setOwner',
-        outputs: [],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: true,
-        inputs: [],
-        name: 'totalSignatures',
-        outputs: [{ name: '', type: 'uint256' }],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: true,
-        inputs: [],
-        name: 'owner',
-        outputs: [{ name: '', type: 'address' }],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: false,
-        inputs: [],
-        name: 'drain',
-        outputs: [],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: true,
-        inputs: [{ name: '', type: 'bytes4' }],
-        name: 'entries',
-        outputs: [{ name: '', type: 'string' }],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: false,
-        inputs: [{ name: '_method', type: 'string' }],
-        name: 'register',
-        outputs: [{ name: '', type: 'bool' }],
-        payable: false,
-        type: 'function',
-    },
-    { inputs: [], type: 'constructor' },
-    {
-        anonymous: false,
-        inputs: [
-            { indexed: true, name: 'creator', type: 'address' },
-            { indexed: true, name: 'signature', type: 'bytes4' },
-            { indexed: false, name: 'method', type: 'string' },
-        ],
-        name: 'Registered',
-        type: 'event',
-    },
-    {
-        anonymous: false,
-        inputs: [
-            { indexed: true, name: 'old', type: 'address' },
-            { indexed: true, name: 'current', type: 'address' },
-        ],
-        name: 'NewOwner',
-        type: 'event',
-    },
-];
 class MethodDataHelper {
-    constructor({ getState }) {
+    constructor({ getProvider, getState, }) {
         _MethodDataHelper_instances.add(this);
+        _MethodDataHelper_getProvider.set(this, void 0);
         _MethodDataHelper_getState.set(this, void 0);
-        _MethodDataHelper_interfaceByNetworkClientId.set(this, void 0);
+        _MethodDataHelper_methodRegistryByNetworkClientId.set(this, void 0);
         _MethodDataHelper_mutex.set(this, new async_mutex_1.Mutex());
         this.hub = new events_1.default();
+        __classPrivateFieldSet(this, _MethodDataHelper_getProvider, getProvider, "f");
         __classPrivateFieldSet(this, _MethodDataHelper_getState, getState, "f");
-        __classPrivateFieldSet(this, _MethodDataHelper_interfaceByNetworkClientId, new Map(), "f");
+        __classPrivateFieldSet(this, _MethodDataHelper_methodRegistryByNetworkClientId, new Map(), "f");
     }
     async lookup(fourBytePrefix, networkClientId) {
         log('lookup', fourBytePrefix, networkClientId);
@@ -113,13 +45,15 @@ class MethodDataHelper {
                 log('Cached', cachedResult);
                 return cachedResult;
             }
-            let iface = __classPrivateFieldGet(this, _MethodDataHelper_interfaceByNetworkClientId, "f").get(networkClientId);
-            if (!iface) {
-                iface = new abi_1.Interface(methodRegistryAbi);
-                __classPrivateFieldGet(this, _MethodDataHelper_interfaceByNetworkClientId, "f").set(networkClientId, iface);
-                log('Created interface', networkClientId);
+            let registry = __classPrivateFieldGet(this, _MethodDataHelper_methodRegistryByNetworkClientId, "f").get(networkClientId);
+            if (!registry) {
+                const provider = __classPrivateFieldGet(this, _MethodDataHelper_getProvider, "f").call(this, networkClientId);
+                // @ts-expect-error Type in eth-method-registry is inappropriate and should be changed
+                registry = new eth_method_registry_1.MethodRegistry({ provider });
+                __classPrivateFieldGet(this, _MethodDataHelper_methodRegistryByNetworkClientId, "f").set(networkClientId, registry);
+                log('Created registry', networkClientId);
             }
-            const methodData = await __classPrivateFieldGet(this, _MethodDataHelper_instances, "m", _MethodDataHelper_interfaceLookup).call(this, fourBytePrefix, iface);
+            const methodData = await __classPrivateFieldGet(this, _MethodDataHelper_instances, "m", _MethodDataHelper_registryLookup).call(this, fourBytePrefix, registry);
             log('Result', methodData);
             this.hub.emit('update', { fourBytePrefix, methodData });
             return methodData;
@@ -130,23 +64,17 @@ class MethodDataHelper {
     }
 }
 exports.MethodDataHelper = MethodDataHelper;
-_MethodDataHelper_getState = new WeakMap(), _MethodDataHelper_interfaceByNetworkClientId = new WeakMap(), _MethodDataHelper_mutex = new WeakMap(), _MethodDataHelper_instances = new WeakSet(), _MethodDataHelper_interfaceLookup = async function _MethodDataHelper_interfaceLookup(fourBytePrefix, iface) {
-    try {
-        const functionFragment = iface.getFunction(fourBytePrefix);
-        return {
-            registryMethod: functionFragment.format(),
-            parsedRegistryMethod: {
-                name: functionFragment.name,
-                args: functionFragment.inputs.map(({ type }) => ({ type })),
-            },
-        };
-    }
-    catch {
-        log('No method found or invalid signature', fourBytePrefix);
+_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) {
+    const registryMethod = await methodRegistry.lookup(fourBytePrefix);
+    if (!registryMethod) {
+        log('No method found', fourBytePrefix);
         return {
             registryMethod: '',
             parsedRegistryMethod: { name: undefined, args: undefined },
         };
     }
+    log('Parsing', registryMethod);
+    const parsedRegistryMethod = methodRegistry.parse(registryMethod);
+    return { registryMethod, parsedRegistryMethod };
 };
 //# sourceMappingURL=MethodDataHelper.cjs.map

package/dist/helpers/MethodDataHelper.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MethodDataHelper.cjs","sourceRoot":"","sources":["../../src/helpers/MethodDataHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import { Interface } from '@ethersproject/abi';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport { createModuleLogger } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\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\nconst methodRegistryAbi = [\n  {\n    constant: false,\n    inputs: [{ name: '_new', type: 'address' }],\n    name: 'setOwner',\n    outputs: [],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: true,\n    inputs: [],\n    name: 'totalSignatures',\n    outputs: [{ name: '', type: 'uint256' }],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: true,\n    inputs: [],\n    name: 'owner',\n    outputs: [{ name: '', type: 'address' }],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: false,\n    inputs: [],\n    name: 'drain',\n    outputs: [],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: true,\n    inputs: [{ name: '', type: 'bytes4' }],\n    name: 'entries',\n    outputs: [{ name: '', type: 'string' }],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: false,\n    inputs: [{ name: '_method', type: 'string' }],\n    name: 'register',\n    outputs: [{ name: '', type: 'bool' }],\n    payable: false,\n    type: 'function',\n  },\n  { inputs: [], type: 'constructor' },\n  {\n    anonymous: false,\n    inputs: [\n      { indexed: true, name: 'creator', type: 'address' },\n      { indexed: true, name: 'signature', type: 'bytes4' },\n      { indexed: false, name: 'method', type: 'string' },\n    ],\n    name: 'Registered',\n    type: 'event',\n  },\n  {\n    anonymous: false,\n    inputs: [\n      { indexed: true, name: 'old', type: 'address' },\n      { indexed: true, name: 'current', type: 'address' },\n    ],\n    name: 'NewOwner',\n    type: 'event',\n  },\n];\n\nexport class MethodDataHelper {\n  hub: EventEmitter;\n\n  #getState: () => Record<string, MethodData>;\n\n  #interfaceByNetworkClientId: Map<NetworkClientId, Interface>;\n\n  #mutex = new Mutex();\n\n  constructor({ getState }: { getState: () => Record<string, MethodData> }) {\n    this.hub = new EventEmitter();\n\n    this.#getState = getState;\n    this.#interfaceByNetworkClientId = 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 iface = this.#interfaceByNetworkClientId.get(networkClientId);\n\n      if (!iface) {\n        iface = new Interface(methodRegistryAbi);\n        this.#interfaceByNetworkClientId.set(networkClientId, iface);\n        log('Created interface', networkClientId);\n      }\n\n      const methodData = await this.#interfaceLookup(fourBytePrefix, iface);\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 #interfaceLookup(\n    fourBytePrefix: string,\n    iface: Interface,\n  ): Promise<MethodData> {\n    try {\n      const functionFragment = iface.getFunction(fourBytePrefix);\n      return {\n        registryMethod: functionFragment.format(),\n        parsedRegistryMethod: {\n          name: functionFragment.name,\n          args: functionFragment.inputs.map(({ type }) => ({ type })),\n        },\n      };\n    } catch {\n      log('No method found or invalid signature', fourBytePrefix);\n      return {\n        registryMethod: '',\n        parsedRegistryMethod: { name: undefined, args: undefined },\n      };\n    }\n  }\n}\n"]}
+{"version":3,"file":"MethodDataHelper.cjs","sourceRoot":"","sources":["../../src/helpers/MethodDataHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,2CAAqD;AACrD,6CAAoC;AACpC,6DAAqD;AACrD,kEAAkE;AAClE,sDAAsD;AACtD,oDAAkC;AAElC,0CAA0C;AAG1C,MAAM,GAAG,GAAG,IAAA,0BAAkB,EAAC,sBAAa,EAAE,aAAa,CAAC,CAAC;AAE7D,MAAa,gBAAgB;IAW3B,YAAY,EACV,WAAW,EACX,QAAQ,GAIT;;QAdD,gDAA6D;QAE7D,6CAA4C;QAE5C,oEAAuE;QAEvE,kCAAS,IAAI,mBAAK,EAAE,EAAC;QASnB,IAAI,CAAC,GAAG,GAAG,IAAI,gBAAY,EAAE,CAAC;QAE9B,uBAAA,IAAI,iCAAgB,WAAW,MAAA,CAAC;QAChC,uBAAA,IAAI,8BAAa,QAAQ,MAAA,CAAC;QAC1B,uBAAA,IAAI,qDAAoC,IAAI,GAAG,EAAE,MAAA,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,MAAM,CACV,cAAsB,EACtB,eAAgC;QAEhC,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;QAE/C,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,+BAAO,CAAC,OAAO,EAAE,CAAC;QAEhD,IAAI;YACF,MAAM,YAAY,GAAG,uBAAA,IAAI,kCAAU,MAAd,IAAI,CAAY,CAAC,cAAc,CAAC,CAAC;YAEtD,IAAI,YAAY,EAAE;gBAChB,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBAC5B,OAAO,YAAY,CAAC;aACrB;YAED,IAAI,QAAQ,GAAG,uBAAA,IAAI,yDAAiC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAE1E,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,QAAQ,GAAG,uBAAA,IAAI,qCAAa,MAAjB,IAAI,EAAc,eAAe,CAAC,CAAC;gBAEpD,sFAAsF;gBACtF,QAAQ,GAAG,IAAI,oCAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAE5C,uBAAA,IAAI,yDAAiC,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;gBAErE,GAAG,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;aAC1C;YAED,MAAM,UAAU,GAAG,MAAM,uBAAA,IAAI,qEAAgB,MAApB,IAAI,EAAiB,cAAc,EAAE,QAAQ,CAAC,CAAC;YAExE,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAE1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;YAExD,OAAO,UAAU,CAAC;SACnB;gBAAS;YACR,WAAW,EAAE,CAAC;SACf;IACH,CAAC;CAuBF;AAvFD,4CAuFC;uRArBC,KAAK,2CACH,cAAsB,EACtB,cAA8B;IAE9B,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAEnE,IAAI,CAAC,cAAc,EAAE;QACnB,GAAG,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;QAEvC,OAAO;YACL,cAAc,EAAE,EAAE;YAClB,oBAAoB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;SAC3D,CAAC;KACH;IAED,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAE/B,MAAM,oBAAoB,GAAG,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAElE,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,CAAC;AAClD,CAAC","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  #getProvider: (networkClientId: NetworkClientId) => Provider;\n\n  #getState: () => Record<string, MethodData>;\n\n  #methodRegistryByNetworkClientId: Map<NetworkClientId, MethodRegistry>;\n\n  #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"]}

package/dist/helpers/MethodDataHelper.d.cts

@@ -1,11 +1,12 @@
 /// <reference types="node" />
-import type { NetworkClientId } from "@metamask/network-controller";
+import type { NetworkClientId, Provider } from "@metamask/network-controller";
 import EventEmitter from "events";
 import type { MethodData } from "../TransactionController.cjs";
 export declare class MethodDataHelper {
     #private;
     hub: EventEmitter;
-    constructor({ getState }: {
+    constructor({ getProvider, getState, }: {
+        getProvider: (networkClientId: NetworkClientId) => Provider;
         getState: () => Record<string, MethodData>;
     });
     lookup(fourBytePrefix: string, networkClientId: NetworkClientId): Promise<MethodData>;

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

@@ -1 +1 @@
-{"version":3,"file":"MethodDataHelper.d.cts","sourceRoot":"","sources":["../../src/helpers/MethodDataHelper.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AAKpE,OAAO,YAAY,eAAe;AAGlC,OAAO,KAAK,EAAE,UAAU,EAAE,qCAAiC;AA2E3D,qBAAa,gBAAgB;;IAC3B,GAAG,EAAE,YAAY,CAAC;gBAQN,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;KAAE;IAOlE,MAAM,CACV,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,UAAU,CAAC;CAsDvB"}
+{"version":3,"file":"MethodDataHelper.d.cts","sourceRoot":"","sources":["../../src/helpers/MethodDataHelper.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,qCAAqC;AAM9E,OAAO,YAAY,eAAe;AAGlC,OAAO,KAAK,EAAE,UAAU,EAAE,qCAAiC;AAI3D,qBAAa,gBAAgB;;IAC3B,GAAG,EAAE,YAAY,CAAC;gBAUN,EACV,WAAW,EACX,QAAQ,GACT,EAAE;QACD,WAAW,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,QAAQ,CAAC;QAC5D,QAAQ,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;KAC5C;IAQK,MAAM,CACV,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,UAAU,CAAC;CA2DvB"}

package/dist/helpers/MethodDataHelper.d.mts

@@ -1,11 +1,12 @@
 /// <reference types="node" />
-import type { NetworkClientId } from "@metamask/network-controller";
+import type { NetworkClientId, Provider } from "@metamask/network-controller";
 import EventEmitter from "events";
 import type { MethodData } from "../TransactionController.mjs";
 export declare class MethodDataHelper {
     #private;
     hub: EventEmitter;
-    constructor({ getState }: {
+    constructor({ getProvider, getState, }: {
+        getProvider: (networkClientId: NetworkClientId) => Provider;
         getState: () => Record<string, MethodData>;
     });
     lookup(fourBytePrefix: string, networkClientId: NetworkClientId): Promise<MethodData>;

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

@@ -1 +1 @@
-{"version":3,"file":"MethodDataHelper.d.mts","sourceRoot":"","sources":["../../src/helpers/MethodDataHelper.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AAKpE,OAAO,YAAY,eAAe;AAGlC,OAAO,KAAK,EAAE,UAAU,EAAE,qCAAiC;AA2E3D,qBAAa,gBAAgB;;IAC3B,GAAG,EAAE,YAAY,CAAC;gBAQN,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;KAAE;IAOlE,MAAM,CACV,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,UAAU,CAAC;CAsDvB"}
+{"version":3,"file":"MethodDataHelper.d.mts","sourceRoot":"","sources":["../../src/helpers/MethodDataHelper.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,qCAAqC;AAM9E,OAAO,YAAY,eAAe;AAGlC,OAAO,KAAK,EAAE,UAAU,EAAE,qCAAiC;AAI3D,qBAAa,gBAAgB;;IAC3B,GAAG,EAAE,YAAY,CAAC;gBAUN,EACV,WAAW,EACX,QAAQ,GACT,EAAE;QACD,WAAW,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,QAAQ,CAAC;QAC5D,QAAQ,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;KAC5C;IAQK,MAAM,CACV,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,UAAU,CAAC;CA2DvB"}

package/dist/helpers/MethodDataHelper.mjs

@@ -9,94 +9,26 @@ 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_getState, _MethodDataHelper_interfaceByNetworkClientId, _MethodDataHelper_mutex, _MethodDataHelper_interfaceLookup;
-import { Interface } from "@ethersproject/abi";
+var _MethodDataHelper_instances, _MethodDataHelper_getProvider, _MethodDataHelper_getState, _MethodDataHelper_methodRegistryByNetworkClientId, _MethodDataHelper_mutex, _MethodDataHelper_registryLookup;
 import { createModuleLogger } from "@metamask/utils";
 import { Mutex } from "async-mutex";
+import { MethodRegistry } from "eth-method-registry";
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
 import EventEmitter from "events";
 import { projectLogger } from "../logger.mjs";
 const log = createModuleLogger(projectLogger, 'method-data');
-const methodRegistryAbi = [
-    {
-        constant: false,
-        inputs: [{ name: '_new', type: 'address' }],
-        name: 'setOwner',
-        outputs: [],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: true,
-        inputs: [],
-        name: 'totalSignatures',
-        outputs: [{ name: '', type: 'uint256' }],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: true,
-        inputs: [],
-        name: 'owner',
-        outputs: [{ name: '', type: 'address' }],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: false,
-        inputs: [],
-        name: 'drain',
-        outputs: [],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: true,
-        inputs: [{ name: '', type: 'bytes4' }],
-        name: 'entries',
-        outputs: [{ name: '', type: 'string' }],
-        payable: false,
-        type: 'function',
-    },
-    {
-        constant: false,
-        inputs: [{ name: '_method', type: 'string' }],
-        name: 'register',
-        outputs: [{ name: '', type: 'bool' }],
-        payable: false,
-        type: 'function',
-    },
-    { inputs: [], type: 'constructor' },
-    {
-        anonymous: false,
-        inputs: [
-            { indexed: true, name: 'creator', type: 'address' },
-            { indexed: true, name: 'signature', type: 'bytes4' },
-            { indexed: false, name: 'method', type: 'string' },
-        ],
-        name: 'Registered',
-        type: 'event',
-    },
-    {
-        anonymous: false,
-        inputs: [
-            { indexed: true, name: 'old', type: 'address' },
-            { indexed: true, name: 'current', type: 'address' },
-        ],
-        name: 'NewOwner',
-        type: 'event',
-    },
-];
 export class MethodDataHelper {
-    constructor({ getState }) {
+    constructor({ getProvider, getState, }) {
         _MethodDataHelper_instances.add(this);
+        _MethodDataHelper_getProvider.set(this, void 0);
         _MethodDataHelper_getState.set(this, void 0);
-        _MethodDataHelper_interfaceByNetworkClientId.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_getState, getState, "f");
-        __classPrivateFieldSet(this, _MethodDataHelper_interfaceByNetworkClientId, new Map(), "f");
+        __classPrivateFieldSet(this, _MethodDataHelper_methodRegistryByNetworkClientId, new Map(), "f");
     }
     async lookup(fourBytePrefix, networkClientId) {
         log('lookup', fourBytePrefix, networkClientId);
@@ -107,13 +39,15 @@ export class MethodDataHelper {
                 log('Cached', cachedResult);
                 return cachedResult;
             }
-            let iface = __classPrivateFieldGet(this, _MethodDataHelper_interfaceByNetworkClientId, "f").get(networkClientId);
-            if (!iface) {
-                iface = new Interface(methodRegistryAbi);
-                __classPrivateFieldGet(this, _MethodDataHelper_interfaceByNetworkClientId, "f").set(networkClientId, iface);
-                log('Created interface', networkClientId);
+            let registry = __classPrivateFieldGet(this, _MethodDataHelper_methodRegistryByNetworkClientId, "f").get(networkClientId);
+            if (!registry) {
+                const provider = __classPrivateFieldGet(this, _MethodDataHelper_getProvider, "f").call(this, 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);
+                log('Created registry', networkClientId);
             }
-            const methodData = await __classPrivateFieldGet(this, _MethodDataHelper_instances, "m", _MethodDataHelper_interfaceLookup).call(this, fourBytePrefix, iface);
+            const methodData = await __classPrivateFieldGet(this, _MethodDataHelper_instances, "m", _MethodDataHelper_registryLookup).call(this, fourBytePrefix, registry);
             log('Result', methodData);
             this.hub.emit('update', { fourBytePrefix, methodData });
             return methodData;
@@ -123,23 +57,17 @@ export class MethodDataHelper {
         }
     }
 }
-_MethodDataHelper_getState = new WeakMap(), _MethodDataHelper_interfaceByNetworkClientId = new WeakMap(), _MethodDataHelper_mutex = new WeakMap(), _MethodDataHelper_instances = new WeakSet(), _MethodDataHelper_interfaceLookup = async function _MethodDataHelper_interfaceLookup(fourBytePrefix, iface) {
-    try {
-        const functionFragment = iface.getFunction(fourBytePrefix);
-        return {
-            registryMethod: functionFragment.format(),
-            parsedRegistryMethod: {
-                name: functionFragment.name,
-                args: functionFragment.inputs.map(({ type }) => ({ type })),
-            },
-        };
-    }
-    catch {
-        log('No method found or invalid signature', fourBytePrefix);
+_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) {
+    const registryMethod = await methodRegistry.lookup(fourBytePrefix);
+    if (!registryMethod) {
+        log('No method found', fourBytePrefix);
         return {
             registryMethod: '',
             parsedRegistryMethod: { name: undefined, args: undefined },
         };
     }
+    log('Parsing', registryMethod);
+    const parsedRegistryMethod = methodRegistry.parse(registryMethod);
+    return { registryMethod, parsedRegistryMethod };
 };
 //# sourceMappingURL=MethodDataHelper.mjs.map

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 { Interface } from '@ethersproject/abi';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport { createModuleLogger } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\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\nconst methodRegistryAbi = [\n  {\n    constant: false,\n    inputs: [{ name: '_new', type: 'address' }],\n    name: 'setOwner',\n    outputs: [],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: true,\n    inputs: [],\n    name: 'totalSignatures',\n    outputs: [{ name: '', type: 'uint256' }],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: true,\n    inputs: [],\n    name: 'owner',\n    outputs: [{ name: '', type: 'address' }],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: false,\n    inputs: [],\n    name: 'drain',\n    outputs: [],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: true,\n    inputs: [{ name: '', type: 'bytes4' }],\n    name: 'entries',\n    outputs: [{ name: '', type: 'string' }],\n    payable: false,\n    type: 'function',\n  },\n  {\n    constant: false,\n    inputs: [{ name: '_method', type: 'string' }],\n    name: 'register',\n    outputs: [{ name: '', type: 'bool' }],\n    payable: false,\n    type: 'function',\n  },\n  { inputs: [], type: 'constructor' },\n  {\n    anonymous: false,\n    inputs: [\n      { indexed: true, name: 'creator', type: 'address' },\n      { indexed: true, name: 'signature', type: 'bytes4' },\n      { indexed: false, name: 'method', type: 'string' },\n    ],\n    name: 'Registered',\n    type: 'event',\n  },\n  {\n    anonymous: false,\n    inputs: [\n      { indexed: true, name: 'old', type: 'address' },\n      { indexed: true, name: 'current', type: 'address' },\n    ],\n    name: 'NewOwner',\n    type: 'event',\n  },\n];\n\nexport class MethodDataHelper {\n  hub: EventEmitter;\n\n  #getState: () => Record<string, MethodData>;\n\n  #interfaceByNetworkClientId: Map<NetworkClientId, Interface>;\n\n  #mutex = new Mutex();\n\n  constructor({ getState }: { getState: () => Record<string, MethodData> }) {\n    this.hub = new EventEmitter();\n\n    this.#getState = getState;\n    this.#interfaceByNetworkClientId = 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 iface = this.#interfaceByNetworkClientId.get(networkClientId);\n\n      if (!iface) {\n        iface = new Interface(methodRegistryAbi);\n        this.#interfaceByNetworkClientId.set(networkClientId, iface);\n        log('Created interface', networkClientId);\n      }\n\n      const methodData = await this.#interfaceLookup(fourBytePrefix, iface);\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 #interfaceLookup(\n    fourBytePrefix: string,\n    iface: Interface,\n  ): Promise<MethodData> {\n    try {\n      const functionFragment = iface.getFunction(fourBytePrefix);\n      return {\n        registryMethod: functionFragment.format(),\n        parsedRegistryMethod: {\n          name: functionFragment.name,\n          args: functionFragment.inputs.map(({ type }) => ({ type })),\n        },\n      };\n    } catch {\n      log('No method found or invalid signature', fourBytePrefix);\n      return {\n        registryMethod: '',\n        parsedRegistryMethod: { name: undefined, args: undefined },\n      };\n    }\n  }\n}\n"]}
+{"version":3,"file":"MethodDataHelper.mjs","sourceRoot":"","sources":["../../src/helpers/MethodDataHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,kBAAkB,EAAE,wBAAwB;AACrD,OAAO,EAAE,KAAK,EAAE,oBAAoB;AACpC,OAAO,EAAE,cAAc,EAAE,4BAA4B;AACrD,kEAAkE;AAClE,sDAAsD;AACtD,OAAO,YAAY,eAAe;AAElC,OAAO,EAAE,aAAa,EAAE,sBAAkB;AAG1C,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;AAE7D,MAAM,OAAO,gBAAgB;IAW3B,YAAY,EACV,WAAW,EACX,QAAQ,GAIT;;QAdD,gDAA6D;QAE7D,6CAA4C;QAE5C,oEAAuE;QAEvE,kCAAS,IAAI,KAAK,EAAE,EAAC;QASnB,IAAI,CAAC,GAAG,GAAG,IAAI,YAAY,EAAE,CAAC;QAE9B,uBAAA,IAAI,iCAAgB,WAAW,MAAA,CAAC;QAChC,uBAAA,IAAI,8BAAa,QAAQ,MAAA,CAAC;QAC1B,uBAAA,IAAI,qDAAoC,IAAI,GAAG,EAAE,MAAA,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,MAAM,CACV,cAAsB,EACtB,eAAgC;QAEhC,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;QAE/C,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,+BAAO,CAAC,OAAO,EAAE,CAAC;QAEhD,IAAI;YACF,MAAM,YAAY,GAAG,uBAAA,IAAI,kCAAU,MAAd,IAAI,CAAY,CAAC,cAAc,CAAC,CAAC;YAEtD,IAAI,YAAY,EAAE;gBAChB,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBAC5B,OAAO,YAAY,CAAC;aACrB;YAED,IAAI,QAAQ,GAAG,uBAAA,IAAI,yDAAiC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAE1E,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,QAAQ,GAAG,uBAAA,IAAI,qCAAa,MAAjB,IAAI,EAAc,eAAe,CAAC,CAAC;gBAEpD,sFAAsF;gBACtF,QAAQ,GAAG,IAAI,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAE5C,uBAAA,IAAI,yDAAiC,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;gBAErE,GAAG,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;aAC1C;YAED,MAAM,UAAU,GAAG,MAAM,uBAAA,IAAI,qEAAgB,MAApB,IAAI,EAAiB,cAAc,EAAE,QAAQ,CAAC,CAAC;YAExE,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAE1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;YAExD,OAAO,UAAU,CAAC;SACnB;gBAAS;YACR,WAAW,EAAE,CAAC;SACf;IACH,CAAC;CAuBF;uRArBC,KAAK,2CACH,cAAsB,EACtB,cAA8B;IAE9B,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAEnE,IAAI,CAAC,cAAc,EAAE;QACnB,GAAG,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;QAEvC,OAAO;YACL,cAAc,EAAE,EAAE;YAClB,oBAAoB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;SAC3D,CAAC;KACH;IAED,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAE/B,MAAM,oBAAoB,GAAG,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAElE,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,CAAC;AAClD,CAAC","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  #getProvider: (networkClientId: NetworkClientId) => Provider;\n\n  #getState: () => Record<string, MethodData>;\n\n  #methodRegistryByNetworkClientId: Map<NetworkClientId, MethodRegistry>;\n\n  #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"]}

package/dist/{utils/resimulate.cjs → helpers/ResimulateHelper.cjs}

@@ -1,18 +1,107 @@
 "use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _ResimulateHelper_instances, _ResimulateHelper_activeResimulations, _ResimulateHelper_intervalIds, _ResimulateHelper_getTransactions, _ResimulateHelper_updateSimulationData, _ResimulateHelper_start, _ResimulateHelper_stop, _ResimulateHelper_removeListener, _ResimulateHelper_getUnapprovedTransactions;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasSimulationDataChanged = exports.shouldResimulate = exports.BLOCK_TIME_ADDITIONAL_SECONDS = exports.VALUE_COMPARISON_PERCENT_THRESHOLD = exports.BLOCKAID_RESULT_TYPE_MALICIOUS = exports.RESIMULATE_PARAMS = void 0;
+exports.hasSimulationDataChanged = exports.shouldResimulate = exports.ResimulateHelper = exports.RESIMULATE_INTERVAL_MS = exports.BLOCK_TIME_ADDITIONAL_SECONDS = exports.VALUE_COMPARISON_PERCENT_THRESHOLD = exports.BLOCKAID_RESULT_TYPE_MALICIOUS = exports.RESIMULATE_PARAMS = void 0;
 const utils_1 = require("@metamask/utils");
 const bn_js_1 = require("bn.js");
 const lodash_1 = require("lodash");
 const logger_1 = require("../logger.cjs");
-const utils_2 = require("./utils.cjs");
-const log = (0, utils_1.createModuleLogger)(logger_1.projectLogger, 'resimulate');
+const types_1 = require("../types.cjs");
+const utils_2 = require("../utils/utils.cjs");
+const log = (0, logger_1.createModuleLogger)(logger_1.projectLogger, 'resimulate-helper');
 exports.RESIMULATE_PARAMS = ['to', 'value', 'data'];
 exports.BLOCKAID_RESULT_TYPE_MALICIOUS = 'Malicious';
 exports.VALUE_COMPARISON_PERCENT_THRESHOLD = 5;
 exports.BLOCK_TIME_ADDITIONAL_SECONDS = 60;
+exports.RESIMULATE_INTERVAL_MS = 3000;
+class ResimulateHelper {
+    constructor({ getTransactions, updateSimulationData, onStateChange, }) {
+        _ResimulateHelper_instances.add(this);
+        // Map of transactionId <=> isActive
+        _ResimulateHelper_activeResimulations.set(this, new Map());
+        // Map of transactionId <=> intervalId
+        _ResimulateHelper_intervalIds.set(this, new Map());
+        _ResimulateHelper_getTransactions.set(this, void 0);
+        _ResimulateHelper_updateSimulationData.set(this, void 0);
+        __classPrivateFieldSet(this, _ResimulateHelper_getTransactions, getTransactions, "f");
+        __classPrivateFieldSet(this, _ResimulateHelper_updateSimulationData, updateSimulationData, "f");
+        onStateChange(() => {
+            const unapprovedTransactions = __classPrivateFieldGet(this, _ResimulateHelper_instances, "m", _ResimulateHelper_getUnapprovedTransactions).call(this);
+            const unapprovedTransactionIds = new Set(unapprovedTransactions.map((tx) => tx.id));
+            // Start or stop resimulation based on the current isFocused state
+            unapprovedTransactions.forEach((transactionMeta) => {
+                if (transactionMeta.isFocused) {
+                    __classPrivateFieldGet(this, _ResimulateHelper_instances, "m", _ResimulateHelper_start).call(this, transactionMeta);
+                }
+                else {
+                    __classPrivateFieldGet(this, _ResimulateHelper_instances, "m", _ResimulateHelper_stop).call(this, transactionMeta);
+                }
+            });
+            // Force stop any running active resimulation that are no longer unapproved transactions list
+            __classPrivateFieldGet(this, _ResimulateHelper_activeResimulations, "f").forEach((isActive, transactionId) => {
+                if (isActive && !unapprovedTransactionIds.has(transactionId)) {
+                    __classPrivateFieldGet(this, _ResimulateHelper_instances, "m", _ResimulateHelper_stop).call(this, {
+                        id: transactionId,
+                        // Forcing this to false to ensure the resimulation is stopped
+                        isFocused: false,
+                    });
+                }
+            });
+        });
+    }
+}
+exports.ResimulateHelper = ResimulateHelper;
+_ResimulateHelper_activeResimulations = new WeakMap(), _ResimulateHelper_intervalIds = new WeakMap(), _ResimulateHelper_getTransactions = new WeakMap(), _ResimulateHelper_updateSimulationData = new WeakMap(), _ResimulateHelper_instances = new WeakSet(), _ResimulateHelper_start = function _ResimulateHelper_start(transactionMeta) {
+    const { id: transactionId } = transactionMeta;
+    const isActive = __classPrivateFieldGet(this, _ResimulateHelper_activeResimulations, "f").get(transactionId);
+    if (!transactionMeta.isFocused || isActive) {
+        return;
+    }
+    const listener = async () => {
+        try {
+            __classPrivateFieldGet(this, _ResimulateHelper_updateSimulationData, "f").call(this, transactionMeta);
+        }
+        catch (error) {
+            /* istanbul ignore next */
+            log('Error during transaction resimulation', error);
+        }
+    };
+    const intervalId = setInterval(listener, exports.RESIMULATE_INTERVAL_MS);
+    __classPrivateFieldGet(this, _ResimulateHelper_intervalIds, "f").set(transactionId, intervalId);
+    __classPrivateFieldGet(this, _ResimulateHelper_activeResimulations, "f").set(transactionId, true);
+    log(`Started resimulating transaction ${transactionId} every 3 seconds`);
+}, _ResimulateHelper_stop = function _ResimulateHelper_stop(transactionMeta) {
+    const { id: transactionId } = transactionMeta;
+    const isActive = __classPrivateFieldGet(this, _ResimulateHelper_activeResimulations, "f").get(transactionId);
+    if (transactionMeta.isFocused || !isActive) {
+        return;
+    }
+    __classPrivateFieldGet(this, _ResimulateHelper_instances, "m", _ResimulateHelper_removeListener).call(this, transactionId);
+    log(`Stopped resimulating transaction ${transactionId} every 3 seconds`);
+}, _ResimulateHelper_removeListener = function _ResimulateHelper_removeListener(id) {
+    const intervalId = __classPrivateFieldGet(this, _ResimulateHelper_intervalIds, "f").get(id);
+    if (intervalId) {
+        clearInterval(intervalId);
+        __classPrivateFieldGet(this, _ResimulateHelper_intervalIds, "f").delete(id);
+    }
+    __classPrivateFieldGet(this, _ResimulateHelper_activeResimulations, "f").delete(id);
+}, _ResimulateHelper_getUnapprovedTransactions = function _ResimulateHelper_getUnapprovedTransactions() {
+    return __classPrivateFieldGet(this, _ResimulateHelper_getTransactions, "f").call(this).filter((tx) => tx.status === types_1.TransactionStatus.unapproved);
+};
 /**
  * Determine if a transaction should be resimulated.
+ *
  * @param originalTransactionMeta - The original transaction metadata.
  * @param newTransactionMeta - The new transaction metadata.
  * @returns Whether the transaction should be resimulated.
@@ -45,6 +134,7 @@ function shouldResimulate(originalTransactionMeta, newTransactionMeta) {
 exports.shouldResimulate = shouldResimulate;
 /**
  * Determine if the simulation data has changed.
+ *
  * @param originalSimulationData - The original simulation data.
  * @param newSimulationData - The new simulation data.
  * @returns Whether the simulation data has changed.
@@ -84,6 +174,7 @@ function hasSimulationDataChanged(originalSimulationData, newSimulationData) {
 exports.hasSimulationDataChanged = hasSimulationDataChanged;
 /**
  * Determine if the transaction parameters have been updated.
+ *
  * @param originalTransactionMeta - The original transaction metadata.
  * @param newTransactionMeta - The new transaction metadata.
  * @returns Whether the transaction parameters have been updated.
@@ -106,6 +197,7 @@ function isParametersUpdated(originalTransactionMeta, newTransactionMeta) {
 }
 /**
  * Determine if a transaction has a new security alert.
+ *
  * @param originalTransactionMeta - The original transaction metadata.
  * @param newTransactionMeta - The new transaction metadata.
  * @returns Whether the transaction has a new security alert.
@@ -125,6 +217,7 @@ function hasNewSecurityAlert(originalTransactionMeta, newTransactionMeta) {
 }
 /**
  * Determine if a transaction has a value and simulation native balance mismatch.
+ *
  * @param originalTransactionMeta - The original transaction metadata.
  * @param newTransactionMeta - The new transaction metadata.
  * @returns Whether the transaction has a value and simulation native balance mismatch.
@@ -142,6 +235,7 @@ function hasValueAndNativeBalanceMismatch(originalTransactionMeta, newTransactio
 }
 /**
  * Determine if a balance change has been updated.
+ *
  * @param originalBalanceChange - The original balance change.
  * @param newBalanceChange - The new balance change.
  * @returns Whether the balance change has been updated.
@@ -151,6 +245,7 @@ function isBalanceChangeUpdated(originalBalanceChange, newBalanceChange) {
 }
 /**
  * Determine if the percentage change between two values is within a threshold.
+ *
  * @param originalValue - The original value.
  * @param newValue - The new value.
  * @param originalNegative - Whether the original value is negative.
@@ -169,4 +264,4 @@ function percentageChangeWithinThreshold(originalValue, newValue, originalNegati
     return ((0, utils_2.getPercentageChange)(originalValueBN, newValueBN) <=
         exports.VALUE_COMPARISON_PERCENT_THRESHOLD);
 }
-//# sourceMappingURL=resimulate.cjs.map
+//# sourceMappingURL=ResimulateHelper.cjs.map