@metamask-previews/transaction-controller 46.0.0-preview-90578fc4 → 46.0.0-preview-af470a9

package/CHANGELOG.md

@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- 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`

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, _TransactionController_updateGasEstimate;
+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;
 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");
@@ -372,6 +372,7 @@ class TransactionController extends base_controller_1.BaseController {
         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)({
+            data: txParams.data,
             from: txParams.from,
             internalAccounts,
             origin,
@@ -1103,54 +1104,6 @@ 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) => {
@@ -1163,11 +1116,18 @@ 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 } = transactionMeta;
+        const { networkClientId, chainId } = 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 });
         const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId });
         await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas', parentContext: traceContext }, async () => {
-            await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasEstimate).call(this, transactionMeta);
+            await (0, gas_1.updateGas)({
+                ethQuery,
+                chainId,
+                isCustomNetwork,
+                txMeta: transactionMeta,
+            });
         });
         await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas Fees', parentContext: traceContext }, async () => await (0, gas_fees_1.updateGasFees)({
             eip1559: isEIP1559Compatible,
@@ -1929,9 +1889,6 @@ _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;
@@ -2087,16 +2044,5 @@ _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