Merge branch 'main' of https://github.com/0xOlias/ponder

.github/actions/setup/action.yml

@@ -19,7 +19,7 @@ runs:
     - name: Set up foundry
       uses: foundry-rs/foundry-toolchain@v1
       with:
-        version: nightly
+        version: "nightly-d75318c9c7a1c6af5404fe96f63ca890dcdd588d"
 
     - name: Install dependencies
       shell: bash

packages/core/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @ponder/core
 
+## 0.6.6
+
+### Patch Changes
+
+- [#1130](https://github.com/ponder-sh/ponder/pull/1130) [`a50db23dda44c32289c661d8799a37c5c6a88ec4`](https://github.com/ponder-sh/ponder/commit/a50db23dda44c32289c661d8799a37c5c6a88ec4) Thanks [@kyscott18](https://github.com/kyscott18)! - Fixed a bug introduced in `0.6.0` that caused some apps to log progress greater than 100% and re-sync blocks unnecessarily.
+
+## 0.6.5
+
+### Patch Changes
+
+- [#1126](https://github.com/ponder-sh/ponder/pull/1126) [`0a3adb000d60e091b24a6e8facce194c41712fc6`](https://github.com/ponder-sh/ponder/commit/0a3adb000d60e091b24a6e8facce194c41712fc6) Thanks [@kyscott18](https://github.com/kyscott18)! - Fixed a bug introduced in v0.6 where extra transaction may be added to the database in the "realtime" sync when using factory contracts.
+
+  Any users that were affected by this bug and want to reduce the database size can do so with the query:
+
+  ```sql
+  DELETE FROM ponder_sync.transactions WHERE
+    hash NOT IN (SELECT "transactionHash" FROM ponder_sync.logs)
+    AND
+    hash NOT IN (SELECT "transactionHash" FROM ponder_sync."callTraces");
+  ```
+
 ## 0.6.4
 
 ### Patch Changes

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ponder/core",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "An open-source framework for crypto application backends",
   "license": "MIT",
   "type": "module",

packages/core/src/common/telemetry.test.ts

@@ -3,9 +3,8 @@ import { mkdirSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { createTelemetry } from "@/common/telemetry.js";
-import { wait } from "@/utils/wait.js";
 import { rimrafSync } from "rimraf";
-import { beforeEach, expect, test, vi } from "vitest";
+import { afterEach, beforeEach, expect, test, vi } from "vitest";
 import type { Common } from "./common.js";
 import { createLogger } from "./logger.js";
 
@@ -14,7 +13,10 @@ const fetchSpy = vi.fn();
 beforeEach(() => {
   fetchSpy.mockReset();
   vi.stubGlobal("fetch", fetchSpy);
-  return () => vi.unstubAllGlobals();
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
 });
 
 beforeEach((context) => {
@@ -46,7 +48,7 @@ test("telemetry calls fetch with event body", async (context) => {
     properties: { duration_seconds: process.uptime() },
   });
 
-  await wait(0);
+  await telemetry.flush();
   await telemetry.kill();
 
   expect(fetchSpy).toHaveBeenCalledTimes(1);
@@ -77,10 +79,10 @@ test("telemetry does not submit events if telemetry is disabled", async (context
     properties: { duration_seconds: process.uptime() },
   });
 
-  await wait(0);
+  await telemetry.flush();
   await telemetry.kill();
 
-  expect(fetchSpy).toHaveBeenCalledTimes(0);
+  expect(fetchSpy).not.toHaveBeenCalled();
 });
 
 test("telemetry throws if event is submitted after kill", async (context) => {
@@ -96,7 +98,7 @@ test("telemetry throws if event is submitted after kill", async (context) => {
     });
   }
 
-  await wait(0);
+  await telemetry.flush();
   await telemetry.kill();
 
   expect(fetchSpy).toHaveBeenCalledTimes(5);
@@ -106,7 +108,35 @@ test("telemetry throws if event is submitted after kill", async (context) => {
     properties: { duration_seconds: process.uptime() },
   });
 
-  await wait(100);
+  await telemetry.flush();
 
   expect(fetchSpy).toHaveBeenCalledTimes(5);
 });
+
+test("kill resolves within 1 second even with slow events", async (context) => {
+  const telemetry = createTelemetry({
+    options: context.common.options,
+    logger: context.common.logger,
+  });
+
+  // Mock fetch to simulate a slow request
+  fetchSpy.mockImplementation(
+    () => new Promise((resolve) => setTimeout(resolve, 5000)),
+  );
+
+  // Record an event that will trigger the slow fetch
+  telemetry.record({
+    name: "lifecycle:heartbeat_send",
+    properties: { duration_seconds: process.uptime() },
+  });
+
+  const startTime = Date.now();
+  await telemetry.kill();
+  const endTime = Date.now();
+
+  const killDuration = endTime - startTime;
+  expect(killDuration).toBeLessThan(1100); // Allow a small buffer for execution time
+
+  // Ensure that fetch was called, but not completed
+  expect(fetchSpy).toHaveBeenCalledTimes(1);
+});

packages/core/src/common/telemetry.ts

@@ -67,7 +67,11 @@ export function createTelemetry({
   logger,
 }: { options: Options; logger: Logger }) {
   if (options.telemetryDisabled) {
-    return { record: (_event: TelemetryEvent) => {}, kill: async () => {} };
+    return {
+      record: (_event: TelemetryEvent) => {},
+      flush: async () => {},
+      kill: async () => {},
+    };
   }
 
   const conf = new Conf<DeviceConf>({
@@ -208,6 +212,11 @@ export function createTelemetry({
     });
   }, HEARTBEAT_INTERVAL_MS);
 
+  // Note that this method is only used for testing.
+  const flush = async () => {
+    await queue.onIdle();
+  };
+
   const kill = async () => {
     clearInterval(heartbeatInterval);
     isKilled = true;
@@ -217,7 +226,7 @@ export function createTelemetry({
     await Promise.race([queue.onIdle(), wait(1_000)]);
   };
 
-  return { record, kill };
+  return { record, flush, kill };
 }
 
 async function getPackageManager() {

packages/core/src/sync-realtime/index.ts

@@ -206,6 +206,20 @@ export const createRealtimeSync = (
       return isMatched;
     });
 
+    // Remove transactions and transaction receipts that may have been filtered out
+    const transactionHashes = new Set<Hash>();
+    for (const log of logs) {
+      transactionHashes.add(log.transactionHash);
+    }
+    for (const trace of callTraces) {
+      transactionHashes.add(trace.transactionHash);
+    }
+
+    transactions = transactions.filter((t) => transactionHashes.has(t.hash));
+    transactionReceipts = transactionReceipts.filter((t) =>
+      transactionHashes.has(t.transactionHash),
+    );
+
     // Record matched block filters
     for (const filter of blockFilters) {
       if (isBlockFilterMatched({ filter, block })) {

packages/core/src/sync/index.ts

@@ -997,8 +997,20 @@ export async function* localHistoricalSyncGenerator({
   // Cursor to track progress.
   let fromBlock = hexToNumber(syncProgress.start.number);
 
-  // Handle a cache hit by fast forwarding and potentially exiting
-  if (syncProgress.cached !== undefined) {
+  /**
+   * Handle a cache hit by fast forwarding and potentially exiting.
+   * A cache hit can either be: (listed by priority)
+   *   1) recovering progress from earlier invocations with different `finalized` blocks
+   *   2) recovering progress from the interval cache
+   */
+  if (
+    syncProgress.current !== undefined &&
+    (syncProgress.cached === undefined ||
+      hexToNumber(syncProgress.current.number) >
+        hexToNumber(syncProgress.cached.number))
+  ) {
+    fromBlock = hexToNumber(syncProgress.current.number) + 1;
+  } else if (syncProgress.cached !== undefined) {
     // `getEvents` can make progress without calling `sync`, so immediately "yield"
     yield;
 
@@ -1026,7 +1038,7 @@ export async function* localHistoricalSyncGenerator({
      * time spent syncing ≈ time before indexing function feedback.
      */
     const interval: Interval = [
-      fromBlock,
+      Math.min(fromBlock, hexToNumber(historicalLast.number)),
       Math.min(fromBlock + estimateRange, hexToNumber(historicalLast.number)),
     ];
 

packages/create-ponder/CHANGELOG.md

@@ -1,5 +1,9 @@
 # create-ponder
 
+## 0.6.6
+
+## 0.6.5
+
 ## 0.6.4
 
 ## 0.6.3

packages/create-ponder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ponder",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "type": "module",
   "description": "A CLI tool to create Ponder apps",
   "license": "MIT",

packages/eslint-config-ponder/CHANGELOG.md

@@ -1,5 +1,9 @@
 # eslint-config-ponder
 
+## 0.6.6
+
+## 0.6.5
+
 ## 0.6.4
 
 ## 0.6.3

packages/eslint-config-ponder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-ponder",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "ESLint config for Ponder apps",
   "license": "MIT",
   "main": "./index.js",