@metamask-previews/transaction-controller 35.1.1-preview-63249efd → 35.1.1-preview-e8f9512d

package/dist/chunk-UHSRHP55.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utils/utils.ts"],"sourcesContent":["import {\n  add0x,\n  getKnownPropertyNames,\n  isStrictHexString,\n} from '@metamask/utils';\nimport type { Json } from '@metamask/utils';\n\nimport { TransactionStatus } from '../types';\nimport type {\n  TransactionParams,\n  TransactionMeta,\n  TransactionError,\n  GasPriceValue,\n  FeeMarketEIP1559Values,\n} from '../types';\n\nexport const ESTIMATE_GAS_ERROR = 'eth_estimateGas rpc method error';\n\n// TODO: Replace `any` with type\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst NORMALIZERS: { [param in keyof TransactionParams]: any } = {\n  data: (data: string) => add0x(padHexToEvenLength(data)),\n  from: (from: string) => add0x(from).toLowerCase(),\n  gas: (gas: string) => add0x(gas),\n  gasLimit: (gas: string) => add0x(gas),\n  gasPrice: (gasPrice: string) => add0x(gasPrice),\n  nonce: (nonce: string) => add0x(nonce),\n  to: (to: string) => add0x(to).toLowerCase(),\n  value: (value: string) => add0x(value),\n  maxFeePerGas: (maxFeePerGas: string) => add0x(maxFeePerGas),\n  maxPriorityFeePerGas: (maxPriorityFeePerGas: string) =>\n    add0x(maxPriorityFeePerGas),\n  estimatedBaseFee: (maxPriorityFeePerGas: string) =>\n    add0x(maxPriorityFeePerGas),\n  type: (type: string) => add0x(type),\n};\n\n/**\n * Normalizes properties on transaction params.\n *\n * @param txParams - The transaction params to normalize.\n * @returns Normalized transaction params.\n */\nexport function normalizeTransactionParams(txParams: TransactionParams) {\n  const normalizedTxParams: TransactionParams = { from: '' };\n\n  for (const key of getKnownPropertyNames(NORMALIZERS)) {\n    if (txParams[key]) {\n      normalizedTxParams[key] = NORMALIZERS[key](txParams[key]);\n    }\n  }\n\n  if (!normalizedTxParams.value) {\n    normalizedTxParams.value = '0x0';\n  }\n\n  return normalizedTxParams;\n}\n\n/**\n * Checks if a transaction is EIP-1559 by checking for the existence of\n * maxFeePerGas and maxPriorityFeePerGas within its parameters.\n *\n * @param txParams - Transaction params object to add.\n * @returns Boolean that is true if the transaction is EIP-1559 (has maxFeePerGas and maxPriorityFeePerGas), otherwise returns false.\n */\nexport function isEIP1559Transaction(txParams: TransactionParams): boolean {\n  const hasOwnProp = (obj: TransactionParams, key: string) =>\n    Object.prototype.hasOwnProperty.call(obj, key);\n  return (\n    hasOwnProp(txParams, 'maxFeePerGas') &&\n    hasOwnProp(txParams, 'maxPriorityFeePerGas')\n  );\n}\n\nexport const validateGasValues = (\n  gasValues: GasPriceValue | FeeMarketEIP1559Values,\n) => {\n  Object.keys(gasValues).forEach((key) => {\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const value = (gasValues as any)[key];\n    if (typeof value !== 'string' || !isStrictHexString(value)) {\n      throw new TypeError(\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n        `expected hex string for ${key} but received: ${value}`,\n      );\n    }\n  });\n};\n\n/**\n * Validates that a transaction is unapproved.\n * Throws if the transaction is not unapproved.\n *\n * @param transactionMeta - The transaction metadata to check.\n * @param fnName - The name of the function calling this helper.\n */\nexport function validateIfTransactionUnapproved(\n  transactionMeta: TransactionMeta | undefined,\n  fnName: string,\n) {\n  if (transactionMeta?.status !== TransactionStatus.unapproved) {\n    throw new Error(\n      // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n      `TransactionsController: Can only call ${fnName} on an unapproved transaction.\\n      Current tx status: ${transactionMeta?.status}`,\n    );\n  }\n}\n\n/**\n * Normalizes properties on transaction params.\n *\n * @param error - The error to be normalize.\n * @returns Normalized transaction error.\n */\nexport function normalizeTxError(\n  error: Error & { code?: string; value?: unknown },\n): TransactionError {\n  return {\n    name: error.name,\n    message: error.message,\n    stack: error.stack,\n    code: error.code,\n    rpc: isJsonCompatible(error.value) ? error.value : undefined,\n  };\n}\n\n/**\n * Normalize an object containing gas fee values.\n *\n * @param gasFeeValues - An object containing gas fee values.\n * @returns An object containing normalized gas fee values.\n */\nexport function normalizeGasFeeValues(\n  gasFeeValues: GasPriceValue | FeeMarketEIP1559Values,\n): GasPriceValue | FeeMarketEIP1559Values {\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const normalize = (value: any) =>\n    typeof value === 'string' ? add0x(value) : value;\n\n  if ('gasPrice' in gasFeeValues) {\n    return {\n      gasPrice: normalize(gasFeeValues.gasPrice),\n    };\n  }\n\n  return {\n    maxFeePerGas: normalize(gasFeeValues.maxFeePerGas),\n    maxPriorityFeePerGas: normalize(gasFeeValues.maxPriorityFeePerGas),\n  };\n}\n\n/**\n * Determines whether the given value can be encoded as JSON.\n *\n * @param value - The value.\n * @returns True if the value is JSON-encodable, false if not.\n */\nfunction isJsonCompatible(value: unknown): value is Json {\n  try {\n    JSON.parse(JSON.stringify(value));\n    return true;\n  } catch {\n    return false;\n  }\n}\n\n/**\n * Ensure a hex string is of even length by adding a leading 0 if necessary.\n * Any existing `0x` prefix is preserved but is not added if missing.\n *\n * @param hex - The hex string to ensure is even.\n * @returns The hex string with an even length.\n */\nexport function padHexToEvenLength(hex: string) {\n  const prefix = hex.toLowerCase().startsWith('0x') ? hex.slice(0, 2) : '';\n  const data = prefix ? hex.slice(2) : hex;\n  const evenData = data.length % 2 === 0 ? data : `0${data}`;\n\n  return prefix + evenData;\n}\n"],"mappings":"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","names":[]}

package/dist/{chunk-5MYXN7TL.mjs → chunk-VGFPVAKX.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-NOHEXQ7Y.mjs";
 import {
   getGasFeeFlow
-} from "./chunk-TWU3E2S2.mjs";
+} from "./chunk-NNHSNPT2.mjs";
 import {
   projectLogger
 } from "./chunk-UQQWZT6C.mjs";
@@ -225,4 +225,4 @@ getGasFeeControllerData_fn = async function(transactions) {
 export {
   GasFeePoller
 };
-//# sourceMappingURL=chunk-5MYXN7TL.mjs.map
+//# sourceMappingURL=chunk-VGFPVAKX.mjs.map

package/dist/{chunk-X4UQYI6T.js → chunk-VKWOHNDO.js}

@@ -4,6 +4,9 @@
 var _chunkPRUNMTRDjs = require('./chunk-PRUNMTRD.js');
 
 
+var _chunk5QVDIVJHjs = require('./chunk-5QVDIVJH.js');
+
+
 var _chunkNNCUD3QFjs = require('./chunk-NNCUD3QF.js');
 
 
@@ -11,7 +14,7 @@ var _chunkSD6CWFDFjs = require('./chunk-SD6CWFDF.js');
 
 
 
-var _chunkDV4DIGIEjs = require('./chunk-DV4DIGIE.js');
+var _chunk4OYPDGHOjs = require('./chunk-4OYPDGHO.js');
 
 
 var _chunkULD4JC3Qjs = require('./chunk-ULD4JC3Q.js');
@@ -38,7 +41,7 @@ var _chunkWR5F34OWjs = require('./chunk-WR5F34OW.js');
 var _chunkTJMQEH57js = require('./chunk-TJMQEH57.js');
 
 
-var _chunk3Y7RHK6Ljs = require('./chunk-3Y7RHK6L.js');
+var _chunk5HYWLTVQjs = require('./chunk-5HYWLTVQ.js');
 
 
 
@@ -54,19 +57,17 @@ var _chunk6OLJWLKKjs = require('./chunk-6OLJWLKK.js');
 var _chunk7NMV2NPMjs = require('./chunk-7NMV2NPM.js');
 
 
-var _chunkOSRJHVMIjs = require('./chunk-OSRJHVMI.js');
-
-
-var _chunkOBYKCUWHjs = require('./chunk-OBYKCUWH.js');
+var _chunkUHAFIPSLjs = require('./chunk-UHAFIPSL.js');
 
 
-var _chunkPI5XNTNCjs = require('./chunk-PI5XNTNC.js');
+var _chunkEHWAY6XUjs = require('./chunk-EHWAY6XU.js');
 
 
+var _chunkBZV72SCFjs = require('./chunk-BZV72SCF.js');
 
-var _chunkQH2H4W3Njs = require('./chunk-QH2H4W3N.js');
 
 
+var _chunkQKV7E5BOjs = require('./chunk-QKV7E5BO.js');
 
 
 
@@ -74,12 +75,10 @@ var _chunkQH2H4W3Njs = require('./chunk-QH2H4W3N.js');
 
 
 
+var _chunkKTGMNUTQjs = require('./chunk-KTGMNUTQ.js');
 
 
-var _chunkOZ6UB42Cjs = require('./chunk-OZ6UB42C.js');
-
-
-var _chunkSZRRNVKKjs = require('./chunk-SZRRNVKK.js');
+var _chunkYWLMT7XHjs = require('./chunk-YWLMT7XH.js');
 
 
 var _chunkS6VGOPUYjs = require('./chunk-S6VGOPUY.js');
@@ -143,7 +142,7 @@ function getDefaultTransactionControllerState() {
     lastFetchedBlockNumbers: {}
   };
 }
-var _internalEvents, _incomingTransactionOptions, _pendingTransactionOptions, _trace, _transactionHistoryLimit, _isSimulationEnabled, _testGasFeeFlows, _multichainTrackingHelper, _createNonceTracker, createNonceTracker_fn, _createIncomingTransactionHelper, createIncomingTransactionHelper_fn, _createPendingTransactionTracker, createPendingTransactionTracker_fn, _checkForPendingTransactionAndStartPolling, _stopAllTracking, stopAllTracking_fn, _removeIncomingTransactionHelperListeners, removeIncomingTransactionHelperListeners_fn, _addIncomingTransactionHelperListeners, addIncomingTransactionHelperListeners_fn, _removePendingTransactionTrackerListeners, removePendingTransactionTrackerListeners_fn, _addPendingTransactionTrackerListeners, addPendingTransactionTrackerListeners_fn, _getNonceTrackerPendingTransactions, getNonceTrackerPendingTransactions_fn, _getGasFeeFlows, getGasFeeFlows_fn, _getLayer1GasFeeFlows, getLayer1GasFeeFlows_fn, _updateTransactionInternal, updateTransactionInternal_fn, _checkIfTransactionParamsUpdated, checkIfTransactionParamsUpdated_fn, _onTransactionParamsUpdated, onTransactionParamsUpdated_fn, _updateSimulationData, updateSimulationData_fn, _onGasFeePollerTransactionUpdate, onGasFeePollerTransactionUpdate_fn, _getNetworkClientId, getNetworkClientId_fn, _getGlobalNetworkClientId, getGlobalNetworkClientId_fn, _getGlobalChainId, getGlobalChainId_fn, _isCustomNetwork, isCustomNetwork_fn, _getSelectedAccount, getSelectedAccount_fn;
+var _internalEvents, _incomingTransactionOptions, _pendingTransactionOptions, _trace, _transactionHistoryLimit, _isSimulationEnabled, _testGasFeeFlows, _multichainTrackingHelper, _retryTransaction, retryTransaction_fn, _createNonceTracker, createNonceTracker_fn, _createIncomingTransactionHelper, createIncomingTransactionHelper_fn, _createPendingTransactionTracker, createPendingTransactionTracker_fn, _checkForPendingTransactionAndStartPolling, _stopAllTracking, stopAllTracking_fn, _removeIncomingTransactionHelperListeners, removeIncomingTransactionHelperListeners_fn, _addIncomingTransactionHelperListeners, addIncomingTransactionHelperListeners_fn, _removePendingTransactionTrackerListeners, removePendingTransactionTrackerListeners_fn, _addPendingTransactionTrackerListeners, addPendingTransactionTrackerListeners_fn, _getNonceTrackerPendingTransactions, getNonceTrackerPendingTransactions_fn, _getGasFeeFlows, getGasFeeFlows_fn, _getLayer1GasFeeFlows, getLayer1GasFeeFlows_fn, _updateTransactionInternal, updateTransactionInternal_fn, _checkIfTransactionParamsUpdated, checkIfTransactionParamsUpdated_fn, _onTransactionParamsUpdated, onTransactionParamsUpdated_fn, _updateSimulationData, updateSimulationData_fn, _onGasFeePollerTransactionUpdate, onGasFeePollerTransactionUpdate_fn, _getNetworkClientId, getNetworkClientId_fn, _getGlobalNetworkClientId, getGlobalNetworkClientId_fn, _getGlobalChainId, getGlobalChainId_fn, _isCustomNetwork, isCustomNetwork_fn, _getSelectedAccount, getSelectedAccount_fn;
 var TransactionController = class extends _basecontroller.BaseController {
   /**
    * Constructs a TransactionController.
@@ -213,6 +212,7 @@ var TransactionController = class extends _basecontroller.BaseController {
         ...state
       }
     });
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _retryTransaction);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _createNonceTracker);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _createIncomingTransactionHelper);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _createPendingTransactionTracker);
@@ -325,7 +325,7 @@ var TransactionController = class extends _basecontroller.BaseController {
     });
     this.gasFeeFlows = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getGasFeeFlows, getGasFeeFlows_fn).call(this);
     this.layer1GasFeeFlows = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getLayer1GasFeeFlows, getLayer1GasFeeFlows_fn).call(this);
-    const gasFeePoller = new (0, _chunk3Y7RHK6Ljs.GasFeePoller)({
+    const gasFeePoller = new (0, _chunk5HYWLTVQjs.GasFeePoller)({
       findNetworkClientIdByChainId,
       gasFeeFlows: this.gasFeeFlows,
       getGasFeeControllerEstimates: this.getGasFeeEstimates,
@@ -360,7 +360,7 @@ var TransactionController = class extends _basecontroller.BaseController {
   }
   failTransaction(transactionMeta, error, actionId) {
     const newTransactionMeta = _lodash.merge.call(void 0, {}, transactionMeta, {
-      error: _chunkOZ6UB42Cjs.normalizeTxError.call(void 0, error),
+      error: _chunkKTGMNUTQjs.normalizeTxError.call(void 0, error),
       status: "failed" /* failed */
     });
     this.messagingSystem.publish(`${controllerName}:transactionFailed`, {
@@ -460,7 +460,7 @@ var TransactionController = class extends _basecontroller.BaseController {
     networkClientId: requestNetworkClientId
   } = {}) {
     _chunkS6VGOPUYjs.projectLogger.call(void 0, "Adding transaction", txParams);
-    txParams = _chunkOZ6UB42Cjs.normalizeTransactionParams.call(void 0, txParams);
+    txParams = _chunkKTGMNUTQjs.normalizeTransactionParams.call(void 0, txParams);
     if (requestNetworkClientId && !_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).has(requestNetworkClientId)) {
       throw new Error(
         "The networkClientId for this transaction could not be found"
@@ -470,9 +470,9 @@ var TransactionController = class extends _basecontroller.BaseController {
     const isEIP1559Compatible = await this.getEIP1559Compatibility(
       networkClientId
     );
-    _chunkDV4DIGIEjs.validateTxParams.call(void 0, txParams, isEIP1559Compatible);
+    _chunk4OYPDGHOjs.validateTxParams.call(void 0, txParams, isEIP1559Compatible);
     if (origin) {
-      await _chunkDV4DIGIEjs.validateTransactionOrigin.call(void 0, 
+      await _chunk4OYPDGHOjs.validateTransactionOrigin.call(void 0, 
         await this.getPermittedAccounts(origin),
         _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getSelectedAccount, getSelectedAccount_fn).call(this).address,
         txParams.from,
@@ -524,7 +524,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       if (!this.isHistoryDisabled) {
         addedTransactionMeta = _chunkTIE3CPF7js.addInitialHistorySnapshot.call(void 0, addedTransactionMeta);
       }
-      addedTransactionMeta = _chunkQH2H4W3Njs.updateSwapsTransaction.call(void 0, 
+      addedTransactionMeta = _chunkQKV7E5BOjs.updateSwapsTransaction.call(void 0, 
         addedTransactionMeta,
         transactionType,
         swaps,
@@ -605,116 +605,30 @@ var TransactionController = class extends _basecontroller.BaseController {
     estimatedBaseFee,
     actionId
   } = {}) {
-    if (this.getTransactionWithActionId(actionId)) {
-      return;
-    }
-    if (gasValues) {
-      gasValues = _chunkOZ6UB42Cjs.normalizeGasFeeValues.call(void 0, gasValues);
-      _chunkOZ6UB42Cjs.validateGasValues.call(void 0, gasValues);
-    }
-    _chunkS6VGOPUYjs.projectLogger.call(void 0, "Creating cancel transaction", transactionId, gasValues);
-    const transactionMeta = this.getTransaction(transactionId);
-    if (!transactionMeta) {
-      return;
-    }
-    if (!this.sign) {
-      throw new Error("No sign method defined.");
-    }
-    const minGasPrice = _chunkOZ6UB42Cjs.getIncreasedPriceFromExisting.call(void 0, 
-      transactionMeta.txParams.gasPrice,
-      CANCEL_RATE
-    );
-    const gasPriceFromValues = _chunkOZ6UB42Cjs.isGasPriceValue.call(void 0, gasValues) && gasValues.gasPrice;
-    const newGasPrice = gasPriceFromValues && _chunkOZ6UB42Cjs.validateMinimumIncrease.call(void 0, gasPriceFromValues, minGasPrice) || minGasPrice;
-    const existingMaxFeePerGas = transactionMeta.txParams?.maxFeePerGas;
-    const minMaxFeePerGas = _chunkOZ6UB42Cjs.getIncreasedPriceFromExisting.call(void 0, 
-      existingMaxFeePerGas,
-      CANCEL_RATE
-    );
-    const maxFeePerGasValues = _chunkOZ6UB42Cjs.isFeeMarketEIP1559Values.call(void 0, gasValues) && gasValues.maxFeePerGas;
-    const newMaxFeePerGas = maxFeePerGasValues && _chunkOZ6UB42Cjs.validateMinimumIncrease.call(void 0, maxFeePerGasValues, minMaxFeePerGas) || existingMaxFeePerGas && minMaxFeePerGas;
-    const existingMaxPriorityFeePerGas = transactionMeta.txParams?.maxPriorityFeePerGas;
-    const minMaxPriorityFeePerGas = _chunkOZ6UB42Cjs.getIncreasedPriceFromExisting.call(void 0, 
-      existingMaxPriorityFeePerGas,
-      CANCEL_RATE
-    );
-    const maxPriorityFeePerGasValues = _chunkOZ6UB42Cjs.isFeeMarketEIP1559Values.call(void 0, gasValues) && gasValues.maxPriorityFeePerGas;
-    const newMaxPriorityFeePerGas = maxPriorityFeePerGasValues && _chunkOZ6UB42Cjs.validateMinimumIncrease.call(void 0, 
-      maxPriorityFeePerGasValues,
-      minMaxPriorityFeePerGas
-    ) || existingMaxPriorityFeePerGas && minMaxPriorityFeePerGas;
-    const newTxParams = newMaxFeePerGas && newMaxPriorityFeePerGas ? {
-      from: transactionMeta.txParams.from,
-      gasLimit: transactionMeta.txParams.gas,
-      maxFeePerGas: newMaxFeePerGas,
-      maxPriorityFeePerGas: newMaxPriorityFeePerGas,
-      type: "0x2" /* feeMarket */,
-      nonce: transactionMeta.txParams.nonce,
-      to: transactionMeta.txParams.from,
-      value: "0x0"
-    } : {
-      from: transactionMeta.txParams.from,
-      gasLimit: transactionMeta.txParams.gas,
-      gasPrice: newGasPrice,
-      nonce: transactionMeta.txParams.nonce,
-      to: transactionMeta.txParams.from,
-      value: "0x0"
-    };
-    const unsignedEthTx = this.prepareUnsignedEthTx(
-      transactionMeta.chainId,
-      newTxParams
-    );
-    const signedTx = await this.sign(
-      unsignedEthTx,
-      transactionMeta.txParams.from
-    );
-    const rawTx = _util.bufferToHex.call(void 0, signedTx.serialize());
-    const newFee = newTxParams.maxFeePerGas ?? newTxParams.gasPrice;
-    const oldFee = newTxParams.maxFeePerGas ? transactionMeta.txParams.maxFeePerGas : transactionMeta.txParams.gasPrice;
-    _chunkS6VGOPUYjs.projectLogger.call(void 0, "Submitting cancel transaction", {
-      oldFee,
-      newFee,
-      txParams: newTxParams
-    });
-    const ethQuery = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getEthQuery({
-      networkClientId: transactionMeta.networkClientId,
-      chainId: transactionMeta.chainId
-    });
-    const hash = await this.publishTransactionForRetry(
-      ethQuery,
-      rawTx,
-      transactionMeta
-    );
-    const cancelTransactionMeta = {
+    return await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _retryTransaction, retryTransaction_fn).call(this, {
       actionId,
-      chainId: transactionMeta.chainId,
-      networkClientId: transactionMeta.networkClientId,
       estimatedBaseFee,
-      hash,
-      id: _uuid.v1.call(void 0, ),
-      originalGasEstimate: transactionMeta.txParams.gas,
-      status: "submitted" /* submitted */,
-      time: Date.now(),
-      type: "cancel" /* cancel */,
-      txParams: newTxParams
-    };
-    this.addMetadata(cancelTransactionMeta);
-    this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
-      transactionMeta: cancelTransactionMeta,
-      actionId
-    });
-    this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
-      transactionMeta: cancelTransactionMeta,
-      actionId
+      gasValues,
+      label: "cancel",
+      rate: CANCEL_RATE,
+      transactionId,
+      transactionType: "cancel" /* cancel */,
+      prepareTransactionParams: (txParams) => {
+        delete txParams.data;
+        txParams.to = txParams.from;
+        txParams.value = "0x0";
+      },
+      afterSubmit: (newTransactionMeta) => {
+        this.messagingSystem.publish(
+          `${controllerName}:transactionFinished`,
+          newTransactionMeta
+        );
+        _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _internalEvents).emit(
+          `${newTransactionMeta.id}:finished`,
+          newTransactionMeta
+        );
+      }
     });
-    this.messagingSystem.publish(
-      `${controllerName}:transactionFinished`,
-      cancelTransactionMeta
-    );
-    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _internalEvents).emit(
-      `${transactionMeta.id}:finished`,
-      cancelTransactionMeta
-    );
   }
   /**
    * Attempts to speed up a transaction increasing transaction gasPrice by ten percent.
@@ -729,118 +643,21 @@ var TransactionController = class extends _basecontroller.BaseController {
     actionId,
     estimatedBaseFee
   } = {}) {
-    if (this.getTransactionWithActionId(actionId)) {
-      return;
-    }
-    if (gasValues) {
-      gasValues = _chunkOZ6UB42Cjs.normalizeGasFeeValues.call(void 0, gasValues);
-      _chunkOZ6UB42Cjs.validateGasValues.call(void 0, gasValues);
-    }
-    _chunkS6VGOPUYjs.projectLogger.call(void 0, "Creating speed up transaction", transactionId, gasValues);
-    const transactionMeta = this.getTransaction(transactionId);
-    if (!transactionMeta) {
-      return;
-    }
-    if (!this.sign) {
-      throw new Error("No sign method defined.");
-    }
-    const minGasPrice = _chunkOZ6UB42Cjs.getIncreasedPriceFromExisting.call(void 0, 
-      transactionMeta.txParams.gasPrice,
-      SPEED_UP_RATE
-    );
-    const gasPriceFromValues = _chunkOZ6UB42Cjs.isGasPriceValue.call(void 0, gasValues) && gasValues.gasPrice;
-    const newGasPrice = gasPriceFromValues && _chunkOZ6UB42Cjs.validateMinimumIncrease.call(void 0, gasPriceFromValues, minGasPrice) || minGasPrice;
-    const existingMaxFeePerGas = transactionMeta.txParams?.maxFeePerGas;
-    const minMaxFeePerGas = _chunkOZ6UB42Cjs.getIncreasedPriceFromExisting.call(void 0, 
-      existingMaxFeePerGas,
-      SPEED_UP_RATE
-    );
-    const maxFeePerGasValues = _chunkOZ6UB42Cjs.isFeeMarketEIP1559Values.call(void 0, gasValues) && gasValues.maxFeePerGas;
-    const newMaxFeePerGas = maxFeePerGasValues && _chunkOZ6UB42Cjs.validateMinimumIncrease.call(void 0, maxFeePerGasValues, minMaxFeePerGas) || existingMaxFeePerGas && minMaxFeePerGas;
-    const existingMaxPriorityFeePerGas = transactionMeta.txParams?.maxPriorityFeePerGas;
-    const minMaxPriorityFeePerGas = _chunkOZ6UB42Cjs.getIncreasedPriceFromExisting.call(void 0, 
-      existingMaxPriorityFeePerGas,
-      SPEED_UP_RATE
-    );
-    const maxPriorityFeePerGasValues = _chunkOZ6UB42Cjs.isFeeMarketEIP1559Values.call(void 0, gasValues) && gasValues.maxPriorityFeePerGas;
-    const newMaxPriorityFeePerGas = maxPriorityFeePerGasValues && _chunkOZ6UB42Cjs.validateMinimumIncrease.call(void 0, 
-      maxPriorityFeePerGasValues,
-      minMaxPriorityFeePerGas
-    ) || existingMaxPriorityFeePerGas && minMaxPriorityFeePerGas;
-    const txParams = newMaxFeePerGas && newMaxPriorityFeePerGas ? {
-      ...transactionMeta.txParams,
-      gasLimit: transactionMeta.txParams.gas,
-      maxFeePerGas: newMaxFeePerGas,
-      maxPriorityFeePerGas: newMaxPriorityFeePerGas,
-      type: "0x2" /* feeMarket */
-    } : {
-      ...transactionMeta.txParams,
-      gasLimit: transactionMeta.txParams.gas,
-      gasPrice: newGasPrice
-    };
-    const unsignedEthTx = this.prepareUnsignedEthTx(
-      transactionMeta.chainId,
-      txParams
-    );
-    const signedTx = await this.sign(
-      unsignedEthTx,
-      transactionMeta.txParams.from
-    );
-    const transactionMetaWithRsv = this.updateTransactionMetaRSV(
-      transactionMeta,
-      signedTx
-    );
-    const rawTx = _util.bufferToHex.call(void 0, signedTx.serialize());
-    const newFee = txParams.maxFeePerGas ?? txParams.gasPrice;
-    const oldFee = txParams.maxFeePerGas ? transactionMetaWithRsv.txParams.maxFeePerGas : transactionMetaWithRsv.txParams.gasPrice;
-    _chunkS6VGOPUYjs.projectLogger.call(void 0, "Submitting speed up transaction", { oldFee, newFee, txParams });
-    const ethQuery = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getEthQuery({
-      networkClientId: transactionMeta.networkClientId,
-      chainId: transactionMeta.chainId
-    });
-    const hash = await this.publishTransactionForRetry(
-      ethQuery,
-      rawTx,
-      transactionMeta
-    );
-    const baseTransactionMeta = {
-      ...transactionMetaWithRsv,
-      estimatedBaseFee,
-      id: _uuid.v1.call(void 0, ),
-      time: Date.now(),
-      hash,
+    return await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _retryTransaction, retryTransaction_fn).call(this, {
       actionId,
-      originalGasEstimate: transactionMeta.txParams.gas,
-      type: "retry" /* retry */,
-      originalType: transactionMeta.type
-    };
-    const newTransactionMeta = newMaxFeePerGas && newMaxPriorityFeePerGas ? {
-      ...baseTransactionMeta,
-      txParams: {
-        ...transactionMeta.txParams,
-        maxFeePerGas: newMaxFeePerGas,
-        maxPriorityFeePerGas: newMaxPriorityFeePerGas
-      }
-    } : {
-      ...baseTransactionMeta,
-      txParams: {
-        ...transactionMeta.txParams,
-        gasPrice: newGasPrice
+      estimatedBaseFee,
+      gasValues,
+      label: "speed up",
+      rate: SPEED_UP_RATE,
+      transactionId,
+      transactionType: "retry" /* retry */,
+      afterSubmit: (newTransactionMeta) => {
+        this.messagingSystem.publish(
+          `${controllerName}:speedupTransactionAdded`,
+          newTransactionMeta
+        );
       }
-    };
-    this.addMetadata(newTransactionMeta);
-    this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
-      transactionMeta: newTransactionMeta,
-      actionId
     });
-    this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
-      transactionMeta: newTransactionMeta,
-      actionId
-    });
-    this.messagingSystem.publish(
-      `${controllerName}:speedupTransactionAdded`,
-      newTransactionMeta
-    );
   }
   /**
    * Estimates required gas for a given transaction.
@@ -1006,7 +823,7 @@ var TransactionController = class extends _basecontroller.BaseController {
         `Cannot update send flow history as no transaction metadata found`
       );
     }
-    _chunkOZ6UB42Cjs.validateIfTransactionUnapproved.call(void 0, 
+    _chunkKTGMNUTQjs.validateIfTransactionUnapproved.call(void 0, 
       transactionMeta,
       "updateTransactionSendFlowHistory"
     );
@@ -1060,7 +877,7 @@ var TransactionController = class extends _basecontroller.BaseController {
         `Cannot update transaction as no transaction metadata found`
       );
     }
-    _chunkOZ6UB42Cjs.validateIfTransactionUnapproved.call(void 0, 
+    _chunkKTGMNUTQjs.validateIfTransactionUnapproved.call(void 0, 
       transactionMeta,
       "updateTransactionGasFees"
     );
@@ -1111,7 +928,7 @@ var TransactionController = class extends _basecontroller.BaseController {
         `Cannot update transaction as no transaction metadata found`
       );
     }
-    _chunkOZ6UB42Cjs.validateIfTransactionUnapproved.call(void 0, transactionMeta, "updatePreviousGasParams");
+    _chunkKTGMNUTQjs.validateIfTransactionUnapproved.call(void 0, transactionMeta, "updatePreviousGasParams");
     const transactionPreviousGas = {
       previousGas: {
         gasLimit,
@@ -1164,7 +981,7 @@ var TransactionController = class extends _basecontroller.BaseController {
         `Cannot update editable params as no transaction metadata found`
       );
     }
-    _chunkOZ6UB42Cjs.validateIfTransactionUnapproved.call(void 0, transactionMeta, "updateEditableParams");
+    _chunkKTGMNUTQjs.validateIfTransactionUnapproved.call(void 0, transactionMeta, "updateEditableParams");
     const editableParams = {
       txParams: {
         data,
@@ -1299,7 +1116,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       updatedTransactionMeta.submittedTime = (/* @__PURE__ */ new Date()).getTime();
     }
     if (updatedTransactionMeta.status === "failed" /* failed */) {
-      updatedTransactionMeta.error = _chunkOZ6UB42Cjs.normalizeTxError.call(void 0, new Error(errorMessage));
+      updatedTransactionMeta.error = _chunkKTGMNUTQjs.normalizeTxError.call(void 0, new Error(errorMessage));
     }
     this.updateTransaction(
       updatedTransactionMeta,
@@ -1413,7 +1230,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       chainId,
       networkClientId
     };
-    const gasFeeFlow = _chunkSZRRNVKKjs.getGasFeeFlow.call(void 0, 
+    const gasFeeFlow = _chunkYWLMT7XHjs.getGasFeeFlow.call(void 0, 
       transactionMeta,
       this.gasFeeFlows
     );
@@ -1460,8 +1277,8 @@ var TransactionController = class extends _basecontroller.BaseController {
     if (!this.sign) {
       throw new Error("No sign method defined.");
     }
-    const normalizedTransactionParams = _chunkOZ6UB42Cjs.normalizeTransactionParams.call(void 0, transactionParams);
-    const type = _chunkOZ6UB42Cjs.isEIP1559Transaction.call(void 0, normalizedTransactionParams) ? "0x2" /* feeMarket */ : "0x0" /* legacy */;
+    const normalizedTransactionParams = _chunkKTGMNUTQjs.normalizeTransactionParams.call(void 0, transactionParams);
+    const type = _chunkKTGMNUTQjs.isEIP1559Transaction.call(void 0, normalizedTransactionParams) ? "0x2" /* feeMarket */ : "0x0" /* legacy */;
     const updatedTransactionParams = {
       ...normalizedTransactionParams,
       type,
@@ -1509,7 +1326,7 @@ var TransactionController = class extends _basecontroller.BaseController {
     this.signAbortCallbacks.delete(transactionId);
   }
   addMetadata(transactionMeta) {
-    _chunkDV4DIGIEjs.validateTxParams.call(void 0, transactionMeta.txParams);
+    _chunk4OYPDGHOjs.validateTxParams.call(void 0, transactionMeta.txParams);
     this.update((state) => {
       state.transactions = this.trimTransactionsForState([
         ...state.transactions,
@@ -1537,7 +1354,7 @@ var TransactionController = class extends _basecontroller.BaseController {
         txMeta: transactionMeta
       });
     });
-    await _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _trace).call(this, { name: "Update Gas Fees", parentContext: traceContext }, async () => await _chunkPI5XNTNCjs.updateGasFees.call(void 0, {
+    await _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _trace).call(this, { name: "Update Gas Fees", parentContext: traceContext }, async () => await _chunkBZV72SCFjs.updateGasFees.call(void 0, {
       eip1559: isEIP1559Compatible,
       ethQuery,
       gasFeeFlows: this.gasFeeFlows,
@@ -1704,7 +1521,7 @@ var TransactionController = class extends _basecontroller.BaseController {
           nonce,
           chainId,
           gasLimit: txParams.gas,
-          ..._chunkOZ6UB42Cjs.isEIP1559Transaction.call(void 0, txParams) && {
+          ..._chunkKTGMNUTQjs.isEIP1559Transaction.call(void 0, txParams) && {
             type: "0x2" /* feeMarket */
           }
         };
@@ -2225,7 +2042,7 @@ var TransactionController = class extends _basecontroller.BaseController {
         networkClientId: transactionMeta.networkClientId,
         chainId: transactionMeta.chainId
       });
-      const { updatedTransactionMeta, approvalTransactionMeta } = await _chunkQH2H4W3Njs.updatePostTransactionBalance.call(void 0, transactionMeta, {
+      const { updatedTransactionMeta, approvalTransactionMeta } = await _chunkQKV7E5BOjs.updatePostTransactionBalance.call(void 0, transactionMeta, {
         ethQuery,
         getTransaction: this.getTransaction.bind(this),
         updateTransaction: this.updateTransaction.bind(this)
@@ -2276,6 +2093,91 @@ _transactionHistoryLimit = new WeakMap();
 _isSimulationEnabled = new WeakMap();
 _testGasFeeFlows = new WeakMap();
 _multichainTrackingHelper = new WeakMap();
+_retryTransaction = new WeakSet();
+retryTransaction_fn = async function({
+  actionId,
+  afterSubmit,
+  estimatedBaseFee,
+  gasValues,
+  label,
+  prepareTransactionParams,
+  rate,
+  transactionId,
+  transactionType
+}) {
+  if (this.getTransactionWithActionId(actionId)) {
+    return;
+  }
+  if (gasValues) {
+    gasValues = _chunkKTGMNUTQjs.normalizeGasFeeValues.call(void 0, gasValues);
+    _chunkKTGMNUTQjs.validateGasValues.call(void 0, gasValues);
+  }
+  _chunkS6VGOPUYjs.projectLogger.call(void 0, `Creating ${label} transaction`, transactionId, gasValues);
+  const transactionMeta = this.getTransaction(transactionId);
+  if (!transactionMeta) {
+    return;
+  }
+  if (!this.sign) {
+    throw new Error("No sign method defined.");
+  }
+  const newTxParams = _chunk5QVDIVJHjs.getTransactionParamsWithIncreasedGasFee.call(void 0, 
+    transactionMeta.txParams,
+    rate,
+    gasValues
+  );
+  prepareTransactionParams?.(newTxParams);
+  const unsignedEthTx = this.prepareUnsignedEthTx(
+    transactionMeta.chainId,
+    newTxParams
+  );
+  const signedTx = await this.sign(
+    unsignedEthTx,
+    transactionMeta.txParams.from
+  );
+  const transactionMetaWithRsv = this.updateTransactionMetaRSV(
+    transactionMeta,
+    signedTx
+  );
+  const rawTx = _util.bufferToHex.call(void 0, signedTx.serialize());
+  const newFee = newTxParams.maxFeePerGas ?? newTxParams.gasPrice;
+  const oldFee = newTxParams.maxFeePerGas ? transactionMetaWithRsv.txParams.maxFeePerGas : transactionMetaWithRsv.txParams.gasPrice;
+  _chunkS6VGOPUYjs.projectLogger.call(void 0, `Submitting ${label} transaction`, {
+    oldFee,
+    newFee,
+    txParams: newTxParams
+  });
+  const ethQuery = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getEthQuery({
+    networkClientId: transactionMeta.networkClientId,
+    chainId: transactionMeta.chainId
+  });
+  const hash = await this.publishTransactionForRetry(
+    ethQuery,
+    rawTx,
+    transactionMeta
+  );
+  const newTransactionMeta = {
+    ...transactionMetaWithRsv,
+    estimatedBaseFee,
+    id: _uuid.v1.call(void 0, ),
+    time: Date.now(),
+    hash,
+    actionId,
+    originalGasEstimate: transactionMeta.txParams.gas,
+    type: transactionType,
+    txParams: newTxParams,
+    originalType: transactionMeta.type
+  };
+  this.addMetadata(newTransactionMeta);
+  this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
+    transactionMeta: newTransactionMeta,
+    actionId
+  });
+  this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
+    transactionMeta: newTransactionMeta,
+    actionId
+  });
+  afterSubmit?.(newTransactionMeta);
+};
 _createNonceTracker = new WeakSet();
 createNonceTracker_fn = function({
   provider,
@@ -2418,7 +2320,7 @@ getGasFeeFlows_fn = function() {
   if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _testGasFeeFlows)) {
     return [new (0, _chunkTJMQEH57js.TestGasFeeFlow)()];
   }
-  return [new (0, _chunkOSRJHVMIjs.LineaGasFeeFlow)(), new (0, _chunkOBYKCUWHjs.DefaultGasFeeFlow)()];
+  return [new (0, _chunkUHAFIPSLjs.LineaGasFeeFlow)(), new (0, _chunkEHWAY6XUjs.DefaultGasFeeFlow)()];
 };
 _getLayer1GasFeeFlows = new WeakSet();
 getLayer1GasFeeFlows_fn = function() {
@@ -2437,10 +2339,10 @@ updateTransactionInternal_fn = function({
     );
     let transactionMeta2 = state.transactions[index];
     transactionMeta2 = callback(transactionMeta2) ?? transactionMeta2;
-    transactionMeta2.txParams = _chunkOZ6UB42Cjs.normalizeTransactionParams.call(void 0, 
+    transactionMeta2.txParams = _chunkKTGMNUTQjs.normalizeTransactionParams.call(void 0, 
       transactionMeta2.txParams
     );
-    _chunkDV4DIGIEjs.validateTxParams.call(void 0, transactionMeta2.txParams);
+    _chunk4OYPDGHOjs.validateTxParams.call(void 0, transactionMeta2.txParams);
     updatedTransactionParams = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _checkIfTransactionParamsUpdated, checkIfTransactionParamsUpdated_fn).call(this, transactionMeta2);
     const shouldSkipHistory = this.isHistoryDisabled || skipHistory;
     if (!shouldSkipHistory) {
@@ -2604,4 +2506,4 @@ getSelectedAccount_fn = function() {
 
 
 exports.HARDFORK = HARDFORK; exports.CANCEL_RATE = CANCEL_RATE; exports.SPEED_UP_RATE = SPEED_UP_RATE; exports.ApprovalState = ApprovalState; exports.TransactionController = TransactionController;
-//# sourceMappingURL=chunk-X4UQYI6T.js.map
+//# sourceMappingURL=chunk-VKWOHNDO.js.map