@metamask/transaction-controller 28.1.1 → 29.0.1

package/dist/{chunk-FMCTVRU2.js → chunk-KT3F6CZP.js}

@@ -1,5 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+
+var _chunkZNZEJDOEjs = require('./chunk-ZNZEJDOE.js');
+
+
 var _chunkX3KACH5Pjs = require('./chunk-X3KACH5P.js');
 
 
@@ -10,6 +14,9 @@ var _chunkSD6CWFDFjs = require('./chunk-SD6CWFDF.js');
 var _chunkVH47Q6TSjs = require('./chunk-VH47Q6TS.js');
 
 
+var _chunk5KMU2IATjs = require('./chunk-5KMU2IAT.js');
+
+
 var _chunk7LXE4KHVjs = require('./chunk-7LXE4KHV.js');
 
 
@@ -22,17 +29,16 @@ var _chunkV72C4MCRjs = require('./chunk-V72C4MCR.js');
 var _chunkQP75SWIQjs = require('./chunk-QP75SWIQ.js');
 
 
-
-var _chunkZNZEJDOEjs = require('./chunk-ZNZEJDOE.js');
-
-
 var _chunkNYKRCWBGjs = require('./chunk-NYKRCWBG.js');
 
 
 var _chunkWR5F34OWjs = require('./chunk-WR5F34OW.js');
 
 
-var _chunkV6UIRCOFjs = require('./chunk-V6UIRCOF.js');
+var _chunkTJMQEH57js = require('./chunk-TJMQEH57.js');
+
+
+var _chunk7DJO6UZAjs = require('./chunk-7DJO6UZA.js');
 
 
 
@@ -48,16 +54,13 @@ var _chunk5XQ2KRYLjs = require('./chunk-5XQ2KRYL.js');
 var _chunkEQT25RSPjs = require('./chunk-EQT25RSP.js');
 
 
-var _chunk5KMU2IATjs = require('./chunk-5KMU2IAT.js');
+var _chunkDUFOYA4Djs = require('./chunk-DUFOYA4D.js');
 
 
-var _chunkLNX4JTOLjs = require('./chunk-LNX4JTOL.js');
+var _chunkVJYFB7BMjs = require('./chunk-VJYFB7BM.js');
 
 
-var _chunk4RJXBKSRjs = require('./chunk-4RJXBKSR.js');
-
-
-var _chunkEQNKFFTMjs = require('./chunk-EQNKFFTM.js');
+var _chunkKNYSD4JPjs = require('./chunk-KNYSD4JP.js');
 
 
 
@@ -76,6 +79,9 @@ var _chunkC2LNDHP4js = require('./chunk-C2LNDHP4.js');
 var _chunkUGFBA4GVjs = require('./chunk-UGFBA4GV.js');
 
 
+var _chunkEMDU4XLMjs = require('./chunk-EMDU4XLM.js');
+
+
 var _chunkS6VGOPUYjs = require('./chunk-S6VGOPUY.js');
 
 
@@ -137,7 +143,7 @@ function getDefaultTransactionControllerState() {
     lastFetchedBlockNumbers: {}
   };
 }
-var _internalEvents, _incomingTransactionOptions, _pendingTransactionOptions, _transactionHistoryLimit, _isSimulationEnabled, _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;
+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;
 var TransactionController = class extends _basecontroller.BaseController {
   /**
    * Constructs a TransactionController.
@@ -166,6 +172,7 @@ var TransactionController = class extends _basecontroller.BaseController {
    * @param options.securityProviderRequest - A function for verifying a transaction, whether it is malicious or not.
    * @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.transactionHistoryLimit - Transaction history limit.
    * @param options.hooks - The controller hooks.
    */
@@ -193,6 +200,7 @@ var TransactionController = class extends _basecontroller.BaseController {
     securityProviderRequest,
     sign,
     state,
+    testGasFeeFlows,
     transactionHistoryLimit = 40,
     hooks
   }) {
@@ -221,14 +229,19 @@ var TransactionController = class extends _basecontroller.BaseController {
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _onTransactionParamsUpdated);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _updateSimulationData);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _onGasFeePollerTransactionUpdate);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getNetworkClientId);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getGlobalNetworkClientId);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getGlobalChainId);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _isCustomNetwork);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _internalEvents, new (0, _events.EventEmitter)());
-    this.inProcessOfSigning = /* @__PURE__ */ new Set();
+    this.approvingTransactionIds = /* @__PURE__ */ new Set();
     this.mutex = new (0, _asyncmutex.Mutex)();
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _incomingTransactionOptions, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _pendingTransactionOptions, void 0);
     this.signAbortCallbacks = /* @__PURE__ */ new Map();
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _transactionHistoryLimit, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _isSimulationEnabled, void 0);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _testGasFeeFlows, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _multichainTrackingHelper, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _checkForPendingTransactionAndStartPolling, () => {
       this.pendingTransactionTracker.startIfPendingTransactions();
@@ -253,6 +266,7 @@ var TransactionController = class extends _basecontroller.BaseController {
     _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _pendingTransactionOptions, pendingTransactions);
     _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _transactionHistoryLimit, transactionHistoryLimit);
     this.sign = sign;
+    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _testGasFeeFlows, testGasFeeFlows === true);
     this.afterSign = hooks?.afterSign ?? (() => true);
     this.beforeApproveOnInit = hooks?.beforeApproveOnInit ?? (() => true);
     this.beforeCheckPendingTransaction = hooks?.beforeCheckPendingTransaction ?? /* istanbul ignore next */
@@ -264,17 +278,18 @@ var TransactionController = class extends _basecontroller.BaseController {
       provider,
       blockTracker
     });
+    const findNetworkClientIdByChainId = (chainId) => {
+      return this.messagingSystem.call(
+        `NetworkController:findNetworkClientIdByChainId`,
+        chainId
+      );
+    };
     _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _multichainTrackingHelper, new (0, _chunk5XQ2KRYLjs.MultichainTrackingHelper)({
       isMultichainEnabled,
       provider,
       nonceTracker: this.nonceTracker,
       incomingTransactionOptions: incomingTransactions,
-      findNetworkClientIdByChainId: (chainId) => {
-        return this.messagingSystem.call(
-          `NetworkController:findNetworkClientIdByChainId`,
-          chainId
-        );
-      },
+      findNetworkClientIdByChainId,
       getNetworkClientById: (networkClientId) => {
         return this.messagingSystem.call(
           `NetworkController:getNetworkClientById`,
@@ -308,9 +323,9 @@ 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, _chunkV6UIRCOFjs.GasFeePoller)({
-      // Default gas fee polling is not yet supported by the clients
-      gasFeeFlows: this.gasFeeFlows.slice(0, -1),
+    const gasFeePoller = new (0, _chunk7DJO6UZAjs.GasFeePoller)({
+      findNetworkClientIdByChainId,
+      gasFeeFlows: this.gasFeeFlows,
       getGasFeeControllerEstimates: this.getGasFeeEstimates,
       getProvider: (chainId, networkClientId) => _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getProvider({
         networkClientId,
@@ -438,15 +453,16 @@ var TransactionController = class extends _basecontroller.BaseController {
     sendFlowHistory,
     swaps = {},
     type,
-    networkClientId
+    networkClientId: requestNetworkClientId
   } = {}) {
     _chunkS6VGOPUYjs.projectLogger.call(void 0, "Adding transaction", txParams);
     txParams = _chunkUGFBA4GVjs.normalizeTransactionParams.call(void 0, txParams);
-    if (networkClientId && !_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).has(networkClientId)) {
+    if (requestNetworkClientId && !_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).has(requestNetworkClientId)) {
       throw new Error(
         "The networkClientId for this transaction could not be found"
       );
     }
+    const networkClientId = requestNetworkClientId ?? _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getGlobalNetworkClientId, getGlobalNetworkClientId_fn).call(this);
     const isEIP1559Compatible = await this.getEIP1559Compatibility(
       networkClientId
     );
@@ -709,9 +725,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       _chunkUGFBA4GVjs.validateGasValues.call(void 0, gasValues);
     }
     _chunkS6VGOPUYjs.projectLogger.call(void 0, "Creating speed up transaction", transactionId, gasValues);
-    const transactionMeta = this.state.transactions.find(
-      ({ id }) => id === transactionId
-    );
+    const transactionMeta = this.getTransaction(transactionId);
     if (!transactionMeta) {
       return;
     }
@@ -760,7 +774,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       unsignedEthTx,
       transactionMeta.txParams.from
     );
-    const transactionMetaWithRsv = await this.updateTransactionMetaRSV(
+    const transactionMetaWithRsv = this.updateTransactionMetaRSV(
       transactionMeta,
       signedTx
     );
@@ -1199,10 +1213,10 @@ var TransactionController = class extends _basecontroller.BaseController {
       common
     });
     const initialTxAsSerializedHex = _util.bufferToHex.call(void 0, initialTxAsEthTx.serialize());
-    if (this.inProcessOfSigning.has(initialTxAsSerializedHex)) {
+    if (this.approvingTransactionIds.has(initialTxAsSerializedHex)) {
       return "";
     }
-    this.inProcessOfSigning.add(initialTxAsSerializedHex);
+    this.approvingTransactionIds.add(initialTxAsSerializedHex);
     let rawTransactions, nonceLock;
     try {
       const fromAddress = initialTx.from;
@@ -1223,7 +1237,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       throw err;
     } finally {
       nonceLock?.releaseLock();
-      this.inProcessOfSigning.delete(initialTxAsSerializedHex);
+      this.approvingTransactionIds.delete(initialTxAsSerializedHex);
     }
     return rawTransactions;
   }
@@ -1264,10 +1278,10 @@ var TransactionController = class extends _basecontroller.BaseController {
       transactionMeta,
       _lodash.pickBy.call(void 0, { hash, status })
     );
-    if (status === "submitted" /* submitted */) {
+    if (updatedTransactionMeta.status === "submitted" /* submitted */) {
       updatedTransactionMeta.submittedTime = (/* @__PURE__ */ new Date()).getTime();
     }
-    if (status === "failed" /* failed */) {
+    if (updatedTransactionMeta.status === "failed" /* failed */) {
       updatedTransactionMeta.error = _chunkUGFBA4GVjs.normalizeTxError.call(void 0, new Error(errorMessage));
     }
     this.updateTransaction(
@@ -1368,6 +1382,37 @@ var TransactionController = class extends _basecontroller.BaseController {
     }
     return filteredTransactions;
   }
+  async estimateGasFee({
+    transactionParams,
+    chainId,
+    networkClientId: requestNetworkClientId
+  }) {
+    const networkClientId = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getNetworkClientId, getNetworkClientId_fn).call(this, {
+      networkClientId: requestNetworkClientId,
+      chainId
+    });
+    const transactionMeta = {
+      txParams: transactionParams,
+      chainId,
+      networkClientId
+    };
+    const gasFeeFlow = _chunkEMDU4XLMjs.getGasFeeFlow.call(void 0, 
+      transactionMeta,
+      this.gasFeeFlows
+    );
+    const ethQuery = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getEthQuery({
+      networkClientId,
+      chainId
+    });
+    const gasFeeControllerData = await this.getGasFeeEstimates({
+      networkClientId
+    });
+    return gasFeeFlow.getGasFees({
+      ethQuery,
+      gasFeeControllerData,
+      transactionMeta
+    });
+  }
   /**
    * Determine the layer 1 gas fee for the given transaction parameters.
    *
@@ -1457,10 +1502,7 @@ var TransactionController = class extends _basecontroller.BaseController {
   async updateGasProperties(transactionMeta) {
     const isEIP1559Compatible = await this.getEIP1559Compatibility(transactionMeta.networkClientId) && transactionMeta.txParams.type !== "0x0" /* legacy */;
     const { networkClientId, chainId } = transactionMeta;
-    const isCustomNetwork = networkClientId ? this.messagingSystem.call(
-      `NetworkController:getNetworkClientById`,
-      networkClientId
-    ).configuration.type === _networkcontroller.NetworkClientType.Custom : this.getNetworkState().providerConfig.type === _controllerutils.NetworkType.rpc;
+    const isCustomNetwork = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _isCustomNetwork, isCustomNetwork_fn).call(this, networkClientId);
     const ethQuery = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getEthQuery({
       networkClientId,
       chainId
@@ -1475,7 +1517,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       isCustomNetwork,
       txMeta: transactionMeta
     });
-    await _chunkEQNKFFTMjs.updateGasFees.call(void 0, {
+    await _chunkKNYSD4JPjs.updateGasFees.call(void 0, {
       eip1559: isEIP1559Compatible,
       ethQuery,
       gasFeeFlows: this.gasFeeFlows,
@@ -1595,68 +1637,62 @@ var TransactionController = class extends _basecontroller.BaseController {
    * @param transactionId - The ID of the transaction to approve.
    */
   async approveTransaction(transactionId) {
-    const { transactions } = this.state;
-    const releaseLock = await this.mutex.acquire();
-    const index = transactions.findIndex(({ id }) => transactionId === id);
-    const transactionMeta = transactions[index];
-    const updatedTransactionMeta = _lodash.cloneDeep.call(void 0, transactionMeta);
-    const {
-      txParams: { from },
-      networkClientId
-    } = transactionMeta;
-    let releaseNonceLock;
+    const cleanupTasks = new Array();
+    cleanupTasks.push(await this.mutex.acquire());
+    let transactionMeta = this.getTransactionOrThrow(transactionId);
     try {
       if (!this.sign) {
-        releaseLock();
         this.failTransaction(
           transactionMeta,
           new Error("No sign method defined.")
         );
         return "not-approved" /* NotApproved */;
       } else if (!transactionMeta.chainId) {
-        releaseLock();
         this.failTransaction(transactionMeta, new Error("No chainId defined."));
         return "not-approved" /* NotApproved */;
       }
-      if (this.inProcessOfSigning.has(transactionId)) {
+      if (this.approvingTransactionIds.has(transactionId)) {
         _chunkS6VGOPUYjs.projectLogger.call(void 0, "Skipping approval as signing in progress", transactionId);
         return "not-approved" /* NotApproved */;
       }
+      this.approvingTransactionIds.add(transactionId);
+      cleanupTasks.push(
+        () => this.approvingTransactionIds.delete(transactionId)
+      );
       const [nonce, releaseNonce] = await _chunkZNZEJDOEjs.getNextNonce.call(void 0, 
         transactionMeta,
-        (address) => _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getNonceLock(address, networkClientId)
-      );
-      releaseNonceLock = releaseNonce;
-      updatedTransactionMeta.status = "approved" /* approved */;
-      updatedTransactionMeta.txParams = {
-        ...updatedTransactionMeta.txParams,
-        nonce,
-        chainId: transactionMeta.chainId
-      };
-      const baseTxParams = {
-        ...updatedTransactionMeta.txParams,
-        gasLimit: updatedTransactionMeta.txParams.gas
-      };
-      this.updateTransaction(
-        updatedTransactionMeta,
-        "TransactionController#approveTransaction - Transaction approved"
+        (address) => _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getNonceLock(
+          address,
+          transactionMeta.networkClientId
+        )
       );
-      this.onTransactionStatusChange(updatedTransactionMeta);
-      const isEIP1559 = _chunkUGFBA4GVjs.isEIP1559Transaction.call(void 0, updatedTransactionMeta.txParams);
-      const txParams = isEIP1559 ? {
-        ...baseTxParams,
-        estimatedBaseFee: updatedTransactionMeta.txParams.estimatedBaseFee,
-        type: "0x2" /* feeMarket */
-      } : baseTxParams;
+      releaseNonce && cleanupTasks.push(releaseNonce);
+      transactionMeta = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _updateTransactionInternal, updateTransactionInternal_fn).call(this, {
+        transactionId,
+        note: "TransactionController#approveTransaction - Transaction approved"
+      }, (draftTxMeta) => {
+        const { txParams, chainId } = draftTxMeta;
+        draftTxMeta.status = "approved" /* approved */;
+        draftTxMeta.txParams = {
+          ...txParams,
+          nonce,
+          chainId,
+          gasLimit: txParams.gas,
+          ..._chunkUGFBA4GVjs.isEIP1559Transaction.call(void 0, txParams) && {
+            type: "0x2" /* feeMarket */
+          }
+        };
+      });
+      this.onTransactionStatusChange(transactionMeta);
       const rawTx = await this.signTransaction(
-        updatedTransactionMeta,
-        txParams
+        transactionMeta,
+        transactionMeta.txParams
       );
-      if (!this.beforePublish(updatedTransactionMeta)) {
+      if (!this.beforePublish(transactionMeta)) {
         _chunkS6VGOPUYjs.projectLogger.call(void 0, "Skipping publishing transaction based on hook");
         this.messagingSystem.publish(
           `${controllerName}:transactionPublishingSkipped`,
-          updatedTransactionMeta
+          transactionMeta
         );
         return "skipped-via-before-publish-hook" /* SkippedViaBeforePublishHook */;
       }
@@ -1667,51 +1703,50 @@ var TransactionController = class extends _basecontroller.BaseController {
         networkClientId: transactionMeta.networkClientId,
         chainId: transactionMeta.chainId
       });
-      if (transactionMeta.type === "swap" /* swap */) {
+      let preTxBalance;
+      const shouldUpdatePreTxBalance = transactionMeta.type === "swap" /* swap */;
+      if (shouldUpdatePreTxBalance) {
         _chunkS6VGOPUYjs.projectLogger.call(void 0, "Determining pre-transaction balance");
-        const preTxBalance = await _controllerutils.query.call(void 0, ethQuery, "getBalance", [from]);
-        updatedTransactionMeta.preTxBalance = preTxBalance;
-        _chunkS6VGOPUYjs.projectLogger.call(void 0, 
-          "Updated pre-transaction balance",
-          updatedTransactionMeta.preTxBalance
-        );
+        preTxBalance = await _controllerutils.query.call(void 0, ethQuery, "getBalance", [
+          transactionMeta.txParams.from
+        ]);
       }
-      _chunkS6VGOPUYjs.projectLogger.call(void 0, "Publishing transaction", txParams);
+      _chunkS6VGOPUYjs.projectLogger.call(void 0, "Publishing transaction", transactionMeta.txParams);
       let { transactionHash: hash } = await this.publish(
-        updatedTransactionMeta,
+        transactionMeta,
         rawTx
       );
       if (hash === void 0) {
         hash = await this.publishTransaction(ethQuery, rawTx);
       }
       _chunkS6VGOPUYjs.projectLogger.call(void 0, "Publish successful", hash);
-      updatedTransactionMeta.hash = hash;
-      updatedTransactionMeta.status = "submitted" /* submitted */;
-      updatedTransactionMeta.submittedTime = (/* @__PURE__ */ new Date()).getTime();
-      this.updateTransaction(
-        updatedTransactionMeta,
-        "TransactionController#approveTransaction - Transaction submitted"
-      );
+      transactionMeta = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _updateTransactionInternal, updateTransactionInternal_fn).call(this, {
+        transactionId,
+        note: "TransactionController#approveTransaction - Transaction submitted"
+      }, (draftTxMeta) => {
+        draftTxMeta.hash = hash;
+        draftTxMeta.status = "submitted" /* submitted */;
+        draftTxMeta.submittedTime = (/* @__PURE__ */ new Date()).getTime();
+        if (shouldUpdatePreTxBalance) {
+          draftTxMeta.preTxBalance = preTxBalance;
+          _chunkS6VGOPUYjs.projectLogger.call(void 0, "Updated pre-transaction balance", preTxBalance);
+        }
+      });
       this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
-        transactionMeta: updatedTransactionMeta
+        transactionMeta
       });
       this.messagingSystem.publish(
         `${controllerName}:transactionFinished`,
-        updatedTransactionMeta
-      );
-      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _internalEvents).emit(
-        `${updatedTransactionMeta.id}:finished`,
-        updatedTransactionMeta
+        transactionMeta
       );
-      this.onTransactionStatusChange(updatedTransactionMeta);
+      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _internalEvents).emit(`${transactionId}:finished`, transactionMeta);
+      this.onTransactionStatusChange(transactionMeta);
       return "approved" /* Approved */;
     } catch (error) {
       this.failTransaction(transactionMeta, error);
       return "not-approved" /* NotApproved */;
     } finally {
-      this.inProcessOfSigning.delete(transactionId);
-      releaseNonceLock?.();
-      releaseLock();
+      cleanupTasks.forEach((task) => task());
     }
   }
   async publishTransaction(ethQuery, rawTransaction) {
@@ -1833,6 +1868,15 @@ var TransactionController = class extends _basecontroller.BaseController {
     const { transactions } = this.state;
     return transactions.find(({ id }) => id === transactionId);
   }
+  getTransactionOrThrow(transactionId, errorMessagePrefix = "TransactionController") {
+    const txMeta = this.getTransaction(transactionId);
+    if (!txMeta) {
+      throw new Error(
+        `${errorMessagePrefix}: No transaction found with id ${transactionId}`
+      );
+    }
+    return txMeta;
+  }
   getApprovalId(txMeta) {
     return String(txMeta.id);
   }
@@ -1845,14 +1889,15 @@ var TransactionController = class extends _basecontroller.BaseController {
     return { meta: transaction, isCompleted };
   }
   getChainId(networkClientId) {
-    if (networkClientId) {
-      return this.messagingSystem.call(
-        `NetworkController:getNetworkClientById`,
-        networkClientId
-      ).configuration.chainId;
+    const globalChainId = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getGlobalChainId, getGlobalChainId_fn).call(this);
+    const globalNetworkClientId = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getGlobalNetworkClientId, getGlobalNetworkClientId_fn).call(this);
+    if (!networkClientId || networkClientId === globalNetworkClientId) {
+      return globalChainId;
     }
-    const { providerConfig } = this.getNetworkState();
-    return providerConfig.chainId;
+    return this.messagingSystem.call(
+      `NetworkController:getNetworkClientById`,
+      networkClientId
+    ).configuration.chainId;
   }
   prepareUnsignedEthTx(chainId, txParams) {
     return _tx.TransactionFactory.fromTxData(txParams, {
@@ -2040,8 +2085,9 @@ var TransactionController = class extends _basecontroller.BaseController {
    *
    * @param transactionMeta - The TransactionMeta object to update.
    * @param signedTx - The encompassing type for all transaction types containing r, s, and v values.
+   * @returns The updated TransactionMeta object.
    */
-  async updateTransactionMetaRSV(transactionMeta, signedTx) {
+  updateTransactionMetaRSV(transactionMeta, signedTx) {
     const transactionMetaWithRsv = _lodash.cloneDeep.call(void 0, transactionMeta);
     for (const key of ["r", "s", "v"]) {
       const value = signedTx[key];
@@ -2063,7 +2109,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       transactionMeta.chainId,
       txParams
     );
-    this.inProcessOfSigning.add(transactionMeta.id);
+    this.approvingTransactionIds.add(transactionMeta.id);
     const signedTx = await new Promise((resolve, reject) => {
       this.sign?.(
         unsignedEthTx,
@@ -2089,7 +2135,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       return void 0;
     }
     const transactionMetaWithRsv = {
-      ...await this.updateTransactionMetaRSV(transactionMeta, signedTx),
+      ...this.updateTransactionMetaRSV(transactionMeta, signedTx),
       status: "signed" /* signed */
     };
     this.updateTransaction(
@@ -2187,6 +2233,7 @@ _incomingTransactionOptions = new WeakMap();
 _pendingTransactionOptions = new WeakMap();
 _transactionHistoryLimit = new WeakMap();
 _isSimulationEnabled = new WeakMap();
+_testGasFeeFlows = new WeakMap();
 _multichainTrackingHelper = new WeakMap();
 _createNonceTracker = new WeakSet();
 createNonceTracker_fn = function({
@@ -2326,7 +2373,10 @@ getNonceTrackerPendingTransactions_fn = function(chainId, address) {
 };
 _getGasFeeFlows = new WeakSet();
 getGasFeeFlows_fn = function() {
-  return [new (0, _chunkLNX4JTOLjs.LineaGasFeeFlow)(), new (0, _chunk4RJXBKSRjs.DefaultGasFeeFlow)()];
+  if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _testGasFeeFlows)) {
+    return [new (0, _chunkTJMQEH57js.TestGasFeeFlow)()];
+  }
+  return [new (0, _chunkDUFOYA4Djs.LineaGasFeeFlow)(), new (0, _chunkVJYFB7BMjs.DefaultGasFeeFlow)()];
 };
 _getLayer1GasFeeFlows = new WeakSet();
 getLayer1GasFeeFlows_fn = function() {
@@ -2364,6 +2414,7 @@ updateTransactionInternal_fn = function({
   if (updatedTransactionParams.length > 0) {
     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _onTransactionParamsUpdated, onTransactionParamsUpdated_fn).call(this, transactionMeta, updatedTransactionParams);
   }
+  return transactionMeta;
 };
 _checkIfTransactionParamsUpdated = new WeakSet();
 checkIfTransactionParamsUpdated_fn = function(newTransactionMeta) {
@@ -2453,6 +2504,43 @@ onGasFeePollerTransactionUpdate_fn = function({
     }
   });
 };
+_getNetworkClientId = new WeakSet();
+getNetworkClientId_fn = function({
+  networkClientId: requestNetworkClientId,
+  chainId
+}) {
+  const globalChainId = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getGlobalChainId, getGlobalChainId_fn).call(this);
+  const globalNetworkClientId = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getGlobalNetworkClientId, getGlobalNetworkClientId_fn).call(this);
+  if (requestNetworkClientId) {
+    return requestNetworkClientId;
+  }
+  if (!chainId || chainId === globalChainId) {
+    return globalNetworkClientId;
+  }
+  return this.messagingSystem.call(
+    `NetworkController:findNetworkClientIdByChainId`,
+    chainId
+  );
+};
+_getGlobalNetworkClientId = new WeakSet();
+getGlobalNetworkClientId_fn = function() {
+  return this.getNetworkState().selectedNetworkClientId;
+};
+_getGlobalChainId = new WeakSet();
+getGlobalChainId_fn = function() {
+  return this.getNetworkState().providerConfig.chainId;
+};
+_isCustomNetwork = new WeakSet();
+isCustomNetwork_fn = function(networkClientId) {
+  const globalNetworkClientId = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getGlobalNetworkClientId, getGlobalNetworkClientId_fn).call(this);
+  if (!networkClientId || networkClientId === globalNetworkClientId) {
+    return this.getNetworkState().providerConfig.type === _controllerutils.NetworkType.rpc;
+  }
+  return this.messagingSystem.call(
+    `NetworkController:getNetworkClientById`,
+    networkClientId
+  ).configuration.type === _networkcontroller.NetworkClientType.Custom;
+};
 
 
 
@@ -2461,4 +2549,4 @@ onGasFeePollerTransactionUpdate_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-FMCTVRU2.js.map
+//# sourceMappingURL=chunk-KT3F6CZP.js.map