ponder 0.8.20 → 0.8.22

package/dist/bin/ponder.js

@@ -3887,6 +3887,8 @@ function prettyPrint(args) {
     const trimmedValue = typeof value === "string" && value.length > 80 ? value.slice(0, 80).concat("...") : value;
     return [key, trimmedValue];
   }).filter(Boolean);
+  if (entries.length === 0)
+    return "  (empty object)";
   const maxLength = entries.reduce(
     (acc, [key]) => Math.max(acc, key.length),
     0
@@ -6227,47 +6229,24 @@ var executeSetup = async (indexingService, { event }) => {
   } catch (_error) {
     if (indexingService.isKilled)
       return { status: "killed" };
-    const error = _error;
-    const decodedCheckpoint = decodeCheckpoint(event.checkpoint);
+    const error = _error instanceof Error ? _error : new Error(String(_error));
     addStackTrace(error, common.options);
-    common.metrics.ponder_indexing_has_error.set(1);
+    if (error instanceof BaseError) {
+      error.meta.push(toErrorMeta(event));
+    } else {
+      error.meta = [toErrorMeta(event)];
+    }
+    const decodedCheckpoint = decodeCheckpoint(event.checkpoint);
     common.logger.error({
       service: "indexing",
       msg: `Error while processing '${event.name}' event in '${networkByChainId[event.chainId].name}' block ${decodedCheckpoint.blockNumber}`,
       error
     });
+    common.metrics.ponder_indexing_has_error.set(1);
     return { status: "error", error };
   }
   return { status: "success" };
 };
-var toErrorMeta = (event) => {
-  switch (event.type) {
-    case "log":
-    case "trace": {
-      return `Event arguments:
-${prettyPrint(event.event.args)}`;
-    }
-    case "transfer": {
-      return `Event arguments:
-${prettyPrint(event.event.transfer)}`;
-    }
-    case "block": {
-      return `Block:
-${prettyPrint({
-        hash: event.event.block.hash,
-        number: event.event.block.number,
-        timestamp: event.event.block.timestamp
-      })}`;
-    }
-    case "transaction": {
-      return `Transaction:
-${prettyPrint({
-        hash: event.event.transaction.hash,
-        block: event.event.block.number
-      })}`;
-    }
-  }
-};
 var executeEvent = async (indexingService, { event }) => {
   const {
     common,
@@ -6297,13 +6276,14 @@ var executeEvent = async (indexingService, { event }) => {
   } catch (_error) {
     if (indexingService.isKilled)
       return { status: "killed" };
-    const error = _error;
-    const decodedCheckpoint = decodeCheckpoint(event.checkpoint);
+    const error = _error instanceof Error ? _error : new Error(String(_error));
     addStackTrace(error, common.options);
-    error.meta = Array.isArray(error.meta) ? error.meta : [];
-    if (error.meta.length === 0) {
+    if (error instanceof BaseError) {
       error.meta.push(toErrorMeta(event));
+    } else {
+      error.meta = [toErrorMeta(event)];
     }
+    const decodedCheckpoint = decodeCheckpoint(event.checkpoint);
     common.logger.error({
       service: "indexing",
       msg: `Error while processing '${event.name}' event in '${networkByChainId[event.chainId].name}' block ${decodedCheckpoint.blockNumber}`,
@@ -6314,6 +6294,75 @@ var executeEvent = async (indexingService, { event }) => {
   }
   return { status: "success" };
 };
+var blockText = (block) => `Block:
+${prettyPrint({
+  hash: block.hash,
+  number: block.number,
+  timestamp: block.timestamp
+})}`;
+var transactionText = (transaction) => `Transaction:
+${prettyPrint({
+  hash: transaction.hash,
+  from: transaction.from,
+  to: transaction.to
+})}`;
+var logText = (log) => `Log:
+${prettyPrint({
+  index: log.logIndex,
+  address: log.address
+})}`;
+var traceText = (trace) => `Trace:
+${prettyPrint({
+  traceIndex: trace.traceIndex,
+  from: trace.from,
+  to: trace.to
+})}`;
+var toErrorMeta = (event) => {
+  switch (event.type) {
+    case "setup": {
+      return `Block:
+${prettyPrint({
+        number: event.block
+      })}`;
+    }
+    case "log": {
+      return [
+        `Event arguments:
+${prettyPrint(event.event.args)}`,
+        logText(event.event.log),
+        transactionText(event.event.transaction),
+        blockText(event.event.block)
+      ].join("\n");
+    }
+    case "trace": {
+      return [
+        `Call trace arguments:
+${prettyPrint(event.event.args)}`,
+        traceText(event.event.trace),
+        transactionText(event.event.transaction),
+        blockText(event.event.block)
+      ].join("\n");
+    }
+    case "transfer": {
+      return [
+        `Transfer arguments:
+${prettyPrint(event.event.transfer)}`,
+        traceText(event.event.trace),
+        transactionText(event.event.transaction),
+        blockText(event.event.block)
+      ].join("\n");
+    }
+    case "block": {
+      return blockText(event.event.block);
+    }
+    case "transaction": {
+      return [
+        transactionText(event.event.transaction),
+        blockText(event.event.block)
+      ].join("\n");
+    }
+  }
+};
 
 // src/indexing/index.ts
 var methods = {
@@ -6771,8 +6820,8 @@ function encodeTrace({
     input: trace.input,
     functionSelector: trace.input.slice(0, 10),
     output: trace.output ?? null,
-    revertReason: trace.revertReason ?? null,
-    error: trace.error ?? null,
+    revertReason: trace.revertReason ? trace.revertReason.replace(/\0/g, "") : null,
+    error: trace.error ? trace.error.replace(/\0/g, "") : null,
     value: trace.value ? hexToBigInt(trace.value) : null,
     index: trace.index,
     subcalls: trace.subcalls,