@metamask-previews/transaction-controller 40.1.0-preview-6879d4ce → 40.1.0-preview-8a7e499b

package/dist/TransactionController.cjs

@@ -37,7 +37,7 @@ const LineaGasFeeFlow_1 = require("./gas-flows/LineaGasFeeFlow.cjs");
 const OptimismLayer1GasFeeFlow_1 = require("./gas-flows/OptimismLayer1GasFeeFlow.cjs");
 const ScrollLayer1GasFeeFlow_1 = require("./gas-flows/ScrollLayer1GasFeeFlow.cjs");
 const TestGasFeeFlow_1 = require("./gas-flows/TestGasFeeFlow.cjs");
-const AccountsApiRemoteTransactionSource_1 = require("./helpers/AccountsApiRemoteTransactionSource.cjs");
+const EtherscanRemoteTransactionSource_1 = require("./helpers/EtherscanRemoteTransactionSource.cjs");
 const GasFeePoller_1 = require("./helpers/GasFeePoller.cjs");
 const IncomingTransactionHelper_1 = require("./helpers/IncomingTransactionHelper.cjs");
 const MultichainTrackingHelper_1 = require("./helpers/MultichainTrackingHelper.cjs");
@@ -267,20 +267,30 @@ class TransactionController extends base_controller_1.BaseController {
             isMultichainEnabled,
             provider,
             nonceTracker: this.nonceTracker,
+            incomingTransactionOptions: incomingTransactions,
             findNetworkClientIdByChainId,
             getNetworkClientById: ((networkClientId) => {
                 return this.messagingSystem.call(`NetworkController:getNetworkClientById`, networkClientId);
             }),
             getNetworkClientRegistry,
+            removeIncomingTransactionHelperListeners: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removeIncomingTransactionHelperListeners).bind(this),
             removePendingTransactionTrackerListeners: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removePendingTransactionTrackerListeners).bind(this),
             createNonceTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createNonceTracker).bind(this),
+            createIncomingTransactionHelper: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createIncomingTransactionHelper).bind(this),
             createPendingTransactionTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).bind(this),
             onNetworkStateChange: (listener) => {
                 this.messagingSystem.subscribe('NetworkController:stateChange', listener);
             },
         }), "f");
         __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").initialize();
-        this.incomingTransactionHelper = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createIncomingTransactionHelper).call(this);
+        const etherscanRemoteTransactionSource = new EtherscanRemoteTransactionSource_1.EtherscanRemoteTransactionSource({
+            apiKeysByChainId: incomingTransactions.etherscanApiKeysByChainId,
+            includeTokenTransfers: incomingTransactions.includeTokenTransfers,
+        });
+        this.incomingTransactionHelper = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createIncomingTransactionHelper).call(this, {
+            blockTracker,
+            etherscanRemoteTransactionSource,
+        });
         this.pendingTransactionTracker = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).call(this, {
             provider,
             blockTracker,
@@ -463,20 +473,27 @@ class TransactionController extends base_controller_1.BaseController {
     startIncomingTransactionPolling(networkClientIds = []) {
         if (networkClientIds.length === 0) {
             this.incomingTransactionHelper.start();
+            return;
         }
+        __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").startIncomingTransactionPolling(networkClientIds);
     }
     stopIncomingTransactionPolling(networkClientIds = []) {
         if (networkClientIds.length === 0) {
             this.incomingTransactionHelper.stop();
+            return;
         }
+        __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopIncomingTransactionPolling(networkClientIds);
     }
     stopAllIncomingTransactionPolling() {
         this.incomingTransactionHelper.stop();
+        __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopAllIncomingTransactionPolling();
     }
     async updateIncomingTransactions(networkClientIds = []) {
         if (networkClientIds.length === 0) {
             await this.incomingTransactionHelper.update();
+            return;
         }
+        await __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").updateIncomingTransactions(networkClientIds);
     }
     /**
      * Attempts to cancel a transaction based on its ID by setting its status to "rejected"
@@ -604,33 +621,23 @@ class TransactionController extends base_controller_1.BaseController {
      * wiped on current network.
      */
     wipeTransactions(ignoreNetwork, address) {
-        (0, logger_1.projectLogger)('Wiping transactions', { ignoreNetwork, address });
         /* istanbul ignore next */
         if (ignoreNetwork && !address) {
             this.update((state) => {
                 state.transactions = [];
-                state.lastFetchedBlockNumbers = {};
             });
             return;
         }
         const currentChainId = this.getChainId();
-        const { transactions } = this.state;
-        const newTransactions = transactions.filter((tx) => {
-            const { chainId, txParams } = tx;
+        const newTransactions = this.state.transactions.filter(({ chainId, txParams }) => {
             const isMatchingNetwork = ignoreNetwork || chainId === currentChainId;
             if (!isMatchingNetwork) {
                 return true;
             }
-            const isMatchingAddress = !address ||
-                txParams.from?.toLowerCase() === address.toLowerCase() ||
-                txParams.to?.toLowerCase() === address.toLowerCase();
-            if (isMatchingAddress) {
-                (0, logger_1.projectLogger)('Removing transaction', tx);
-            }
+            const isMatchingAddress = !address || txParams.from?.toLowerCase() === address.toLowerCase();
             return !isMatchingAddress;
         });
         this.update((state) => {
-            state.lastFetchedBlockNumbers = {};
             state.transactions = this.trimTransactionsForState(newTransactions);
         });
     }
@@ -1521,28 +1528,24 @@ class TransactionController extends base_controller_1.BaseController {
         };
         return common_1.Common.custom(customChainParams);
     }
-    onIncomingTransactions(transactions) {
-        let newTransactions = [];
+    onIncomingTransactions({ added, updated, }) {
         this.update((state) => {
             const { transactions: currentTransactions } = state;
-            newTransactions = transactions.filter((tx) => !currentTransactions.some((currentTx) => currentTx.hash?.toLowerCase() === tx.hash?.toLowerCase() &&
-                currentTx.txParams.from?.toLowerCase() ===
-                    tx.txParams.from?.toLowerCase()));
-            if (!newTransactions.length) {
-                return;
-            }
-            (0, logger_1.projectLogger)('Adding incoming transactions to state', newTransactions.length, {
-                newTransactions,
-            });
-            state.transactions = this.trimTransactionsForState([
-                ...newTransactions,
-                ...currentTransactions,
-            ]);
+            const updatedTransactions = [
+                ...added,
+                ...currentTransactions.map((originalTransaction) => {
+                    const updatedTransaction = updated.find(({ hash }) => hash === originalTransaction.hash);
+                    return updatedTransaction ?? originalTransaction;
+                }),
+            ];
+            state.transactions = this.trimTransactionsForState(updatedTransactions);
         });
-        if (!newTransactions.length) {
-            return;
-        }
-        this.messagingSystem.publish(`${controllerName}:incomingTransactionsReceived`, newTransactions);
+    }
+    onUpdatedLastFetchedBlockNumbers({ lastFetchedBlockNumbers, blockNumber, }) {
+        this.update((state) => {
+            state.lastFetchedBlockNumbers = lastFetchedBlockNumbers;
+        });
+        this.messagingSystem.publish(`${controllerName}:incomingTransactionBlockReceived`, blockNumber);
     }
     generateDappSuggestedGasFees(txParams, origin) {
         if (!origin || origin === controller_utils_1.ORIGIN_METAMASK) {
@@ -1869,21 +1872,17 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
         getPendingTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNonceTrackerPendingTransactions).bind(this, chainId),
         getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, types_1.TransactionStatus.confirmed),
     });
-}, _TransactionController_createIncomingTransactionHelper = function _TransactionController_createIncomingTransactionHelper({ chainId, } = {}) {
-    const updateCache = (fn) => {
-        this.update((state) => {
-            fn(state.lastFetchedBlockNumbers);
-        });
-    };
+}, _TransactionController_createIncomingTransactionHelper = function _TransactionController_createIncomingTransactionHelper({ blockTracker, etherscanRemoteTransactionSource, chainId, }) {
     const incomingTransactionHelper = new IncomingTransactionHelper_1.IncomingTransactionHelper({
+        blockTracker,
         getCurrentAccount: () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getSelectedAccount).call(this),
-        getCache: () => this.state.lastFetchedBlockNumbers,
-        getChainIds: chainId ? () => [chainId] : () => [this.getChainId()],
-        includeTokenTransfers: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").includeTokenTransfers,
+        getLastFetchedBlockNumbers: () => this.state.lastFetchedBlockNumbers,
+        getLocalTransactions: () => this.state.transactions,
+        getChainId: chainId ? () => chainId : this.getChainId.bind(this),
         isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
         queryEntireHistory: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").queryEntireHistory,
-        remoteTransactionSource: new AccountsApiRemoteTransactionSource_1.AccountsApiRemoteTransactionSource(),
-        updateCache,
+        remoteTransactionSource: etherscanRemoteTransactionSource,
+        transactionLimit: __classPrivateFieldGet(this, _TransactionController_transactionHistoryLimit, "f"),
         updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addIncomingTransactionHelperListeners).call(this, incomingTransactionHelper);
@@ -1918,9 +1917,10 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
     __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopAllTracking();
 }, _TransactionController_removeIncomingTransactionHelperListeners = function _TransactionController_removeIncomingTransactionHelperListeners(incomingTransactionHelper) {
     incomingTransactionHelper.hub.removeAllListeners('transactions');
-    incomingTransactionHelper.hub.removeAllListeners('updated-last-fetched-timestamp');
+    incomingTransactionHelper.hub.removeAllListeners('updatedLastFetchedBlockNumbers');
 }, _TransactionController_addIncomingTransactionHelperListeners = function _TransactionController_addIncomingTransactionHelperListeners(incomingTransactionHelper) {
     incomingTransactionHelper.hub.on('transactions', this.onIncomingTransactions.bind(this));
+    incomingTransactionHelper.hub.on('updatedLastFetchedBlockNumbers', this.onUpdatedLastFetchedBlockNumbers.bind(this));
 }, _TransactionController_removePendingTransactionTrackerListeners = function _TransactionController_removePendingTransactionTrackerListeners(pendingTransactionTracker) {
     pendingTransactionTracker.hub.removeAllListeners('transaction-confirmed');
     pendingTransactionTracker.hub.removeAllListeners('transaction-dropped');