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

package/dist/index.mjs

@@ -1931,7 +1931,8 @@ function createBaseLog() {
     data: new Uint8Array(0),
     transactionIndex: 0,
     transactionHash: void 0,
-    transactionStatus: 0
+    transactionStatus: 0,
+    logIndexInTransaction: 0
   };
 }
 const Log$1 = {
@@ -1966,6 +1967,9 @@ const Log$1 = {
     if (message.transactionStatus !== void 0 && message.transactionStatus !== 0) {
       writer.uint32(64).int32(message.transactionStatus);
     }
+    if (message.logIndexInTransaction !== void 0 && message.logIndexInTransaction !== 0) {
+      writer.uint32(72).uint32(message.logIndexInTransaction);
+    }
     return writer;
   },
   decode(input, length) {
@@ -2030,6 +2034,12 @@ const Log$1 = {
           }
           message.transactionStatus = reader.int32();
           continue;
+        case 9:
+          if (tag !== 72) {
+            break;
+          }
+          message.logIndexInTransaction = reader.uint32();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -2047,7 +2057,8 @@ const Log$1 = {
       data: isSet$1(object.data) ? bytesFromBase64(object.data) : new Uint8Array(0),
       transactionIndex: isSet$1(object.transactionIndex) ? globalThis.Number(object.transactionIndex) : 0,
       transactionHash: isSet$1(object.transactionHash) ? B256.fromJSON(object.transactionHash) : void 0,
-      transactionStatus: isSet$1(object.transactionStatus) ? transactionStatusFromJSON(object.transactionStatus) : 0
+      transactionStatus: isSet$1(object.transactionStatus) ? transactionStatusFromJSON(object.transactionStatus) : 0,
+      logIndexInTransaction: isSet$1(object.logIndexInTransaction) ? globalThis.Number(object.logIndexInTransaction) : 0
     };
   },
   toJSON(message) {
@@ -2076,6 +2087,9 @@ const Log$1 = {
     if (message.transactionStatus !== void 0 && message.transactionStatus !== 0) {
       obj.transactionStatus = transactionStatusToJSON(message.transactionStatus);
     }
+    if (message.logIndexInTransaction !== void 0 && message.logIndexInTransaction !== 0) {
+      obj.logIndexInTransaction = Math.round(message.logIndexInTransaction);
+    }
     return obj;
   },
   create(base) {
@@ -2091,6 +2105,7 @@ const Log$1 = {
     message.transactionIndex = object.transactionIndex ?? 0;
     message.transactionHash = object.transactionHash !== void 0 && object.transactionHash !== null ? B256.fromPartial(object.transactionHash) : void 0;
     message.transactionStatus = object.transactionStatus ?? 0;
+    message.logIndexInTransaction = object.logIndexInTransaction ?? 0;
     return message;
   }
 };
@@ -3009,18 +3024,18 @@ const TransactionStatus = Schema.transform(
 );
 const BlockHeader = Schema.Struct({
   blockNumber: Schema.BigIntFromSelf,
-  blockHash: Schema.optional(B256$1),
-  parentBlockHash: Schema.optional(B256$1),
-  unclesHash: Schema.optional(B256$1),
-  miner: Schema.optional(Address$1),
-  stateRoot: Schema.optional(B256$1),
-  transactionsRoot: Schema.optional(B256$1),
-  receiptsRoot: Schema.optional(B256$1),
-  logsBloom: Schema.optional(Bloom),
-  difficulty: Schema.optional(U256$1),
-  gasLimit: Schema.optional(U128$1),
-  gasUsed: Schema.optional(U128$1),
-  timestamp: Schema.optional(Schema.DateFromSelf),
+  blockHash: B256$1,
+  parentBlockHash: B256$1,
+  unclesHash: B256$1,
+  miner: Address$1,
+  stateRoot: B256$1,
+  transactionsRoot: B256$1,
+  receiptsRoot: B256$1,
+  logsBloom: Bloom,
+  difficulty: U256$1,
+  gasLimit: U128$1,
+  gasUsed: U128$1,
+  timestamp: Schema.DateFromSelf,
   extraData: BytesFromUint8Array,
   mixHash: Schema.optional(B256$1),
   nonce: Schema.optional(Schema.BigIntFromSelf),
@@ -3032,72 +3047,73 @@ const BlockHeader = Schema.Struct({
   parentBeaconBlockRoot: Schema.optional(B256$1)
 });
 const Withdrawal = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
+  filterIds: Schema.Array(Schema.Number),
   withdrawalIndex: Schema.Number,
   index: Schema.BigIntFromSelf,
   validatorIndex: Schema.Number,
-  address: Schema.optional(Address$1),
-  amount: Schema.optional(Schema.BigIntFromSelf)
+  address: Address$1,
+  amount: Schema.BigIntFromSelf
 });
 const AccessListItem = Schema.Struct({
-  address: Schema.optional(Address$1),
+  address: Address$1,
   storageKeys: Schema.Array(B256$1)
 });
 const Signature = Schema.Struct({
-  r: Schema.optional(U256$1),
-  s: Schema.optional(U256$1),
-  v: Schema.optional(U256$1),
+  r: U256$1,
+  s: U256$1,
+  v: U256$1,
   YParity: Schema.optional(Schema.Boolean)
 });
 const Transaction = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
+  filterIds: Schema.Array(Schema.Number),
   transactionIndex: Schema.Number,
-  transactionHash: Schema.optional(B256$1),
-  nonce: Schema.optional(Schema.BigIntFromSelf),
-  from: Schema.optional(Address$1),
+  transactionHash: B256$1,
+  nonce: Schema.BigIntFromSelf,
+  from: Address$1,
   to: Schema.optional(Address$1),
-  value: Schema.optional(U256$1),
+  value: U256$1,
   gasPrice: Schema.optional(U128$1),
-  gas: Schema.optional(U128$1),
+  gas: U128$1,
   maxFeePerGas: Schema.optional(U128$1),
   maxPriorityFeePerGas: Schema.optional(U128$1),
   input: BytesFromUint8Array,
   signature: Schema.optional(Signature),
   chainId: Schema.optional(Schema.BigIntFromSelf),
   accessList: Schema.Array(AccessListItem),
-  transactionType: Schema.optional(Schema.BigIntFromSelf),
+  transactionType: Schema.BigIntFromSelf,
   maxFeePerBlobGas: Schema.optional(U128$1),
   blobVersionedHashes: Schema.Array(B256$1),
-  transactionStatus: Schema.optional(TransactionStatus)
+  transactionStatus: TransactionStatus
 });
 const TransactionReceipt = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  transactionIndex: Schema.optional(Schema.Number),
-  transactionHash: Schema.optional(B256$1),
-  cumulativeGasUsed: Schema.optional(U128$1),
-  gasUsed: Schema.optional(U128$1),
-  effectiveGasPrice: Schema.optional(U128$1),
-  from: Schema.optional(Address$1),
+  filterIds: Schema.Array(Schema.Number),
+  transactionIndex: Schema.Number,
+  transactionHash: B256$1,
+  cumulativeGasUsed: U128$1,
+  gasUsed: U128$1,
+  effectiveGasPrice: U128$1,
+  from: Address$1,
   to: Schema.optional(Address$1),
   contractAddress: Schema.optional(Address$1),
-  logsBloom: Schema.optional(Bloom),
-  transactionType: Schema.optional(Schema.BigIntFromSelf),
+  logsBloom: Bloom,
+  transactionType: Schema.BigIntFromSelf,
   blobGasUsed: Schema.optional(U128$1),
   blobGasPrice: Schema.optional(U128$1),
-  transactionStatus: Schema.optional(TransactionStatus)
+  transactionStatus: TransactionStatus
 });
 const Log = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  address: Schema.optional(Address$1),
+  filterIds: Schema.Array(Schema.Number),
+  address: Address$1,
   topics: Schema.Array(B256$1),
   data: BytesFromUint8Array,
   logIndex: Schema.Number,
+  logIndexInTransaction: Schema.Number,
   transactionIndex: Schema.Number,
-  transactionHash: Schema.optional(B256$1),
-  transactionStatus: Schema.optional(TransactionStatus)
+  transactionHash: B256$1,
+  transactionStatus: TransactionStatus
 });
 const Block = Schema.Struct({
-  header: Schema.optional(BlockHeader),
+  header: BlockHeader,
   withdrawals: Schema.Array(Withdrawal),
   transactions: Schema.Array(Transaction),
   receipts: Schema.Array(TransactionReceipt),

package/package.json

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

package/src/block.ts

@@ -44,18 +44,18 @@ export type TransactionStatus = typeof TransactionStatus.Type;
 
 export const BlockHeader = Schema.Struct({
   blockNumber: Schema.BigIntFromSelf,
-  blockHash: Schema.optional(B256),
-  parentBlockHash: Schema.optional(B256),
-  unclesHash: Schema.optional(B256),
-  miner: Schema.optional(Address),
-  stateRoot: Schema.optional(B256),
-  transactionsRoot: Schema.optional(B256),
-  receiptsRoot: Schema.optional(B256),
-  logsBloom: Schema.optional(Bloom),
-  difficulty: Schema.optional(U256),
-  gasLimit: Schema.optional(U128),
-  gasUsed: Schema.optional(U128),
-  timestamp: Schema.optional(Schema.DateFromSelf),
+  blockHash: B256,
+  parentBlockHash: B256,
+  unclesHash: B256,
+  miner: Address,
+  stateRoot: B256,
+  transactionsRoot: B256,
+  receiptsRoot: B256,
+  logsBloom: Bloom,
+  difficulty: U256,
+  gasLimit: U128,
+  gasUsed: U128,
+  timestamp: Schema.DateFromSelf,
   extraData: BytesFromUint8Array,
   mixHash: Schema.optional(B256),
   nonce: Schema.optional(Schema.BigIntFromSelf),
@@ -70,80 +70,81 @@ export const BlockHeader = Schema.Struct({
 export type BlockHeader = typeof BlockHeader.Type;
 
 export const Withdrawal = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
+  filterIds: Schema.Array(Schema.Number),
   withdrawalIndex: Schema.Number,
   index: Schema.BigIntFromSelf,
   validatorIndex: Schema.Number,
-  address: Schema.optional(Address),
-  amount: Schema.optional(Schema.BigIntFromSelf),
+  address: Address,
+  amount: Schema.BigIntFromSelf,
 });
 
 export const AccessListItem = Schema.Struct({
-  address: Schema.optional(Address),
+  address: Address,
   storageKeys: Schema.Array(B256),
 });
 
 export const Signature = Schema.Struct({
-  r: Schema.optional(U256),
-  s: Schema.optional(U256),
-  v: Schema.optional(U256),
+  r: U256,
+  s: U256,
+  v: U256,
   YParity: Schema.optional(Schema.Boolean),
 });
 
 export const Transaction = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
+  filterIds: Schema.Array(Schema.Number),
   transactionIndex: Schema.Number,
-  transactionHash: Schema.optional(B256),
-  nonce: Schema.optional(Schema.BigIntFromSelf),
-  from: Schema.optional(Address),
+  transactionHash: B256,
+  nonce: Schema.BigIntFromSelf,
+  from: Address,
   to: Schema.optional(Address),
-  value: Schema.optional(U256),
+  value: U256,
   gasPrice: Schema.optional(U128),
-  gas: Schema.optional(U128),
+  gas: U128,
   maxFeePerGas: Schema.optional(U128),
   maxPriorityFeePerGas: Schema.optional(U128),
   input: BytesFromUint8Array,
   signature: Schema.optional(Signature),
   chainId: Schema.optional(Schema.BigIntFromSelf),
   accessList: Schema.Array(AccessListItem),
-  transactionType: Schema.optional(Schema.BigIntFromSelf),
+  transactionType: Schema.BigIntFromSelf,
   maxFeePerBlobGas: Schema.optional(U128),
   blobVersionedHashes: Schema.Array(B256),
-  transactionStatus: Schema.optional(TransactionStatus),
+  transactionStatus: TransactionStatus,
 });
 
 export const TransactionReceipt = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  transactionIndex: Schema.optional(Schema.Number),
-  transactionHash: Schema.optional(B256),
-  cumulativeGasUsed: Schema.optional(U128),
-  gasUsed: Schema.optional(U128),
-  effectiveGasPrice: Schema.optional(U128),
-  from: Schema.optional(Address),
+  filterIds: Schema.Array(Schema.Number),
+  transactionIndex: Schema.Number,
+  transactionHash: B256,
+  cumulativeGasUsed: U128,
+  gasUsed: U128,
+  effectiveGasPrice: U128,
+  from: Address,
   to: Schema.optional(Address),
   contractAddress: Schema.optional(Address),
-  logsBloom: Schema.optional(Bloom),
-  transactionType: Schema.optional(Schema.BigIntFromSelf),
+  logsBloom: Bloom,
+  transactionType: Schema.BigIntFromSelf,
   blobGasUsed: Schema.optional(U128),
   blobGasPrice: Schema.optional(U128),
-  transactionStatus: Schema.optional(TransactionStatus),
+  transactionStatus: TransactionStatus,
 });
 
 export const Log = Schema.Struct({
-  filterIds: Schema.optional(Schema.Array(Schema.Number)),
-  address: Schema.optional(Address),
+  filterIds: Schema.Array(Schema.Number),
+  address: Address,
   topics: Schema.Array(B256),
   data: BytesFromUint8Array,
   logIndex: Schema.Number,
+  logIndexInTransaction: Schema.Number,
   transactionIndex: Schema.Number,
-  transactionHash: Schema.optional(B256),
-  transactionStatus: Schema.optional(TransactionStatus),
+  transactionHash: B256,
+  transactionStatus: TransactionStatus,
 });
 
 export type Log = typeof Log.Type;
 
 export const Block = Schema.Struct({
-  header: Schema.optional(BlockHeader),
+  header: BlockHeader,
   withdrawals: Schema.Array(Withdrawal),
   transactions: Schema.Array(Transaction),
   receipts: Schema.Array(TransactionReceipt),

package/src/proto/data.ts

@@ -351,7 +351,11 @@ export interface Log {
     | B256
     | undefined;
   /** The transaction status. */
-  readonly transactionStatus?: TransactionStatus | undefined;
+  readonly transactionStatus?:
+    | TransactionStatus
+    | undefined;
+  /** Index of the log in the transaction. */
+  readonly logIndexInTransaction?: number | undefined;
 }
 
 export interface Signature {
@@ -1830,6 +1834,7 @@ function createBaseLog(): Log {
     transactionIndex: 0,
     transactionHash: undefined,
     transactionStatus: 0,
+    logIndexInTransaction: 0,
   };
 }
 
@@ -1865,6 +1870,9 @@ export const Log = {
     if (message.transactionStatus !== undefined && message.transactionStatus !== 0) {
       writer.uint32(64).int32(message.transactionStatus);
     }
+    if (message.logIndexInTransaction !== undefined && message.logIndexInTransaction !== 0) {
+      writer.uint32(72).uint32(message.logIndexInTransaction);
+    }
     return writer;
   },
 
@@ -1941,6 +1949,13 @@ export const Log = {
 
           message.transactionStatus = reader.int32() as any;
           continue;
+        case 9:
+          if (tag !== 72) {
+            break;
+          }
+
+          message.logIndexInTransaction = reader.uint32();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1962,6 +1977,7 @@ export const Log = {
       transactionIndex: isSet(object.transactionIndex) ? globalThis.Number(object.transactionIndex) : 0,
       transactionHash: isSet(object.transactionHash) ? B256.fromJSON(object.transactionHash) : undefined,
       transactionStatus: isSet(object.transactionStatus) ? transactionStatusFromJSON(object.transactionStatus) : 0,
+      logIndexInTransaction: isSet(object.logIndexInTransaction) ? globalThis.Number(object.logIndexInTransaction) : 0,
     };
   },
 
@@ -1991,6 +2007,9 @@ export const Log = {
     if (message.transactionStatus !== undefined && message.transactionStatus !== 0) {
       obj.transactionStatus = transactionStatusToJSON(message.transactionStatus);
     }
+    if (message.logIndexInTransaction !== undefined && message.logIndexInTransaction !== 0) {
+      obj.logIndexInTransaction = Math.round(message.logIndexInTransaction);
+    }
     return obj;
   },
 
@@ -2011,6 +2030,7 @@ export const Log = {
       ? B256.fromPartial(object.transactionHash)
       : undefined;
     message.transactionStatus = object.transactionStatus ?? 0;
+    message.logIndexInTransaction = object.logIndexInTransaction ?? 0;
     return message;
   },
 };