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

package/dist/{chunk-FGXUEMNU.mjs → chunk-XTMJ25EF.mjs}

@@ -2,6 +2,9 @@ import {
   getAndFormatTransactionsForNonceTracker,
   getNextNonce
 } from "./chunk-6DDVVUJC.mjs";
+import {
+  getTransactionParamsWithIncreasedGasFee
+} from "./chunk-JOQK7A5G.mjs";
 import {
   getSimulationData
 } from "./chunk-3AVRGHUO.mjs";
@@ -11,7 +14,7 @@ import {
 import {
   validateTransactionOrigin,
   validateTxParams
-} from "./chunk-P6E3JOST.mjs";
+} from "./chunk-X4XSEYPL.mjs";
 import {
   PendingTransactionTracker
 } from "./chunk-6B5BEO3R.mjs";
@@ -38,7 +41,7 @@ import {
 } from "./chunk-FMRLPVFZ.mjs";
 import {
   GasFeePoller
-} from "./chunk-5MYXN7TL.mjs";
+} from "./chunk-VGFPVAKX.mjs";
 import {
   getTransactionLayer1GasFee,
   updateTransactionLayer1GasFee
@@ -54,32 +57,28 @@ import {
 } from "./chunk-EKJXGERC.mjs";
 import {
   LineaGasFeeFlow
-} from "./chunk-EUJSTRE7.mjs";
+} from "./chunk-KYRW4BLA.mjs";
 import {
   DefaultGasFeeFlow
-} from "./chunk-EPCF4BU3.mjs";
+} from "./chunk-AWIJZAW3.mjs";
 import {
   updateGasFees
-} from "./chunk-EXQCUTGP.mjs";
+} from "./chunk-SFFOC25Q.mjs";
 import {
   updatePostTransactionBalance,
   updateSwapsTransaction
-} from "./chunk-GNAL5HC2.mjs";
+} from "./chunk-JIFPK37W.mjs";
 import {
-  getIncreasedPriceFromExisting,
   isEIP1559Transaction,
-  isFeeMarketEIP1559Values,
-  isGasPriceValue,
   normalizeGasFeeValues,
   normalizeTransactionParams,
   normalizeTxError,
   validateGasValues,
-  validateIfTransactionUnapproved,
-  validateMinimumIncrease
-} from "./chunk-Q56I5ONX.mjs";
+  validateIfTransactionUnapproved
+} from "./chunk-UHSRHP55.mjs";
 import {
   getGasFeeFlow
-} from "./chunk-TWU3E2S2.mjs";
+} from "./chunk-NNHSNPT2.mjs";
 import {
   projectLogger
 } from "./chunk-UQQWZT6C.mjs";
@@ -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 {
   /**
    * Constructs a TransactionController.
@@ -213,6 +212,7 @@ var TransactionController = class extends BaseController {
         ...state
       }
     });
+    __privateAdd(this, _retryTransaction);
     __privateAdd(this, _createNonceTracker);
     __privateAdd(this, _createIncomingTransactionHelper);
     __privateAdd(this, _createPendingTransactionTracker);
@@ -605,116 +605,30 @@ var TransactionController = class extends BaseController {
     estimatedBaseFee,
     actionId
   } = {}) {
-    if (this.getTransactionWithActionId(actionId)) {
-      return;
-    }
-    if (gasValues) {
-      gasValues = normalizeGasFeeValues(gasValues);
-      validateGasValues(gasValues);
-    }
-    projectLogger("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 = getIncreasedPriceFromExisting(
-      transactionMeta.txParams.gasPrice,
-      CANCEL_RATE
-    );
-    const gasPriceFromValues = isGasPriceValue(gasValues) && gasValues.gasPrice;
-    const newGasPrice = gasPriceFromValues && validateMinimumIncrease(gasPriceFromValues, minGasPrice) || minGasPrice;
-    const existingMaxFeePerGas = transactionMeta.txParams?.maxFeePerGas;
-    const minMaxFeePerGas = getIncreasedPriceFromExisting(
-      existingMaxFeePerGas,
-      CANCEL_RATE
-    );
-    const maxFeePerGasValues = isFeeMarketEIP1559Values(gasValues) && gasValues.maxFeePerGas;
-    const newMaxFeePerGas = maxFeePerGasValues && validateMinimumIncrease(maxFeePerGasValues, minMaxFeePerGas) || existingMaxFeePerGas && minMaxFeePerGas;
-    const existingMaxPriorityFeePerGas = transactionMeta.txParams?.maxPriorityFeePerGas;
-    const minMaxPriorityFeePerGas = getIncreasedPriceFromExisting(
-      existingMaxPriorityFeePerGas,
-      CANCEL_RATE
-    );
-    const maxPriorityFeePerGasValues = isFeeMarketEIP1559Values(gasValues) && gasValues.maxPriorityFeePerGas;
-    const newMaxPriorityFeePerGas = maxPriorityFeePerGasValues && validateMinimumIncrease(
-      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 = bufferToHex(signedTx.serialize());
-    const newFee = newTxParams.maxFeePerGas ?? newTxParams.gasPrice;
-    const oldFee = newTxParams.maxFeePerGas ? transactionMeta.txParams.maxFeePerGas : transactionMeta.txParams.gasPrice;
-    projectLogger("Submitting cancel transaction", {
-      oldFee,
-      newFee,
-      txParams: newTxParams
-    });
-    const ethQuery = __privateGet(this, _multichainTrackingHelper).getEthQuery({
-      networkClientId: transactionMeta.networkClientId,
-      chainId: transactionMeta.chainId
-    });
-    const hash = await this.publishTransactionForRetry(
-      ethQuery,
-      rawTx,
-      transactionMeta
-    );
-    const cancelTransactionMeta = {
+    return await __privateMethod(this, _retryTransaction, retryTransaction_fn).call(this, {
       actionId,
-      chainId: transactionMeta.chainId,
-      networkClientId: transactionMeta.networkClientId,
       estimatedBaseFee,
-      hash,
-      id: random(),
-      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
+        );
+        __privateGet(this, _internalEvents).emit(
+          `${newTransactionMeta.id}:finished`,
+          newTransactionMeta
+        );
+      }
     });
-    this.messagingSystem.publish(
-      `${controllerName}:transactionFinished`,
-      cancelTransactionMeta
-    );
-    __privateGet(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 {
     actionId,
     estimatedBaseFee
   } = {}) {
-    if (this.getTransactionWithActionId(actionId)) {
-      return;
-    }
-    if (gasValues) {
-      gasValues = normalizeGasFeeValues(gasValues);
-      validateGasValues(gasValues);
-    }
-    projectLogger("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 = getIncreasedPriceFromExisting(
-      transactionMeta.txParams.gasPrice,
-      SPEED_UP_RATE
-    );
-    const gasPriceFromValues = isGasPriceValue(gasValues) && gasValues.gasPrice;
-    const newGasPrice = gasPriceFromValues && validateMinimumIncrease(gasPriceFromValues, minGasPrice) || minGasPrice;
-    const existingMaxFeePerGas = transactionMeta.txParams?.maxFeePerGas;
-    const minMaxFeePerGas = getIncreasedPriceFromExisting(
-      existingMaxFeePerGas,
-      SPEED_UP_RATE
-    );
-    const maxFeePerGasValues = isFeeMarketEIP1559Values(gasValues) && gasValues.maxFeePerGas;
-    const newMaxFeePerGas = maxFeePerGasValues && validateMinimumIncrease(maxFeePerGasValues, minMaxFeePerGas) || existingMaxFeePerGas && minMaxFeePerGas;
-    const existingMaxPriorityFeePerGas = transactionMeta.txParams?.maxPriorityFeePerGas;
-    const minMaxPriorityFeePerGas = getIncreasedPriceFromExisting(
-      existingMaxPriorityFeePerGas,
-      SPEED_UP_RATE
-    );
-    const maxPriorityFeePerGasValues = isFeeMarketEIP1559Values(gasValues) && gasValues.maxPriorityFeePerGas;
-    const newMaxPriorityFeePerGas = maxPriorityFeePerGasValues && validateMinimumIncrease(
-      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 = bufferToHex(signedTx.serialize());
-    const newFee = txParams.maxFeePerGas ?? txParams.gasPrice;
-    const oldFee = txParams.maxFeePerGas ? transactionMetaWithRsv.txParams.maxFeePerGas : transactionMetaWithRsv.txParams.gasPrice;
-    projectLogger("Submitting speed up transaction", { oldFee, newFee, txParams });
-    const ethQuery = __privateGet(this, _multichainTrackingHelper).getEthQuery({
-      networkClientId: transactionMeta.networkClientId,
-      chainId: transactionMeta.chainId
-    });
-    const hash = await this.publishTransactionForRetry(
-      ethQuery,
-      rawTx,
-      transactionMeta
-    );
-    const baseTransactionMeta = {
-      ...transactionMetaWithRsv,
-      estimatedBaseFee,
-      id: random(),
-      time: Date.now(),
-      hash,
+    return await __privateMethod(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.
@@ -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 = normalizeGasFeeValues(gasValues);
+    validateGasValues(gasValues);
+  }
+  projectLogger(`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 = getTransactionParamsWithIncreasedGasFee(
+    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 = bufferToHex(signedTx.serialize());
+  const newFee = newTxParams.maxFeePerGas ?? newTxParams.gasPrice;
+  const oldFee = newTxParams.maxFeePerGas ? transactionMetaWithRsv.txParams.maxFeePerGas : transactionMetaWithRsv.txParams.gasPrice;
+  projectLogger(`Submitting ${label} transaction`, {
+    oldFee,
+    newFee,
+    txParams: newTxParams
+  });
+  const ethQuery = __privateGet(this, _multichainTrackingHelper).getEthQuery({
+    networkClientId: transactionMeta.networkClientId,
+    chainId: transactionMeta.chainId
+  });
+  const hash = await this.publishTransactionForRetry(
+    ethQuery,
+    rawTx,
+    transactionMeta
+  );
+  const newTransactionMeta = {
+    ...transactionMetaWithRsv,
+    estimatedBaseFee,
+    id: random(),
+    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,
@@ -2604,4 +2506,4 @@ export {
   ApprovalState,
   TransactionController
 };
-//# sourceMappingURL=chunk-FGXUEMNU.mjs.map
+//# sourceMappingURL=chunk-XTMJ25EF.mjs.map