@metamask-previews/transaction-controller 29.1.0-preview-2008174 → 30.0.0-preview-4a95e5f

package/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [30.0.0]
+
+### Fixed
+
+- **BREAKING**: Update from `nonce-tracker@^3.0.0` to `@metamask/nonce-tracker@^5.0.0` to mitigate issue with redundant polling loops in block tracker. ([#4309](https://github.com/MetaMask/core/pull/4309))
+  - The constructor now expects the `blockTracker` option being an instance of `@metamask/eth-block-tracker` instead of`eth-block-tracker`.
+
 ## [29.1.0]
 
 ### Changed
@@ -839,7 +846,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@29.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@30.0.0...HEAD
+[30.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@29.1.0...@metamask/transaction-controller@30.0.0
 [29.1.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@29.0.2...@metamask/transaction-controller@29.1.0
 [29.0.2]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@29.0.1...@metamask/transaction-controller@29.0.2
 [29.0.1]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@29.0.0...@metamask/transaction-controller@29.0.1

package/dist/TransactionController.js

@@ -4,8 +4,8 @@
 
 
 
-var _chunkBOMMIDDPjs = require('./chunk-BOMMIDDP.js');
-require('./chunk-ZNZEJDOE.js');
+var _chunkHI52J7VMjs = require('./chunk-HI52J7VM.js');
+require('./chunk-PRUNMTRD.js');
 require('./chunk-IT3SYNZ6.js');
 require('./chunk-KT6UAKBB.js');
 require('./chunk-SD6CWFDF.js');
@@ -21,7 +21,7 @@ require('./chunk-TJMQEH57.js');
 require('./chunk-E76IQWXN.js');
 require('./chunk-2XKEAKQG.js');
 require('./chunk-DTDTOMTB.js');
-require('./chunk-5XQ2KRYL.js');
+require('./chunk-PUESYN62.js');
 require('./chunk-EQT25RSP.js');
 require('./chunk-FDUCRHYT.js');
 require('./chunk-HMOSP33F.js');
@@ -41,5 +41,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.ApprovalState = _chunkBOMMIDDPjs.ApprovalState; exports.CANCEL_RATE = _chunkBOMMIDDPjs.CANCEL_RATE; exports.HARDFORK = _chunkBOMMIDDPjs.HARDFORK; exports.SPEED_UP_RATE = _chunkBOMMIDDPjs.SPEED_UP_RATE; exports.TransactionController = _chunkBOMMIDDPjs.TransactionController;
+exports.ApprovalState = _chunkHI52J7VMjs.ApprovalState; exports.CANCEL_RATE = _chunkHI52J7VMjs.CANCEL_RATE; exports.HARDFORK = _chunkHI52J7VMjs.HARDFORK; exports.SPEED_UP_RATE = _chunkHI52J7VMjs.SPEED_UP_RATE; exports.TransactionController = _chunkHI52J7VMjs.TransactionController;
 //# sourceMappingURL=TransactionController.js.map

package/dist/TransactionController.mjs

@@ -4,8 +4,8 @@ import {
   HARDFORK,
   SPEED_UP_RATE,
   TransactionController
-} from "./chunk-YN546ADU.mjs";
-import "./chunk-NHRBO3LU.mjs";
+} from "./chunk-VQIK6JCK.mjs";
+import "./chunk-6DDVVUJC.mjs";
 import "./chunk-AHSDUIMT.mjs";
 import "./chunk-K4KOSAGM.mjs";
 import "./chunk-KG4UW4K4.mjs";
@@ -21,7 +21,7 @@ import "./chunk-FMRLPVFZ.mjs";
 import "./chunk-JC2WLSM5.mjs";
 import "./chunk-NOHEXQ7Y.mjs";
 import "./chunk-Y7ENNK7L.mjs";
-import "./chunk-F6E3TTR3.mjs";
+import "./chunk-AZ4WIRH3.mjs";
 import "./chunk-CPMTUMMZ.mjs";
 import "./chunk-QZLPYOGC.mjs";
 import "./chunk-HQSNKCXI.mjs";

package/dist/{chunk-NHRBO3LU.mjs → chunk-6DDVVUJC.mjs}

@@ -47,4 +47,4 @@ export {
   getNextNonce,
   getAndFormatTransactionsForNonceTracker
 };
-//# sourceMappingURL=chunk-NHRBO3LU.mjs.map
+//# sourceMappingURL=chunk-6DDVVUJC.mjs.map

package/dist/chunk-6DDVVUJC.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utils/nonce.ts"],"sourcesContent":["import { toHex } from '@metamask/controller-utils';\nimport type {\n  NonceLock,\n  Transaction as NonceTrackerTransaction,\n} from '@metamask/nonce-tracker';\n\nimport { createModuleLogger, projectLogger } from '../logger';\nimport type { TransactionMeta, TransactionStatus } from '../types';\n\nconst log = createModuleLogger(projectLogger, 'nonce');\n\n/**\n * Determine the next nonce to be used for a transaction.\n *\n * @param txMeta - The transaction metadata.\n * @param getNonceLock - An anonymous function that acquires the nonce lock for an address\n * @returns The next hexadecimal nonce to be used for the given transaction, and optionally a function to release the nonce lock.\n */\nexport async function getNextNonce(\n  txMeta: TransactionMeta,\n  getNonceLock: (address: string) => Promise<NonceLock>,\n): Promise<[string, (() => void) | undefined]> {\n  const {\n    customNonceValue,\n    txParams: { from, nonce: existingNonce },\n  } = txMeta;\n\n  const customNonce = customNonceValue ? toHex(customNonceValue) : undefined;\n\n  if (customNonce) {\n    log('Using custom nonce', customNonce);\n    return [customNonce, undefined];\n  }\n\n  if (existingNonce) {\n    log('Using existing nonce', existingNonce);\n    return [existingNonce, undefined];\n  }\n\n  const nonceLock = await getNonceLock(from);\n  const nonce = toHex(nonceLock.nextNonce);\n  const releaseLock = nonceLock.releaseLock.bind(nonceLock);\n\n  log('Using nonce from nonce tracker', nonce, nonceLock.nonceDetails);\n\n  return [nonce, releaseLock];\n}\n\n/**\n * Filter and format transactions for the nonce tracker.\n *\n * @param currentChainId - Chain ID of the current network.\n * @param fromAddress - Address of the account from which the transactions to filter from are sent.\n * @param transactionStatus - Status of the transactions for which to filter.\n * @param transactions - Array of transactionMeta objects that have been prefiltered.\n * @returns Array of transactions formatted for the nonce tracker.\n */\nexport function getAndFormatTransactionsForNonceTracker(\n  currentChainId: string,\n  fromAddress: string,\n  transactionStatus: TransactionStatus,\n  transactions: TransactionMeta[],\n): NonceTrackerTransaction[] {\n  return transactions\n    .filter(\n      ({ chainId, isTransfer, isUserOperation, status, txParams: { from } }) =>\n        !isTransfer &&\n        !isUserOperation &&\n        chainId === currentChainId &&\n        status === transactionStatus &&\n        from.toLowerCase() === fromAddress.toLowerCase(),\n    )\n    .map(({ status, txParams: { from, gas, value, nonce } }) => {\n      // the only value we care about is the nonce\n      // but we need to return the other values to satisfy the type\n      // TODO: refactor nonceTracker to not require this\n      /* istanbul ignore next */\n      return {\n        status,\n        history: [{}],\n        txParams: {\n          from: from ?? '',\n          gas: gas ?? '',\n          value: value ?? '',\n          nonce: nonce ?? '',\n        },\n      };\n    });\n}\n"],"mappings":";;;;;;AAAA,SAAS,aAAa;AAStB,IAAM,MAAM,mBAAmB,eAAe,OAAO;AASrD,eAAsB,aACpB,QACA,cAC6C;AAC7C,QAAM;AAAA,IACJ;AAAA,IACA,UAAU,EAAE,MAAM,OAAO,cAAc;AAAA,EACzC,IAAI;AAEJ,QAAM,cAAc,mBAAmB,MAAM,gBAAgB,IAAI;AAEjE,MAAI,aAAa;AACf,QAAI,sBAAsB,WAAW;AACrC,WAAO,CAAC,aAAa,MAAS;AAAA,EAChC;AAEA,MAAI,eAAe;AACjB,QAAI,wBAAwB,aAAa;AACzC,WAAO,CAAC,eAAe,MAAS;AAAA,EAClC;AAEA,QAAM,YAAY,MAAM,aAAa,IAAI;AACzC,QAAM,QAAQ,MAAM,UAAU,SAAS;AACvC,QAAM,cAAc,UAAU,YAAY,KAAK,SAAS;AAExD,MAAI,kCAAkC,OAAO,UAAU,YAAY;AAEnE,SAAO,CAAC,OAAO,WAAW;AAC5B;AAWO,SAAS,wCACd,gBACA,aACA,mBACA,cAC2B;AAC3B,SAAO,aACJ;AAAA,IACC,CAAC,EAAE,SAAS,YAAY,iBAAiB,QAAQ,UAAU,EAAE,KAAK,EAAE,MAClE,CAAC,cACD,CAAC,mBACD,YAAY,kBACZ,WAAW,qBACX,KAAK,YAAY,MAAM,YAAY,YAAY;AAAA,EACnD,EACC,IAAI,CAAC,EAAE,QAAQ,UAAU,EAAE,MAAM,KAAK,OAAO,MAAM,EAAE,MAAM;AAK1D,WAAO;AAAA,MACL;AAAA,MACA,SAAS,CAAC,CAAC,CAAC;AAAA,MACZ,UAAU;AAAA,QACR,MAAM,QAAQ;AAAA,QACd,KAAK,OAAO;AAAA,QACZ,OAAO,SAAS;AAAA,QAChB,OAAO,SAAS;AAAA,MAClB;AAAA,IACF;AAAA,EACF,CAAC;AACL;","names":[]}

package/dist/{chunk-F6E3TTR3.mjs → chunk-AZ4WIRH3.mjs}

@@ -332,4 +332,4 @@ getNetworkClient_fn = function({
 export {
   MultichainTrackingHelper
 };
-//# sourceMappingURL=chunk-F6E3TTR3.mjs.map
+//# sourceMappingURL=chunk-AZ4WIRH3.mjs.map

package/dist/chunk-AZ4WIRH3.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/helpers/MultichainTrackingHelper.ts"],"sourcesContent":["import EthQuery from '@metamask/eth-query';\nimport 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 { incomingTransactionsLogger as log } from '../logger';\nimport { EtherscanRemoteTransactionSource } from './EtherscanRemoteTransactionSource';\nimport type {\n  IncomingTransactionHelper,\n  IncomingTransactionOptions,\n} from './IncomingTransactionHelper';\nimport type { PendingTransactionTracker } from './PendingTransactionTracker';\n\n/**\n * Registry of network clients provided by the NetworkController\n */\ntype NetworkClientRegistry = ReturnType<\n  NetworkController['getNetworkClientRegistry']\n>;\n\nexport type MultichainTrackingHelperOptions = {\n  isMultichainEnabled: boolean;\n  provider: Provider;\n  nonceTracker: NonceTracker;\n  incomingTransactionOptions: IncomingTransactionOptions;\n\n  findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n  getNetworkClientById: NetworkController['getNetworkClientById'];\n  getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  removeIncomingTransactionHelperListeners: (\n    IncomingTransactionHelper: IncomingTransactionHelper,\n  ) => void;\n  removePendingTransactionTrackerListeners: (\n    pendingTransactionTracker: PendingTransactionTracker,\n  ) => void;\n  createNonceTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId?: Hex;\n  }) => NonceTracker;\n  createIncomingTransactionHelper: (opts: {\n    blockTracker: BlockTracker;\n    etherscanRemoteTransactionSource: EtherscanRemoteTransactionSource;\n    chainId?: Hex;\n  }) => IncomingTransactionHelper;\n  createPendingTransactionTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId?: Hex;\n  }) => PendingTransactionTracker;\n  onNetworkStateChange: (\n    listener: (\n      ...payload: NetworkControllerStateChangeEvent['payload']\n    ) => void,\n  ) => void;\n};\n\nexport class MultichainTrackingHelper {\n  #isMultichainEnabled: boolean;\n\n  readonly #provider: Provider;\n\n  readonly #nonceTracker: NonceTracker;\n\n  readonly #incomingTransactionOptions: IncomingTransactionOptions;\n\n  readonly #findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n\n  readonly #getNetworkClientById: NetworkController['getNetworkClientById'];\n\n  readonly #getNetworkClientRegistry: NetworkController['getNetworkClientRegistry'];\n\n  readonly #removeIncomingTransactionHelperListeners: (\n    IncomingTransactionHelper: IncomingTransactionHelper,\n  ) => void;\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 #createIncomingTransactionHelper: (opts: {\n    blockTracker: BlockTracker;\n    chainId?: Hex;\n    etherscanRemoteTransactionSource: EtherscanRemoteTransactionSource;\n  }) => IncomingTransactionHelper;\n\n  readonly #createPendingTransactionTracker: (opts: {\n    provider: Provider;\n    blockTracker: BlockTracker;\n    chainId?: Hex;\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      incomingTransactionHelper: IncomingTransactionHelper;\n    }\n  > = new Map();\n\n  readonly #etherscanRemoteTransactionSourcesMap: Map<\n    Hex,\n    EtherscanRemoteTransactionSource\n  > = new Map();\n\n  constructor({\n    isMultichainEnabled,\n    provider,\n    nonceTracker,\n    incomingTransactionOptions,\n    findNetworkClientIdByChainId,\n    getNetworkClientById,\n    getNetworkClientRegistry,\n    removeIncomingTransactionHelperListeners,\n    removePendingTransactionTrackerListeners,\n    createNonceTracker,\n    createIncomingTransactionHelper,\n    createPendingTransactionTracker,\n    onNetworkStateChange,\n  }: MultichainTrackingHelperOptions) {\n    this.#isMultichainEnabled = isMultichainEnabled;\n    this.#provider = provider;\n    this.#nonceTracker = nonceTracker;\n    this.#incomingTransactionOptions = incomingTransactionOptions;\n\n    this.#findNetworkClientIdByChainId = findNetworkClientIdByChainId;\n    this.#getNetworkClientById = getNetworkClientById;\n    this.#getNetworkClientRegistry = getNetworkClientRegistry;\n\n    this.#removeIncomingTransactionHelperListeners =\n      removeIncomingTransactionHelperListeners;\n    this.#removePendingTransactionTrackerListeners =\n      removePendingTransactionTrackerListeners;\n    this.#createNonceTracker = createNonceTracker;\n    this.#createIncomingTransactionHelper = createIncomingTransactionHelper;\n    this.#createPendingTransactionTracker = createPendingTransactionTracker;\n\n    onNetworkStateChange((_, patches) => {\n      if (this.#isMultichainEnabled) {\n        const networkClients = this.#getNetworkClientRegistry();\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\n  initialize() {\n    if (!this.#isMultichainEnabled) {\n      return;\n    }\n    const networkClients = this.#getNetworkClientRegistry();\n    this.#refreshTrackingMap(networkClients);\n  }\n\n  has(networkClientId: NetworkClientId) {\n    return this.#trackingMap.has(networkClientId);\n  }\n\n  getEthQuery({\n    networkClientId,\n    chainId,\n  }: {\n    networkClientId?: NetworkClientId;\n    chainId?: Hex;\n  } = {}): EthQuery {\n    return new EthQuery(this.getProvider({ networkClientId, chainId }));\n  }\n\n  getProvider({\n    networkClientId,\n    chainId,\n  }: {\n    networkClientId?: NetworkClientId;\n    chainId?: Hex;\n  } = {}): Provider {\n    if (!this.#isMultichainEnabled) {\n      return this.#provider;\n    }\n\n    const networkClient = this.#getNetworkClient({\n      networkClientId,\n      chainId,\n    });\n\n    return networkClient?.provider || this.#provider;\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    let releaseLockForChainIdKey: (() => void) | undefined;\n    let nonceTracker = this.#nonceTracker;\n    if (networkClientId && this.#isMultichainEnabled) {\n      const networkClient = this.#getNetworkClientById(networkClientId);\n      releaseLockForChainIdKey = await this.acquireNonceLockForChainIdKey({\n        chainId: networkClient.configuration.chainId,\n        key: address,\n      });\n      const trackers = this.#trackingMap.get(networkClientId);\n      if (!trackers) {\n        throw new Error('missing nonceTracker for networkClientId');\n      }\n      nonceTracker = trackers.nonceTracker;\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      return {\n        ...nonceLock,\n        releaseLock: () => {\n          nonceLock.releaseLock();\n          releaseLockForChainIdKey?.();\n        },\n      };\n    } catch (err) {\n      releaseLockForChainIdKey?.();\n      throw err;\n    }\n  }\n\n  startIncomingTransactionPolling(networkClientIds: NetworkClientId[] = []) {\n    networkClientIds.forEach((networkClientId) => {\n      this.#trackingMap.get(networkClientId)?.incomingTransactionHelper.start();\n    });\n  }\n\n  stopIncomingTransactionPolling(networkClientIds: NetworkClientId[] = []) {\n    networkClientIds.forEach((networkClientId) => {\n      this.#trackingMap.get(networkClientId)?.incomingTransactionHelper.stop();\n    });\n  }\n\n  stopAllIncomingTransactionPolling() {\n    for (const [, trackers] of this.#trackingMap) {\n      trackers.incomingTransactionHelper.stop();\n    }\n  }\n\n  async updateIncomingTransactions(networkClientIds: NetworkClientId[] = []) {\n    const promises = await Promise.allSettled(\n      networkClientIds.map(async (networkClientId) => {\n        return await this.#trackingMap\n          .get(networkClientId)\n          ?.incomingTransactionHelper.update();\n      }),\n    );\n\n    promises\n      .filter((result) => result.status === 'rejected')\n      .forEach((result) => {\n        log(\n          'failed to update incoming transactions',\n          (result as PromiseRejectedResult).reason,\n        );\n      });\n  }\n\n  checkForPendingTransactionAndStartPolling = () => {\n    for (const [, trackers] of this.#trackingMap) {\n      trackers.pendingTransactionTracker.startIfPendingTransactions();\n    }\n  };\n\n  stopAllTracking() {\n    for (const [networkClientId] of this.#trackingMap) {\n      this.#stopTrackingByNetworkClientId(networkClientId);\n    }\n  }\n\n  #refreshTrackingMap = (networkClients: NetworkClientRegistry) => {\n    this.#refreshEtherscanRemoteTransactionSources(networkClients);\n\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    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    networkClientIdsToAdd.forEach((id) => {\n      this.#startTrackingByNetworkClientId(id);\n    });\n  };\n\n  #stopTrackingByNetworkClientId(networkClientId: NetworkClientId) {\n    const trackers = this.#trackingMap.get(networkClientId);\n    if (trackers) {\n      trackers.pendingTransactionTracker.stop();\n      this.#removePendingTransactionTrackerListeners(\n        trackers.pendingTransactionTracker,\n      );\n      trackers.incomingTransactionHelper.stop();\n      this.#removeIncomingTransactionHelperListeners(\n        trackers.incomingTransactionHelper,\n      );\n      this.#trackingMap.delete(networkClientId);\n    }\n  }\n\n  #startTrackingByNetworkClientId(networkClientId: NetworkClientId) {\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    let etherscanRemoteTransactionSource =\n      this.#etherscanRemoteTransactionSourcesMap.get(chainId);\n    if (!etherscanRemoteTransactionSource) {\n      etherscanRemoteTransactionSource = new EtherscanRemoteTransactionSource({\n        includeTokenTransfers:\n          this.#incomingTransactionOptions.includeTokenTransfers,\n      });\n      this.#etherscanRemoteTransactionSourcesMap.set(\n        chainId,\n        etherscanRemoteTransactionSource,\n      );\n    }\n\n    const nonceTracker = this.#createNonceTracker({\n      provider,\n      blockTracker,\n      chainId,\n    });\n\n    const incomingTransactionHelper = this.#createIncomingTransactionHelper({\n      blockTracker,\n      etherscanRemoteTransactionSource,\n      chainId,\n    });\n\n    const pendingTransactionTracker = this.#createPendingTransactionTracker({\n      provider,\n      blockTracker,\n      chainId,\n    });\n\n    this.#trackingMap.set(networkClientId, {\n      nonceTracker,\n      incomingTransactionHelper,\n      pendingTransactionTracker,\n    });\n  }\n\n  #refreshEtherscanRemoteTransactionSources = (\n    networkClients: NetworkClientRegistry,\n  ) => {\n    // this will be prettier when we have consolidated network clients with a single chainId:\n    // check if there are still other network clients using the same chainId\n    // if not remove the etherscanRemoteTransaction source from the map\n    const chainIdsInRegistry = new Set();\n    Object.values(networkClients).forEach((networkClient) =>\n      chainIdsInRegistry.add(networkClient.configuration.chainId),\n    );\n    const existingChainIds = Array.from(\n      this.#etherscanRemoteTransactionSourcesMap.keys(),\n    );\n    const chainIdsToRemove = existingChainIds.filter(\n      (chainId) => !chainIdsInRegistry.has(chainId),\n    );\n\n    chainIdsToRemove.forEach((chainId) => {\n      this.#etherscanRemoteTransactionSourcesMap.delete(chainId);\n    });\n  };\n\n  #getNetworkClient({\n    networkClientId,\n    chainId,\n  }: {\n    networkClientId?: NetworkClientId;\n    chainId?: Hex;\n  } = {}): NetworkClient | undefined {\n    let networkClient: NetworkClient | undefined;\n\n    if (networkClientId) {\n      try {\n        networkClient = this.#getNetworkClientById(networkClientId);\n      } catch (err) {\n        log('failed to get network client by networkClientId');\n      }\n    }\n    if (!networkClient && chainId) {\n      try {\n        const networkClientIdForChainId =\n          this.#findNetworkClientIdByChainId(chainId);\n        networkClient = this.#getNetworkClientById(networkClientIdForChainId);\n      } catch (err) {\n        log('failed to get network client by chainId');\n      }\n    }\n    return networkClient;\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/{chunk-BOMMIDDP.js → chunk-HI52J7VM.js}

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 
-var _chunkZNZEJDOEjs = require('./chunk-ZNZEJDOE.js');
+var _chunkPRUNMTRDjs = require('./chunk-PRUNMTRD.js');
 
 
 var _chunkIT3SYNZ6js = require('./chunk-IT3SYNZ6.js');
@@ -48,7 +48,7 @@ var _chunk2XKEAKQGjs = require('./chunk-2XKEAKQG.js');
 var _chunkDTDTOMTBjs = require('./chunk-DTDTOMTB.js');
 
 
-var _chunk5XQ2KRYLjs = require('./chunk-5XQ2KRYL.js');
+var _chunkPUESYN62js = require('./chunk-PUESYN62.js');
 
 
 var _chunkEQT25RSPjs = require('./chunk-EQT25RSP.js');
@@ -104,13 +104,13 @@ var _basecontroller = require('@metamask/base-controller');
 var _controllerutils = require('@metamask/controller-utils');
 var _ethquery = require('@metamask/eth-query'); var _ethquery2 = _interopRequireDefault(_ethquery);
 var _networkcontroller = require('@metamask/network-controller');
+var _noncetracker = require('@metamask/nonce-tracker');
 var _rpcerrors = require('@metamask/rpc-errors');
 var _utils = require('@metamask/utils');
 var _asyncmutex = require('async-mutex');
 var _ethmethodregistry = require('eth-method-registry');
 var _events = require('events');
 var _lodash = require('lodash');
-var _noncetracker = require('nonce-tracker');
 var _uuid = require('uuid');
 var metadata = {
   transactions: {
@@ -284,7 +284,7 @@ var TransactionController = class extends _basecontroller.BaseController {
         chainId
       );
     };
-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _multichainTrackingHelper, new (0, _chunk5XQ2KRYLjs.MultichainTrackingHelper)({
+    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _multichainTrackingHelper, new (0, _chunkPUESYN62js.MultichainTrackingHelper)({
       isMultichainEnabled,
       provider,
       nonceTracker: this.nonceTracker,
@@ -1659,7 +1659,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       cleanupTasks.push(
         () => this.approvingTransactionIds.delete(transactionId)
       );
-      const [nonce, releaseNonce] = await _chunkZNZEJDOEjs.getNextNonce.call(void 0, 
+      const [nonce, releaseNonce] = await _chunkPRUNMTRDjs.getNextNonce.call(void 0, 
         transactionMeta,
         (address) => _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getNonceLock(
           address,
@@ -2126,16 +2126,17 @@ var TransactionController = class extends _basecontroller.BaseController {
       _chunkS6VGOPUYjs.projectLogger.call(void 0, "Skipping signed status as no signed transaction");
       return void 0;
     }
-    if (!this.afterSign(transactionMeta, signedTx)) {
+    const transactionMetaFromHook = _lodash.cloneDeep.call(void 0, transactionMeta);
+    if (!this.afterSign(transactionMetaFromHook, signedTx)) {
       this.updateTransaction(
-        transactionMeta,
+        transactionMetaFromHook,
         "TransactionController#signTransaction - Update after sign"
       );
       _chunkS6VGOPUYjs.projectLogger.call(void 0, "Skipping signed status based on hook");
       return void 0;
     }
     const transactionMetaWithRsv = {
-      ...this.updateTransactionMetaRSV(transactionMeta, signedTx),
+      ...this.updateTransactionMetaRSV(transactionMetaFromHook, signedTx),
       status: "signed" /* signed */
     };
     this.updateTransaction(
@@ -2159,7 +2160,7 @@ var TransactionController = class extends _basecontroller.BaseController {
     });
   }
   getNonceTrackerTransactions(status, address, chainId = this.getChainId()) {
-    return _chunkZNZEJDOEjs.getAndFormatTransactionsForNonceTracker.call(void 0, 
+    return _chunkPRUNMTRDjs.getAndFormatTransactionsForNonceTracker.call(void 0, 
       chainId,
       address,
       status,
@@ -2242,9 +2243,10 @@ createNonceTracker_fn = function({
   chainId
 }) {
   return new (0, _noncetracker.NonceTracker)({
-    // TODO: Replace `any` with type
+    // TODO: Fix types
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     provider,
+    // @ts-expect-error TODO: Fix types
     blockTracker,
     getPendingTransactions: _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getNonceTrackerPendingTransactions, getNonceTrackerPendingTransactions_fn).bind(
       this,
@@ -2549,4 +2551,4 @@ isCustomNetwork_fn = function(networkClientId) {
 
 
 exports.HARDFORK = HARDFORK; exports.CANCEL_RATE = CANCEL_RATE; exports.SPEED_UP_RATE = SPEED_UP_RATE; exports.ApprovalState = ApprovalState; exports.TransactionController = TransactionController;
-//# sourceMappingURL=chunk-BOMMIDDP.js.map
+//# sourceMappingURL=chunk-HI52J7VM.js.map