@sentio/sdk 1.36.4 → 1.37.0-rc.2

package/src/builtin/internal/erc1155_processor.ts

@@ -18,6 +18,7 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  toBlockTag,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
 import { ERC1155, ERC1155__factory } from "./index";
@@ -219,7 +220,7 @@ export class ERC1155BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -240,7 +241,7 @@ export class ERC1155BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -261,7 +262,7 @@ export class ERC1155BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -281,7 +282,7 @@ export class ERC1155BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -301,7 +302,7 @@ export class ERC1155BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {

package/src/builtin/internal/erc20_processor.ts

@@ -18,6 +18,7 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  toBlockTag,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
 import { ERC20, ERC20__factory } from "./index";
@@ -286,7 +287,7 @@ export class ERC20BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -306,7 +307,7 @@ export class ERC20BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -323,7 +324,7 @@ export class ERC20BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -340,7 +341,7 @@ export class ERC20BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -357,7 +358,7 @@ export class ERC20BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -374,7 +375,7 @@ export class ERC20BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -391,7 +392,7 @@ export class ERC20BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -408,7 +409,7 @@ export class ERC20BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {

package/src/builtin/internal/erc20bytes_processor.ts

@@ -18,6 +18,7 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  toBlockTag,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
 import { ERC20Bytes, ERC20Bytes__factory } from "./index";
@@ -190,7 +191,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -207,7 +208,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -224,7 +225,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -244,7 +245,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -261,7 +262,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -282,7 +283,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {

package/src/builtin/internal/erc721_processor.ts

@@ -18,6 +18,7 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  toBlockTag,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
 import { ERC721, ERC721__factory } from "./index";
@@ -290,7 +291,7 @@ export class ERC721BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -310,7 +311,7 @@ export class ERC721BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -330,7 +331,7 @@ export class ERC721BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -351,7 +352,7 @@ export class ERC721BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -368,7 +369,7 @@ export class ERC721BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -388,7 +389,7 @@ export class ERC721BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -408,7 +409,7 @@ export class ERC721BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -425,7 +426,7 @@ export class ERC721BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -445,7 +446,7 @@ export class ERC721BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {

package/src/builtin/internal/weth9_processor.ts

@@ -18,6 +18,7 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  toBlockTag,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
 import { WETH9, WETH9__factory } from "./index";
@@ -199,7 +200,7 @@ export class WETH9BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -216,7 +217,7 @@ export class WETH9BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -233,7 +234,7 @@ export class WETH9BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -253,7 +254,7 @@ export class WETH9BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -270,7 +271,7 @@ export class WETH9BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -291,7 +292,7 @@ export class WETH9BoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {

package/src/builtin/solana/wormhole-processor.ts

@@ -1,8 +1,13 @@
 import { SolanaBaseProcessor, SolanaContext, SolanaBindOptions } from '@sentio/sdk'
 import { Instruction } from '@project-serum/anchor'
-import * as borsh from "@coral-xyz/borsh";
 import bs58 from 'bs58'
 
+import {
+  deserialize,
+  field,
+  vec, fixedArray, option,
+} from "@dao-xyz/borsh";
+
 // https://github.com/certusone/wormhole/blob/8818d4b8f0471095dd48fa6f5da9c315cbfc9b52/solana/modules/token_bridge/program/src/lib.rs#L100
 enum TokenBridgeInstruction {
   Initialize = 0,
@@ -20,30 +25,104 @@ enum TokenBridgeInstruction {
   TransferNativeWithPayload,
 }
 
+class TransferDataValues {
+  @field({ type: 'u32' })
+  nonce: number
+
+  @field({type: 'u64'})
+  amount: bigint
+
+  @field({type: 'u64'})
+  fee: bigint
+
+  @field({ type: fixedArray('u8', 32) })
+  target_address: number[];
+
+  @field({ type: 'u16' })
+  target_chain: number
+
+  constructor(data?: TransferDataValues)  {
+    if(data){
+      Object.assign(this,data)
+    }
+  }
+}
+
+class TransferNativeWithPayloadData {
+  @field({ type: 'u32' })
+  nonce: number
+
+  @field({type: 'u64'})
+  amount: bigint
+
+  @field({type: 'u64'})
+  fee: bigint
+
+  @field({ type: fixedArray('u8', 32) })
+  target_address: number[];
+
+  @field({ type: 'u16' })
+  target_chain: number
+
+  @field({ type: vec('u8') })
+  payload: number[];
+
+  @field({type: option(fixedArray('u8', 32) )})
+  cpi_program_id?: number[]
+
+  constructor(data?: TransferNativeWithPayloadData)  {
+    if(data){
+      Object.assign(this,data)
+    }
+  }
+}
+
+class AttestTokenValues {
+  @field({ type: 'u32' })
+  nonce: number
+
+  constructor(data?: AttestTokenValues)  {
+    if(data){
+      Object.assign(this,data)
+    }
+  }
+}
+
+class InitializeDataValues {
+  @field({type: fixedArray('u8', 32) })
+  bridge: number[]
+
+  constructor(data?: InitializeDataValues)  {
+    if(data){
+      Object.assign(this,data)
+    }
+  }
+}
+
 export class TokenBridgeProcessor extends SolanaBaseProcessor {
 
-  private readonly transferDataValues = [
-    borsh.u32('nonce'),
-    borsh.u64('amount'),
-    borsh.u64('fee'),
-    borsh.array(borsh.u8(undefined), 32, 'target_address'),
-    borsh.u16('target_chain')
-  ]
+  // private readonly transferDataValues = [
+  //   borsh.u32('nonce'),
+  //   borsh.u64('amount'),
+  //   borsh.u64('fee'),
+  //   borsh.array(borsh.u8(undefined), 32, 'target_address'),
+  //   borsh.u16('target_chain')
+  // ]
   // https://github.com/certusone/wormhole/blob/8818d4b8f0471095dd48fa6f5da9c315cbfc9b52/solana/modules/token_bridge/program/src/api/transfer_payload.rs#L170
-  private readonly transferDataWithPayloadValues = [
-    borsh.u32('nonce'),
-    borsh.u64('amount'),
-    borsh.array(borsh.u8(undefined), 32, 'target_address'),
-    borsh.u16('target_chain'),
-    borsh.vecU8('payload'),
-    borsh.option(borsh.publicKey(undefined), 'cpi_program_id')
-  ]
-  private readonly attestTokenValues = [
-    borsh.u32('nonce')
-  ]
-  private readonly initializeDataValues = [
-    borsh.publicKey('bridge')
-  ]
+  // private readonly transferDataWithPayloadValues = [
+  //   borsh.u32('nonce'),
+  //   borsh.u64('amount'),
+  //   borsh.array(borsh.u8(undefined), 32, 'target_address'),
+  //   borsh.u16('target_chain'),
+  //   borsh.vecU8('payload'),
+  //   borsh.option(borsh.publicKey(undefined), 'cpi_program_id')
+  // ]
+  // private readonly attestTokenValues = [
+  //   borsh.u32('nonce')
+  // ]
+  // private readonly initializeDataValues = [
+  //   borsh.publicKey('bridge')
+  // ]
 
   static bind(options: SolanaBindOptions): TokenBridgeProcessor {
     if (options && !options.name) {
@@ -67,39 +146,51 @@ export class TokenBridgeProcessor extends SolanaBaseProcessor {
           name: TokenBridgeInstruction[TokenBridgeInstruction.Initialize]
         }
       case TokenBridgeInstruction.TransferNative:
+        data = deserialize(Buffer.from(u8Arr.slice(1)), TransferDataValues)
+
         // struct is defined at: https://github.com/certusone/wormhole/blob/8818d4b8f0471095dd48fa6f5da9c315cbfc9b52/solana/modules/token_bridge/program/src/api/transfer.rs#L295
-        data = borsh.struct(this.transferDataValues, 'TransferNativeData').decode(Buffer.from(u8Arr.slice(1)))
+        // data = borsh.struct(this.transferDataValues, 'TransferNativeData').decode(Buffer.from(u8Arr.slice(1)))
         return {
           data,
           name: TokenBridgeInstruction[TokenBridgeInstruction.TransferNative]
         }
       case TokenBridgeInstruction.TransferWrapped:
+        data = deserialize(Buffer.from(u8Arr.slice(1)), TransferDataValues)
+
         // stuct is defined at: https://github.com/certusone/wormhole/blob/8818d4b8f0471095dd48fa6f5da9c315cbfc9b52/solana/modules/token_bridge/program/src/api/transfer.rs#L295
-        data = borsh.struct(this.transferDataValues, 'TransferWrappedData').decode(Buffer.from(u8Arr.slice(1)))
+        // data = borsh.struct(this.transferDataValues, 'TransferWrappedData').decode(Buffer.from(u8Arr.slice(1)))
         return {
           data,
           name: TokenBridgeInstruction[TokenBridgeInstruction.TransferWrapped]
         }
       case TokenBridgeInstruction.TransferNativeWithPayload:
-        data = borsh.struct(this.transferDataWithPayloadValues, 'TransferNativeWithPayloadData').decode(Buffer.from(u8Arr.slice(1)))
+        data = deserialize(Buffer.from(u8Arr.slice(1)), TransferNativeWithPayloadData)
+
+        // data = borsh.struct(this.transferDataWithPayloadValues, 'TransferNativeWithPayloadData').decode(Buffer.from(u8Arr.slice(1)))
         return {
           data,
           name: TokenBridgeInstruction[TokenBridgeInstruction.TransferNativeWithPayload]
         }
       case TokenBridgeInstruction.TransferWrappedWithPayload:
-        data = borsh.struct(this.transferDataWithPayloadValues, 'TransferWrappedWithPayloadData').decode(Buffer.from(u8Arr.slice(1)))
+        data = deserialize(Buffer.from(u8Arr.slice(1)), TransferNativeWithPayloadData)
+
+        // data = borsh.struct(this.transferDataWithPayloadValues, 'TransferWrappedWithPayloadData').decode(Buffer.from(u8Arr.slice(1)))
         return {
           data,
           name: TokenBridgeInstruction[TokenBridgeInstruction.TransferWrappedWithPayload]
         }
       case TokenBridgeInstruction.Initialize:
-        data = borsh.struct(this.initializeDataValues, 'InitializeData').decode(Buffer.from(u8Arr.slice(1)))
+        data = deserialize(Buffer.from(u8Arr.slice(1)), InitializeDataValues)
+
+        // data = borsh.struct(this.initializeDataValues, 'InitializeData').decode(Buffer.from(u8Arr.slice(1)))
         return {
           data,
           name: TokenBridgeInstruction[TokenBridgeInstruction.Initialize]
         }
       case TokenBridgeInstruction.AttestToken:
-        data = borsh.struct(this.attestTokenValues, 'AttestTokenData').decode(Buffer.from(u8Arr.slice(1)))
+        data = deserialize(Buffer.from(u8Arr.slice(1)), AttestTokenValues)
+
+        // data = borsh.struct(this.attestTokenValues, 'AttestTokenData').decode(Buffer.from(u8Arr.slice(1)))
         return {
           data,
           name: TokenBridgeInstruction[TokenBridgeInstruction.AttestToken]

package/src/core/account-processor.ts

@@ -1,4 +1,4 @@
-import { ListStateStorage } from '../state/state-storage'
+import { ListStateStorage } from '@sentio/base'
 import { ERC20__factory, ERC721__factory } from '../builtin/internal'
 import { AddressType, DummyProvider, ProcessResult } from '@sentio/sdk'
 import { AccountBindOptions } from './bind-options'

package/src/core/base-context.ts

@@ -1,4 +1,4 @@
-import { ProcessResult, RecordMetaData } from '../gen'
+import { ProcessResult, RecordMetaData } from '@sentio/protos'
 import { Logger } from './logger'
 import { Labels } from './metadata'
 import { Meter } from './meter'

package/src/core/base-processor-template.ts

@@ -4,12 +4,11 @@ import { BaseContract, EventFilter } from 'ethers'
 import { Event } from '@ethersproject/contracts'
 import { BaseProcessor } from './base-processor'
 import { BindOptions, getOptionsSignature } from './bind-options'
-import { HandleInterval, TemplateInstance } from '../gen'
-import Long from 'long'
+import { HandleInterval, TemplateInstance } from '@sentio/protos'
 import { getNetwork } from '@ethersproject/providers'
 import { PromiseOrVoid } from '../promise-or-void'
 import { Trace } from './trace'
-import { ListStateStorage } from '../state/state-storage'
+import { ListStateStorage } from '@sentio/base'
 
 export class ProcessorTemplateProcessorState extends ListStateStorage<
   BaseProcessorTemplate<BaseContract, BoundContractView<BaseContract, any>>
@@ -70,22 +69,14 @@ export abstract class BaseProcessorTemplate<
         chainId: options.network ? getNetwork(options.network).chainId.toString() : '1',
         abi: '',
       },
-      startBlock: Long.ZERO,
-      endBlock: Long.ZERO,
+      startBlock: 0n,
+      endBlock: 0n,
     }
     if (options.startBlock) {
-      if (typeof options.startBlock === 'number') {
-        instance.startBlock = Long.fromNumber(options.startBlock)
-      } else {
-        instance.startBlock = options.startBlock
-      }
+      instance.startBlock = BigInt(options.startBlock)
     }
     if (options.endBlock) {
-      if (typeof options.endBlock === 'number') {
-        instance.endBlock = Long.fromNumber(options.endBlock)
-      } else {
-        instance.endBlock = options.endBlock
-      }
+      instance.endBlock = BigInt(options.endBlock)
     }
     TemplateInstanceState.INSTANCE.addValue(instance)
     return processor

package/src/core/base-processor.ts

@@ -1,10 +1,9 @@
 import { BytesLike } from '@ethersproject/bytes'
 import { Block, Log, getNetwork } from '@ethersproject/providers'
 import { BaseContract, Event, EventFilter } from '@ethersproject/contracts'
-import Long from 'long'
 
 import { BoundContractView, ContractContext, ContractView } from './context'
-import { AddressType, HandleInterval, ProcessResult } from '../gen'
+import { AddressType, HandleInterval, ProcessResult } from '@sentio/protos'
 import { BindInternalOptions, BindOptions } from './bind-options'
 import { PromiseOrVoid } from '../promise-or-void'
 import { Trace } from './trace'
@@ -44,21 +43,13 @@ export abstract class BaseProcessor<
       address: config.address,
       name: config.name || '',
       network: config.network ? config.network : 1,
-      startBlock: new Long(0),
+      startBlock: 0n,
     }
     if (config.startBlock) {
-      if (typeof config.startBlock === 'number') {
-        this.config.startBlock = Long.fromNumber(config.startBlock)
-      } else {
-        this.config.startBlock = config.startBlock
-      }
+      this.config.startBlock = BigInt(config.startBlock)
     }
     if (config.endBlock) {
-      if (typeof config.endBlock === 'number') {
-        this.config.endBlock = Long.fromNumber(config.endBlock)
-      } else {
-        this.config.endBlock = config.endBlock
-      }
+      this.config.endBlock = BigInt(config.endBlock)
     }
   }
 

package/src/core/bind-options.ts

@@ -1,5 +1,4 @@
 import { Networkish } from '@ethersproject/networks'
-import Long from 'long'
 import { getNetwork } from '@ethersproject/providers'
 
 export class BindOptions {
@@ -9,8 +8,8 @@ export class BindOptions {
   network?: Networkish = 1
   // Optional, override default contract name
   name?: string
-  startBlock?: Long | number
-  endBlock?: Long | number
+  startBlock?: bigint | number
+  endBlock?: bigint | number
 }
 
 export function getOptionsSignature(opts: BindOptions): string {
@@ -34,12 +33,12 @@ export class BindInternalOptions {
   address: string
   network: Networkish
   name: string
-  startBlock: Long
-  endBlock?: Long
+  startBlock: bigint
+  endBlock?: bigint
 }
 
 export class AccountBindOptions {
   address: string
   network?: Networkish
-  startBlock?: Long | number
+  startBlock?: bigint | number
 }