@apibara/evm 2.0.0-beta.7 → 2.0.1-beta.0

package/dist/index.cjs

@@ -2333,6 +2333,49 @@ const data = {
 };
 
 const protobufPackage = "evm.v2";
+var HeaderFilter$1 = /* @__PURE__ */ ((HeaderFilter2) => {
+  HeaderFilter2[HeaderFilter2["UNSPECIFIED"] = 0] = "UNSPECIFIED";
+  HeaderFilter2[HeaderFilter2["ALWAYS"] = 1] = "ALWAYS";
+  HeaderFilter2[HeaderFilter2["ON_DATA"] = 2] = "ON_DATA";
+  HeaderFilter2[HeaderFilter2["ON_DATA_OR_ON_NEW_BLOCK"] = 3] = "ON_DATA_OR_ON_NEW_BLOCK";
+  HeaderFilter2[HeaderFilter2["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
+  return HeaderFilter2;
+})(HeaderFilter$1 || {});
+function headerFilterFromJSON(object) {
+  switch (object) {
+    case 0:
+    case "HEADER_FILTER_UNSPECIFIED":
+      return 0 /* UNSPECIFIED */;
+    case 1:
+    case "HEADER_FILTER_ALWAYS":
+      return 1 /* ALWAYS */;
+    case 2:
+    case "HEADER_FILTER_ON_DATA":
+      return 2 /* ON_DATA */;
+    case 3:
+    case "HEADER_FILTER_ON_DATA_OR_ON_NEW_BLOCK":
+      return 3 /* ON_DATA_OR_ON_NEW_BLOCK */;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return -1 /* UNRECOGNIZED */;
+  }
+}
+function headerFilterToJSON(object) {
+  switch (object) {
+    case 0 /* UNSPECIFIED */:
+      return "HEADER_FILTER_UNSPECIFIED";
+    case 1 /* ALWAYS */:
+      return "HEADER_FILTER_ALWAYS";
+    case 2 /* ON_DATA */:
+      return "HEADER_FILTER_ON_DATA";
+    case 3 /* ON_DATA_OR_ON_NEW_BLOCK */:
+      return "HEADER_FILTER_ON_DATA_OR_ON_NEW_BLOCK";
+    case -1 /* UNRECOGNIZED */:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
 var TransactionStatusFilter$1 = /* @__PURE__ */ ((TransactionStatusFilter2) => {
   TransactionStatusFilter2[TransactionStatusFilter2["UNSPECIFIED"] = 0] = "UNSPECIFIED";
   TransactionStatusFilter2[TransactionStatusFilter2["SUCCEEDED"] = 1] = "SUCCEEDED";
@@ -2377,12 +2420,12 @@ function transactionStatusFilterToJSON(object) {
   }
 }
 function createBaseFilter() {
-  return { header: void 0, withdrawals: [], transactions: [], logs: [] };
+  return { header: 0, withdrawals: [], transactions: [], logs: [] };
 }
 const Filter$1 = {
   encode(message, writer = _m0__default.Writer.create()) {
-    if (message.header !== void 0) {
-      HeaderFilter$1.encode(message.header, writer.uint32(10).fork()).ldelim();
+    if (message.header !== void 0 && message.header !== 0) {
+      writer.uint32(8).int32(message.header);
     }
     if (message.withdrawals !== void 0 && message.withdrawals.length !== 0) {
       for (const v of message.withdrawals) {
@@ -2409,10 +2452,10 @@ const Filter$1 = {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag !== 10) {
+          if (tag !== 8) {
             break;
           }
-          message.header = HeaderFilter$1.decode(reader, reader.uint32());
+          message.header = reader.int32();
           continue;
         case 2:
           if (tag !== 18) {
@@ -2442,7 +2485,7 @@ const Filter$1 = {
   },
   fromJSON(object) {
     return {
-      header: isSet(object.header) ? HeaderFilter$1.fromJSON(object.header) : void 0,
+      header: isSet(object.header) ? headerFilterFromJSON(object.header) : 0,
       withdrawals: globalThis.Array.isArray(object?.withdrawals) ? object.withdrawals.map((e) => WithdrawalFilter$1.fromJSON(e)) : [],
       transactions: globalThis.Array.isArray(object?.transactions) ? object.transactions.map((e) => TransactionFilter$1.fromJSON(e)) : [],
       logs: globalThis.Array.isArray(object?.logs) ? object.logs.map((e) => LogFilter$1.fromJSON(e)) : []
@@ -2450,8 +2493,8 @@ const Filter$1 = {
   },
   toJSON(message) {
     const obj = {};
-    if (message.header !== void 0) {
-      obj.header = HeaderFilter$1.toJSON(message.header);
+    if (message.header !== void 0 && message.header !== 0) {
+      obj.header = headerFilterToJSON(message.header);
     }
     if (message.withdrawals?.length) {
       obj.withdrawals = message.withdrawals.map((e) => WithdrawalFilter$1.toJSON(e));
@@ -2469,63 +2512,13 @@ const Filter$1 = {
   },
   fromPartial(object) {
     const message = createBaseFilter();
-    message.header = object.header !== void 0 && object.header !== null ? HeaderFilter$1.fromPartial(object.header) : void 0;
+    message.header = object.header ?? 0;
     message.withdrawals = object.withdrawals?.map((e) => WithdrawalFilter$1.fromPartial(e)) || [];
     message.transactions = object.transactions?.map((e) => TransactionFilter$1.fromPartial(e)) || [];
     message.logs = object.logs?.map((e) => LogFilter$1.fromPartial(e)) || [];
     return message;
   }
 };
-function createBaseHeaderFilter() {
-  return { always: void 0 };
-}
-const HeaderFilter$1 = {
-  encode(message, writer = _m0__default.Writer.create()) {
-    if (message.always !== void 0) {
-      writer.uint32(8).bool(message.always);
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof _m0__default.Reader ? input : _m0__default.Reader.create(input);
-    let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseHeaderFilter();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          if (tag !== 8) {
-            break;
-          }
-          message.always = reader.bool();
-          continue;
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return { always: isSet(object.always) ? globalThis.Boolean(object.always) : void 0 };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.always !== void 0) {
-      obj.always = message.always;
-    }
-    return obj;
-  },
-  create(base) {
-    return HeaderFilter$1.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseHeaderFilter();
-    message.always = object.always ?? void 0;
-    return message;
-  }
-};
 function createBaseWithdrawalFilter() {
   return { id: 0, validatorIndex: void 0, address: void 0 };
 }
@@ -2974,6 +2967,8 @@ const filter = {
   TransactionFilter: TransactionFilter$1,
   TransactionStatusFilter: TransactionStatusFilter$1,
   WithdrawalFilter: WithdrawalFilter$1,
+  headerFilterFromJSON: headerFilterFromJSON,
+  headerFilterToJSON: headerFilterToJSON,
   protobufPackage: protobufPackage,
   transactionStatusFilterFromJSON: transactionStatusFilterFromJSON,
   transactionStatusFilterToJSON: transactionStatusFilterToJSON
@@ -3136,9 +3131,34 @@ const BlockFromBytes = schema.Schema.transform(
 );
 
 const OptionalArray = (schema$1) => schema.Schema.optional(schema.Schema.Array(schema$1));
-const HeaderFilter = schema.Schema.Struct({
-  always: schema.Schema.optional(schema.Schema.Boolean)
-});
+const HeaderFilter = schema.Schema.transform(
+  schema.Schema.Enums(HeaderFilter$1),
+  schema.Schema.Literal("always", "on_data", "on_data_or_on_new_block", "unknown"),
+  {
+    decode(value) {
+      const enumMap = {
+        [HeaderFilter$1.ALWAYS]: "always",
+        [HeaderFilter$1.ON_DATA]: "on_data",
+        [HeaderFilter$1.ON_DATA_OR_ON_NEW_BLOCK]: "on_data_or_on_new_block",
+        [HeaderFilter$1.UNSPECIFIED]: "unknown",
+        [HeaderFilter$1.UNRECOGNIZED]: "unknown"
+      };
+      return enumMap[value] ?? "unknown";
+    },
+    encode(value) {
+      switch (value) {
+        case "always":
+          return HeaderFilter$1.ALWAYS;
+        case "on_data":
+          return HeaderFilter$1.ON_DATA;
+        case "on_data_or_on_new_block":
+          return HeaderFilter$1.ON_DATA_OR_ON_NEW_BLOCK;
+        default:
+          return HeaderFilter$1.UNSPECIFIED;
+      }
+    }
+  }
+);
 const WithdrawalFilter = schema.Schema.Struct({
   id: schema.Schema.optional(schema.Schema.Number),
   validatorIndex: schema.Schema.optional(schema.Schema.Number),
@@ -3247,9 +3267,13 @@ function mergeHeaderFilter(a, b) {
   if (b === void 0) {
     return a;
   }
-  return {
-    always: a.always || b.always
-  };
+  if (a === "always" || b === "always") {
+    return "always";
+  }
+  if (a === "on_data_or_on_new_block" || b === "on_data_or_on_new_block") {
+    return "on_data_or_on_new_block";
+  }
+  return "on_data";
 }
 
 const EvmStream = new protocol.StreamConfig(

package/dist/index.d.cts

@@ -360,6 +360,15 @@ declare namespace data {
 
 declare const protobufPackage = "evm.v2";
 /** EVM DNA definitions (filter). */
+declare enum HeaderFilter$1 {
+    UNSPECIFIED = 0,
+    ALWAYS = 1,
+    ON_DATA = 2,
+    ON_DATA_OR_ON_NEW_BLOCK = 3,
+    UNRECOGNIZED = -1
+}
+declare function headerFilterFromJSON(object: any): HeaderFilter$1;
+declare function headerFilterToJSON(object: HeaderFilter$1): string;
 declare enum TransactionStatusFilter$1 {
     UNSPECIFIED = 0,
     SUCCEEDED = 1,
@@ -387,18 +396,6 @@ declare const Filter$1: {
     create(base?: DeepPartial<Filter$1>): Filter$1;
     fromPartial(object: DeepPartial<Filter$1>): Filter$1;
 };
-interface HeaderFilter$1 {
-    /** Always include header data. Defaults to `false`. */
-    readonly always?: boolean | undefined;
-}
-declare const HeaderFilter$1: {
-    encode(message: HeaderFilter$1, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number): HeaderFilter$1;
-    fromJSON(object: any): HeaderFilter$1;
-    toJSON(message: HeaderFilter$1): unknown;
-    create(base?: DeepPartial<HeaderFilter$1>): HeaderFilter$1;
-    fromPartial(object: DeepPartial<HeaderFilter$1>): HeaderFilter$1;
-};
 interface WithdrawalFilter$1 {
     readonly id?: number | undefined;
     /** Filter based on the validator index. */
@@ -503,11 +500,13 @@ type DeepPartial<T> = T extends Builtin ? T : T extends globalThis.Array<infer U
 } : Partial<T>;
 
 type filter_DeepPartial<T> = DeepPartial<T>;
+declare const filter_headerFilterFromJSON: typeof headerFilterFromJSON;
+declare const filter_headerFilterToJSON: typeof headerFilterToJSON;
 declare const filter_protobufPackage: typeof protobufPackage;
 declare const filter_transactionStatusFilterFromJSON: typeof transactionStatusFilterFromJSON;
 declare const filter_transactionStatusFilterToJSON: typeof transactionStatusFilterToJSON;
 declare namespace filter {
-  export { type filter_DeepPartial as DeepPartial, Filter$1 as Filter, HeaderFilter$1 as HeaderFilter, LogFilter$1 as LogFilter, Topic$1 as Topic, TransactionFilter$1 as TransactionFilter, TransactionStatusFilter$1 as TransactionStatusFilter, WithdrawalFilter$1 as WithdrawalFilter, filter_protobufPackage as protobufPackage, filter_transactionStatusFilterFromJSON as transactionStatusFilterFromJSON, filter_transactionStatusFilterToJSON as transactionStatusFilterToJSON };
+  export { type filter_DeepPartial as DeepPartial, Filter$1 as Filter, HeaderFilter$1 as HeaderFilter, LogFilter$1 as LogFilter, Topic$1 as Topic, TransactionFilter$1 as TransactionFilter, TransactionStatusFilter$1 as TransactionStatusFilter, WithdrawalFilter$1 as WithdrawalFilter, filter_headerFilterFromJSON as headerFilterFromJSON, filter_headerFilterToJSON as headerFilterToJSON, filter_protobufPackage as protobufPackage, filter_transactionStatusFilterFromJSON as transactionStatusFilterFromJSON, filter_transactionStatusFilterToJSON as transactionStatusFilterToJSON };
 }
 
 declare const index_common: typeof common;
@@ -583,9 +582,13 @@ declare const u128FromProto: (i: {
     readonly x1: bigint;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => bigint;
 
-declare const HeaderFilter: Schema.Struct<{
-    always: Schema.optional<typeof Schema.Boolean>;
-}>;
+/** Header options.
+ *
+ * - `always`: receive all block headers.
+ * - `on_data`: receive headers only if any other filter matches.
+ * - `on_data_or_on_new_block`: receive headers only if any other filter matches and for "live" blocks.
+ */
+declare const HeaderFilter: Schema.transform<Schema.Enums<typeof HeaderFilter$1>, Schema.Literal<["always", "on_data", "on_data_or_on_new_block", "unknown"]>>;
 type HeaderFilter = typeof HeaderFilter.Type;
 declare const WithdrawalFilter: Schema.Struct<{
     id: Schema.optional<typeof Schema.Number>;
@@ -657,9 +660,7 @@ declare const TransactionFilter: Schema.Struct<{
 }>;
 type TransactionFilter = typeof TransactionFilter.Type;
 declare const Filter: Schema.Struct<{
-    header: Schema.optional<Schema.Struct<{
-        always: Schema.optional<typeof Schema.Boolean>;
-    }>>;
+    header: Schema.optional<Schema.transform<Schema.Enums<typeof HeaderFilter$1>, Schema.Literal<["always", "on_data", "on_data_or_on_new_block", "unknown"]>>>;
     withdrawals: Schema.optional<Schema.Array$<Schema.Struct<{
         id: Schema.optional<typeof Schema.Number>;
         validatorIndex: Schema.optional<typeof Schema.Number>;
@@ -714,9 +715,7 @@ declare const Filter: Schema.Struct<{
 }>;
 type Filter = typeof Filter.Type;
 declare const filterToProto: (a: {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -741,9 +740,7 @@ declare const filterToProto: (a: {
         readonly includeTransaction?: boolean | undefined;
     }[] | undefined;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: HeaderFilter$1 | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -792,9 +789,7 @@ declare const filterToProto: (a: {
     }[] | undefined;
 };
 declare const filterFromProto: (i: {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: HeaderFilter$1 | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -842,9 +837,7 @@ declare const filterFromProto: (i: {
         readonly includeTransaction?: boolean | undefined;
     }[] | undefined;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -870,9 +863,7 @@ declare const filterFromProto: (i: {
     }[] | undefined;
 };
 declare const FilterFromBytes: Schema.transform<Schema.Schema<Uint8Array, Uint8Array, never>, Schema.Struct<{
-    header: Schema.optional<Schema.Struct<{
-        always: Schema.optional<typeof Schema.Boolean>;
-    }>>;
+    header: Schema.optional<Schema.transform<Schema.Enums<typeof HeaderFilter$1>, Schema.Literal<["always", "on_data", "on_data_or_on_new_block", "unknown"]>>>;
     withdrawals: Schema.optional<Schema.Array$<Schema.Struct<{
         id: Schema.optional<typeof Schema.Number>;
         validatorIndex: Schema.optional<typeof Schema.Number>;
@@ -926,9 +917,7 @@ declare const FilterFromBytes: Schema.transform<Schema.Schema<Uint8Array, Uint8A
     }>>>;
 }>>;
 declare const filterToBytes: (a: {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -954,9 +943,7 @@ declare const filterToBytes: (a: {
     }[] | undefined;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => Uint8Array;
 declare const filterFromBytes: (i: Uint8Array, overrideOptions?: _effect_schema_AST.ParseOptions) => {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -1862,9 +1849,7 @@ declare const BlockFromBytes: Schema.transform<Schema.Schema<Uint8Array, Uint8Ar
 }>>>;
 
 declare const EvmStream: StreamConfig<{
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;

package/dist/index.d.mts

@@ -360,6 +360,15 @@ declare namespace data {
 
 declare const protobufPackage = "evm.v2";
 /** EVM DNA definitions (filter). */
+declare enum HeaderFilter$1 {
+    UNSPECIFIED = 0,
+    ALWAYS = 1,
+    ON_DATA = 2,
+    ON_DATA_OR_ON_NEW_BLOCK = 3,
+    UNRECOGNIZED = -1
+}
+declare function headerFilterFromJSON(object: any): HeaderFilter$1;
+declare function headerFilterToJSON(object: HeaderFilter$1): string;
 declare enum TransactionStatusFilter$1 {
     UNSPECIFIED = 0,
     SUCCEEDED = 1,
@@ -387,18 +396,6 @@ declare const Filter$1: {
     create(base?: DeepPartial<Filter$1>): Filter$1;
     fromPartial(object: DeepPartial<Filter$1>): Filter$1;
 };
-interface HeaderFilter$1 {
-    /** Always include header data. Defaults to `false`. */
-    readonly always?: boolean | undefined;
-}
-declare const HeaderFilter$1: {
-    encode(message: HeaderFilter$1, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number): HeaderFilter$1;
-    fromJSON(object: any): HeaderFilter$1;
-    toJSON(message: HeaderFilter$1): unknown;
-    create(base?: DeepPartial<HeaderFilter$1>): HeaderFilter$1;
-    fromPartial(object: DeepPartial<HeaderFilter$1>): HeaderFilter$1;
-};
 interface WithdrawalFilter$1 {
     readonly id?: number | undefined;
     /** Filter based on the validator index. */
@@ -503,11 +500,13 @@ type DeepPartial<T> = T extends Builtin ? T : T extends globalThis.Array<infer U
 } : Partial<T>;
 
 type filter_DeepPartial<T> = DeepPartial<T>;
+declare const filter_headerFilterFromJSON: typeof headerFilterFromJSON;
+declare const filter_headerFilterToJSON: typeof headerFilterToJSON;
 declare const filter_protobufPackage: typeof protobufPackage;
 declare const filter_transactionStatusFilterFromJSON: typeof transactionStatusFilterFromJSON;
 declare const filter_transactionStatusFilterToJSON: typeof transactionStatusFilterToJSON;
 declare namespace filter {
-  export { type filter_DeepPartial as DeepPartial, Filter$1 as Filter, HeaderFilter$1 as HeaderFilter, LogFilter$1 as LogFilter, Topic$1 as Topic, TransactionFilter$1 as TransactionFilter, TransactionStatusFilter$1 as TransactionStatusFilter, WithdrawalFilter$1 as WithdrawalFilter, filter_protobufPackage as protobufPackage, filter_transactionStatusFilterFromJSON as transactionStatusFilterFromJSON, filter_transactionStatusFilterToJSON as transactionStatusFilterToJSON };
+  export { type filter_DeepPartial as DeepPartial, Filter$1 as Filter, HeaderFilter$1 as HeaderFilter, LogFilter$1 as LogFilter, Topic$1 as Topic, TransactionFilter$1 as TransactionFilter, TransactionStatusFilter$1 as TransactionStatusFilter, WithdrawalFilter$1 as WithdrawalFilter, filter_headerFilterFromJSON as headerFilterFromJSON, filter_headerFilterToJSON as headerFilterToJSON, filter_protobufPackage as protobufPackage, filter_transactionStatusFilterFromJSON as transactionStatusFilterFromJSON, filter_transactionStatusFilterToJSON as transactionStatusFilterToJSON };
 }
 
 declare const index_common: typeof common;
@@ -583,9 +582,13 @@ declare const u128FromProto: (i: {
     readonly x1: bigint;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => bigint;
 
-declare const HeaderFilter: Schema.Struct<{
-    always: Schema.optional<typeof Schema.Boolean>;
-}>;
+/** Header options.
+ *
+ * - `always`: receive all block headers.
+ * - `on_data`: receive headers only if any other filter matches.
+ * - `on_data_or_on_new_block`: receive headers only if any other filter matches and for "live" blocks.
+ */
+declare const HeaderFilter: Schema.transform<Schema.Enums<typeof HeaderFilter$1>, Schema.Literal<["always", "on_data", "on_data_or_on_new_block", "unknown"]>>;
 type HeaderFilter = typeof HeaderFilter.Type;
 declare const WithdrawalFilter: Schema.Struct<{
     id: Schema.optional<typeof Schema.Number>;
@@ -657,9 +660,7 @@ declare const TransactionFilter: Schema.Struct<{
 }>;
 type TransactionFilter = typeof TransactionFilter.Type;
 declare const Filter: Schema.Struct<{
-    header: Schema.optional<Schema.Struct<{
-        always: Schema.optional<typeof Schema.Boolean>;
-    }>>;
+    header: Schema.optional<Schema.transform<Schema.Enums<typeof HeaderFilter$1>, Schema.Literal<["always", "on_data", "on_data_or_on_new_block", "unknown"]>>>;
     withdrawals: Schema.optional<Schema.Array$<Schema.Struct<{
         id: Schema.optional<typeof Schema.Number>;
         validatorIndex: Schema.optional<typeof Schema.Number>;
@@ -714,9 +715,7 @@ declare const Filter: Schema.Struct<{
 }>;
 type Filter = typeof Filter.Type;
 declare const filterToProto: (a: {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -741,9 +740,7 @@ declare const filterToProto: (a: {
         readonly includeTransaction?: boolean | undefined;
     }[] | undefined;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: HeaderFilter$1 | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -792,9 +789,7 @@ declare const filterToProto: (a: {
     }[] | undefined;
 };
 declare const filterFromProto: (i: {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: HeaderFilter$1 | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -842,9 +837,7 @@ declare const filterFromProto: (i: {
         readonly includeTransaction?: boolean | undefined;
     }[] | undefined;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -870,9 +863,7 @@ declare const filterFromProto: (i: {
     }[] | undefined;
 };
 declare const FilterFromBytes: Schema.transform<Schema.Schema<Uint8Array, Uint8Array, never>, Schema.Struct<{
-    header: Schema.optional<Schema.Struct<{
-        always: Schema.optional<typeof Schema.Boolean>;
-    }>>;
+    header: Schema.optional<Schema.transform<Schema.Enums<typeof HeaderFilter$1>, Schema.Literal<["always", "on_data", "on_data_or_on_new_block", "unknown"]>>>;
     withdrawals: Schema.optional<Schema.Array$<Schema.Struct<{
         id: Schema.optional<typeof Schema.Number>;
         validatorIndex: Schema.optional<typeof Schema.Number>;
@@ -926,9 +917,7 @@ declare const FilterFromBytes: Schema.transform<Schema.Schema<Uint8Array, Uint8A
     }>>>;
 }>>;
 declare const filterToBytes: (a: {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -954,9 +943,7 @@ declare const filterToBytes: (a: {
     }[] | undefined;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => Uint8Array;
 declare const filterFromBytes: (i: Uint8Array, overrideOptions?: _effect_schema_AST.ParseOptions) => {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -1862,9 +1849,7 @@ declare const BlockFromBytes: Schema.transform<Schema.Schema<Uint8Array, Uint8Ar
 }>>>;
 
 declare const EvmStream: StreamConfig<{
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;

package/dist/index.d.ts

@@ -360,6 +360,15 @@ declare namespace data {
 
 declare const protobufPackage = "evm.v2";
 /** EVM DNA definitions (filter). */
+declare enum HeaderFilter$1 {
+    UNSPECIFIED = 0,
+    ALWAYS = 1,
+    ON_DATA = 2,
+    ON_DATA_OR_ON_NEW_BLOCK = 3,
+    UNRECOGNIZED = -1
+}
+declare function headerFilterFromJSON(object: any): HeaderFilter$1;
+declare function headerFilterToJSON(object: HeaderFilter$1): string;
 declare enum TransactionStatusFilter$1 {
     UNSPECIFIED = 0,
     SUCCEEDED = 1,
@@ -387,18 +396,6 @@ declare const Filter$1: {
     create(base?: DeepPartial<Filter$1>): Filter$1;
     fromPartial(object: DeepPartial<Filter$1>): Filter$1;
 };
-interface HeaderFilter$1 {
-    /** Always include header data. Defaults to `false`. */
-    readonly always?: boolean | undefined;
-}
-declare const HeaderFilter$1: {
-    encode(message: HeaderFilter$1, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number): HeaderFilter$1;
-    fromJSON(object: any): HeaderFilter$1;
-    toJSON(message: HeaderFilter$1): unknown;
-    create(base?: DeepPartial<HeaderFilter$1>): HeaderFilter$1;
-    fromPartial(object: DeepPartial<HeaderFilter$1>): HeaderFilter$1;
-};
 interface WithdrawalFilter$1 {
     readonly id?: number | undefined;
     /** Filter based on the validator index. */
@@ -503,11 +500,13 @@ type DeepPartial<T> = T extends Builtin ? T : T extends globalThis.Array<infer U
 } : Partial<T>;
 
 type filter_DeepPartial<T> = DeepPartial<T>;
+declare const filter_headerFilterFromJSON: typeof headerFilterFromJSON;
+declare const filter_headerFilterToJSON: typeof headerFilterToJSON;
 declare const filter_protobufPackage: typeof protobufPackage;
 declare const filter_transactionStatusFilterFromJSON: typeof transactionStatusFilterFromJSON;
 declare const filter_transactionStatusFilterToJSON: typeof transactionStatusFilterToJSON;
 declare namespace filter {
-  export { type filter_DeepPartial as DeepPartial, Filter$1 as Filter, HeaderFilter$1 as HeaderFilter, LogFilter$1 as LogFilter, Topic$1 as Topic, TransactionFilter$1 as TransactionFilter, TransactionStatusFilter$1 as TransactionStatusFilter, WithdrawalFilter$1 as WithdrawalFilter, filter_protobufPackage as protobufPackage, filter_transactionStatusFilterFromJSON as transactionStatusFilterFromJSON, filter_transactionStatusFilterToJSON as transactionStatusFilterToJSON };
+  export { type filter_DeepPartial as DeepPartial, Filter$1 as Filter, HeaderFilter$1 as HeaderFilter, LogFilter$1 as LogFilter, Topic$1 as Topic, TransactionFilter$1 as TransactionFilter, TransactionStatusFilter$1 as TransactionStatusFilter, WithdrawalFilter$1 as WithdrawalFilter, filter_headerFilterFromJSON as headerFilterFromJSON, filter_headerFilterToJSON as headerFilterToJSON, filter_protobufPackage as protobufPackage, filter_transactionStatusFilterFromJSON as transactionStatusFilterFromJSON, filter_transactionStatusFilterToJSON as transactionStatusFilterToJSON };
 }
 
 declare const index_common: typeof common;
@@ -583,9 +582,13 @@ declare const u128FromProto: (i: {
     readonly x1: bigint;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => bigint;
 
-declare const HeaderFilter: Schema.Struct<{
-    always: Schema.optional<typeof Schema.Boolean>;
-}>;
+/** Header options.
+ *
+ * - `always`: receive all block headers.
+ * - `on_data`: receive headers only if any other filter matches.
+ * - `on_data_or_on_new_block`: receive headers only if any other filter matches and for "live" blocks.
+ */
+declare const HeaderFilter: Schema.transform<Schema.Enums<typeof HeaderFilter$1>, Schema.Literal<["always", "on_data", "on_data_or_on_new_block", "unknown"]>>;
 type HeaderFilter = typeof HeaderFilter.Type;
 declare const WithdrawalFilter: Schema.Struct<{
     id: Schema.optional<typeof Schema.Number>;
@@ -657,9 +660,7 @@ declare const TransactionFilter: Schema.Struct<{
 }>;
 type TransactionFilter = typeof TransactionFilter.Type;
 declare const Filter: Schema.Struct<{
-    header: Schema.optional<Schema.Struct<{
-        always: Schema.optional<typeof Schema.Boolean>;
-    }>>;
+    header: Schema.optional<Schema.transform<Schema.Enums<typeof HeaderFilter$1>, Schema.Literal<["always", "on_data", "on_data_or_on_new_block", "unknown"]>>>;
     withdrawals: Schema.optional<Schema.Array$<Schema.Struct<{
         id: Schema.optional<typeof Schema.Number>;
         validatorIndex: Schema.optional<typeof Schema.Number>;
@@ -714,9 +715,7 @@ declare const Filter: Schema.Struct<{
 }>;
 type Filter = typeof Filter.Type;
 declare const filterToProto: (a: {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -741,9 +740,7 @@ declare const filterToProto: (a: {
         readonly includeTransaction?: boolean | undefined;
     }[] | undefined;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: HeaderFilter$1 | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -792,9 +789,7 @@ declare const filterToProto: (a: {
     }[] | undefined;
 };
 declare const filterFromProto: (i: {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: HeaderFilter$1 | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -842,9 +837,7 @@ declare const filterFromProto: (i: {
         readonly includeTransaction?: boolean | undefined;
     }[] | undefined;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -870,9 +863,7 @@ declare const filterFromProto: (i: {
     }[] | undefined;
 };
 declare const FilterFromBytes: Schema.transform<Schema.Schema<Uint8Array, Uint8Array, never>, Schema.Struct<{
-    header: Schema.optional<Schema.Struct<{
-        always: Schema.optional<typeof Schema.Boolean>;
-    }>>;
+    header: Schema.optional<Schema.transform<Schema.Enums<typeof HeaderFilter$1>, Schema.Literal<["always", "on_data", "on_data_or_on_new_block", "unknown"]>>>;
     withdrawals: Schema.optional<Schema.Array$<Schema.Struct<{
         id: Schema.optional<typeof Schema.Number>;
         validatorIndex: Schema.optional<typeof Schema.Number>;
@@ -926,9 +917,7 @@ declare const FilterFromBytes: Schema.transform<Schema.Schema<Uint8Array, Uint8A
     }>>>;
 }>>;
 declare const filterToBytes: (a: {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -954,9 +943,7 @@ declare const filterToBytes: (a: {
     }[] | undefined;
 }, overrideOptions?: _effect_schema_AST.ParseOptions) => Uint8Array;
 declare const filterFromBytes: (i: Uint8Array, overrideOptions?: _effect_schema_AST.ParseOptions) => {
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;
@@ -1862,9 +1849,7 @@ declare const BlockFromBytes: Schema.transform<Schema.Schema<Uint8Array, Uint8Ar
 }>>>;
 
 declare const EvmStream: StreamConfig<{
-    readonly header?: {
-        readonly always?: boolean | undefined;
-    } | undefined;
+    readonly header?: "unknown" | "always" | "on_data" | "on_data_or_on_new_block" | undefined;
     readonly withdrawals?: readonly {
         readonly id?: number | undefined;
         readonly validatorIndex?: number | undefined;

package/dist/index.mjs

@@ -2326,6 +2326,49 @@ const data = {
 };
 
 const protobufPackage = "evm.v2";
+var HeaderFilter$1 = /* @__PURE__ */ ((HeaderFilter2) => {
+  HeaderFilter2[HeaderFilter2["UNSPECIFIED"] = 0] = "UNSPECIFIED";
+  HeaderFilter2[HeaderFilter2["ALWAYS"] = 1] = "ALWAYS";
+  HeaderFilter2[HeaderFilter2["ON_DATA"] = 2] = "ON_DATA";
+  HeaderFilter2[HeaderFilter2["ON_DATA_OR_ON_NEW_BLOCK"] = 3] = "ON_DATA_OR_ON_NEW_BLOCK";
+  HeaderFilter2[HeaderFilter2["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
+  return HeaderFilter2;
+})(HeaderFilter$1 || {});
+function headerFilterFromJSON(object) {
+  switch (object) {
+    case 0:
+    case "HEADER_FILTER_UNSPECIFIED":
+      return 0 /* UNSPECIFIED */;
+    case 1:
+    case "HEADER_FILTER_ALWAYS":
+      return 1 /* ALWAYS */;
+    case 2:
+    case "HEADER_FILTER_ON_DATA":
+      return 2 /* ON_DATA */;
+    case 3:
+    case "HEADER_FILTER_ON_DATA_OR_ON_NEW_BLOCK":
+      return 3 /* ON_DATA_OR_ON_NEW_BLOCK */;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return -1 /* UNRECOGNIZED */;
+  }
+}
+function headerFilterToJSON(object) {
+  switch (object) {
+    case 0 /* UNSPECIFIED */:
+      return "HEADER_FILTER_UNSPECIFIED";
+    case 1 /* ALWAYS */:
+      return "HEADER_FILTER_ALWAYS";
+    case 2 /* ON_DATA */:
+      return "HEADER_FILTER_ON_DATA";
+    case 3 /* ON_DATA_OR_ON_NEW_BLOCK */:
+      return "HEADER_FILTER_ON_DATA_OR_ON_NEW_BLOCK";
+    case -1 /* UNRECOGNIZED */:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
 var TransactionStatusFilter$1 = /* @__PURE__ */ ((TransactionStatusFilter2) => {
   TransactionStatusFilter2[TransactionStatusFilter2["UNSPECIFIED"] = 0] = "UNSPECIFIED";
   TransactionStatusFilter2[TransactionStatusFilter2["SUCCEEDED"] = 1] = "SUCCEEDED";
@@ -2370,12 +2413,12 @@ function transactionStatusFilterToJSON(object) {
   }
 }
 function createBaseFilter() {
-  return { header: void 0, withdrawals: [], transactions: [], logs: [] };
+  return { header: 0, withdrawals: [], transactions: [], logs: [] };
 }
 const Filter$1 = {
   encode(message, writer = _m0.Writer.create()) {
-    if (message.header !== void 0) {
-      HeaderFilter$1.encode(message.header, writer.uint32(10).fork()).ldelim();
+    if (message.header !== void 0 && message.header !== 0) {
+      writer.uint32(8).int32(message.header);
     }
     if (message.withdrawals !== void 0 && message.withdrawals.length !== 0) {
       for (const v of message.withdrawals) {
@@ -2402,10 +2445,10 @@ const Filter$1 = {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag !== 10) {
+          if (tag !== 8) {
             break;
           }
-          message.header = HeaderFilter$1.decode(reader, reader.uint32());
+          message.header = reader.int32();
           continue;
         case 2:
           if (tag !== 18) {
@@ -2435,7 +2478,7 @@ const Filter$1 = {
   },
   fromJSON(object) {
     return {
-      header: isSet(object.header) ? HeaderFilter$1.fromJSON(object.header) : void 0,
+      header: isSet(object.header) ? headerFilterFromJSON(object.header) : 0,
       withdrawals: globalThis.Array.isArray(object?.withdrawals) ? object.withdrawals.map((e) => WithdrawalFilter$1.fromJSON(e)) : [],
       transactions: globalThis.Array.isArray(object?.transactions) ? object.transactions.map((e) => TransactionFilter$1.fromJSON(e)) : [],
       logs: globalThis.Array.isArray(object?.logs) ? object.logs.map((e) => LogFilter$1.fromJSON(e)) : []
@@ -2443,8 +2486,8 @@ const Filter$1 = {
   },
   toJSON(message) {
     const obj = {};
-    if (message.header !== void 0) {
-      obj.header = HeaderFilter$1.toJSON(message.header);
+    if (message.header !== void 0 && message.header !== 0) {
+      obj.header = headerFilterToJSON(message.header);
     }
     if (message.withdrawals?.length) {
       obj.withdrawals = message.withdrawals.map((e) => WithdrawalFilter$1.toJSON(e));
@@ -2462,63 +2505,13 @@ const Filter$1 = {
   },
   fromPartial(object) {
     const message = createBaseFilter();
-    message.header = object.header !== void 0 && object.header !== null ? HeaderFilter$1.fromPartial(object.header) : void 0;
+    message.header = object.header ?? 0;
     message.withdrawals = object.withdrawals?.map((e) => WithdrawalFilter$1.fromPartial(e)) || [];
     message.transactions = object.transactions?.map((e) => TransactionFilter$1.fromPartial(e)) || [];
     message.logs = object.logs?.map((e) => LogFilter$1.fromPartial(e)) || [];
     return message;
   }
 };
-function createBaseHeaderFilter() {
-  return { always: void 0 };
-}
-const HeaderFilter$1 = {
-  encode(message, writer = _m0.Writer.create()) {
-    if (message.always !== void 0) {
-      writer.uint32(8).bool(message.always);
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-    let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseHeaderFilter();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          if (tag !== 8) {
-            break;
-          }
-          message.always = reader.bool();
-          continue;
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return { always: isSet(object.always) ? globalThis.Boolean(object.always) : void 0 };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.always !== void 0) {
-      obj.always = message.always;
-    }
-    return obj;
-  },
-  create(base) {
-    return HeaderFilter$1.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseHeaderFilter();
-    message.always = object.always ?? void 0;
-    return message;
-  }
-};
 function createBaseWithdrawalFilter() {
   return { id: 0, validatorIndex: void 0, address: void 0 };
 }
@@ -2967,6 +2960,8 @@ const filter = {
   TransactionFilter: TransactionFilter$1,
   TransactionStatusFilter: TransactionStatusFilter$1,
   WithdrawalFilter: WithdrawalFilter$1,
+  headerFilterFromJSON: headerFilterFromJSON,
+  headerFilterToJSON: headerFilterToJSON,
   protobufPackage: protobufPackage,
   transactionStatusFilterFromJSON: transactionStatusFilterFromJSON,
   transactionStatusFilterToJSON: transactionStatusFilterToJSON
@@ -3129,9 +3124,34 @@ const BlockFromBytes = Schema.transform(
 );
 
 const OptionalArray = (schema) => Schema.optional(Schema.Array(schema));
-const HeaderFilter = Schema.Struct({
-  always: Schema.optional(Schema.Boolean)
-});
+const HeaderFilter = Schema.transform(
+  Schema.Enums(HeaderFilter$1),
+  Schema.Literal("always", "on_data", "on_data_or_on_new_block", "unknown"),
+  {
+    decode(value) {
+      const enumMap = {
+        [HeaderFilter$1.ALWAYS]: "always",
+        [HeaderFilter$1.ON_DATA]: "on_data",
+        [HeaderFilter$1.ON_DATA_OR_ON_NEW_BLOCK]: "on_data_or_on_new_block",
+        [HeaderFilter$1.UNSPECIFIED]: "unknown",
+        [HeaderFilter$1.UNRECOGNIZED]: "unknown"
+      };
+      return enumMap[value] ?? "unknown";
+    },
+    encode(value) {
+      switch (value) {
+        case "always":
+          return HeaderFilter$1.ALWAYS;
+        case "on_data":
+          return HeaderFilter$1.ON_DATA;
+        case "on_data_or_on_new_block":
+          return HeaderFilter$1.ON_DATA_OR_ON_NEW_BLOCK;
+        default:
+          return HeaderFilter$1.UNSPECIFIED;
+      }
+    }
+  }
+);
 const WithdrawalFilter = Schema.Struct({
   id: Schema.optional(Schema.Number),
   validatorIndex: Schema.optional(Schema.Number),
@@ -3240,9 +3260,13 @@ function mergeHeaderFilter(a, b) {
   if (b === void 0) {
     return a;
   }
-  return {
-    always: a.always || b.always
-  };
+  if (a === "always" || b === "always") {
+    return "always";
+  }
+  if (a === "on_data_or_on_new_block" || b === "on_data_or_on_new_block") {
+    return "on_data_or_on_new_block";
+  }
+  return "on_data";
 }
 
 const EvmStream = new StreamConfig(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apibara/evm",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.1-beta.0",
   "type": "module",
   "files": [
     "dist",
@@ -35,7 +35,7 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/protocol": "2.0.0-beta.7",
+    "@apibara/protocol": "2.0.0-beta.8",
     "@effect/schema": "^0.67.15",
     "effect": "^3.2.6",
     "long": "^5.2.1",

package/src/filter.test.ts

@@ -87,23 +87,19 @@ describe("LogFilter", () => {
 
 describe("mergeFilter", () => {
   it("returns header.always if any has it", () => {
-    const fa = mergeFilter({}, { header: { always: true } });
+    const fa = mergeFilter({}, { header: "always" });
     expect(fa).toMatchInlineSnapshot(`
       {
-        "header": {
-          "always": true,
-        },
+        "header": "always",
         "logs": [],
         "transactions": [],
         "withdrawals": [],
       }
     `);
-    const fb = mergeFilter({ header: { always: true } }, {});
+    const fb = mergeFilter({ header: "always" }, {});
     expect(fb).toMatchInlineSnapshot(`
       {
-        "header": {
-          "always": true,
-        },
+        "header": "always",
         "logs": [],
         "transactions": [],
         "withdrawals": [],

package/src/filter.ts

@@ -7,9 +7,41 @@ import * as proto from "./proto";
 const OptionalArray = <TSchema extends Schema.Schema.Any>(schema: TSchema) =>
   Schema.optional(Schema.Array(schema));
 
-export const HeaderFilter = Schema.Struct({
-  always: Schema.optional(Schema.Boolean),
-});
+/** Header options.
+ *
+ * - `always`: receive all block headers.
+ * - `on_data`: receive headers only if any other filter matches.
+ * - `on_data_or_on_new_block`: receive headers only if any other filter matches and for "live" blocks.
+ */
+export const HeaderFilter = Schema.transform(
+  Schema.Enums(proto.filter.HeaderFilter),
+  Schema.Literal("always", "on_data", "on_data_or_on_new_block", "unknown"),
+  {
+    decode(value) {
+      const enumMap = {
+        [proto.filter.HeaderFilter.ALWAYS]: "always",
+        [proto.filter.HeaderFilter.ON_DATA]: "on_data",
+        [proto.filter.HeaderFilter.ON_DATA_OR_ON_NEW_BLOCK]:
+          "on_data_or_on_new_block",
+        [proto.filter.HeaderFilter.UNSPECIFIED]: "unknown",
+        [proto.filter.HeaderFilter.UNRECOGNIZED]: "unknown",
+      } as const;
+      return enumMap[value] ?? "unknown";
+    },
+    encode(value) {
+      switch (value) {
+        case "always":
+          return proto.filter.HeaderFilter.ALWAYS;
+        case "on_data":
+          return proto.filter.HeaderFilter.ON_DATA;
+        case "on_data_or_on_new_block":
+          return proto.filter.HeaderFilter.ON_DATA_OR_ON_NEW_BLOCK;
+        default:
+          return proto.filter.HeaderFilter.UNSPECIFIED;
+      }
+    },
+  },
+);
 
 export type HeaderFilter = typeof HeaderFilter.Type;
 
@@ -144,7 +176,14 @@ function mergeHeaderFilter(
   if (b === undefined) {
     return a;
   }
-  return {
-    always: a.always || b.always,
-  };
+
+  if (a === "always" || b === "always") {
+    return "always";
+  }
+
+  if (a === "on_data_or_on_new_block" || b === "on_data_or_on_new_block") {
+    return "on_data_or_on_new_block";
+  }
+
+  return "on_data";
 }

package/src/proto/filter.ts

@@ -12,6 +12,51 @@ export const protobufPackage = "evm.v2";
 
 /** EVM DNA definitions (filter). */
 
+export enum HeaderFilter {
+  UNSPECIFIED = 0,
+  ALWAYS = 1,
+  ON_DATA = 2,
+  ON_DATA_OR_ON_NEW_BLOCK = 3,
+  UNRECOGNIZED = -1,
+}
+
+export function headerFilterFromJSON(object: any): HeaderFilter {
+  switch (object) {
+    case 0:
+    case "HEADER_FILTER_UNSPECIFIED":
+      return HeaderFilter.UNSPECIFIED;
+    case 1:
+    case "HEADER_FILTER_ALWAYS":
+      return HeaderFilter.ALWAYS;
+    case 2:
+    case "HEADER_FILTER_ON_DATA":
+      return HeaderFilter.ON_DATA;
+    case 3:
+    case "HEADER_FILTER_ON_DATA_OR_ON_NEW_BLOCK":
+      return HeaderFilter.ON_DATA_OR_ON_NEW_BLOCK;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return HeaderFilter.UNRECOGNIZED;
+  }
+}
+
+export function headerFilterToJSON(object: HeaderFilter): string {
+  switch (object) {
+    case HeaderFilter.UNSPECIFIED:
+      return "HEADER_FILTER_UNSPECIFIED";
+    case HeaderFilter.ALWAYS:
+      return "HEADER_FILTER_ALWAYS";
+    case HeaderFilter.ON_DATA:
+      return "HEADER_FILTER_ON_DATA";
+    case HeaderFilter.ON_DATA_OR_ON_NEW_BLOCK:
+      return "HEADER_FILTER_ON_DATA_OR_ON_NEW_BLOCK";
+    case HeaderFilter.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
 export enum TransactionStatusFilter {
   UNSPECIFIED = 0,
   SUCCEEDED = 1,
@@ -74,11 +119,6 @@ export interface Filter {
   readonly logs?: readonly LogFilter[] | undefined;
 }
 
-export interface HeaderFilter {
-  /** Always include header data. Defaults to `false`. */
-  readonly always?: boolean | undefined;
-}
-
 export interface WithdrawalFilter {
   readonly id?:
     | number
@@ -174,13 +214,13 @@ export interface Topic {
 }
 
 function createBaseFilter(): Filter {
-  return { header: undefined, withdrawals: [], transactions: [], logs: [] };
+  return { header: 0, withdrawals: [], transactions: [], logs: [] };
 }
 
 export const Filter = {
   encode(message: Filter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.header !== undefined) {
-      HeaderFilter.encode(message.header, writer.uint32(10).fork()).ldelim();
+    if (message.header !== undefined && message.header !== 0) {
+      writer.uint32(8).int32(message.header);
     }
     if (message.withdrawals !== undefined && message.withdrawals.length !== 0) {
       for (const v of message.withdrawals) {
@@ -208,11 +248,11 @@ export const Filter = {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag !== 10) {
+          if (tag !== 8) {
             break;
           }
 
-          message.header = HeaderFilter.decode(reader, reader.uint32());
+          message.header = reader.int32() as any;
           continue;
         case 2:
           if (tag !== 18) {
@@ -246,7 +286,7 @@ export const Filter = {
 
   fromJSON(object: any): Filter {
     return {
-      header: isSet(object.header) ? HeaderFilter.fromJSON(object.header) : undefined,
+      header: isSet(object.header) ? headerFilterFromJSON(object.header) : 0,
       withdrawals: globalThis.Array.isArray(object?.withdrawals)
         ? object.withdrawals.map((e: any) => WithdrawalFilter.fromJSON(e))
         : [],
@@ -259,8 +299,8 @@ export const Filter = {
 
   toJSON(message: Filter): unknown {
     const obj: any = {};
-    if (message.header !== undefined) {
-      obj.header = HeaderFilter.toJSON(message.header);
+    if (message.header !== undefined && message.header !== 0) {
+      obj.header = headerFilterToJSON(message.header);
     }
     if (message.withdrawals?.length) {
       obj.withdrawals = message.withdrawals.map((e) => WithdrawalFilter.toJSON(e));
@@ -279,9 +319,7 @@ export const Filter = {
   },
   fromPartial(object: DeepPartial<Filter>): Filter {
     const message = createBaseFilter() as any;
-    message.header = (object.header !== undefined && object.header !== null)
-      ? HeaderFilter.fromPartial(object.header)
-      : undefined;
+    message.header = object.header ?? 0;
     message.withdrawals = object.withdrawals?.map((e) => WithdrawalFilter.fromPartial(e)) || [];
     message.transactions = object.transactions?.map((e) => TransactionFilter.fromPartial(e)) || [];
     message.logs = object.logs?.map((e) => LogFilter.fromPartial(e)) || [];
@@ -289,63 +327,6 @@ export const Filter = {
   },
 };
 
-function createBaseHeaderFilter(): HeaderFilter {
-  return { always: undefined };
-}
-
-export const HeaderFilter = {
-  encode(message: HeaderFilter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.always !== undefined) {
-      writer.uint32(8).bool(message.always);
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): HeaderFilter {
-    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseHeaderFilter() as any;
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          if (tag !== 8) {
-            break;
-          }
-
-          message.always = reader.bool();
-          continue;
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): HeaderFilter {
-    return { always: isSet(object.always) ? globalThis.Boolean(object.always) : undefined };
-  },
-
-  toJSON(message: HeaderFilter): unknown {
-    const obj: any = {};
-    if (message.always !== undefined) {
-      obj.always = message.always;
-    }
-    return obj;
-  },
-
-  create(base?: DeepPartial<HeaderFilter>): HeaderFilter {
-    return HeaderFilter.fromPartial(base ?? {});
-  },
-  fromPartial(object: DeepPartial<HeaderFilter>): HeaderFilter {
-    const message = createBaseHeaderFilter() as any;
-    message.always = object.always ?? undefined;
-    return message;
-  },
-};
-
 function createBaseWithdrawalFilter(): WithdrawalFilter {
   return { id: 0, validatorIndex: undefined, address: undefined };
 }