ponder 0.14.13 → 0.15.0

package/src/sync-realtime/bloom.ts

@@ -1,5 +1,9 @@
 import type { LogFilter, SyncBlock } from "@/internal/types.js";
-import { isAddressFactory } from "@/runtime/filter.js";
+import {
+  getFilterFromBlock,
+  getFilterToBlock,
+  isAddressFactory,
+} from "@/runtime/filter.js";
 import { type Hex, hexToBytes, hexToNumber, keccak256 } from "viem";
 
 export const zeroLogsBloom =
@@ -42,8 +46,8 @@ export function isFilterInBloom({
 }): boolean {
   // Return `false` for out of range blocks
   if (
-    hexToNumber(block.number) < (filter.fromBlock ?? 0) ||
-    hexToNumber(block.number) > (filter.toBlock ?? Number.POSITIVE_INFINITY)
+    hexToNumber(block.number) < getFilterFromBlock(filter) ||
+    hexToNumber(block.number) > getFilterToBlock(filter)
   ) {
     return false;
   }

package/src/sync-realtime/index.ts

@@ -3,12 +3,12 @@ import { ShutdownError } from "@/internal/errors.js";
 import type {
   BlockFilter,
   Chain,
+  EventCallback,
   Factory,
   FactoryId,
   Filter,
   LightBlock,
   LogFilter,
-  Source,
   SyncBlock,
   SyncBlockHeader,
   SyncLog,
@@ -34,6 +34,7 @@ import {
 import type { Rpc } from "@/rpc/index.js";
 import {
   getChildAddress,
+  getFilterFactories,
   isAddressFactory,
   isAddressMatched,
   isBlockFilterMatched,
@@ -87,7 +88,7 @@ type CreateRealtimeSyncParameters = {
   common: Common;
   chain: Chain;
   rpc: Rpc;
-  sources: Source[];
+  eventCallbacks: EventCallback[];
   syncProgress: Pick<SyncProgress, "finalized">;
   childAddresses: Map<FactoryId, Map<Address, number>>;
 };
@@ -135,46 +136,36 @@ export const createRealtimeSync = (
   const transferFilters: TransferFilter[] = [];
   const blockFilters: BlockFilter[] = [];
 
-  for (const source of args.sources) {
-    // Collect filters from sources
-    if (source.type === "contract") {
-      if (source.filter.type === "log") {
-        logFilters.push(source.filter);
-      } else if (source.filter.type === "trace") {
-        traceFilters.push(source.filter);
-      }
-    } else if (source.type === "account") {
-      if (source.filter.type === "transaction") {
-        transactionFilters.push(source.filter);
-      } else if (source.filter.type === "transfer") {
-        transferFilters.push(source.filter);
-      }
-    } else if (source.type === "block") {
-      blockFilters.push(source.filter);
+  for (const eventCallback of args.eventCallbacks) {
+    if (
+      eventCallback.filter.toBlock &&
+      eventCallback.filter.toBlock <= hexToNumber(finalizedBlock.number)
+    ) {
+      continue;
     }
 
-    // Collect factories from sources
-    switch (source.filter.type) {
-      case "trace":
-      case "transaction":
-      case "transfer": {
-        const { fromAddress, toAddress } = source.filter;
+    // Collect filters from event callbacks
+    if (eventCallback.filter.type === "log") {
+      logFilters.push(eventCallback.filter);
+    } else if (eventCallback.filter.type === "trace") {
+      traceFilters.push(eventCallback.filter);
+    } else if (eventCallback.filter.type === "transaction") {
+      transactionFilters.push(eventCallback.filter);
+    } else if (eventCallback.filter.type === "transfer") {
+      transferFilters.push(eventCallback.filter);
+    } else if (eventCallback.filter.type === "block") {
+      blockFilters.push(eventCallback.filter);
+    }
 
-        if (isAddressFactory(fromAddress)) {
-          factories.push(fromAddress);
-        }
-        if (isAddressFactory(toAddress)) {
-          factories.push(toAddress);
-        }
-        break;
-      }
-      case "log": {
-        const { address } = source.filter;
-        if (isAddressFactory(address)) {
-          factories.push(address);
-        }
-        break;
+    for (const factory of getFilterFactories(eventCallback.filter)) {
+      if (
+        factory.toBlock &&
+        factory.toBlock <= hexToNumber(finalizedBlock.number)
+      ) {
+        continue;
       }
+
+      factories.push(factory);
     }
   }
 
@@ -358,10 +349,7 @@ export const createRealtimeSync = (
       }
     }
 
-    if (
-      shouldRequestLogs === false &&
-      args.sources.some((s) => s.filter.type === "log")
-    ) {
+    if (shouldRequestLogs === false && logFilters.length > 0) {
       args.common.logger.trace({
         msg: "Skipped eth_getLogs request due to bloom filter result",
         action: "fetch_block_data",
@@ -717,10 +705,7 @@ export const createRealtimeSync = (
       let isMatched = transactionHashes.has(transaction.hash);
       for (const filter of transactionFilters) {
         if (
-          isTransactionFilterMatched({
-            filter,
-            transaction,
-          }) &&
+          isTransactionFilterMatched({ filter, transaction }) &&
           (isAddressFactory(filter.fromAddress)
             ? isAddressMatched({
                 address: transaction.from,