@sentio/sdk 1.36.4 → 1.37.0-rc.1

package/src/aptos/context.ts

@@ -1,5 +1,4 @@
-import Long from 'long'
-import { RecordMetaData } from '../gen'
+import { RecordMetaData } from '@sentio/protos'
 import { Labels } from '../core/metadata'
 import { normalizeLabels } from '../core/meter'
 import { BaseContext } from '../core/base-context'
@@ -34,7 +33,7 @@ export class AptosContext extends BaseContext {
     return {
       address: this.address,
       contractName: this.moduleName,
-      blockNumber: Long.fromString(this.version.toString()),
+      blockNumber: this.version,
       transactionIndex: 0,
       transactionHash: this.transaction?.hash || '', // TODO
       logIndex: 0,
@@ -63,7 +62,7 @@ export class AptosResourceContext extends BaseContext {
     return {
       address: this.address,
       contractName: 'resources',
-      blockNumber: Long.fromString(this.version.toString()),
+      blockNumber: this.version,
       transactionIndex: 0,
       transactionHash: '',
       logIndex: 0,

package/src/binds.ts

@@ -3,7 +3,7 @@ import { BaseProcessor, ContractView } from './core'
 import { Networkish } from '@ethersproject/networks'
 import { getNetwork } from '@ethersproject/providers'
 import { BaseContract } from 'ethers'
-import { MapStateStorage } from './state/state-storage'
+import { MapStateStorage } from '@sentio/base'
 
 export class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {
   static INSTANCE = new ProcessorState()

package/src/builtin/internal/eacaggregatorproxy_processor.ts

@@ -18,6 +18,7 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  toBlockTag,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
 import { EACAggregatorProxy, EACAggregatorProxy__factory } from "./index";
@@ -472,7 +473,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -489,7 +490,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -506,7 +507,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -523,7 +524,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -543,7 +544,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -571,7 +572,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -591,7 +592,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -608,7 +609,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -625,7 +626,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -652,7 +653,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -669,7 +670,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -686,7 +687,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -706,7 +707,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -723,7 +724,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -740,7 +741,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -768,7 +769,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -795,7 +796,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {
@@ -812,7 +813,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         };
       }
       if (overrides) {

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/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
 }