@metamask-previews/transaction-controller 49.0.0-preview-b4d33c51 → 49.0.0-preview-3db01c5

package/CHANGELOG.md

@@ -7,19 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- Add additional metadata for batch metrics ([#5488](https://github.com/MetaMask/core/pull/5488))
-  - Add `delegationAddress` to `TransactionMetadata`.
-  - Add `NestedTransactionMetadata` type containing `BatchTransactionParams` and `type`.
-  - Add optional `type` to `TransactionBatchSingleRequest`.
-
-### Changed
-
-- **BREAKING:** Add additional metadata for batch metrics ([#5488](https://github.com/MetaMask/core/pull/5488))
-  - Change `error` in `TransactionMetadata` to optional for all statuses.
-  - Change `nestedTransactions` in `TransactionMetadata` to array of `NestedTransactionMetadata`.
-
 ## [49.0.0]
 
 ### Added

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_rejectTransaction, _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, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow;
+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");
@@ -395,7 +395,6 @@ class TransactionController extends base_controller_1.BaseController {
             networkClientId,
         });
         const transactionType = type ?? (await (0, transaction_type_1.determineTransactionType)(txParams, ethQuery)).type;
-        const { delegationAddress } = await (0, eip7702_1.isAccountUpgradedToEIP7702)(txParams.from, chainId, this.messagingSystem, ethQuery);
         const existingTransactionMeta = this.getTransactionWithActionId(actionId);
         // If a request to add a transaction with the same actionId is submitted again, a new transaction will not be created for it.
         let addedTransactionMeta = existingTransactionMeta
@@ -406,7 +405,6 @@ class TransactionController extends base_controller_1.BaseController {
                 batchId,
                 chainId,
                 dappSuggestedGasFees,
-                delegationAddress,
                 deviceConfirmedOn,
                 id: (0, uuid_1.v1)(),
                 isFirstTimeInteraction: undefined,
@@ -441,7 +439,7 @@ class TransactionController extends base_controller_1.BaseController {
             }
             addedTransactionMeta = (0, swaps_1.updateSwapsTransaction)(addedTransactionMeta, transactionType, swaps, {
                 isSwapsDisabled: this.isSwapsDisabled,
-                cancelTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransaction).bind(this),
+                cancelTransaction: this.cancelTransaction.bind(this),
                 messenger: this.messagingSystem,
             });
             this.addMetadata(addedTransactionMeta);
@@ -1241,13 +1239,18 @@ class TransactionController extends base_controller_1.BaseController {
                         actionId,
                     });
                 }
+                // TODO: Replace `any` with type
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }
-            catch (rawError) {
-                const error = rawError;
+            catch (error) {
                 const { isCompleted: isTxCompleted } = this.isTransactionCompleted(transactionId);
                 if (!isTxCompleted) {
-                    if (__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isRejectError).call(this, error)) {
-                        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransactionAndThrow).call(this, transactionId, actionId, error);
+                    if (error?.code === rpc_errors_1.errorCodes.provider.userRejectedRequest) {
+                        this.cancelTransaction(transactionId, actionId);
+                        throw rpc_errors_1.providerErrors.userRejectedRequest({
+                            message: 'MetaMask Tx Signature: User denied transaction signature.',
+                            data: error?.data,
+                        });
                     }
                     else {
                         this.failTransaction(meta, error, actionId);
@@ -1258,9 +1261,8 @@ class TransactionController extends base_controller_1.BaseController {
         const finalMeta = await finishedPromise;
         switch (finalMeta?.status) {
             case types_1.TransactionStatus.failed:
-                const error = finalMeta.error;
-                resultCallbacks?.error(error);
-                throw rpc_errors_1.rpcErrors.internal(error.message);
+                resultCallbacks?.error(finalMeta.error);
+                throw rpc_errors_1.rpcErrors.internal(finalMeta.error.message);
             case types_1.TransactionStatus.submitted:
                 resultCallbacks?.success();
                 return finalMeta.hash;
@@ -1387,6 +1389,34 @@ class TransactionController extends base_controller_1.BaseController {
         }
         return transactionHash;
     }
+    /**
+     * Cancels a transaction based on its ID by setting its status to "rejected"
+     * and emitting a `<tx.id>:finished` hub event.
+     *
+     * @param transactionId - The ID of the transaction to cancel.
+     * @param actionId - The actionId passed from UI
+     */
+    cancelTransaction(transactionId, actionId) {
+        const transactionMeta = this.state.transactions.find(({ id }) => id === transactionId);
+        if (!transactionMeta) {
+            return;
+        }
+        this.update((state) => {
+            const transactions = state.transactions.filter(({ id }) => id !== transactionId);
+            state.transactions = this.trimTransactionsForState(transactions);
+        });
+        const updatedTransactionMeta = {
+            ...transactionMeta,
+            status: types_1.TransactionStatus.rejected,
+        };
+        this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
+        __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, updatedTransactionMeta);
+        this.messagingSystem.publish(`${controllerName}:transactionRejected`, {
+            transactionMeta: updatedTransactionMeta,
+            actionId,
+        });
+        this.onTransactionStatusChange(updatedTransactionMeta);
+    }
     /**
      * Trim the amount of transactions that are set on the state. Checks
      * if the length of the tx history is longer then desired persistence
@@ -1829,24 +1859,6 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         actionId,
     });
     afterSubmit?.(newTransactionMeta);
-}, _TransactionController_rejectTransaction = function _TransactionController_rejectTransaction(transactionId, actionId, error) {
-    const transactionMeta = this.getTransaction(transactionId);
-    if (!transactionMeta) {
-        return;
-    }
-    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_deleteTransaction).call(this, transactionId);
-    const updatedTransactionMeta = {
-        ...transactionMeta,
-        status: types_1.TransactionStatus.rejected,
-        error: (0, utils_2.normalizeTxError)(error ?? rpc_errors_1.providerErrors.userRejectedRequest()),
-    };
-    this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
-    __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, updatedTransactionMeta);
-    this.messagingSystem.publish(`${controllerName}:transactionRejected`, {
-        transactionMeta: updatedTransactionMeta,
-        actionId,
-    });
-    this.onTransactionStatusChange(updatedTransactionMeta);
 }, _TransactionController_getChainId = function _TransactionController_getChainId(networkClientId) {
     return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({ networkClientId })
         .configuration.chainId;
@@ -2094,24 +2106,5 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         isCustomNetwork,
         txMeta: transactionMeta,
     });
-}, _TransactionController_deleteTransaction = function _TransactionController_deleteTransaction(transactionId) {
-    this.update((state) => {
-        const transactions = state.transactions.filter(({ id }) => id !== transactionId);
-        state.transactions = this.trimTransactionsForState(transactions);
-    });
-}, _TransactionController_isRejectError = function _TransactionController_isRejectError(error) {
-    return [
-        rpc_errors_1.errorCodes.provider.userRejectedRequest,
-        rpc_errors_1.errorCodes.rpc.methodNotSupported,
-    ].includes(error.code);
-}, _TransactionController_rejectTransactionAndThrow = function _TransactionController_rejectTransactionAndThrow(transactionId, actionId, error) {
-    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransaction).call(this, transactionId, actionId, error);
-    if (error.code === rpc_errors_1.errorCodes.provider.userRejectedRequest) {
-        throw rpc_errors_1.providerErrors.userRejectedRequest({
-            message: 'MetaMask Tx Signature: User denied transaction signature.',
-            data: error?.data,
-        });
-    }
-    throw error;
 };
 //# sourceMappingURL=TransactionController.cjs.map