@metamask/transaction-controller 54.0.0 → 54.2.0

package/dist/TransactionController.mjs

@@ -1,15 +1,15 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _TransactionController_instances, _TransactionController_internalEvents, _TransactionController_methodDataHelper, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_publishBatchHook, _TransactionController_publicKeyEIP7702, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_testGasFeeFlows, _TransactionController_multichainTrackingHelper, _TransactionController_retryTransaction, _TransactionController_rejectTransaction, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_markNonceDuplicatesDropped, _TransactionController_signTransaction, _TransactionController_onConfirmedTransaction, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateFirstTimeInteraction, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow;
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_afterSign, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isHistoryDisabled, _TransactionController_isSendFlowHistoryDisabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_securityProviderRequest, _TransactionController_sign, _TransactionController_signAbortCallbacks, _TransactionController_testGasFeeFlows, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_retryTransaction, _TransactionController_signExternalTransaction, _TransactionController_addMetadata, _TransactionController_updateGasProperties, _TransactionController_onBootCleanup, _TransactionController_failIncompleteTransactions, _TransactionController_processApproval, _TransactionController_approveTransaction, _TransactionController_publishTransaction, _TransactionController_rejectTransaction, _TransactionController_trimTransactionsForState, _TransactionController_isFinalState, _TransactionController_isLocalFinalState, _TransactionController_requestApproval, _TransactionController_getTransaction, _TransactionController_getTransactionOrThrow, _TransactionController_getApprovalId, _TransactionController_isTransactionCompleted, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _TransactionController_getTransactionWithActionId, _TransactionController_waitForTransactionFinished, _TransactionController_updateTransactionMetaRSV, _TransactionController_getEIP1559Compatibility, _TransactionController_signTransaction, _TransactionController_onTransactionStatusChange, _TransactionController_getNonceTrackerTransactions, _TransactionController_onConfirmedTransaction, _TransactionController_updatePostBalance, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_publishTransactionForRetry, _TransactionController_isTransactionAlreadyConfirmedError, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateFirstTimeInteraction, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction;
 function $importDefault(module) {
     if (module?.__esModule) {
         return module.default;
@@ -22,7 +22,7 @@ import $EthQuery from "@metamask/eth-query";
 const EthQuery = $importDefault($EthQuery);
 import { NetworkClientType } from "@metamask/network-controller";
 import { NonceTracker } from "@metamask/nonce-tracker";
-import { errorCodes, rpcErrors, providerErrors } from "@metamask/rpc-errors";
+import { errorCodes, rpcErrors, providerErrors, JsonRpcError } from "@metamask/rpc-errors";
 import { add0x, hexToNumber, remove0x } from "@metamask/utils";
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
@@ -62,7 +62,7 @@ import { getSimulationData } from "./utils/simulation.mjs";
 import { updatePostTransactionBalance, updateSwapsTransaction } from "./utils/swaps.mjs";
 import { determineTransactionType } from "./utils/transaction-type.mjs";
 import { normalizeTransactionParams, isEIP1559Transaction, validateGasValues, validateIfTransactionUnapproved, normalizeTxError, normalizeGasFeeValues, setEnvelopeType } from "./utils/utils.mjs";
-import { validateParamTo, validateTransactionOrigin, validateTxParams } from "./utils/validation.mjs";
+import { ErrorCode, validateParamTo, validateTransactionOrigin, validateTxParams } from "./utils/validation.mjs";
 /**
  * Metadata for the TransactionController state, describing how to "anonymize"
  * the state and which parts should be persisted.
@@ -124,42 +124,13 @@ function getDefaultTransactionControllerState() {
  * Controller responsible for submitting and managing transactions.
  */
 export class TransactionController extends BaseController {
-    failTransaction(transactionMeta, error, actionId) {
-        let newTransactionMeta;
-        try {
-            newTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
-                transactionId: transactionMeta.id,
-                note: 'TransactionController#failTransaction - Add error message and set status to failed',
-                skipValidation: true,
-            }, (draftTransactionMeta) => {
-                draftTransactionMeta.status = TransactionStatus.failed;
-                draftTransactionMeta.error = normalizeTxError(error);
-            });
-        }
-        catch (err) {
-            log('Failed to mark transaction as failed', err);
-            newTransactionMeta = {
-                ...transactionMeta,
-                status: TransactionStatus.failed,
-                error: normalizeTxError(error),
-            };
-        }
-        this.messagingSystem.publish(`${controllerName}:transactionFailed`, {
-            actionId,
-            error: error.message,
-            transactionMeta: newTransactionMeta,
-        });
-        this.onTransactionStatusChange(newTransactionMeta);
-        this.messagingSystem.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
-        __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, newTransactionMeta);
-    }
     /**
      * Constructs a TransactionController.
      *
      * @param options - The controller options.
      */
     constructor(options) {
-        const { disableHistory, disableSendFlowHistory, disableSwaps, isAutomaticGasFeeUpdateEnabled, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, incomingTransactions = {}, isFirstTimeInteractionEnabled, isSimulationEnabled, messenger, pendingTransactions = {}, publicKeyEIP7702, securityProviderRequest, sign, state, testGasFeeFlows, trace, transactionHistoryLimit = 40, hooks, } = options;
+        const { disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, hooks, incomingTransactions = {}, isAutomaticGasFeeUpdateEnabled, isFirstTimeInteractionEnabled, isSimulationEnabled, messenger, pendingTransactions = {}, publicKeyEIP7702, securityProviderRequest, sign, state, testGasFeeFlows, trace, transactionHistoryLimit = 40, } = options;
         super({
             name: controllerName,
             metadata,
@@ -170,61 +141,76 @@ export class TransactionController extends BaseController {
             },
         });
         _TransactionController_instances.add(this);
-        _TransactionController_internalEvents.set(this, new EventEmitter());
-        this.approvingTransactionIds = new Set();
-        _TransactionController_methodDataHelper.set(this, void 0);
+        _TransactionController_afterAdd.set(this, void 0);
+        _TransactionController_afterSign.set(this, void 0);
+        _TransactionController_approvingTransactionIds.set(this, new Set());
+        _TransactionController_beforeCheckPendingTransaction.set(this, void 0);
+        _TransactionController_beforePublish.set(this, void 0);
+        _TransactionController_gasFeeFlows.set(this, void 0);
+        _TransactionController_getAdditionalSignArguments.set(this, void 0);
+        _TransactionController_getCurrentAccountEIP1559Compatibility.set(this, void 0);
+        _TransactionController_getCurrentNetworkEIP1559Compatibility.set(this, void 0);
+        _TransactionController_getExternalPendingTransactions.set(this, void 0);
+        _TransactionController_getGasFeeEstimates.set(this, void 0);
+        _TransactionController_getNetworkState.set(this, void 0);
+        _TransactionController_getPermittedAccounts.set(this, void 0);
+        _TransactionController_getSavedGasFees.set(this, void 0);
         _TransactionController_incomingTransactionHelper.set(this, void 0);
         _TransactionController_incomingTransactionOptions.set(this, void 0);
+        _TransactionController_internalEvents.set(this, new EventEmitter());
+        _TransactionController_isAutomaticGasFeeUpdateEnabled.set(this, void 0);
+        _TransactionController_isFirstTimeInteractionEnabled.set(this, void 0);
+        _TransactionController_isHistoryDisabled.set(this, void 0);
+        _TransactionController_isSendFlowHistoryDisabled.set(this, void 0);
+        _TransactionController_isSimulationEnabled.set(this, void 0);
+        _TransactionController_isSwapsDisabled.set(this, void 0);
+        _TransactionController_layer1GasFeeFlows.set(this, void 0);
+        _TransactionController_methodDataHelper.set(this, void 0);
+        _TransactionController_multichainTrackingHelper.set(this, void 0);
         _TransactionController_pendingTransactionOptions.set(this, void 0);
-        _TransactionController_publishBatchHook.set(this, void 0);
         _TransactionController_publicKeyEIP7702.set(this, void 0);
-        this.signAbortCallbacks = new Map();
+        _TransactionController_publish.set(this, void 0);
+        _TransactionController_publishBatchHook.set(this, void 0);
+        _TransactionController_securityProviderRequest.set(this, void 0);
+        _TransactionController_sign.set(this, void 0);
+        _TransactionController_signAbortCallbacks.set(this, new Map());
+        _TransactionController_testGasFeeFlows.set(this, void 0);
         _TransactionController_trace.set(this, void 0);
         _TransactionController_transactionHistoryLimit.set(this, void 0);
-        _TransactionController_isFirstTimeInteractionEnabled.set(this, void 0);
-        _TransactionController_isSimulationEnabled.set(this, void 0);
-        _TransactionController_testGasFeeFlows.set(this, void 0);
-        _TransactionController_multichainTrackingHelper.set(this, void 0);
         _TransactionController_checkForPendingTransactionAndStartPolling.set(this, () => {
             __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").checkForPendingTransactionAndStartPolling();
         });
         this.messagingSystem = messenger;
-        this.isTxParamsGasFeeUpdatesEnabled =
-            isAutomaticGasFeeUpdateEnabled ?? ((_txMeta) => false);
-        this.getNetworkState = getNetworkState;
-        this.isSendFlowHistoryDisabled = disableSendFlowHistory ?? false;
-        this.isHistoryDisabled = disableHistory ?? false;
-        this.isSwapsDisabled = disableSwaps ?? false;
+        __classPrivateFieldSet(this, _TransactionController_afterAdd, hooks?.afterAdd ?? (() => Promise.resolve({})), "f");
+        __classPrivateFieldSet(this, _TransactionController_afterSign, hooks?.afterSign ?? (() => true), "f");
+        __classPrivateFieldSet(this, _TransactionController_beforeCheckPendingTransaction, 
+        /* istanbul ignore next */
+        hooks?.beforeCheckPendingTransaction ?? (() => Promise.resolve(true)), "f");
+        __classPrivateFieldSet(this, _TransactionController_beforePublish, hooks?.beforePublish ?? (() => Promise.resolve(true)), "f");
+        __classPrivateFieldSet(this, _TransactionController_getAdditionalSignArguments, hooks?.getAdditionalSignArguments ?? (() => []), "f");
+        __classPrivateFieldSet(this, _TransactionController_getCurrentAccountEIP1559Compatibility, getCurrentAccountEIP1559Compatibility ?? (() => Promise.resolve(true)), "f");
+        __classPrivateFieldSet(this, _TransactionController_getCurrentNetworkEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, "f");
+        __classPrivateFieldSet(this, _TransactionController_getExternalPendingTransactions, getExternalPendingTransactions ?? (() => []), "f");
+        __classPrivateFieldSet(this, _TransactionController_getGasFeeEstimates, getGasFeeEstimates || (() => Promise.resolve({})), "f");
+        __classPrivateFieldSet(this, _TransactionController_getNetworkState, getNetworkState, "f");
+        __classPrivateFieldSet(this, _TransactionController_getPermittedAccounts, getPermittedAccounts, "f");
+        __classPrivateFieldSet(this, _TransactionController_getSavedGasFees, getSavedGasFees ?? ((_chainId) => undefined), "f");
+        __classPrivateFieldSet(this, _TransactionController_incomingTransactionOptions, incomingTransactions, "f");
+        __classPrivateFieldSet(this, _TransactionController_isAutomaticGasFeeUpdateEnabled, isAutomaticGasFeeUpdateEnabled ?? ((_txMeta) => false), "f");
         __classPrivateFieldSet(this, _TransactionController_isFirstTimeInteractionEnabled, isFirstTimeInteractionEnabled ?? (() => true), "f");
+        __classPrivateFieldSet(this, _TransactionController_isHistoryDisabled, disableHistory ?? false, "f");
+        __classPrivateFieldSet(this, _TransactionController_isSendFlowHistoryDisabled, disableSendFlowHistory ?? false, "f");
         __classPrivateFieldSet(this, _TransactionController_isSimulationEnabled, isSimulationEnabled ?? (() => true), "f");
-        this.getSavedGasFees = getSavedGasFees ?? ((_chainId) => undefined);
-        this.getCurrentAccountEIP1559Compatibility =
-            getCurrentAccountEIP1559Compatibility ?? (() => Promise.resolve(true));
-        this.getCurrentNetworkEIP1559Compatibility =
-            getCurrentNetworkEIP1559Compatibility;
-        this.getGasFeeEstimates =
-            getGasFeeEstimates || (() => Promise.resolve({}));
-        this.getPermittedAccounts = getPermittedAccounts;
-        this.getExternalPendingTransactions =
-            getExternalPendingTransactions ?? (() => []);
-        this.securityProviderRequest = securityProviderRequest;
-        __classPrivateFieldSet(this, _TransactionController_incomingTransactionOptions, incomingTransactions, "f");
+        __classPrivateFieldSet(this, _TransactionController_isSwapsDisabled, disableSwaps ?? false, "f");
         __classPrivateFieldSet(this, _TransactionController_pendingTransactionOptions, pendingTransactions, "f");
-        __classPrivateFieldSet(this, _TransactionController_publishBatchHook, hooks?.publishBatch, "f");
         __classPrivateFieldSet(this, _TransactionController_publicKeyEIP7702, publicKeyEIP7702, "f");
-        __classPrivateFieldSet(this, _TransactionController_transactionHistoryLimit, transactionHistoryLimit, "f");
-        this.sign = sign;
+        __classPrivateFieldSet(this, _TransactionController_publish, hooks?.publish ?? (() => Promise.resolve({ transactionHash: undefined })), "f");
+        __classPrivateFieldSet(this, _TransactionController_publishBatchHook, hooks?.publishBatch, "f");
+        __classPrivateFieldSet(this, _TransactionController_securityProviderRequest, securityProviderRequest, "f");
+        __classPrivateFieldSet(this, _TransactionController_sign, sign, "f");
         __classPrivateFieldSet(this, _TransactionController_testGasFeeFlows, testGasFeeFlows === true, "f");
         __classPrivateFieldSet(this, _TransactionController_trace, trace ?? ((_request, fn) => fn?.()), "f");
-        this.afterSign = hooks?.afterSign ?? (() => true);
-        this.beforeCheckPendingTransaction =
-            /* istanbul ignore next */
-            hooks?.beforeCheckPendingTransaction ?? (() => Promise.resolve(true));
-        this.beforePublish = hooks?.beforePublish ?? (() => Promise.resolve(true));
-        this.getAdditionalSignArguments =
-            hooks?.getAdditionalSignArguments ?? (() => []);
-        this.publish =
-            hooks?.publish ?? (() => Promise.resolve({ transactionHash: undefined }));
+        __classPrivateFieldSet(this, _TransactionController_transactionHistoryLimit, transactionHistoryLimit, "f");
         const findNetworkClientIdByChainId = (chainId) => {
             return this.messagingSystem.call(`NetworkController:findNetworkClientIdByChainId`, chainId);
         };
@@ -242,15 +228,15 @@ export class TransactionController extends BaseController {
             },
         }), "f");
         __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").initialize();
-        this.gasFeeFlows = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGasFeeFlows).call(this);
-        this.layer1GasFeeFlows = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getLayer1GasFeeFlows).call(this);
+        __classPrivateFieldSet(this, _TransactionController_gasFeeFlows, __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGasFeeFlows).call(this), "f");
+        __classPrivateFieldSet(this, _TransactionController_layer1GasFeeFlows, __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getLayer1GasFeeFlows).call(this), "f");
         const gasFeePoller = new GasFeePoller({
             findNetworkClientIdByChainId,
-            gasFeeFlows: this.gasFeeFlows,
-            getGasFeeControllerEstimates: this.getGasFeeEstimates,
+            gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
+            getGasFeeControllerEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
             getProvider: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId }),
             getTransactions: () => this.state.transactions,
-            layer1GasFeeFlows: this.layer1GasFeeFlows,
+            layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
             messenger: this.messagingSystem,
             onStateChange: (listener) => {
                 this.messagingSystem.subscribe('TransactionController:stateChange', listener);
@@ -279,7 +265,7 @@ export class TransactionController extends BaseController {
             isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
             queryEntireHistory: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").queryEntireHistory,
             remoteTransactionSource: new AccountsApiRemoteTransactionSource(),
-            trimTransactions: this.trimTransactionsForState.bind(this),
+            trimTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).bind(this),
             updateCache,
             updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
         }), "f");
@@ -294,7 +280,7 @@ export class TransactionController extends BaseController {
             },
             getTransactions: () => this.state.transactions,
         });
-        this.onBootCleanup();
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onBootCleanup).call(this);
         __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f").call(this);
         __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_registerActionHandlers).call(this);
     }
@@ -326,7 +312,7 @@ export class TransactionController extends BaseController {
             getChainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).bind(this),
             getEthQuery: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId }),
             getInternalAccounts: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getInternalAccounts).bind(this),
-            getTransaction: (transactionId) => this.getTransactionOrThrow(transactionId),
+            getTransaction: (transactionId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId),
             messenger: this.messagingSystem,
             publishBatchHook: __classPrivateFieldGet(this, _TransactionController_publishBatchHook, "f"),
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
@@ -387,7 +373,7 @@ export class TransactionController extends BaseController {
         });
         const permittedAddresses = origin === undefined
             ? undefined
-            : await this.getPermittedAccounts?.(origin);
+            : await __classPrivateFieldGet(this, _TransactionController_getPermittedAccounts, "f")?.call(this, origin);
         const selectedAddress = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getSelectedAccount).call(this).address;
         const internalAccounts = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getInternalAccounts).call(this);
         await validateTransactionOrigin({
@@ -401,7 +387,7 @@ export class TransactionController extends BaseController {
             type,
         });
         const delegationAddressPromise = getDelegationAddress(txParams.from, ethQuery).catch(() => undefined);
-        const isEIP1559Compatible = await this.getEIP1559Compatibility(networkClientId);
+        const isEIP1559Compatible = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEIP1559Compatibility).call(this, networkClientId);
         validateTxParams(txParams, isEIP1559Compatible, chainId);
         if (!txParams.type) {
             // Determine transaction type based on transaction parameters and network compatibility
@@ -410,12 +396,12 @@ export class TransactionController extends BaseController {
         const isDuplicateBatchId = batchId?.length &&
             this.state.transactions.some((tx) => tx.batchId?.toLowerCase() === batchId?.toLowerCase());
         if (isDuplicateBatchId && origin && origin !== ORIGIN_METAMASK) {
-            throw rpcErrors.invalidInput('Batch ID already exists');
+            throw new JsonRpcError(ErrorCode.DuplicateBundleId, 'Batch ID already exists');
         }
-        const dappSuggestedGasFees = this.generateDappSuggestedGasFees(txParams, origin);
+        const dappSuggestedGasFees = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_generateDappSuggestedGasFees).call(this, txParams, origin);
         const transactionType = type ?? (await determineTransactionType(txParams, ethQuery)).type;
         const delegationAddress = await delegationAddressPromise;
-        const existingTransactionMeta = this.getTransactionWithActionId(actionId);
+        const existingTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionWithActionId).call(this, actionId);
         // If a request to add a transaction with the same actionId is submitted again, a new transaction will not be created for it.
         let addedTransactionMeta = existingTransactionMeta
             ? cloneDeep(existingTransactionMeta)
@@ -441,30 +427,38 @@ export class TransactionController extends BaseController {
                 userEditedGasLimit: false,
                 verifiedOnBlockchain: false,
             };
-        await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Estimate Gas Properties', parentContext: traceContext }, (context) => this.updateGasProperties(addedTransactionMeta, {
+        const { updateTransaction } = await __classPrivateFieldGet(this, _TransactionController_afterAdd, "f").call(this, {
+            transactionMeta: addedTransactionMeta,
+        });
+        if (updateTransaction) {
+            log('Updating transaction using afterAdd hook');
+            addedTransactionMeta.txParamsOriginal = cloneDeep(addedTransactionMeta.txParams);
+            updateTransaction(addedTransactionMeta);
+        }
+        await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Estimate Gas Properties', parentContext: traceContext }, (context) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasProperties).call(this, addedTransactionMeta, {
             traceContext: context,
         }));
         // Checks if a transaction already exists with a given actionId
         if (!existingTransactionMeta) {
             // Set security provider response
-            if (method && this.securityProviderRequest) {
-                const securityProviderResponse = await this.securityProviderRequest(addedTransactionMeta, method);
+            if (method && __classPrivateFieldGet(this, _TransactionController_securityProviderRequest, "f")) {
+                const securityProviderResponse = await __classPrivateFieldGet(this, _TransactionController_securityProviderRequest, "f").call(this, addedTransactionMeta, method);
                 addedTransactionMeta.securityProviderResponse =
                     securityProviderResponse;
             }
-            if (!this.isSendFlowHistoryDisabled) {
+            if (!__classPrivateFieldGet(this, _TransactionController_isSendFlowHistoryDisabled, "f")) {
                 addedTransactionMeta.sendFlowHistory = sendFlowHistory ?? [];
             }
             // Initial history push
-            if (!this.isHistoryDisabled) {
+            if (!__classPrivateFieldGet(this, _TransactionController_isHistoryDisabled, "f")) {
                 addedTransactionMeta = addInitialHistorySnapshot(addedTransactionMeta);
             }
             addedTransactionMeta = updateSwapsTransaction(addedTransactionMeta, transactionType, swaps, {
-                isSwapsDisabled: this.isSwapsDisabled,
+                isSwapsDisabled: __classPrivateFieldGet(this, _TransactionController_isSwapsDisabled, "f"),
                 cancelTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransaction).bind(this),
                 messenger: this.messagingSystem,
             });
-            this.addMetadata(addedTransactionMeta);
+            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addMetadata).call(this, addedTransactionMeta);
             if (requireApproval !== false) {
                 __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSimulationData).call(this, addedTransactionMeta, {
                     traceContext,
@@ -484,7 +478,7 @@ export class TransactionController extends BaseController {
             this.messagingSystem.publish(`${controllerName}:unapprovedTransactionAdded`, addedTransactionMeta);
         }
         return {
-            result: this.processApproval(addedTransactionMeta, {
+            result: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_processApproval).call(this, addedTransactionMeta, {
                 actionId,
                 isExisting: Boolean(existingTransactionMeta),
                 publishHook,
@@ -623,7 +617,7 @@ export class TransactionController extends BaseController {
         if (!securityAlertResponse) {
             throw new Error('updateSecurityAlertResponse: securityAlertResponse should not be null');
         }
-        const transactionMeta = this.getTransaction(transactionId);
+        const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
         if (!transactionMeta) {
             throw new Error(`Cannot update security alert response as no transaction metadata found`);
         }
@@ -656,7 +650,7 @@ export class TransactionController extends BaseController {
             return !isMatchingAddress;
         });
         this.update((state) => {
-            state.transactions = this.trimTransactionsForState(newTransactions);
+            state.transactions = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).call(this, newTransactions);
         });
     }
     /**
@@ -668,7 +662,7 @@ export class TransactionController extends BaseController {
      */
     async confirmExternalTransaction(transactionMeta, transactionReceipt, baseFeePerGas) {
         // Run validation and add external transaction to state.
-        const newTransactionMeta = this.addExternalTransaction(transactionMeta);
+        const newTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addExternalTransaction).call(this, transactionMeta);
         try {
             const transactionId = newTransactionMeta.id;
             // Make sure status is confirmed and define gasUsed as in receipt.
@@ -684,9 +678,9 @@ export class TransactionController extends BaseController {
             __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_markNonceDuplicatesDropped).call(this, transactionId);
             // Update external provided transaction with updated gas values and confirmed status.
             this.updateTransaction(updatedTransactionMeta, `${controllerName}:confirmExternalTransaction - Add external transaction`);
-            this.onTransactionStatusChange(updatedTransactionMeta);
+            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, updatedTransactionMeta);
             // Intentional given potential duration of process.
-            this.updatePostBalance(updatedTransactionMeta).catch((error) => {
+            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updatePostBalance).call(this, updatedTransactionMeta).catch((error) => {
                 /* istanbul ignore next */
                 log('Error while updating post balance', error);
                 throw error;
@@ -706,10 +700,10 @@ export class TransactionController extends BaseController {
      * @returns The updated transactionMeta.
      */
     updateTransactionSendFlowHistory(transactionID, currentSendFlowHistoryLength, sendFlowHistoryToAdd) {
-        if (this.isSendFlowHistoryDisabled) {
+        if (__classPrivateFieldGet(this, _TransactionController_isSendFlowHistoryDisabled, "f")) {
             throw new Error('Send flow history is disabled for the current transaction controller');
         }
-        const transactionMeta = this.getTransaction(transactionID);
+        const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionID);
         if (!transactionMeta) {
             throw new Error(`Cannot update send flow history as no transaction metadata found`);
         }
@@ -722,7 +716,7 @@ export class TransactionController extends BaseController {
             };
             this.updateTransaction(updatedTransactionMeta, `${controllerName}:updateTransactionSendFlowHistory - sendFlowHistory updated`);
         }
-        return this.getTransaction(transactionID);
+        return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionID);
     }
     /**
      * Update the gas values of a transaction.
@@ -743,7 +737,7 @@ export class TransactionController extends BaseController {
      * @returns The updated transactionMeta.
      */
     updateTransactionGasFees(transactionId, { defaultGasEstimates, estimateUsed, estimateSuggested, gas, gasLimit, gasPrice, maxPriorityFeePerGas, maxFeePerGas, originalGasEstimate, userEditedGasLimit, userFeeLevel, }) {
-        const transactionMeta = this.getTransaction(transactionId);
+        const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
         if (!transactionMeta) {
             throw new Error(`Cannot update transaction as no transaction metadata found`);
         }
@@ -771,7 +765,7 @@ export class TransactionController extends BaseController {
         // merge updated gas values with existing transaction meta
         const updatedMeta = merge({}, transactionMeta, transactionGasFees);
         this.updateTransaction(updatedMeta, `${controllerName}:updateTransactionGasFees - gas values updated`);
-        return this.getTransaction(transactionId);
+        return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
     }
     /**
      * Update the previous gas values of a transaction.
@@ -784,7 +778,7 @@ export class TransactionController extends BaseController {
      * @returns The updated transactionMeta.
      */
     updatePreviousGasParams(transactionId, { gasLimit, maxFeePerGas, maxPriorityFeePerGas, }) {
-        const transactionMeta = this.getTransaction(transactionId);
+        const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
         if (!transactionMeta) {
             throw new Error(`Cannot update transaction as no transaction metadata found`);
         }
@@ -803,7 +797,7 @@ export class TransactionController extends BaseController {
         // merge updated previous gas values with existing transaction meta
         const updatedMeta = merge({}, transactionMeta, transactionPreviousGas);
         this.updateTransaction(updatedMeta, `${controllerName}:updatePreviousGasParams - Previous gas values updated`);
-        return this.getTransaction(transactionId);
+        return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
     }
     async getNonceLock(address, networkClientId) {
         return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, networkClientId);
@@ -824,7 +818,7 @@ export class TransactionController extends BaseController {
      * @returns The updated transaction metadata.
      */
     async updateEditableParams(txId, { data, from, gas, gasPrice, maxFeePerGas, maxPriorityFeePerGas, to, value, }) {
-        const transactionMeta = this.getTransaction(txId);
+        const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, txId);
         if (!transactionMeta) {
             throw new Error(`Cannot update editable params as no transaction metadata found`);
         }
@@ -849,13 +843,13 @@ export class TransactionController extends BaseController {
         const { type } = await determineTransactionType(updatedTransaction.txParams, ethQuery);
         updatedTransaction.type = type;
         await updateTransactionLayer1GasFee({
-            layer1GasFeeFlows: this.layer1GasFeeFlows,
+            layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
             messenger: this.messagingSystem,
             provider,
             transactionMeta: updatedTransaction,
         });
         this.updateTransaction(updatedTransaction, `Update Editable Params for ${txId}`);
-        return this.getTransaction(txId);
+        return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, txId);
     }
     /**
      * Update the isActive state of a transaction.
@@ -864,7 +858,7 @@ export class TransactionController extends BaseController {
      * @param isActive - The active state.
      */
     setTransactionActive(transactionId, isActive) {
-        const transactionMeta = this.getTransaction(transactionId);
+        const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
         if (!transactionMeta) {
             throw new Error(`Transaction with id ${transactionId} not found`);
         }
@@ -898,10 +892,10 @@ export class TransactionController extends BaseController {
         const networkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNetworkClientId).call(this, { chainId });
         const initialTxAsEthTx = prepareTransaction(chainId, initialTx);
         const initialTxAsSerializedHex = serializeTransaction(initialTxAsEthTx);
-        if (this.approvingTransactionIds.has(initialTxAsSerializedHex)) {
+        if (__classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").has(initialTxAsSerializedHex)) {
             return '';
         }
-        this.approvingTransactionIds.add(initialTxAsSerializedHex);
+        __classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").add(initialTxAsSerializedHex);
         let rawTransactions, nonceLock;
         try {
             // TODO: we should add a check to verify that all transactions have the same from address
@@ -918,7 +912,7 @@ export class TransactionController extends BaseController {
             }
             rawTransactions = await Promise.all(listOfTxParams.map((txParams) => {
                 txParams.nonce = nonce;
-                return this.signExternalTransaction(txParams.chainId, txParams);
+                return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_signExternalTransaction).call(this, txParams.chainId, txParams);
             }));
         }
         catch (err) {
@@ -929,7 +923,7 @@ export class TransactionController extends BaseController {
         }
         finally {
             nonceLock?.releaseLock();
-            this.approvingTransactionIds.delete(initialTxAsSerializedHex);
+            __classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").delete(initialTxAsSerializedHex);
         }
         return rawTransactions;
     }
@@ -942,7 +936,7 @@ export class TransactionController extends BaseController {
      */
     updateCustodialTransaction(request) {
         const { transactionId, errorMessage, hash, status, gasLimit, gasPrice, maxFeePerGas, maxPriorityFeePerGas, nonce, type, } = request;
-        const transactionMeta = this.getTransaction(transactionId);
+        const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
         if (!transactionMeta) {
             throw new Error(`Cannot update custodial transaction as no transaction metadata found`);
         }
@@ -1075,9 +1069,9 @@ export class TransactionController extends BaseController {
             networkClientId,
         };
         // Guaranteed as the default gas fee flow matches all transactions.
-        const gasFeeFlow = getGasFeeFlow(transactionMeta, this.gasFeeFlows, this.messagingSystem);
+        const gasFeeFlow = getGasFeeFlow(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messagingSystem);
         const ethQuery = new EthQuery(provider);
-        const gasFeeControllerData = await this.getGasFeeEstimates({
+        const gasFeeControllerData = await __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f").call(this, {
             networkClientId,
         });
         return gasFeeFlow.getGasFees({
@@ -1102,7 +1096,7 @@ export class TransactionController extends BaseController {
             networkClientId,
         });
         return await getTransactionLayer1GasFee({
-            layer1GasFeeFlows: this.layer1GasFeeFlows,
+            layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
             messenger: this.messagingSystem,
             provider,
             transactionMeta: {
@@ -1111,33 +1105,13 @@ export class TransactionController extends BaseController {
             },
         });
     }
-    async signExternalTransaction(chainId, transactionParams) {
-        if (!this.sign) {
-            throw new Error('No sign method defined.');
-        }
-        const normalizedTransactionParams = normalizeTransactionParams(transactionParams);
-        const type = isEIP1559Transaction(normalizedTransactionParams)
-            ? TransactionEnvelopeType.feeMarket
-            : TransactionEnvelopeType.legacy;
-        const updatedTransactionParams = {
-            ...normalizedTransactionParams,
-            type,
-            gasLimit: normalizedTransactionParams.gas,
-            chainId,
-        };
-        const { from } = updatedTransactionParams;
-        const unsignedTransaction = prepareTransaction(chainId, updatedTransactionParams);
-        const signedTransaction = await this.sign(unsignedTransaction, from);
-        const rawTransaction = serializeTransaction(signedTransaction);
-        return rawTransaction;
-    }
     /**
      * Removes unapproved transactions from state.
      */
     clearUnapprovedTransactions() {
         const transactions = this.state.transactions.filter(({ status }) => status !== TransactionStatus.unapproved);
         this.update((state) => {
-            state.transactions = this.trimTransactionsForState(transactions);
+            state.transactions = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).call(this, transactions);
         });
     }
     /**
@@ -1147,16 +1121,16 @@ export class TransactionController extends BaseController {
      * @param transactionId - The ID of the transaction to stop signing.
      */
     abortTransactionSigning(transactionId) {
-        const transactionMeta = this.getTransaction(transactionId);
+        const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
         if (!transactionMeta) {
             throw new Error(`Cannot abort signing as no transaction metadata found`);
         }
-        const abortCallback = this.signAbortCallbacks.get(transactionId);
+        const abortCallback = __classPrivateFieldGet(this, _TransactionController_signAbortCallbacks, "f").get(transactionId);
         if (!abortCallback) {
             throw new Error(`Cannot abort signing as transaction is not waiting for signing`);
         }
         abortCallback();
-        this.signAbortCallbacks.delete(transactionId);
+        __classPrivateFieldGet(this, _TransactionController_signAbortCallbacks, "f").delete(transactionId);
     }
     /**
      * Update the transaction data of a single nested transaction within an atomic batch transaction.
@@ -1238,536 +1212,10 @@ export class TransactionController extends BaseController {
             transactionMeta.selectedGasFeeToken = contractAddress;
         });
     }
-    addMetadata(transactionMeta) {
-        validateTxParams(transactionMeta.txParams);
-        this.update((state) => {
-            state.transactions = this.trimTransactionsForState([
-                ...state.transactions,
-                transactionMeta,
-            ]);
-        });
-    }
-    async updateGasProperties(transactionMeta, { traceContext } = {}) {
-        const isEIP1559Compatible = transactionMeta.txParams.type !== TransactionEnvelopeType.legacy &&
-            (await this.getEIP1559Compatibility(transactionMeta.networkClientId));
-        const { networkClientId } = transactionMeta;
-        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
-        const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId });
-        await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas', parentContext: traceContext }, async () => {
-            await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasEstimate).call(this, transactionMeta);
-        });
-        await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas Fees', parentContext: traceContext }, async () => await updateGasFees({
-            eip1559: isEIP1559Compatible,
-            ethQuery,
-            gasFeeFlows: this.gasFeeFlows,
-            getGasFeeEstimates: this.getGasFeeEstimates,
-            getSavedGasFees: this.getSavedGasFees.bind(this),
-            messenger: this.messagingSystem,
-            txMeta: transactionMeta,
-        }));
-        await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Layer 1 Gas Fees', parentContext: traceContext }, async () => await updateTransactionLayer1GasFee({
-            layer1GasFeeFlows: this.layer1GasFeeFlows,
-            messenger: this.messagingSystem,
-            provider,
-            transactionMeta,
-        }));
-    }
-    onBootCleanup() {
-        this.clearUnapprovedTransactions();
-        this.failIncompleteTransactions();
-    }
-    failIncompleteTransactions() {
-        const incompleteTransactions = this.state.transactions.filter((transaction) => [TransactionStatus.approved, TransactionStatus.signed].includes(transaction.status));
-        for (const transactionMeta of incompleteTransactions) {
-            this.failTransaction(transactionMeta, new Error('Transaction incomplete at startup'));
-        }
-    }
-    async processApproval(transactionMeta, { actionId, isExisting = false, publishHook, requireApproval, shouldShowRequest = true, traceContext, }) {
-        const transactionId = transactionMeta.id;
-        let resultCallbacks;
-        const { meta, isCompleted } = this.isTransactionCompleted(transactionId);
-        const finishedPromise = isCompleted
-            ? Promise.resolve(meta)
-            : this.waitForTransactionFinished(transactionId);
-        if (meta && !isExisting && !isCompleted) {
-            try {
-                if (requireApproval !== false) {
-                    const acceptResult = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Await Approval', parentContext: traceContext }, (context) => this.requestApproval(transactionMeta, {
-                        shouldShowRequest,
-                        traceContext: context,
-                    }));
-                    resultCallbacks = acceptResult.resultCallbacks;
-                    const approvalValue = acceptResult.value;
-                    const updatedTransaction = approvalValue?.txMeta;
-                    if (updatedTransaction) {
-                        log('Updating transaction with approval data', {
-                            customNonce: updatedTransaction.customNonceValue,
-                            params: updatedTransaction.txParams,
-                        });
-                        this.updateTransaction(updatedTransaction, 'TransactionController#processApproval - Updated with approval data');
-                    }
-                }
-                const { isCompleted: isTxCompleted } = this.isTransactionCompleted(transactionId);
-                if (!isTxCompleted) {
-                    const approvalResult = await this.approveTransaction(transactionId, traceContext, publishHook);
-                    if (approvalResult === ApprovalState.SkippedViaBeforePublishHook &&
-                        resultCallbacks) {
-                        resultCallbacks.success();
-                    }
-                    const updatedTransactionMeta = this.getTransaction(transactionId);
-                    this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
-                        transactionMeta: updatedTransactionMeta,
-                        actionId,
-                    });
-                }
-            }
-            catch (rawError) {
-                const error = rawError;
-                const { isCompleted: isTxCompleted } = this.isTransactionCompleted(transactionId);
-                if (!isTxCompleted) {
-                    if (__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isRejectError).call(this, error)) {
-                        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransactionAndThrow).call(this, transactionId, actionId, error);
-                    }
-                    else {
-                        this.failTransaction(meta, error, actionId);
-                    }
-                }
-            }
-        }
-        const finalMeta = await finishedPromise;
-        switch (finalMeta?.status) {
-            case TransactionStatus.failed:
-                const error = finalMeta.error;
-                resultCallbacks?.error(error);
-                throw rpcErrors.internal(error.message);
-            case TransactionStatus.submitted:
-                resultCallbacks?.success();
-                return finalMeta.hash;
-            default:
-                const internalError = rpcErrors.internal(`MetaMask Tx Signature: Unknown problem: ${JSON.stringify(finalMeta || transactionId)}`);
-                resultCallbacks?.error(internalError);
-                throw internalError;
-        }
-    }
-    /**
-     * Approves a transaction and updates it's status in state. If this is not a
-     * retry transaction, a nonce will be generated. The transaction is signed
-     * using the sign configuration property, then published to the blockchain.
-     * 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.
-     * @param publishHookOverride - Custom logic to publish the transaction.
-     * @returns The state of the approval.
-     */
-    async approveTransaction(transactionId, traceContext, publishHookOverride) {
-        let clearApprovingTransactionId;
-        let clearNonceLock;
-        let transactionMeta = this.getTransactionOrThrow(transactionId);
-        log('Approving transaction', transactionMeta);
-        try {
-            if (!this.sign) {
-                this.failTransaction(transactionMeta, new Error('No sign method defined.'));
-                return ApprovalState.NotApproved;
-            }
-            else if (!transactionMeta.chainId) {
-                this.failTransaction(transactionMeta, new Error('No chainId defined.'));
-                return ApprovalState.NotApproved;
-            }
-            if (this.approvingTransactionIds.has(transactionId)) {
-                log('Skipping approval as signing in progress', transactionId);
-                return ApprovalState.NotApproved;
-            }
-            this.approvingTransactionIds.add(transactionId);
-            clearApprovingTransactionId = () => this.approvingTransactionIds.delete(transactionId);
-            const [nonce, releaseNonce] = await getNextNonce(transactionMeta, (address) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, transactionMeta.networkClientId));
-            clearNonceLock = releaseNonce;
-            transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
-                transactionId,
-                note: 'TransactionController#approveTransaction - Transaction approved',
-            }, (draftTxMeta) => {
-                const { chainId, txParams } = draftTxMeta;
-                const { gas, type } = txParams;
-                draftTxMeta.status = TransactionStatus.approved;
-                draftTxMeta.txParams.chainId = chainId;
-                draftTxMeta.txParams.gasLimit = gas;
-                draftTxMeta.txParams.nonce = nonce;
-                if (!type && isEIP1559Transaction(txParams)) {
-                    draftTxMeta.txParams.type = TransactionEnvelopeType.feeMarket;
-                }
-            });
-            this.onTransactionStatusChange(transactionMeta);
-            const rawTx = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_signTransaction).call(this, transactionMeta));
-            if (!(await this.beforePublish(transactionMeta))) {
-                log('Skipping publishing transaction based on hook');
-                this.messagingSystem.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
-                return ApprovalState.SkippedViaBeforePublishHook;
-            }
-            if (!rawTx && !transactionMeta.isExternalSign) {
-                return ApprovalState.NotApproved;
-            }
-            const { networkClientId } = transactionMeta;
-            const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
-            let preTxBalance;
-            const shouldUpdatePreTxBalance = transactionMeta.type === TransactionType.swap;
-            if (shouldUpdatePreTxBalance) {
-                log('Determining pre-transaction balance');
-                preTxBalance = await query(ethQuery, 'getBalance', [
-                    transactionMeta.txParams.from,
-                ]);
-            }
-            log('Publishing transaction', transactionMeta.txParams);
-            let hash;
-            clearNonceLock?.();
-            clearNonceLock = undefined;
-            if (transactionMeta.batchTransactions?.length) {
-                log('Found batch transactions', transactionMeta.batchTransactions);
-                const extraTransactionsPublishHook = new ExtraTransactionsPublishHook({
-                    addTransactionBatch: this.addTransactionBatch.bind(this),
-                    transactions: transactionMeta.batchTransactions,
-                });
-                publishHookOverride = extraTransactionsPublishHook.getHook();
-            }
-            await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Publish', parentContext: traceContext }, async () => {
-                const publishHook = publishHookOverride ?? this.publish;
-                ({ transactionHash: hash } = await publishHook(transactionMeta, rawTx ?? '0x'));
-                if (hash === undefined) {
-                    hash = await this.publishTransaction(ethQuery, {
-                        ...transactionMeta,
-                        rawTx,
-                    });
-                }
-            });
-            log('Publish successful', hash);
-            transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
-                transactionId,
-                note: 'TransactionController#approveTransaction - Transaction submitted',
-            }, (draftTxMeta) => {
-                draftTxMeta.hash = hash;
-                draftTxMeta.status = TransactionStatus.submitted;
-                draftTxMeta.submittedTime = new Date().getTime();
-                if (shouldUpdatePreTxBalance) {
-                    draftTxMeta.preTxBalance = preTxBalance;
-                    log('Updated pre-transaction balance', preTxBalance);
-                }
-            });
-            this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
-                transactionMeta,
-            });
-            this.messagingSystem.publish(`${controllerName}:transactionFinished`, transactionMeta);
-            __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionId}:finished`, transactionMeta);
-            this.onTransactionStatusChange(transactionMeta);
-            return ApprovalState.Approved;
-            // TODO: Replace `any` with type
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        }
-        catch (error) {
-            this.failTransaction(transactionMeta, error);
-            return ApprovalState.NotApproved;
-        }
-        finally {
-            clearApprovingTransactionId?.();
-            clearNonceLock?.();
-        }
-    }
-    async publishTransaction(ethQuery, transactionMeta, { skipSubmitHistory } = {}) {
-        const transactionHash = await query(ethQuery, 'sendRawTransaction', [
-            transactionMeta.rawTx,
-        ]);
-        if (skipSubmitHistory !== true) {
-            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSubmitHistory).call(this, transactionMeta, transactionHash);
-        }
-        return transactionHash;
-    }
-    /**
-     * Trim the amount of transactions that are set on the state. Checks
-     * if the length of the tx history is longer then desired persistence
-     * limit and then if it is removes the oldest confirmed or rejected tx.
-     * Pending or unapproved transactions will not be removed by this
-     * operation. For safety of presenting a fully functional transaction UI
-     * representation, this function will not break apart transactions with the
-     * same nonce, created on the same day, per network. Not accounting for
-     * transactions of the same nonce, same day and network combo can result in
-     * confusing or broken experiences in the UI.
-     *
-     * @param transactions - The transactions to be applied to the state.
-     * @returns The trimmed list of transactions.
-     */
-    trimTransactionsForState(transactions) {
-        const nonceNetworkSet = new Set();
-        const txsToKeep = [...transactions]
-            .sort((a, b) => (a.time > b.time ? -1 : 1)) // Descending time order
-            .filter((tx) => {
-            const { chainId, status, txParams, time } = tx;
-            if (txParams) {
-                const key = `${String(txParams.nonce)}-${convertHexToDecimal(chainId)}-${new Date(time).toDateString()}`;
-                if (nonceNetworkSet.has(key)) {
-                    return true;
-                }
-                else if (nonceNetworkSet.size < __classPrivateFieldGet(this, _TransactionController_transactionHistoryLimit, "f") ||
-                    !this.isFinalState(status)) {
-                    nonceNetworkSet.add(key);
-                    return true;
-                }
-            }
-            return false;
-        });
-        txsToKeep.reverse(); // Ascending time order
-        return txsToKeep;
-    }
-    /**
-     * Determines if the transaction is in a final state.
-     *
-     * @param status - The transaction status.
-     * @returns Whether the transaction is in a final state.
-     */
-    isFinalState(status) {
-        return (status === TransactionStatus.rejected ||
-            status === TransactionStatus.confirmed ||
-            status === TransactionStatus.failed);
-    }
-    /**
-     * Whether the transaction has at least completed all local processing.
-     *
-     * @param status - The transaction status.
-     * @returns Whether the transaction is in a final state.
-     */
-    isLocalFinalState(status) {
-        return [
-            TransactionStatus.confirmed,
-            TransactionStatus.failed,
-            TransactionStatus.rejected,
-            TransactionStatus.submitted,
-        ].includes(status);
-    }
-    async requestApproval(txMeta, { shouldShowRequest, traceContext, }) {
-        const id = this.getApprovalId(txMeta);
-        const { origin } = txMeta;
-        const type = ApprovalType.Transaction;
-        const requestData = { txId: txMeta.id };
-        await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, {
-            name: 'Notification Display',
-            id,
-            parentContext: traceContext,
-        });
-        return (await this.messagingSystem.call('ApprovalController:addRequest', {
-            id,
-            origin: origin || ORIGIN_METAMASK,
-            type,
-            requestData,
-            expectsResult: true,
-        }, shouldShowRequest));
-    }
-    getTransaction(transactionId) {
-        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);
-    }
-    isTransactionCompleted(transactionId) {
-        const transaction = this.getTransaction(transactionId);
-        if (!transaction) {
-            return { meta: undefined, isCompleted: false };
-        }
-        const isCompleted = this.isLocalFinalState(transaction.status);
-        return { meta: transaction, isCompleted };
-    }
-    onIncomingTransactions(transactions) {
-        if (!transactions.length) {
-            return;
-        }
-        const finalTransactions = transactions.map((tx) => {
-            const { chainId } = tx;
-            const networkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNetworkClientId).call(this, { chainId });
-            return {
-                ...tx,
-                networkClientId,
-            };
-        });
-        this.update((state) => {
-            const { transactions: currentTransactions } = state;
-            state.transactions = this.trimTransactionsForState([
-                ...finalTransactions,
-                ...currentTransactions,
-            ]);
-            log('Added incoming transactions to state', finalTransactions.length, finalTransactions);
-        });
-        this.messagingSystem.publish(`${controllerName}:incomingTransactionsReceived`, finalTransactions);
-    }
-    generateDappSuggestedGasFees(txParams, origin) {
-        if (!origin || origin === ORIGIN_METAMASK) {
-            return undefined;
-        }
-        const { gasPrice, maxFeePerGas, maxPriorityFeePerGas, gas } = txParams;
-        if (gasPrice === undefined &&
-            maxFeePerGas === undefined &&
-            maxPriorityFeePerGas === undefined &&
-            gas === undefined) {
-            return undefined;
-        }
-        const dappSuggestedGasFees = {};
-        if (gasPrice !== undefined) {
-            dappSuggestedGasFees.gasPrice = gasPrice;
-        }
-        else if (maxFeePerGas !== undefined ||
-            maxPriorityFeePerGas !== undefined) {
-            dappSuggestedGasFees.maxFeePerGas = maxFeePerGas;
-            dappSuggestedGasFees.maxPriorityFeePerGas = maxPriorityFeePerGas;
-        }
-        if (gas !== undefined) {
-            dappSuggestedGasFees.gas = gas;
-        }
-        return dappSuggestedGasFees;
-    }
-    /**
-     * Validates and adds external provided transaction to state.
-     *
-     * @param transactionMeta - Nominated external transaction to be added to state.
-     * @returns The new transaction.
-     */
-    addExternalTransaction(transactionMeta) {
-        const { chainId } = transactionMeta;
-        const { transactions } = this.state;
-        const fromAddress = transactionMeta?.txParams?.from;
-        const sameFromAndNetworkTransactions = transactions.filter((transaction) => transaction.txParams.from === fromAddress &&
-            transaction.chainId === chainId);
-        const confirmedTxs = sameFromAndNetworkTransactions.filter((transaction) => transaction.status === TransactionStatus.confirmed);
-        const pendingTxs = sameFromAndNetworkTransactions.filter((transaction) => transaction.status === TransactionStatus.submitted);
-        validateConfirmedExternalTransaction(transactionMeta, confirmedTxs, pendingTxs);
-        // Make sure provided external transaction has non empty history array
-        const newTransactionMeta = (transactionMeta.history ?? []).length === 0 && !this.isHistoryDisabled
-            ? addInitialHistorySnapshot(transactionMeta)
-            : transactionMeta;
-        this.update((state) => {
-            state.transactions = this.trimTransactionsForState([
-                ...state.transactions,
-                newTransactionMeta,
-            ]);
-        });
-        return newTransactionMeta;
-    }
-    /**
-     * Method to set transaction status to dropped.
-     *
-     * @param transactionMeta - TransactionMeta of transaction to be marked as dropped.
-     */
-    setTransactionStatusDropped(transactionMeta) {
-        const updatedTransactionMeta = {
-            ...transactionMeta,
-            status: TransactionStatus.dropped,
-        };
-        this.messagingSystem.publish(`${controllerName}:transactionDropped`, {
-            transactionMeta: updatedTransactionMeta,
-        });
-        this.updateTransaction(updatedTransactionMeta, 'TransactionController#setTransactionStatusDropped - Transaction dropped');
-        this.onTransactionStatusChange(updatedTransactionMeta);
-    }
-    /**
-     * Get transaction with provided actionId.
-     *
-     * @param actionId - Unique ID to prevent duplicate requests
-     * @returns the filtered transaction
-     */
-    getTransactionWithActionId(actionId) {
-        return this.state.transactions.find((transaction) => actionId && transaction.actionId === actionId);
-    }
-    async waitForTransactionFinished(transactionId) {
-        return new Promise((resolve) => {
-            __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").once(`${transactionId}:finished`, (txMeta) => {
-                resolve(txMeta);
-            });
-        });
-    }
-    /**
-     * Updates the r, s, and v properties of a TransactionMeta object
-     * with values from a signed transaction.
-     *
-     * @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.
-     */
-    updateTransactionMetaRSV(transactionMeta, signedTx) {
-        const transactionMetaWithRsv = cloneDeep(transactionMeta);
-        for (const key of ['r', 's', 'v']) {
-            const value = signedTx[key];
-            if (value === undefined || value === null) {
-                continue;
-            }
-            transactionMetaWithRsv[key] = add0x(value.toString(16));
-        }
-        return transactionMetaWithRsv;
-    }
-    async getEIP1559Compatibility(networkClientId) {
-        const currentNetworkIsEIP1559Compatible = await this.getCurrentNetworkEIP1559Compatibility(networkClientId);
-        const currentAccountIsEIP1559Compatible = await this.getCurrentAccountEIP1559Compatibility();
-        return (currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible);
-    }
-    onTransactionStatusChange(transactionMeta) {
-        this.messagingSystem.publish(`${controllerName}:transactionStatusUpdated`, {
-            transactionMeta,
-        });
-    }
-    getNonceTrackerTransactions(statuses, address, chainId) {
-        return getAndFormatTransactionsForNonceTracker(chainId, address, statuses, this.state.transactions);
-    }
-    async updatePostBalance(transactionMeta) {
-        try {
-            const { networkClientId, type } = transactionMeta;
-            if (type !== TransactionType.swap) {
-                return;
-            }
-            const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
-            const { updatedTransactionMeta, approvalTransactionMeta } = await updatePostTransactionBalance(transactionMeta, {
-                ethQuery,
-                getTransaction: this.getTransaction.bind(this),
-                updateTransaction: this.updateTransaction.bind(this),
-            });
-            this.messagingSystem.publish(`${controllerName}:postTransactionBalanceUpdated`, {
-                transactionMeta: updatedTransactionMeta,
-                approvalTransactionMeta,
-            });
-        }
-        catch (error) {
-            /* istanbul ignore next */
-            log('Error while updating post transaction balance', error);
-        }
-    }
-    async publishTransactionForRetry(ethQuery, transactionMeta) {
-        try {
-            return await this.publishTransaction(ethQuery, transactionMeta);
-        }
-        catch (error) {
-            if (this.isTransactionAlreadyConfirmedError(error)) {
-                throw new Error('Previous transaction is already confirmed');
-            }
-            throw error;
-        }
-    }
-    /**
-     * Ensures that error is a nonce issue
-     *
-     * @param error - The error to check
-     * @returns Whether or not the error is a nonce issue
-     */
-    // TODO: Replace `any` with type
-    // Some networks are returning original error in the data field
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    isTransactionAlreadyConfirmedError(error) {
-        return (error?.message?.includes('nonce too low') ||
-            error?.data?.message?.includes('nonce too low'));
-    }
 }
-_TransactionController_internalEvents = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_publishBatchHook = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_trace = new WeakMap(), _TransactionController_transactionHistoryLimit = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_retryTransaction = async function _TransactionController_retryTransaction({ actionId, afterSubmit, estimatedBaseFee, gasValues, label, prepareTransactionParams, rate, transactionId, transactionType, }) {
+_TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSign = new WeakMap(), _TransactionController_approvingTransactionIds = new WeakMap(), _TransactionController_beforeCheckPendingTransaction = new WeakMap(), _TransactionController_beforePublish = new WeakMap(), _TransactionController_gasFeeFlows = new WeakMap(), _TransactionController_getAdditionalSignArguments = new WeakMap(), _TransactionController_getCurrentAccountEIP1559Compatibility = new WeakMap(), _TransactionController_getCurrentNetworkEIP1559Compatibility = new WeakMap(), _TransactionController_getExternalPendingTransactions = new WeakMap(), _TransactionController_getGasFeeEstimates = new WeakMap(), _TransactionController_getNetworkState = new WeakMap(), _TransactionController_getPermittedAccounts = new WeakMap(), _TransactionController_getSavedGasFees = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_internalEvents = new WeakMap(), _TransactionController_isAutomaticGasFeeUpdateEnabled = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isHistoryDisabled = new WeakMap(), _TransactionController_isSendFlowHistoryDisabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_isSwapsDisabled = new WeakMap(), _TransactionController_layer1GasFeeFlows = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_publish = new WeakMap(), _TransactionController_publishBatchHook = new WeakMap(), _TransactionController_securityProviderRequest = new WeakMap(), _TransactionController_sign = new WeakMap(), _TransactionController_signAbortCallbacks = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_trace = new WeakMap(), _TransactionController_transactionHistoryLimit = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_retryTransaction = async function _TransactionController_retryTransaction({ actionId, afterSubmit, estimatedBaseFee, gasValues, label, prepareTransactionParams, rate, transactionId, transactionType, }) {
     // If transaction is found for same action id, do not create a new transaction.
-    if (this.getTransactionWithActionId(actionId)) {
+    if (__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionWithActionId).call(this, actionId)) {
         return;
     }
     if (gasValues) {
@@ -1776,20 +1224,20 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         validateGasValues(gasValues);
     }
     log(`Creating ${label} transaction`, transactionId, gasValues);
-    const transactionMeta = this.getTransaction(transactionId);
+    const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
     /* istanbul ignore next */
     if (!transactionMeta) {
         return;
     }
     /* istanbul ignore next */
-    if (!this.sign) {
+    if (!__classPrivateFieldGet(this, _TransactionController_sign, "f")) {
         throw new Error('No sign method defined.');
     }
     const newTxParams = getTransactionParamsWithIncreasedGasFee(transactionMeta.txParams, rate, gasValues);
     prepareTransactionParams?.(newTxParams);
     const unsignedEthTx = prepareTransaction(transactionMeta.chainId, newTxParams);
-    const signedTx = await this.sign(unsignedEthTx, transactionMeta.txParams.from);
-    const transactionMetaWithRsv = this.updateTransactionMetaRSV(transactionMeta, signedTx);
+    const signedTx = await __classPrivateFieldGet(this, _TransactionController_sign, "f").call(this, unsignedEthTx, transactionMeta.txParams.from);
+    const transactionMetaWithRsv = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionMetaRSV).call(this, transactionMeta, signedTx);
     const rawTx = serializeTransaction(signedTx);
     const newFee = newTxParams.maxFeePerGas ?? newTxParams.gasPrice;
     const oldFee = newTxParams.maxFeePerGas
@@ -1814,12 +1262,12 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         txParams: newTxParams,
         type: transactionType,
     };
-    const hash = await this.publishTransactionForRetry(ethQuery, {
+    const hash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransactionForRetry).call(this, ethQuery, {
         ...newTransactionMeta,
         origin: label,
     });
     newTransactionMeta.hash = hash;
-    this.addMetadata(newTransactionMeta);
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addMetadata).call(this, newTransactionMeta);
     // speedUpTransaction has no approval request, so we assume the user has already approved the transaction
     this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
         transactionMeta: newTransactionMeta,
@@ -1830,8 +1278,262 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         actionId,
     });
     afterSubmit?.(newTransactionMeta);
+}, _TransactionController_signExternalTransaction = async function _TransactionController_signExternalTransaction(chainId, transactionParams) {
+    if (!__classPrivateFieldGet(this, _TransactionController_sign, "f")) {
+        throw new Error('No sign method defined.');
+    }
+    const normalizedTransactionParams = normalizeTransactionParams(transactionParams);
+    const type = isEIP1559Transaction(normalizedTransactionParams)
+        ? TransactionEnvelopeType.feeMarket
+        : TransactionEnvelopeType.legacy;
+    const updatedTransactionParams = {
+        ...normalizedTransactionParams,
+        type,
+        gasLimit: normalizedTransactionParams.gas,
+        chainId,
+    };
+    const { from } = updatedTransactionParams;
+    const unsignedTransaction = prepareTransaction(chainId, updatedTransactionParams);
+    const signedTransaction = await __classPrivateFieldGet(this, _TransactionController_sign, "f").call(this, unsignedTransaction, from);
+    const rawTransaction = serializeTransaction(signedTransaction);
+    return rawTransaction;
+}, _TransactionController_addMetadata = function _TransactionController_addMetadata(transactionMeta) {
+    validateTxParams(transactionMeta.txParams);
+    this.update((state) => {
+        state.transactions = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).call(this, [
+            ...state.transactions,
+            transactionMeta,
+        ]);
+    });
+}, _TransactionController_updateGasProperties = async function _TransactionController_updateGasProperties(transactionMeta, { traceContext } = {}) {
+    const isEIP1559Compatible = transactionMeta.txParams.type !== TransactionEnvelopeType.legacy &&
+        (await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEIP1559Compatibility).call(this, transactionMeta.networkClientId));
+    const { networkClientId } = transactionMeta;
+    const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
+    const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId });
+    await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas', parentContext: traceContext }, async () => {
+        await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasEstimate).call(this, transactionMeta);
+    });
+    await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas Fees', parentContext: traceContext }, async () => await updateGasFees({
+        eip1559: isEIP1559Compatible,
+        ethQuery,
+        gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
+        getGasFeeEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
+        getSavedGasFees: __classPrivateFieldGet(this, _TransactionController_getSavedGasFees, "f").bind(this),
+        messenger: this.messagingSystem,
+        txMeta: transactionMeta,
+    }));
+    await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Layer 1 Gas Fees', parentContext: traceContext }, async () => await updateTransactionLayer1GasFee({
+        layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
+        messenger: this.messagingSystem,
+        provider,
+        transactionMeta,
+    }));
+}, _TransactionController_onBootCleanup = function _TransactionController_onBootCleanup() {
+    this.clearUnapprovedTransactions();
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failIncompleteTransactions).call(this);
+}, _TransactionController_failIncompleteTransactions = function _TransactionController_failIncompleteTransactions() {
+    const incompleteTransactions = this.state.transactions.filter((transaction) => [TransactionStatus.approved, TransactionStatus.signed].includes(transaction.status));
+    for (const transactionMeta of incompleteTransactions) {
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, transactionMeta, new Error('Transaction incomplete at startup'));
+    }
+}, _TransactionController_processApproval = async function _TransactionController_processApproval(transactionMeta, { actionId, isExisting = false, publishHook, requireApproval, shouldShowRequest = true, traceContext, }) {
+    const transactionId = transactionMeta.id;
+    let resultCallbacks;
+    const { meta, isCompleted } = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isTransactionCompleted).call(this, transactionId);
+    const finishedPromise = isCompleted
+        ? Promise.resolve(meta)
+        : __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_waitForTransactionFinished).call(this, transactionId);
+    if (meta && !isExisting && !isCompleted) {
+        try {
+            if (requireApproval !== false) {
+                const acceptResult = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Await Approval', parentContext: traceContext }, (context) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_requestApproval).call(this, transactionMeta, {
+                    shouldShowRequest,
+                    traceContext: context,
+                }));
+                resultCallbacks = acceptResult.resultCallbacks;
+                const approvalValue = acceptResult.value;
+                const updatedTransaction = approvalValue?.txMeta;
+                if (updatedTransaction) {
+                    log('Updating transaction with approval data', {
+                        customNonce: updatedTransaction.customNonceValue,
+                        params: updatedTransaction.txParams,
+                    });
+                    this.updateTransaction(updatedTransaction, 'TransactionController#processApproval - Updated with approval data');
+                }
+            }
+            const { isCompleted: isTxCompleted } = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isTransactionCompleted).call(this, transactionId);
+            if (!isTxCompleted) {
+                const approvalResult = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_approveTransaction).call(this, transactionId, traceContext, publishHook);
+                if (approvalResult === ApprovalState.SkippedViaBeforePublishHook &&
+                    resultCallbacks) {
+                    resultCallbacks.success();
+                }
+                const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
+                this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
+                    transactionMeta: updatedTransactionMeta,
+                    actionId,
+                });
+            }
+        }
+        catch (rawError) {
+            const error = rawError;
+            const { isCompleted: isTxCompleted } = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isTransactionCompleted).call(this, transactionId);
+            if (!isTxCompleted) {
+                if (__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isRejectError).call(this, error)) {
+                    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransactionAndThrow).call(this, transactionId, actionId, error);
+                }
+                else {
+                    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, meta, error, actionId);
+                }
+            }
+        }
+    }
+    const finalMeta = await finishedPromise;
+    switch (finalMeta?.status) {
+        case TransactionStatus.failed:
+            const error = finalMeta.error;
+            resultCallbacks?.error(error);
+            throw rpcErrors.internal(error.message);
+        case TransactionStatus.submitted:
+            resultCallbacks?.success();
+            return finalMeta.hash;
+        default:
+            const internalError = rpcErrors.internal(`MetaMask Tx Signature: Unknown problem: ${JSON.stringify(finalMeta || transactionId)}`);
+            resultCallbacks?.error(internalError);
+            throw internalError;
+    }
+}, _TransactionController_approveTransaction = 
+/**
+ * Approves a transaction and updates it's status in state. If this is not a
+ * retry transaction, a nonce will be generated. The transaction is signed
+ * using the sign configuration property, then published to the blockchain.
+ * 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.
+ * @param publishHookOverride - Custom logic to publish the transaction.
+ * @returns The state of the approval.
+ */
+async function _TransactionController_approveTransaction(transactionId, traceContext, publishHookOverride) {
+    let clearApprovingTransactionId;
+    let clearNonceLock;
+    let transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
+    log('Approving transaction', transactionMeta);
+    try {
+        if (!__classPrivateFieldGet(this, _TransactionController_sign, "f")) {
+            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, transactionMeta, new Error('No sign method defined.'));
+            return ApprovalState.NotApproved;
+        }
+        else if (!transactionMeta.chainId) {
+            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, transactionMeta, new Error('No chainId defined.'));
+            return ApprovalState.NotApproved;
+        }
+        if (__classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").has(transactionId)) {
+            log('Skipping approval as signing in progress', transactionId);
+            return ApprovalState.NotApproved;
+        }
+        __classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").add(transactionId);
+        clearApprovingTransactionId = () => __classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").delete(transactionId);
+        const [nonce, releaseNonce] = await getNextNonce(transactionMeta, (address) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, transactionMeta.networkClientId));
+        clearNonceLock = releaseNonce;
+        transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
+            transactionId,
+            note: 'TransactionController#approveTransaction - Transaction approved',
+        }, (draftTxMeta) => {
+            const { chainId, txParams } = draftTxMeta;
+            const { gas, type } = txParams;
+            draftTxMeta.status = TransactionStatus.approved;
+            draftTxMeta.txParams.chainId = chainId;
+            draftTxMeta.txParams.gasLimit = gas;
+            draftTxMeta.txParams.nonce = nonce;
+            if (!type && isEIP1559Transaction(txParams)) {
+                draftTxMeta.txParams.type = TransactionEnvelopeType.feeMarket;
+            }
+        });
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMeta);
+        const rawTx = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_signTransaction).call(this, transactionMeta));
+        if (!(await __classPrivateFieldGet(this, _TransactionController_beforePublish, "f").call(this, transactionMeta))) {
+            log('Skipping publishing transaction based on hook');
+            this.messagingSystem.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
+            return ApprovalState.SkippedViaBeforePublishHook;
+        }
+        if (!rawTx && !transactionMeta.isExternalSign) {
+            return ApprovalState.NotApproved;
+        }
+        const { networkClientId } = transactionMeta;
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
+        let preTxBalance;
+        const shouldUpdatePreTxBalance = transactionMeta.type === TransactionType.swap;
+        if (shouldUpdatePreTxBalance) {
+            log('Determining pre-transaction balance');
+            preTxBalance = await query(ethQuery, 'getBalance', [
+                transactionMeta.txParams.from,
+            ]);
+        }
+        log('Publishing transaction', transactionMeta.txParams);
+        let hash;
+        clearNonceLock?.();
+        clearNonceLock = undefined;
+        if (transactionMeta.batchTransactions?.length) {
+            log('Found batch transactions', transactionMeta.batchTransactions);
+            const extraTransactionsPublishHook = new ExtraTransactionsPublishHook({
+                addTransactionBatch: this.addTransactionBatch.bind(this),
+                transactions: transactionMeta.batchTransactions,
+            });
+            publishHookOverride = extraTransactionsPublishHook.getHook();
+        }
+        await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Publish', parentContext: traceContext }, async () => {
+            const publishHook = publishHookOverride ?? __classPrivateFieldGet(this, _TransactionController_publish, "f");
+            ({ transactionHash: hash } = await publishHook(transactionMeta, rawTx ?? '0x'));
+            if (hash === undefined) {
+                hash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, {
+                    ...transactionMeta,
+                    rawTx,
+                });
+            }
+        });
+        log('Publish successful', hash);
+        transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
+            transactionId,
+            note: 'TransactionController#approveTransaction - Transaction submitted',
+        }, (draftTxMeta) => {
+            draftTxMeta.hash = hash;
+            draftTxMeta.status = TransactionStatus.submitted;
+            draftTxMeta.submittedTime = new Date().getTime();
+            if (shouldUpdatePreTxBalance) {
+                draftTxMeta.preTxBalance = preTxBalance;
+                log('Updated pre-transaction balance', preTxBalance);
+            }
+        });
+        this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
+            transactionMeta,
+        });
+        this.messagingSystem.publish(`${controllerName}:transactionFinished`, transactionMeta);
+        __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionId}:finished`, transactionMeta);
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMeta);
+        return ApprovalState.Approved;
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    }
+    catch (error) {
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, transactionMeta, error);
+        return ApprovalState.NotApproved;
+    }
+    finally {
+        clearApprovingTransactionId?.();
+        clearNonceLock?.();
+    }
+}, _TransactionController_publishTransaction = async function _TransactionController_publishTransaction(ethQuery, transactionMeta, { skipSubmitHistory } = {}) {
+    const transactionHash = await query(ethQuery, 'sendRawTransaction', [
+        transactionMeta.rawTx,
+    ]);
+    if (skipSubmitHistory !== true) {
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSubmitHistory).call(this, transactionMeta, transactionHash);
+    }
+    return transactionHash;
 }, _TransactionController_rejectTransaction = function _TransactionController_rejectTransaction(transactionId, actionId, error) {
-    const transactionMeta = this.getTransaction(transactionId);
+    const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
     if (!transactionMeta) {
         return;
     }
@@ -1847,7 +1549,74 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         transactionMeta: updatedTransactionMeta,
         actionId,
     });
-    this.onTransactionStatusChange(updatedTransactionMeta);
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, updatedTransactionMeta);
+}, _TransactionController_trimTransactionsForState = function _TransactionController_trimTransactionsForState(transactions) {
+    const nonceNetworkSet = new Set();
+    const txsToKeep = [...transactions]
+        .sort((a, b) => (a.time > b.time ? -1 : 1)) // Descending time order
+        .filter((tx) => {
+        const { chainId, status, txParams, time } = tx;
+        if (txParams) {
+            const key = `${String(txParams.nonce)}-${convertHexToDecimal(chainId)}-${new Date(time).toDateString()}`;
+            if (nonceNetworkSet.has(key)) {
+                return true;
+            }
+            else if (nonceNetworkSet.size < __classPrivateFieldGet(this, _TransactionController_transactionHistoryLimit, "f") ||
+                !__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isFinalState).call(this, status)) {
+                nonceNetworkSet.add(key);
+                return true;
+            }
+        }
+        return false;
+    });
+    txsToKeep.reverse(); // Ascending time order
+    return txsToKeep;
+}, _TransactionController_isFinalState = function _TransactionController_isFinalState(status) {
+    return (status === TransactionStatus.rejected ||
+        status === TransactionStatus.confirmed ||
+        status === TransactionStatus.failed);
+}, _TransactionController_isLocalFinalState = function _TransactionController_isLocalFinalState(status) {
+    return [
+        TransactionStatus.confirmed,
+        TransactionStatus.failed,
+        TransactionStatus.rejected,
+        TransactionStatus.submitted,
+    ].includes(status);
+}, _TransactionController_requestApproval = async function _TransactionController_requestApproval(txMeta, { shouldShowRequest, traceContext, }) {
+    const id = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getApprovalId).call(this, txMeta);
+    const { origin } = txMeta;
+    const type = ApprovalType.Transaction;
+    const requestData = { txId: txMeta.id };
+    await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, {
+        name: 'Notification Display',
+        id,
+        parentContext: traceContext,
+    });
+    return (await this.messagingSystem.call('ApprovalController:addRequest', {
+        id,
+        origin: origin || ORIGIN_METAMASK,
+        type,
+        requestData,
+        expectsResult: true,
+    }, shouldShowRequest));
+}, _TransactionController_getTransaction = function _TransactionController_getTransaction(transactionId) {
+    const { transactions } = this.state;
+    return transactions.find(({ id }) => id === transactionId);
+}, _TransactionController_getTransactionOrThrow = function _TransactionController_getTransactionOrThrow(transactionId, errorMessagePrefix = 'TransactionController') {
+    const txMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
+    if (!txMeta) {
+        throw new Error(`${errorMessagePrefix}: No transaction found with id ${transactionId}`);
+    }
+    return txMeta;
+}, _TransactionController_getApprovalId = function _TransactionController_getApprovalId(txMeta) {
+    return String(txMeta.id);
+}, _TransactionController_isTransactionCompleted = function _TransactionController_isTransactionCompleted(transactionId) {
+    const transaction = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
+    if (!transaction) {
+        return { meta: undefined, isCompleted: false };
+    }
+    const isCompleted = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isLocalFinalState).call(this, transaction.status);
+    return { meta: transaction, isCompleted };
 }, _TransactionController_getChainId = function _TransactionController_getChainId(networkClientId) {
     return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({ networkClientId })
         .configuration.chainId;
@@ -1865,8 +1634,73 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         chainId,
         networkClientId,
     }).provider;
+}, _TransactionController_onIncomingTransactions = function _TransactionController_onIncomingTransactions(transactions) {
+    if (!transactions.length) {
+        return;
+    }
+    const finalTransactions = transactions.map((tx) => {
+        const { chainId } = tx;
+        const networkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNetworkClientId).call(this, { chainId });
+        return {
+            ...tx,
+            networkClientId,
+        };
+    });
+    this.update((state) => {
+        const { transactions: currentTransactions } = state;
+        state.transactions = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).call(this, [
+            ...finalTransactions,
+            ...currentTransactions,
+        ]);
+        log('Added incoming transactions to state', finalTransactions.length, finalTransactions);
+    });
+    this.messagingSystem.publish(`${controllerName}:incomingTransactionsReceived`, finalTransactions);
+}, _TransactionController_generateDappSuggestedGasFees = function _TransactionController_generateDappSuggestedGasFees(txParams, origin) {
+    if (!origin || origin === ORIGIN_METAMASK) {
+        return undefined;
+    }
+    const { gasPrice, maxFeePerGas, maxPriorityFeePerGas, gas } = txParams;
+    if (gasPrice === undefined &&
+        maxFeePerGas === undefined &&
+        maxPriorityFeePerGas === undefined &&
+        gas === undefined) {
+        return undefined;
+    }
+    const dappSuggestedGasFees = {};
+    if (gasPrice !== undefined) {
+        dappSuggestedGasFees.gasPrice = gasPrice;
+    }
+    else if (maxFeePerGas !== undefined ||
+        maxPriorityFeePerGas !== undefined) {
+        dappSuggestedGasFees.maxFeePerGas = maxFeePerGas;
+        dappSuggestedGasFees.maxPriorityFeePerGas = maxPriorityFeePerGas;
+    }
+    if (gas !== undefined) {
+        dappSuggestedGasFees.gas = gas;
+    }
+    return dappSuggestedGasFees;
+}, _TransactionController_addExternalTransaction = function _TransactionController_addExternalTransaction(transactionMeta) {
+    const { chainId } = transactionMeta;
+    const { transactions } = this.state;
+    const fromAddress = transactionMeta?.txParams?.from;
+    const sameFromAndNetworkTransactions = transactions.filter((transaction) => transaction.txParams.from === fromAddress &&
+        transaction.chainId === chainId);
+    const confirmedTxs = sameFromAndNetworkTransactions.filter((transaction) => transaction.status === TransactionStatus.confirmed);
+    const pendingTxs = sameFromAndNetworkTransactions.filter((transaction) => transaction.status === TransactionStatus.submitted);
+    validateConfirmedExternalTransaction(transactionMeta, confirmedTxs, pendingTxs);
+    // Make sure provided external transaction has non empty history array
+    const newTransactionMeta = (transactionMeta.history ?? []).length === 0 && !__classPrivateFieldGet(this, _TransactionController_isHistoryDisabled, "f")
+        ? addInitialHistorySnapshot(transactionMeta)
+        : transactionMeta;
+    this.update((state) => {
+        state.transactions = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).call(this, [
+            ...state.transactions,
+            newTransactionMeta,
+        ]);
+    });
+    return newTransactionMeta;
 }, _TransactionController_markNonceDuplicatesDropped = function _TransactionController_markNonceDuplicatesDropped(transactionId) {
-    const transactionMeta = this.getTransaction(transactionId);
+    const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
     if (!transactionMeta) {
         return;
     }
@@ -1894,9 +1728,41 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
     for (const transaction of this.state.transactions) {
         if (sameNonceTransactionIds.includes(transaction.id) &&
             transaction.status !== TransactionStatus.failed) {
-            this.setTransactionStatusDropped(transaction);
+            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_setTransactionStatusDropped).call(this, transaction);
         }
     }
+}, _TransactionController_setTransactionStatusDropped = function _TransactionController_setTransactionStatusDropped(transactionMeta) {
+    const updatedTransactionMeta = {
+        ...transactionMeta,
+        status: TransactionStatus.dropped,
+    };
+    this.messagingSystem.publish(`${controllerName}:transactionDropped`, {
+        transactionMeta: updatedTransactionMeta,
+    });
+    this.updateTransaction(updatedTransactionMeta, 'TransactionController#setTransactionStatusDropped - Transaction dropped');
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, updatedTransactionMeta);
+}, _TransactionController_getTransactionWithActionId = function _TransactionController_getTransactionWithActionId(actionId) {
+    return this.state.transactions.find((transaction) => actionId && transaction.actionId === actionId);
+}, _TransactionController_waitForTransactionFinished = async function _TransactionController_waitForTransactionFinished(transactionId) {
+    return new Promise((resolve) => {
+        __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").once(`${transactionId}:finished`, (txMeta) => {
+            resolve(txMeta);
+        });
+    });
+}, _TransactionController_updateTransactionMetaRSV = function _TransactionController_updateTransactionMetaRSV(transactionMeta, signedTx) {
+    const transactionMetaWithRsv = cloneDeep(transactionMeta);
+    for (const key of ['r', 's', 'v']) {
+        const value = signedTx[key];
+        if (value === undefined || value === null) {
+            continue;
+        }
+        transactionMetaWithRsv[key] = add0x(value.toString(16));
+    }
+    return transactionMetaWithRsv;
+}, _TransactionController_getEIP1559Compatibility = async function _TransactionController_getEIP1559Compatibility(networkClientId) {
+    const currentNetworkIsEIP1559Compatible = await __classPrivateFieldGet(this, _TransactionController_getCurrentNetworkEIP1559Compatibility, "f").call(this, networkClientId);
+    const currentAccountIsEIP1559Compatible = await __classPrivateFieldGet(this, _TransactionController_getCurrentAccountEIP1559Compatibility, "f").call(this);
+    return (currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible);
 }, _TransactionController_signTransaction = async function _TransactionController_signTransaction(transactionMeta) {
     const { isExternalSign, txParams } = transactionMeta;
     if (isExternalSign) {
@@ -1912,45 +1778,72 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         transactionMeta,
     });
     const unsignedEthTx = prepareTransaction(transactionMeta.chainId, finalTxParams);
-    this.approvingTransactionIds.add(transactionMeta.id);
+    __classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").add(transactionMeta.id);
     const signedTx = await new Promise((resolve, reject) => {
-        this.sign?.(unsignedEthTx, from, ...this.getAdditionalSignArguments(transactionMeta)).then(resolve, reject);
-        this.signAbortCallbacks.set(transactionMeta.id, () => reject(new Error('Signing aborted by user')));
+        __classPrivateFieldGet(this, _TransactionController_sign, "f")?.call(this, unsignedEthTx, from, ...__classPrivateFieldGet(this, _TransactionController_getAdditionalSignArguments, "f").call(this, transactionMeta)).then(resolve, reject);
+        __classPrivateFieldGet(this, _TransactionController_signAbortCallbacks, "f").set(transactionMeta.id, () => reject(new Error('Signing aborted by user')));
     });
-    this.signAbortCallbacks.delete(transactionMeta.id);
+    __classPrivateFieldGet(this, _TransactionController_signAbortCallbacks, "f").delete(transactionMeta.id);
     if (!signedTx) {
         log('Skipping signed status as no signed transaction');
         return undefined;
     }
     const transactionMetaFromHook = cloneDeep(transactionMeta);
-    if (!this.afterSign(transactionMetaFromHook, signedTx)) {
+    if (!__classPrivateFieldGet(this, _TransactionController_afterSign, "f").call(this, transactionMetaFromHook, signedTx)) {
         this.updateTransaction(transactionMetaFromHook, 'TransactionController#signTransaction - Update after sign');
         log('Skipping signed status based on hook');
         return undefined;
     }
     const transactionMetaWithRsv = {
-        ...this.updateTransactionMetaRSV(transactionMetaFromHook, signedTx),
+        ...__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionMetaRSV).call(this, transactionMetaFromHook, signedTx),
         status: TransactionStatus.signed,
         txParams: finalTxParams,
     };
     this.updateTransaction(transactionMetaWithRsv, 'TransactionController#approveTransaction - Transaction signed');
-    this.onTransactionStatusChange(transactionMetaWithRsv);
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMetaWithRsv);
     const rawTx = serializeTransaction(signedTx);
     const transactionMetaWithRawTx = merge({}, transactionMetaWithRsv, {
         rawTx,
     });
     this.updateTransaction(transactionMetaWithRawTx, 'TransactionController#approveTransaction - RawTransaction added');
     return rawTx;
+}, _TransactionController_onTransactionStatusChange = function _TransactionController_onTransactionStatusChange(transactionMeta) {
+    this.messagingSystem.publish(`${controllerName}:transactionStatusUpdated`, {
+        transactionMeta,
+    });
+}, _TransactionController_getNonceTrackerTransactions = function _TransactionController_getNonceTrackerTransactions(statuses, address, chainId) {
+    return getAndFormatTransactionsForNonceTracker(chainId, address, statuses, this.state.transactions);
 }, _TransactionController_onConfirmedTransaction = function _TransactionController_onConfirmedTransaction(transactionMeta) {
     log('Processing confirmed transaction', transactionMeta.id);
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_markNonceDuplicatesDropped).call(this, transactionMeta.id);
     this.messagingSystem.publish(`${controllerName}:transactionConfirmed`, transactionMeta);
-    this.onTransactionStatusChange(transactionMeta);
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMeta);
     // Intentional given potential duration of process.
-    this.updatePostBalance(transactionMeta).catch((error) => {
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updatePostBalance).call(this, transactionMeta).catch((error) => {
         log('Error while updating post balance', error);
         throw error;
     });
+}, _TransactionController_updatePostBalance = async function _TransactionController_updatePostBalance(transactionMeta) {
+    try {
+        const { networkClientId, type } = transactionMeta;
+        if (type !== TransactionType.swap) {
+            return;
+        }
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
+        const { updatedTransactionMeta, approvalTransactionMeta } = await updatePostTransactionBalance(transactionMeta, {
+            ethQuery,
+            getTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).bind(this),
+            updateTransaction: this.updateTransaction.bind(this),
+        });
+        this.messagingSystem.publish(`${controllerName}:postTransactionBalanceUpdated`, {
+            transactionMeta: updatedTransactionMeta,
+            approvalTransactionMeta,
+        });
+    }
+    catch (error) {
+        /* istanbul ignore next */
+        log('Error while updating post transaction balance', error);
+    }
 }, _TransactionController_createNonceTracker = function _TransactionController_createNonceTracker({ provider, blockTracker, chainId, }) {
     return new NonceTracker({
         // TODO: Fix types
@@ -1959,7 +1852,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         // TODO: Fix types
         blockTracker,
         getPendingTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNonceTrackerPendingTransactions).bind(this, chainId),
-        getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, [TransactionStatus.confirmed], chainId),
+        getConfirmedTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNonceTrackerTransactions).bind(this, [TransactionStatus.confirmed], chainId),
     });
 }, _TransactionController_createPendingTransactionTracker = function _TransactionController_createPendingTransactionTracker({ provider, blockTracker, chainId, networkClientId, }) {
     const ethQuery = new EthQuery(provider);
@@ -1974,11 +1867,11 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
             chainId,
         }),
         messenger: this.messagingSystem,
-        publishTransaction: (_ethQuery, transactionMeta) => this.publishTransaction(_ethQuery, transactionMeta, {
+        publishTransaction: (_ethQuery, transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, _ethQuery, transactionMeta, {
             skipSubmitHistory: true,
         }),
         hooks: {
-            beforeCheckPendingTransaction: this.beforeCheckPendingTransaction.bind(this),
+            beforeCheckPendingTransaction: __classPrivateFieldGet(this, _TransactionController_beforeCheckPendingTransaction, "f").bind(this),
         },
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addPendingTransactionTrackerListeners).call(this, pendingTransactionTracker);
@@ -1986,7 +1879,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
 }, _TransactionController_stopAllTracking = function _TransactionController_stopAllTracking() {
     __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopAllTracking();
 }, _TransactionController_addIncomingTransactionHelperListeners = function _TransactionController_addIncomingTransactionHelperListeners(incomingTransactionHelper) {
-    incomingTransactionHelper.hub.on('transactions', this.onIncomingTransactions.bind(this));
+    incomingTransactionHelper.hub.on('transactions', __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onIncomingTransactions).bind(this));
 }, _TransactionController_removePendingTransactionTrackerListeners = function _TransactionController_removePendingTransactionTrackerListeners(pendingTransactionTracker) {
     pendingTransactionTracker.hub.removeAllListeners('transaction-confirmed');
     pendingTransactionTracker.hub.removeAllListeners('transaction-dropped');
@@ -1994,17 +1887,30 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
     pendingTransactionTracker.hub.removeAllListeners('transaction-updated');
 }, _TransactionController_addPendingTransactionTrackerListeners = function _TransactionController_addPendingTransactionTrackerListeners(pendingTransactionTracker) {
     pendingTransactionTracker.hub.on('transaction-confirmed', __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onConfirmedTransaction).bind(this));
-    pendingTransactionTracker.hub.on('transaction-dropped', this.setTransactionStatusDropped.bind(this));
-    pendingTransactionTracker.hub.on('transaction-failed', this.failTransaction.bind(this));
+    pendingTransactionTracker.hub.on('transaction-dropped', __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_setTransactionStatusDropped).bind(this));
+    pendingTransactionTracker.hub.on('transaction-failed', __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).bind(this));
     pendingTransactionTracker.hub.on('transaction-updated', this.updateTransaction.bind(this));
 }, _TransactionController_getNonceTrackerPendingTransactions = function _TransactionController_getNonceTrackerPendingTransactions(chainId, address) {
-    const standardPendingTransactions = this.getNonceTrackerTransactions([
+    const standardPendingTransactions = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNonceTrackerTransactions).call(this, [
         TransactionStatus.approved,
         TransactionStatus.signed,
         TransactionStatus.submitted,
     ], address, chainId);
-    const externalPendingTransactions = this.getExternalPendingTransactions(address, chainId);
+    const externalPendingTransactions = __classPrivateFieldGet(this, _TransactionController_getExternalPendingTransactions, "f").call(this, address, chainId);
     return [...standardPendingTransactions, ...externalPendingTransactions];
+}, _TransactionController_publishTransactionForRetry = async function _TransactionController_publishTransactionForRetry(ethQuery, transactionMeta) {
+    try {
+        return await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, transactionMeta);
+    }
+    catch (error) {
+        if (__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isTransactionAlreadyConfirmedError).call(this, error)) {
+            throw new Error('Previous transaction is already confirmed');
+        }
+        throw error;
+    }
+}, _TransactionController_isTransactionAlreadyConfirmedError = function _TransactionController_isTransactionAlreadyConfirmedError(error) {
+    return (error?.message?.includes('nonce too low') ||
+        error?.data?.message?.includes('nonce too low'));
 }, _TransactionController_getGasFeeFlows = function _TransactionController_getGasFeeFlows() {
     if (__classPrivateFieldGet(this, _TransactionController_testGasFeeFlows, "f")) {
         return [new TestGasFeeFlow()];
@@ -2033,13 +1939,13 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         if (!skipResimulateCheck && __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this)) {
             resimulateResponse = shouldResimulate(originalTransactionMeta, transactionMeta);
         }
-        const shouldSkipHistory = this.isHistoryDisabled || skipHistory;
+        const shouldSkipHistory = __classPrivateFieldGet(this, _TransactionController_isHistoryDisabled, "f") || skipHistory;
         if (!shouldSkipHistory) {
             transactionMeta = updateTransactionHistory(transactionMeta, note ?? 'Transaction updated');
         }
         state.transactions[index] = transactionMeta;
     });
-    const transactionMeta = this.getTransaction(transactionId);
+    const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
     if (resimulateResponse?.resimulate) {
         __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSimulationData).call(this, transactionMeta, {
             blockTime: resimulateResponse.blockTime,
@@ -2072,7 +1978,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
     try {
         const { count } = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Account Address Relationship', parentContext: traceContext }, () => getAccountAddressRelationship(request));
         const isFirstTimeInteraction = count === undefined ? undefined : count === 0;
-        const finalTransactionMeta = this.getTransaction(transactionId);
+        const finalTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
         /* istanbul ignore if */
         if (!finalTransactionMeta) {
             log('Cannot update first time interaction as transaction not found', transactionId);
@@ -2127,7 +2033,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
             };
         }
     }
-    const finalTransactionMeta = this.getTransaction(transactionId);
+    const finalTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
     /* istanbul ignore if */
     if (!finalTransactionMeta) {
         log('Cannot update simulation data as transaction not found', transactionId, simulationData);
@@ -2148,7 +2054,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
             txMeta,
             gasFeeEstimates,
             gasFeeEstimatesLoaded,
-            isTxParamsGasFeeUpdatesEnabled: this.isTxParamsGasFeeUpdatesEnabled,
+            isTxParamsGasFeeUpdatesEnabled: __classPrivateFieldGet(this, _TransactionController_isAutomaticGasFeeUpdateEnabled, "f"),
             layer1GasFee,
         });
     });
@@ -2161,7 +2067,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         .map((account) => account.address);
 }, _TransactionController_updateSubmitHistory = function _TransactionController_updateSubmitHistory(transactionMeta, hash) {
     const { chainId, networkClientId, origin, rawTx, txParams } = transactionMeta;
-    const { networkConfigurationsByChainId } = this.getNetworkState();
+    const { networkConfigurationsByChainId } = __classPrivateFieldGet(this, _TransactionController_getNetworkState, "f").call(this);
     const networkConfiguration = networkConfigurationsByChainId[chainId];
     const endpoint = networkConfiguration?.rpcEndpoints.find((currentEndpoint) => currentEndpoint.networkClientId === networkClientId);
     const networkUrl = endpoint?.url;
@@ -2202,7 +2108,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
 }, _TransactionController_deleteTransaction = function _TransactionController_deleteTransaction(transactionId) {
     this.update((state) => {
         const transactions = state.transactions.filter(({ id }) => id !== transactionId);
-        state.transactions = this.trimTransactionsForState(transactions);
+        state.transactions = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).call(this, transactions);
     });
 }, _TransactionController_isRejectError = function _TransactionController_isRejectError(error) {
     return [
@@ -2218,5 +2124,33 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         });
     }
     throw error;
+}, _TransactionController_failTransaction = function _TransactionController_failTransaction(transactionMeta, error, actionId) {
+    let newTransactionMeta;
+    try {
+        newTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
+            transactionId: transactionMeta.id,
+            note: 'TransactionController#failTransaction - Add error message and set status to failed',
+            skipValidation: true,
+        }, (draftTransactionMeta) => {
+            draftTransactionMeta.status = TransactionStatus.failed;
+            draftTransactionMeta.error = normalizeTxError(error);
+        });
+    }
+    catch (err) {
+        log('Failed to mark transaction as failed', err);
+        newTransactionMeta = {
+            ...transactionMeta,
+            status: TransactionStatus.failed,
+            error: normalizeTxError(error),
+        };
+    }
+    this.messagingSystem.publish(`${controllerName}:transactionFailed`, {
+        actionId,
+        error: error.message,
+        transactionMeta: newTransactionMeta,
+    });
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, newTransactionMeta);
+    this.messagingSystem.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
+    __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, newTransactionMeta);
 };
 //# sourceMappingURL=TransactionController.mjs.map