ponder 0.9.4 → 0.9.5-debug.1

package/dist/types/utils/requestQueue.d.ts

@@ -0,0 +1,21 @@
+import type { Common } from '../internal/common.js';
+import type { Network } from '../internal/types.js';
+import { type Queue } from './queue.js';
+import { type EIP1193Parameters, type PublicRpcSchema } from "viem";
+import type { DebugRpcSchema } from "./debug.js";
+type Schema = [...PublicRpcSchema, ...DebugRpcSchema];
+type RequestReturnType<method extends EIP1193Parameters<Schema>["method"]> = Extract<Schema[number], {
+    Method: method;
+}>["ReturnType"];
+export type RequestQueue = Omit<Queue<RequestReturnType<EIP1193Parameters<Schema>["method"]>, EIP1193Parameters<Schema>>, "add"> & {
+    request: <TParameters extends EIP1193Parameters<Schema>>(parameters: TParameters) => Promise<RequestReturnType<TParameters["method"]>>;
+};
+/**
+ * Creates a queue built to manage rpc requests.
+ */
+export declare const createRequestQueue: ({ common, network, }: {
+    common: Common;
+    network: Network;
+}) => RequestQueue;
+export {};
+//# sourceMappingURL=requestQueue.d.ts.map

package/dist/types/utils/requestQueue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestQueue.d.ts","sourceRoot":"","sources":["../../../src/utils/requestQueue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,kBAAkB,CAAC;AAK3D,OAAO,EACL,KAAK,iBAAiB,EAMtB,KAAK,eAAe,EAGrB,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAIjD,KAAK,MAAM,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,CAAC;AAEtD,KAAK,iBAAiB,CAAC,MAAM,SAAS,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IACvE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,YAAY,CAAC,CAAC;AAE5D,MAAM,MAAM,YAAY,GAAG,IAAI,CAC7B,KAAK,CACH,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,EACtD,iBAAiB,CAAC,MAAM,CAAC,CAC1B,EACD,KAAK,CACN,GAAG;IACF,OAAO,EAAE,CAAC,WAAW,SAAS,iBAAiB,CAAC,MAAM,CAAC,EACrD,UAAU,EAAE,WAAW,KACpB,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;CACxD,CAAC;AAKF;;GAEG;AACH,eAAO,MAAM,kBAAkB;YAGlB,MAAM;aAAW,OAAO;MAAK,YA8GzC,CAAC"}

package/dist/types/utils/result.d.ts

@@ -0,0 +1,17 @@
+export type Result<T> = ([T] extends [never] ? {
+    status: "success";
+} : {
+    status: "success";
+    result: T;
+}) | {
+    status: "error";
+    error: Error;
+};
+export type MergeResults<T extends readonly Result<any>[]> = T extends readonly [
+    infer Head extends Result<unknown>,
+    ...infer Tail extends Result<unknown>[]
+] ? [Extract<Head, {
+    status: "success";
+}>["result"], ...MergeResults<Tail>] : [];
+export declare const mergeResults: <const T extends readonly Result<unknown>[]>(results: T) => Result<MergeResults<T>>;
+//# sourceMappingURL=result.d.ts.map

package/dist/types/utils/result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../../src/utils/result.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,CAAC,CAAC,IAChB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAChB;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,GACrC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAEtC,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,SAAS,MAAM,CAAC,GAAG,CAAC,EAAE,IACvD,CAAC,SAAS,SAAS;IACjB,MAAM,IAAI,SAAS,MAAM,CAAC,OAAO,CAAC;IAClC,GAAG,MAAM,IAAI,SAAS,MAAM,CAAC,OAAO,CAAC,EAAE;CACxC,GACG,CAAC,OAAO,CAAC,IAAI,EAAE;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,GACvE,EAAE,CAAC;AAET,eAAO,MAAM,YAAY,qFAWxB,CAAC"}

package/dist/types/utils/rpc.d.ts

@@ -0,0 +1,57 @@
+import type { SyncBlock, SyncLog, SyncTrace, SyncTransactionReceipt } from '../types/sync.js';
+import type { RequestQueue } from './requestQueue.js';
+import { type Address, type Hash, type Hex, type LogTopic } from "viem";
+/**
+ * Helper function for "eth_getBlockByNumber" request.
+ */
+export declare const _eth_getBlockByNumber: (requestQueue: RequestQueue, { blockNumber, blockTag, }: {
+    blockNumber: Hex | number;
+    blockTag?: undefined;
+} | {
+    blockNumber?: undefined;
+    blockTag: "latest";
+}) => Promise<SyncBlock>;
+/**
+ * Helper function for "eth_getBlockByNumber" request.
+ */
+export declare const _eth_getBlockByHash: (requestQueue: RequestQueue, { hash }: {
+    hash: Hex;
+}) => Promise<SyncBlock>;
+/**
+ * Helper function for "eth_getLogs" rpc request.
+ * Handles different error types and retries the request if applicable.
+ */
+export declare const _eth_getLogs: (requestQueue: RequestQueue, params: {
+    address?: Address | Address[];
+    topics?: LogTopic[];
+} & ({
+    fromBlock: Hex | number;
+    toBlock: Hex | number;
+} | {
+    blockHash: Hash;
+})) => Promise<SyncLog[]>;
+/**
+ * Helper function for "eth_getTransactionReceipt" request.
+ */
+export declare const _eth_getTransactionReceipt: (requestQueue: RequestQueue, { hash }: {
+    hash: Hex;
+}) => Promise<SyncTransactionReceipt>;
+/**
+ * Helper function for "eth_getBlockReceipts" request.
+ */
+export declare const _eth_getBlockReceipts: (requestQueue: RequestQueue, { blockHash }: {
+    blockHash: Hash;
+}) => Promise<SyncTransactionReceipt[]>;
+/**
+ * Helper function for "debug_traceBlockByNumber" request.
+ */
+export declare const _debug_traceBlockByNumber: (requestQueue: RequestQueue, { blockNumber, }: {
+    blockNumber: Hex | number;
+}) => Promise<SyncTrace[]>;
+/**
+ * Helper function for "debug_traceBlockByHash" request.
+ */
+export declare const _debug_traceBlockByHash: (requestQueue: RequestQueue, { hash, }: {
+    hash: Hash;
+}) => Promise<SyncTrace[]>;
+//# sourceMappingURL=rpc.d.ts.map

package/dist/types/utils/rpc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../../src/utils/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EACP,SAAS,EACT,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EACL,KAAK,OAAO,EAEZ,KAAK,IAAI,EACT,KAAK,GAAG,EACR,KAAK,QAAQ,EAGd,MAAM,MAAM,CAAC;AAEd;;GAEG;AACH,eAAO,MAAM,qBAAqB,iBAClB,YAAY;iBAKP,GAAG,GAAG,MAAM;;;;cACM,QAAQ;MAC5C,QAAQ,SAAS,CAiBd,CAAC;AAEP;;GAEG;AACH,eAAO,MAAM,mBAAmB,iBAChB,YAAY;UACR,GAAG;MACpB,QAAQ,SAAS,CAYd,CAAC;AAEP;;;GAGG;AACH,eAAO,MAAM,YAAY,iBACT,YAAY,UAClB;IACN,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;IAC9B,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;CACrB,GAAG,CACA;IAAE,SAAS,EAAE,GAAG,GAAG,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,GAAG,MAAM,CAAA;CAAE,GAClD;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,CACtB,KACA,QAAQ,OAAO,EAAE,CA6CnB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,iBACvB,YAAY;UACR,GAAG;MACpB,QAAQ,sBAAsB,CAY3B,CAAC;AAEP;;GAEG;AACH,eAAO,MAAM,qBAAqB,iBAClB,YAAY;eACE,IAAI;MAC/B,QAAQ,sBAAsB,EAAE,CAMqC,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,yBAAyB,iBACtB,YAAY;iBAIX,GAAG,GAAG,MAAM;MAE1B,QAAQ,SAAS,EAAE,CA8DhB,CAAC;AAEP;;GAEG;AACH,eAAO,MAAM,uBAAuB,iBACpB,YAAY;UAIlB,IAAI;MAEX,QAAQ,SAAS,EAAE,CAyDhB,CAAC"}

package/dist/types/utils/serialize.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Serialize function that handles BigInt.
+ *
+ * Forked from https://github.com/wevm/wagmi
+ *
+ * @param value to stringify
+ * @returns the stringified output
+ */
+export declare function serialize(value: any): string;
+/**
+ * Deserialize function that handles BigInt.
+ *
+ * Forked from https://github.com/wevm/wagmi
+ *
+ * @param value to parse
+ * @returns the output object
+ */
+export declare function deserialize<type>(value: string): type;
+//# sourceMappingURL=serialize.d.ts.map

package/dist/types/utils/serialize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../src/utils/serialize.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,UAInC;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAIrD"}

package/dist/types/utils/timer.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Measures the elapsed wall clock time in milliseconds (ms) between two points.
+ * @returns A function returning the elapsed time in milliseconds (ms).
+ */
+export declare function startClock(): () => number;
+/**
+ * Converts a process.hrtime() measurement to milliseconds (ms).
+ * @returns The timestamp in milliseconds (ms).
+ */
+export declare function hrTimeToMs(diff: [number, number]): number;
+//# sourceMappingURL=timer.d.ts.map

package/dist/types/utils/timer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../../src/utils/timer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,UAAU,iBAGzB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,UAGhD"}

package/dist/types/utils/wait.d.ts

@@ -0,0 +1,6 @@
+/** Waits at least a specified amount of time.
+ *
+ * @param milliseconds Minimum number of milliseconds to wait.
+ */
+export declare function wait(milliseconds: number): Promise<void>;
+//# sourceMappingURL=wait.d.ts.map

package/dist/types/utils/wait.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/utils/wait.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAsB,IAAI,CAAC,YAAY,EAAE,MAAM,iBAE9C"}

package/dist/types/utils/zipper.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Merges two sorted arrays into a single sorted array.
+ *
+ * @param array1 - The first array to merge.
+ * @param array2 - The second array to merge.
+ * @param compare - The comparison function to use.
+ *
+ * @returns The merged array.
+ *
+ * @example
+ * ```ts
+ * const result = zipper([1, 3, 5], [2, 4, 6]);
+ * // result = [1, 2, 3, 4, 5, 6]
+ * ```
+ */
+export declare const zipper: <T>(array1: T[], array2: T[], compare?: ((a: T, b: T) => number) | undefined) => T[];
+/**
+ * Merges many sorted arrays into a single sorted array.
+ *
+ * @param arrays - The arrays to merge.
+ * @param compare - The comparison function to use.
+ *
+ * @returns The merged array.
+ *
+ * @example
+ * ```ts
+ * const result = zipperMany([
+ *   [1, 3, 5],
+ *   [2, 4, 6],
+ *   [7, 8, 9],
+ * ]);
+ * // result = [1, 2, 3, 4, 5, 6, 7, 8, 9]
+ * ```
+ */
+export declare const zipperMany: <T>(arrays: T[][], compare?: ((a: T, b: T) => number) | undefined) => T[];
+//# sourceMappingURL=zipper.d.ts.map

package/dist/types/utils/zipper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zipper.d.ts","sourceRoot":"","sources":["../../../src/utils/zipper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,MAAM,2DAGS,MAAM,qBA2BjC,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,gDAEK,MAAM,qBAYjC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ponder",
-  "version": "0.9.4",
+  "version": "0.9.5-debug.1",
   "description": "An open-source framework for crypto application backends",
   "license": "MIT",
   "type": "module",
@@ -12,20 +12,22 @@
   "files": [
     "dist",
     "src/**/*.ts",
-    "!src/**/*.test.ts",
-    "!src/**/*.test-d.ts",
-    "!src/_test/**/*"
+    "!src/_test/**/*",
+    "!**/*.test.ts",
+    "!**/*.test-d.ts",
+    "!**/*.tsbuildinfo",
+    "CHANGELOG.md"
   ],
   "bin": {
-    "ponder": "./dist/bin/ponder.js"
+    "ponder": "./dist/esm/bin/ponder.js"
   },
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "typings": "./dist/index.d.ts",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/types/index.d.ts",
+  "typings": "./dist/types/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "types": "./dist/types/index.d.ts",
+      "import": "./dist/esm/index.js"
     },
     "./virtual": {
       "types": "./src/types.d.ts"
@@ -85,20 +87,18 @@
     "@types/react": "^18.2.38",
     "@viem/anvil": "^0.0.6",
     "@wagmi/cli": "^1.5.2",
+    "chokidar": "^4.0.3",
     "execa": "^8.0.1",
     "rimraf": "^5.0.5",
-    "tsup": "^8.0.1",
-    "vitest": "^1.0.2"
-  },
-  "imports": {
-    "@ponder/common": "../common/index.ts",
-    "@ponder/client": "../client/index.ts"
+    "tsx": "^4.19.2",
+    "vitest": "^1.0.2",
+    "@ponder/client": "0.9.5"
   },
   "engines": {
     "node": ">=18.14"
   },
   "scripts": {
-    "build": "tsup",
+    "build": "tsx build.ts",
     "test": "vitest",
     "test:typecheck": "vitest --typecheck.only",
     "typecheck": "tsc --noEmit"

package/src/bin/commands/dev.ts

@@ -9,8 +9,8 @@ import { createShutdown } from "@/internal/shutdown.js";
 import { buildPayload, createTelemetry } from "@/internal/telemetry.js";
 import type { IndexingBuild } from "@/internal/types.js";
 import { createUi } from "@/ui/index.js";
+import { createQueue } from "@/utils/queue.js";
 import { type Result, mergeResults } from "@/utils/result.js";
-import { createQueue } from "@ponder/common";
 import type { CliOptions } from "../ponder.js";
 import { createExit } from "../utils/exit.js";
 import { run } from "../utils/run.js";

package/src/bin/ponder.ts

@@ -14,7 +14,7 @@ import { start } from "./commands/start.js";
 dotenv.config({ path: ".env.local" });
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const packageJsonPath = resolve(__dirname, "../../package.json");
+const packageJsonPath = resolve(__dirname, "../../../package.json");
 const packageJson = JSON.parse(
   readFileSync(packageJsonPath, { encoding: "utf8" }),
 );

package/src/bin/utils/run.ts

@@ -8,7 +8,6 @@ import type { Common } from "@/internal/common.js";
 import { getAppProgress } from "@/internal/metrics.js";
 import type { IndexingBuild, PreBuild, SchemaBuild } from "@/internal/types.js";
 import { createSyncStore } from "@/sync-store/index.js";
-import { decodeEvents } from "@/sync/events.js";
 import { type RealtimeEvent, createSync, splitEvents } from "@/sync/index.js";
 import {
   ZERO_CHECKPOINT_STRING,
@@ -135,12 +134,8 @@ export async function run({
   // Run historical indexing until complete.
   for await (const events of sync.getEvents()) {
     if (events.length > 0) {
-      const decodedEvents = decodeEvents(common, indexingBuild.sources, events);
-      const eventChunks = chunk(decodedEvents, 93);
-      common.logger.debug({
-        service: "app",
-        msg: `Decoded ${decodedEvents.length} events`,
-      });
+      const eventChunks = chunk(events, 93);
+
       for (const eventChunk of eventChunks) {
         const result = await indexingService.processEvents({
           events: eventChunk,
@@ -196,12 +191,12 @@ export async function run({
       if (eta === undefined || progress === undefined) {
         common.logger.info({
           service: "app",
-          msg: `Indexed ${decodedEvents.length} events`,
+          msg: `Indexed ${events.length} events`,
         });
       } else {
         common.logger.info({
           service: "app",
-          msg: `Indexed ${decodedEvents.length} events with ${formatPercentage(progress)} complete and ${formatEta(eta * 1_000)} remaining`,
+          msg: `Indexed ${events.length} events with ${formatPercentage(progress)} complete and ${formatEta(eta * 1_000)} remaining`,
         });
       }
 
@@ -306,24 +301,18 @@ export async function run({
                 Number(decodeCheckpoint(checkpoint).chainId),
             )!;
 
-            const decodedEvents = decodeEvents(
-              common,
-              indexingBuild.sources,
-              events,
-            );
-
             common.logger.debug({
               service: "app",
-              msg: `Decoded ${decodedEvents.length} '${network.name}' events for block ${Number(decodeCheckpoint(checkpoint).blockNumber)}`,
+              msg: `Decoded ${events.length} '${network.name}' events for block ${Number(decodeCheckpoint(checkpoint).blockNumber)}`,
             });
 
             const result = await indexingService.processEvents({
-              events: decodedEvents,
+              events,
             });
 
             common.logger.info({
               service: "app",
-              msg: `Indexed ${decodedEvents.length} '${network.name}' events for block ${Number(decodeCheckpoint(checkpoint).blockNumber)}`,
+              msg: `Indexed ${events.length} '${network.name}' events for block ${Number(decodeCheckpoint(checkpoint).blockNumber)}`,
             });
 
             if (result.status === "error") onReloadableError(result.error);

package/src/build/configAndIndexingFunctions.ts

@@ -25,8 +25,8 @@ import {
 } from "@/sync/filter.js";
 import type { SyncBlock } from "@/types/sync.js";
 import { chains } from "@/utils/chains.js";
+import { dedupe } from "@/utils/dedupe.js";
 import { toLowerCase } from "@/utils/lowercase.js";
-import { dedupe } from "@ponder/common";
 import { BlockNotFoundError, type Hex, type LogTopic, hexToNumber } from "viem";
 import { buildLogFactory } from "./factory.js";
 

package/src/build/factory.ts

@@ -1,7 +1,7 @@
 import type { LogFactory } from "@/internal/types.js";
+import { dedupe } from "@/utils/dedupe.js";
 import { toLowerCase } from "@/utils/lowercase.js";
 import { getBytesConsumedByParam } from "@/utils/offset.js";
-import { dedupe } from "@ponder/common";
 import type { AbiEvent } from "abitype";
 import { type Address, toEventSelector } from "viem";
 

package/src/client/index.ts

@@ -1,6 +1,6 @@
 import type { Schema } from "@/internal/types.js";
 import type { ReadonlyDrizzle } from "@/types/db.js";
-import { promiseWithResolvers } from "@ponder/common";
+import { promiseWithResolvers } from "@/utils/promiseWithResolvers.js";
 import type { QueryWithTypings } from "drizzle-orm";
 import { type PgSession, pgTable } from "drizzle-orm/pg-core";
 import { createMiddleware } from "hono/factory";

package/src/graphql/index.ts

@@ -457,7 +457,7 @@ const columnToGraphQLCore = (
     const enumType = enumTypes[column.enum.enumName];
     if (enumType === undefined) {
       throw new Error(
-        `Internal error: Expected to find a GraphQL enum named "${column.enum.enumName}"`,
+        `Internal error: Expected to find a GraphQL enum named "${column.enum.enumName}". This may happen if "${column.enum.enumName}" has not been exported from your Ponder schema`,
       );
     }
 

package/src/indexing-store/historical.ts

@@ -14,7 +14,7 @@ import {
 } from "@/internal/errors.js";
 import type { SchemaBuild } from "@/internal/types.js";
 import { prettyPrint } from "@/utils/print.js";
-import { createQueue } from "@ponder/common";
+import { createQueue } from "@/utils/queue.js";
 import {
   type Column,
   type QueryWithTypings,

package/src/indexing-store/realtime.ts

@@ -9,6 +9,7 @@ import {
 } from "@/internal/errors.js";
 import type { SchemaBuild } from "@/internal/types.js";
 import { prettyPrint } from "@/utils/print.js";
+import { createQueue } from "@/utils/queue.js";
 import {
   type QueryWithTypings,
   type SQL,
@@ -20,7 +21,6 @@ import {
 } from "drizzle-orm";
 import { type PgTable, getTableConfig } from "drizzle-orm/pg-core";
 import { drizzle } from "drizzle-orm/pg-proxy";
-import { createQueue } from "../../../common/src/queue.js";
 import { normalizeColumn } from "./historical.js";
 import { type IndexingStore, parseSqlError } from "./index.js";
 

package/src/internal/telemetry.ts

@@ -5,8 +5,8 @@ import os from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
 import type { Options } from "@/internal/options.js";
+import { createQueue } from "@/utils/queue.js";
 import { startClock } from "@/utils/timer.js";
-import { createQueue } from "@ponder/common";
 import Conf from "conf";
 import { type PM, detect, getNpmVersion } from "detect-package-manager";
 import { ShutdownError } from "./errors.js";

package/src/sync/fragments.ts

@@ -12,7 +12,7 @@ import type {
   TransactionFilter,
   TransferFilter,
 } from "@/internal/types.js";
-import { dedupe } from "@ponder/common";
+import { dedupe } from "@/utils/dedupe.js";
 import type { Address, Hex } from "viem";
 import { isAddressFactory, shouldGetTransactionReceipt } from "./filter.js";
 

package/src/sync/index.ts

@@ -1,5 +1,6 @@
 import type { Common } from "@/internal/common.js";
 import type {
+  Event,
   Factory,
   Filter,
   IndexingBuild,
@@ -52,11 +53,11 @@ import { _eth_getBlockByNumber } from "@/utils/rpc.js";
 import { startClock } from "@/utils/timer.js";
 import { zipperMany } from "@/utils/zipper.js";
 import { type Address, type Hash, hexToBigInt, hexToNumber, toHex } from "viem";
-import { buildEvents } from "./events.js";
+import { buildEvents, decodeEvents } from "./events.js";
 import { isAddressFactory } from "./filter.js";
 
 export type Sync = {
-  getEvents(): AsyncGenerator<RawEvent[]>;
+  getEvents(): AsyncGenerator<Event[]>;
   startRealtime(): Promise<void>;
   getStatus(): Status;
   seconds: Seconds;
@@ -68,7 +69,7 @@ export type RealtimeEvent =
       type: "block";
       checkpoint: string;
       status: Status;
-      events: RawEvent[];
+      events: Event[];
       network: Network;
     }
   | {
@@ -155,23 +156,23 @@ const getHistoricalLast = (
 };
 
 export const splitEvents = (
-  events: RawEvent[],
-): { checkpoint: string; events: RawEvent[] }[] => {
+  events: Event[],
+): { checkpoint: string; events: Event[] }[] => {
   let hash: Hash | undefined;
-  const result: { checkpoint: string; events: RawEvent[] }[] = [];
+  const result: { checkpoint: string; events: Event[] }[] = [];
 
   for (const event of events) {
-    if (hash === undefined || hash !== event.block.hash) {
+    if (hash === undefined || hash !== event.event.block.hash) {
       result.push({
         checkpoint: encodeCheckpoint({
           ...MAX_CHECKPOINT,
-          blockTimestamp: Number(event.block.timestamp),
+          blockTimestamp: Number(event.event.block.timestamp),
           chainId: BigInt(event.chainId),
-          blockNumber: event.block.number,
+          blockNumber: event.event.block.number,
         }),
         events: [],
       });
-      hash = event.block.hash;
+      hash = event.event.block.hash;
     }
 
     result[result.length - 1]!.events.push(event);
@@ -264,7 +265,7 @@ export const createSync = async (params: {
     events,
     checkpoint,
     network,
-  }: { events: RawEvent[]; checkpoint: string; network: Network }) => {
+  }: { events: Event[]; checkpoint: string; network: Network }) => {
     if (Number(decodeCheckpoint(checkpoint).chainId) === network.chainId) {
       status[network.name]!.block = {
         timestamp: decodeCheckpoint(checkpoint).blockTimestamp,
@@ -349,7 +350,18 @@ export const createSync = async (params: {
           ),
         });
 
-        return bufferAsyncGenerator(localEventGenerator, 1);
+        async function* decodeEventGenerator() {
+          for await (const { events, checkpoint } of localEventGenerator) {
+            const decodedEvents = decodeEvents(params.common, sources, events);
+            params.common.logger.debug({
+              service: "app",
+              msg: `Decoded ${decodedEvents.length} '${network.name}' events`,
+            });
+            yield { events: decodedEvents, checkpoint };
+          }
+        }
+
+        return bufferAsyncGenerator(decodeEventGenerator(), 1);
       },
     );
 
@@ -403,10 +415,12 @@ export const createSync = async (params: {
     event: RealtimeSyncEvent,
     {
       network,
+      sources,
       syncProgress,
       realtimeSync,
     }: {
       network: Network;
+      sources: Source[];
       syncProgress: SyncProgress;
       realtimeSync: RealtimeSync;
     },
@@ -442,9 +456,20 @@ export const createSync = async (params: {
           pendingEvents = [];
           executedEvents = executedEvents.concat(readyEvents);
 
+          const decodedEvents = decodeEvents(
+            params.common,
+            sources,
+            readyEvents,
+          );
+
+          params.common.logger.debug({
+            service: "sync",
+            msg: `Decoded ${decodedEvents.length} '${network.name}' events for block ${hexToNumber(event.block.number)}`,
+          });
+
           params.common.logger.debug({
             service: "sync",
-            msg: `Sequenced ${readyEvents.length} '${network.name}' events for block ${hexToNumber(event.block.number)}`,
+            msg: `Sequenced ${decodedEvents.length} '${network.name}' events for block ${hexToNumber(event.block.number)}`,
           });
 
           params
@@ -452,7 +477,7 @@ export const createSync = async (params: {
               type: "block",
               checkpoint,
               status: structuredClone(status),
-              events: readyEvents.sort((a, b) =>
+              events: decodedEvents.sort((a, b) =>
                 a.checkpoint < b.checkpoint ? -1 : 1,
               ),
               network,
@@ -495,9 +520,20 @@ export const createSync = async (params: {
               .filter(({ checkpoint }) => checkpoint > to);
             executedEvents = executedEvents.concat(readyEvents);
 
+            const decodedEvents = decodeEvents(
+              params.common,
+              sources,
+              readyEvents,
+            );
+
+            params.common.logger.debug({
+              service: "sync",
+              msg: `Decoded ${decodedEvents.length} '${network.name}' events for block ${hexToNumber(event.block.number)}`,
+            });
+
             params.common.logger.debug({
               service: "sync",
-              msg: `Sequenced ${readyEvents.length} '${network.name}' events for timestamp range [${decodeCheckpoint(from).blockTimestamp}, ${decodeCheckpoint(to).blockTimestamp}]`,
+              msg: `Sequenced ${decodedEvents.length} '${network.name}' events for timestamp range [${decodeCheckpoint(from).blockTimestamp}, ${decodeCheckpoint(to).blockTimestamp}]`,
             });
 
             params
@@ -505,7 +541,7 @@ export const createSync = async (params: {
                 type: "block",
                 checkpoint: to,
                 status: structuredClone(status),
-                events: readyEvents.sort((a, b) =>
+                events: decodedEvents.sort((a, b) =>
                   a.checkpoint < b.checkpoint ? -1 : 1,
                 ),
                 network,
@@ -698,6 +734,7 @@ export const createSync = async (params: {
             .then((event) => {
               onRealtimeSyncEvent(event, {
                 network,
+                sources,
                 syncProgress,
                 realtimeSync,
               });
@@ -805,7 +842,6 @@ export const createSync = async (params: {
         const filters = params.indexingBuild.sources
           .filter(({ filter }) => filter.chainId === network.chainId)
           .map(({ filter }) => filter);
-
         status[network.name]!.block = {
           number: hexToNumber(syncProgress.current!.number),
           timestamp: hexToNumber(syncProgress.current!.timestamp),
@@ -1167,6 +1203,10 @@ export async function* getLocalEventGenerator(params: {
         cursor = queryCursor;
         yield { events, checkpoint: cursor };
       } catch (error) {
+        if (params.common.shutdown.isKilled) {
+          throw error;
+        }
+
         params.common.logger.warn({
           service: "sync",
           msg: `Failed '${params.network.name}' extract query for timestamp range [${decodeCheckpoint(cursor).blockTimestamp}, ${decodeCheckpoint(to).blockTimestamp}]`,
@@ -1525,8 +1565,8 @@ export const getCachedBlock = ({
  * @returns A single generator that yields events from all generators.
  */
 export async function* mergeAsyncGeneratorsWithEventOrder(
-  generators: AsyncGenerator<{ events: RawEvent[]; checkpoint: string }>[],
-): AsyncGenerator<{ events: RawEvent[]; checkpoint: string }> {
+  generators: AsyncGenerator<{ events: Event[]; checkpoint: string }>[],
+): AsyncGenerator<{ events: Event[]; checkpoint: string }> {
   const results = await Promise.all(generators.map((gen) => gen.next()));
 
   while (results.some((res) => res.done !== true)) {
@@ -1534,7 +1574,7 @@ export async function* mergeAsyncGeneratorsWithEventOrder(
       ...results.map((res) => (res.done ? undefined : res.value.checkpoint)),
     );
 
-    const eventArrays: RawEvent[][] = [];
+    const eventArrays: Event[][] = [];
 
     for (const result of results) {
       if (result.done === false) {