@metamask-previews/transaction-controller 35.1.1-preview-e8f9512d → 35.1.1-preview-4f1ca72a

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

@@ -2,9 +2,6 @@ import {
   getAndFormatTransactionsForNonceTracker,
   getNextNonce
 } from "./chunk-6DDVVUJC.mjs";
-import {
-  getTransactionParamsWithIncreasedGasFee
-} from "./chunk-JOQK7A5G.mjs";
 import {
   getSimulationData
 } from "./chunk-3AVRGHUO.mjs";
@@ -14,7 +11,7 @@ import {
 import {
   validateTransactionOrigin,
   validateTxParams
-} from "./chunk-X4XSEYPL.mjs";
+} from "./chunk-LTPS73D7.mjs";
 import {
   PendingTransactionTracker
 } from "./chunk-6B5BEO3R.mjs";
@@ -41,7 +38,7 @@ import {
 } from "./chunk-FMRLPVFZ.mjs";
 import {
   GasFeePoller
-} from "./chunk-VGFPVAKX.mjs";
+} from "./chunk-SFFTNB2X.mjs";
 import {
   getTransactionLayer1GasFee,
   updateTransactionLayer1GasFee
@@ -57,28 +54,32 @@ import {
 } from "./chunk-EKJXGERC.mjs";
 import {
   LineaGasFeeFlow
-} from "./chunk-KYRW4BLA.mjs";
+} from "./chunk-UHG2LLVV.mjs";
 import {
   DefaultGasFeeFlow
-} from "./chunk-AWIJZAW3.mjs";
+} from "./chunk-H2KZOK3J.mjs";
 import {
   updateGasFees
-} from "./chunk-SFFOC25Q.mjs";
+} from "./chunk-VXNPVIYL.mjs";
 import {
   updatePostTransactionBalance,
   updateSwapsTransaction
-} from "./chunk-JIFPK37W.mjs";
+} from "./chunk-GNAL5HC2.mjs";
 import {
+  getIncreasedPriceFromExisting,
   isEIP1559Transaction,
+  isFeeMarketEIP1559Values,
+  isGasPriceValue,
   normalizeGasFeeValues,
   normalizeTransactionParams,
   normalizeTxError,
   validateGasValues,
-  validateIfTransactionUnapproved
-} from "./chunk-UHSRHP55.mjs";
+  validateIfTransactionUnapproved,
+  validateMinimumIncrease
+} from "./chunk-Q56I5ONX.mjs";
 import {
   getGasFeeFlow
-} from "./chunk-NNHSNPT2.mjs";
+} from "./chunk-JXXTNVU4.mjs";
 import {
   projectLogger
 } from "./chunk-UQQWZT6C.mjs";
@@ -142,7 +143,7 @@ function getDefaultTransactionControllerState() {
     lastFetchedBlockNumbers: {}
   };
 }
-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 _internalEvents, _incomingTransactionOptions, _pendingTransactionOptions, _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 TransactionController = class extends BaseController {
   /**
    * Constructs a TransactionController.
@@ -171,7 +172,6 @@ var TransactionController = class extends BaseController {
    * @param options.sign - Function used to sign transactions.
    * @param options.state - Initial state to set on this controller.
    * @param options.testGasFeeFlows - Whether to use the test gas fee flow.
-   * @param options.trace - Callback to generate trace information.
    * @param options.transactionHistoryLimit - Transaction history limit.
    * @param options.hooks - The controller hooks.
    */
@@ -199,7 +199,6 @@ var TransactionController = class extends BaseController {
     sign,
     state,
     testGasFeeFlows,
-    trace,
     transactionHistoryLimit = 40,
     hooks
   }) {
@@ -212,7 +211,6 @@ var TransactionController = class extends BaseController {
         ...state
       }
     });
-    __privateAdd(this, _retryTransaction);
     __privateAdd(this, _createNonceTracker);
     __privateAdd(this, _createIncomingTransactionHelper);
     __privateAdd(this, _createPendingTransactionTracker);
@@ -240,7 +238,6 @@ var TransactionController = class extends BaseController {
     __privateAdd(this, _incomingTransactionOptions, void 0);
     __privateAdd(this, _pendingTransactionOptions, void 0);
     this.signAbortCallbacks = /* @__PURE__ */ new Map();
-    __privateAdd(this, _trace, void 0);
     __privateAdd(this, _transactionHistoryLimit, void 0);
     __privateAdd(this, _isSimulationEnabled, void 0);
     __privateAdd(this, _testGasFeeFlows, void 0);
@@ -268,7 +265,6 @@ var TransactionController = class extends BaseController {
     __privateSet(this, _transactionHistoryLimit, transactionHistoryLimit);
     this.sign = sign;
     __privateSet(this, _testGasFeeFlows, testGasFeeFlows === true);
-    __privateSet(this, _trace, trace ?? ((_request, fn) => fn?.()));
     this.afterSign = hooks?.afterSign ?? (() => true);
     this.beforeApproveOnInit = hooks?.beforeApproveOnInit ?? (() => true);
     this.beforeCheckPendingTransaction = hooks?.beforeCheckPendingTransaction ?? /* istanbul ignore next */
@@ -443,7 +439,6 @@ var TransactionController = class extends BaseController {
    * @param opts.swaps.hasApproveTx - Whether the transaction has an approval transaction.
    * @param opts.swaps.meta - Metadata for swap transaction.
    * @param opts.networkClientId - The id of the network client for this transaction.
-   * @param opts.traceContext - The parent context for any new traces.
    * @returns Object containing a promise resolving to the transaction hash if approved.
    */
   async addTransaction(txParams, {
@@ -455,7 +450,6 @@ var TransactionController = class extends BaseController {
     securityAlertResponse,
     sendFlowHistory,
     swaps = {},
-    traceContext,
     type,
     networkClientId: requestNetworkClientId
   } = {}) {
@@ -507,9 +501,7 @@ var TransactionController = class extends BaseController {
       type: transactionType,
       networkClientId
     };
-    await __privateGet(this, _trace).call(this, { name: "Estimate Gas Properties", parentContext: traceContext }, (context) => this.updateGasProperties(addedTransactionMeta, {
-      traceContext: context
-    }));
+    await this.updateGasProperties(addedTransactionMeta);
     if (!existingTransactionMeta) {
       if (method && this.securityProviderRequest) {
         const securityProviderResponse = await this.securityProviderRequest(
@@ -536,9 +528,7 @@ var TransactionController = class extends BaseController {
       );
       this.addMetadata(addedTransactionMeta);
       if (requireApproval !== false) {
-        __privateMethod(this, _updateSimulationData, updateSimulationData_fn).call(this, addedTransactionMeta, {
-          traceContext
-        }).catch((error) => {
+        __privateMethod(this, _updateSimulationData, updateSimulationData_fn).call(this, addedTransactionMeta).catch((error) => {
           projectLogger("Error while updating simulation data", error);
           throw error;
         });
@@ -554,8 +544,7 @@ var TransactionController = class extends BaseController {
       result: this.processApproval(addedTransactionMeta, {
         isExisting: Boolean(existingTransactionMeta),
         requireApproval,
-        actionId,
-        traceContext
+        actionId
       }),
       transactionMeta: addedTransactionMeta
     };
@@ -605,30 +594,116 @@ var TransactionController = class extends BaseController {
     estimatedBaseFee,
     actionId
   } = {}) {
-    return await __privateMethod(this, _retryTransaction, retryTransaction_fn).call(this, {
+    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 = {
       actionId,
+      chainId: transactionMeta.chainId,
+      networkClientId: transactionMeta.networkClientId,
       estimatedBaseFee,
-      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
-        );
-      }
+      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
     });
+    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.
@@ -643,21 +718,118 @@ var TransactionController = class extends BaseController {
     actionId,
     estimatedBaseFee
   } = {}) {
-    return await __privateMethod(this, _retryTransaction, retryTransaction_fn).call(this, {
-      actionId,
+    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,
-      gasValues,
-      label: "speed up",
-      rate: SPEED_UP_RATE,
-      transactionId,
-      transactionType: "retry" /* retry */,
-      afterSubmit: (newTransactionMeta) => {
-        this.messagingSystem.publish(
-          `${controllerName}:speedupTransactionAdded`,
-          newTransactionMeta
-        );
+      id: random(),
+      time: Date.now(),
+      hash,
+      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
       }
+    };
+    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.
@@ -1334,7 +1506,7 @@ var TransactionController = class extends BaseController {
       ]);
     });
   }
-  async updateGasProperties(transactionMeta, { traceContext } = {}) {
+  async updateGasProperties(transactionMeta) {
     const isEIP1559Compatible = transactionMeta.txParams.type !== "0x0" /* legacy */ && await this.getEIP1559Compatibility(transactionMeta.networkClientId);
     const { networkClientId, chainId } = transactionMeta;
     const isCustomNetwork = __privateMethod(this, _isCustomNetwork, isCustomNetwork_fn).call(this, networkClientId);
@@ -1346,27 +1518,25 @@ var TransactionController = class extends BaseController {
       networkClientId,
       chainId
     });
-    await __privateGet(this, _trace).call(this, { name: "Update Gas", parentContext: traceContext }, async () => {
-      await updateGas({
-        ethQuery,
-        chainId,
-        isCustomNetwork,
-        txMeta: transactionMeta
-      });
+    await updateGas({
+      ethQuery,
+      chainId,
+      isCustomNetwork,
+      txMeta: transactionMeta
     });
-    await __privateGet(this, _trace).call(this, { name: "Update Gas Fees", parentContext: traceContext }, async () => await updateGasFees({
+    await updateGasFees({
       eip1559: isEIP1559Compatible,
       ethQuery,
       gasFeeFlows: this.gasFeeFlows,
       getGasFeeEstimates: this.getGasFeeEstimates,
       getSavedGasFees: this.getSavedGasFees.bind(this),
       txMeta: transactionMeta
-    }));
-    await __privateGet(this, _trace).call(this, { name: "Update Layer 1 Gas Fees", parentContext: traceContext }, async () => await updateTransactionLayer1GasFee({
+    });
+    await updateTransactionLayer1GasFee({
       layer1GasFeeFlows: this.layer1GasFeeFlows,
       provider,
       transactionMeta
-    }));
+    });
   }
   onBootCleanup() {
     this.submitApprovedTransactions();
@@ -1390,8 +1560,7 @@ var TransactionController = class extends BaseController {
     isExisting = false,
     requireApproval,
     shouldShowRequest = true,
-    actionId,
-    traceContext
+    actionId
   }) {
     const transactionId = transactionMeta.id;
     let resultCallbacks;
@@ -1400,10 +1569,9 @@ var TransactionController = class extends BaseController {
     if (meta && !isExisting && !isCompleted) {
       try {
         if (requireApproval !== false) {
-          const acceptResult = await __privateGet(this, _trace).call(this, { name: "Await Approval", parentContext: traceContext }, (context) => this.requestApproval(transactionMeta, {
-            shouldShowRequest,
-            traceContext: context
-          }));
+          const acceptResult = await this.requestApproval(transactionMeta, {
+            shouldShowRequest
+          });
           resultCallbacks = acceptResult.resultCallbacks;
           const approvalValue = acceptResult.value;
           const updatedTransaction = approvalValue?.txMeta;
@@ -1420,10 +1588,7 @@ var TransactionController = class extends BaseController {
         }
         const { isCompleted: isTxCompleted } = this.isTransactionCompleted(transactionId);
         if (!isTxCompleted) {
-          const approvalResult = await this.approveTransaction(
-            transactionId,
-            traceContext
-          );
+          const approvalResult = await this.approveTransaction(transactionId);
           if (approvalResult === "skipped-via-before-publish-hook" /* SkippedViaBeforePublishHook */ && resultCallbacks) {
             resultCallbacks.success();
           }
@@ -1477,9 +1642,8 @@ var TransactionController = class extends BaseController {
    * A `<tx.id>:finished` hub event is fired after success or failure.
    *
    * @param transactionId - The ID of the transaction to approve.
-   * @param traceContext - The parent context for any new traces.
    */
-  async approveTransaction(transactionId, traceContext) {
+  async approveTransaction(transactionId) {
     const cleanupTasks = new Array();
     cleanupTasks.push(await this.mutex.acquire());
     let transactionMeta = this.getTransactionOrThrow(transactionId);
@@ -1527,7 +1691,10 @@ var TransactionController = class extends BaseController {
         };
       });
       this.onTransactionStatusChange(transactionMeta);
-      const rawTx = await __privateGet(this, _trace).call(this, { name: "Sign", parentContext: traceContext }, () => this.signTransaction(transactionMeta, transactionMeta.txParams));
+      const rawTx = await this.signTransaction(
+        transactionMeta,
+        transactionMeta.txParams
+      );
       if (!this.beforePublish(transactionMeta)) {
         projectLogger("Skipping publishing transaction based on hook");
         this.messagingSystem.publish(
@@ -1552,16 +1719,13 @@ var TransactionController = class extends BaseController {
         ]);
       }
       projectLogger("Publishing transaction", transactionMeta.txParams);
-      let hash;
-      await __privateGet(this, _trace).call(this, { name: "Publish", parentContext: traceContext }, async () => {
-        ({ transactionHash: hash } = await this.publish(
-          transactionMeta,
-          rawTx
-        ));
-        if (hash === void 0) {
-          hash = await this.publishTransaction(ethQuery, rawTx);
-        }
-      });
+      let { transactionHash: hash } = await this.publish(
+        transactionMeta,
+        rawTx
+      );
+      if (hash === void 0) {
+        hash = await this.publishTransaction(ethQuery, rawTx);
+      }
       projectLogger("Publish successful", hash);
       transactionMeta = __privateMethod(this, _updateTransactionInternal, updateTransactionInternal_fn).call(this, {
         transactionId,
@@ -1692,19 +1856,11 @@ var TransactionController = class extends BaseController {
       "submitted" /* submitted */
     ].includes(status);
   }
-  async requestApproval(txMeta, {
-    shouldShowRequest,
-    traceContext
-  }) {
+  async requestApproval(txMeta, { shouldShowRequest }) {
     const id = this.getApprovalId(txMeta);
     const { origin } = txMeta;
     const type = ApprovalType.Transaction;
     const requestData = { txId: txMeta.id };
-    await __privateGet(this, _trace).call(this, {
-      name: "Notification Display",
-      id,
-      parentContext: traceContext
-    });
     return await this.messagingSystem.call(
       "ApprovalController:addRequest",
       {
@@ -2088,96 +2244,10 @@ var TransactionController = class extends BaseController {
 _internalEvents = new WeakMap();
 _incomingTransactionOptions = new WeakMap();
 _pendingTransactionOptions = new WeakMap();
-_trace = new WeakMap();
 _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,
@@ -2394,7 +2464,7 @@ onTransactionParamsUpdated_fn = function(transactionMeta, updatedParams) {
   }
 };
 _updateSimulationData = new WeakSet();
-updateSimulationData_fn = async function(transactionMeta, { traceContext } = {}) {
+updateSimulationData_fn = async function(transactionMeta) {
   const { id: transactionId, chainId, txParams } = transactionMeta;
   const { from, to, value, data } = txParams;
   let simulationData = {
@@ -2408,13 +2478,13 @@ updateSimulationData_fn = async function(transactionMeta, { traceContext } = {})
     __privateMethod(this, _updateTransactionInternal, updateTransactionInternal_fn).call(this, { transactionId, skipHistory: true }, (txMeta) => {
       txMeta.simulationData = void 0;
     });
-    simulationData = await __privateGet(this, _trace).call(this, { name: "Simulate", parentContext: traceContext }, () => getSimulationData({
+    simulationData = await getSimulationData({
       chainId,
       from,
       to,
       value,
       data
-    }));
+    });
   }
   const finalTransactionMeta = this.getTransaction(transactionId);
   if (!finalTransactionMeta) {
@@ -2506,4 +2576,4 @@ export {
   ApprovalState,
   TransactionController
 };
-//# sourceMappingURL=chunk-XTMJ25EF.mjs.map
+//# sourceMappingURL=chunk-T3GOPPVF.mjs.map