@metamask-previews/transaction-controller 52.2.0-preview-ca923904 → 52.2.0-preview-afcc340

package/dist/helpers/TransactionPoller.mjs

@@ -9,13 +9,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TransactionPoller_instances, _TransactionPoller_acceleratedCount, _TransactionPoller_blockTracker, _TransactionPoller_blockTrackerListener, _TransactionPoller_listener, _TransactionPoller_pendingTransactions, _TransactionPoller_running, _TransactionPoller_timeout, _TransactionPoller_queue, _TransactionPoller_interval, _TransactionPoller_stopTimeout, _TransactionPoller_stopBlockTracker;
+var _TransactionPoller_instances, _TransactionPoller_acceleratedCount, _TransactionPoller_blockTracker, _TransactionPoller_chainId, _TransactionPoller_messenger, _TransactionPoller_blockTrackerListener, _TransactionPoller_listener, _TransactionPoller_pendingTransactions, _TransactionPoller_running, _TransactionPoller_timeout, _TransactionPoller_queue, _TransactionPoller_interval, _TransactionPoller_stopTimeout, _TransactionPoller_stopBlockTracker;
 import { createModuleLogger } from "@metamask/utils";
 import $lodash from "lodash";
 const { isEqual } = $lodash;
 import { projectLogger } from "../logger.mjs";
-export const ACCELERATED_COUNT_MAX = 10;
-export const ACCELERATED_INTERVAL = 1000 * 3; // 3 Seconds
+import { getAcceleratedPollingParams } from "../utils/feature-flags.mjs";
 const log = createModuleLogger(projectLogger, 'transaction-poller');
 /**
  * Helper class to orchestrate when to poll pending transactions.
@@ -23,16 +22,20 @@ const log = createModuleLogger(projectLogger, 'transaction-poller');
  * Following that, it will poll on every new block via the block tracker.
  */
 export class TransactionPoller {
-    constructor(blockTracker) {
+    constructor({ blockTracker, chainId, messenger, }) {
         _TransactionPoller_instances.add(this);
         _TransactionPoller_acceleratedCount.set(this, 0);
         _TransactionPoller_blockTracker.set(this, void 0);
+        _TransactionPoller_chainId.set(this, void 0);
+        _TransactionPoller_messenger.set(this, void 0);
         _TransactionPoller_blockTrackerListener.set(this, void 0);
         _TransactionPoller_listener.set(this, void 0);
         _TransactionPoller_pendingTransactions.set(this, void 0);
         _TransactionPoller_running.set(this, false);
         _TransactionPoller_timeout.set(this, void 0);
         __classPrivateFieldSet(this, _TransactionPoller_blockTracker, blockTracker, "f");
+        __classPrivateFieldSet(this, _TransactionPoller_chainId, chainId, "f");
+        __classPrivateFieldSet(this, _TransactionPoller_messenger, messenger, "f");
     }
     /**
      * Start the poller with a listener that will be called on every interval.
@@ -87,11 +90,12 @@ export class TransactionPoller {
         }
     }
 }
-_TransactionPoller_acceleratedCount = new WeakMap(), _TransactionPoller_blockTracker = new WeakMap(), _TransactionPoller_blockTrackerListener = new WeakMap(), _TransactionPoller_listener = new WeakMap(), _TransactionPoller_pendingTransactions = new WeakMap(), _TransactionPoller_running = new WeakMap(), _TransactionPoller_timeout = new WeakMap(), _TransactionPoller_instances = new WeakSet(), _TransactionPoller_queue = function _TransactionPoller_queue() {
+_TransactionPoller_acceleratedCount = new WeakMap(), _TransactionPoller_blockTracker = new WeakMap(), _TransactionPoller_chainId = new WeakMap(), _TransactionPoller_messenger = new WeakMap(), _TransactionPoller_blockTrackerListener = new WeakMap(), _TransactionPoller_listener = new WeakMap(), _TransactionPoller_pendingTransactions = new WeakMap(), _TransactionPoller_running = new WeakMap(), _TransactionPoller_timeout = new WeakMap(), _TransactionPoller_instances = new WeakSet(), _TransactionPoller_queue = function _TransactionPoller_queue() {
     if (!__classPrivateFieldGet(this, _TransactionPoller_running, "f")) {
         return;
     }
-    if (__classPrivateFieldGet(this, _TransactionPoller_acceleratedCount, "f") >= ACCELERATED_COUNT_MAX) {
+    const { countMax, intervalMs } = getAcceleratedPollingParams(__classPrivateFieldGet(this, _TransactionPoller_chainId, "f"), __classPrivateFieldGet(this, _TransactionPoller_messenger, "f"));
+    if (__classPrivateFieldGet(this, _TransactionPoller_acceleratedCount, "f") >= countMax) {
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
         __classPrivateFieldSet(this, _TransactionPoller_blockTrackerListener, (latestBlockNumber) => __classPrivateFieldGet(this, _TransactionPoller_instances, "m", _TransactionPoller_interval).call(this, false, latestBlockNumber), "f");
         __classPrivateFieldGet(this, _TransactionPoller_blockTracker, "f").on('latest', __classPrivateFieldGet(this, _TransactionPoller_blockTrackerListener, "f"));
@@ -103,7 +107,7 @@ _TransactionPoller_acceleratedCount = new WeakMap(), _TransactionPoller_blockTra
     __classPrivateFieldSet(this, _TransactionPoller_timeout, setTimeout(async () => {
         await __classPrivateFieldGet(this, _TransactionPoller_instances, "m", _TransactionPoller_interval).call(this, true);
         __classPrivateFieldGet(this, _TransactionPoller_instances, "m", _TransactionPoller_queue).call(this);
-    }, ACCELERATED_INTERVAL), "f");
+    }, intervalMs), "f");
 }, _TransactionPoller_interval = async function _TransactionPoller_interval(isAccelerated, latestBlockNumber) {
     if (isAccelerated) {
         log('Accelerated interval', __classPrivateFieldGet(this, _TransactionPoller_acceleratedCount, "f") + 1);

package/dist/helpers/TransactionPoller.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionPoller.mjs","sourceRoot":"","sources":["../../src/helpers/TransactionPoller.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BlockTracker } from '@metamask/network-controller';\nimport { createModuleLogger } from '@metamask/utils';\nimport { isEqual } from 'lodash';\n\nimport { projectLogger } from '../logger';\nimport type { TransactionMeta } from '../types';\n\nexport const ACCELERATED_COUNT_MAX = 10;\nexport const ACCELERATED_INTERVAL = 1000 * 3; // 3 Seconds\n\nconst log = createModuleLogger(projectLogger, 'transaction-poller');\n\n/**\n * Helper class to orchestrate when to poll pending transactions.\n * Initially starts polling via a timeout chain every 2 seconds up to 5 times.\n * Following that, it will poll on every new block via the block tracker.\n */\nexport class TransactionPoller {\n  #acceleratedCount = 0;\n\n  readonly #blockTracker: BlockTracker;\n\n  #blockTrackerListener?: (latestBlockNumber: string) => void;\n\n  #listener?: (latestBlockNumber: string) => Promise<void>;\n\n  #pendingTransactions?: TransactionMeta[];\n\n  #running = false;\n\n  #timeout?: NodeJS.Timeout;\n\n  constructor(blockTracker: BlockTracker) {\n    this.#blockTracker = blockTracker;\n  }\n\n  /**\n   * Start the poller with a listener that will be called on every interval.\n   *\n   * @param listener - The listener to call on every interval.\n   */\n  start(listener: (latestBlockNumber: string) => Promise<void>) {\n    if (this.#running) {\n      return;\n    }\n\n    this.#listener = listener;\n    this.#running = true;\n\n    this.#queue();\n\n    log('Started');\n  }\n\n  /**\n   * Stop the poller.\n   * Remove all timeouts and block tracker listeners.\n   */\n  stop() {\n    if (!this.#running) {\n      return;\n    }\n\n    this.#running = false;\n    this.#listener = undefined;\n    this.#acceleratedCount = 0;\n    this.#pendingTransactions = undefined;\n\n    this.#stopTimeout();\n    this.#stopBlockTracker();\n\n    log('Stopped');\n  }\n\n  /**\n   * Notify the poller of the pending transactions being monitored.\n   * This will reset to the accelerated polling and reset the count\n   * when new transactions are added or removed.\n   *\n   * @param pendingTransactions - The pending transactions to poll.\n   */\n  setPendingTransactions(pendingTransactions: TransactionMeta[]) {\n    const currentPendingTransactionIds = (this.#pendingTransactions ?? []).map(\n      (tx) => tx.id,\n    );\n\n    this.#pendingTransactions = pendingTransactions;\n\n    const newPendingTransactionIds = pendingTransactions.map((tx) => tx.id);\n\n    const hasUpdatedIds = !isEqual(\n      currentPendingTransactionIds,\n      newPendingTransactionIds,\n    );\n\n    if (!this.#running || !hasUpdatedIds) {\n      return;\n    }\n\n    log('Detected new pending transactions', newPendingTransactionIds);\n\n    this.#acceleratedCount = 0;\n\n    if (this.#blockTrackerListener) {\n      this.#stopBlockTracker();\n      this.#queue();\n    }\n  }\n\n  #queue() {\n    if (!this.#running) {\n      return;\n    }\n\n    if (this.#acceleratedCount >= ACCELERATED_COUNT_MAX) {\n      // eslint-disable-next-line @typescript-eslint/no-misused-promises\n      this.#blockTrackerListener = (latestBlockNumber) =>\n        this.#interval(false, latestBlockNumber);\n\n      this.#blockTracker.on('latest', this.#blockTrackerListener);\n\n      log('Added block tracker listener');\n\n      return;\n    }\n\n    this.#stopTimeout();\n\n    // eslint-disable-next-line @typescript-eslint/no-misused-promises\n    this.#timeout = setTimeout(async () => {\n      await this.#interval(true);\n      this.#queue();\n    }, ACCELERATED_INTERVAL);\n  }\n\n  async #interval(isAccelerated: boolean, latestBlockNumber?: string) {\n    if (isAccelerated) {\n      log('Accelerated interval', this.#acceleratedCount + 1);\n    } else {\n      log('Block tracker interval', latestBlockNumber);\n    }\n\n    const latestBlockNumberFinal =\n      latestBlockNumber ?? (await this.#blockTracker.getLatestBlock());\n\n    await this.#listener?.(latestBlockNumberFinal);\n\n    if (isAccelerated && this.#running) {\n      this.#acceleratedCount += 1;\n    }\n  }\n\n  #stopTimeout() {\n    if (!this.#timeout) {\n      return;\n    }\n\n    clearTimeout(this.#timeout);\n    this.#timeout = undefined;\n  }\n\n  #stopBlockTracker() {\n    if (!this.#blockTrackerListener) {\n      return;\n    }\n\n    this.#blockTracker.removeListener('latest', this.#blockTrackerListener);\n    this.#blockTrackerListener = undefined;\n  }\n}\n"]}
+{"version":3,"file":"TransactionPoller.mjs","sourceRoot":"","sources":["../../src/helpers/TransactionPoller.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BlockTracker } from '@metamask/network-controller';\nimport { createModuleLogger, type Hex } from '@metamask/utils';\nimport { isEqual } from 'lodash';\n\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\nimport type { TransactionMeta } from '../types';\nimport { getAcceleratedPollingParams } from '../utils/feature-flags';\n\nconst log = createModuleLogger(projectLogger, 'transaction-poller');\n\n/**\n * Helper class to orchestrate when to poll pending transactions.\n * Initially starts polling via a timeout chain every 2 seconds up to 5 times.\n * Following that, it will poll on every new block via the block tracker.\n */\nexport class TransactionPoller {\n  #acceleratedCount = 0;\n\n  readonly #blockTracker: BlockTracker;\n\n  readonly #chainId: Hex;\n\n  readonly #messenger: TransactionControllerMessenger;\n\n  #blockTrackerListener?: (latestBlockNumber: string) => void;\n\n  #listener?: (latestBlockNumber: string) => Promise<void>;\n\n  #pendingTransactions?: TransactionMeta[];\n\n  #running = false;\n\n  #timeout?: NodeJS.Timeout;\n\n  constructor({\n    blockTracker,\n    chainId,\n    messenger,\n  }: {\n    blockTracker: BlockTracker;\n    chainId: Hex;\n    messenger: TransactionControllerMessenger;\n  }) {\n    this.#blockTracker = blockTracker;\n    this.#chainId = chainId;\n    this.#messenger = messenger;\n  }\n\n  /**\n   * Start the poller with a listener that will be called on every interval.\n   *\n   * @param listener - The listener to call on every interval.\n   */\n  start(listener: (latestBlockNumber: string) => Promise<void>) {\n    if (this.#running) {\n      return;\n    }\n\n    this.#listener = listener;\n    this.#running = true;\n\n    this.#queue();\n\n    log('Started');\n  }\n\n  /**\n   * Stop the poller.\n   * Remove all timeouts and block tracker listeners.\n   */\n  stop() {\n    if (!this.#running) {\n      return;\n    }\n\n    this.#running = false;\n    this.#listener = undefined;\n    this.#acceleratedCount = 0;\n    this.#pendingTransactions = undefined;\n\n    this.#stopTimeout();\n    this.#stopBlockTracker();\n\n    log('Stopped');\n  }\n\n  /**\n   * Notify the poller of the pending transactions being monitored.\n   * This will reset to the accelerated polling and reset the count\n   * when new transactions are added or removed.\n   *\n   * @param pendingTransactions - The pending transactions to poll.\n   */\n  setPendingTransactions(pendingTransactions: TransactionMeta[]) {\n    const currentPendingTransactionIds = (this.#pendingTransactions ?? []).map(\n      (tx) => tx.id,\n    );\n\n    this.#pendingTransactions = pendingTransactions;\n\n    const newPendingTransactionIds = pendingTransactions.map((tx) => tx.id);\n\n    const hasUpdatedIds = !isEqual(\n      currentPendingTransactionIds,\n      newPendingTransactionIds,\n    );\n\n    if (!this.#running || !hasUpdatedIds) {\n      return;\n    }\n\n    log('Detected new pending transactions', newPendingTransactionIds);\n\n    this.#acceleratedCount = 0;\n\n    if (this.#blockTrackerListener) {\n      this.#stopBlockTracker();\n      this.#queue();\n    }\n  }\n\n  #queue() {\n    if (!this.#running) {\n      return;\n    }\n\n    const { countMax, intervalMs } = getAcceleratedPollingParams(\n      this.#chainId,\n      this.#messenger,\n    );\n\n    if (this.#acceleratedCount >= countMax) {\n      // eslint-disable-next-line @typescript-eslint/no-misused-promises\n      this.#blockTrackerListener = (latestBlockNumber) =>\n        this.#interval(false, latestBlockNumber);\n\n      this.#blockTracker.on('latest', this.#blockTrackerListener);\n\n      log('Added block tracker listener');\n\n      return;\n    }\n\n    this.#stopTimeout();\n\n    // eslint-disable-next-line @typescript-eslint/no-misused-promises\n    this.#timeout = setTimeout(async () => {\n      await this.#interval(true);\n      this.#queue();\n    }, intervalMs);\n  }\n\n  async #interval(isAccelerated: boolean, latestBlockNumber?: string) {\n    if (isAccelerated) {\n      log('Accelerated interval', this.#acceleratedCount + 1);\n    } else {\n      log('Block tracker interval', latestBlockNumber);\n    }\n\n    const latestBlockNumberFinal =\n      latestBlockNumber ?? (await this.#blockTracker.getLatestBlock());\n\n    await this.#listener?.(latestBlockNumberFinal);\n\n    if (isAccelerated && this.#running) {\n      this.#acceleratedCount += 1;\n    }\n  }\n\n  #stopTimeout() {\n    if (!this.#timeout) {\n      return;\n    }\n\n    clearTimeout(this.#timeout);\n    this.#timeout = undefined;\n  }\n\n  #stopBlockTracker() {\n    if (!this.#blockTrackerListener) {\n      return;\n    }\n\n    this.#blockTracker.removeListener('latest', this.#blockTrackerListener);\n    this.#blockTrackerListener = undefined;\n  }\n}\n"]}

package/dist/utils/feature-flags.cjs

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultGasEstimateFallback = exports.getGasEstimateFallback = exports.getBatchSizeLimit = exports.getEIP7702UpgradeContractAddress = exports.getEIP7702ContractAddresses = exports.getEIP7702SupportedChains = exports.FEATURE_FLAG_EIP_7702 = exports.FEATURE_FLAG_TRANSACTIONS = void 0;
+exports.getAcceleratedPollingParams = exports.getBatchSizeLimit = exports.getEIP7702UpgradeContractAddress = exports.getEIP7702ContractAddresses = exports.getEIP7702SupportedChains = exports.FEATURE_FLAG_EIP_7702 = exports.FEATURE_FLAG_TRANSACTIONS = void 0;
 const utils_1 = require("@metamask/utils");
 const signature_1 = require("./signature.cjs");
 const logger_1 = require("../logger.cjs");
 exports.FEATURE_FLAG_TRANSACTIONS = 'confirmations_transactions';
 exports.FEATURE_FLAG_EIP_7702 = 'confirmations_eip_7702';
 const DEFAULT_BATCH_SIZE_LIMIT = 10;
-const DEFAULT_GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT = 35;
+const DEFAULT_ACCELERATED_POLLING_COUNT_MAX = 10;
+const DEFAULT_ACCELERATED_POLLING_INTERVAL_MS = 3 * 1000;
 const log = (0, utils_1.createModuleLogger)(logger_1.projectLogger, 'feature-flags');
 /**
  * Retrieves the supported EIP-7702 chains.
@@ -62,41 +63,24 @@ function getBatchSizeLimit(messenger) {
 }
 exports.getBatchSizeLimit = getBatchSizeLimit;
 /**
- * Retrieves the gas estimate fallback for a given chain ID.
- * Defaults to the default gas estimate fallback if not set.
+ * Retrieves the accelerated polling parameters for a given chain ID.
  *
  * @param chainId - The chain ID.
  * @param messenger - The controller messenger instance.
- * @returns The gas estimate fallback.
+ * @returns The accelerated polling parameters: `countMax` and `intervalMs`.
  */
-function getGasEstimateFallback(chainId, messenger) {
+function getAcceleratedPollingParams(chainId, messenger) {
     const featureFlags = getFeatureFlags(messenger);
-    const gasEstimateFallbackPerChain = featureFlags?.[exports.FEATURE_FLAG_TRANSACTIONS]?.gasEstimateFallbacks?.[chainId];
-    if (gasEstimateFallbackPerChain) {
-        return {
-            gasEstimateFallback: gasEstimateFallbackPerChain.value,
-            isFixedGas: gasEstimateFallbackPerChain.isFixedGas,
-        };
-    }
-    return getDefaultGasEstimateFallback(messenger);
+    const acceleratedPollingParams = featureFlags?.[exports.FEATURE_FLAG_TRANSACTIONS]?.acceleratedPolling;
+    const countMax = acceleratedPollingParams?.perChainConfig?.[chainId]?.countMax ||
+        acceleratedPollingParams?.defaultCountMax ||
+        DEFAULT_ACCELERATED_POLLING_COUNT_MAX;
+    const intervalMs = acceleratedPollingParams?.perChainConfig?.[chainId]?.intervalMs ||
+        acceleratedPollingParams?.defaultIntervalMs ||
+        DEFAULT_ACCELERATED_POLLING_INTERVAL_MS;
+    return { countMax, intervalMs };
 }
-exports.getGasEstimateFallback = getGasEstimateFallback;
-/**
- * Retrieves the default gas estimate fallback.
- *
- * @param messenger - The controller messenger instance.
- * @returns The default gas estimate fallback.
- */
-function getDefaultGasEstimateFallback(messenger) {
-    const featureFlags = getFeatureFlags(messenger);
-    const defaultGasEstimateFallback = featureFlags?.[exports.FEATURE_FLAG_TRANSACTIONS]?.defaultGasEstimateFallback;
-    return {
-        gasEstimateFallback: defaultGasEstimateFallback?.value ??
-            DEFAULT_GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT,
-        isFixedGas: defaultGasEstimateFallback?.isFixedGas ?? false,
-    };
-}
-exports.getDefaultGasEstimateFallback = getDefaultGasEstimateFallback;
+exports.getAcceleratedPollingParams = getAcceleratedPollingParams;
 /**
  * Retrieves the relevant feature flags from the remote feature flag controller.
  *

package/dist/utils/feature-flags.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"feature-flags.cjs","sourceRoot":"","sources":["../../src/utils/feature-flags.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAE/D,+CAA+C;AAC/C,0CAA0C;AAG7B,QAAA,yBAAyB,GAAG,4BAA4B,CAAC;AACzD,QAAA,qBAAqB,GAAG,wBAAwB,CAAC;AAE9D,MAAM,wBAAwB,GAAG,EAAE,CAAC;AACpC,MAAM,2CAA2C,GAAG,EAAE,CAAC;AAwDvD,MAAM,GAAG,GAAG,IAAA,0BAAkB,EAAC,sBAAa,EAAE,eAAe,CAAC,CAAC;AAE/D;;;;;GAKG;AACH,SAAgB,yBAAyB,CACvC,SAAyC;IAEzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAChD,OAAO,YAAY,EAAE,CAAC,6BAAqB,CAAC,EAAE,eAAe,IAAI,EAAE,CAAC;AACtE,CAAC;AALD,8DAKC;AAED;;;;;;;GAOG;AACH,SAAgB,2BAA2B,CACzC,OAAY,EACZ,SAAyC,EACzC,SAAc;IAEd,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAEhD,MAAM,SAAS,GACb,YAAY,EAAE,CAAC,6BAAqB,CAAC,EAAE,SAAS,EAAE,CAChD,OAAO,CAAC,WAAW,EAAS,CAC7B,IAAI,EAAE,CAAC;IAEV,OAAO,SAAS;SACb,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CACnB,IAAA,4BAAgB,EACd,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,EAC3B,QAAQ,CAAC,SAAS,EAClB,SAAS,CACV,CACF;SACA,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AArBD,kEAqBC;AAED;;;;;;;GAOG;AACH,SAAgB,gCAAgC,CAC9C,OAAY,EACZ,SAAyC,EACzC,SAAc;IAEd,OAAO,2BAA2B,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAND,4EAMC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAC/B,SAAyC;IAEzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAChD,OAAO,CACL,YAAY,EAAE,CAAC,iCAAyB,CAAC,EAAE,cAAc;QACzD,wBAAwB,CACzB,CAAC;AACJ,CAAC;AARD,8CAQC;AAED;;;;;;;GAOG;AACH,SAAgB,sBAAsB,CACpC,OAAY,EACZ,SAAyC;IAKzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAEhD,MAAM,2BAA2B,GAC/B,YAAY,EAAE,CAAC,iCAAyB,CAAC,EAAE,oBAAoB,EAAE,CAAC,OAAO,CAAC,CAAC;IAE7E,IAAI,2BAA2B,EAAE;QAC/B,OAAO;YACL,mBAAmB,EAAE,2BAA2B,CAAC,KAAK;YACtD,UAAU,EAAE,2BAA2B,CAAC,UAAU;SACnD,CAAC;KACH;IAED,OAAO,6BAA6B,CAAC,SAAS,CAAC,CAAC;AAClD,CAAC;AApBD,wDAoBC;AAED;;;;;GAKG;AACH,SAAgB,6BAA6B,CAC3C,SAAyC;IAKzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAEhD,MAAM,0BAA0B,GAC9B,YAAY,EAAE,CAAC,iCAAyB,CAAC,EAAE,0BAA0B,CAAC;IAExE,OAAO;QACL,mBAAmB,EACjB,0BAA0B,EAAE,KAAK;YACjC,2CAA2C;QAC7C,UAAU,EAAE,0BAA0B,EAAE,UAAU,IAAI,KAAK;KAC5D,CAAC;AACJ,CAAC;AAjBD,sEAiBC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CACtB,SAAyC;IAEzC,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CACjC,sCAAsC,CACvC,CAAC,kBAAkB,CAAC;IAErB,GAAG,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;IAE7C,OAAO,YAAiD,CAAC;AAC3D,CAAC","sourcesContent":["import { createModuleLogger, type Hex } from '@metamask/utils';\n\nimport { isValidSignature } from './signature';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\n\nexport const FEATURE_FLAG_TRANSACTIONS = 'confirmations_transactions';\nexport const FEATURE_FLAG_EIP_7702 = 'confirmations_eip_7702';\n\nconst DEFAULT_BATCH_SIZE_LIMIT = 10;\nconst DEFAULT_GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT = 35;\n\ntype GasEstimateFallback = {\n  /**\n   * The fallback gas estimate for a transaction.\n   * This value is either a fixed hexadecimal number or a percentage multiplier.\n   */\n  value: number | Hex;\n\n  /**\n   * Indicates whether the gas estimate is a fixed hexadecimal number or a percentage multiplier.\n   * - `true`: The gas estimate is a fixed hexadecimal number.\n   * - `false`: The gas estimate is a percentage multiplier.\n   */\n  isFixedGas: boolean;\n};\n\nexport type TransactionControllerFeatureFlags = {\n  [FEATURE_FLAG_EIP_7702]?: {\n    /**\n     * All contracts that support EIP-7702 batch transactions.\n     * Keyed by chain ID.\n     * First entry in each array is the contract that standard EOAs will be upgraded to.\n     */\n    contracts?: Record<\n      Hex,\n      {\n        /** Address of the smart contract. */\n        address: Hex;\n\n        /** Signature to verify the contract is authentic. */\n        signature: Hex;\n      }[]\n    >;\n\n    /** Chains enabled for EIP-7702 batch transactions. */\n    supportedChains?: Hex[];\n  };\n\n  [FEATURE_FLAG_TRANSACTIONS]?: {\n    /** Maximum number of transactions that can be in an external batch. */\n    batchSizeLimit?: number;\n\n    /** Fallback gas estimation configurations per chain. */\n    gasEstimateFallbacks?: {\n      [chainId: Hex]: GasEstimateFallback;\n    };\n\n    /**\n     * Default gas estimate fallback.\n     * This value is used when no specific gas estimate fallback is found for a chain ID.\n     */\n    defaultGasEstimateFallback?: GasEstimateFallback;\n  };\n};\n\nconst log = createModuleLogger(projectLogger, 'feature-flags');\n\n/**\n * Retrieves the supported EIP-7702 chains.\n *\n * @param messenger - The controller messenger instance.\n * @returns The supported chains.\n */\nexport function getEIP7702SupportedChains(\n  messenger: TransactionControllerMessenger,\n): Hex[] {\n  const featureFlags = getFeatureFlags(messenger);\n  return featureFlags?.[FEATURE_FLAG_EIP_7702]?.supportedChains ?? [];\n}\n\n/**\n * Retrieves the supported EIP-7702 contract addresses for a given chain ID.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @param publicKey - The public key used to validate the contract authenticity.\n * @returns The supported contract addresses.\n */\nexport function getEIP7702ContractAddresses(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  publicKey: Hex,\n): Hex[] {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const contracts =\n    featureFlags?.[FEATURE_FLAG_EIP_7702]?.contracts?.[\n      chainId.toLowerCase() as Hex\n    ] ?? [];\n\n  return contracts\n    .filter((contract) =>\n      isValidSignature(\n        [contract.address, chainId],\n        contract.signature,\n        publicKey,\n      ),\n    )\n    .map((contract) => contract.address);\n}\n\n/**\n * Retrieves the EIP-7702 upgrade contract address.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @param publicKey - The public key used to validate the contract authenticity.\n * @returns The upgrade contract address.\n */\nexport function getEIP7702UpgradeContractAddress(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  publicKey: Hex,\n): Hex | undefined {\n  return getEIP7702ContractAddresses(chainId, messenger, publicKey)?.[0];\n}\n\n/**\n * Retrieves the batch size limit.\n * Defaults to 10 if not set.\n *\n * @param messenger - The controller messenger instance.\n * @returns  The batch size limit.\n */\nexport function getBatchSizeLimit(\n  messenger: TransactionControllerMessenger,\n): number {\n  const featureFlags = getFeatureFlags(messenger);\n  return (\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.batchSizeLimit ??\n    DEFAULT_BATCH_SIZE_LIMIT\n  );\n}\n\n/**\n * Retrieves the gas estimate fallback for a given chain ID.\n * Defaults to the default gas estimate fallback if not set.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @returns The gas estimate fallback.\n */\nexport function getGasEstimateFallback(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n): {\n  gasEstimateFallback: number | Hex;\n  isFixedGas: boolean;\n} {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const gasEstimateFallbackPerChain =\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.gasEstimateFallbacks?.[chainId];\n\n  if (gasEstimateFallbackPerChain) {\n    return {\n      gasEstimateFallback: gasEstimateFallbackPerChain.value,\n      isFixedGas: gasEstimateFallbackPerChain.isFixedGas,\n    };\n  }\n\n  return getDefaultGasEstimateFallback(messenger);\n}\n\n/**\n * Retrieves the default gas estimate fallback.\n *\n * @param messenger - The controller messenger instance.\n * @returns The default gas estimate fallback.\n */\nexport function getDefaultGasEstimateFallback(\n  messenger: TransactionControllerMessenger,\n): {\n  gasEstimateFallback: number | Hex;\n  isFixedGas: boolean;\n} {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const defaultGasEstimateFallback =\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.defaultGasEstimateFallback;\n\n  return {\n    gasEstimateFallback:\n      defaultGasEstimateFallback?.value ??\n      DEFAULT_GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT,\n    isFixedGas: defaultGasEstimateFallback?.isFixedGas ?? false,\n  };\n}\n\n/**\n * Retrieves the relevant feature flags from the remote feature flag controller.\n *\n * @param messenger - The messenger instance.\n * @returns The feature flags.\n */\nfunction getFeatureFlags(\n  messenger: TransactionControllerMessenger,\n): TransactionControllerFeatureFlags {\n  const featureFlags = messenger.call(\n    'RemoteFeatureFlagController:getState',\n  ).remoteFeatureFlags;\n\n  log('Retrieved feature flags', featureFlags);\n\n  return featureFlags as TransactionControllerFeatureFlags;\n}\n"]}
+{"version":3,"file":"feature-flags.cjs","sourceRoot":"","sources":["../../src/utils/feature-flags.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAE/D,+CAA+C;AAC/C,0CAA0C;AAG7B,QAAA,yBAAyB,GAAG,4BAA4B,CAAC;AACzD,QAAA,qBAAqB,GAAG,wBAAwB,CAAC;AAE9D,MAAM,wBAAwB,GAAG,EAAE,CAAC;AACpC,MAAM,qCAAqC,GAAG,EAAE,CAAC;AACjD,MAAM,uCAAuC,GAAG,CAAC,GAAG,IAAI,CAAC;AAyDzD,MAAM,GAAG,GAAG,IAAA,0BAAkB,EAAC,sBAAa,EAAE,eAAe,CAAC,CAAC;AAE/D;;;;;GAKG;AACH,SAAgB,yBAAyB,CACvC,SAAyC;IAEzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAChD,OAAO,YAAY,EAAE,CAAC,6BAAqB,CAAC,EAAE,eAAe,IAAI,EAAE,CAAC;AACtE,CAAC;AALD,8DAKC;AAED;;;;;;;GAOG;AACH,SAAgB,2BAA2B,CACzC,OAAY,EACZ,SAAyC,EACzC,SAAc;IAEd,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAEhD,MAAM,SAAS,GACb,YAAY,EAAE,CAAC,6BAAqB,CAAC,EAAE,SAAS,EAAE,CAChD,OAAO,CAAC,WAAW,EAAS,CAC7B,IAAI,EAAE,CAAC;IAEV,OAAO,SAAS;SACb,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CACnB,IAAA,4BAAgB,EACd,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,EAC3B,QAAQ,CAAC,SAAS,EAClB,SAAS,CACV,CACF;SACA,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AArBD,kEAqBC;AAED;;;;;;;GAOG;AACH,SAAgB,gCAAgC,CAC9C,OAAY,EACZ,SAAyC,EACzC,SAAc;IAEd,OAAO,2BAA2B,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAND,4EAMC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAC/B,SAAyC;IAEzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAChD,OAAO,CACL,YAAY,EAAE,CAAC,iCAAyB,CAAC,EAAE,cAAc;QACzD,wBAAwB,CACzB,CAAC;AACJ,CAAC;AARD,8CAQC;AAED;;;;;;GAMG;AACH,SAAgB,2BAA2B,CACzC,OAAY,EACZ,SAAyC;IAEzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAEhD,MAAM,wBAAwB,GAC5B,YAAY,EAAE,CAAC,iCAAyB,CAAC,EAAE,kBAAkB,CAAC;IAEhE,MAAM,QAAQ,GACZ,wBAAwB,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,QAAQ;QAC7D,wBAAwB,EAAE,eAAe;QACzC,qCAAqC,CAAC;IAExC,MAAM,UAAU,GACd,wBAAwB,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,UAAU;QAC/D,wBAAwB,EAAE,iBAAiB;QAC3C,uCAAuC,CAAC;IAE1C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AAClC,CAAC;AApBD,kEAoBC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CACtB,SAAyC;IAEzC,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CACjC,sCAAsC,CACvC,CAAC,kBAAkB,CAAC;IAErB,GAAG,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;IAE7C,OAAO,YAAiD,CAAC;AAC3D,CAAC","sourcesContent":["import { createModuleLogger, type Hex } from '@metamask/utils';\n\nimport { isValidSignature } from './signature';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\n\nexport const FEATURE_FLAG_TRANSACTIONS = 'confirmations_transactions';\nexport const FEATURE_FLAG_EIP_7702 = 'confirmations_eip_7702';\n\nconst DEFAULT_BATCH_SIZE_LIMIT = 10;\nconst DEFAULT_ACCELERATED_POLLING_COUNT_MAX = 10;\nconst DEFAULT_ACCELERATED_POLLING_INTERVAL_MS = 3 * 1000;\n\nexport type TransactionControllerFeatureFlags = {\n  [FEATURE_FLAG_EIP_7702]?: {\n    /**\n     * All contracts that support EIP-7702 batch transactions.\n     * Keyed by chain ID.\n     * First entry in each array is the contract that standard EOAs will be upgraded to.\n     */\n    contracts?: Record<\n      Hex,\n      {\n        /** Address of the smart contract. */\n        address: Hex;\n\n        /** Signature to verify the contract is authentic. */\n        signature: Hex;\n      }[]\n    >;\n\n    /** Chains enabled for EIP-7702 batch transactions. */\n    supportedChains?: Hex[];\n  };\n\n  [FEATURE_FLAG_TRANSACTIONS]?: {\n    /** Maximum number of transactions that can be in an external batch. */\n    batchSizeLimit?: number;\n\n    acceleratedPolling?: {\n      /**\n       * Accelerated polling is used to speed up the polling process for\n       * transactions that are not yet confirmed.\n       */\n      perChainConfig?: {\n        /** Accelerated polling parameters on a per-chain basis. */\n\n        [chainId: Hex]: {\n          /**\n           * Maximum number of polling requests that can be made in a row, before\n           * the normal polling resumes.\n           */\n          countMax?: number;\n\n          /** Interval between polling requests in milliseconds. */\n          intervalMs?: number;\n        };\n      };\n\n      /** Default `countMax` in case no chain-specific parameter is set. */\n      defaultCountMax?: number;\n\n      /** Default `intervalMs` in case no chain-specific parameter is set. */\n      defaultIntervalMs?: number;\n    };\n  };\n};\n\nconst log = createModuleLogger(projectLogger, 'feature-flags');\n\n/**\n * Retrieves the supported EIP-7702 chains.\n *\n * @param messenger - The controller messenger instance.\n * @returns The supported chains.\n */\nexport function getEIP7702SupportedChains(\n  messenger: TransactionControllerMessenger,\n): Hex[] {\n  const featureFlags = getFeatureFlags(messenger);\n  return featureFlags?.[FEATURE_FLAG_EIP_7702]?.supportedChains ?? [];\n}\n\n/**\n * Retrieves the supported EIP-7702 contract addresses for a given chain ID.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @param publicKey - The public key used to validate the contract authenticity.\n * @returns The supported contract addresses.\n */\nexport function getEIP7702ContractAddresses(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  publicKey: Hex,\n): Hex[] {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const contracts =\n    featureFlags?.[FEATURE_FLAG_EIP_7702]?.contracts?.[\n      chainId.toLowerCase() as Hex\n    ] ?? [];\n\n  return contracts\n    .filter((contract) =>\n      isValidSignature(\n        [contract.address, chainId],\n        contract.signature,\n        publicKey,\n      ),\n    )\n    .map((contract) => contract.address);\n}\n\n/**\n * Retrieves the EIP-7702 upgrade contract address.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @param publicKey - The public key used to validate the contract authenticity.\n * @returns The upgrade contract address.\n */\nexport function getEIP7702UpgradeContractAddress(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  publicKey: Hex,\n): Hex | undefined {\n  return getEIP7702ContractAddresses(chainId, messenger, publicKey)?.[0];\n}\n\n/**\n * Retrieves the batch size limit.\n * Defaults to 10 if not set.\n *\n * @param messenger - The controller messenger instance.\n * @returns  The batch size limit.\n */\nexport function getBatchSizeLimit(\n  messenger: TransactionControllerMessenger,\n): number {\n  const featureFlags = getFeatureFlags(messenger);\n  return (\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.batchSizeLimit ??\n    DEFAULT_BATCH_SIZE_LIMIT\n  );\n}\n\n/**\n * Retrieves the accelerated polling parameters for a given chain ID.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @returns The accelerated polling parameters: `countMax` and `intervalMs`.\n */\nexport function getAcceleratedPollingParams(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n): { countMax: number; intervalMs: number } {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const acceleratedPollingParams =\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.acceleratedPolling;\n\n  const countMax =\n    acceleratedPollingParams?.perChainConfig?.[chainId]?.countMax ||\n    acceleratedPollingParams?.defaultCountMax ||\n    DEFAULT_ACCELERATED_POLLING_COUNT_MAX;\n\n  const intervalMs =\n    acceleratedPollingParams?.perChainConfig?.[chainId]?.intervalMs ||\n    acceleratedPollingParams?.defaultIntervalMs ||\n    DEFAULT_ACCELERATED_POLLING_INTERVAL_MS;\n\n  return { countMax, intervalMs };\n}\n\n/**\n * Retrieves the relevant feature flags from the remote feature flag controller.\n *\n * @param messenger - The messenger instance.\n * @returns The feature flags.\n */\nfunction getFeatureFlags(\n  messenger: TransactionControllerMessenger,\n): TransactionControllerFeatureFlags {\n  const featureFlags = messenger.call(\n    'RemoteFeatureFlagController:getState',\n  ).remoteFeatureFlags;\n\n  log('Retrieved feature flags', featureFlags);\n\n  return featureFlags as TransactionControllerFeatureFlags;\n}\n"]}

package/dist/utils/feature-flags.d.cts

@@ -2,19 +2,6 @@ import { type Hex } from "@metamask/utils";
 import type { TransactionControllerMessenger } from "../TransactionController.cjs";
 export declare const FEATURE_FLAG_TRANSACTIONS = "confirmations_transactions";
 export declare const FEATURE_FLAG_EIP_7702 = "confirmations_eip_7702";
-type GasEstimateFallback = {
-    /**
-     * The fallback gas estimate for a transaction.
-     * This value is either a fixed hexadecimal number or a percentage multiplier.
-     */
-    value: number | Hex;
-    /**
-     * Indicates whether the gas estimate is a fixed hexadecimal number or a percentage multiplier.
-     * - `true`: The gas estimate is a fixed hexadecimal number.
-     * - `false`: The gas estimate is a percentage multiplier.
-     */
-    isFixedGas: boolean;
-};
 export type TransactionControllerFeatureFlags = {
     [FEATURE_FLAG_EIP_7702]?: {
         /**
@@ -34,15 +21,28 @@ export type TransactionControllerFeatureFlags = {
     [FEATURE_FLAG_TRANSACTIONS]?: {
         /** Maximum number of transactions that can be in an external batch. */
         batchSizeLimit?: number;
-        /** Fallback gas estimation configurations per chain. */
-        gasEstimateFallbacks?: {
-            [chainId: Hex]: GasEstimateFallback;
+        acceleratedPolling?: {
+            /**
+             * Accelerated polling is used to speed up the polling process for
+             * transactions that are not yet confirmed.
+             */
+            perChainConfig?: {
+                /** Accelerated polling parameters on a per-chain basis. */
+                [chainId: Hex]: {
+                    /**
+                     * Maximum number of polling requests that can be made in a row, before
+                     * the normal polling resumes.
+                     */
+                    countMax?: number;
+                    /** Interval between polling requests in milliseconds. */
+                    intervalMs?: number;
+                };
+            };
+            /** Default `countMax` in case no chain-specific parameter is set. */
+            defaultCountMax?: number;
+            /** Default `intervalMs` in case no chain-specific parameter is set. */
+            defaultIntervalMs?: number;
         };
-        /**
-         * Default gas estimate fallback.
-         * This value is used when no specific gas estimate fallback is found for a chain ID.
-         */
-        defaultGasEstimateFallback?: GasEstimateFallback;
     };
 };
 /**
@@ -79,26 +79,14 @@ export declare function getEIP7702UpgradeContractAddress(chainId: Hex, messenger
  */
 export declare function getBatchSizeLimit(messenger: TransactionControllerMessenger): number;
 /**
- * Retrieves the gas estimate fallback for a given chain ID.
- * Defaults to the default gas estimate fallback if not set.
+ * Retrieves the accelerated polling parameters for a given chain ID.
  *
  * @param chainId - The chain ID.
  * @param messenger - The controller messenger instance.
- * @returns The gas estimate fallback.
- */
-export declare function getGasEstimateFallback(chainId: Hex, messenger: TransactionControllerMessenger): {
-    gasEstimateFallback: number | Hex;
-    isFixedGas: boolean;
-};
-/**
- * Retrieves the default gas estimate fallback.
- *
- * @param messenger - The controller messenger instance.
- * @returns The default gas estimate fallback.
+ * @returns The accelerated polling parameters: `countMax` and `intervalMs`.
  */
-export declare function getDefaultGasEstimateFallback(messenger: TransactionControllerMessenger): {
-    gasEstimateFallback: number | Hex;
-    isFixedGas: boolean;
+export declare function getAcceleratedPollingParams(chainId: Hex, messenger: TransactionControllerMessenger): {
+    countMax: number;
+    intervalMs: number;
 };
-export {};
 //# sourceMappingURL=feature-flags.d.cts.map

package/dist/utils/feature-flags.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-flags.d.cts","sourceRoot":"","sources":["../../src/utils/feature-flags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,GAAG,EAAE,wBAAwB;AAI/D,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAE/E,eAAO,MAAM,yBAAyB,+BAA+B,CAAC;AACtE,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAK9D,KAAK,mBAAmB,GAAG;IACzB;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC;IAEpB;;;;OAIG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,CAAC,qBAAqB,CAAC,CAAC,EAAE;QACxB;;;;WAIG;QACH,SAAS,CAAC,EAAE,MAAM,CAChB,GAAG,EACH;YACE,qCAAqC;YACrC,OAAO,EAAE,GAAG,CAAC;YAEb,qDAAqD;YACrD,SAAS,EAAE,GAAG,CAAC;SAChB,EAAE,CACJ,CAAC;QAEF,sDAAsD;QACtD,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;KACzB,CAAC;IAEF,CAAC,yBAAyB,CAAC,CAAC,EAAE;QAC5B,uEAAuE;QACvE,cAAc,CAAC,EAAE,MAAM,CAAC;QAExB,wDAAwD;QACxD,oBAAoB,CAAC,EAAE;YACrB,CAAC,OAAO,EAAE,GAAG,GAAG,mBAAmB,CAAC;SACrC,CAAC;QAEF;;;WAGG;QACH,0BAA0B,CAAC,EAAE,mBAAmB,CAAC;KAClD,CAAC;CACH,CAAC;AAIF;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,8BAA8B,GACxC,GAAG,EAAE,CAGP;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,SAAS,EAAE,GAAG,GACb,GAAG,EAAE,CAiBP;AAED;;;;;;;GAOG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,SAAS,EAAE,GAAG,GACb,GAAG,GAAG,SAAS,CAEjB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,8BAA8B,GACxC,MAAM,CAMR;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,GACxC;IACD,mBAAmB,EAAE,MAAM,GAAG,GAAG,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;CACrB,CAcA;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,8BAA8B,GACxC;IACD,mBAAmB,EAAE,MAAM,GAAG,GAAG,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;CACrB,CAYA"}
+{"version":3,"file":"feature-flags.d.cts","sourceRoot":"","sources":["../../src/utils/feature-flags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,GAAG,EAAE,wBAAwB;AAI/D,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAE/E,eAAO,MAAM,yBAAyB,+BAA+B,CAAC;AACtE,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAM9D,MAAM,MAAM,iCAAiC,GAAG;IAC9C,CAAC,qBAAqB,CAAC,CAAC,EAAE;QACxB;;;;WAIG;QACH,SAAS,CAAC,EAAE,MAAM,CAChB,GAAG,EACH;YACE,qCAAqC;YACrC,OAAO,EAAE,GAAG,CAAC;YAEb,qDAAqD;YACrD,SAAS,EAAE,GAAG,CAAC;SAChB,EAAE,CACJ,CAAC;QAEF,sDAAsD;QACtD,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;KACzB,CAAC;IAEF,CAAC,yBAAyB,CAAC,CAAC,EAAE;QAC5B,uEAAuE;QACvE,cAAc,CAAC,EAAE,MAAM,CAAC;QAExB,kBAAkB,CAAC,EAAE;YACnB;;;eAGG;YACH,cAAc,CAAC,EAAE;gBACf,2DAA2D;gBAE3D,CAAC,OAAO,EAAE,GAAG,GAAG;oBACd;;;uBAGG;oBACH,QAAQ,CAAC,EAAE,MAAM,CAAC;oBAElB,yDAAyD;oBACzD,UAAU,CAAC,EAAE,MAAM,CAAC;iBACrB,CAAC;aACH,CAAC;YAEF,qEAAqE;YACrE,eAAe,CAAC,EAAE,MAAM,CAAC;YAEzB,uEAAuE;YACvE,iBAAiB,CAAC,EAAE,MAAM,CAAC;SAC5B,CAAC;KACH,CAAC;CACH,CAAC;AAIF;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,8BAA8B,GACxC,GAAG,EAAE,CAGP;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,SAAS,EAAE,GAAG,GACb,GAAG,EAAE,CAiBP;AAED;;;;;;;GAOG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,SAAS,EAAE,GAAG,GACb,GAAG,GAAG,SAAS,CAEjB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,8BAA8B,GACxC,MAAM,CAMR;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,GACxC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAiB1C"}

package/dist/utils/feature-flags.d.mts

@@ -2,19 +2,6 @@ import { type Hex } from "@metamask/utils";
 import type { TransactionControllerMessenger } from "../TransactionController.mjs";
 export declare const FEATURE_FLAG_TRANSACTIONS = "confirmations_transactions";
 export declare const FEATURE_FLAG_EIP_7702 = "confirmations_eip_7702";
-type GasEstimateFallback = {
-    /**
-     * The fallback gas estimate for a transaction.
-     * This value is either a fixed hexadecimal number or a percentage multiplier.
-     */
-    value: number | Hex;
-    /**
-     * Indicates whether the gas estimate is a fixed hexadecimal number or a percentage multiplier.
-     * - `true`: The gas estimate is a fixed hexadecimal number.
-     * - `false`: The gas estimate is a percentage multiplier.
-     */
-    isFixedGas: boolean;
-};
 export type TransactionControllerFeatureFlags = {
     [FEATURE_FLAG_EIP_7702]?: {
         /**
@@ -34,15 +21,28 @@ export type TransactionControllerFeatureFlags = {
     [FEATURE_FLAG_TRANSACTIONS]?: {
         /** Maximum number of transactions that can be in an external batch. */
         batchSizeLimit?: number;
-        /** Fallback gas estimation configurations per chain. */
-        gasEstimateFallbacks?: {
-            [chainId: Hex]: GasEstimateFallback;
+        acceleratedPolling?: {
+            /**
+             * Accelerated polling is used to speed up the polling process for
+             * transactions that are not yet confirmed.
+             */
+            perChainConfig?: {
+                /** Accelerated polling parameters on a per-chain basis. */
+                [chainId: Hex]: {
+                    /**
+                     * Maximum number of polling requests that can be made in a row, before
+                     * the normal polling resumes.
+                     */
+                    countMax?: number;
+                    /** Interval between polling requests in milliseconds. */
+                    intervalMs?: number;
+                };
+            };
+            /** Default `countMax` in case no chain-specific parameter is set. */
+            defaultCountMax?: number;
+            /** Default `intervalMs` in case no chain-specific parameter is set. */
+            defaultIntervalMs?: number;
         };
-        /**
-         * Default gas estimate fallback.
-         * This value is used when no specific gas estimate fallback is found for a chain ID.
-         */
-        defaultGasEstimateFallback?: GasEstimateFallback;
     };
 };
 /**
@@ -79,26 +79,14 @@ export declare function getEIP7702UpgradeContractAddress(chainId: Hex, messenger
  */
 export declare function getBatchSizeLimit(messenger: TransactionControllerMessenger): number;
 /**
- * Retrieves the gas estimate fallback for a given chain ID.
- * Defaults to the default gas estimate fallback if not set.
+ * Retrieves the accelerated polling parameters for a given chain ID.
  *
  * @param chainId - The chain ID.
  * @param messenger - The controller messenger instance.
- * @returns The gas estimate fallback.
- */
-export declare function getGasEstimateFallback(chainId: Hex, messenger: TransactionControllerMessenger): {
-    gasEstimateFallback: number | Hex;
-    isFixedGas: boolean;
-};
-/**
- * Retrieves the default gas estimate fallback.
- *
- * @param messenger - The controller messenger instance.
- * @returns The default gas estimate fallback.
+ * @returns The accelerated polling parameters: `countMax` and `intervalMs`.
  */
-export declare function getDefaultGasEstimateFallback(messenger: TransactionControllerMessenger): {
-    gasEstimateFallback: number | Hex;
-    isFixedGas: boolean;
+export declare function getAcceleratedPollingParams(chainId: Hex, messenger: TransactionControllerMessenger): {
+    countMax: number;
+    intervalMs: number;
 };
-export {};
 //# sourceMappingURL=feature-flags.d.mts.map

package/dist/utils/feature-flags.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-flags.d.mts","sourceRoot":"","sources":["../../src/utils/feature-flags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,GAAG,EAAE,wBAAwB;AAI/D,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAE/E,eAAO,MAAM,yBAAyB,+BAA+B,CAAC;AACtE,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAK9D,KAAK,mBAAmB,GAAG;IACzB;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC;IAEpB;;;;OAIG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,CAAC,qBAAqB,CAAC,CAAC,EAAE;QACxB;;;;WAIG;QACH,SAAS,CAAC,EAAE,MAAM,CAChB,GAAG,EACH;YACE,qCAAqC;YACrC,OAAO,EAAE,GAAG,CAAC;YAEb,qDAAqD;YACrD,SAAS,EAAE,GAAG,CAAC;SAChB,EAAE,CACJ,CAAC;QAEF,sDAAsD;QACtD,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;KACzB,CAAC;IAEF,CAAC,yBAAyB,CAAC,CAAC,EAAE;QAC5B,uEAAuE;QACvE,cAAc,CAAC,EAAE,MAAM,CAAC;QAExB,wDAAwD;QACxD,oBAAoB,CAAC,EAAE;YACrB,CAAC,OAAO,EAAE,GAAG,GAAG,mBAAmB,CAAC;SACrC,CAAC;QAEF;;;WAGG;QACH,0BAA0B,CAAC,EAAE,mBAAmB,CAAC;KAClD,CAAC;CACH,CAAC;AAIF;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,8BAA8B,GACxC,GAAG,EAAE,CAGP;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,SAAS,EAAE,GAAG,GACb,GAAG,EAAE,CAiBP;AAED;;;;;;;GAOG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,SAAS,EAAE,GAAG,GACb,GAAG,GAAG,SAAS,CAEjB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,8BAA8B,GACxC,MAAM,CAMR;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,GACxC;IACD,mBAAmB,EAAE,MAAM,GAAG,GAAG,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;CACrB,CAcA;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,8BAA8B,GACxC;IACD,mBAAmB,EAAE,MAAM,GAAG,GAAG,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;CACrB,CAYA"}
+{"version":3,"file":"feature-flags.d.mts","sourceRoot":"","sources":["../../src/utils/feature-flags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,GAAG,EAAE,wBAAwB;AAI/D,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAE/E,eAAO,MAAM,yBAAyB,+BAA+B,CAAC;AACtE,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAM9D,MAAM,MAAM,iCAAiC,GAAG;IAC9C,CAAC,qBAAqB,CAAC,CAAC,EAAE;QACxB;;;;WAIG;QACH,SAAS,CAAC,EAAE,MAAM,CAChB,GAAG,EACH;YACE,qCAAqC;YACrC,OAAO,EAAE,GAAG,CAAC;YAEb,qDAAqD;YACrD,SAAS,EAAE,GAAG,CAAC;SAChB,EAAE,CACJ,CAAC;QAEF,sDAAsD;QACtD,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;KACzB,CAAC;IAEF,CAAC,yBAAyB,CAAC,CAAC,EAAE;QAC5B,uEAAuE;QACvE,cAAc,CAAC,EAAE,MAAM,CAAC;QAExB,kBAAkB,CAAC,EAAE;YACnB;;;eAGG;YACH,cAAc,CAAC,EAAE;gBACf,2DAA2D;gBAE3D,CAAC,OAAO,EAAE,GAAG,GAAG;oBACd;;;uBAGG;oBACH,QAAQ,CAAC,EAAE,MAAM,CAAC;oBAElB,yDAAyD;oBACzD,UAAU,CAAC,EAAE,MAAM,CAAC;iBACrB,CAAC;aACH,CAAC;YAEF,qEAAqE;YACrE,eAAe,CAAC,EAAE,MAAM,CAAC;YAEzB,uEAAuE;YACvE,iBAAiB,CAAC,EAAE,MAAM,CAAC;SAC5B,CAAC;KACH,CAAC;CACH,CAAC;AAIF;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,8BAA8B,GACxC,GAAG,EAAE,CAGP;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,SAAS,EAAE,GAAG,GACb,GAAG,EAAE,CAiBP;AAED;;;;;;;GAOG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,SAAS,EAAE,GAAG,GACb,GAAG,GAAG,SAAS,CAEjB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,8BAA8B,GACxC,MAAM,CAMR;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,GACxC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAiB1C"}

package/dist/utils/feature-flags.mjs

@@ -4,7 +4,8 @@ import { projectLogger } from "../logger.mjs";
 export const FEATURE_FLAG_TRANSACTIONS = 'confirmations_transactions';
 export const FEATURE_FLAG_EIP_7702 = 'confirmations_eip_7702';
 const DEFAULT_BATCH_SIZE_LIMIT = 10;
-const DEFAULT_GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT = 35;
+const DEFAULT_ACCELERATED_POLLING_COUNT_MAX = 10;
+const DEFAULT_ACCELERATED_POLLING_INTERVAL_MS = 3 * 1000;
 const log = createModuleLogger(projectLogger, 'feature-flags');
 /**
  * Retrieves the supported EIP-7702 chains.
@@ -55,38 +56,22 @@ export function getBatchSizeLimit(messenger) {
         DEFAULT_BATCH_SIZE_LIMIT);
 }
 /**
- * Retrieves the gas estimate fallback for a given chain ID.
- * Defaults to the default gas estimate fallback if not set.
+ * Retrieves the accelerated polling parameters for a given chain ID.
  *
  * @param chainId - The chain ID.
  * @param messenger - The controller messenger instance.
- * @returns The gas estimate fallback.
+ * @returns The accelerated polling parameters: `countMax` and `intervalMs`.
  */
-export function getGasEstimateFallback(chainId, messenger) {
+export function getAcceleratedPollingParams(chainId, messenger) {
     const featureFlags = getFeatureFlags(messenger);
-    const gasEstimateFallbackPerChain = featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.gasEstimateFallbacks?.[chainId];
-    if (gasEstimateFallbackPerChain) {
-        return {
-            gasEstimateFallback: gasEstimateFallbackPerChain.value,
-            isFixedGas: gasEstimateFallbackPerChain.isFixedGas,
-        };
-    }
-    return getDefaultGasEstimateFallback(messenger);
-}
-/**
- * Retrieves the default gas estimate fallback.
- *
- * @param messenger - The controller messenger instance.
- * @returns The default gas estimate fallback.
- */
-export function getDefaultGasEstimateFallback(messenger) {
-    const featureFlags = getFeatureFlags(messenger);
-    const defaultGasEstimateFallback = featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.defaultGasEstimateFallback;
-    return {
-        gasEstimateFallback: defaultGasEstimateFallback?.value ??
-            DEFAULT_GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT,
-        isFixedGas: defaultGasEstimateFallback?.isFixedGas ?? false,
-    };
+    const acceleratedPollingParams = featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.acceleratedPolling;
+    const countMax = acceleratedPollingParams?.perChainConfig?.[chainId]?.countMax ||
+        acceleratedPollingParams?.defaultCountMax ||
+        DEFAULT_ACCELERATED_POLLING_COUNT_MAX;
+    const intervalMs = acceleratedPollingParams?.perChainConfig?.[chainId]?.intervalMs ||
+        acceleratedPollingParams?.defaultIntervalMs ||
+        DEFAULT_ACCELERATED_POLLING_INTERVAL_MS;
+    return { countMax, intervalMs };
 }
 /**
  * Retrieves the relevant feature flags from the remote feature flag controller.

package/dist/utils/feature-flags.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"feature-flags.mjs","sourceRoot":"","sources":["../../src/utils/feature-flags.ts"],"names":[],"mappings":"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","sourcesContent":["import { createModuleLogger, type Hex } from '@metamask/utils';\n\nimport { isValidSignature } from './signature';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\n\nexport const FEATURE_FLAG_TRANSACTIONS = 'confirmations_transactions';\nexport const FEATURE_FLAG_EIP_7702 = 'confirmations_eip_7702';\n\nconst DEFAULT_BATCH_SIZE_LIMIT = 10;\nconst DEFAULT_GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT = 35;\n\ntype GasEstimateFallback = {\n  /**\n   * The fallback gas estimate for a transaction.\n   * This value is either a fixed hexadecimal number or a percentage multiplier.\n   */\n  value: number | Hex;\n\n  /**\n   * Indicates whether the gas estimate is a fixed hexadecimal number or a percentage multiplier.\n   * - `true`: The gas estimate is a fixed hexadecimal number.\n   * - `false`: The gas estimate is a percentage multiplier.\n   */\n  isFixedGas: boolean;\n};\n\nexport type TransactionControllerFeatureFlags = {\n  [FEATURE_FLAG_EIP_7702]?: {\n    /**\n     * All contracts that support EIP-7702 batch transactions.\n     * Keyed by chain ID.\n     * First entry in each array is the contract that standard EOAs will be upgraded to.\n     */\n    contracts?: Record<\n      Hex,\n      {\n        /** Address of the smart contract. */\n        address: Hex;\n\n        /** Signature to verify the contract is authentic. */\n        signature: Hex;\n      }[]\n    >;\n\n    /** Chains enabled for EIP-7702 batch transactions. */\n    supportedChains?: Hex[];\n  };\n\n  [FEATURE_FLAG_TRANSACTIONS]?: {\n    /** Maximum number of transactions that can be in an external batch. */\n    batchSizeLimit?: number;\n\n    /** Fallback gas estimation configurations per chain. */\n    gasEstimateFallbacks?: {\n      [chainId: Hex]: GasEstimateFallback;\n    };\n\n    /**\n     * Default gas estimate fallback.\n     * This value is used when no specific gas estimate fallback is found for a chain ID.\n     */\n    defaultGasEstimateFallback?: GasEstimateFallback;\n  };\n};\n\nconst log = createModuleLogger(projectLogger, 'feature-flags');\n\n/**\n * Retrieves the supported EIP-7702 chains.\n *\n * @param messenger - The controller messenger instance.\n * @returns The supported chains.\n */\nexport function getEIP7702SupportedChains(\n  messenger: TransactionControllerMessenger,\n): Hex[] {\n  const featureFlags = getFeatureFlags(messenger);\n  return featureFlags?.[FEATURE_FLAG_EIP_7702]?.supportedChains ?? [];\n}\n\n/**\n * Retrieves the supported EIP-7702 contract addresses for a given chain ID.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @param publicKey - The public key used to validate the contract authenticity.\n * @returns The supported contract addresses.\n */\nexport function getEIP7702ContractAddresses(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  publicKey: Hex,\n): Hex[] {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const contracts =\n    featureFlags?.[FEATURE_FLAG_EIP_7702]?.contracts?.[\n      chainId.toLowerCase() as Hex\n    ] ?? [];\n\n  return contracts\n    .filter((contract) =>\n      isValidSignature(\n        [contract.address, chainId],\n        contract.signature,\n        publicKey,\n      ),\n    )\n    .map((contract) => contract.address);\n}\n\n/**\n * Retrieves the EIP-7702 upgrade contract address.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @param publicKey - The public key used to validate the contract authenticity.\n * @returns The upgrade contract address.\n */\nexport function getEIP7702UpgradeContractAddress(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  publicKey: Hex,\n): Hex | undefined {\n  return getEIP7702ContractAddresses(chainId, messenger, publicKey)?.[0];\n}\n\n/**\n * Retrieves the batch size limit.\n * Defaults to 10 if not set.\n *\n * @param messenger - The controller messenger instance.\n * @returns  The batch size limit.\n */\nexport function getBatchSizeLimit(\n  messenger: TransactionControllerMessenger,\n): number {\n  const featureFlags = getFeatureFlags(messenger);\n  return (\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.batchSizeLimit ??\n    DEFAULT_BATCH_SIZE_LIMIT\n  );\n}\n\n/**\n * Retrieves the gas estimate fallback for a given chain ID.\n * Defaults to the default gas estimate fallback if not set.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @returns The gas estimate fallback.\n */\nexport function getGasEstimateFallback(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n): {\n  gasEstimateFallback: number | Hex;\n  isFixedGas: boolean;\n} {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const gasEstimateFallbackPerChain =\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.gasEstimateFallbacks?.[chainId];\n\n  if (gasEstimateFallbackPerChain) {\n    return {\n      gasEstimateFallback: gasEstimateFallbackPerChain.value,\n      isFixedGas: gasEstimateFallbackPerChain.isFixedGas,\n    };\n  }\n\n  return getDefaultGasEstimateFallback(messenger);\n}\n\n/**\n * Retrieves the default gas estimate fallback.\n *\n * @param messenger - The controller messenger instance.\n * @returns The default gas estimate fallback.\n */\nexport function getDefaultGasEstimateFallback(\n  messenger: TransactionControllerMessenger,\n): {\n  gasEstimateFallback: number | Hex;\n  isFixedGas: boolean;\n} {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const defaultGasEstimateFallback =\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.defaultGasEstimateFallback;\n\n  return {\n    gasEstimateFallback:\n      defaultGasEstimateFallback?.value ??\n      DEFAULT_GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT,\n    isFixedGas: defaultGasEstimateFallback?.isFixedGas ?? false,\n  };\n}\n\n/**\n * Retrieves the relevant feature flags from the remote feature flag controller.\n *\n * @param messenger - The messenger instance.\n * @returns The feature flags.\n */\nfunction getFeatureFlags(\n  messenger: TransactionControllerMessenger,\n): TransactionControllerFeatureFlags {\n  const featureFlags = messenger.call(\n    'RemoteFeatureFlagController:getState',\n  ).remoteFeatureFlags;\n\n  log('Retrieved feature flags', featureFlags);\n\n  return featureFlags as TransactionControllerFeatureFlags;\n}\n"]}
+{"version":3,"file":"feature-flags.mjs","sourceRoot":"","sources":["../../src/utils/feature-flags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAY,wBAAwB;AAE/D,OAAO,EAAE,gBAAgB,EAAE,wBAAoB;AAC/C,OAAO,EAAE,aAAa,EAAE,sBAAkB;AAG1C,MAAM,CAAC,MAAM,yBAAyB,GAAG,4BAA4B,CAAC;AACtE,MAAM,CAAC,MAAM,qBAAqB,GAAG,wBAAwB,CAAC;AAE9D,MAAM,wBAAwB,GAAG,EAAE,CAAC;AACpC,MAAM,qCAAqC,GAAG,EAAE,CAAC;AACjD,MAAM,uCAAuC,GAAG,CAAC,GAAG,IAAI,CAAC;AAyDzD,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;AAE/D;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,SAAyC;IAEzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAChD,OAAO,YAAY,EAAE,CAAC,qBAAqB,CAAC,EAAE,eAAe,IAAI,EAAE,CAAC;AACtE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,2BAA2B,CACzC,OAAY,EACZ,SAAyC,EACzC,SAAc;IAEd,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAEhD,MAAM,SAAS,GACb,YAAY,EAAE,CAAC,qBAAqB,CAAC,EAAE,SAAS,EAAE,CAChD,OAAO,CAAC,WAAW,EAAS,CAC7B,IAAI,EAAE,CAAC;IAEV,OAAO,SAAS;SACb,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CACnB,gBAAgB,CACd,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,EAC3B,QAAQ,CAAC,SAAS,EAClB,SAAS,CACV,CACF;SACA,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gCAAgC,CAC9C,OAAY,EACZ,SAAyC,EACzC,SAAc;IAEd,OAAO,2BAA2B,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,SAAyC;IAEzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAChD,OAAO,CACL,YAAY,EAAE,CAAC,yBAAyB,CAAC,EAAE,cAAc;QACzD,wBAAwB,CACzB,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,2BAA2B,CACzC,OAAY,EACZ,SAAyC;IAEzC,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAEhD,MAAM,wBAAwB,GAC5B,YAAY,EAAE,CAAC,yBAAyB,CAAC,EAAE,kBAAkB,CAAC;IAEhE,MAAM,QAAQ,GACZ,wBAAwB,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,QAAQ;QAC7D,wBAAwB,EAAE,eAAe;QACzC,qCAAqC,CAAC;IAExC,MAAM,UAAU,GACd,wBAAwB,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,UAAU;QAC/D,wBAAwB,EAAE,iBAAiB;QAC3C,uCAAuC,CAAC;IAE1C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AAClC,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CACtB,SAAyC;IAEzC,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CACjC,sCAAsC,CACvC,CAAC,kBAAkB,CAAC;IAErB,GAAG,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;IAE7C,OAAO,YAAiD,CAAC;AAC3D,CAAC","sourcesContent":["import { createModuleLogger, type Hex } from '@metamask/utils';\n\nimport { isValidSignature } from './signature';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\n\nexport const FEATURE_FLAG_TRANSACTIONS = 'confirmations_transactions';\nexport const FEATURE_FLAG_EIP_7702 = 'confirmations_eip_7702';\n\nconst DEFAULT_BATCH_SIZE_LIMIT = 10;\nconst DEFAULT_ACCELERATED_POLLING_COUNT_MAX = 10;\nconst DEFAULT_ACCELERATED_POLLING_INTERVAL_MS = 3 * 1000;\n\nexport type TransactionControllerFeatureFlags = {\n  [FEATURE_FLAG_EIP_7702]?: {\n    /**\n     * All contracts that support EIP-7702 batch transactions.\n     * Keyed by chain ID.\n     * First entry in each array is the contract that standard EOAs will be upgraded to.\n     */\n    contracts?: Record<\n      Hex,\n      {\n        /** Address of the smart contract. */\n        address: Hex;\n\n        /** Signature to verify the contract is authentic. */\n        signature: Hex;\n      }[]\n    >;\n\n    /** Chains enabled for EIP-7702 batch transactions. */\n    supportedChains?: Hex[];\n  };\n\n  [FEATURE_FLAG_TRANSACTIONS]?: {\n    /** Maximum number of transactions that can be in an external batch. */\n    batchSizeLimit?: number;\n\n    acceleratedPolling?: {\n      /**\n       * Accelerated polling is used to speed up the polling process for\n       * transactions that are not yet confirmed.\n       */\n      perChainConfig?: {\n        /** Accelerated polling parameters on a per-chain basis. */\n\n        [chainId: Hex]: {\n          /**\n           * Maximum number of polling requests that can be made in a row, before\n           * the normal polling resumes.\n           */\n          countMax?: number;\n\n          /** Interval between polling requests in milliseconds. */\n          intervalMs?: number;\n        };\n      };\n\n      /** Default `countMax` in case no chain-specific parameter is set. */\n      defaultCountMax?: number;\n\n      /** Default `intervalMs` in case no chain-specific parameter is set. */\n      defaultIntervalMs?: number;\n    };\n  };\n};\n\nconst log = createModuleLogger(projectLogger, 'feature-flags');\n\n/**\n * Retrieves the supported EIP-7702 chains.\n *\n * @param messenger - The controller messenger instance.\n * @returns The supported chains.\n */\nexport function getEIP7702SupportedChains(\n  messenger: TransactionControllerMessenger,\n): Hex[] {\n  const featureFlags = getFeatureFlags(messenger);\n  return featureFlags?.[FEATURE_FLAG_EIP_7702]?.supportedChains ?? [];\n}\n\n/**\n * Retrieves the supported EIP-7702 contract addresses for a given chain ID.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @param publicKey - The public key used to validate the contract authenticity.\n * @returns The supported contract addresses.\n */\nexport function getEIP7702ContractAddresses(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  publicKey: Hex,\n): Hex[] {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const contracts =\n    featureFlags?.[FEATURE_FLAG_EIP_7702]?.contracts?.[\n      chainId.toLowerCase() as Hex\n    ] ?? [];\n\n  return contracts\n    .filter((contract) =>\n      isValidSignature(\n        [contract.address, chainId],\n        contract.signature,\n        publicKey,\n      ),\n    )\n    .map((contract) => contract.address);\n}\n\n/**\n * Retrieves the EIP-7702 upgrade contract address.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @param publicKey - The public key used to validate the contract authenticity.\n * @returns The upgrade contract address.\n */\nexport function getEIP7702UpgradeContractAddress(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  publicKey: Hex,\n): Hex | undefined {\n  return getEIP7702ContractAddresses(chainId, messenger, publicKey)?.[0];\n}\n\n/**\n * Retrieves the batch size limit.\n * Defaults to 10 if not set.\n *\n * @param messenger - The controller messenger instance.\n * @returns  The batch size limit.\n */\nexport function getBatchSizeLimit(\n  messenger: TransactionControllerMessenger,\n): number {\n  const featureFlags = getFeatureFlags(messenger);\n  return (\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.batchSizeLimit ??\n    DEFAULT_BATCH_SIZE_LIMIT\n  );\n}\n\n/**\n * Retrieves the accelerated polling parameters for a given chain ID.\n *\n * @param chainId - The chain ID.\n * @param messenger - The controller messenger instance.\n * @returns The accelerated polling parameters: `countMax` and `intervalMs`.\n */\nexport function getAcceleratedPollingParams(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n): { countMax: number; intervalMs: number } {\n  const featureFlags = getFeatureFlags(messenger);\n\n  const acceleratedPollingParams =\n    featureFlags?.[FEATURE_FLAG_TRANSACTIONS]?.acceleratedPolling;\n\n  const countMax =\n    acceleratedPollingParams?.perChainConfig?.[chainId]?.countMax ||\n    acceleratedPollingParams?.defaultCountMax ||\n    DEFAULT_ACCELERATED_POLLING_COUNT_MAX;\n\n  const intervalMs =\n    acceleratedPollingParams?.perChainConfig?.[chainId]?.intervalMs ||\n    acceleratedPollingParams?.defaultIntervalMs ||\n    DEFAULT_ACCELERATED_POLLING_INTERVAL_MS;\n\n  return { countMax, intervalMs };\n}\n\n/**\n * Retrieves the relevant feature flags from the remote feature flag controller.\n *\n * @param messenger - The messenger instance.\n * @returns The feature flags.\n */\nfunction getFeatureFlags(\n  messenger: TransactionControllerMessenger,\n): TransactionControllerFeatureFlags {\n  const featureFlags = messenger.call(\n    'RemoteFeatureFlagController:getState',\n  ).remoteFeatureFlags;\n\n  log('Retrieved feature flags', featureFlags);\n\n  return featureFlags as TransactionControllerFeatureFlags;\n}\n"]}

package/dist/utils/gas.cjs

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addGasBuffer = exports.estimateGas = exports.updateGas = exports.DUMMY_AUTHORIZATION_SIGNATURE = exports.INTRINSIC_GAS = exports.MAX_GAS_BLOCK_PERCENT = exports.DEFAULT_GAS_MULTIPLIER = exports.FIXED_GAS = exports.log = void 0;
+exports.addGasBuffer = exports.estimateGas = exports.updateGas = exports.DUMMY_AUTHORIZATION_SIGNATURE = exports.INTRINSIC_GAS = exports.MAX_GAS_BLOCK_PERCENT = exports.GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT = exports.DEFAULT_GAS_MULTIPLIER = exports.FIXED_GAS = exports.log = void 0;
 const controller_utils_1 = require("@metamask/controller-utils");
 const utils_1 = require("@metamask/utils");
 const eip7702_1 = require("./eip7702.cjs");
-const feature_flags_1 = require("./feature-flags.cjs");
 const simulation_api_1 = require("./simulation-api.cjs");
 const constants_1 = require("../constants.cjs");
 const logger_1 = require("../logger.cjs");
@@ -12,6 +11,7 @@ const types_1 = require("../types.cjs");
 exports.log = (0, utils_1.createModuleLogger)(logger_1.projectLogger, 'gas');
 exports.FIXED_GAS = '0x5208';
 exports.DEFAULT_GAS_MULTIPLIER = 1.5;
+exports.GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT = 35;
 exports.MAX_GAS_BLOCK_PERCENT = 90;
 exports.INTRINSIC_GAS = 21000;
 exports.DUMMY_AUTHORIZATION_SIGNATURE = '0x1111111111111111111111111111111111111111111111111111111111111111';
@@ -44,19 +44,15 @@ exports.updateGas = updateGas;
  * @param options.chainId - The chain ID of the transaction.
  * @param options.ethQuery - The EthQuery instance to interact with the network.
  * @param options.isSimulationEnabled - Whether the simulation is enabled.
- * @param options.messenger - The messenger instance for communication.
  * @param options.txParams - The transaction parameters.
  * @returns The estimated gas and related info.
  */
-async function estimateGas({ chainId, ethQuery, isSimulationEnabled, messenger, txParams, }) {
+async function estimateGas({ chainId, ethQuery, isSimulationEnabled, txParams, }) {
     const request = { ...txParams };
     const { authorizationList, data, from, value, to } = request;
     const { gasLimit: blockGasLimit, number: blockNumber } = await getLatestBlock(ethQuery);
     const blockGasLimitBN = (0, controller_utils_1.hexToBN)(blockGasLimit);
-    const { gasEstimateFallback, isFixedGas } = (0, feature_flags_1.getGasEstimateFallback)(chainId, messenger);
-    const fallback = isFixedGas
-        ? gasEstimateFallback
-        : (0, controller_utils_1.BNToHex)((0, controller_utils_1.fractionBN)(blockGasLimitBN, gasEstimateFallback, 100));
+    const fallback = (0, controller_utils_1.BNToHex)((0, controller_utils_1.fractionBN)(blockGasLimitBN, exports.GAS_ESTIMATE_FALLBACK_BLOCK_PERCENT, 100));
     request.data = data ? (0, utils_1.add0x)(data) : data;
     request.value = value || '0x0';
     request.authorizationList = normalizeAuthorizationList(request.authorizationList, chainId);
@@ -146,7 +142,6 @@ async function getGas(request) {
         chainId: request.chainId,
         ethQuery: request.ethQuery,
         isSimulationEnabled,
-        messenger: request.messenger,
         txParams: txMeta.txParams,
     });
     if (isCustomNetwork || simulationFails) {