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

ponder-sh · Jan 6, 2025 · ea796c0 · ea796c0
2 parents c84cc0c + 20f5567
commit ea796c0
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 11 deletions.
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ponder
 
+## 0.8.17
+
+### Patch Changes
+
+- [#1411](https://github.com/ponder-sh/ponder/pull/1411) [`60704d3974387cb625c8fe2e45026fc2235622b9`](https://github.com/ponder-sh/ponder/commit/60704d3974387cb625c8fe2e45026fc2235622b9) Thanks [@kyscott18](https://github.com/kyscott18)! - Fixed an issue where ZKsync system logs failed with the error `Detected inconsistent RPC responses. 'log.transactionHash' 0x0000000000000000000000000000000000000000000000000000000000000000 not found in 'block.transactions' (...)`.
+
 ## 0.8.16
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ponder",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "description": "An open-source framework for crypto application backends",
   "license": "MIT",
   "type": "module",

diff --git a/packages/core/src/sync-historical/index.ts b/packages/core/src/sync-historical/index.ts
@@ -47,6 +47,7 @@ import {
   hexToBigInt,
   hexToNumber,
   toHex,
+  zeroHash,
 } from "viem";
 
 export type HistoricalSync = {
@@ -493,9 +494,16 @@ export const createHistoricalSync = async (
         block.transactions.find((t) => t.hash === log.transactionHash) ===
         undefined
       ) {
-        throw new Error(
-          `Detected inconsistent RPC responses. 'log.transactionHash' ${log.transactionHash} not found in 'block.transactions' ${block.hash}`,
-        );
+        if (log.transactionHash === zeroHash) {
+          args.common.logger.warn({
+            service: "sync",
+            msg: `Detected log with empty transaction hash in block ${block.hash} at log index ${hexToNumber(log.logIndex)}. This is expected for some networks like ZKsync.`,
+          });
+        } else {
+          throw new Error(
+            `Detected inconsistent RPC responses. 'log.transactionHash' ${log.transactionHash} not found in 'block.transactions' ${block.hash}`,
+          );
+        }
       }
     }
 

diff --git a/packages/core/src/sync-realtime/index.ts b/packages/core/src/sync-realtime/index.ts
@@ -34,7 +34,7 @@ import {
 } from "@/utils/rpc.js";
 import { wait } from "@/utils/wait.js";
 import { type Queue, createQueue } from "@ponder/common";
-import { type Address, type Hash, hexToNumber } from "viem";
+import { type Address, type Hash, hexToNumber, zeroHash } from "viem";
 import { isFilterInBloom, zeroLogsBloom } from "./bloom.js";
 import {
   isBlockFilterMatched,
@@ -658,13 +658,28 @@ export const createRealtimeSync = (
         );
       }
 
-      // Check that logs refer to the correct block
       for (const log of logs) {
         if (log.blockHash !== block.hash) {
           throw new Error(
             `Detected invalid eth_getLogs response. 'log.blockHash' ${log.blockHash} does not match requested block hash ${block.hash}`,
           );
         }
+
+        if (
+          block.transactions.find((t) => t.hash === log.transactionHash) ===
+          undefined
+        ) {
+          if (log.transactionHash === zeroHash) {
+            args.common.logger.warn({
+              service: "sync",
+              msg: `Detected log with empty transaction hash in block ${block.hash} at log index ${hexToNumber(log.logIndex)}. This is expected for some networks like ZKsync.`,
+            });
+          } else {
+            throw new Error(
+              `Detected inconsistent RPC responses. 'log.transactionHash' ${log.transactionHash} not found in 'block.transactions' ${block.hash}`,
+            );
+          }
+        }
       }
     }
 

diff --git a/packages/core/src/sync/events.ts b/packages/core/src/sync/events.ts
@@ -231,9 +231,11 @@ export const buildEvents = ({
                   }),
                   log: convertLog(log),
                   block: convertBlock(block),
-                  transaction: convertTransaction(
-                    transactionCache.get(log.transactionHash)!,
-                  ),
+                  transaction: transactionCache.has(log.transactionHash)
+                    ? convertTransaction(
+                        transactionCache.get(log.transactionHash)!,
+                      )
+                    : undefined,
                   transactionReceipt: shouldGetTransactionReceipt(filter)
                     ? convertTransactionReceipt(
                         transactionReceiptCache.get(log.transactionHash)!,

diff --git a/packages/create-ponder/CHANGELOG.md b/packages/create-ponder/CHANGELOG.md
@@ -1,5 +1,7 @@
 # create-ponder
 
+## 0.8.17
+
 ## 0.8.16
 
 ## 0.8.15

diff --git a/packages/create-ponder/package.json b/packages/create-ponder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-ponder",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "type": "module",
   "description": "A CLI tool to create Ponder apps",
   "license": "MIT",

diff --git a/packages/eslint-config-ponder/CHANGELOG.md b/packages/eslint-config-ponder/CHANGELOG.md
@@ -1,5 +1,7 @@
 # eslint-config-ponder
 
+## 0.8.17
+
 ## 0.8.16
 
 ## 0.8.15

diff --git a/packages/eslint-config-ponder/package.json b/packages/eslint-config-ponder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-ponder",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "description": "ESLint config for Ponder apps",
   "license": "MIT",
   "main": "./index.js",