@metamask-previews/transaction-controller 45.1.0-preview-f51ef7f8 → 45.1.0-preview-cd1fb95d

package/CHANGELOG.md

@@ -9,24 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- 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:** 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.
+- 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))
 
 ## [45.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_getInternalAccounts, _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_updateSubmitHistory;
 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,9 +41,9 @@ 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");
@@ -53,7 +53,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");
@@ -303,6 +302,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);
     }
@@ -322,34 +328,6 @@ 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 }),
-            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
@@ -360,7 +338,6 @@ 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.
@@ -375,7 +352,7 @@ class TransactionController extends base_controller_1.BaseController {
      */
     async addTransaction(txParams, options) {
         (0, logger_1.projectLogger)('Adding transaction', txParams, options);
-        const { actionId, deviceConfirmedOn, method, nestedTransactions, networkClientId, origin, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, traceContext, type, } = options;
+        const { actionId, deviceConfirmedOn, method, 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}`);
@@ -384,15 +361,12 @@ 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);
@@ -414,7 +388,6 @@ class TransactionController extends base_controller_1.BaseController {
                 deviceConfirmedOn,
                 id: (0, uuid_1.v1)(),
                 isFirstTimeInteraction: undefined,
-                nestedTransactions,
                 networkClientId,
                 origin,
                 securityAlertResponse,
@@ -829,6 +802,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.
      *
@@ -1257,7 +1251,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));
+            const rawTx = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => this.signTransaction(transactionMeta, transactionMeta.txParams));
             if (!this.beforePublish(transactionMeta)) {
                 (0, logger_1.projectLogger)('Skipping publishing transaction based on hook');
                 this.messagingSystem.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
@@ -1624,8 +1618,7 @@ class TransactionController extends base_controller_1.BaseController {
         const currentAccountIsEIP1559Compatible = await this.getCurrentAccountEIP1559Compatibility();
         return (currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible);
     }
-    async signTransaction(transactionMeta) {
-        const { txParams } = transactionMeta;
+    async signTransaction(transactionMeta, txParams) {
         (0, logger_1.projectLogger)('Signing transaction', txParams);
         const { authorizationList, from } = txParams;
         const finalTxParams = { ...txParams };
@@ -1654,7 +1647,6 @@ 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);
@@ -1883,7 +1875,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) {
@@ -1965,7 +1957,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,
@@ -2000,11 +1992,6 @@ _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();