simplify logic a bit

Author: arcoraven

src/worker/tasks/processEventLogsWorker.ts

@@ -43,19 +43,16 @@ const handler: Processor<any, void, string> = async (job: Job<string>) => {
     return;
   }
 
-  // Get webhooks.
-  const webhooksByContractAddress = await getWebhooksByContractAddresses(
-    chainId,
-  );
-
   // Store logs to DB.
   const insertedLogs = await bulkInsertContractEventLogs({ logs });
   if (insertedLogs.length === 0) {
     return;
   }
 
   // Enqueue webhooks.
-  // This step should happen immediately after inserting to DB.
+  const webhooksByContractAddress = await getWebhooksByContractAddresses(
+    chainId,
+  );
   for (const eventLog of insertedLogs) {
     const webhooks = webhooksByContractAddress[eventLog.contractAddress] ?? [];
     for (const webhook of webhooks) {
@@ -119,6 +116,7 @@ const getLogs = async ({
   }
 
   const chain = defineChain(chainId);
+  // Store a reference to `contract` so ABI fetches are cached.
   const addressConfig: Record<
     Address,
     {
@@ -140,6 +138,7 @@ const getLogs = async ({
     const { contract } = addressConfig[f.address];
 
     // Get events to filter by, if any.
+    // Resolve the event name, "Transfer", to event signature, "Transfer(address to, uint256 quantity)".
     const events: PreparedEvent<AbiEvent>[] = [];
     if (f.events.length > 0) {
       const abi = await resolveContractAbi<AbiEvent[]>(contract);
@@ -154,7 +153,7 @@ const getLogs = async ({
       contract,
       fromBlock: BigInt(fromBlock),
       toBlock: BigInt(toBlock),
-      events,
+      events, // [] means return all events
     });
   });
 
@@ -211,7 +210,7 @@ const getLogs = async ({
  *      "quantity": {
  *        "type:" "uint256",
  *        "value": "2"
- *      },
+ *      }
  *    }
  */
 const formatDecodedLog = async (args: {

src/worker/tasks/processTransactionReceiptsWorker.ts

@@ -41,22 +41,18 @@ const handler: Processor<any, void, string> = async (job: Job<string>) => {
     return;
   }
 
-  // Get webhooks.
-  const webhooksByContractAddress = await getWebhooksByContractAddresses(
-    chainId,
-  );
-
   // Store logs to DB.
   const insertedReceipts = await bulkInsertContractTransactionReceipts({
     receipts,
   });
-
   if (insertedReceipts.length === 0) {
     return;
   }
 
   // Enqueue webhooks.
-  // This step should happen immediately after inserting to DB.
+  const webhooksByContractAddress = await getWebhooksByContractAddresses(
+    chainId,
+  );
   for (const transactionReceipt of insertedReceipts) {
     const webhooks =
       webhooksByContractAddress[transactionReceipt.contractAddress] ?? [];
@@ -115,13 +111,18 @@ const getFormattedTransactionReceipts = async ({
   const addressConfig: Record<
     Address,
     {
-      functions: Set<string>;
+      functions: string[];
       contract: ThirdwebContract;
     }
   > = {};
   for (const filter of filters) {
+    // Merge multiple filters for the same address.
+    if (filter.address in addressConfig) {
+      addressConfig[filter.address].functions.push(...filter.functions);
+    }
+
     addressConfig[filter.address] = {
-      functions: new Set(filter.functions),
+      functions: filter.functions,
       contract: getContract({
         client: thirdwebClient,
         chain,
@@ -152,13 +153,13 @@ const getFormattedTransactionReceipts = async ({
       }
 
       let functionName: string | undefined = undefined;
-      if (config.functions.size > 0) {
+      if (config.functions.length > 0) {
         functionName = await getFunctionName({
           contract: config.contract,
           data: transaction.input,
         });
 
-        if (!config.functions.has(functionName)) {
+        if (!config.functions.includes(functionName)) {
           // This transaction is not for a subscribed function name.
           continue;
         }