@apibara/evm 2.1.0-beta.3 → 2.1.0-beta.31

package/src/proto/filter.ts

@@ -160,7 +160,11 @@ export interface TransactionFilter {
     | boolean
     | undefined;
   /** Flag to request the transaction's logs. Defaults to `false`. */
-  readonly includeLogs?: boolean | undefined;
+  readonly includeLogs?:
+    | boolean
+    | undefined;
+  /** Flag to request the transaction's trace. Defaults to `false`. */
+  readonly includeTransactionTrace?: boolean | undefined;
 }
 
 export interface LogFilter {
@@ -204,7 +208,11 @@ export interface LogFilter {
    *
    * Defaults to false.
    */
-  readonly includeSiblings?: boolean | undefined;
+  readonly includeSiblings?:
+    | boolean
+    | undefined;
+  /** Flag to request the log's trace. Defaults to `false`. */
+  readonly includeTransactionTrace?: boolean | undefined;
 }
 
 /** Topic filter. */
@@ -427,6 +435,7 @@ function createBaseTransactionFilter(): TransactionFilter {
     transactionStatus: undefined,
     includeReceipt: undefined,
     includeLogs: undefined,
+    includeTransactionTrace: undefined,
   };
 }
 
@@ -453,6 +462,9 @@ export const TransactionFilter = {
     if (message.includeLogs !== undefined) {
       writer.uint32(56).bool(message.includeLogs);
     }
+    if (message.includeTransactionTrace !== undefined) {
+      writer.uint32(64).bool(message.includeTransactionTrace);
+    }
     return writer;
   },
 
@@ -512,6 +524,13 @@ export const TransactionFilter = {
 
           message.includeLogs = reader.bool();
           continue;
+        case 8:
+          if (tag !== 64) {
+            break;
+          }
+
+          message.includeTransactionTrace = reader.bool();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -532,6 +551,9 @@ export const TransactionFilter = {
         : undefined,
       includeReceipt: isSet(object.includeReceipt) ? globalThis.Boolean(object.includeReceipt) : undefined,
       includeLogs: isSet(object.includeLogs) ? globalThis.Boolean(object.includeLogs) : undefined,
+      includeTransactionTrace: isSet(object.includeTransactionTrace)
+        ? globalThis.Boolean(object.includeTransactionTrace)
+        : undefined,
     };
   },
 
@@ -558,6 +580,9 @@ export const TransactionFilter = {
     if (message.includeLogs !== undefined) {
       obj.includeLogs = message.includeLogs;
     }
+    if (message.includeTransactionTrace !== undefined) {
+      obj.includeTransactionTrace = message.includeTransactionTrace;
+    }
     return obj;
   },
 
@@ -573,6 +598,7 @@ export const TransactionFilter = {
     message.transactionStatus = object.transactionStatus ?? undefined;
     message.includeReceipt = object.includeReceipt ?? undefined;
     message.includeLogs = object.includeLogs ?? undefined;
+    message.includeTransactionTrace = object.includeTransactionTrace ?? undefined;
     return message;
   },
 };
@@ -587,6 +613,7 @@ function createBaseLogFilter(): LogFilter {
     includeTransaction: undefined,
     includeReceipt: undefined,
     includeSiblings: undefined,
+    includeTransactionTrace: undefined,
   };
 }
 
@@ -618,6 +645,9 @@ export const LogFilter = {
     if (message.includeSiblings !== undefined) {
       writer.uint32(64).bool(message.includeSiblings);
     }
+    if (message.includeTransactionTrace !== undefined) {
+      writer.uint32(72).bool(message.includeTransactionTrace);
+    }
     return writer;
   },
 
@@ -684,6 +714,13 @@ export const LogFilter = {
 
           message.includeSiblings = reader.bool();
           continue;
+        case 9:
+          if (tag !== 72) {
+            break;
+          }
+
+          message.includeTransactionTrace = reader.bool();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -705,6 +742,9 @@ export const LogFilter = {
       includeTransaction: isSet(object.includeTransaction) ? globalThis.Boolean(object.includeTransaction) : undefined,
       includeReceipt: isSet(object.includeReceipt) ? globalThis.Boolean(object.includeReceipt) : undefined,
       includeSiblings: isSet(object.includeSiblings) ? globalThis.Boolean(object.includeSiblings) : undefined,
+      includeTransactionTrace: isSet(object.includeTransactionTrace)
+        ? globalThis.Boolean(object.includeTransactionTrace)
+        : undefined,
     };
   },
 
@@ -734,6 +774,9 @@ export const LogFilter = {
     if (message.includeSiblings !== undefined) {
       obj.includeSiblings = message.includeSiblings;
     }
+    if (message.includeTransactionTrace !== undefined) {
+      obj.includeTransactionTrace = message.includeTransactionTrace;
+    }
     return obj;
   },
 
@@ -752,6 +795,7 @@ export const LogFilter = {
     message.includeTransaction = object.includeTransaction ?? undefined;
     message.includeReceipt = object.includeReceipt ?? undefined;
     message.includeSiblings = object.includeSiblings ?? undefined;
+    message.includeTransactionTrace = object.includeTransactionTrace ?? undefined;
     return message;
   },
 };

package/src/common.test.ts

@@ -1,79 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { Schema } from "@effect/schema";
-import { pad } from "viem";
-
-import { Address, B256, U128, U256 } from "./common";
-
-describe("Address", () => {
-  const encode = Schema.encodeSync(Address);
-  const decode = Schema.decodeSync(Address);
-
-  it("should convert to and from proto", () => {
-    const address = "0x27504265a9bc4330e3fe82061a60cd8b6369b4dc";
-
-    const message = encode(address);
-
-    expect(message.x0).toBeDefined();
-    expect(message.x1).toBeDefined();
-    expect(message.x2).toBeDefined();
-
-    const back = decode(message);
-    expect(back).toEqual(pad(address, { size: 20 }));
-  });
-});
-
-describe("B256", () => {
-  const encode = Schema.encodeSync(B256);
-  const decode = Schema.decodeSync(B256);
-
-  it("should convert to and from proto", () => {
-    const value =
-      "0x9df92d765b5aa041fd4bbe8d5878eb89290efa78e444c1a603eecfae2ea05fa4";
-    const message = encode(value);
-
-    expect(message.x0).toBeDefined();
-    expect(message.x1).toBeDefined();
-    expect(message.x2).toBeDefined();
-    expect(message.x3).toBeDefined();
-
-    const back = decode(message);
-    expect(back).toEqual(pad(value, { size: 32 }));
-  });
-});
-
-describe("U256", () => {
-  const encode = Schema.encodeSync(U256);
-  const decode = Schema.decodeSync(U256);
-
-  it("should convert to and from proto", () => {
-    const value = BigInt(
-      "0x9df92d765b5aa041fd4bbe8d5878eb89290efa78e444c1a603eecfae2ea05fa4",
-    );
-    const message = encode(value);
-
-    expect(message.x0).toBeDefined();
-    expect(message.x1).toBeDefined();
-    expect(message.x2).toBeDefined();
-    expect(message.x3).toBeDefined();
-
-    const back = decode(message);
-    expect(back).toEqual(value);
-  });
-});
-
-describe("U128", () => {
-  const encode = Schema.encodeSync(U128);
-  const decode = Schema.decodeSync(U128);
-
-  it("should convert to and from proto", () => {
-    const value = BigInt("0x090efa78e444c1a603eecfae2ea05fa4");
-    const message = encode(value);
-
-    expect(message.x0).toBeDefined();
-    expect(message.x1).toBeDefined();
-
-    const back = decode(message);
-    expect(back).toEqual(value);
-  });
-});

package/src/filter.test.ts

@@ -1,187 +0,0 @@
-import { encodeEventTopics, pad, parseAbi } from "viem";
-import { describe, expect, it } from "vitest";
-
-import { Schema } from "@effect/schema";
-import {
-  Filter,
-  LogFilter,
-  filterFromProto,
-  filterToProto,
-  mergeFilter,
-} from "./filter";
-
-const abi = parseAbi([
-  "event Transfer(address indexed from, address indexed to, uint256 value)",
-]);
-
-describe("Filter", () => {
-  it("all filters are optional", () => {
-    const filter = Filter.make({});
-
-    const proto = filterToProto(filter);
-    const back = filterFromProto(proto);
-    expect(back).toEqual(filter);
-  });
-
-  it("accepts logs filter", () => {
-    const filter = Filter.make({
-      logs: [
-        {
-          address: "0x123456789012",
-          strict: true,
-          topics: encodeEventTopics({
-            abi,
-            eventName: "Transfer",
-            args: { from: null, to: null },
-          }) as `0x${string}`[],
-        },
-      ],
-    });
-
-    expect(filter.logs).toHaveLength(1);
-
-    const proto = filterToProto(filter);
-    const back = filterFromProto(proto);
-
-    expect(back).toBeDefined();
-    expect(back.logs).toHaveLength(1);
-  });
-});
-
-describe("LogFilter", () => {
-  const encode = Schema.encodeSync(LogFilter);
-  const decode = Schema.decodeSync(LogFilter);
-
-  it("can be empty", () => {
-    const filter = LogFilter.make({});
-
-    const proto = encode(filter);
-    const back = decode(proto);
-    expect(back).toEqual(filter);
-  });
-
-  it("can have null topics", () => {
-    const filter = LogFilter.make({
-      topics: [null, pad("0x1"), null, pad("0x3")],
-    });
-
-    const proto = encode(filter);
-    const back = decode(proto);
-    expect(back).toEqual(filter);
-  });
-
-  it("can have all optional fields", () => {
-    const filter = LogFilter.make({
-      address: pad("0xa", { size: 20 }),
-      topics: [null, pad("0x1"), null, pad("0x3")],
-      includeTransaction: true,
-      includeReceipt: true,
-      strict: true,
-    });
-
-    const proto = encode(filter);
-    const back = decode(proto);
-    expect(back).toEqual(filter);
-  });
-});
-
-describe("mergeFilter", () => {
-  it("returns header.always if any has it", () => {
-    const fa = mergeFilter({}, { header: "always" });
-    expect(fa).toMatchInlineSnapshot(`
-      {
-        "header": "always",
-        "logs": [],
-        "transactions": [],
-        "withdrawals": [],
-      }
-    `);
-    const fb = mergeFilter({ header: "always" }, {});
-    expect(fb).toMatchInlineSnapshot(`
-      {
-        "header": "always",
-        "logs": [],
-        "transactions": [],
-        "withdrawals": [],
-      }
-    `);
-  });
-
-  it("returns an empty header by default", () => {
-    const f = mergeFilter({}, {});
-    expect(f).toMatchInlineSnapshot(`
-      {
-        "header": undefined,
-        "logs": [],
-        "transactions": [],
-        "withdrawals": [],
-      }
-    `);
-  });
-
-  it("concatenates logs", () => {
-    const f = mergeFilter(
-      { logs: [{ address: "0xAAAAAAAAAAAAAAAAAAAAAA" }] },
-      { logs: [{ address: "0xBBBBBBBBBBBBBBBBBBBBBB" }] },
-    );
-    expect(f).toMatchInlineSnapshot(`
-      {
-        "header": undefined,
-        "logs": [
-          {
-            "address": "0xAAAAAAAAAAAAAAAAAAAAAA",
-          },
-          {
-            "address": "0xBBBBBBBBBBBBBBBBBBBBBB",
-          },
-        ],
-        "transactions": [],
-        "withdrawals": [],
-      }
-    `);
-  });
-
-  it("concatenates transactions", () => {
-    const f = mergeFilter(
-      { transactions: [{ from: "0xAAAAAAAAAAAAAAAAAAAAAA" }] },
-      { transactions: [{ from: "0xBBBBBBBBBBBBBBBBBBBBBB" }] },
-    );
-    expect(f).toMatchInlineSnapshot(`
-      {
-        "header": undefined,
-        "logs": [],
-        "transactions": [
-          {
-            "from": "0xAAAAAAAAAAAAAAAAAAAAAA",
-          },
-          {
-            "from": "0xBBBBBBBBBBBBBBBBBBBBBB",
-          },
-        ],
-        "withdrawals": [],
-      }
-    `);
-  });
-
-  it("concatenates withdrawals", () => {
-    const f = mergeFilter(
-      { withdrawals: [{ validatorIndex: 1 }] },
-      { withdrawals: [{ validatorIndex: 100 }] },
-    );
-    expect(f).toMatchInlineSnapshot(`
-      {
-        "header": undefined,
-        "logs": [],
-        "transactions": [],
-        "withdrawals": [
-          {
-            "validatorIndex": 1,
-          },
-          {
-            "validatorIndex": 100,
-          },
-        ],
-      }
-    `);
-  });
-});