@metamask-previews/transaction-controller 66.0.1-preview-e37aff3 → 66.0.1-preview-92f3bde43

package/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- **BREAKING:** Remove deprecated `TransactionController` constructor options and unused hooks, and replace them with direct messenger calls ([#8983](https://github.com/MetaMask/core/pull/8983))
+  - Removed options: `disableHistory`, `disableSendFlowHistory`, `getCurrentAccountEIP1559Compatibility`, `getCurrentNetworkEIP1559Compatibility`, `getExternalPendingTransactions`, `getGasFeeEstimates`, `getNetworkClientRegistry`, `getNetworkState`, `pendingTransactions`, `securityProviderRequest`, `sign`, `transactionHistoryLimit`
+  - Removed hooks: `afterSign`, `afterSimulate`, `getAdditionalSignArguments`
+  - Moved hook: `isTimeoutEnabled` is now a root constructor option instead of a hook
+  - Removed types: `AfterSimulateHook`, `PendingTransactionOptions`, `SecurityProviderRequest`; `AfterAddHook` parameter `skipSimulation` removed
+  - Added required `AllowedActions`: `GasFeeController:fetchGasFeeEstimates`, `KeyringController:signTransaction`, `NetworkController:getEIP1559Compatibility`, `NetworkController:getNetworkClientRegistry`, `NetworkController:getState`
+  - Removed resubmit logic from `PendingTransactionTracker`
+
 ## [66.0.1]
 
 ### Changed

package/dist/TransactionController.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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_afterSimulate, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_isTimeoutEnabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_securityProviderRequest, _TransactionController_sign, _TransactionController_signAbortCallbacks, _TransactionController_skipSimulationTransactionIds, _TransactionController_testGasFeeFlows, _TransactionController_trace, _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_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _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_isBalanceChangesSkipped, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_runAfterSimulateHook, _TransactionController_defaultPublishHook, _TransactionController_getGasFeeTokens;
+var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_isTimeoutEnabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_signAbortCallbacks, _TransactionController_skipSimulationTransactionIds, _TransactionController_testGasFeeFlows, _TransactionController_trace, _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_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _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_isBalanceChangesSkipped, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_defaultPublishHook, _TransactionController_getGasFeeTokens;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionController = exports.ApprovalState = exports.SPEED_UP_RATE = exports.CANCEL_RATE = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -178,7 +178,7 @@ class TransactionController extends base_controller_1.BaseController {
      * @param options - The controller options.
      */
     constructor(options) {
-        const { disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, getSimulationConfig, hooks, incomingTransactions = {}, isAutomaticGasFeeUpdateEnabled, isEIP7702GasFeeTokensEnabled, isFirstTimeInteractionEnabled, isSimulationEnabled, messenger, pendingTransactions = {}, publicKeyEIP7702, securityProviderRequest, sign, state, testGasFeeFlows, trace, } = options;
+        const { disableSwaps, getPermittedAccounts, getSavedGasFees, getSimulationConfig, hooks, incomingTransactions = {}, isAutomaticGasFeeUpdateEnabled, isEIP7702GasFeeTokensEnabled, isFirstTimeInteractionEnabled, isSimulationEnabled, isTimeoutEnabled, messenger, publicKeyEIP7702, state, testGasFeeFlows, trace, } = options;
         super({
             name: controllerName,
             metadata,
@@ -190,19 +190,11 @@ class TransactionController extends base_controller_1.BaseController {
         });
         _TransactionController_instances.add(this);
         _TransactionController_afterAdd.set(this, void 0);
-        _TransactionController_afterSign.set(this, void 0);
-        _TransactionController_afterSimulate.set(this, void 0);
         _TransactionController_approvingTransactionIds.set(this, new Set());
         _TransactionController_beforeCheckPendingTransaction.set(this, void 0);
         _TransactionController_beforePublish.set(this, void 0);
         _TransactionController_beforeSign.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_getSimulationConfig.set(this, void 0);
@@ -218,12 +210,9 @@ class TransactionController extends base_controller_1.BaseController {
         _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_publicKeyEIP7702.set(this, void 0);
         _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_skipSimulationTransactionIds.set(this, new Set());
         _TransactionController_testGasFeeFlows.set(this, void 0);
@@ -233,9 +222,6 @@ class TransactionController extends base_controller_1.BaseController {
         });
         this.messenger = messenger;
         __classPrivateFieldSet(this, _TransactionController_afterAdd, hooks?.afterAdd ?? (() => Promise.resolve({})), "f");
-        __classPrivateFieldSet(this, _TransactionController_afterSign, hooks?.afterSign ?? (() => true), "f");
-        __classPrivateFieldSet(this, _TransactionController_afterSimulate, hooks?.afterSimulate ??
-            (() => Promise.resolve({})), "f");
         __classPrivateFieldSet(this, _TransactionController_beforeCheckPendingTransaction, 
         /* istanbul ignore next */
         hooks?.beforeCheckPendingTransaction ??
@@ -243,15 +229,6 @@ class TransactionController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _TransactionController_beforePublish, hooks?.beforePublish ?? (() => Promise.resolve(true)), "f");
         __classPrivateFieldSet(this, _TransactionController_beforeSign, hooks?.beforeSign ??
             (() => Promise.resolve({})), "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_getSimulationConfig, getSimulationConfig ??
@@ -264,14 +241,11 @@ class TransactionController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _TransactionController_isFirstTimeInteractionEnabled, isFirstTimeInteractionEnabled ?? (() => true), "f");
         __classPrivateFieldSet(this, _TransactionController_isSimulationEnabled, isSimulationEnabled ?? (() => true), "f");
         __classPrivateFieldSet(this, _TransactionController_isSwapsDisabled, disableSwaps ?? false, "f");
-        __classPrivateFieldSet(this, _TransactionController_isTimeoutEnabled, hooks?.isTimeoutEnabled ?? (() => true), "f");
-        __classPrivateFieldSet(this, _TransactionController_pendingTransactionOptions, pendingTransactions, "f");
+        __classPrivateFieldSet(this, _TransactionController_isTimeoutEnabled, isTimeoutEnabled ?? (() => true), "f");
         __classPrivateFieldSet(this, _TransactionController_publicKeyEIP7702, publicKeyEIP7702, "f");
         __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");
         const findNetworkClientIdByChainId = (chainId) => {
@@ -282,7 +256,7 @@ class TransactionController extends base_controller_1.BaseController {
             getNetworkClientById: ((networkClientId) => {
                 return this.messenger.call(`NetworkController:getNetworkClientById`, networkClientId);
             }),
-            getNetworkClientRegistry,
+            getNetworkClientRegistry: (() => this.messenger.call('NetworkController:getNetworkClientRegistry')),
             removePendingTransactionTrackerListeners: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removePendingTransactionTrackerListeners).bind(this),
             createNonceTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createNonceTracker).bind(this),
             createPendingTransactionTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).bind(this),
@@ -295,7 +269,7 @@ class TransactionController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _TransactionController_layer1GasFeeFlows, __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getLayer1GasFeeFlows).call(this), "f");
         const gasFeePoller = new GasFeePoller_1.GasFeePoller({
             gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
-            getGasFeeControllerEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
+            getGasFeeControllerEstimates: (gasFeeOpts) => this.messenger.call('GasFeeController:fetchGasFeeEstimates', gasFeeOpts),
             getTransactions: () => this.state.transactions,
             getTransactionBatches: () => this.state.transactionBatches,
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
@@ -369,7 +343,7 @@ class TransactionController extends base_controller_1.BaseController {
         return await (0, batch_1.addTransactionBatch)({
             addTransaction: this.addTransaction.bind(this),
             estimateGas: this.estimateGas.bind(this),
-            getGasFeeEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
+            getGasFeeEstimates: (options) => this.messenger.call('GasFeeController:fetchGasFeeEstimates', options),
             getInternalAccounts: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getInternalAccounts).bind(this),
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f").bind(this),
             getPendingTransactionTracker: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).call(this, {
@@ -412,7 +386,7 @@ class TransactionController extends base_controller_1.BaseController {
      */
     async addTransaction(txParams, options) {
         (0, logger_1.projectLogger)('Adding transaction', txParams, options);
-        const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, excludeNativeTokenForFee, isGasFeeIncluded, isGasFeeSponsored, isInternal = false, isStateOnly, method, nestedTransactions, networkClientId, origin, publishHook, requestId, requiredAssets, requireApproval, securityAlertResponse, skipInitialGasEstimate, swaps = {}, traceContext, type, } = options;
+        const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, excludeNativeTokenForFee, isGasFeeIncluded, isGasFeeSponsored, isInternal = false, isStateOnly, nestedTransactions, networkClientId, origin, publishHook, requestId, requiredAssets, requireApproval, securityAlertResponse, skipInitialGasEstimate, swaps = {}, traceContext, type, } = options;
         // eslint-disable-next-line no-param-reassign
         txParams = (0, utils_2.normalizeTransactionParams)(txParams);
         if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
@@ -524,12 +498,6 @@ class TransactionController extends base_controller_1.BaseController {
             })
                 .catch(lodash_1.noop);
         }
-        // Set security provider response
-        if (method && __classPrivateFieldGet(this, _TransactionController_securityProviderRequest, "f")) {
-            const securityProviderResponse = await __classPrivateFieldGet(this, _TransactionController_securityProviderRequest, "f").call(this, addedTransactionMeta, method);
-            // eslint-disable-next-line require-atomic-updates
-            addedTransactionMeta.securityProviderResponse = securityProviderResponse;
-        }
         addedTransactionMeta = (0, swaps_1.updateSwapsTransaction)(addedTransactionMeta, transactionType, swaps, {
             isSwapsDisabled: __classPrivateFieldGet(this, _TransactionController_isSwapsDisabled, "f"),
             cancelTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransaction).bind(this),
@@ -1053,7 +1021,7 @@ class TransactionController extends base_controller_1.BaseController {
             chainId,
         });
         const initialTxAsEthTx = (0, prepare_1.prepareTransaction)(chainId, initialTx);
-        const initialTxAsSerializedHex = (0, prepare_1.serializeTransaction)(initialTxAsEthTx);
+        const initialTxAsSerializedHex = (0, prepare_1.serializeTransaction)(chainId, initialTxAsEthTx);
         if (__classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").has(initialTxAsSerializedHex)) {
             return '';
         }
@@ -1241,9 +1209,7 @@ class TransactionController extends base_controller_1.BaseController {
         };
         // Guaranteed as the default gas fee flow matches all transactions.
         const gasFeeFlow = (0, gas_flow_1.getGasFeeFlow)(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messenger);
-        const gasFeeControllerData = await __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f").call(this, {
-            networkClientId,
-        });
+        const gasFeeControllerData = await this.messenger.call('GasFeeController:fetchGasFeeEstimates', { networkClientId });
         return gasFeeFlow.getGasFees({
             gasFeeControllerData,
             messenger: this.messenger,
@@ -1476,7 +1442,7 @@ class TransactionController extends base_controller_1.BaseController {
     }
 }
 exports.TransactionController = TransactionController;
-_TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSign = new WeakMap(), _TransactionController_afterSimulate = new WeakMap(), _TransactionController_approvingTransactionIds = new WeakMap(), _TransactionController_beforeCheckPendingTransaction = new WeakMap(), _TransactionController_beforePublish = new WeakMap(), _TransactionController_beforeSign = 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_getSimulationConfig = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_internalEvents = new WeakMap(), _TransactionController_isAutomaticGasFeeUpdateEnabled = new WeakMap(), _TransactionController_isEIP7702GasFeeTokensEnabled = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_isSwapsDisabled = new WeakMap(), _TransactionController_isTimeoutEnabled = 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_skipSimulationTransactionIds = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_trace = 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_approvingTransactionIds = new WeakMap(), _TransactionController_beforeCheckPendingTransaction = new WeakMap(), _TransactionController_beforePublish = new WeakMap(), _TransactionController_beforeSign = new WeakMap(), _TransactionController_gasFeeFlows = new WeakMap(), _TransactionController_getPermittedAccounts = new WeakMap(), _TransactionController_getSavedGasFees = new WeakMap(), _TransactionController_getSimulationConfig = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_internalEvents = new WeakMap(), _TransactionController_isAutomaticGasFeeUpdateEnabled = new WeakMap(), _TransactionController_isEIP7702GasFeeTokensEnabled = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_isSwapsDisabled = new WeakMap(), _TransactionController_isTimeoutEnabled = new WeakMap(), _TransactionController_layer1GasFeeFlows = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_publish = new WeakMap(), _TransactionController_publishBatchHook = new WeakMap(), _TransactionController_signAbortCallbacks = new WeakMap(), _TransactionController_skipSimulationTransactionIds = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_trace = 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 (gasValues) {
         // Not good practice to reassign a parameter but temporarily avoiding a larger refactor.
         // eslint-disable-next-line no-param-reassign
@@ -1489,16 +1455,12 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
     if (!transactionMeta) {
         return;
     }
-    /* istanbul ignore next */
-    if (!__classPrivateFieldGet(this, _TransactionController_sign, "f")) {
-        throw new Error('No sign method defined.');
-    }
     const newTxParams = (0, retry_1.getTransactionParamsWithIncreasedGasFee)(transactionMeta.txParams, rate, gasValues);
     prepareTransactionParams?.(newTxParams);
     const unsignedEthTx = (0, prepare_1.prepareTransaction)(transactionMeta.chainId, newTxParams);
-    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 = (0, prepare_1.serializeTransaction)(signedTx);
+    const signedTxData = await this.messenger.call('KeyringController:signTransaction', unsignedEthTx, transactionMeta.txParams.from);
+    const transactionMetaWithRsv = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionMetaRSV).call(this, transactionMeta, signedTxData);
+    const rawTx = (0, prepare_1.serializeTransaction)(transactionMeta.chainId, signedTxData);
     const newFee = newTxParams.maxFeePerGas ?? newTxParams.gasPrice;
     const oldFee = newTxParams.maxFeePerGas
         ? transactionMetaWithRsv.txParams.maxFeePerGas
@@ -1537,9 +1499,6 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
     });
     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 = (0, utils_2.normalizeTransactionParams)(transactionParams);
     const type = (0, utils_2.isEIP1559Transaction)(normalizedTransactionParams)
         ? types_1.TransactionEnvelopeType.feeMarket
@@ -1552,8 +1511,8 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
     };
     const { from } = updatedTransactionParams;
     const unsignedTransaction = (0, prepare_1.prepareTransaction)(chainId, updatedTransactionParams);
-    const signedTransaction = await __classPrivateFieldGet(this, _TransactionController_sign, "f").call(this, unsignedTransaction, from);
-    const rawTransaction = (0, prepare_1.serializeTransaction)(signedTransaction);
+    const signedTxData = await this.messenger.call('KeyringController:signTransaction', unsignedTransaction, from);
+    const rawTransaction = (0, prepare_1.serializeTransaction)(chainId, signedTxData);
     return rawTransaction;
 }, _TransactionController_addMetadata = function _TransactionController_addMetadata(transactionMeta) {
     (0, validation_1.validateTxParams)(transactionMeta.txParams);
@@ -1572,7 +1531,7 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
     await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas Fees', parentContext: traceContext }, async () => await (0, gas_fees_1.updateGasFees)({
         eip1559: isEIP1559Compatible,
         gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
-        getGasFeeEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
+        getGasFeeEstimates: (options) => this.messenger.call('GasFeeController:fetchGasFeeEstimates', options),
         getSavedGasFees: __classPrivateFieldGet(this, _TransactionController_getSavedGasFees, "f").bind(this),
         messenger: this.messenger,
         txMeta: transactionMeta,
@@ -1705,11 +1664,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     let transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
     (0, logger_1.projectLogger)('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) {
+        if (!transactionMeta.chainId) {
             __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, transactionMeta, new Error('No chainId defined.'));
             return ApprovalState.NotApproved;
         }
@@ -2045,13 +2000,11 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         if (value === undefined || value === null) {
             continue;
         }
-        transactionMetaWithRsv[key] = (0, utils_1.add0x)(value.toString(16));
+        transactionMetaWithRsv[key] = (0, utils_1.add0x)(BigInt(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);
+    return ((await this.messenger.call('NetworkController:getEIP1559Compatibility', networkClientId)) ?? false);
 }, _TransactionController_signTransaction = async function _TransactionController_signTransaction(originalTransactionMeta) {
     let transactionMeta = originalTransactionMeta;
     const { id: transactionId } = transactionMeta;
@@ -2093,29 +2046,23 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     const unsignedEthTx = (0, prepare_1.prepareTransaction)(chainId, finalTxParams);
     __classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").add(transactionId);
     (0, logger_1.projectLogger)('Signing transaction', finalTxParams);
-    const signedTx = await new Promise((resolve, reject) => {
-        __classPrivateFieldGet(this, _TransactionController_sign, "f")?.call(this, unsignedEthTx, from, ...__classPrivateFieldGet(this, _TransactionController_getAdditionalSignArguments, "f").call(this, finalTransactionMeta)).then(resolve, reject);
+    const signedTxData = await new Promise((resolve, reject) => {
+        // eslint-disable-next-line promise/catch-or-return
+        this.messenger
+            .call('KeyringController:signTransaction', unsignedEthTx, from)
+            .then(resolve, reject);
         __classPrivateFieldGet(this, _TransactionController_signAbortCallbacks, "f").set(transactionId, () => reject(new Error('Signing aborted by user')));
     });
     __classPrivateFieldGet(this, _TransactionController_signAbortCallbacks, "f").delete(transactionId);
-    if (!signedTx) {
-        (0, logger_1.projectLogger)('Skipping signed status as no signed transaction');
-        return undefined;
-    }
     const transactionMetaFromHook = (0, lodash_1.cloneDeep)(finalTransactionMeta);
-    if (!__classPrivateFieldGet(this, _TransactionController_afterSign, "f").call(this, transactionMetaFromHook, signedTx)) {
-        this.updateTransaction(transactionMetaFromHook, 'TransactionController#signTransaction - Update after sign');
-        (0, logger_1.projectLogger)('Skipping signed status based on hook');
-        return undefined;
-    }
     const transactionMetaWithRsv = {
-        ...__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionMetaRSV).call(this, transactionMetaFromHook, signedTx),
+        ...__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionMetaRSV).call(this, transactionMetaFromHook, signedTxData),
         status: types_1.TransactionStatus.signed,
         txParams: finalTxParams,
     };
     this.updateTransaction(transactionMetaWithRsv, 'TransactionController#approveTransaction - Transaction signed');
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMetaWithRsv);
-    const rawTx = (0, prepare_1.serializeTransaction)(signedTx);
+    const rawTx = (0, prepare_1.serializeTransaction)(chainId, signedTxData);
     const transactionMetaWithRawTx = (0, lodash_1.merge)({}, transactionMetaWithRsv, {
         rawTx,
     });
@@ -2179,13 +2126,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         hooks: {
             beforeCheckPendingTransaction: __classPrivateFieldGet(this, _TransactionController_beforeCheckPendingTransaction, "f").bind(this),
         },
-        isResubmitEnabled: __classPrivateFieldGet(this, _TransactionController_pendingTransactionOptions, "f").isResubmitEnabled,
         isTimeoutEnabled: __classPrivateFieldGet(this, _TransactionController_isTimeoutEnabled, "f"),
         messenger: this.messenger,
         networkClientId,
-        publishTransaction: (transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta, {
-            skipSubmitHistory: true,
-        }),
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addPendingTransactionTrackerListeners).call(this, pendingTransactionTracker);
     return pendingTransactionTracker;
@@ -2209,8 +2152,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         types_1.TransactionStatus.signed,
         types_1.TransactionStatus.submitted,
     ], address, chainId);
-    const externalPendingTransactions = __classPrivateFieldGet(this, _TransactionController_getExternalPendingTransactions, "f").call(this, address, chainId);
-    return [...standardPendingTransactions, ...externalPendingTransactions];
+    return standardPendingTransactions;
 }, _TransactionController_publishTransactionForRetry = async function _TransactionController_publishTransactionForRetry(transactionMeta) {
     try {
         return await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta);
@@ -2339,7 +2281,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         }
     });
     (0, logger_1.projectLogger)('Updated simulation data', transactionId, updatedTransactionMeta);
-    await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_runAfterSimulateHook).call(this, updatedTransactionMeta);
 }, _TransactionController_onGasFeePollerTransactionUpdate = function _TransactionController_onGasFeePollerTransactionUpdate({ transactionId, gasFeeEstimates, gasFeeEstimatesLoaded, layer1GasFee, }) {
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId }, (txMeta) => {
         (0, GasFeePoller_1.updateTransactionGasProperties)({
@@ -2373,7 +2314,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         .map((account) => account.address);
 }, _TransactionController_updateSubmitHistory = function _TransactionController_updateSubmitHistory(transactionMeta, hash) {
     const { chainId, networkClientId, origin, rawTx, txParams } = transactionMeta;
-    const { networkConfigurationsByChainId } = __classPrivateFieldGet(this, _TransactionController_getNetworkState, "f").call(this);
+    const { networkConfigurationsByChainId } = this.messenger.call('NetworkController:getState');
     const networkConfiguration = networkConfigurationsByChainId[chainId];
     const endpoint = networkConfiguration?.rpcEndpoints.find((currentEndpoint) => currentEndpoint.networkClientId === networkClientId);
     const networkUrl = endpoint?.url;
@@ -2472,30 +2413,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, newTransactionMeta);
     this.messenger.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
     __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, newTransactionMeta);
-}, _TransactionController_runAfterSimulateHook = async function _TransactionController_runAfterSimulateHook(transactionMeta) {
-    (0, logger_1.projectLogger)('Calling afterSimulate hook', transactionMeta);
-    const { id: transactionId } = transactionMeta;
-    const result = await __classPrivateFieldGet(this, _TransactionController_afterSimulate, "f").call(this, {
-        transactionMeta,
-    });
-    const { skipSimulation, updateTransaction } = result ?? {};
-    if (skipSimulation) {
-        __classPrivateFieldGet(this, _TransactionController_skipSimulationTransactionIds, "f").add(transactionId);
-    }
-    else if (skipSimulation === false) {
-        __classPrivateFieldGet(this, _TransactionController_skipSimulationTransactionIds, "f").delete(transactionId);
-    }
-    if (!updateTransaction) {
-        return;
-    }
-    const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
-        transactionId,
-        skipResimulateCheck: true,
-    }, (txMeta) => {
-        txMeta.txParamsOriginal = (0, lodash_1.cloneDeep)(txMeta.txParams);
-        updateTransaction(txMeta);
-    });
-    (0, logger_1.projectLogger)('Updated transaction with afterSimulate data', updatedTransactionMeta);
 }, _TransactionController_defaultPublishHook = async function _TransactionController_defaultPublishHook({ networkClientId, publishHookOverride, traceContext, }, transactionMeta, signedTx) {
     let transactionHash;
     await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Publish', parentContext: traceContext }, async () => {