ponder 0.18.1 → 0.18.2

package/dist/types/sync-realtime/bloom.d.ts

@@ -1,5 +1,5 @@
 import { type Hex } from "viem";
-import type { LogFilter } from '../internal/types.js';
+import type { Factory, LogFilter } from '../internal/types.js';
 export declare const zeroLogsBloom = "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
 export type BloomBits = {
     byte0: number;
@@ -15,14 +15,8 @@ export type BloomBits = {
  * `undefined` matches every bloom. An array matches if any item is in the bloom.
  */
 export type LogFilterBloom = {
-    fromBlock: number;
-    toBlock: number;
     address: BloomBits[] | undefined;
     topics: (BloomBits[] | undefined)[];
-    factory: {
-        address: BloomBits[] | undefined;
-        eventSelector: BloomBits;
-    } | undefined;
 };
 export declare const getBloomBits: (input: Hex) => BloomBits;
 export declare const isBloomBitsInBloom: (bloom: Uint8Array, bits: BloomBits) => boolean;
@@ -35,15 +29,34 @@ export declare const getLogFilterBloom: (filter: LogFilter) => LogFilterBloom;
 /**
  * Return true if `filter` is in `bloom`.
  *
- * A filter with an address of type `LogFactory` is matched
- * if the address filter is matched (new child contract) or the log
- * filter is matched (log on child contract).
+ * A filter with an address of type `LogFactory` matches all addresses.
+ * Use `isFactoryInBloom` to check for new child contracts.
  *
  * Note: False positives are possible.
  */
-export declare function isFilterInBloom({ blockNumber, bloom, filter, }: {
-    blockNumber: number;
+export declare function isFilterInBloom({ bloom, filter, }: {
     bloom: Uint8Array;
     filter: LogFilterBloom;
 }): boolean;
+/**
+ * A `Factory` with its address and event selector converted to `BloomBits`.
+ */
+export type FactoryBloom = {
+    address: BloomBits[] | undefined;
+    eventSelector: BloomBits;
+};
+/**
+ * Convert `factory` to a `FactoryBloom`. Call once for each factory,
+ * so that the inputs are not hashed again for each block.
+ */
+export declare const getFactoryBloom: (factory: Factory) => FactoryBloom;
+/**
+ * Return true if a log that matches `factory` can be in `bloom`.
+ *
+ * Note: False positives are possible.
+ */
+export declare function isFactoryInBloom({ bloom, factory, }: {
+    bloom: Uint8Array;
+    factory: FactoryBloom;
+}): boolean;
 //# sourceMappingURL=bloom.d.ts.map

package/dist/types/sync-realtime/bloom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bloom.d.ts","sourceRoot":"","sources":["../../../src/sync-realtime/bloom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,MAAM,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAOrD,eAAO,MAAM,aAAa,ugBAC4e,CAAC;AAIvgB,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;IACpC,OAAO,EACH;QAAE,OAAO,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;QAAC,aAAa,EAAE,SAAS,CAAA;KAAE,GAC9D,SAAS,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,YAAY,UAAW,GAAG,KAAG,SAmBzC,CAAC;AAEF,eAAO,MAAM,kBAAkB,UACtB,UAAU,QACX,SAAS,KACd,OAGsC,CAAC;AAE1C,eAAO,MAAM,SAAS,UAAW,UAAU,SAAS,GAAG,KAAG,OACV,CAAC;AAgBjD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,WAAY,SAAS,KAAG,cAyBrD,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,KAAK,EACL,MAAM,GACP,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,cAAc,CAAC;CACxB,GAAG,OAAO,CAmBV"}
+{"version":3,"file":"bloom.d.ts","sourceRoot":"","sources":["../../../src/sync-realtime/bloom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,MAAM,CAAC;AAC3C,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAG9D,eAAO,MAAM,aAAa,ugBAC4e,CAAC;AAIvgB,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,YAAY,UAAW,GAAG,KAAG,SAmBzC,CAAC;AAEF,eAAO,MAAM,kBAAkB,UACtB,UAAU,QACX,SAAS,KACd,OAGsC,CAAC;AAE1C,eAAO,MAAM,SAAS,UAAW,UAAU,SAAS,GAAG,KAAG,OACV,CAAC;AAgBjD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,WAAY,SAAS,KAAG,cAiBrD,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,MAAM,GACP,EAAE;IACD,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,cAAc,CAAC;CACxB,GAAG,OAAO,CAKV;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;IACjC,aAAa,EAAE,SAAS,CAAC;CAC1B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,YAAa,OAAO,KAAG,YAGjD,CAAC;AAEH;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,KAAK,EACL,OAAO,GACR,EAAE;IACD,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;CACvB,GAAG,OAAO,CAKV"}

package/dist/types/sync-realtime/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/sync-realtime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAOb,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EAEV,KAAK,EACL,aAAa,EAEb,iBAAiB,EACjB,SAAS,EAET,UAAU,EAEV,SAAS,EACT,eAAe,EACf,OAAO,EACP,SAAS,EACT,eAAe,EACf,sBAAsB,EAIvB,MAAM,qBAAqB,CAAC;AAY7B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAiB1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAYvD,MAAM,MAAM,YAAY,GAAG;IACzB;;;;OAIG;IACH,IAAI,CACF,KAAK,EAAE,SAAS,GAAG,eAAe,EAClC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,GAC5C,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACrC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC5B,0DAA0D;IAC1D,iBAAiB,EAAE,UAAU,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,SAAS,GAAG,eAAe,CAAC;IACnC,YAAY,EAAE,eAAe,EAAE,CAAC;IAChC,mBAAmB,EAAE,sBAAsB,EAAE,CAAC;IAC9C,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,wEAAwE;IACxE,cAAc,EAAE,GAAG,CAAC,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,iBAAiB,GACzB,CAAC;IACC,IAAI,EAAE,OAAO,CAAC;IACd,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;CAC/C,GAAG,kBAAkB,CAAC,GACvB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,UAAU,EAAE,CAAA;CAAE,CAAC;AAEtE,KAAK,4BAA4B,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC9C,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;CACtD,CAAC;AAKF,eAAO,MAAM,kBAAkB,SACvB,4BAA4B,KACjC,YAqoCF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/sync-realtime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAOb,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EAEV,KAAK,EACL,aAAa,EAEb,iBAAiB,EACjB,SAAS,EAET,UAAU,EAEV,SAAS,EACT,eAAe,EACf,OAAO,EACP,SAAS,EACT,eAAe,EACf,sBAAsB,EAIvB,MAAM,qBAAqB,CAAC;AAY7B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAmB1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAcvD,MAAM,MAAM,YAAY,GAAG;IACzB;;;;OAIG;IACH,IAAI,CACF,KAAK,EAAE,SAAS,GAAG,eAAe,EAClC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,GAC5C,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACrC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC5B,0DAA0D;IAC1D,iBAAiB,EAAE,UAAU,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,SAAS,GAAG,eAAe,CAAC;IACnC,YAAY,EAAE,eAAe,EAAE,CAAC;IAChC,mBAAmB,EAAE,sBAAsB,EAAE,CAAC;IAC9C,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,wEAAwE;IACxE,cAAc,EAAE,GAAG,CAAC,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,iBAAiB,GACzB,CAAC;IACC,IAAI,EAAE,OAAO,CAAC;IACd,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;CAC/C,GAAG,kBAAkB,CAAC,GACvB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,UAAU,EAAE,CAAA;CAAE,CAAC;AAEtE,KAAK,4BAA4B,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC9C,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;CACtD,CAAC;AAKF,eAAO,MAAM,kBAAkB,SACvB,4BAA4B,KACjC,YA8oCF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ponder",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "An open-source TypeScript framework for EVM data indexing",
   "license": "MIT",
   "type": "module",
@@ -81,7 +81,7 @@
   },
   "devDependencies": {
     "@pgsql/types": "16.0.0",
-    "@ponder/client": "0.18.1",
+    "@ponder/client": "0.18.2",
     "@types/babel__code-frame": "^7.0.6",
     "@types/glob": "^8.1.0",
     "@types/node": "^22.0.0",

package/src/rpc/actions.ts

@@ -30,7 +30,7 @@ import { zeroLogsBloom } from "@/sync-realtime/bloom.js";
 import { chunk } from "@/utils/chunk.js";
 import { PG_BIGINT_MAX, PG_INTEGER_MAX } from "@/utils/pg.js";
 
-const ADDRESS_CHUNK_SIZE = 50;
+export const ADDRESS_CHUNK_SIZE = 50;
 
 /**
  * Helper function for "eth_getBlockByNumber" request.
@@ -503,8 +503,6 @@ export const validateTransactionsAndBlock = (
  * Validate that the logs are consistent with the block.
  *
  * @dev Allows `log.transactionHash` to be `zeroHash`.
- * @dev Allows `block.logsBloom` to be `zeroLogsBloom`.
- * @dev Skips bloom validation on async-execution chains.
  */
 export const validateLogsAndBlock = (
   logs: SyncLog[],
@@ -514,25 +512,7 @@ export const validateLogsAndBlock = (
     RequestParameters,
     { method: "eth_getBlockByNumber" | "eth_getBlockByHash" }
   >,
-  isAsyncExecutionChain: boolean,
 ) => {
-  if (
-    isAsyncExecutionChain === false &&
-    block.logsBloom !== zeroLogsBloom &&
-    logs.length === 0
-  ) {
-    const error = new RpcProviderError(
-      `Inconsistent RPC response data. The logs array has length 0, but the associated block has a non-empty 'block.logsBloom'.`,
-    );
-    error.meta = [
-      "Please report this error to the RPC operator.",
-      requestText(blockRequest),
-      requestText(logsRequest),
-    ];
-    error.stack = undefined;
-    throw error;
-  }
-
   const transactionByIndex = new Map<Hex, SyncTransaction>(
     block.transactions.map((transaction) => [
       transaction.transactionIndex,

package/src/runtime/filter.ts

@@ -23,6 +23,7 @@ import type {
   TransactionFilter,
   TransferFilter,
 } from "@/internal/types.js";
+import { ADDRESS_CHUNK_SIZE } from "@/rpc/actions.js";
 import { type RequestParameters, sanitizeLogTopics } from "@/rpc/index.js";
 import type { ChildAddresses, IntervalWithFilter } from "@/runtime/index.js";
 import type {
@@ -222,6 +223,101 @@ export const mergeLogFiltersToRequests = (
   return requests;
 };
 
+/** `address` and `topics` for an "eth_getLogs" request for one block. */
+export type BlockLogsRequestFilter = {
+  address: Address[] | undefined;
+  topics: (Hex[] | null)[] | undefined;
+};
+
+const toLogFilterValues = (
+  value: Hex | Hex[] | null | undefined,
+): Hex[] | undefined => {
+  if (value === null || value === undefined) return undefined;
+  return Array.isArray(value) ? value : [value];
+};
+
+/**
+ * Convert `values` to a request value. A list with more than
+ * `ADDRESS_CHUNK_SIZE` values matches all values, so that `eth_getLogs`
+ * sends exactly one request.
+ */
+const fromLogFilterValues = (values: Hex[] | undefined): Hex[] | null => {
+  if (values === undefined || values.length > ADDRESS_CHUNK_SIZE) return null;
+  return values;
+};
+
+/**
+ * Merge `LogFilter`s and `Factory`s into the `address` and `topics` of one
+ * "eth_getLogs" request for one block. The request matches a superset of the
+ * logs that `logFilters` and `factories` require. Returns `undefined` if no
+ * logs are required.
+ *
+ * @dev A log filter with a factory address matches all addresses, because child
+ * addresses created in the same block are not known before the request.
+ *
+ * @dev Each dimension is the union of all inputs, so the result can match logs
+ * that no single input matches. Logs must be filtered again after the request.
+ *
+ * @dev A dimension with more than `ADDRESS_CHUNK_SIZE` values matches all values.
+ */
+export const mergeLogFiltersToBlockRequest = ({
+  logFilters,
+  factories,
+}: {
+  logFilters: LogFilter[];
+  factories: Factory[];
+}): BlockLogsRequestFilter | undefined => {
+  let address: Hex[] | undefined = [];
+  let topics: (Hex[] | undefined)[] = [[], [], [], []];
+  let isEmpty = true;
+
+  const add = (
+    inputAddress: Hex[] | undefined,
+    inputTopics: (Hex[] | undefined)[],
+  ) => {
+    isEmpty = false;
+    address = mergeLogFilterValue(address, inputAddress);
+    topics = topics.map((values, i) =>
+      mergeLogFilterValue(values, inputTopics[i]),
+    );
+  };
+
+  for (const filter of logFilters) {
+    if (Array.isArray(filter.address) && filter.address.length === 0) continue;
+
+    add(
+      isAddressFactory(filter.address)
+        ? undefined
+        : toLogFilterValues(filter.address),
+      [filter.topic0, filter.topic1, filter.topic2, filter.topic3].map(
+        toLogFilterValues,
+      ),
+    );
+  }
+
+  for (const factory of factories) {
+    if (Array.isArray(factory.address) && factory.address.length === 0) {
+      continue;
+    }
+
+    add(toLogFilterValues(factory.address), [
+      [factory.eventSelector],
+      undefined,
+      undefined,
+      undefined,
+    ]);
+  }
+
+  if (isEmpty) return undefined;
+
+  const requestTopics = sanitizeLogTopics(topics.map(fromLogFilterValues));
+
+  return {
+    address: fromLogFilterValues(address) ?? undefined,
+    topics: requestTopics.length === 0 ? undefined : requestTopics,
+  };
+};
+
 export const getChildAddress = ({
   log,
   factory,
@@ -337,13 +433,7 @@ export const isLogFilterMatched = ({
   filter: LogFilter;
   log: InternalLog | SyncLog;
 }): boolean => {
-  // Return `false` for out of range blocks
-  if (
-    Number(log.blockNumber) < (filter.fromBlock ?? 0) ||
-    Number(log.blockNumber) > (filter.toBlock ?? Number.POSITIVE_INFINITY)
-  ) {
-    return false;
-  }
+  if (isBlockInFilter(filter, Number(log.blockNumber)) === false) return false;
 
   if (isValueMatched(filter.topic0, log.topics[0]) === false) return false;
   if (isValueMatched(filter.topic1, log.topics[1]) === false) return false;
@@ -373,12 +463,7 @@ export const isTransactionFilterMatched = ({
   filter: TransactionFilter;
   transaction: InternalTransaction | SyncTransaction;
 }): boolean => {
-  // Return `false` for out of range blocks
-  if (
-    Number(transaction.blockNumber) < (filter.fromBlock ?? 0) ||
-    Number(transaction.blockNumber) >
-      (filter.toBlock ?? Number.POSITIVE_INFINITY)
-  ) {
+  if (isBlockInFilter(filter, Number(transaction.blockNumber)) === false) {
     return false;
   }
 
@@ -417,13 +502,7 @@ export const isTraceFilterMatched = ({
   trace: InternalTrace | SyncTrace["trace"];
   block: Pick<InternalBlock | SyncBlock, "number">;
 }): boolean => {
-  // Return `false` for out of range blocks
-  if (
-    Number(block.number) < (filter.fromBlock ?? 0) ||
-    Number(block.number) > (filter.toBlock ?? Number.POSITIVE_INFINITY)
-  ) {
-    return false;
-  }
+  if (isBlockInFilter(filter, Number(block.number)) === false) return false;
 
   if (
     isAddressFactory(filter.fromAddress) === false &&
@@ -470,13 +549,7 @@ export const isTransferFilterMatched = ({
   trace: InternalTrace | SyncTrace["trace"];
   block: Pick<InternalBlock | SyncBlock, "number">;
 }): boolean => {
-  // Return `false` for out of range blocks
-  if (
-    Number(block.number) < (filter.fromBlock ?? 0) ||
-    Number(block.number) > (filter.toBlock ?? Number.POSITIVE_INFINITY)
-  ) {
-    return false;
-  }
+  if (isBlockInFilter(filter, Number(block.number)) === false) return false;
 
   if (
     trace.value === undefined ||
@@ -525,13 +598,7 @@ export const isBlockFilterMatched = ({
   filter: BlockFilter;
   block: Pick<InternalBlock | SyncBlock | SyncBlockHeader, "number">;
 }): boolean => {
-  // Return `false` for out of range blocks
-  if (
-    Number(block.number) < (filter.fromBlock ?? 0) ||
-    Number(block.number) > (filter.toBlock ?? Number.POSITIVE_INFINITY)
-  ) {
-    return false;
-  }
+  if (isBlockInFilter(filter, Number(block.number)) === false) return false;
 
   return (Number(block.number) - filter.offset) % filter.interval === 0;
 };
@@ -608,7 +675,10 @@ export const getFilterToBlock = (filter: Filter): number => {
   return Math.max(...blocks);
 };
 
-export const isBlockInFilter = (filter: Filter, blockNumber: number) => {
+export const isBlockInFilter = (
+  filter: Filter | Factory,
+  blockNumber: number,
+) => {
   // Return `false` for out of range blocks
   if (
     blockNumber < (filter.fromBlock ?? 0) ||

package/src/sync-historical/in-memory.ts

@@ -53,7 +53,6 @@ import type {
   IntervalWithFilter,
 } from "@/runtime/index.js";
 import type { SyncStore } from "@/sync-store/index.js";
-import { isAsyncExecutionChain } from "@/utils/finality.js";
 import { drainAsyncGenerator } from "@/utils/generators.js";
 import { type Interval, intervalBounds } from "@/utils/interval.js";
 import { startClock } from "@/utils/timer.js";
@@ -487,7 +486,6 @@ export function createInMemoryHistoricalSync(params: {
                 method: "eth_getBlockByNumber",
                 params: [toHex(blockNumber), true],
               },
-              isAsyncExecutionChain(params.chain.id),
             );
           }
         }

package/src/sync-historical/index.ts

@@ -56,7 +56,6 @@ import type {
 } from "@/runtime/index.js";
 import type { SyncStore } from "@/sync-store/index.js";
 import { dedupe } from "@/utils/dedupe.js";
-import { isAsyncExecutionChain } from "@/utils/finality.js";
 import {
   getChunks,
   type Interval,
@@ -557,7 +556,6 @@ export const createHistoricalSync = (
                 method: "eth_getBlockByNumber",
                 params: [toHex(blockNumber), true],
               },
-              isAsyncExecutionChain(args.chain.id),
             );
           }
         }

package/src/sync-realtime/bloom.ts

@@ -1,10 +1,6 @@
 import { type Hex, keccak256 } from "viem";
-import type { LogFilter } from "@/internal/types.js";
-import {
-  getFilterFromBlock,
-  getFilterToBlock,
-  isAddressFactory,
-} from "@/runtime/filter.js";
+import type { Factory, LogFilter } from "@/internal/types.js";
+import { isAddressFactory } from "@/runtime/filter.js";
 
 export const zeroLogsBloom =
   "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
@@ -26,13 +22,8 @@ export type BloomBits = {
  * `undefined` matches every bloom. An array matches if any item is in the bloom.
  */
 export type LogFilterBloom = {
-  fromBlock: number;
-  toBlock: number;
   address: BloomBits[] | undefined;
   topics: (BloomBits[] | undefined)[];
-  factory:
-    | { address: BloomBits[] | undefined; eventSelector: BloomBits }
-    | undefined;
 };
 
 export const getBloomBits = (input: Hex): BloomBits => {
@@ -87,14 +78,9 @@ const toBloomBits = (
  */
 export const getLogFilterBloom = (filter: LogFilter): LogFilterBloom => {
   let address: BloomBits[] | undefined;
-  let factory: LogFilterBloom["factory"];
 
   if (isAddressFactory(filter.address)) {
     address = undefined;
-    factory = {
-      address: toBloomBits(filter.address.address),
-      eventSelector: getBloomBits(filter.address.eventSelector),
-    };
   } else if (Array.isArray(filter.address) && filter.address.length === 0) {
     address = undefined;
   } else {
@@ -102,50 +88,65 @@ export const getLogFilterBloom = (filter: LogFilter): LogFilterBloom => {
   }
 
   return {
-    fromBlock: getFilterFromBlock(filter),
-    toBlock: getFilterToBlock(filter),
     address,
     topics: [filter.topic0, filter.topic1, filter.topic2, filter.topic3].map(
       toBloomBits,
     ),
-    factory,
   };
 };
 
 /**
  * Return true if `filter` is in `bloom`.
  *
- * A filter with an address of type `LogFactory` is matched
- * if the address filter is matched (new child contract) or the log
- * filter is matched (log on child contract).
+ * A filter with an address of type `LogFactory` matches all addresses.
+ * Use `isFactoryInBloom` to check for new child contracts.
  *
  * Note: False positives are possible.
  */
 export function isFilterInBloom({
-  blockNumber,
   bloom,
   filter,
 }: {
-  blockNumber: number;
   bloom: Uint8Array;
   filter: LogFilterBloom;
 }): boolean {
-  // Return `false` for out of range blocks
-  if (blockNumber < filter.fromBlock || blockNumber > filter.toBlock) {
-    return false;
-  }
-
-  // Return true if the `Factory` is matched.
-  if (
-    filter.factory !== undefined &&
-    isAnyInBloom(bloom, filter.factory.address) &&
-    isBloomBitsInBloom(bloom, filter.factory.eventSelector)
-  ) {
-    return true;
-  }
-
   return (
     isAnyInBloom(bloom, filter.address) &&
     filter.topics.every((topic) => isAnyInBloom(bloom, topic))
   );
 }
+
+/**
+ * A `Factory` with its address and event selector converted to `BloomBits`.
+ */
+export type FactoryBloom = {
+  address: BloomBits[] | undefined;
+  eventSelector: BloomBits;
+};
+
+/**
+ * Convert `factory` to a `FactoryBloom`. Call once for each factory,
+ * so that the inputs are not hashed again for each block.
+ */
+export const getFactoryBloom = (factory: Factory): FactoryBloom => ({
+  address: toBloomBits(factory.address),
+  eventSelector: getBloomBits(factory.eventSelector),
+});
+
+/**
+ * Return true if a log that matches `factory` can be in `bloom`.
+ *
+ * Note: False positives are possible.
+ */
+export function isFactoryInBloom({
+  bloom,
+  factory,
+}: {
+  bloom: Uint8Array;
+  factory: FactoryBloom;
+}): boolean {
+  return (
+    isAnyInBloom(bloom, factory.address) &&
+    isBloomBitsInBloom(bloom, factory.eventSelector)
+  );
+}

package/src/sync-realtime/index.ts

@@ -47,11 +47,13 @@ import {
   isAddressFactory,
   isAddressMatched,
   isBlockFilterMatched,
+  isBlockInFilter,
   isLogFactoryMatched,
   isLogFilterMatched,
   isTraceFilterMatched,
   isTransactionFilterMatched,
   isTransferFilterMatched,
+  mergeLogFiltersToBlockRequest,
 } from "@/runtime/filter.js";
 import {
   getFactoryFragmentId,
@@ -63,7 +65,9 @@ import { createLock } from "@/utils/mutex.js";
 import { range } from "@/utils/range.js";
 import { startClock } from "@/utils/timer.js";
 import {
+  getFactoryBloom,
   getLogFilterBloom,
+  isFactoryInBloom,
   isFilterInBloom,
   isInBloom,
   zeroLogsBloom,
@@ -184,6 +188,7 @@ export const createRealtimeSync = (
   }
 
   const logFilterBlooms = logFilters.map(getLogFilterBloom);
+  const factoryBlooms = factories.map(getFactoryBloom);
 
   const getLatestUnfinalizedBlock = () => {
     if (unfinalizedBlocks.length === 0) {
@@ -220,39 +225,45 @@ export const createRealtimeSync = (
     // Logs
     ////////
 
-    // "eth_getLogs" calls can be skipped if no filters match `newHeadBlock.logsBloom`.
     // Async-execution chains cannot reliably use blooms to filter or validate logs.
+    // A zero `logsBloom` is treated as missing.
     const isAsyncExecution = isAsyncExecutionChain(args.chain.id);
-    let shouldRequestLogs: boolean;
-    if (isAsyncExecution) {
-      shouldRequestLogs = logFilters.length > 0;
-    } else if (maybeBlockHeader.logsBloom === zeroLogsBloom) {
-      shouldRequestLogs = true;
-    } else {
-      const blockNumber = hexToNumber(maybeBlockHeader.number);
-      const bloom = hexToBytes(maybeBlockHeader.logsBloom);
-      shouldRequestLogs = logFilterBlooms.some((filter) =>
-        isFilterInBloom({ blockNumber, bloom, filter }),
-      );
-    }
+    const blockNumber = hexToNumber(maybeBlockHeader.number);
+    const bloom = hexToBytes(maybeBlockHeader.logsBloom);
+
+    const logsRequestFilter = mergeLogFiltersToBlockRequest({
+      logFilters: logFilters.filter(
+        (logFilter, i) =>
+          isBlockInFilter(logFilter, blockNumber) &&
+          (isAsyncExecution ||
+            maybeBlockHeader.logsBloom === zeroLogsBloom ||
+            isFilterInBloom({ bloom, filter: logFilterBlooms[i]! })),
+      ),
+      factories: factories.filter(
+        (factory, i) =>
+          isBlockInFilter(factory, blockNumber) &&
+          (isAsyncExecution ||
+            maybeBlockHeader.logsBloom === zeroLogsBloom ||
+            isFactoryInBloom({ bloom, factory: factoryBlooms[i]! })),
+      ),
+    });
+    const shouldRequestLogs = logsRequestFilter !== undefined;
 
     let logs: SyncLog[] = [];
     if (shouldRequestLogs) {
+      const logsRequestParams = {
+        blockHash: maybeBlockHeader.hash,
+        address: logsRequestFilter.address,
+        topics: logsRequestFilter.topics,
+      };
+
       if (block === undefined) {
         [block, logs] = await Promise.all([
           eth_getBlockByHash(args.rpc, [maybeBlockHeader.hash, true], context),
-          eth_getLogs(
-            args.rpc,
-            [{ blockHash: maybeBlockHeader.hash }],
-            context,
-          ),
+          eth_getLogs(args.rpc, [logsRequestParams], context),
         ]);
       } else {
-        logs = await eth_getLogs(
-          args.rpc,
-          [{ blockHash: block.hash }],
-          context,
-        );
+        logs = await eth_getLogs(args.rpc, [logsRequestParams], context);
       }
 
       validateLogsAndBlock(
@@ -260,7 +271,7 @@ export const createRealtimeSync = (
         block,
         {
           method: "eth_getLogs",
-          params: [{ blockHash: block.hash }],
+          params: [logsRequestParams],
         },
         ethGetBlockMethod === "eth_getBlockByNumber"
           ? {
@@ -271,7 +282,6 @@ export const createRealtimeSync = (
               method: "eth_getBlockByHash",
               params: [block.hash, true],
             },
-        isAsyncExecutionChain(args.chain.id),
       );
 
       for (const log of logs) {
@@ -289,7 +299,10 @@ export const createRealtimeSync = (
       }
     }
 
-    if (shouldRequestLogs === false && logFilters.length > 0) {
+    if (
+      shouldRequestLogs === false &&
+      (logFilters.length > 0 || factories.length > 0)
+    ) {
       args.common.logger.trace({
         msg: "Skipped eth_getLogs request due to bloom filter result",
         action: "fetch_block_data",