@metamask/transaction-controller 45.1.0 → 47.0.0

package/CHANGELOG.md

@@ -7,6 +7,48 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [47.0.0]
+
+### Added
+
+- Persist user rejection optional data in rejected error ([#5355](https://github.com/MetaMask/core/pull/5355))
+- Add `updateAtomicBatchData` method ([#5380](https://github.com/MetaMask/core/pull/5380))
+- Support atomic batch transactions ([#5306](https://github.com/MetaMask/core/pull/5306))
+  - Add methods:
+    - `addTransactionBatch`
+    - `isAtomicBatchSupported`
+  - Add `batch` to `TransactionType`.
+  - Add `nestedTransactions` to `TransactionMeta`.
+  - Add new types:
+    - `BatchTransactionParams`
+    - `TransactionBatchSingleRequest`
+    - `TransactionBatchRequest`
+    - `TransactionBatchResult`
+  - Add dependency on `@metamask/remote-feature-flag-controller:^1.4.0`.
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/accounts-controller` peer dependency to `^25.0.0` ([#5426](https://github.com/MetaMask/core/pull/5426))
+- **BREAKING**: Require messenger permissions for `KeyringController:signEip7702Authorization` action ([#5410](https://github.com/MetaMask/core/pull/5410))
+- **BREAKING:** Support atomic batch transactions ([#5306](https://github.com/MetaMask/core/pull/5306))
+  - Require `AccountsController:getState` action permission in messenger.
+  - Require `RemoteFeatureFlagController:getState` action permission in messenger.
+- Bump `@metamask/utils` from `^11.1.0` to `^11.2.0` ([#5301](https://github.com/MetaMask/core/pull/5301))
+- Throw if `addTransactionBatch` is called with any nested transaction with `to` matching internal account ([#5369](https://github.com/MetaMask/core/pull/5369))
+
+## [46.0.0]
+
+### Added
+
+- Adds ability of re-simulating transaction depending on the `isActive` property on `transactionMeta` ([#5189](https://github.com/MetaMask/core/pull/5189))
+  - `isActive` property is expected to set by client.
+  - Re-simulation of transactions will occur every 3 seconds if `isActive` is `true`.
+- Adds `setTransactionActive` function to update the `isActive` property on `transactionMeta`. ([#5189](https://github.com/MetaMask/core/pull/5189))
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/accounts-controller` peer dependency from `^23.0.0` to `^24.0.0` ([#5318](https://github.com/MetaMask/core/pull/5318))
+
 ## [45.1.0]
 
 ### Added
@@ -1277,7 +1319,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@45.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@47.0.0...HEAD
+[47.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@46.0.0...@metamask/transaction-controller@47.0.0
+[46.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@45.1.0...@metamask/transaction-controller@46.0.0
 [45.1.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@45.0.0...@metamask/transaction-controller@45.1.0
 [45.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@44.1.0...@metamask/transaction-controller@45.0.0
 [44.1.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@44.0.0...@metamask/transaction-controller@44.1.0

package/dist/TransactionController.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _TransactionController_instances, _TransactionController_internalEvents, _TransactionController_methodDataHelper, _TransactionController_incomingTransactionChainIds, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_testGasFeeFlows, _TransactionController_multichainTrackingHelper, _TransactionController_retryTransaction, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _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_updateSubmitHistory;
+var _TransactionController_instances, _TransactionController_internalEvents, _TransactionController_methodDataHelper, _TransactionController_incomingTransactionChainIds, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_testGasFeeFlows, _TransactionController_multichainTrackingHelper, _TransactionController_retryTransaction, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _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;
 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");
@@ -41,8 +41,10 @@ const IncomingTransactionHelper_1 = require("./helpers/IncomingTransactionHelper
 const MethodDataHelper_1 = require("./helpers/MethodDataHelper.cjs");
 const MultichainTrackingHelper_1 = require("./helpers/MultichainTrackingHelper.cjs");
 const PendingTransactionTracker_1 = require("./helpers/PendingTransactionTracker.cjs");
+const ResimulateHelper_1 = require("./helpers/ResimulateHelper.cjs");
 const logger_1 = require("./logger.cjs");
 const types_1 = require("./types.cjs");
+const batch_1 = require("./utils/batch.cjs");
 const eip7702_1 = require("./utils/eip7702.cjs");
 const external_transactions_1 = require("./utils/external-transactions.cjs");
 const gas_1 = require("./utils/gas.cjs");
@@ -52,7 +54,6 @@ const history_1 = require("./utils/history.cjs");
 const layer1_gas_fee_flow_1 = require("./utils/layer1-gas-fee-flow.cjs");
 const nonce_1 = require("./utils/nonce.cjs");
 const prepare_1 = require("./utils/prepare.cjs");
-const resimulate_1 = require("./utils/resimulate.cjs");
 const retry_1 = require("./utils/retry.cjs");
 const simulation_1 = require("./utils/simulation.cjs");
 const swaps_1 = require("./utils/swaps.cjs");
@@ -153,31 +154,9 @@ class TransactionController extends base_controller_1.BaseController {
      * Constructs a TransactionController.
      *
      * @param options - The controller options.
-     * @param options.disableHistory - Whether to disable storing history in transaction metadata.
-     * @param options.disableSendFlowHistory - Explicitly disable transaction metadata history.
-     * @param options.disableSwaps - Whether to disable additional processing on swaps transactions.
-     * @param options.getCurrentAccountEIP1559Compatibility - Whether or not the account supports EIP-1559.
-     * @param options.getCurrentNetworkEIP1559Compatibility - Whether or not the network supports EIP-1559.
-     * @param options.getExternalPendingTransactions - Callback to retrieve pending transactions from external sources.
-     * @param options.getGasFeeEstimates - Callback to retrieve gas fee estimates.
-     * @param options.getNetworkClientRegistry - Gets the network client registry.
-     * @param options.getNetworkState - Gets the state of the network controller.
-     * @param options.getPermittedAccounts - Get accounts that a given origin has permissions for.
-     * @param options.getSavedGasFees - Gets the saved gas fee config.
-     * @param options.incomingTransactions - Configuration options for incoming transaction support.
-     * @param options.isFirstTimeInteractionEnabled - Whether first time interaction checks are enabled.
-     * @param options.isSimulationEnabled - Whether new transactions will be automatically simulated.
-     * @param options.messenger - The controller messenger.
-     * @param options.pendingTransactions - Configuration options for pending transaction support.
-     * @param options.securityProviderRequest - A function for verifying a transaction, whether it is malicious or not.
-     * @param options.sign - Function used to sign transactions.
-     * @param options.state - Initial state to set on this controller.
-     * @param options.testGasFeeFlows - Whether to use the test gas fee flow.
-     * @param options.trace - Callback to generate trace information.
-     * @param options.transactionHistoryLimit - Transaction history limit.
-     * @param options.hooks - The controller hooks.
      */
-    constructor({ disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, incomingTransactions = {}, isFirstTimeInteractionEnabled, isSimulationEnabled, messenger, pendingTransactions = {}, securityProviderRequest, sign, state, testGasFeeFlows, trace, transactionHistoryLimit = 40, hooks, }) {
+    constructor(options) {
+        const { disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, incomingTransactions = {}, isFirstTimeInteractionEnabled, isSimulationEnabled, messenger, pendingTransactions = {}, securityProviderRequest, sign, state, testGasFeeFlows, trace, transactionHistoryLimit = 40, hooks, } = options;
         super({
             name: controllerName,
             metadata,
@@ -302,6 +281,13 @@ class TransactionController extends base_controller_1.BaseController {
         // when transactionsController state changes
         // check for pending transactions and start polling if there are any
         this.messagingSystem.subscribe('TransactionController:stateChange', __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
+        new ResimulateHelper_1.ResimulateHelper({
+            simulateTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSimulationData).bind(this),
+            onTransactionsUpdate: (listener) => {
+                this.messagingSystem.subscribe('TransactionController:stateChange', listener, (controllerState) => controllerState.transactions);
+            },
+            getTransactions: () => this.state.transactions,
+        });
         this.onBootCleanup();
         __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f").call(this);
     }
@@ -321,6 +307,35 @@ class TransactionController extends base_controller_1.BaseController {
     async handleMethodData(fourBytePrefix, networkClientId) {
         return __classPrivateFieldGet(this, _TransactionController_methodDataHelper, "f").lookup(fourBytePrefix, networkClientId);
     }
+    /**
+     * Add a batch of transactions to be submitted after approval.
+     *
+     * @param request - Request object containing the transactions to add.
+     * @returns Result object containing the generated batch ID.
+     */
+    async addTransactionBatch(request) {
+        return await (0, batch_1.addTransactionBatch)({
+            addTransaction: this.addTransaction.bind(this),
+            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),
+            messenger: this.messagingSystem,
+            request,
+        });
+    }
+    /**
+     * Determine which chains support atomic batch transactions with the given account address.
+     *
+     * @param address - The address of the account to check.
+     * @returns  The supported chain IDs.
+     */
+    async isAtomicBatchSupported(address) {
+        return (0, batch_1.isAtomicBatchSupported)({
+            address,
+            getEthQuery: (chainId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { chainId }),
+            messenger: this.messagingSystem,
+        });
+    }
     /**
      * Add a new unapproved transaction to state. Parameters will be validated, a
      * unique transaction id will be generated, and gas and gasPrice will be calculated
@@ -331,6 +346,7 @@ class TransactionController extends base_controller_1.BaseController {
      * @param options.actionId - Unique ID to prevent duplicate requests.
      * @param options.deviceConfirmedOn - An enum to indicate what device confirmed the transaction.
      * @param options.method - RPC method that requested the transaction.
+     * @param options.nestedTransactions - Params for any nested transactions encoded in the data.
      * @param options.origin - The origin of the transaction request, such as a dApp hostname.
      * @param options.requireApproval - Whether the transaction requires approval by the user, defaults to true unless explicitly disabled.
      * @param options.securityAlertResponse - Response from security validator.
@@ -345,7 +361,7 @@ class TransactionController extends base_controller_1.BaseController {
      */
     async addTransaction(txParams, options) {
         (0, logger_1.projectLogger)('Adding transaction', txParams, options);
-        const { actionId, deviceConfirmedOn, method, networkClientId, origin, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, traceContext, type, } = options;
+        const { actionId, deviceConfirmedOn, method, nestedTransactions, networkClientId, origin, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, traceContext, type, } = options;
         txParams = (0, utils_2.normalizeTransactionParams)(txParams);
         if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
             throw new Error(`Network client not found - ${networkClientId}`);
@@ -354,12 +370,15 @@ class TransactionController extends base_controller_1.BaseController {
             ? undefined
             : await this.getPermittedAccounts?.(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 (0, validation_1.validateTransactionOrigin)({
             from: txParams.from,
+            internalAccounts,
             origin,
             permittedAddresses,
             selectedAddress,
             txParams,
+            type,
         });
         const isEIP1559Compatible = await this.getEIP1559Compatibility(networkClientId);
         (0, validation_1.validateTxParams)(txParams, isEIP1559Compatible);
@@ -381,6 +400,7 @@ class TransactionController extends base_controller_1.BaseController {
                 deviceConfirmedOn,
                 id: (0, uuid_1.v1)(),
                 isFirstTimeInteraction: undefined,
+                nestedTransactions,
                 networkClientId,
                 origin,
                 securityAlertResponse,
@@ -471,7 +491,7 @@ class TransactionController extends base_controller_1.BaseController {
      * @param options.estimatedBaseFee - The estimated base fee of the transaction.
      */
     async stopTransaction(transactionId, gasValues, { estimatedBaseFee, actionId, } = {}) {
-        return await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_retryTransaction).call(this, {
+        await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_retryTransaction).call(this, {
             actionId,
             estimatedBaseFee,
             gasValues,
@@ -500,7 +520,7 @@ class TransactionController extends base_controller_1.BaseController {
      * @param options.estimatedBaseFee - The estimated base fee of the transaction.
      */
     async speedUpTransaction(transactionId, gasValues, { actionId, estimatedBaseFee, } = {}) {
-        return await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_retryTransaction).call(this, {
+        await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_retryTransaction).call(this, {
             actionId,
             estimatedBaseFee,
             gasValues,
@@ -533,6 +553,7 @@ class TransactionController extends base_controller_1.BaseController {
      * @param transaction - The transaction params to estimate gas for.
      * @param multiplier - The multiplier to use for the gas buffer.
      * @param networkClientId - The network client id to use for the estimate.
+     * @returns The buffered estimated gas and whether the estimation failed.
      */
     async estimateGasBuffered(transaction, multiplier, networkClientId) {
         const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
@@ -795,6 +816,27 @@ class TransactionController extends base_controller_1.BaseController {
         this.updateTransaction(updatedTransaction, `Update Editable Params for ${txId}`);
         return this.getTransaction(txId);
     }
+    /**
+     * Update the isActive state of a transaction.
+     *
+     * @param transactionId - The ID of the transaction to update.
+     * @param isActive - The active state.
+     */
+    setTransactionActive(transactionId, isActive) {
+        const transactionMeta = this.getTransaction(transactionId);
+        if (!transactionMeta) {
+            throw new Error(`Transaction with id ${transactionId} not found`);
+        }
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
+            transactionId,
+            note: 'TransactionController#setTransactionActive - Transaction isActive updated',
+            skipHistory: true,
+            skipValidation: true,
+            skipResimulateCheck: true,
+        }, (updatedTransactionMeta) => {
+            updatedTransactionMeta.isActive = isActive;
+        });
+    }
     /**
      * Signs and returns the raw transaction data for provided transaction params list.
      *
@@ -998,6 +1040,7 @@ class TransactionController extends base_controller_1.BaseController {
      * @param request.transactionParams - The transaction parameters to estimate the layer 1 gas fee for.
      * @param request.chainId - The ID of the chain where the transaction will be executed.
      * @param request.networkClientId - The ID of a specific network client to process the transaction.
+     * @returns The layer 1 gas fee.
      */
     async getLayer1GasFee({ transactionParams, chainId, networkClientId, }) {
         const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, {
@@ -1060,6 +1103,54 @@ class TransactionController extends base_controller_1.BaseController {
         abortCallback();
         this.signAbortCallbacks.delete(transactionId);
     }
+    /**
+     * Update the transaction data of a single nested transaction within an atomic batch transaction.
+     *
+     * @param options - The options bag.
+     * @param options.transactionId - ID of the atomic batch transaction.
+     * @param options.transactionIndex - Index of the nested transaction within the atomic batch transaction.
+     * @param options.transactionData - New data to set for the nested transaction.
+     * @returns The updated data for the atomic batch transaction.
+     */
+    async updateAtomicBatchData({ transactionId, transactionIndex, transactionData, }) {
+        (0, logger_1.projectLogger)('Updating atomic batch data', {
+            transactionId,
+            transactionIndex,
+            transactionData,
+        });
+        const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
+            transactionId,
+            note: 'TransactionController#updateAtomicBatchData - Atomic batch data updated',
+        }, (transactionMeta) => {
+            const { nestedTransactions, txParams } = transactionMeta;
+            const from = txParams.from;
+            const nestedTransaction = nestedTransactions?.[transactionIndex];
+            if (!nestedTransaction) {
+                throw new Error(`Nested transaction not found with index - ${transactionIndex}`);
+            }
+            nestedTransaction.data = transactionData;
+            const batchTransaction = (0, eip7702_1.generateEIP7702BatchTransaction)(from, nestedTransactions);
+            transactionMeta.txParams.data = batchTransaction.data;
+        });
+        const draftTransaction = (0, lodash_1.cloneDeep)({
+            ...updatedTransactionMeta,
+            txParams: {
+                ...updatedTransactionMeta.txParams,
+                // Clear existing gas to force estimation
+                gas: undefined,
+            },
+        });
+        await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasEstimate).call(this, draftTransaction);
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
+            transactionId,
+            note: 'TransactionController#updateAtomicBatchData - Gas estimate updated',
+        }, (transactionMeta) => {
+            transactionMeta.txParams.gas = draftTransaction.txParams.gas;
+            transactionMeta.simulationFails = draftTransaction.simulationFails;
+            transactionMeta.gasLimitNoBuffer = draftTransaction.gasLimitNoBuffer;
+        });
+        return updatedTransactionMeta.txParams.data;
+    }
     addMetadata(transactionMeta) {
         (0, validation_1.validateTxParams)(transactionMeta.txParams);
         this.update((state) => {
@@ -1072,18 +1163,11 @@ class TransactionController extends base_controller_1.BaseController {
     async updateGasProperties(transactionMeta, { traceContext } = {}) {
         const isEIP1559Compatible = transactionMeta.txParams.type !== types_1.TransactionEnvelopeType.legacy &&
             (await this.getEIP1559Compatibility(transactionMeta.networkClientId));
-        const { networkClientId, chainId } = transactionMeta;
-        const isCustomNetwork = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({ networkClientId })
-            .configuration.type === network_controller_1.NetworkClientType.Custom;
+        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 (0, gas_1.updateGas)({
-                ethQuery,
-                chainId,
-                isCustomNetwork,
-                txMeta: transactionMeta,
-            });
+            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 (0, gas_fees_1.updateGasFees)({
             eip1559: isEIP1559Compatible,
@@ -1155,7 +1239,10 @@ class TransactionController extends base_controller_1.BaseController {
                 if (!isTxCompleted) {
                     if (error?.code === rpc_errors_1.errorCodes.provider.userRejectedRequest) {
                         this.cancelTransaction(transactionId, actionId);
-                        throw rpc_errors_1.providerErrors.userRejectedRequest('MetaMask Tx Signature: User denied transaction signature.');
+                        throw rpc_errors_1.providerErrors.userRejectedRequest({
+                            message: 'MetaMask Tx Signature: User denied transaction signature.',
+                            data: error?.data,
+                        });
                     }
                     else {
                         this.failTransaction(meta, error, actionId);
@@ -1185,6 +1272,7 @@ class TransactionController extends base_controller_1.BaseController {
      *
      * @param transactionId - The ID of the transaction to approve.
      * @param traceContext - The parent context for any new traces.
+     * @returns The state of the approval.
      */
     async approveTransaction(transactionId, traceContext) {
         const cleanupTasks = new Array();
@@ -1223,7 +1311,7 @@ class TransactionController extends base_controller_1.BaseController {
                 }
             });
             this.onTransactionStatusChange(transactionMeta);
-            const rawTx = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => this.signTransaction(transactionMeta, transactionMeta.txParams));
+            const rawTx = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => this.signTransaction(transactionMeta));
             if (!this.beforePublish(transactionMeta)) {
                 (0, logger_1.projectLogger)('Skipping publishing transaction based on hook');
                 this.messagingSystem.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
@@ -1590,7 +1678,8 @@ class TransactionController extends base_controller_1.BaseController {
         const currentAccountIsEIP1559Compatible = await this.getCurrentAccountEIP1559Compatibility();
         return (currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible);
     }
-    async signTransaction(transactionMeta, txParams) {
+    async signTransaction(transactionMeta) {
+        const { txParams } = transactionMeta;
         (0, logger_1.projectLogger)('Signing transaction', txParams);
         const { authorizationList, from } = txParams;
         const finalTxParams = { ...txParams };
@@ -1619,6 +1708,7 @@ class TransactionController extends base_controller_1.BaseController {
         const transactionMetaWithRsv = {
             ...this.updateTransactionMetaRSV(transactionMetaFromHook, signedTx),
             status: types_1.TransactionStatus.signed,
+            txParams: finalTxParams,
         };
         this.updateTransaction(transactionMetaWithRsv, 'TransactionController#approveTransaction - Transaction signed');
         this.onTransactionStatusChange(transactionMetaWithRsv);
@@ -1839,6 +1929,9 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
     let resimulateResponse;
     this.update((state) => {
         const index = state.transactions.findIndex(({ id }) => id === transactionId);
+        if (index === -1) {
+            throw new Error(`Cannot update transaction as ID not found - ${transactionId}`);
+        }
         let transactionMeta = state.transactions[index];
         const originalTransactionMeta = (0, lodash_1.cloneDeep)(transactionMeta);
         transactionMeta = callback(transactionMeta) ?? transactionMeta;
@@ -1847,7 +1940,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
             (0, validation_1.validateTxParams)(transactionMeta.txParams);
         }
         if (!skipResimulateCheck && __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this)) {
-            resimulateResponse = (0, resimulate_1.shouldResimulate)(originalTransactionMeta, transactionMeta);
+            resimulateResponse = (0, ResimulateHelper_1.shouldResimulate)(originalTransactionMeta, transactionMeta);
         }
         const shouldSkipHistory = this.isHistoryDisabled || skipHistory;
         if (!shouldSkipHistory) {
@@ -1929,7 +2022,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         }));
         if (blockTime &&
             prevSimulationData &&
-            (0, resimulate_1.hasSimulationDataChanged)(prevSimulationData, simulationData)) {
+            (0, ResimulateHelper_1.hasSimulationDataChanged)(prevSimulationData, simulationData)) {
             simulationData = {
                 ...simulationData,
                 isUpdatedAfterSecurityCheck: true,
@@ -1964,6 +2057,11 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
     });
 }, _TransactionController_getSelectedAccount = function _TransactionController_getSelectedAccount() {
     return this.messagingSystem.call('AccountsController:getSelectedAccount');
+}, _TransactionController_getInternalAccounts = function _TransactionController_getInternalAccounts() {
+    const state = this.messagingSystem.call('AccountsController:getState');
+    return Object.values(state.internalAccounts?.accounts ?? {})
+        .filter((account) => account.type === 'eip155:eoa')
+        .map((account) => account.address);
 }, _TransactionController_updateSubmitHistory = function _TransactionController_updateSubmitHistory(transactionMeta, hash) {
     const { chainId, networkClientId, origin, rawTx, txParams } = transactionMeta;
     const { networkConfigurationsByChainId } = this.getNetworkState();
@@ -1989,5 +2087,16 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         }
         submitHistory.unshift(submitHistoryEntry);
     });
+}, _TransactionController_updateGasEstimate = async function _TransactionController_updateGasEstimate(transactionMeta) {
+    const { chainId, networkClientId } = transactionMeta;
+    const isCustomNetwork = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({ networkClientId })
+        .configuration.type === network_controller_1.NetworkClientType.Custom;
+    const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
+    await (0, gas_1.updateGas)({
+        chainId,
+        ethQuery,
+        isCustomNetwork,
+        txMeta: transactionMeta,
+    });
 };
 //# sourceMappingURL=TransactionController.cjs.map