@metamask/transaction-controller 62.5.0 → 62.7.0

package/dist/helpers/IncomingTransactionHelper.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"IncomingTransactionHelper.mjs","sourceRoot":"","sources":["../../src/helpers/IncomingTransactionHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountsController } from '@metamask/accounts-controller';\nimport type { Hex } from '@metamask/utils';\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 type { TransactionControllerMessenger } from '..';\nimport { incomingTransactionsLogger as log } from '../logger';\nimport type { RemoteTransactionSource, TransactionMeta } from '../types';\nimport { getIncomingTransactionsPollingInterval } from '../utils/feature-flags';\n\nexport type IncomingTransactionOptions = {\n  /** Name of the client to include in requests. */\n  client?: string;\n\n  /** Whether to retrieve incoming token transfers. Defaults to false. */\n  includeTokenTransfers?: boolean;\n\n  /** Callback to determine if incoming transaction polling is enabled. */\n  isEnabled?: () => boolean;\n\n  /** @deprecated No longer used. */\n  queryEntireHistory?: boolean;\n\n  /** Whether to retrieve outgoing transactions. Defaults to false. */\n  updateTransactions?: boolean;\n};\n\nconst TAG_POLLING = 'automatic-polling';\n\nexport class IncomingTransactionHelper {\n  hub: EventEmitter;\n\n  readonly #client?: string;\n\n  readonly #getCurrentAccount: () => ReturnType<\n    AccountsController['getSelectedAccount']\n  >;\n\n  readonly #getLocalTransactions: () => TransactionMeta[];\n\n  readonly #includeTokenTransfers?: boolean;\n\n  readonly #isEnabled: () => boolean;\n\n  #isRunning: boolean;\n\n  #isUpdating: boolean;\n\n  readonly #messenger: TransactionControllerMessenger;\n\n  readonly #remoteTransactionSource: RemoteTransactionSource;\n\n  #timeoutId?: unknown;\n\n  readonly #trimTransactions: (\n    transactions: TransactionMeta[],\n  ) => TransactionMeta[];\n\n  readonly #updateTransactions?: boolean;\n\n  constructor({\n    client,\n    getCurrentAccount,\n    getLocalTransactions,\n    includeTokenTransfers,\n    isEnabled,\n    messenger,\n    remoteTransactionSource,\n    trimTransactions,\n    updateTransactions,\n  }: {\n    client?: string;\n    getCurrentAccount: () => ReturnType<\n      AccountsController['getSelectedAccount']\n    >;\n    getLocalTransactions: () => TransactionMeta[];\n    includeTokenTransfers?: boolean;\n    isEnabled?: () => boolean;\n    messenger: TransactionControllerMessenger;\n    remoteTransactionSource: RemoteTransactionSource;\n    trimTransactions: (transactions: TransactionMeta[]) => TransactionMeta[];\n    updateTransactions?: boolean;\n  }) {\n    this.hub = new EventEmitter();\n\n    this.#client = client;\n    this.#getCurrentAccount = getCurrentAccount;\n    this.#getLocalTransactions = getLocalTransactions;\n    this.#includeTokenTransfers = includeTokenTransfers;\n    this.#isEnabled = isEnabled ?? (() => true);\n    this.#isRunning = false;\n    this.#isUpdating = false;\n    this.#messenger = messenger;\n    this.#remoteTransactionSource = remoteTransactionSource;\n    this.#trimTransactions = trimTransactions;\n    this.#updateTransactions = updateTransactions;\n  }\n\n  start() {\n    if (this.#isRunning) {\n      return;\n    }\n\n    if (!this.#canStart()) {\n      return;\n    }\n\n    const interval = this.#getInterval();\n\n    log('Started polling', { interval });\n\n    this.#isRunning = true;\n\n    if (this.#isUpdating) {\n      return;\n    }\n\n    this.#onInterval().catch((error) => {\n      log('Initial polling failed', error);\n    });\n  }\n\n  stop() {\n    if (this.#timeoutId) {\n      clearTimeout(this.#timeoutId as number);\n    }\n\n    if (!this.#isRunning) {\n      return;\n    }\n\n    this.#isRunning = false;\n\n    log('Stopped polling');\n  }\n\n  async #onInterval() {\n    this.#isUpdating = true;\n\n    try {\n      await this.update({ isInterval: true });\n    } catch (error) {\n      console.error('Error while checking incoming transactions', error);\n    }\n\n    this.#isUpdating = false;\n\n    if (this.#isRunning) {\n      if (this.#timeoutId) {\n        clearTimeout(this.#timeoutId as number);\n      }\n\n      this.#timeoutId = setTimeout(\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        () => this.#onInterval(),\n        this.#getInterval(),\n      );\n    }\n  }\n\n  async update({\n    isInterval,\n    tags,\n  }: { isInterval?: boolean; tags?: string[] } = {}): Promise<void> {\n    const finalTags = this.#getTags(tags, isInterval);\n\n    log('Checking for incoming transactions', {\n      isInterval: Boolean(isInterval),\n      tags: finalTags,\n    });\n\n    if (!this.#canStart()) {\n      return;\n    }\n\n    const account = this.#getCurrentAccount();\n    const includeTokenTransfers = this.#includeTokenTransfers ?? true;\n    const updateTransactions = this.#updateTransactions ?? false;\n\n    let remoteTransactions: TransactionMeta[] = [];\n\n    try {\n      remoteTransactions =\n        await this.#remoteTransactionSource.fetchTransactions({\n          address: account.address as Hex,\n          includeTokenTransfers,\n          tags: finalTags,\n          updateTransactions,\n        });\n    } catch (error: unknown) {\n      log('Error while fetching remote transactions', error);\n      return;\n    }\n\n    if (!remoteTransactions.length) {\n      return;\n    }\n\n    this.#sortTransactionsByTime(remoteTransactions);\n\n    log(\n      'Found potential transactions',\n      remoteTransactions.length,\n      remoteTransactions,\n    );\n\n    const localTransactions = this.#getLocalTransactions();\n\n    const uniqueTransactions = remoteTransactions.filter(\n      (tx) =>\n        !localTransactions.some(\n          (currentTx) =>\n            currentTx.hash?.toLowerCase() === tx.hash?.toLowerCase() &&\n            currentTx.txParams.from?.toLowerCase() ===\n              tx.txParams.from?.toLowerCase() &&\n            currentTx.type === tx.type,\n        ),\n    );\n\n    if (!uniqueTransactions.length) {\n      log('All transactions are already known');\n      return;\n    }\n\n    log(\n      'Found unique transactions',\n      uniqueTransactions.length,\n      uniqueTransactions,\n    );\n\n    const trimmedTransactions = this.#trimTransactions([\n      ...uniqueTransactions,\n      ...localTransactions,\n    ]);\n\n    const uniqueTransactionIds = uniqueTransactions.map((tx) => tx.id);\n\n    const newTransactions = trimmedTransactions.filter((tx) =>\n      uniqueTransactionIds.includes(tx.id),\n    );\n\n    if (!newTransactions.length) {\n      log('All unique transactions truncated due to limit');\n      return;\n    }\n\n    log('Adding new transactions', newTransactions.length, newTransactions);\n\n    this.hub.emit('transactions', newTransactions);\n  }\n\n  #sortTransactionsByTime(transactions: TransactionMeta[]) {\n    transactions.sort((a, b) => (a.time < b.time ? -1 : 1));\n  }\n\n  #canStart(): boolean {\n    return this.#isEnabled();\n  }\n\n  #getInterval(): number {\n    return getIncomingTransactionsPollingInterval(this.#messenger);\n  }\n\n  #getTags(\n    requestTags: string[] | undefined,\n    isInterval: boolean | undefined,\n  ): string[] | undefined {\n    const tags = [];\n\n    if (this.#client) {\n      tags.push(this.#client);\n    }\n\n    if (requestTags?.length) {\n      tags.push(...requestTags);\n    } else if (isInterval) {\n      tags.push(TAG_POLLING);\n    }\n\n    return tags?.length ? tags : undefined;\n  }\n}\n"]}
+{"version":3,"file":"IncomingTransactionHelper.mjs","sourceRoot":"","sources":["../../src/helpers/IncomingTransactionHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,kEAAkE;AAClE,sDAAsD;AACtD,OAAO,YAAY,eAAe;AAGlC,OAAO,EAAE,0BAA0B,IAAI,GAAG,EAAE,sBAAkB;AAE9D,OAAO,EAAE,sCAAsC,EAAE,mCAA+B;AAmBhF,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAExC,MAAM,OAAO,yBAAyB;IA+BpC,YAAY,EACV,MAAM,EACN,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,SAAS,EACT,SAAS,EACT,uBAAuB,EACvB,gBAAgB,EAChB,kBAAkB,GAanB;;QAlDQ,oDAAiB;QAEjB,+DAEP;QAEO,kEAA+C;QAE/C,mEAAiC;QAEjC,uDAA0B;QAEnC,uDAAoB;QAEpB,wDAAqB;QAEZ,uDAA2C;QAE3C,qEAAkD;QAE3D,uDAAqB;QAEZ,8DAEc;QAEd,gEAA8B;QAyBrC,IAAI,CAAC,GAAG,GAAG,IAAI,YAAY,EAAE,CAAC;QAE9B,uBAAA,IAAI,qCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,gDAAsB,iBAAiB,MAAA,CAAC;QAC5C,uBAAA,IAAI,mDAAyB,oBAAoB,MAAA,CAAC;QAClD,uBAAA,IAAI,oDAA0B,qBAAqB,MAAA,CAAC;QACpD,uBAAA,IAAI,wCAAc,SAAS,IAAI,CAAC,GAAY,EAAE,CAAC,IAAI,CAAC,MAAA,CAAC;QACrD,uBAAA,IAAI,wCAAc,KAAK,MAAA,CAAC;QACxB,uBAAA,IAAI,yCAAe,KAAK,MAAA,CAAC;QACzB,uBAAA,IAAI,wCAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,sDAA4B,uBAAuB,MAAA,CAAC;QACxD,uBAAA,IAAI,+CAAqB,gBAAgB,MAAA,CAAC;QAC1C,uBAAA,IAAI,iDAAuB,kBAAkB,MAAA,CAAC;IAChD,CAAC;IAED,KAAK;QACH,IAAI,uBAAA,IAAI,4CAAW,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,uBAAA,IAAI,iFAAU,MAAd,IAAI,CAAY,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,uBAAA,IAAI,oFAAa,MAAjB,IAAI,CAAe,CAAC;QAErC,GAAG,CAAC,iBAAiB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAErC,uBAAA,IAAI,wCAAc,IAAI,MAAA,CAAC;QAEvB,IAAI,uBAAA,IAAI,6CAAY,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,uBAAA,IAAI,mFAAY,MAAhB,IAAI,CAAc,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACjC,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI;QACF,IAAI,uBAAA,IAAI,4CAAW,EAAE,CAAC;YACpB,YAAY,CAAC,uBAAA,IAAI,4CAAqB,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,uBAAA,IAAI,4CAAW,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,uBAAA,IAAI,wCAAc,KAAK,MAAA,CAAC;QAExB,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACzB,CAAC;IA0BD,KAAK,CAAC,MAAM,CAAC,EACX,UAAU,EACV,IAAI,MACyC,EAAE;QAC/C,MAAM,SAAS,GAAG,uBAAA,IAAI,gFAAS,MAAb,IAAI,EAAU,IAAI,EAAE,UAAU,CAAC,CAAC;QAElD,GAAG,CAAC,oCAAoC,EAAE;YACxC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC;YAC/B,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAA,IAAI,iFAAU,MAAd,IAAI,CAAY,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,uBAAA,IAAI,oDAAmB,MAAvB,IAAI,CAAqB,CAAC;QAC1C,MAAM,qBAAqB,GAAG,uBAAA,IAAI,wDAAuB,IAAI,IAAI,CAAC;QAClE,MAAM,kBAAkB,GAAG,uBAAA,IAAI,qDAAoB,IAAI,KAAK,CAAC;QAE7D,IAAI,kBAAkB,GAAsB,EAAE,CAAC;QAE/C,IAAI,CAAC;YACH,kBAAkB;gBAChB,MAAM,uBAAA,IAAI,0DAAyB,CAAC,iBAAiB,CAAC;oBACpD,OAAO,EAAE,OAAO,CAAC,OAAc;oBAC/B,qBAAqB;oBACrB,IAAI,EAAE,SAAS;oBACf,kBAAkB;iBACnB,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,GAAG,CAAC,0CAA0C,EAAE,KAAK,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,uBAAA,IAAI,+FAAwB,MAA5B,IAAI,EAAyB,kBAAkB,CAAC,CAAC;QAEjD,GAAG,CACD,8BAA8B,EAC9B,kBAAkB,CAAC,MAAM,EACzB,kBAAkB,CACnB,CAAC;QAEF,MAAM,iBAAiB,GAAG,uBAAA,IAAI,uDAAsB,MAA1B,IAAI,CAAwB,CAAC;QAEvD,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,MAAM,CAClD,CAAC,EAAE,EAAE,EAAE,CACL,CAAC,iBAAiB,CAAC,IAAI,CACrB,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE;YACxD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE;gBACpC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE;YACjC,SAAS,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,CAC7B,CACJ,CAAC;QAEF,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC;YAC/B,GAAG,CAAC,oCAAoC,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,GAAG,CACD,2BAA2B,EAC3B,kBAAkB,CAAC,MAAM,EACzB,kBAAkB,CACnB,CAAC;QAEF,MAAM,mBAAmB,GAAG,uBAAA,IAAI,mDAAkB,MAAtB,IAAI,EAAmB;YACjD,GAAG,kBAAkB;YACrB,GAAG,iBAAiB;SACrB,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEnE,MAAM,eAAe,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CACxD,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CACrC,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;YAC5B,GAAG,CAAC,gDAAgD,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QAED,GAAG,CAAC,yBAAyB,EAAE,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAExE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IACjD,CAAC;CAgCF;iyBAjJC,KAAK;IACH,uBAAA,IAAI,yCAAe,IAAI,MAAA,CAAC;IAExB,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,CAAC,CAAC;IACrE,CAAC;IAED,uBAAA,IAAI,yCAAe,KAAK,MAAA,CAAC;IAEzB,IAAI,uBAAA,IAAI,4CAAW,EAAE,CAAC;QACpB,IAAI,uBAAA,IAAI,4CAAW,EAAE,CAAC;YACpB,YAAY,CAAC,uBAAA,IAAI,4CAAqB,CAAC,CAAC;QAC1C,CAAC;QAED,uBAAA,IAAI,wCAAc,UAAU;QAC1B,kEAAkE;QAClE,GAAG,EAAE,CAAC,uBAAA,IAAI,mFAAY,MAAhB,IAAI,CAAc,EACxB,uBAAA,IAAI,oFAAa,MAAjB,IAAI,CAAe,CACpB,MAAA,CAAC;IACJ,CAAC;AACH,CAAC,iHA6FuB,YAA+B;IACrD,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;IAGC,OAAO,uBAAA,IAAI,4CAAW,MAAf,IAAI,CAAa,CAAC;AAC3B,CAAC;IAGC,OAAO,sCAAsC,CAAC,uBAAA,IAAI,4CAAW,CAAC,CAAC;AACjE,CAAC,mFAGC,WAAiC,EACjC,UAA+B;IAE/B,MAAM,IAAI,GAAG,EAAE,CAAC;IAEhB,IAAI,uBAAA,IAAI,yCAAQ,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,uBAAA,IAAI,yCAAQ,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,WAAW,EAAE,MAAM,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;IAC5B,CAAC;SAAM,IAAI,UAAU,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACzC,CAAC","sourcesContent":["import type { AccountsController } from '@metamask/accounts-controller';\nimport type { Hex } from '@metamask/utils';\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 type { TransactionControllerMessenger } from '..';\nimport { incomingTransactionsLogger as log } from '../logger';\nimport type { RemoteTransactionSource, TransactionMeta } from '../types';\nimport { getIncomingTransactionsPollingInterval } from '../utils/feature-flags';\n\nexport type IncomingTransactionOptions = {\n  /** Name of the client to include in requests. */\n  client?: string;\n\n  /** Whether to retrieve incoming token transfers. Defaults to false. */\n  includeTokenTransfers?: boolean;\n\n  /** Callback to determine if incoming transaction polling is enabled. */\n  isEnabled?: () => boolean;\n\n  /** @deprecated No longer used. */\n  queryEntireHistory?: boolean;\n\n  /** Whether to retrieve outgoing transactions. Defaults to false. */\n  updateTransactions?: boolean;\n};\n\nconst TAG_POLLING = 'automatic-polling';\n\nexport class IncomingTransactionHelper {\n  hub: EventEmitter;\n\n  readonly #client?: string;\n\n  readonly #getCurrentAccount: () => ReturnType<\n    AccountsController['getSelectedAccount']\n  >;\n\n  readonly #getLocalTransactions: () => TransactionMeta[];\n\n  readonly #includeTokenTransfers?: boolean;\n\n  readonly #isEnabled: () => boolean;\n\n  #isRunning: boolean;\n\n  #isUpdating: boolean;\n\n  readonly #messenger: TransactionControllerMessenger;\n\n  readonly #remoteTransactionSource: RemoteTransactionSource;\n\n  #timeoutId?: unknown;\n\n  readonly #trimTransactions: (\n    transactions: TransactionMeta[],\n  ) => TransactionMeta[];\n\n  readonly #updateTransactions?: boolean;\n\n  constructor({\n    client,\n    getCurrentAccount,\n    getLocalTransactions,\n    includeTokenTransfers,\n    isEnabled,\n    messenger,\n    remoteTransactionSource,\n    trimTransactions,\n    updateTransactions,\n  }: {\n    client?: string;\n    getCurrentAccount: () => ReturnType<\n      AccountsController['getSelectedAccount']\n    >;\n    getLocalTransactions: () => TransactionMeta[];\n    includeTokenTransfers?: boolean;\n    isEnabled?: () => boolean;\n    messenger: TransactionControllerMessenger;\n    remoteTransactionSource: RemoteTransactionSource;\n    trimTransactions: (transactions: TransactionMeta[]) => TransactionMeta[];\n    updateTransactions?: boolean;\n  }) {\n    this.hub = new EventEmitter();\n\n    this.#client = client;\n    this.#getCurrentAccount = getCurrentAccount;\n    this.#getLocalTransactions = getLocalTransactions;\n    this.#includeTokenTransfers = includeTokenTransfers;\n    this.#isEnabled = isEnabled ?? ((): boolean => true);\n    this.#isRunning = false;\n    this.#isUpdating = false;\n    this.#messenger = messenger;\n    this.#remoteTransactionSource = remoteTransactionSource;\n    this.#trimTransactions = trimTransactions;\n    this.#updateTransactions = updateTransactions;\n  }\n\n  start(): void {\n    if (this.#isRunning) {\n      return;\n    }\n\n    if (!this.#canStart()) {\n      return;\n    }\n\n    const interval = this.#getInterval();\n\n    log('Started polling', { interval });\n\n    this.#isRunning = true;\n\n    if (this.#isUpdating) {\n      return;\n    }\n\n    this.#onInterval().catch((error) => {\n      log('Initial polling failed', error);\n    });\n  }\n\n  stop(): void {\n    if (this.#timeoutId) {\n      clearTimeout(this.#timeoutId as number);\n    }\n\n    if (!this.#isRunning) {\n      return;\n    }\n\n    this.#isRunning = false;\n\n    log('Stopped polling');\n  }\n\n  async #onInterval(): Promise<void> {\n    this.#isUpdating = true;\n\n    try {\n      await this.update({ isInterval: true });\n    } catch (error) {\n      console.error('Error while checking incoming transactions', error);\n    }\n\n    this.#isUpdating = false;\n\n    if (this.#isRunning) {\n      if (this.#timeoutId) {\n        clearTimeout(this.#timeoutId as number);\n      }\n\n      this.#timeoutId = setTimeout(\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        () => this.#onInterval(),\n        this.#getInterval(),\n      );\n    }\n  }\n\n  async update({\n    isInterval,\n    tags,\n  }: { isInterval?: boolean; tags?: string[] } = {}): Promise<void> {\n    const finalTags = this.#getTags(tags, isInterval);\n\n    log('Checking for incoming transactions', {\n      isInterval: Boolean(isInterval),\n      tags: finalTags,\n    });\n\n    if (!this.#canStart()) {\n      return;\n    }\n\n    const account = this.#getCurrentAccount();\n    const includeTokenTransfers = this.#includeTokenTransfers ?? true;\n    const updateTransactions = this.#updateTransactions ?? false;\n\n    let remoteTransactions: TransactionMeta[] = [];\n\n    try {\n      remoteTransactions =\n        await this.#remoteTransactionSource.fetchTransactions({\n          address: account.address as Hex,\n          includeTokenTransfers,\n          tags: finalTags,\n          updateTransactions,\n        });\n    } catch (error: unknown) {\n      log('Error while fetching remote transactions', error);\n      return;\n    }\n\n    if (!remoteTransactions.length) {\n      return;\n    }\n\n    this.#sortTransactionsByTime(remoteTransactions);\n\n    log(\n      'Found potential transactions',\n      remoteTransactions.length,\n      remoteTransactions,\n    );\n\n    const localTransactions = this.#getLocalTransactions();\n\n    const uniqueTransactions = remoteTransactions.filter(\n      (tx) =>\n        !localTransactions.some(\n          (currentTx) =>\n            currentTx.hash?.toLowerCase() === tx.hash?.toLowerCase() &&\n            currentTx.txParams.from?.toLowerCase() ===\n              tx.txParams.from?.toLowerCase() &&\n            currentTx.type === tx.type,\n        ),\n    );\n\n    if (!uniqueTransactions.length) {\n      log('All transactions are already known');\n      return;\n    }\n\n    log(\n      'Found unique transactions',\n      uniqueTransactions.length,\n      uniqueTransactions,\n    );\n\n    const trimmedTransactions = this.#trimTransactions([\n      ...uniqueTransactions,\n      ...localTransactions,\n    ]);\n\n    const uniqueTransactionIds = uniqueTransactions.map((tx) => tx.id);\n\n    const newTransactions = trimmedTransactions.filter((tx) =>\n      uniqueTransactionIds.includes(tx.id),\n    );\n\n    if (!newTransactions.length) {\n      log('All unique transactions truncated due to limit');\n      return;\n    }\n\n    log('Adding new transactions', newTransactions.length, newTransactions);\n\n    this.hub.emit('transactions', newTransactions);\n  }\n\n  #sortTransactionsByTime(transactions: TransactionMeta[]): void {\n    transactions.sort((a, b) => (a.time < b.time ? -1 : 1));\n  }\n\n  #canStart(): boolean {\n    return this.#isEnabled();\n  }\n\n  #getInterval(): number {\n    return getIncomingTransactionsPollingInterval(this.#messenger);\n  }\n\n  #getTags(\n    requestTags: string[] | undefined,\n    isInterval: boolean | undefined,\n  ): string[] | undefined {\n    const tags = [];\n\n    if (this.#client) {\n      tags.push(this.#client);\n    }\n\n    if (requestTags?.length) {\n      tags.push(...requestTags);\n    } else if (isInterval) {\n      tags.push(TAG_POLLING);\n    }\n\n    return tags?.length ? tags : undefined;\n  }\n}\n"]}

package/dist/helpers/MultichainTrackingHelper.cjs

@@ -131,9 +131,9 @@ class MultichainTrackingHelper {
                 releaseLock,
             };
         }
-        catch (err) {
+        catch (error) {
             releaseLockForChainIdKey?.();
-            throw err;
+            throw error;
         }
     }
     stopAllTracking() {

package/dist/helpers/MultichainTrackingHelper.cjs.map

@@ -1 +1 @@
-{"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    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() {\n    const networkClients = this.#getNetworkClientRegistry();\n\n    this.#refreshTrackingMap(networkClients);\n\n    log('Initialized');\n  }\n\n  has(networkClientId: NetworkClientId) {\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 = () => {\n        nonceLock.releaseLock();\n        releaseLockForChainIdKey?.();\n      };\n\n      return {\n        ...nonceLock,\n        releaseLock,\n      };\n    } catch (err) {\n      releaseLockForChainIdKey?.();\n      throw err;\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  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 = (networkClients: NetworkClientRegistry) => {\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) {\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) {\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    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"]}

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;IAQV,GAAG,CAAC,eAAe,EAAE,eAAe;IAIpC;;;;;;;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,aAIvC;IAEF,eAAe;IAMf,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"}
+{"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"}

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;IAQV,GAAG,CAAC,eAAe,EAAE,eAAe;IAIpC;;;;;;;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,aAIvC;IAEF,eAAe;IAMf,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"}
+{"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"}

package/dist/helpers/MultichainTrackingHelper.mjs

@@ -128,9 +128,9 @@ export class MultichainTrackingHelper {
                 releaseLock,
             };
         }
-        catch (err) {
+        catch (error) {
             releaseLockForChainIdKey?.();
-            throw err;
+            throw error;
         }
     }
     stopAllTracking() {

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() {\n    const networkClients = this.#getNetworkClientRegistry();\n\n    this.#refreshTrackingMap(networkClients);\n\n    log('Initialized');\n  }\n\n  has(networkClientId: NetworkClientId) {\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 = () => {\n        nonceLock.releaseLock();\n        releaseLockForChainIdKey?.();\n      };\n\n      return {\n        ...nonceLock,\n        releaseLock,\n      };\n    } catch (err) {\n      releaseLockForChainIdKey?.();\n      throw err;\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  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 = (networkClients: NetworkClientRegistry) => {\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) {\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) {\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    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"]}

package/dist/helpers/PendingTransactionTracker.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _PendingTransactionTracker_instances, _PendingTransactionTracker_droppedBlockCountByHash, _PendingTransactionTracker_getChainId, _PendingTransactionTracker_getEthQuery, _PendingTransactionTracker_getNetworkClientId, _PendingTransactionTracker_getTransactions, _PendingTransactionTracker_isResubmitEnabled, _PendingTransactionTracker_listener, _PendingTransactionTracker_log, _PendingTransactionTracker_getGlobalLock, _PendingTransactionTracker_publishTransaction, _PendingTransactionTracker_running, _PendingTransactionTracker_transactionPoller, _PendingTransactionTracker_transactionToForcePoll, _PendingTransactionTracker_beforeCheckPendingTransaction, _PendingTransactionTracker_start, _PendingTransactionTracker_onLatestBlock, _PendingTransactionTracker_checkTransactions, _PendingTransactionTracker_resubmitTransactions, _PendingTransactionTracker_isKnownTransactionError, _PendingTransactionTracker_resubmitTransaction, _PendingTransactionTracker_isResubmitDue, _PendingTransactionTracker_cleanTransactionToForcePoll, _PendingTransactionTracker_checkTransaction, _PendingTransactionTracker_onTransactionConfirmed, _PendingTransactionTracker_isTransactionDropped, _PendingTransactionTracker_isNonceTaken, _PendingTransactionTracker_getPendingTransactions, _PendingTransactionTracker_warnTransaction, _PendingTransactionTracker_failTransaction, _PendingTransactionTracker_dropTransaction, _PendingTransactionTracker_updateTransaction, _PendingTransactionTracker_getTransactionReceipt, _PendingTransactionTracker_getBlockByHash, _PendingTransactionTracker_getNetworkTransactionCount, _PendingTransactionTracker_getChainTransactions, _PendingTransactionTracker_getNetworkClientTransactions;
+var _PendingTransactionTracker_instances, _PendingTransactionTracker_beforeCheckPendingTransaction, _PendingTransactionTracker_droppedBlockCountByHash, _PendingTransactionTracker_isTimeoutEnabled, _PendingTransactionTracker_getChainId, _PendingTransactionTracker_getEthQuery, _PendingTransactionTracker_getGlobalLock, _PendingTransactionTracker_getNetworkClientId, _PendingTransactionTracker_getTransactions, _PendingTransactionTracker_isResubmitEnabled, _PendingTransactionTracker_listener, _PendingTransactionTracker_log, _PendingTransactionTracker_messenger, _PendingTransactionTracker_publishTransaction, _PendingTransactionTracker_running, _PendingTransactionTracker_timeoutCountByHash, _PendingTransactionTracker_transactionPoller, _PendingTransactionTracker_transactionToForcePoll, _PendingTransactionTracker_start, _PendingTransactionTracker_onLatestBlock, _PendingTransactionTracker_checkTransactions, _PendingTransactionTracker_resubmitTransactions, _PendingTransactionTracker_isKnownTransactionError, _PendingTransactionTracker_resubmitTransaction, _PendingTransactionTracker_isResubmitDue, _PendingTransactionTracker_cleanTransactionToForcePoll, _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");
@@ -24,6 +24,7 @@ const lodash_1 = require("lodash");
 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");
 /**
  * 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
@@ -42,11 +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, hooks, isResubmitEnabled, messenger, publishTransaction, }) {
+    constructor({ blockTracker, getChainId, getEthQuery, getGlobalLock, getNetworkClientId, getTransactions, isTimeoutEnabled, hooks, isResubmitEnabled, messenger, 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_getTransactions.set(this, void 0);
         _PendingTransactionTracker_isResubmitEnabled.set(this, void 0);
@@ -54,12 +58,12 @@ class PendingTransactionTracker {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         _PendingTransactionTracker_listener.set(this, void 0);
         _PendingTransactionTracker_log.set(this, void 0);
-        _PendingTransactionTracker_getGlobalLock.set(this, void 0);
+        _PendingTransactionTracker_messenger.set(this, void 0);
         _PendingTransactionTracker_publishTransaction.set(this, void 0);
         _PendingTransactionTracker_running.set(this, void 0);
+        _PendingTransactionTracker_timeoutCountByHash.set(this, void 0);
         _PendingTransactionTracker_transactionPoller.set(this, void 0);
         _PendingTransactionTracker_transactionToForcePoll.set(this, void 0);
-        _PendingTransactionTracker_beforeCheckPendingTransaction.set(this, void 0);
         this.startIfPendingTransactions = () => {
             const pendingTransactions = __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_getPendingTransactions).call(this);
             if (pendingTransactions.length) {
@@ -73,13 +77,15 @@ class PendingTransactionTracker {
         __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_getTransactions, getTransactions, "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_isResubmitEnabled, isResubmitEnabled ?? (() => true), "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_listener, __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_onLatestBlock).bind(this), "f");
-        __classPrivateFieldSet(this, _PendingTransactionTracker_getGlobalLock, getGlobalLock, "f");
+        __classPrivateFieldSet(this, _PendingTransactionTracker_messenger, messenger, "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_publishTransaction, publishTransaction, "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_running, false, "f");
+        __classPrivateFieldSet(this, _PendingTransactionTracker_timeoutCountByHash, new Map(), "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_transactionToForcePoll, undefined, "f");
         __classPrivateFieldSet(this, _PendingTransactionTracker_transactionPoller, new TransactionPoller_1.TransactionPoller({
             blockTracker,
@@ -89,6 +95,7 @@ class PendingTransactionTracker {
         __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");
     }
     /**
@@ -134,7 +141,7 @@ class PendingTransactionTracker {
     }
 }
 exports.PendingTransactionTracker = PendingTransactionTracker;
-_PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTransactionTracker_getChainId = new WeakMap(), _PendingTransactionTracker_getEthQuery = new WeakMap(), _PendingTransactionTracker_getNetworkClientId = new WeakMap(), _PendingTransactionTracker_getTransactions = new WeakMap(), _PendingTransactionTracker_isResubmitEnabled = new WeakMap(), _PendingTransactionTracker_listener = new WeakMap(), _PendingTransactionTracker_log = new WeakMap(), _PendingTransactionTracker_getGlobalLock = new WeakMap(), _PendingTransactionTracker_publishTransaction = new WeakMap(), _PendingTransactionTracker_running = new WeakMap(), _PendingTransactionTracker_transactionPoller = new WeakMap(), _PendingTransactionTracker_transactionToForcePoll = new WeakMap(), _PendingTransactionTracker_beforeCheckPendingTransaction = 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_getChainId = new WeakMap(), _PendingTransactionTracker_getEthQuery = new WeakMap(), _PendingTransactionTracker_getGlobalLock = new WeakMap(), _PendingTransactionTracker_getNetworkClientId = new WeakMap(), _PendingTransactionTracker_getTransactions = new WeakMap(), _PendingTransactionTracker_isResubmitEnabled = new WeakMap(), _PendingTransactionTracker_listener = new WeakMap(), _PendingTransactionTracker_log = new WeakMap(), _PendingTransactionTracker_messenger = new WeakMap(), _PendingTransactionTracker_publishTransaction = new WeakMap(), _PendingTransactionTracker_running = new WeakMap(), _PendingTransactionTracker_timeoutCountByHash = 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;
@@ -198,8 +205,8 @@ _PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTran
         }
         catch (error) {
             /* istanbul ignore next */
-            const errorMessage = error.value?.message?.toLowerCase() ||
-                error.message?.toLowerCase() ||
+            const errorMessage = error.value?.message?.toLowerCase() ??
+                error.message?.toLowerCase() ??
                 String(error);
             if (__classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_isKnownTransactionError).call(this, errorMessage)) {
                 __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'Ignoring known transaction error', errorMessage);
@@ -230,7 +237,7 @@ _PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTran
     const { firstRetryBlockNumber } = txMetaWithFirstRetryBlockNumber;
     const blocksSinceFirstRetry = Number.parseInt(latestBlockNumber, 16) -
         Number.parseInt(firstRetryBlockNumber, 16);
-    const retryCount = txMeta.retryCount || 0;
+    const retryCount = txMeta.retryCount ?? 0;
     // Exponential backoff to limit retries at publishing
     // Capped at ~15 minutes between retries
     const requiredBlocksSinceFirstRetry = Math.min(MAX_RETRY_BLOCK_DISTANCE, Math.pow(2, retryCount));
@@ -240,7 +247,7 @@ _PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTran
         __classPrivateFieldSet(this, _PendingTransactionTracker_transactionToForcePoll, undefined, "f");
     }
 }, _PendingTransactionTracker_checkTransaction = async function _PendingTransactionTracker_checkTransaction(txMeta) {
-    const { hash, id, isIntentComplete } = txMeta;
+    const { hash, id, isIntentComplete, txParams: { from }, } = txMeta;
     if (isIntentComplete) {
         await __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_onTransactionConfirmed).call(this, txMeta);
         return;
@@ -265,7 +272,7 @@ _PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTran
             __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_failTransaction).call(this, txMeta, new Error('Transaction dropped or replaced'));
             return;
         }
-        const { blockNumber, blockHash } = receipt || {};
+        const { blockNumber, blockHash } = receipt ?? {};
         if (isSuccess && blockNumber && blockHash) {
             await __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_onTransactionConfirmed).call(this, txMeta, {
                 ...receipt,
@@ -274,16 +281,20 @@ _PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTran
             });
             return;
         }
-        // TODO: Replace `any` with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'No receipt status', { hash, receipt });
+        const nextNonceHex = await __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_getNetworkTransactionCount).call(this, from);
+        const nextNonce = parseInt(nextNonceHex, 16);
+        // Check if transaction should be failed due to no receipt
+        if (!receipt && (await __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_isTransactionTimeout).call(this, txMeta, nextNonce))) {
+            return;
+        }
+        if (await __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_isTransactionDropped).call(this, txMeta, nextNonce)) {
+            __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_dropTransaction).call(this, txMeta);
+        }
     }
     catch (error) {
         __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'Failed to check transaction', id, error);
         __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_warnTransaction).call(this, txMeta, error.message, 'There was a problem loading this transaction.');
-        return;
-    }
-    if (await __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_isTransactionDropped).call(this, txMeta)) {
-        __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_dropTransaction).call(this, txMeta);
     }
 }, _PendingTransactionTracker_onTransactionConfirmed = async function _PendingTransactionTracker_onTransactionConfirmed(txMeta, receipt) {
     const { id } = txMeta;
@@ -309,16 +320,69 @@ _PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTran
     updatedTxMeta.status = types_1.TransactionStatus.confirmed;
     __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_updateTransaction).call(this, updatedTxMeta, 'PendingTransactionTracker:#onTransactionConfirmed - Transaction confirmed');
     this.hub.emit('transaction-confirmed', updatedTxMeta);
-}, _PendingTransactionTracker_isTransactionDropped = async function _PendingTransactionTracker_isTransactionDropped(txMeta) {
-    const { hash, id, txParams: { nonce, from }, } = txMeta;
+}, _PendingTransactionTracker_isTransactionTimeout = async function _PendingTransactionTracker_isTransactionTimeout(txMeta, nextNonce) {
+    const { chainId, hash, id: transactionId, txParams: { nonce }, } = txMeta;
+    if (!hash || !nonce) {
+        return false;
+    }
+    if (!__classPrivateFieldGet(this, _PendingTransactionTracker_isTimeoutEnabled, "f").call(this, txMeta)) {
+        __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'Timeout disabled for transaction', txMeta);
+        return false;
+    }
+    const threshold = (0, feature_flags_1.getTimeoutAttempts)(chainId, __classPrivateFieldGet(this, _PendingTransactionTracker_messenger, "f"));
+    // Feature is disabled if threshold is undefined or zero
+    if (threshold === undefined || threshold === 0) {
+        __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'Timeout disabled due to threshold', { chainId, threshold });
+        return false;
+    }
+    // Skip timeout if this transaction's nonce is a queued transaction with a future nonce
+    const nonceNumber = parseInt(nonce, 16);
+    if (nonceNumber > nextNonce) {
+        __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'Skipping timeout as queued transaction', {
+            transactionNonce: nonceNumber,
+            nextNonce,
+        });
+        return false;
+    }
+    try {
+        // Check if transaction exists on the network
+        const transaction = await __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_getTransactionByHash).call(this, hash);
+        // If transaction exists, reset the counter
+        if (transaction !== null) {
+            __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'Transaction found on network, resetting timeout counter', transactionId);
+            __classPrivateFieldGet(this, _PendingTransactionTracker_timeoutCountByHash, "f").delete(hash);
+            return false;
+        }
+        // Transaction doesn't exist, increment counter
+        let attempts = __classPrivateFieldGet(this, _PendingTransactionTracker_timeoutCountByHash, "f").get(hash);
+        attempts ?? (attempts = 0);
+        attempts += 1;
+        __classPrivateFieldGet(this, _PendingTransactionTracker_timeoutCountByHash, "f").set(hash, attempts);
+        __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'Incrementing timeout counter', {
+            transactionId,
+            attempts,
+            threshold,
+        });
+        if (attempts < threshold) {
+            return false;
+        }
+        __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'Hit timeout threshold', transactionId);
+        __classPrivateFieldGet(this, _PendingTransactionTracker_timeoutCountByHash, "f").delete(hash);
+        __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_failTransaction).call(this, txMeta, new Error('Transaction not found on network after timeout'));
+        return true;
+    }
+    catch (error) {
+        __classPrivateFieldGet(this, _PendingTransactionTracker_log, "f").call(this, 'Failed to check transaction by hash', transactionId, error);
+        return false;
+    }
+}, _PendingTransactionTracker_isTransactionDropped = async function _PendingTransactionTracker_isTransactionDropped(txMeta, nextNonce) {
+    const { hash, id, txParams: { nonce }, } = txMeta;
     /* istanbul ignore next */
     if (!nonce || !hash) {
         return false;
     }
-    const networkNextNonceHex = await __classPrivateFieldGet(this, _PendingTransactionTracker_instances, "m", _PendingTransactionTracker_getNetworkTransactionCount).call(this, from);
-    const networkNextNonceNumber = parseInt(networkNextNonceHex, 16);
     const nonceNumber = parseInt(nonce, 16);
-    if (nonceNumber >= networkNextNonceNumber) {
+    if (nonceNumber >= nextNonce) {
         return false;
     }
     let droppedBlockCount = __classPrivateFieldGet(this, _PendingTransactionTracker_droppedBlockCountByHash, "f").get(hash);
@@ -364,6 +428,8 @@ _PendingTransactionTracker_droppedBlockCountByHash = new WeakMap(), _PendingTran
     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]);
+}, _PendingTransactionTracker_getTransactionByHash = async function _PendingTransactionTracker_getTransactionByHash(txHash) {
+    return await (0, controller_utils_1.query)(__classPrivateFieldGet(this, _PendingTransactionTracker_getEthQuery, "f").call(this), 'getTransactionByHash', [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,