@sentio/sdk 1.36.4-rc.1 → 1.37.0-rc.1

package/src/core/context.ts

@@ -1,8 +1,7 @@
-import { RecordMetaData, ProcessResult } from '../gen'
+import { RecordMetaData } from '@sentio/protos'
 import { BaseContract, EventFilter } from 'ethers'
 import { Block, Log } from '@ethersproject/abstract-provider'
 import { normalizeLabels } from './meter'
-import Long from 'long'
 import { Trace } from './trace'
 import { Labels } from './metadata'
 import { CHAIN_IDS } from '../utils/chain'
@@ -14,7 +13,7 @@ export abstract class EthContext extends BaseContext {
   log?: Log
   block?: Block
   trace?: Trace
-  blockNumber: Long
+  blockNumber: bigint | number
   transactionHash?: string
 
   protected constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace) {
@@ -25,12 +24,12 @@ export abstract class EthContext extends BaseContext {
     this.trace = trace
     this.address = address
     if (log) {
-      this.blockNumber = Long.fromNumber(log.blockNumber, true)
+      this.blockNumber = log.blockNumber
       this.transactionHash = log.transactionHash
     } else if (block) {
-      this.blockNumber = Long.fromNumber(block.number, true)
+      this.blockNumber = block.number
     } else if (trace) {
-      this.blockNumber = Long.fromNumber(trace.blockNumber, true)
+      this.blockNumber = trace.blockNumber
       this.transactionHash = trace.transactionHash
     }
   }
@@ -42,7 +41,7 @@ export abstract class EthContext extends BaseContext {
       return {
         address: this.address,
         contractName: this.getContractName(),
-        blockNumber: this.blockNumber,
+        blockNumber: BigInt(this.blockNumber),
         transactionIndex: this.log.transactionIndex,
         transactionHash: this.transactionHash || '',
         logIndex: this.log.logIndex,
@@ -55,7 +54,7 @@ export abstract class EthContext extends BaseContext {
       return {
         address: this.address,
         contractName: this.getContractName(),
-        blockNumber: this.blockNumber,
+        blockNumber: BigInt(this.blockNumber),
         transactionIndex: -1,
         transactionHash: '',
         logIndex: -1,
@@ -68,7 +67,7 @@ export abstract class EthContext extends BaseContext {
       return {
         address: this.address,
         contractName: this.getContractName(),
-        blockNumber: this.blockNumber,
+        blockNumber: BigInt(this.blockNumber),
         transactionIndex: this.trace.transactionPosition,
         transactionHash: this.transactionHash || '',
         logIndex: -1,
@@ -159,9 +158,9 @@ export class BoundContractView<TContract extends BaseContract, TContractView ext
 export class SuiContext extends BaseContext {
   address: string
   moduleName: string
-  blockNumber: Long
+  blockNumber: bigint
 
-  constructor(address: string, slot: Long) {
+  constructor(address: string, slot: bigint) {
     super()
     this.address = address
     this.blockNumber = slot

package/src/core/eth-plugin.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginManager } from '../plugin'
+import { Plugin, PluginManager } from '@sentio/base'
 import {
   AccountConfig,
   ContractConfig,
@@ -8,7 +8,7 @@ import {
   LogHandlerConfig,
   ProcessConfigResponse,
   ProcessResult,
-} from '../gen/processor/protos/processor'
+} from '@sentio/protos'
 import { DEFAULT_MAX_BLOCK, errorString, mergeProcessResults, USER_PROCESSOR, Utf8ArrayToStr } from '../service'
 
 import { ServerError, Status } from 'nice-grpc'
@@ -16,7 +16,6 @@ import { Block, Log } from '@ethersproject/abstract-provider'
 import { Trace } from '@sentio/sdk'
 import { ProcessorState } from '../binds'
 import { AccountProcessorState } from './account-processor'
-import Long from 'long'
 
 export class EthPlugin implements Plugin {
   name: string = 'EthPlugin'
@@ -118,7 +117,7 @@ export class EthPlugin implements Plugin {
       const accountConfig: AccountConfig = {
         address: processor.config.address,
         chainId: processor.getChainId().toString(),
-        startBlock: processor.config.startBlock ? Long.fromValue(processor.config.startBlock) : Long.ZERO,
+        startBlock: processor.config.startBlock ? BigInt(processor.config.startBlock) : 0n,
         aptosIntervalConfigs: [],
         intervalConfigs: [],
         logConfigs: [],

package/src/core/event-tracker.ts

@@ -1,7 +1,7 @@
 import { BaseContext } from './base-context'
-import { EventTrackingResult } from '../gen'
+import { EventTrackingResult } from '@sentio/protos'
 import { NamedResultDescriptor } from './metadata'
-import { MapStateStorage } from '../state/state-storage'
+import { MapStateStorage } from '@sentio/base'
 
 export interface Event {
   // The unique identifier of main identity associate with an event

package/src/core/exporter.ts

@@ -1,7 +1,7 @@
 import { BaseContext } from './base-context'
 import { ExportResult } from '@sentio/sdk'
 import { NamedResultDescriptor } from './metadata'
-import { MapStateStorage } from '../state/state-storage'
+import { MapStateStorage } from '@sentio/base'
 
 export type Export = Record<string, any>
 

package/src/core/index.ts

@@ -2,7 +2,7 @@ export { BigDecimal } from './big-decimal'
 export { ContractContext, ContractView, BoundContractView } from './context'
 export { CounterBinding, Meter, GaugeBinding, Counter, Gauge, MetricOptions } from './meter'
 export { EventTracker, AccountEventTracker } from './event-tracker'
-export { type Numberish, toBigInteger, toMetricValue } from './numberish'
+export { type Numberish, toBigInteger, toMetricValue, toBlockTag } from './numberish'
 
 export { BindOptions } from './bind-options'
 

package/src/core/logger.ts

@@ -1,5 +1,5 @@
 import { BaseContext } from './base-context'
-import { LogLevel } from '../gen'
+import { LogLevel } from '@sentio/protos'
 import { NamedResultDescriptor } from './metadata'
 
 export type Attributes = Record<string, any>

package/src/core/meter.ts

@@ -1,8 +1,8 @@
 import { BaseContext } from './base-context'
 import { Numberish, toMetricValue } from './numberish'
 import { Labels, NamedResultDescriptor } from './metadata'
-import { AggregationConfig, AggregationType, MetricConfig, MetricType } from '../gen'
-import { MapStateStorage } from '../state/state-storage'
+import { AggregationConfig, AggregationType, MetricConfig, MetricType } from '@sentio/protos'
+import { MapStateStorage } from '@sentio/base'
 
 export function normalizeName(name: string): string {
   const regex = new RegExp('![_.a-zA-Z0-9]')

package/src/core/numberish.ts

@@ -1,11 +1,21 @@
 import { BigNumber } from 'ethers'
-import { BigInteger, MetricValue } from '../gen'
+import { BigInteger, MetricValue } from '@sentio/protos'
 import { BigDecimal } from '.'
 import { BN } from '@project-serum/anchor'
-import Long from 'long'
+import { BlockTag } from '@ethersproject/providers'
 
 export type Numberish = number | BigNumber | bigint | BigDecimal
 
+export function toBlockTag(a: number | bigint): BlockTag {
+  if (typeof a === 'number') {
+    return a
+  }
+  if (a > Number.MAX_SAFE_INTEGER) {
+    return '0x' + a.toString(16)
+  }
+  return Number(a)
+}
+
 export function toMetricValue(value: Numberish): MetricValue {
   if (value instanceof BigNumber) {
     return MetricValue.fromPartial({
@@ -115,7 +125,3 @@ function hexToBigInteger(hex: string, negative: boolean): BigInteger {
     data: new Uint8Array(buffer),
   }
 }
-
-export function toBigInt(v: Long): bigint {
-  return BigInt(v.toString())
-}

package/src/core/solana-context.ts

@@ -1,5 +1,4 @@
 import { BaseContext } from './base-context'
-import Long from 'long'
 import { Labels } from './metadata'
 import { RecordMetaData } from '@sentio/sdk'
 import { CHAIN_IDS } from '../utils/chain'
@@ -9,9 +8,9 @@ export class SolanaContext extends BaseContext {
   network: string
   address: string
   programName: string
-  blockNumber: Long
+  blockNumber: bigint
 
-  constructor(programName: string, network: string, address: string, slot: Long) {
+  constructor(programName: string, network: string, address: string, slot: bigint) {
     super()
     this.network = network || CHAIN_IDS.SOLANA_MAINNET
     this.programName = programName

package/src/core/solana-options.ts

@@ -1,10 +1,8 @@
-import Long from 'long'
-
 export class SolanaBindOptions {
   address: string
   network?: string
   name?: string
-  startBlock?: Long | number
-  endBlock?: Long | number
+  startBlock?: bigint | number
+  endBlock?: bigint | number
   processInnerInstruction?: boolean
 }

package/src/core/solana-plugin.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginManager } from '../plugin'
+import { Plugin, PluginManager } from '@sentio/base'
 import {
   ContractConfig,
   Data_SolInstruction,
@@ -6,8 +6,8 @@ import {
   HandlerType,
   ProcessConfigResponse,
   ProcessResult,
-} from '../gen/processor/protos/processor'
-import { DEFAULT_MAX_BLOCK, errorString, mergeProcessResults, USER_PROCESSOR, Utf8ArrayToStr } from '../service'
+} from '@sentio/protos'
+import { DEFAULT_MAX_BLOCK, mergeProcessResults, USER_PROCESSOR } from '../service'
 
 import { ServerError, Status } from 'nice-grpc'
 

package/src/core/solana-processor.ts

@@ -1,14 +1,13 @@
-import { ProcessResult } from '../gen'
+import { ProcessResult } from '@sentio/protos'
 import { SolanaContext } from './solana-context'
-import Long from 'long'
 import { Instruction } from '@project-serum/anchor'
 import { SolanaBindOptions } from './solana-options'
-import { ListStateStorage } from '../state/state-storage'
+import { ListStateStorage } from '@sentio/base'
 import { CHAIN_IDS } from '../utils/chain'
 
 type IndexConfigure = {
-  startSlot: Long
-  endSlot?: Long
+  startSlot: bigint
+  endSlot?: bigint
 }
 
 export type SolanaInstructionHandler = (instruction: Instruction, ctx: SolanaContext, accounts?: string[]) => void
@@ -24,7 +23,7 @@ export class SolanaBaseProcessor {
   contractName: string
   network: string
   processInnerInstruction: boolean
-  config: IndexConfigure = { startSlot: new Long(0) }
+  config: IndexConfigure = { startSlot: 0n }
   decodeInstruction: (rawInstruction: string) => Instruction | null
   fromParsedInstruction: (instruction: { type: string; info: any }) => Instruction | null
 
@@ -80,7 +79,7 @@ export class SolanaBaseProcessor {
     parsedInstruction: Instruction,
     accounts: string[],
     handler: SolanaInstructionHandler,
-    slot: Long
+    slot: bigint
   ): ProcessResult {
     const ctx = new SolanaContext(this.contractName, this.network, this.address, slot)
     handler(parsedInstruction, ctx, accounts)
@@ -91,19 +90,13 @@ export class SolanaBaseProcessor {
     return this.address !== null
   }
 
-  public startSlot(startSlot: Long | number) {
-    if (typeof startSlot === 'number') {
-      startSlot = Long.fromNumber(startSlot)
-    }
-    this.config.startSlot = startSlot
+  public startSlot(startSlot: bigint | number) {
+    this.config.startSlot = BigInt(startSlot)
     return this
   }
 
-  public endBlock(endBlock: Long | number) {
-    if (typeof endBlock === 'number') {
-      endBlock = Long.fromNumber(endBlock)
-    }
-    this.config.endSlot = endBlock
+  public endBlock(endBlock: bigint | number) {
+    this.config.endSlot = BigInt(endBlock)
     return this
   }
 }

package/src/core/sui-plugin.ts

@@ -1,11 +1,6 @@
-import { Plugin, PluginManager } from '../plugin'
-import {
-  ContractConfig,
-  DataBinding,
-  HandlerType,
-  ProcessConfigResponse,
-  ProcessResult,
-} from '../gen/processor/protos/processor'
+import { Plugin, PluginManager } from '@sentio/base'
+import { ContractConfig, DataBinding, HandlerType, ProcessConfigResponse, ProcessResult } from '@sentio/protos'
+
 import { DEFAULT_MAX_BLOCK, USER_PROCESSOR } from '../service'
 
 import { ServerError, Status } from 'nice-grpc'

package/src/core/sui-processor.ts

@@ -1,18 +1,17 @@
 import { SuiContext } from './context'
-import { ProcessResult } from '../gen'
-import Long from 'long'
-import { ListStateStorage } from '../state/state-storage'
+import { ProcessResult } from '@sentio/protos'
+import { ListStateStorage } from '@sentio/base'
 
 type IndexConfigure = {
-  startSeqNumber: Long
-  endSeqNumber?: Long
+  startSeqNumber: bigint
+  endSeqNumber?: bigint
 }
 
 export class SuiBindOptions {
   address: string
   // network?: Networkish = 1
   // name?: string
-  startBlock?: Long | number
+  startBlock?: bigint | number
   // endBlock?: Long | number
 }
 
@@ -23,7 +22,7 @@ export class SuiProcessorState extends ListStateStorage<SuiBaseProcessor> {
 export class SuiBaseProcessor {
   public transactionHanlder: (transaction: any, ctx: SuiContext) => void
   address: string
-  config: IndexConfigure = { startSeqNumber: new Long(0) }
+  config: IndexConfigure = { startSeqNumber: 0n }
 
   constructor(name: string, options: SuiBindOptions) {
     this.address = options.address
@@ -38,7 +37,7 @@ export class SuiBaseProcessor {
     return this
   }
 
-  public handleTransaction(txn: any, slot: Long): ProcessResult | null {
+  public handleTransaction(txn: any, slot: bigint): ProcessResult | null {
     const ctx = new SuiContext(this.address, slot)
 
     if (txn) {
@@ -47,19 +46,13 @@ export class SuiBaseProcessor {
     return ctx.getProcessResult()
   }
 
-  public startSlot(startSlot: Long | number) {
-    if (typeof startSlot === 'number') {
-      startSlot = Long.fromNumber(startSlot)
-    }
-    this.config.startSeqNumber = startSlot
+  public startSlot(startSlot: bigint | number) {
+    this.config.startSeqNumber = BigInt(startSlot)
     return this
   }
 
-  public endBlock(endBlock: Long | number) {
-    if (typeof endBlock === 'number') {
-      endBlock = Long.fromNumber(endBlock)
-    }
-    this.config.endSeqNumber = endBlock
+  public endBlock(endBlock: bigint | number) {
+    this.config.endSeqNumber = BigInt(endBlock)
     return this
   }
 }

package/src/index.ts

@@ -1,12 +1,10 @@
-// export { ProcessorServiceImpl } from './service'
 export { getProvider, setProvider, DummyProvider } from './provider'
-export { transformEtherError } from './error'
-// export { ProcessorState } from './state/processor-state'
-export { EthersError } from './error'
+export { transformEtherError, EthersError } from './error'
 
 export { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds'
 
-export * from './gen'
+// TODO maybe remove this
+export * from '@sentio/protos'
 
 export * from './core'
 

package/src/processor-runner.ts

@@ -9,14 +9,14 @@ import { createServer } from 'nice-grpc'
 import { createLogger, transports, format } from 'winston'
 import { CompressionAlgorithms } from '@grpc/grpc-js/build/src/compression-algorithms'
 
-import { ProcessorDefinition } from './gen'
+import { ProcessorDefinition } from '@sentio/protos'
 import { ProcessorServiceImpl } from './service'
 import { setProvider } from './provider'
-import { ProcessorState } from './state/processor-state'
+import { State } from '@sentio/base'
 import { load } from './loader'
 import { Endpoints } from './endpoints'
 
-global.PROCESSOR_STATE = new ProcessorState()
+State.reset()
 global.ENDPOINTS = new Endpoints()
 
 const optionDefinitions = [

package/src/service.ts

@@ -10,10 +10,10 @@ import {
   ProcessorServiceImplementation,
   ProcessResult,
   StartRequest,
-} from './gen'
+} from '@sentio/protos'
+
+import { Empty } from '@sentio/protos/lib/google/protobuf/empty'
 
-import { Empty } from './gen/google/protobuf/empty'
-import Long from 'long'
 import { MetricState } from './core/meter'
 import { ExporterState } from './core/exporter'
 import { EventTrackerState } from './core/event-tracker'
@@ -22,12 +22,12 @@ import { ProcessorTemplateProcessorState, TemplateInstanceState } from './core/b
 // (Long.prototype as any).toBigInt = function() {
 //   return BigInt(this.toString())
 // };
-import { PluginManager } from './plugin'
+import { PluginManager } from '@sentio/base'
 ;(BigInt.prototype as any).toJSON = function () {
   return this.toString()
 }
 
-export const DEFAULT_MAX_BLOCK = Long.ZERO
+export const DEFAULT_MAX_BLOCK = 0n
 
 export const USER_PROCESSOR = 'user_processor'
 

package/src/target-ethers-sentio/file.ts

@@ -160,6 +160,7 @@ export function codeGenSentioFile(contract: Contract): string {
         'ContractView',
         'DummyProvider',
         'TypedCallTrace',
+        'toBlockTag',
       ],
       './common': ['PromiseOrValue'],
       './index': [`${contract.name}`, `${contract.name}__factory`],

package/src/target-ethers-sentio/view-function.ts

@@ -61,7 +61,7 @@ export function generateBoundViewFunction(fn: FunctionDeclaration, includeArgTyp
     try {
       if (!overrides && this.context) {
         overrides = {
-          blockTag: this.context.blockNumber.toNumber(),
+          blockTag: toBlockTag(this.context.blockNumber),
         }
       }
       if (overrides) {

package/src/testing/metric-utils.ts

@@ -1,4 +1,4 @@
-import { MetricValue, ProcessResult } from '../gen'
+import { MetricValue, ProcessResult } from '@sentio/protos'
 import { Numberish, BigDecimal } from '../core'
 import { BigNumber } from 'ethers'
 

package/src/testing/test-processor-server.ts

@@ -10,16 +10,15 @@ import {
   ProcessConfigResponse,
   ProcessorServiceImplementation,
   StartRequest,
-} from '../gen'
+} from '@sentio/protos'
 import { CallContext } from 'nice-grpc-common'
-import { Empty } from '../gen/google/protobuf/empty'
+import { Empty } from '@sentio/protos/lib/google/protobuf/empty'
 import { ChainConfig } from '../chain-config'
 import { CHAIN_MAP } from '../utils/chain'
 import { Block, Log } from '@ethersproject/abstract-provider'
-import Long from 'long'
 import { getNetwork, Networkish } from '@ethersproject/providers'
 import { Endpoints } from '../endpoints'
-import { ProcessorState } from '../state/processor-state'
+import { State } from '@sentio/base'
 import { ProcessorServiceImpl } from '../service'
 import { Trace } from '../core/trace'
 import { setProvider } from '../provider'
@@ -27,7 +26,7 @@ import { setProvider } from '../provider'
 export const TEST_CONTEXT: CallContext = <CallContext>{}
 
 export function cleanTest() {
-  global.PROCESSOR_STATE = new ProcessorState()
+  State.reset()
   if (!global.ENDPOINTS) {
     global.ENDPOINTS = new Endpoints()
   }
@@ -282,11 +281,11 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
       if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {
         continue
       }
-      const longBlockNumber = Long.fromNumber(block.number)
+      const longBlockNumber = block.number
       if (longBlockNumber < contract.startBlock) {
         continue
       }
-      if (contract.endBlock !== Long.ZERO && longBlockNumber >= contract.endBlock) {
+      if (contract.endBlock !== 0n && longBlockNumber >= contract.endBlock) {
         continue
       }
 
@@ -323,12 +322,3 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
     return this.service.processBindingsStream(request, context)
   }
 }
-
-function toBytes(obj: any): Uint8Array {
-  const logJsonStr = JSON.stringify(obj)
-  const raw = new Uint8Array(logJsonStr.length)
-  for (let i = 0; i < logJsonStr.length; i++) {
-    raw[i] = logJsonStr.charCodeAt(i)
-  }
-  return raw
-}

package/src/types/global.d.ts

@@ -1,8 +1,8 @@
-import { ProcessorState } from '../state/processor-state'
+// import { State } from '../../../base/src/state'
 import { Endpoints } from "../endpoints";
 
 declare global {
-  var PROCESSOR_STATE: ProcessorState
+  // var PROCESSOR_STATE: State
   var ENDPOINTS: Endpoints
 }
 

package/src/utils/conversion.ts

@@ -1,7 +1,7 @@
 import { BigNumber } from 'ethers'
 import { BigDecimal } from '../core/big-decimal'
 import { Numberish } from '../core'
-import { MetricValue } from '../gen'
+import { MetricValue } from '@sentio/protos'
 
 export function toBigDecimal(n: BigNumber | bigint) {
   return new BigDecimal(n.toString())

package/src/utils/price.ts

@@ -1,4 +1,4 @@
-import { PriceServiceClient, PriceServiceDefinition } from '../gen/service/price/protos/price'
+import { PriceServiceClient, PriceServiceDefinition } from '@sentio/protos/lib/service/price/protos/price'
 import { createChannel, createClientFactory } from 'nice-grpc'
 import { retryMiddleware, RetryOptions } from 'nice-grpc-client-middleware-retry'
 

package/lib/gen/builtin.d.ts

@@ -1,6 +0,0 @@
-import Long from 'long';
-declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
-    [K in keyof T]?: DeepPartial<T[K]>;
-} : Partial<T>;
-export {};

package/lib/gen/builtin.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=builtin.js.map

package/lib/gen/builtin.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"builtin.js","sourceRoot":"","sources":["../../src/gen/builtin.ts"],"names":[],"mappings":"","sourcesContent":["import Long from 'long'\n\ntype Builtin =\n  | Date\n  | Function\n  | Uint8Array\n  | string\n  | number\n  | boolean\n  | undefined;\n\nexport type DeepPartial<T> = T extends Builtin\n  ? T\n  : T extends Long\n    ? string | number | Long\n    : T extends Array<infer U>\n      ? Array<DeepPartial<U>>\n      : T extends ReadonlyArray<infer U>\n        ? ReadonlyArray<DeepPartial<U>>\n        : T extends {}\n          ? { [K in keyof T]?: DeepPartial<T[K]> }\n          : Partial<T>;\n"]}