@apibara/beaconchain 2.0.1-beta.9 → 2.1.0-beta.2

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { BytesFromUint8Array, StreamConfig } from '@apibara/protocol';
-import { B256 as B256$1, Address as Address$1, U256 as U256$1, U128 as U128$1, Signature as Signature$1, AccessListItem as AccessListItem$1 } from '@apibara/evm';
+import { B256 as B256$1, Address as Address$1, U256 as U256$1, U128 as U128$1, AccessListItem as AccessListItem$1 } from '@apibara/evm';
 export { Address, B256, U128, U256 } from '@apibara/evm';
 import { Schema } from '@effect/schema';
 import { hexToBytes, pad } from 'viem';
@@ -1081,7 +1081,7 @@ const Transaction$1 = {
       writer.uint32(98).bytes(message.input);
     }
     if (message.signature !== void 0) {
-      Signature.encode(message.signature, writer.uint32(106).fork()).ldelim();
+      Signature$1.encode(message.signature, writer.uint32(106).fork()).ldelim();
     }
     if (message.chainId !== void 0) {
       if (BigInt.asUintN(64, message.chainId) !== message.chainId) {
@@ -1200,7 +1200,7 @@ const Transaction$1 = {
           if (tag !== 106) {
             break;
           }
-          message.signature = Signature.decode(reader, reader.uint32());
+          message.signature = Signature$1.decode(reader, reader.uint32());
           continue;
         case 14:
           if (tag !== 112) {
@@ -1254,7 +1254,7 @@ const Transaction$1 = {
       maxFeePerGas: isSet$1(object.maxFeePerGas) ? U128.fromJSON(object.maxFeePerGas) : void 0,
       maxPriorityFeePerGas: isSet$1(object.maxPriorityFeePerGas) ? U128.fromJSON(object.maxPriorityFeePerGas) : void 0,
       input: isSet$1(object.input) ? bytesFromBase64(object.input) : new Uint8Array(0),
-      signature: isSet$1(object.signature) ? Signature.fromJSON(object.signature) : void 0,
+      signature: isSet$1(object.signature) ? Signature$1.fromJSON(object.signature) : void 0,
       chainId: isSet$1(object.chainId) ? BigInt(object.chainId) : void 0,
       accessList: globalThis.Array.isArray(object?.accessList) ? object.accessList.map((e) => AccessListItem.fromJSON(e)) : [],
       transactionType: isSet$1(object.transactionType) ? BigInt(object.transactionType) : BigInt("0"),
@@ -1301,7 +1301,7 @@ const Transaction$1 = {
       obj.input = base64FromBytes(message.input);
     }
     if (message.signature !== void 0) {
-      obj.signature = Signature.toJSON(message.signature);
+      obj.signature = Signature$1.toJSON(message.signature);
     }
     if (message.chainId !== void 0) {
       obj.chainId = message.chainId.toString();
@@ -1337,7 +1337,7 @@ const Transaction$1 = {
     message.maxFeePerGas = object.maxFeePerGas !== void 0 && object.maxFeePerGas !== null ? U128.fromPartial(object.maxFeePerGas) : void 0;
     message.maxPriorityFeePerGas = object.maxPriorityFeePerGas !== void 0 && object.maxPriorityFeePerGas !== null ? U128.fromPartial(object.maxPriorityFeePerGas) : void 0;
     message.input = object.input ?? new Uint8Array(0);
-    message.signature = object.signature !== void 0 && object.signature !== null ? Signature.fromPartial(object.signature) : void 0;
+    message.signature = object.signature !== void 0 && object.signature !== null ? Signature$1.fromPartial(object.signature) : void 0;
     message.chainId = object.chainId ?? void 0;
     message.accessList = object.accessList?.map((e) => AccessListItem.fromPartial(e)) || [];
     message.transactionType = object.transactionType ?? BigInt("0");
@@ -1948,7 +1948,7 @@ const ExecutionPayload$1 = {
 function createBaseSignature() {
   return { r: void 0, s: void 0 };
 }
-const Signature = {
+const Signature$1 = {
   encode(message, writer = _m0.Writer.create()) {
     if (message.r !== void 0) {
       U256.encode(message.r, writer.uint32(10).fork()).ldelim();
@@ -2002,7 +2002,7 @@ const Signature = {
     return obj;
   },
   create(base) {
-    return Signature.fromPartial(base ?? {});
+    return Signature$1.fromPartial(base ?? {});
   },
   fromPartial(object) {
     const message = createBaseSignature();
@@ -2139,7 +2139,7 @@ const data = {
   Block: Block$1,
   BlockHeader: BlockHeader$1,
   ExecutionPayload: ExecutionPayload$1,
-  Signature: Signature,
+  Signature: Signature$1,
   Transaction: Transaction$1,
   Validator: Validator$1,
   protobufPackage: protobufPackage$1
@@ -2647,75 +2647,81 @@ const B384 = Schema.transform(B384Proto, _B384, {
 });
 
 const ExecutionPayload = Schema.Struct({
-  parentHash: Schema.optional(B256$1),
-  feeRecipient: Schema.optional(Address$1),
-  stateRoot: Schema.optional(B256$1),
-  receiptsRoot: Schema.optional(B256$1),
+  parentHash: B256$1,
+  feeRecipient: Address$1,
+  stateRoot: B256$1,
+  receiptsRoot: B256$1,
   logsBloom: BytesFromUint8Array,
-  prevRandao: Schema.optional(B256$1),
-  blockNumber: Schema.optional(Schema.BigIntFromSelf),
-  timestamp: Schema.optional(Schema.DateFromSelf)
+  prevRandao: B256$1,
+  blockNumber: Schema.BigIntFromSelf,
+  timestamp: Schema.DateFromSelf
 });
 const BlockHeader = Schema.Struct({
   slot: Schema.BigIntFromSelf,
   proposerIndex: Schema.Number,
-  parentRoot: Schema.optional(B256$1),
-  stateRoot: Schema.optional(B256$1),
+  parentRoot: B256$1,
+  stateRoot: B256$1,
   randaoReveal: BytesFromUint8Array,
-  depositCount: Schema.optional(Schema.BigIntFromSelf),
-  depositRoot: Schema.optional(B256$1),
-  blockHash: Schema.optional(B256$1),
-  graffiti: Schema.optional(B256$1),
+  depositCount: Schema.BigIntFromSelf,
+  depositRoot: B256$1,
+  blockHash: B256$1,
+  graffiti: B256$1,
   executionPayload: Schema.optional(ExecutionPayload),
-  blobKzgCommitments: Schema.optional(Schema.Array(B384))
+  blobKzgCommitments: Schema.Array(B384)
 });
 const Validator = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  validatorIndex: Schema.optional(Schema.Number),
-  balance: Schema.optional(Schema.BigIntFromSelf),
-  status: Schema.optional(ValidatorStatus),
-  pubkey: Schema.optional(B384),
-  withdrawalCredentials: Schema.optional(B256$1),
-  effectiveBalance: Schema.optional(Schema.BigIntFromSelf),
-  slashed: Schema.optional(Schema.Boolean),
-  activationEligibilityEpoch: Schema.optional(Schema.BigIntFromSelf),
-  activationEpoch: Schema.optional(Schema.BigIntFromSelf),
-  exitEpoch: Schema.optional(Schema.BigIntFromSelf),
-  withdrawableEpoch: Schema.optional(Schema.BigIntFromSelf)
+  filterIds: Schema.Array(Schema.Number),
+  validatorIndex: Schema.Number,
+  balance: Schema.BigIntFromSelf,
+  status: ValidatorStatus,
+  pubkey: B384,
+  withdrawalCredentials: B256$1,
+  effectiveBalance: Schema.BigIntFromSelf,
+  slashed: Schema.Boolean,
+  activationEligibilityEpoch: Schema.BigIntFromSelf,
+  activationEpoch: Schema.BigIntFromSelf,
+  exitEpoch: Schema.BigIntFromSelf,
+  withdrawableEpoch: Schema.BigIntFromSelf
 });
 const Blob = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  blobIndex: Schema.optional(Schema.Number),
-  blob: Schema.optional(Schema.Uint8ArrayFromSelf),
-  kzgCommitment: Schema.optional(B384),
-  kzgProof: Schema.optional(B384),
-  kzgCommitmentInclusionProof: Schema.optional(Schema.Array(B256$1)),
-  blobHash: Schema.optional(B256$1),
-  transactionIndex: Schema.optional(Schema.Number),
-  transactionHash: Schema.optional(B256$1)
+  filterIds: Schema.Array(Schema.Number),
+  blobIndex: Schema.Number,
+  blob: Schema.Uint8ArrayFromSelf,
+  kzgCommitment: B384,
+  kzgProof: B384,
+  kzgCommitmentInclusionProof: Schema.Array(B256$1),
+  blobHash: B256$1,
+  transactionIndex: Schema.Number,
+  transactionHash: B256$1
+});
+const Signature = Schema.Struct({
+  r: Schema.optional(U256$1),
+  s: Schema.optional(U256$1),
+  v: Schema.optional(U256$1),
+  YParity: Schema.optional(Schema.Boolean)
 });
 const Transaction = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  transactionHash: Schema.optional(B256$1),
-  nonce: Schema.optional(Schema.BigIntFromSelf),
-  transactionIndex: Schema.optional(Schema.Number),
-  from: Schema.optional(Address$1),
+  filterIds: Schema.Array(Schema.Number),
+  transactionHash: B256$1,
+  nonce: Schema.BigIntFromSelf,
+  transactionIndex: Schema.Number,
+  from: Address$1,
   to: Schema.optional(Address$1),
-  value: Schema.optional(U256$1),
+  value: U256$1,
   gasPrice: Schema.optional(U128$1),
   gasLimit: Schema.optional(U128$1),
   maxFeePerGas: Schema.optional(U128$1),
   maxPriorityFeePerGas: Schema.optional(U128$1),
-  input: Schema.optional(Schema.Uint8ArrayFromSelf),
-  signature: Schema.optional(Signature$1),
+  input: Schema.Uint8ArrayFromSelf,
+  signature: Schema.optional(Signature),
   chainId: Schema.optional(Schema.BigIntFromSelf),
-  accessList: Schema.optional(Schema.Array(AccessListItem$1)),
-  transactionType: Schema.optional(Schema.BigIntFromSelf),
+  accessList: Schema.Array(AccessListItem$1),
+  transactionType: Schema.BigIntFromSelf,
   maxFeePerBlobGas: Schema.optional(U128$1),
-  blobVersionedHashes: Schema.optional(Schema.Array(B256$1))
+  blobVersionedHashes: Schema.Array(B256$1)
 });
 const Block = Schema.Struct({
-  header: Schema.optional(BlockHeader),
+  header: BlockHeader,
   validators: Schema.Array(Validator),
   blobs: Schema.Array(Blob),
   transactions: Schema.Array(Transaction)
@@ -2838,4 +2844,4 @@ const BeaconChainStream = new StreamConfig(
   mergeFilter
 );
 
-export { B384, BeaconChainStream, Blob, BlobFilter, Block, BlockFromBytes, BlockHeader, ExecutionPayload, Filter, FilterFromBytes, HeaderFilter, Transaction, TransactionFilter, Validator, ValidatorFilter, ValidatorStatus, filterFromBytes, filterFromProto, filterToBytes, filterToProto, mergeFilter, index as proto };
+export { B384, BeaconChainStream, Blob, BlobFilter, Block, BlockFromBytes, BlockHeader, ExecutionPayload, Filter, FilterFromBytes, HeaderFilter, Signature, Transaction, TransactionFilter, Validator, ValidatorFilter, ValidatorStatus, filterFromBytes, filterFromProto, filterToBytes, filterToProto, mergeFilter, index as proto };

package/package.json

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

package/src/block.ts

@@ -1,4 +1,4 @@
-import { AccessListItem, Signature } from "@apibara/evm";
+import { AccessListItem } from "@apibara/evm";
 import { BytesFromUint8Array } from "@apibara/protocol";
 import { Schema } from "@effect/schema";
 
@@ -6,14 +6,14 @@ import { Address, B256, B384, U128, U256, ValidatorStatus } from "./common";
 import * as proto from "./proto";
 
 export const ExecutionPayload = Schema.Struct({
-  parentHash: Schema.optional(B256),
-  feeRecipient: Schema.optional(Address),
-  stateRoot: Schema.optional(B256),
-  receiptsRoot: Schema.optional(B256),
+  parentHash: B256,
+  feeRecipient: Address,
+  stateRoot: B256,
+  receiptsRoot: B256,
   logsBloom: BytesFromUint8Array,
-  prevRandao: Schema.optional(B256),
-  blockNumber: Schema.optional(Schema.BigIntFromSelf),
-  timestamp: Schema.optional(Schema.DateFromSelf),
+  prevRandao: B256,
+  blockNumber: Schema.BigIntFromSelf,
+  timestamp: Schema.DateFromSelf,
 });
 
 export type ExecutionPayload = typeof ExecutionPayload.Type;
@@ -21,71 +21,80 @@ export type ExecutionPayload = typeof ExecutionPayload.Type;
 export const BlockHeader = Schema.Struct({
   slot: Schema.BigIntFromSelf,
   proposerIndex: Schema.Number,
-  parentRoot: Schema.optional(B256),
-  stateRoot: Schema.optional(B256),
+  parentRoot: B256,
+  stateRoot: B256,
   randaoReveal: BytesFromUint8Array,
-  depositCount: Schema.optional(Schema.BigIntFromSelf),
-  depositRoot: Schema.optional(B256),
-  blockHash: Schema.optional(B256),
-  graffiti: Schema.optional(B256),
+  depositCount: Schema.BigIntFromSelf,
+  depositRoot: B256,
+  blockHash: B256,
+  graffiti: B256,
   executionPayload: Schema.optional(ExecutionPayload),
-  blobKzgCommitments: Schema.optional(Schema.Array(B384)),
+  blobKzgCommitments: Schema.Array(B384),
 });
 
 export type BlockHeader = typeof BlockHeader.Type;
 
 export const Validator = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  validatorIndex: Schema.optional(Schema.Number),
-  balance: Schema.optional(Schema.BigIntFromSelf),
-  status: Schema.optional(ValidatorStatus),
-  pubkey: Schema.optional(B384),
-  withdrawalCredentials: Schema.optional(B256),
-  effectiveBalance: Schema.optional(Schema.BigIntFromSelf),
-  slashed: Schema.optional(Schema.Boolean),
-  activationEligibilityEpoch: Schema.optional(Schema.BigIntFromSelf),
-  activationEpoch: Schema.optional(Schema.BigIntFromSelf),
-  exitEpoch: Schema.optional(Schema.BigIntFromSelf),
-  withdrawableEpoch: Schema.optional(Schema.BigIntFromSelf),
+  filterIds: Schema.Array(Schema.Number),
+  validatorIndex: Schema.Number,
+  balance: Schema.BigIntFromSelf,
+  status: ValidatorStatus,
+  pubkey: B384,
+  withdrawalCredentials: B256,
+  effectiveBalance: Schema.BigIntFromSelf,
+  slashed: Schema.Boolean,
+  activationEligibilityEpoch: Schema.BigIntFromSelf,
+  activationEpoch: Schema.BigIntFromSelf,
+  exitEpoch: Schema.BigIntFromSelf,
+  withdrawableEpoch: Schema.BigIntFromSelf,
 });
 
 export const Blob = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  blobIndex: Schema.optional(Schema.Number),
-  blob: Schema.optional(Schema.Uint8ArrayFromSelf),
-  kzgCommitment: Schema.optional(B384),
-  kzgProof: Schema.optional(B384),
-  kzgCommitmentInclusionProof: Schema.optional(Schema.Array(B256)),
-  blobHash: Schema.optional(B256),
-  transactionIndex: Schema.optional(Schema.Number),
-  transactionHash: Schema.optional(B256),
+  filterIds: Schema.Array(Schema.Number),
+  blobIndex: Schema.Number,
+  blob: Schema.Uint8ArrayFromSelf,
+  kzgCommitment: B384,
+  kzgProof: B384,
+  kzgCommitmentInclusionProof: Schema.Array(B256),
+  blobHash: B256,
+  transactionIndex: Schema.Number,
+  transactionHash: B256,
 });
 
+export const Signature = Schema.Struct({
+  r: Schema.optional(U256),
+  s: Schema.optional(U256),
+  v: Schema.optional(U256),
+  YParity: Schema.optional(Schema.Boolean),
+});
+
+export type Signature = typeof Signature.Type;
+
 export const Transaction = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  transactionHash: Schema.optional(B256),
-  nonce: Schema.optional(Schema.BigIntFromSelf),
-  transactionIndex: Schema.optional(Schema.Number),
-  from: Schema.optional(Address),
+  filterIds: Schema.Array(Schema.Number),
+  transactionHash: B256,
+  nonce: Schema.BigIntFromSelf,
+  transactionIndex: Schema.Number,
+  from: Address,
   to: Schema.optional(Address),
-  value: Schema.optional(U256),
+  value: U256,
   gasPrice: Schema.optional(U128),
   gasLimit: Schema.optional(U128),
   maxFeePerGas: Schema.optional(U128),
   maxPriorityFeePerGas: Schema.optional(U128),
-  input: Schema.optional(Schema.Uint8ArrayFromSelf),
+  input: Schema.Uint8ArrayFromSelf,
   signature: Schema.optional(Signature),
   chainId: Schema.optional(Schema.BigIntFromSelf),
-  accessList: Schema.optional(Schema.Array(AccessListItem)),
-  transactionType: Schema.optional(Schema.BigIntFromSelf),
+  accessList: Schema.Array(AccessListItem),
+  transactionType: Schema.BigIntFromSelf,
   maxFeePerBlobGas: Schema.optional(U128),
-  blobVersionedHashes: Schema.optional(Schema.Array(B256)),
+  blobVersionedHashes: Schema.Array(B256),
 });
 
 export type Transaction = typeof Transaction.Type;
 
 export const Block = Schema.Struct({
-  header: Schema.optional(BlockHeader),
+  header: BlockHeader,
   validators: Schema.Array(Validator),
   blobs: Schema.Array(Blob),
   transactions: Schema.Array(Transaction),