ponder 0.8.26 → 0.8.27-next.1

package/dist/bin/ponder.js

@@ -19,7 +19,7 @@ import { Command } from "@commander-js/extra-typings";
 import dotenv from "dotenv";
 
 // src/build/index.ts
-import crypto from "node:crypto";
+import crypto2 from "node:crypto";
 import fs from "node:fs";
 import path2 from "node:path";
 
@@ -1448,8 +1448,9 @@ function buildPre({
         msg: `Using Postgres database '${getDatabaseName(connectionString)}' (${source})`
       });
       const poolConfig = {
+        connectionString,
         max: config.database.poolConfig?.max ?? 30,
-        connectionString
+        ssl: config.database.poolConfig?.ssl ?? false
       };
       databaseConfig = { kind: "postgres", poolConfig };
     } else {
@@ -1474,7 +1475,7 @@ function buildPre({
         level: "info",
         msg: `Using Postgres database ${getDatabaseName(connectionString)} (${source})`
       });
-      const poolConfig = { max: 30, connectionString };
+      const poolConfig = { connectionString, max: 30 };
       databaseConfig = { kind: "postgres", poolConfig };
     } else {
       logs.push({
@@ -1803,7 +1804,7 @@ var createBuild = async ({
       return executeResult;
     }
     const config = executeResult.exports.default;
-    const contentHash = crypto.createHash("sha256").update(serialize(config)).digest("hex");
+    const contentHash = crypto2.createHash("sha256").update(serialize(config)).digest("hex");
     return {
       status: "success",
       result: { config, contentHash }
@@ -1827,7 +1828,7 @@ var createBuild = async ({
       status: "success",
       result: {
         schema,
-        contentHash: crypto.createHash("sha256").update(contents).digest("hex")
+        contentHash: crypto2.createHash("sha256").update(contents).digest("hex")
       }
     };
   };
@@ -1854,7 +1855,7 @@ var createBuild = async ({
         return executeResult;
       }
     }
-    const hash = crypto.createHash("sha256");
+    const hash = crypto2.createHash("sha256");
     for (const file of files) {
       try {
         const contents = fs.readFileSync(file, "utf-8");
@@ -2004,7 +2005,7 @@ var createBuild = async ({
       for (const log of buildConfigAndIndexingFunctionsResult.logs) {
         common.logger[log.level]({ service: "build", msg: log.msg });
       }
-      const buildId = crypto.createHash("sha256").update(BUILD_ID_VERSION).update(configResult.contentHash).update(schemaResult.contentHash).update(indexingResult.contentHash).digest("hex").slice(0, 10);
+      const buildId = crypto2.createHash("sha256").update(BUILD_ID_VERSION).update(configResult.contentHash).update(schemaResult.contentHash).update(indexingResult.contentHash).digest("hex").slice(0, 10);
       return {
         status: "success",
         result: {
@@ -4008,15 +4009,18 @@ var BASE_DURATION = 125;
 var HeadlessKysely = class extends Kysely {
   common;
   name;
+  includeTraceLogs;
   isKilled = false;
   constructor({
     common,
     name,
+    includeTraceLogs = false,
     ...args
   }) {
     super(args);
     this.common = common;
     this.name = name;
+    this.includeTraceLogs = includeTraceLogs;
   }
   async destroy() {
     this.isKilled = true;
@@ -4026,6 +4030,13 @@ var HeadlessKysely = class extends Kysely {
     let hasError = false;
     for (let i = 0; i <= RETRY_COUNT; i++) {
       const endClock = startClock();
+      const id = crypto.randomUUID().slice(0, 8);
+      if (this.includeTraceLogs) {
+        this.common.logger.trace({
+          service: this.name,
+          msg: `Started '${options.method}' database method (id=${id})`
+        });
+      }
       try {
         const result = await fn();
         this.common.metrics.ponder_database_method_duration.observe(
@@ -4046,7 +4057,7 @@ var HeadlessKysely = class extends Kysely {
         if (this.isKilled) {
           this.common.logger.trace({
             service: this.name,
-            msg: `Ignored error during '${options.method}' database method (service is killed)`
+            msg: `Ignored error during '${options.method}' database method, service is killed (id=${id})`
           });
           throw new IgnorableError();
         }
@@ -4054,17 +4065,18 @@ var HeadlessKysely = class extends Kysely {
           hasError = true;
           firstError = error;
         }
-        if (error instanceof NonRetryableError || options.shouldRetry?.(error) === false) {
+        if (error instanceof NonRetryableError) {
           this.common.logger.warn({
             service: this.name,
-            msg: `Failed '${options.method}' database method `
+            msg: `Failed '${options.method}' database method (id=${id})`,
+            error
           });
           throw error;
         }
         if (i === RETRY_COUNT) {
           this.common.logger.warn({
             service: this.name,
-            msg: `Failed '${options.method}' database method after '${i + 1}' attempts`,
+            msg: `Failed '${options.method}' database method after '${i + 1}' attempts (id=${id})`,
             error
           });
           throw firstError;
@@ -4072,10 +4084,17 @@ var HeadlessKysely = class extends Kysely {
         const duration = BASE_DURATION * 2 ** i;
         this.common.logger.debug({
           service: this.name,
-          msg: `Failed '${options.method}' database method, retrying after ${duration} milliseconds`,
+          msg: `Failed '${options.method}' database method, retrying after ${duration} milliseconds (id=${id})`,
           error
         });
         await wait(duration);
+      } finally {
+        if (this.includeTraceLogs) {
+          this.common.logger.trace({
+            service: this.name,
+            msg: `Completed '${options.method}' database method in ${Math.round(endClock())}ms (id=${id})`
+          });
+        }
       }
     }
   };
@@ -4100,6 +4119,7 @@ var createDatabase = ({
       internal: new HeadlessKysely({
         name: "internal",
         common,
+        includeTraceLogs: true,
         dialect: kyselyDialect,
         log(event) {
           if (event.level === "query") {
@@ -4139,6 +4159,7 @@ var createDatabase = ({
       sync: new HeadlessKysely({
         name: "sync",
         common,
+        includeTraceLogs: true,
         dialect: kyselyDialect,
         log(event) {
           if (event.level === "query") {
@@ -4196,6 +4217,7 @@ var createDatabase = ({
       internal: new HeadlessKysely({
         name: "internal",
         common,
+        includeTraceLogs: true,
         dialect: new PostgresDialect({ pool: driver.internal }),
         log(event) {
           if (event.level === "query") {
@@ -4235,6 +4257,7 @@ var createDatabase = ({
       sync: new HeadlessKysely({
         name: "sync",
         common,
+        includeTraceLogs: true,
         dialect: new PostgresDialect({ pool: driver.sync }),
         log(event) {
           if (event.level === "query") {
@@ -7157,239 +7180,98 @@ var createSyncStore = ({
       }
     });
   },
-  getEvents: async ({ filters, from, to, limit }) => {
-    const addressSQL = (qb, address, column) => {
-      if (typeof address === "string")
-        return qb.where(column, "=", address);
-      if (isAddressFactory(address)) {
-        return qb.where(
-          column,
-          "in",
-          db.selectFrom("logs").$call((qb2) => logFactorySQL(qb2, address))
-        );
-      }
-      if (Array.isArray(address))
-        return qb.where(column, "in", address);
-      return qb;
-    };
-    const logSQL = (filter, db2, index) => db2.selectFrom("logs").select([
-      ksql.raw(`'${index}'`).as("filterIndex"),
-      "checkpoint",
-      "chainId",
-      "blockHash",
-      "transactionHash",
-      "id as logId",
-      ksql`null`.as("traceId")
-    ]).where("chainId", "=", filter.chainId).$call((qb) => {
-      for (const idx of [0, 1, 2, 3]) {
-        const raw = filter[`topic${idx}`] ?? null;
-        if (raw === null)
-          continue;
-        const topic = Array.isArray(raw) && raw.length === 1 ? raw[0] : raw;
-        if (Array.isArray(topic)) {
-          qb = qb.where(
-            (eb) => eb.or(topic.map((t) => eb(`logs.topic${idx}`, "=", t)))
-          );
-        } else {
-          qb = qb.where(`logs.topic${idx}`, "=", topic);
-        }
-      }
-      return qb;
-    }).$call((qb) => addressSQL(qb, filter.address, "address")).$if(
-      filter.fromBlock !== void 0,
-      (qb) => qb.where("blockNumber", ">=", filter.fromBlock.toString())
-    ).$if(
-      filter.toBlock !== void 0,
-      (qb) => qb.where("blockNumber", "<=", filter.toBlock.toString())
-    );
-    const blockSQL = (filter, db2, index) => db2.selectFrom("blocks").select([
-      ksql.raw(`'${index}'`).as("filterIndex"),
-      "checkpoint",
-      "chainId",
-      "hash as blockHash",
-      ksql`null`.as("transactionHash"),
-      ksql`null`.as("logId"),
-      ksql`null`.as("traceId")
-    ]).where("chainId", "=", filter.chainId).$if(
-      filter !== void 0 && filter.interval !== void 0,
-      (qb) => qb.where(ksql`(number - ${filter.offset}) % ${filter.interval} = 0`)
-    ).$if(
-      filter.fromBlock !== void 0,
-      (qb) => qb.where("number", ">=", filter.fromBlock.toString())
-    ).$if(
-      filter.toBlock !== void 0,
-      (qb) => qb.where("number", "<=", filter.toBlock.toString())
-    );
-    const transactionSQL = (filter, db2, index) => db2.selectFrom("transactions").select([
-      ksql.raw(`'${index}'`).as("filterIndex"),
-      "checkpoint",
-      "chainId",
-      "blockHash",
-      "hash as transactionHash",
-      ksql`null`.as("logId"),
-      ksql`null`.as("traceId")
-    ]).where("chainId", "=", filter.chainId).$call((qb) => addressSQL(qb, filter.fromAddress, "from")).$call((qb) => addressSQL(qb, filter.toAddress, "to")).$if(
-      filter.includeReverted === false,
-      (qb) => qb.where(
-        db2.selectFrom("transactionReceipts").select("status").where(
-          "transactionReceipts.transactionHash",
-          "=",
-          ksql.ref("transactions.hash")
-        ),
-        "=",
-        "0x1"
-      )
-    ).$if(
-      filter.fromBlock !== void 0,
-      (qb) => qb.where("blockNumber", ">=", filter.fromBlock.toString())
-    ).$if(
-      filter.toBlock !== void 0,
-      (qb) => qb.where("blockNumber", "<=", filter.toBlock.toString())
-    );
-    const transferSQL = (filter, db2, index) => db2.selectFrom("traces").select([
-      ksql.raw(`'${index}'`).as("filterIndex"),
-      "checkpoint",
-      "chainId",
-      "blockHash",
-      "transactionHash",
-      ksql`null`.as("logId"),
-      "id as traceId"
-    ]).where("chainId", "=", filter.chainId).$call((qb) => addressSQL(qb, filter.fromAddress, "from")).$call((qb) => addressSQL(qb, filter.toAddress, "to")).where("value", ">", "0").$if(
-      filter.includeReverted === false,
-      (qb) => qb.where("isReverted", "=", 0)
-    ).$if(
-      filter.fromBlock !== void 0,
-      (qb) => qb.where("blockNumber", ">=", filter.fromBlock.toString())
-    ).$if(
-      filter.toBlock !== void 0,
-      (qb) => qb.where("blockNumber", "<=", filter.toBlock.toString())
-    );
-    const traceSQL = (filter, db2, index) => db2.selectFrom("traces").select([
-      ksql.raw(`'${index}'`).as("filterIndex"),
-      "checkpoint",
-      "chainId",
-      "blockHash",
-      "transactionHash",
-      ksql`null`.as("logId"),
-      "id as traceId"
-    ]).where("chainId", "=", filter.chainId).$call((qb) => addressSQL(qb, filter.fromAddress, "from")).$call((qb) => addressSQL(qb, filter.toAddress, "to")).$if(
-      filter.includeReverted === false,
-      (qb) => qb.where("isReverted", "=", 0)
-    ).$if(
-      filter.callType !== void 0,
-      (qb) => qb.where("type", "=", filter.callType)
-    ).$if(filter.functionSelector !== void 0, (qb) => {
-      if (Array.isArray(filter.functionSelector)) {
-        return qb.where("functionSelector", "in", filter.functionSelector);
+  getEvents: async ({ filters, from, to, limit }) => db.wrap({ method: "getEvents" }, async () => {
+    let query2;
+    for (let i = 0; i < filters.length; i++) {
+      const filter = filters[i];
+      const _query = filter.type === "log" ? logSQL(filter, db, i) : filter.type === "block" ? blockSQL(filter, db, i) : filter.type === "transaction" ? transactionSQL(filter, db, i) : filter.type === "transfer" ? transferSQL(filter, db, i) : traceSQL(filter, db, i);
+      query2 = query2 === void 0 ? _query : query2.unionAll(_query);
+    }
+    const rows = await db.with("event", () => query2).selectFrom("event").select([
+      "event.filterIndex as event_filterIndex",
+      "event.checkpoint as event_checkpoint"
+    ]).innerJoin("blocks", "blocks.hash", "event.blockHash").select([
+      "blocks.baseFeePerGas as block_baseFeePerGas",
+      "blocks.difficulty as block_difficulty",
+      "blocks.extraData as block_extraData",
+      "blocks.gasLimit as block_gasLimit",
+      "blocks.gasUsed as block_gasUsed",
+      "blocks.hash as block_hash",
+      "blocks.logsBloom as block_logsBloom",
+      "blocks.miner as block_miner",
+      "blocks.mixHash as block_mixHash",
+      "blocks.nonce as block_nonce",
+      "blocks.number as block_number",
+      "blocks.parentHash as block_parentHash",
+      "blocks.receiptsRoot as block_receiptsRoot",
+      "blocks.sha3Uncles as block_sha3Uncles",
+      "blocks.size as block_size",
+      "blocks.stateRoot as block_stateRoot",
+      "blocks.timestamp as block_timestamp",
+      "blocks.totalDifficulty as block_totalDifficulty",
+      "blocks.transactionsRoot as block_transactionsRoot"
+    ]).leftJoin("logs", "logs.id", "event.logId").select([
+      "logs.address as log_address",
+      "logs.chainId as log_chainId",
+      "logs.data as log_data",
+      "logs.id as log_id",
+      "logs.logIndex as log_logIndex",
+      "logs.topic0 as log_topic0",
+      "logs.topic1 as log_topic1",
+      "logs.topic2 as log_topic2",
+      "logs.topic3 as log_topic3"
+    ]).leftJoin("transactions", "transactions.hash", "event.transactionHash").select([
+      "transactions.accessList as tx_accessList",
+      "transactions.from as tx_from",
+      "transactions.gas as tx_gas",
+      "transactions.gasPrice as tx_gasPrice",
+      "transactions.hash as tx_hash",
+      "transactions.input as tx_input",
+      "transactions.maxFeePerGas as tx_maxFeePerGas",
+      "transactions.maxPriorityFeePerGas as tx_maxPriorityFeePerGas",
+      "transactions.nonce as tx_nonce",
+      "transactions.r as tx_r",
+      "transactions.s as tx_s",
+      "transactions.to as tx_to",
+      "transactions.transactionIndex as tx_transactionIndex",
+      "transactions.type as tx_type",
+      "transactions.value as tx_value",
+      "transactions.v as tx_v"
+    ]).leftJoin("traces", "traces.id", "event.traceId").select([
+      "traces.id as trace_id",
+      "traces.type as trace_callType",
+      "traces.from as trace_from",
+      "traces.to as trace_to",
+      "traces.gas as trace_gas",
+      "traces.gasUsed as trace_gasUsed",
+      "traces.input as trace_input",
+      "traces.output as trace_output",
+      "traces.error as trace_error",
+      "traces.revertReason as trace_revertReason",
+      "traces.value as trace_value",
+      "traces.index as trace_index",
+      "traces.subcalls as trace_subcalls"
+    ]).leftJoin(
+      "transactionReceipts",
+      "transactionReceipts.transactionHash",
+      "event.transactionHash"
+    ).select([
+      "transactionReceipts.contractAddress as txr_contractAddress",
+      "transactionReceipts.cumulativeGasUsed as txr_cumulativeGasUsed",
+      "transactionReceipts.effectiveGasPrice as txr_effectiveGasPrice",
+      "transactionReceipts.from as txr_from",
+      "transactionReceipts.gasUsed as txr_gasUsed",
+      "transactionReceipts.logsBloom as txr_logsBloom",
+      "transactionReceipts.status as txr_status",
+      "transactionReceipts.to as txr_to",
+      "transactionReceipts.type as txr_type"
+    ]).where("event.checkpoint", ">", from).where("event.checkpoint", "<=", to).orderBy("event.checkpoint", "asc").orderBy("event.filterIndex", "asc").$if(limit !== void 0, (qb) => qb.limit(limit)).execute().catch((error) => {
+      if (error.message.includes("statement timeout")) {
+        throw new NonRetryableError(error.message);
       } else {
-        return qb.where("functionSelector", "=", filter.functionSelector);
-      }
-    }).$if(
-      filter.fromBlock !== void 0,
-      (qb) => qb.where("blockNumber", ">=", filter.fromBlock.toString())
-    ).$if(
-      filter.toBlock !== void 0,
-      (qb) => qb.where("blockNumber", "<=", filter.toBlock.toString())
-    );
-    const rows = await db.wrap(
-      {
-        method: "getEvents",
-        shouldRetry(error) {
-          return error.message.includes("statement timeout") === false;
-        }
-      },
-      async () => {
-        let query2;
-        for (let i = 0; i < filters.length; i++) {
-          const filter = filters[i];
-          const _query = filter.type === "log" ? logSQL(filter, db, i) : filter.type === "block" ? blockSQL(filter, db, i) : filter.type === "transaction" ? transactionSQL(filter, db, i) : filter.type === "transfer" ? transferSQL(filter, db, i) : traceSQL(filter, db, i);
-          query2 = query2 === void 0 ? _query : query2.unionAll(_query);
-        }
-        return await db.with("event", () => query2).selectFrom("event").select([
-          "event.filterIndex as event_filterIndex",
-          "event.checkpoint as event_checkpoint"
-        ]).innerJoin("blocks", "blocks.hash", "event.blockHash").select([
-          "blocks.baseFeePerGas as block_baseFeePerGas",
-          "blocks.difficulty as block_difficulty",
-          "blocks.extraData as block_extraData",
-          "blocks.gasLimit as block_gasLimit",
-          "blocks.gasUsed as block_gasUsed",
-          "blocks.hash as block_hash",
-          "blocks.logsBloom as block_logsBloom",
-          "blocks.miner as block_miner",
-          "blocks.mixHash as block_mixHash",
-          "blocks.nonce as block_nonce",
-          "blocks.number as block_number",
-          "blocks.parentHash as block_parentHash",
-          "blocks.receiptsRoot as block_receiptsRoot",
-          "blocks.sha3Uncles as block_sha3Uncles",
-          "blocks.size as block_size",
-          "blocks.stateRoot as block_stateRoot",
-          "blocks.timestamp as block_timestamp",
-          "blocks.totalDifficulty as block_totalDifficulty",
-          "blocks.transactionsRoot as block_transactionsRoot"
-        ]).leftJoin("logs", "logs.id", "event.logId").select([
-          "logs.address as log_address",
-          "logs.chainId as log_chainId",
-          "logs.data as log_data",
-          "logs.id as log_id",
-          "logs.logIndex as log_logIndex",
-          "logs.topic0 as log_topic0",
-          "logs.topic1 as log_topic1",
-          "logs.topic2 as log_topic2",
-          "logs.topic3 as log_topic3"
-        ]).leftJoin(
-          "transactions",
-          "transactions.hash",
-          "event.transactionHash"
-        ).select([
-          "transactions.accessList as tx_accessList",
-          "transactions.from as tx_from",
-          "transactions.gas as tx_gas",
-          "transactions.gasPrice as tx_gasPrice",
-          "transactions.hash as tx_hash",
-          "transactions.input as tx_input",
-          "transactions.maxFeePerGas as tx_maxFeePerGas",
-          "transactions.maxPriorityFeePerGas as tx_maxPriorityFeePerGas",
-          "transactions.nonce as tx_nonce",
-          "transactions.r as tx_r",
-          "transactions.s as tx_s",
-          "transactions.to as tx_to",
-          "transactions.transactionIndex as tx_transactionIndex",
-          "transactions.type as tx_type",
-          "transactions.value as tx_value",
-          "transactions.v as tx_v"
-        ]).leftJoin("traces", "traces.id", "event.traceId").select([
-          "traces.id as trace_id",
-          "traces.type as trace_callType",
-          "traces.from as trace_from",
-          "traces.to as trace_to",
-          "traces.gas as trace_gas",
-          "traces.gasUsed as trace_gasUsed",
-          "traces.input as trace_input",
-          "traces.output as trace_output",
-          "traces.error as trace_error",
-          "traces.revertReason as trace_revertReason",
-          "traces.value as trace_value",
-          "traces.index as trace_index",
-          "traces.subcalls as trace_subcalls"
-        ]).leftJoin(
-          "transactionReceipts",
-          "transactionReceipts.transactionHash",
-          "event.transactionHash"
-        ).select([
-          "transactionReceipts.contractAddress as txr_contractAddress",
-          "transactionReceipts.cumulativeGasUsed as txr_cumulativeGasUsed",
-          "transactionReceipts.effectiveGasPrice as txr_effectiveGasPrice",
-          "transactionReceipts.from as txr_from",
-          "transactionReceipts.gasUsed as txr_gasUsed",
-          "transactionReceipts.logsBloom as txr_logsBloom",
-          "transactionReceipts.status as txr_status",
-          "transactionReceipts.to as txr_to",
-          "transactionReceipts.type as txr_type"
-        ]).where("event.checkpoint", ">", from).where("event.checkpoint", "<=", to).orderBy("event.checkpoint", "asc").orderBy("event.filterIndex", "asc").$if(limit !== void 0, (qb) => qb.limit(limit)).execute();
+        throw error;
       }
-    );
+    });
     const events = rows.map((_row) => {
       const row = _row;
       const filter = filters[row.event_filterIndex];
@@ -7501,7 +7383,7 @@ var createSyncStore = ({
       cursor = events[events.length - 1].checkpoint;
     }
     return { events, cursor };
-  },
+  }),
   insertRpcRequestResult: async ({ request, blockNumber, chainId, result }) => db.wrap({ method: "insertRpcRequestResult" }, async () => {
     await db.insertInto("rpc_request_results").values({
       request,
@@ -7536,6 +7418,139 @@ var createSyncStore = ({
     })
   )
 });
+var addressSQL = (qb, db, address, column) => {
+  if (typeof address === "string")
+    return qb.where(column, "=", address);
+  if (isAddressFactory(address)) {
+    return qb.where(
+      column,
+      "in",
+      db.selectFrom("logs").$call((qb2) => logFactorySQL(qb2, address))
+    );
+  }
+  if (Array.isArray(address))
+    return qb.where(column, "in", address);
+  return qb;
+};
+var logSQL = (filter, db, index) => db.selectFrom("logs").select([
+  ksql.raw(`'${index}'`).as("filterIndex"),
+  "checkpoint",
+  "chainId",
+  "blockHash",
+  "transactionHash",
+  "id as logId",
+  ksql`null`.as("traceId")
+]).where("chainId", "=", filter.chainId).$call((qb) => {
+  for (const idx of [0, 1, 2, 3]) {
+    const raw = filter[`topic${idx}`] ?? null;
+    if (raw === null)
+      continue;
+    const topic = Array.isArray(raw) && raw.length === 1 ? raw[0] : raw;
+    if (Array.isArray(topic)) {
+      qb = qb.where(
+        (eb) => eb.or(topic.map((t) => eb(`logs.topic${idx}`, "=", t)))
+      );
+    } else {
+      qb = qb.where(`logs.topic${idx}`, "=", topic);
+    }
+  }
+  return qb;
+}).$call((qb) => addressSQL(qb, db, filter.address, "address")).$if(
+  filter.fromBlock !== void 0,
+  (qb) => qb.where("blockNumber", ">=", filter.fromBlock.toString())
+).$if(
+  filter.toBlock !== void 0,
+  (qb) => qb.where("blockNumber", "<=", filter.toBlock.toString())
+);
+var blockSQL = (filter, db, index) => db.selectFrom("blocks").select([
+  ksql.raw(`'${index}'`).as("filterIndex"),
+  "checkpoint",
+  "chainId",
+  "hash as blockHash",
+  ksql`null`.as("transactionHash"),
+  ksql`null`.as("logId"),
+  ksql`null`.as("traceId")
+]).where("chainId", "=", filter.chainId).$if(
+  filter !== void 0 && filter.interval !== void 0,
+  (qb) => qb.where(ksql`(number - ${filter.offset}) % ${filter.interval} = 0`)
+).$if(
+  filter.fromBlock !== void 0,
+  (qb) => qb.where("number", ">=", filter.fromBlock.toString())
+).$if(
+  filter.toBlock !== void 0,
+  (qb) => qb.where("number", "<=", filter.toBlock.toString())
+);
+var transactionSQL = (filter, db, index) => db.selectFrom("transactions").select([
+  ksql.raw(`'${index}'`).as("filterIndex"),
+  "checkpoint",
+  "chainId",
+  "blockHash",
+  "hash as transactionHash",
+  ksql`null`.as("logId"),
+  ksql`null`.as("traceId")
+]).where("chainId", "=", filter.chainId).$call((qb) => addressSQL(qb, db, filter.fromAddress, "from")).$call((qb) => addressSQL(qb, db, filter.toAddress, "to")).$if(
+  filter.includeReverted === false,
+  (qb) => qb.where(
+    db.selectFrom("transactionReceipts").select("status").where(
+      "transactionReceipts.transactionHash",
+      "=",
+      ksql.ref("transactions.hash")
+    ),
+    "=",
+    "0x1"
+  )
+).$if(
+  filter.fromBlock !== void 0,
+  (qb) => qb.where("blockNumber", ">=", filter.fromBlock.toString())
+).$if(
+  filter.toBlock !== void 0,
+  (qb) => qb.where("blockNumber", "<=", filter.toBlock.toString())
+);
+var transferSQL = (filter, db, index) => db.selectFrom("traces").select([
+  ksql.raw(`'${index}'`).as("filterIndex"),
+  "checkpoint",
+  "chainId",
+  "blockHash",
+  "transactionHash",
+  ksql`null`.as("logId"),
+  "id as traceId"
+]).where("chainId", "=", filter.chainId).$call((qb) => addressSQL(qb, db, filter.fromAddress, "from")).$call((qb) => addressSQL(qb, db, filter.toAddress, "to")).where("value", ">", "0").$if(
+  filter.includeReverted === false,
+  (qb) => qb.where("isReverted", "=", 0)
+).$if(
+  filter.fromBlock !== void 0,
+  (qb) => qb.where("blockNumber", ">=", filter.fromBlock.toString())
+).$if(
+  filter.toBlock !== void 0,
+  (qb) => qb.where("blockNumber", "<=", filter.toBlock.toString())
+);
+var traceSQL = (filter, db, index) => db.selectFrom("traces").select([
+  ksql.raw(`'${index}'`).as("filterIndex"),
+  "checkpoint",
+  "chainId",
+  "blockHash",
+  "transactionHash",
+  ksql`null`.as("logId"),
+  "id as traceId"
+]).where("chainId", "=", filter.chainId).$call((qb) => addressSQL(qb, db, filter.fromAddress, "from")).$call((qb) => addressSQL(qb, db, filter.toAddress, "to")).$if(
+  filter.includeReverted === false,
+  (qb) => qb.where("isReverted", "=", 0)
+).$if(
+  filter.callType !== void 0,
+  (qb) => qb.where("type", "=", filter.callType)
+).$if(filter.functionSelector !== void 0, (qb) => {
+  if (Array.isArray(filter.functionSelector)) {
+    return qb.where("functionSelector", "in", filter.functionSelector);
+  } else {
+    return qb.where("functionSelector", "=", filter.functionSelector);
+  }
+}).$if(
+  filter.fromBlock !== void 0,
+  (qb) => qb.where("blockNumber", ">=", filter.fromBlock.toString())
+).$if(
+  filter.toBlock !== void 0,
+  (qb) => qb.where("blockNumber", "<=", filter.toBlock.toString())
+);
 
 // src/sync-realtime/filter.ts
 import { hexToBigInt as hexToBigInt3, hexToNumber as hexToNumber2 } from "viem";
@@ -10464,13 +10479,13 @@ var createSync = async (args) => {
           getOmnichainCheckpoint("finalized"),
           getOmnichainCheckpoint("current")
         );
+        let consecutiveErrors = 0;
         while (true) {
           if (isKilled)
             return;
           if (from >= to)
             break;
           const getEventsMaxBatchSize = args.common.options.syncEventsQuerySize;
-          let consecutiveErrors = 0;
           const estimatedTo = encodeCheckpoint({
             ...zeroCheckpoint,
             blockTimestamp: Math.min(
@@ -10487,7 +10502,7 @@ var createSync = async (args) => {
             });
             args.common.logger.debug({
               service: "sync",
-              msg: `Fetched ${events.length} events from the database for a ${formatEta(estimateSeconds * 1e3)} range from ${decodeCheckpoint(from).blockTimestamp}`
+              msg: `Fetched ${events.length} events from the database for a ${formatEta(estimateSeconds * 1e3)} range from timestamp ${decodeCheckpoint(from).blockTimestamp}`
             });
             for (const network of args.networks) {
               updateHistoricalStatus({ events, checkpoint: cursor, network });