@metamask-previews/transaction-controller 39.1.0-preview-fd7ad7de → 39.1.0-preview-690da12e

package/dist/TransactionController.cjs

@@ -70,7 +70,7 @@ const metadata = {
         persist: true,
         anonymous: false,
     },
-    lastFetchedTimestamps: {
+    lastFetchedBlockNumbers: {
         persist: true,
         anonymous: false,
     },
@@ -111,7 +111,7 @@ function getDefaultTransactionControllerState() {
     return {
         methodData: {},
         transactions: [],
-        lastFetchedTimestamps: {},
+        lastFetchedBlockNumbers: {},
         submitHistory: [],
     };
 }
@@ -599,12 +599,12 @@ class TransactionController extends base_controller_1.BaseController {
         if (ignoreNetwork && !address) {
             this.update((state) => {
                 state.transactions = [];
-                state.lastFetchedTimestamps = {};
+                state.lastFetchedBlockNumbers = {};
             });
             return;
         }
         const currentChainId = this.getChainId();
-        const { lastFetchedTimestamps, transactions } = this.state;
+        const { transactions } = this.state;
         const newTransactions = transactions.filter((tx) => {
             const { chainId, txParams } = tx;
             const isMatchingNetwork = ignoreNetwork || chainId === currentChainId;
@@ -619,20 +619,8 @@ class TransactionController extends base_controller_1.BaseController {
             }
             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.lastFetchedBlockNumbers = {};
             state.transactions = this.trimTransactionsForState(newTransactions);
         });
     }
@@ -1523,20 +1511,20 @@ class TransactionController extends base_controller_1.BaseController {
         };
         return common_1.Common.custom(customChainParams);
     }
-    onIncomingTransactions(incomingTransactions) {
+    onIncomingTransactions(transactions) {
         this.update((state) => {
             const { transactions: currentTransactions } = state;
+            const newTransactions = transactions.filter((tx) => !currentTransactions.some((currentTx) => currentTx.hash?.toLowerCase() === tx.hash?.toLowerCase() &&
+                currentTx.type === types_1.TransactionType.incoming));
+            (0, logger_1.projectLogger)('Adding incoming transactions to state', newTransactions.length, {
+                newTransactions,
+            });
             state.transactions = this.trimTransactionsForState([
-                ...incomingTransactions,
+                ...newTransactions,
                 ...currentTransactions,
             ]);
         });
-        this.messagingSystem.publish(`${controllerName}:incomingTransactionsReceived`, incomingTransactions);
-    }
-    onUpdatedLastFetchedTimestamp({ key, timestamp, }) {
-        this.update((state) => {
-            state.lastFetchedTimestamps[key] = timestamp;
-        });
+        this.messagingSystem.publish(`${controllerName}:incomingTransactionsReceived`, transactions);
     }
     generateDappSuggestedGasFees(txParams, origin) {
         if (!origin || origin === controller_utils_1.ORIGIN_METAMASK) {
@@ -1864,13 +1852,21 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
         getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, types_1.TransactionStatus.confirmed),
     });
 }, _TransactionController_createIncomingTransactionHelper = function _TransactionController_createIncomingTransactionHelper({ chainId, } = {}) {
+    const updateCache = (fn) => {
+        this.update((state) => {
+            fn(state.lastFetchedBlockNumbers);
+        });
+    };
     const incomingTransactionHelper = new IncomingTransactionHelper_1.IncomingTransactionHelper({
         getCurrentAccount: () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getSelectedAccount).call(this),
-        getLastFetchedTimestamps: () => this.state.lastFetchedTimestamps,
+        getCache: () => this.state.lastFetchedBlockNumbers,
         getChainIds: chainId ? () => [chainId] : () => [this.getChainId()],
+        includeTokenTransfers: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").includeTokenTransfers,
         isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
+        queryEntireHistory: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").queryEntireHistory,
         remoteTransactionSource: new AccountsApiRemoteTransactionSource_1.AccountsApiRemoteTransactionSource(),
-        transactionLimit: __classPrivateFieldGet(this, _TransactionController_transactionHistoryLimit, "f"),
+        updateCache,
+        updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addIncomingTransactionHelperListeners).call(this, incomingTransactionHelper);
     return incomingTransactionHelper;
@@ -1903,11 +1899,10 @@ _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('incoming-transactions');
+    incomingTransactionHelper.hub.removeAllListeners('transactions');
     incomingTransactionHelper.hub.removeAllListeners('updated-last-fetched-timestamp');
 }, _TransactionController_addIncomingTransactionHelperListeners = function _TransactionController_addIncomingTransactionHelperListeners(incomingTransactionHelper) {
-    incomingTransactionHelper.hub.on('incoming-transactions', this.onIncomingTransactions.bind(this));
-    incomingTransactionHelper.hub.on('updated-last-fetched-timestamp', this.onUpdatedLastFetchedTimestamp.bind(this));
+    incomingTransactionHelper.hub.on('transactions', this.onIncomingTransactions.bind(this));
 }, _TransactionController_removePendingTransactionTrackerListeners = function _TransactionController_removePendingTransactionTrackerListeners(pendingTransactionTracker) {
     pendingTransactionTracker.hub.removeAllListeners('transaction-confirmed');
     pendingTransactionTracker.hub.removeAllListeners('transaction-dropped');