@metamask-previews/transaction-controller 38.3.0-preview-7692db0d → 38.3.0-preview-de5d2fda

package/dist/TransactionController.cjs

@@ -36,7 +36,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 EtherscanRemoteTransactionSource_1 = require("./helpers/EtherscanRemoteTransactionSource.cjs");
+const AccountsApiRemoteTransactionSource_1 = require("./helpers/AccountsApiRemoteTransactionSource.cjs");
 const GasFeePoller_1 = require("./helpers/GasFeePoller.cjs");
 const IncomingTransactionHelper_1 = require("./helpers/IncomingTransactionHelper.cjs");
 const MultichainTrackingHelper_1 = require("./helpers/MultichainTrackingHelper.cjs");
@@ -70,7 +70,7 @@ const metadata = {
         persist: true,
         anonymous: false,
     },
-    lastFetchedBlockNumbers: {
+    lastFetchedTimestamps: {
         persist: true,
         anonymous: false,
     },
@@ -111,7 +111,7 @@ function getDefaultTransactionControllerState() {
     return {
         methodData: {},
         transactions: [],
-        lastFetchedBlockNumbers: {},
+        lastFetchedTimestamps: {},
         submitHistory: [],
     };
 }
@@ -263,30 +263,20 @@ 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();
-        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.incomingTransactionHelper = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createIncomingTransactionHelper).call(this);
         this.pendingTransactionTracker = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).call(this, {
             provider,
             blockTracker,
@@ -463,27 +453,20 @@ 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"
@@ -611,23 +594,45 @@ 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.lastFetchedTimestamps = {};
             });
             return;
         }
         const currentChainId = this.getChainId();
-        const newTransactions = this.state.transactions.filter(({ chainId, txParams }) => {
+        const { lastFetchedTimestamps, transactions } = this.state;
+        const newTransactions = transactions.filter((tx) => {
+            const { chainId, txParams } = tx;
             const isMatchingNetwork = ignoreNetwork || chainId === currentChainId;
             if (!isMatchingNetwork) {
                 return true;
             }
-            const isMatchingAddress = !address || txParams.from?.toLowerCase() === address.toLowerCase();
+            const isMatchingAddress = !address ||
+                txParams.from?.toLowerCase() === address.toLowerCase() ||
+                txParams.to?.toLowerCase() === address.toLowerCase();
+            if (isMatchingAddress) {
+                (0, logger_1.projectLogger)('Removing transaction', tx);
+            }
             return !isMatchingAddress;
         });
+        const newLastFetchedTimestamps = Object.keys(lastFetchedTimestamps).reduce((acc, key) => {
+            const timestamp = lastFetchedTimestamps[key];
+            const isMatchingNetwork = ignoreNetwork || key.startsWith(`${currentChainId}#`);
+            const isMatchingAddress = !address || key.endsWith(`#${address.toLowerCase()}`);
+            if (!isMatchingNetwork || !isMatchingAddress) {
+                acc[key] = timestamp;
+            }
+            else {
+                (0, logger_1.projectLogger)('Removing last fetched timestamp', { key, timestamp });
+            }
+            return acc;
+        }, {});
         this.update((state) => {
+            state.lastFetchedTimestamps = newLastFetchedTimestamps;
             state.transactions = this.trimTransactionsForState(newTransactions);
         });
     }
@@ -1518,24 +1523,20 @@ class TransactionController extends base_controller_1.BaseController {
         };
         return common_1.Common.custom(customChainParams);
     }
-    onIncomingTransactions({ added, updated, }) {
+    onIncomingTransactions(incomingTransactions) {
         this.update((state) => {
             const { transactions: currentTransactions } = state;
-            const updatedTransactions = [
-                ...added,
-                ...currentTransactions.map((originalTransaction) => {
-                    const updatedTransaction = updated.find(({ hash }) => hash === originalTransaction.hash);
-                    return updatedTransaction ?? originalTransaction;
-                }),
-            ];
-            state.transactions = this.trimTransactionsForState(updatedTransactions);
+            state.transactions = this.trimTransactionsForState([
+                ...incomingTransactions,
+                ...currentTransactions,
+            ]);
         });
+        this.messagingSystem.publish(`${controllerName}:incomingTransactionsReceived`, incomingTransactions);
     }
-    onUpdatedLastFetchedBlockNumbers({ lastFetchedBlockNumbers, blockNumber, }) {
+    onUpdatedLastFetchedTimestamp({ key, timestamp, }) {
         this.update((state) => {
-            state.lastFetchedBlockNumbers = lastFetchedBlockNumbers;
+            state.lastFetchedTimestamps[key] = timestamp;
         });
-        this.messagingSystem.publish(`${controllerName}:incomingTransactionBlockReceived`, blockNumber);
     }
     generateDappSuggestedGasFees(txParams, origin) {
         if (!origin || origin === controller_utils_1.ORIGIN_METAMASK) {
@@ -1862,18 +1863,14 @@ _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({ blockTracker, etherscanRemoteTransactionSource, chainId, }) {
+}, _TransactionController_createIncomingTransactionHelper = function _TransactionController_createIncomingTransactionHelper({ chainId, } = {}) {
     const incomingTransactionHelper = new IncomingTransactionHelper_1.IncomingTransactionHelper({
-        blockTracker,
         getCurrentAccount: () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getSelectedAccount).call(this),
-        getLastFetchedBlockNumbers: () => this.state.lastFetchedBlockNumbers,
-        getLocalTransactions: () => this.state.transactions,
-        getChainId: chainId ? () => chainId : this.getChainId.bind(this),
+        getLastFetchedTimestamps: () => this.state.lastFetchedTimestamps,
+        getChainIds: chainId ? () => [chainId] : () => [this.getChainId()],
         isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
-        queryEntireHistory: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").queryEntireHistory,
-        remoteTransactionSource: etherscanRemoteTransactionSource,
+        remoteTransactionSource: new AccountsApiRemoteTransactionSource_1.AccountsApiRemoteTransactionSource(),
         transactionLimit: __classPrivateFieldGet(this, _TransactionController_transactionHistoryLimit, "f"),
-        updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addIncomingTransactionHelperListeners).call(this, incomingTransactionHelper);
     return incomingTransactionHelper;
@@ -1906,11 +1903,11 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removeIncomingTransactionHelperListeners).call(this, this.incomingTransactionHelper);
     __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopAllTracking();
 }, _TransactionController_removeIncomingTransactionHelperListeners = function _TransactionController_removeIncomingTransactionHelperListeners(incomingTransactionHelper) {
-    incomingTransactionHelper.hub.removeAllListeners('transactions');
-    incomingTransactionHelper.hub.removeAllListeners('updatedLastFetchedBlockNumbers');
+    incomingTransactionHelper.hub.removeAllListeners('incoming-transactions');
+    incomingTransactionHelper.hub.removeAllListeners('updated-last-fetched-timestamp');
 }, _TransactionController_addIncomingTransactionHelperListeners = function _TransactionController_addIncomingTransactionHelperListeners(incomingTransactionHelper) {
-    incomingTransactionHelper.hub.on('transactions', this.onIncomingTransactions.bind(this));
-    incomingTransactionHelper.hub.on('updatedLastFetchedBlockNumbers', this.onUpdatedLastFetchedBlockNumbers.bind(this));
+    incomingTransactionHelper.hub.on('incoming-transactions', this.onIncomingTransactions.bind(this));
+    incomingTransactionHelper.hub.on('updated-last-fetched-timestamp', this.onUpdatedLastFetchedTimestamp.bind(this));
 }, _TransactionController_removePendingTransactionTrackerListeners = function _TransactionController_removePendingTransactionTrackerListeners(pendingTransactionTracker) {
     pendingTransactionTracker.hub.removeAllListeners('transaction-confirmed');
     pendingTransactionTracker.hub.removeAllListeners('transaction-dropped');