fix

0xProject · Oct 10, 2024 · 497076c · 497076c
1 parent cfc383b
commit 497076c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/filters/erc20_transfer_events.ts b/src/filters/erc20_transfer_events.ts
@@ -32,12 +32,15 @@ export function filterERC20TransferEvents(
     transaction: Transaction,
     allowedTxnList?: Set<string>,
 ): Event[] {
-    if (allowedTxnList && allowedTxnList.size > 0) {
-        if (allowedTxnList.has(transaction.transactionHash)) {
-            return events.filter((e) => e !== null);
-        }
-    } else if (transaction.quoteId) {
-        return events.filter((e) => e !== null);
+    const filteredEvents = new Set<Event>();
+
+    if (allowedTxnList && allowedTxnList.size > 0 && allowedTxnList.has(transaction.transactionHash)) {
+        events.filter((e) => e !== null).forEach((e) => filteredEvents.add(e));
     }
-    return [];
+
+    if (transaction.quoteId) {
+        events.filter((e) => e !== null).forEach((e) => filteredEvents.add(e));
+    }
+
+    return Array.from(filteredEvents);
 }
diff --git a/src/scripts/pull_and_save_block_events.ts b/src/scripts/pull_and_save_block_events.ts
@@ -78,11 +78,9 @@ function parseBlockTransactionsEvents(fullBlock: FullBlock, allowedTxnList?: Set
 
     const usefullTxs: ParsedTransaction[] = fullBlock.transactions
         .map((transaction: FullTransaction): ParsedTransaction | null => {
-            if (!allowedTxnList || allowedTxnList.has(transaction.hash)) {
-                const parsedTransactionEvents = parseTransactionEvents(transaction, allowedTxnList);
-                if (parsedTransactionEvents.parsedTransaction !== null) {
-                    return parsedTransactionEvents;
-                }
+            const parsedTransactionEvents = parseTransactionEvents(transaction, allowedTxnList);
+            if (parsedTransactionEvents.parsedTransaction !== null) {
+                return parsedTransactionEvents;
             }
             return null;
         })