ponder 0.8.6 → 0.8.8

package/dist/bin/ponder.js

@@ -4241,8 +4241,8 @@ var createDatabase = ({
     for (const log of reversed) {
       if (log.operation === 0) {
         await tx.deleteFrom(tableName.sql).$call((qb2) => {
-          for (const { sql: sql6 } of primaryKeyColumns) {
-            qb2 = qb2.where(sql6, "=", log[sql6]);
+          for (const { sql: sql5 } of primaryKeyColumns) {
+            qb2 = qb2.where(sql5, "=", log[sql5]);
           }
           return qb2;
         }).execute();
@@ -4251,8 +4251,8 @@ var createDatabase = ({
         log.checkpoint = void 0;
         log.operation = void 0;
         await tx.updateTable(tableName.sql).set(log).$call((qb2) => {
-          for (const { sql: sql6 } of primaryKeyColumns) {
-            qb2 = qb2.where(sql6, "=", log[sql6]);
+          for (const { sql: sql5 } of primaryKeyColumns) {
+            qb2 = qb2.where(sql5, "=", log[sql5]);
           }
           return qb2;
         }).execute();
@@ -4261,7 +4261,7 @@ var createDatabase = ({
         log.checkpoint = void 0;
         log.operation = void 0;
         await tx.insertInto(tableName.sql).values(log).onConflict(
-          (oc) => oc.columns(primaryKeyColumns.map(({ sql: sql6 }) => sql6)).doNothing()
+          (oc) => oc.columns(primaryKeyColumns.map(({ sql: sql5 }) => sql5)).doNothing()
         ).execute();
       }
     }
@@ -6563,7 +6563,7 @@ function intervalRange(interval) {
 }
 
 // src/sync-store/index.ts
-import { sql as ksql, sql as sql4 } from "kysely";
+import { sql as ksql } from "kysely";
 import {
   checksumAddress as checksumAddress2,
   hexToBigInt as hexToBigInt2
@@ -6756,20 +6756,32 @@ var createSyncStore = ({
   common,
   db
 }) => ({
-  insertIntervals: async ({ intervals }) => {
+  insertIntervals: async ({ intervals, chainId }) => {
     if (intervals.length === 0)
       return;
     await db.wrap({ method: "insertIntervals" }, async () => {
+      const perFragmentIntervals = /* @__PURE__ */ new Map();
       const values = [];
-      for (const { interval, filter } of intervals) {
+      for (const { filter, interval } of intervals) {
         for (const fragment of getFragmentIds(filter)) {
-          values.push({
-            fragment_id: fragment.id,
-            chain_id: filter.chainId,
-            blocks: ksql`nummultirange(numrange(${interval[0]}, ${interval[1] + 1}, '[]'))`
-          });
+          if (perFragmentIntervals.has(fragment.id) === false) {
+            perFragmentIntervals.set(fragment.id, []);
+          }
+          perFragmentIntervals.get(fragment.id).push(interval);
         }
       }
+      for (const [fragmentId, intervals2] of perFragmentIntervals) {
+        const numranges = intervals2.map((interval) => {
+          const start2 = interval[0];
+          const end = interval[1] + 1;
+          return `numrange(${start2}, ${end}, '[]')`;
+        }).join(", ");
+        values.push({
+          fragment_id: fragmentId,
+          chain_id: chainId,
+          blocks: ksql.raw(`nummultirange(${numranges})`)
+        });
+      }
       await db.insertInto("intervals").values(values).onConflict(
         (oc) => oc.column("fragment_id").doUpdateSet({
           blocks: ksql`intervals.blocks + excluded.blocks`
@@ -6784,10 +6796,10 @@ var createSyncStore = ({
       const fragments = getFragmentIds(filter);
       for (const fragment of fragments) {
         const _query = db.selectFrom(
-          db.selectFrom("intervals").select(sql4`unnest(blocks)`.as("blocks")).where("fragment_id", "in", fragment.adjacent).as("unnested")
+          db.selectFrom("intervals").select(ksql`unnest(blocks)`.as("blocks")).where("fragment_id", "in", fragment.adjacent).as("unnested")
         ).select([
-          sql4`range_agg(unnested.blocks)`.as("merged_blocks"),
-          sql4.raw(`${i}`).as("filter")
+          ksql`range_agg(unnested.blocks)`.as("merged_blocks"),
+          ksql.raw(`'${i}'`).as("filter")
         ]);
         query2 = query2 === void 0 ? _query : query2.unionAll(_query);
       }
@@ -7020,7 +7032,7 @@ var createSyncStore = ({
         db2.selectFrom("transactionReceipts").select("status").where(
           "transactionReceipts.transactionHash",
           "=",
-          sql4.ref("transactions.hash")
+          ksql.ref("transactions.hash")
         ),
         "=",
         "0x1"
@@ -7299,7 +7311,7 @@ var createSyncStore = ({
     ).execute();
   }),
   getRpcRequestResult: async ({ request, chainId }) => db.wrap({ method: "getRpcRequestResult" }, async () => {
-    const result = await db.selectFrom("rpc_request_results").select("result").where("request_hash", "=", sql4`MD5(${request})`).where("chain_id", "=", chainId).executeTakeFirst();
+    const result = await db.selectFrom("rpc_request_results").select("result").where("request_hash", "=", ksql`MD5(${request})`).where("chain_id", "=", chainId).executeTakeFirst();
     return result?.result;
   }),
   pruneRpcRequestResult: async ({ blocks, chainId }) => db.wrap({ method: "pruneRpcRequestResult" }, async () => {
@@ -8660,7 +8672,8 @@ var createHistoricalSync = async (args) => {
       ]);
       if (args.network.disableCache === false) {
         await args.syncStore.insertIntervals({
-          intervals: syncedIntervals
+          intervals: syncedIntervals,
+          chainId: args.network.chainId
         });
       }
       blockCache.clear();
@@ -9913,6 +9926,10 @@ var createSync = async (args) => {
               limit: getEventsMaxBatchSize
             });
             consecutiveErrors = 0;
+            args.common.logger.debug({
+              service: "sync",
+              msg: `Fetched ${events.length} events from the database for a ${formatEta(estimateSeconds * 1e3)} range from ${decodeCheckpoint(from).blockTimestamp}`
+            });
             for (const network of args.networks) {
               updateHistoricalStatus({ events, checkpoint: cursor, network });
             }
@@ -9928,22 +9945,12 @@ var createSync = async (args) => {
             });
             yield { events, checkpoint: to };
             from = cursor;
-            const { eta, progress } = await getAppProgress(args.common.metrics);
-            if (events.length > 0) {
-              if (eta === void 0 || progress === void 0) {
-                args.common.logger.info({
-                  service: "app",
-                  msg: `Indexed ${events.length} events`
-                });
-              } else {
-                args.common.logger.info({
-                  service: "app",
-                  msg: `Indexed ${events.length} events with ${formatPercentage(progress)} complete and ${formatEta(eta)} remaining`
-                });
-              }
-            }
           } catch (error) {
             estimateSeconds = Math.max(10, Math.round(estimateSeconds / 10));
+            args.common.logger.debug({
+              service: "sync",
+              msg: `Failed to fetch events from the database, retrying with a ${formatEta(estimateSeconds * 1e3)} range`
+            });
             if (++consecutiveErrors > 4)
               throw error;
           }
@@ -10119,7 +10126,8 @@ var createSync = async (args) => {
         ]);
         if (network.disableCache === false) {
           await args.syncStore.insertIntervals({
-            intervals: args.sources.filter(({ filter }) => filter.chainId === network.chainId).map(({ filter }) => ({ filter, interval }))
+            intervals: args.sources.filter(({ filter }) => filter.chainId === network.chainId).map(({ filter }) => ({ filter, interval })),
+            chainId: network.chainId
           });
         }
         if (isSyncEnd(syncProgress)) {
@@ -10511,11 +10519,34 @@ async function run({
     let lastFlush = Date.now();
     for await (const { events, checkpoint } of sync.getEvents()) {
       end = checkpoint;
-      const result = await handleEvents(
-        decodeEvents(common, indexingBuild.sources, events),
-        checkpoint
-      );
+      const decodedEvents = decodeEvents(common, indexingBuild.sources, events);
+      const result = await handleEvents(decodedEvents, checkpoint);
+      const { eta, progress } = await getAppProgress(common.metrics);
+      if (events.length > 0) {
+        if (eta === void 0 || progress === void 0) {
+          common.logger.info({
+            service: "app",
+            msg: `Indexed ${events.length} events`
+          });
+        } else {
+          common.logger.info({
+            service: "app",
+            msg: `Indexed ${events.length} events with ${formatPercentage(progress)} complete and ${formatEta(eta)} remaining`
+          });
+        }
+      }
       if (historicalIndexingStore.isCacheFull() && events.length > 0 || common.options.command === "dev" && lastFlush + 5e3 < Date.now() && events.length > 0) {
+        if (historicalIndexingStore.isCacheFull()) {
+          common.logger.debug({
+            service: "indexing",
+            msg: `Indexing cache has exceeded ${common.options.indexingCacheMaxBytes} MB limit, starting flush`
+          });
+        } else {
+          common.logger.debug({
+            service: "indexing",
+            msg: "Dev server periodic flush triggered, starting flush"
+          });
+        }
         await database.finalize({
           checkpoint: encodeCheckpoint(zeroCheckpoint)
         });
@@ -10527,6 +10558,10 @@ async function run({
           checkpoint: events[events.length - 1].checkpoint
         });
         lastFlush = Date.now();
+        common.logger.debug({
+          service: "indexing",
+          msg: "Completed flush"
+        });
       }
       await metadataStore.setStatus(sync.getStatus());
       if (result.status === "killed") {
@@ -10538,6 +10573,10 @@ async function run({
     }
     if (isKilled)
       return;
+    common.logger.debug({
+      service: "indexing",
+      msg: "Completed all historical events, starting final flush"
+    });
     await database.finalize({ checkpoint: encodeCheckpoint(zeroCheckpoint) });
     await historicalIndexingStore.flush();
     await database.complete({ checkpoint: encodeCheckpoint(zeroCheckpoint) });
@@ -11006,7 +11045,7 @@ async function dev({ cliOptions }) {
 }
 
 // src/bin/commands/list.ts
-import { sql as sql5 } from "kysely";
+import { sql as sql4 } from "kysely";
 var emptySchemaBuild = {
   schema: {},
   statements: {
@@ -11053,7 +11092,7 @@ async function list({ cliOptions }) {
   ).execute();
   let union;
   for (const row of ponderSchemas) {
-    const query2 = database.qb.internal.selectFrom(`${row.table_schema}._ponder_meta`).select(["value", sql5`${row.table_schema}`.as("schema")]).where("key", "=", "app");
+    const query2 = database.qb.internal.selectFrom(`${row.table_schema}._ponder_meta`).select(["value", sql4`${row.table_schema}`.as("schema")]).where("key", "=", "app");
     if (union === void 0) {
       union = query2;
     } else {