@sentio/sdk 1.30.1 → 1.30.3

package/src/aptos/aptos-processor.ts

@@ -1,14 +1,15 @@
-import { ProcessResult } from '../gen'
-
-import { TYPE_REGISTRY, TypeRegistry } from './type-registry'
-import { AptosBindOptions, AptosNetwork, getChainId } from './network'
 import {
   MoveResource,
   Transaction_UserTransaction,
   TransactionPayload_EntryFunctionPayload,
 } from 'aptos-sdk/src/generated'
+
+import { TYPE_REGISTRY, TypeRegistry } from './type-registry'
+import { AptosBindOptions, AptosNetwork, getChainId } from './network'
 import { AptosContext, AptosResourceContext } from './context'
 import { EventInstance } from './models'
+import { ListStateStorage } from '../state/state-storage'
+import { ProcessResult } from '../gen'
 
 type IndexConfigure = {
   address: string
@@ -60,6 +61,10 @@ class ResourceHandlder {
   handler: (resource: MoveResourcesWithVersionPayload) => Promise<ProcessResult>
 }
 
+export class AptosProcessorState extends ListStateStorage<AptosBaseProcessor> {
+  static INSTANCE = new AptosProcessorState()
+}
+
 export class AptosBaseProcessor {
   readonly moduleName: string
   config: IndexConfigure
@@ -69,7 +74,7 @@ export class AptosBaseProcessor {
   constructor(moduleName: string, options: AptosBindOptions) {
     this.moduleName = moduleName
     this.config = configure(options)
-    global.PROCESSOR_STATE.aptosProcessors.push(this)
+    AptosProcessorState.INSTANCE.addValue(this)
     this.loadTypes(TYPE_REGISTRY)
   }
 
@@ -202,6 +207,10 @@ export class AptosBaseProcessor {
   }
 }
 
+export class AptosAccountProcessorState extends ListStateStorage<AptosAccountProcessor> {
+  static INSTANCE = new AptosAccountProcessorState()
+}
+
 export class AptosAccountProcessor {
   config: IndexConfigure
 
@@ -213,7 +222,7 @@ export class AptosAccountProcessor {
 
   protected constructor(options: AptosBindOptions) {
     this.config = configure(options)
-    global.PROCESSOR_STATE.aptosAccountProcessors.push(this)
+    AptosAccountProcessorState.INSTANCE.addValue(this)
   }
 
   getChainId(): string {

package/src/core/event-tracker.ts

@@ -1,6 +1,7 @@
 import { BaseContext } from './base-context'
-import { DataDescriptor, EventTrackingResult } from '../gen'
+import { EventTrackingResult } from '../gen'
 import { NamedResultDescriptor } from './metadata'
+import { MapStateStorage } from '../state/state-storage'
 
 export interface Event {
   // The unique identifier of main identity associate with an event
@@ -16,6 +17,10 @@ export interface TrackerOptions {
   distinctByDays?: number[]
 }
 
+export class EventTrackerState extends MapStateStorage<EventTracker> {
+  static INSTANCE = new EventTrackerState()
+}
+
 // Track Event with an identity associate with it
 export class EventTracker extends NamedResultDescriptor {
   static DEFAULT_OPTIONS: TrackerOptions = {
@@ -25,8 +30,7 @@ export class EventTracker extends NamedResultDescriptor {
 
   static register(eventName: string, options?: TrackerOptions) {
     const tracker = new EventTracker(eventName, { ...EventTracker.DEFAULT_OPTIONS, ...options })
-    global.PROCESSOR_STATE.eventTrackers.push(tracker)
-    return tracker
+    return EventTrackerState.INSTANCE.getOrSetValue(eventName, tracker)
   }
 
   options: TrackerOptions
@@ -60,7 +64,6 @@ export class AccountEventTracker extends EventTracker {
       eventName = 'user'
     }
     const tracker = new AccountEventTracker(eventName, { ...AccountEventTracker.DEFAULT_OPTIONS, ...options })
-    global.PROCESSOR_STATE.eventTrackers.push(tracker)
-    return tracker
+    return EventTrackerState.INSTANCE.getOrSetValue(eventName, tracker)
   }
 }

package/src/core/exporter.ts

@@ -1,14 +1,18 @@
 import { BaseContext } from './base-context'
 import { ExportResult } from '@sentio/sdk'
 import { NamedResultDescriptor } from './metadata'
+import { MapStateStorage } from '../state/state-storage'
 
 export type Export = Record<string, any>
 
+export class ExporterState extends MapStateStorage<Exporter> {
+  static INSTANCE = new ExporterState()
+}
+
 export class Exporter extends NamedResultDescriptor {
   static register(name: string, channel: string) {
     const exporter = new Exporter(name, channel)
-    global.PROCESSOR_STATE.exporters.push(exporter)
-    return exporter
+    return ExporterState.INSTANCE.getOrSetValue(name, exporter)
   }
 
   channel: string

package/src/core/meter.ts

@@ -2,6 +2,7 @@ import { BaseContext } from './base-context'
 import { toMetricValue, Numberish } from './numberish'
 import { Labels, NamedResultDescriptor } from './metadata'
 import { AggregationConfig, MetricConfig } from '../gen'
+import { MapStateStorage } from '../state/state-storage'
 
 export function normalizeName(name: string): string {
   const regex = new RegExp('![_.a-zA-Z0-9]')
@@ -40,20 +41,50 @@ export class CounterOptions {
   sparse?: boolean
 }
 
+enum MetricType {
+  Counter = 0,
+  Gauge = 1,
+}
+
 export class Metric extends NamedResultDescriptor {
+  type: MetricType
   descriptor: MetricConfig
-  constructor(name: string, option?: MetricOptions) {
+  constructor(type: MetricType, name: string, option?: MetricOptions) {
     super(name)
+    this.type = type
     this.descriptor = MetricConfig.fromPartial({ name: this.name, ...option })
   }
 }
 
+export class MetricState extends MapStateStorage<Metric> {
+  static INSTANCE = new MetricState()
+
+  getOrRegisterMetric(type: MetricType, name: string, option?: CounterOptions | MetricOptions): Metric {
+    const metricMap = this.getOrRegister()
+    let metric = metricMap.get(name)
+    if (metric && metric.type !== type) {
+      throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.type}`)
+    }
+
+    if (!metric) {
+      if (type === MetricType.Counter) {
+        metric = new Counter(name, option)
+      } else {
+        metric = new Gauge(name, option)
+      }
+    }
+    metricMap.set(name, metric)
+    return metric
+  }
+}
+
 export class Counter extends Metric {
   static register(name: string, option?: CounterOptions): Counter {
-    // TODO also dedup
-    const metric = new Counter(name, option)
-    global.PROCESSOR_STATE.metrics.push(metric)
-    return metric
+    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Counter, name, option) as Counter
+  }
+
+  constructor(name: string, option?: MetricOptions) {
+    super(MetricType.Counter, name, option)
   }
 
   add(ctx: BaseContext, value: Numberish, labels: Labels = {}) {
@@ -94,10 +125,11 @@ export class CounterBinding {
 
 export class Gauge extends Metric {
   static register(name: string, option?: MetricOptions): Gauge {
-    // TODO also dedup
-    const metric = new Gauge(name, option)
-    global.PROCESSOR_STATE.metrics.push(metric)
-    return metric
+    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Gauge, name, option) as Gauge
+  }
+
+  constructor(name: string, option?: MetricOptions) {
+    super(MetricType.Counter, name, option)
   }
 
   record(ctx: BaseContext, value: Numberish, labels: Labels = {}) {

package/src/index.ts

@@ -1,7 +1,7 @@
-export { ProcessorServiceImpl } from './service'
+// export { ProcessorServiceImpl } from './service'
 export { getProvider, setProvider, DummyProvider } from './provider'
 export { transformEtherError } from './error'
-export { ProcessorState } from './processor-state'
+// export { ProcessorState } from './state/processor-state'
 export { EthersError } from './error'
 
 export { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds'

package/src/processor-runner.ts

@@ -8,7 +8,7 @@ import { setProvider } from './provider'
 
 import path from 'path'
 import fs from 'fs-extra'
-import { ProcessorState } from './processor-state'
+import { ProcessorState } from './state/processor-state'
 import { load } from './loader'
 import { CompressionAlgorithms } from '@grpc/grpc-js/build/src/compression-algorithms'
 import { Endpoints } from './endpoints'

package/src/service.ts

@@ -33,7 +33,14 @@ import Long from 'long'
 import { TextDecoder } from 'util'
 import { Trace } from './core'
 import { Instruction } from '@project-serum/anchor'
-import { MoveResourcesWithVersionPayload } from './aptos/aptos-processor'
+import { MetricState } from './core/meter'
+import { ExporterState } from './core/exporter'
+import { EventTrackerState } from './core/event-tracker'
+import {
+  AptosAccountProcessorState,
+  AptosProcessorState,
+  MoveResourcesWithVersionPayload,
+} from './aptos/aptos-processor'
 ;(BigInt.prototype as any).toJSON = function () {
   return this.toString()
 }
@@ -100,13 +107,13 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     this.exportConfigs = []
 
     // part 0, prepare metrics and event tracking configs
-    for (const metric of global.PROCESSOR_STATE.metrics) {
+    for (const metric of MetricState.INSTANCE.getValues()) {
       this.metricConfigs.push({
         ...metric.descriptor,
       })
     }
 
-    for (const eventTracker of global.PROCESSOR_STATE.eventTrackers) {
+    for (const eventTracker of EventTrackerState.INSTANCE.getValues()) {
       this.eventTrackingConfigs.push({
         distinctAggregationByDays: eventTracker.options.distinctByDays || [],
         eventName: eventTracker.name,
@@ -117,7 +124,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       })
     }
 
-    for (const exporter of global.PROCESSOR_STATE.exporters) {
+    for (const exporter of ExporterState.INSTANCE.getValues()) {
       this.exportConfigs.push({
         name: exporter.name,
         channel: exporter.channel,
@@ -260,7 +267,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     }
 
     // Part 4, prepare aptos constractors
-    for (const aptosProcessor of global.PROCESSOR_STATE.aptosProcessors) {
+    for (const aptosProcessor of AptosProcessorState.INSTANCE.getValues()) {
       const contractConfig: ContractConfig = {
         processorType: USER_PROCESSOR,
         contract: {
@@ -313,7 +320,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       this.contractConfigs.push(contractConfig)
     }
 
-    for (const aptosProcessor of global.PROCESSOR_STATE.aptosAccountProcessors) {
+    for (const aptosProcessor of AptosAccountProcessorState.INSTANCE.getValues()) {
       const accountConfig: AccountConfig = {
         address: aptosProcessor.config.address,
         chainId: aptosProcessor.getChainId(),

package/src/{processor-state.ts → state/processor-state.ts}

@@ -5,14 +5,10 @@ import {
   BaseProcessorTemplate,
   SolanaBaseProcessor,
   SuiBaseProcessor,
-  EventTracker,
-} from './core'
+} from '../core'
 
 import { BaseContract } from 'ethers'
-import { TemplateInstance } from './gen'
-import { Metric } from './core/meter'
-import { Exporter } from './core/exporter'
-import { AptosBaseProcessor, AptosAccountProcessor } from './aptos/aptos-processor'
+import { TemplateInstance } from '../gen'
 
 export class ProcessorState {
   // from abiName_address_chainId => contract wrapper
@@ -30,12 +26,7 @@ export class ProcessorState {
 
   suiProcessors: SuiBaseProcessor[] = []
 
-  aptosProcessors: AptosBaseProcessor[] = []
-  aptosAccountProcessors: AptosAccountProcessor[] = []
+  // TODO move above to state map
 
-  eventTrackers: EventTracker[] = []
-
-  exporters: Exporter[] = []
-
-  metrics: Metric[] = []
+  stateMap = new Map<string, any>()
 }

package/src/state/state-storage.ts

@@ -0,0 +1,65 @@
+export abstract class StateStorage<T> {
+  // TODO learn how to define single instance for all subclasses
+
+  protected constructor() {
+    //
+  }
+
+  abstract initValue(): T
+
+  key(): string {
+    return this.constructor.name
+  }
+
+  getOrRegister(): T {
+    let metricState: T = global.PROCESSOR_STATE.stateMap.get(this.key())
+    if (!metricState) {
+      metricState = this.initValue()
+      global.PROCESSOR_STATE.stateMap.set(this.key(), metricState)
+    }
+    return metricState
+  }
+}
+
+export abstract class MapStateStorage<T> extends StateStorage<Map<string, T>> {
+  initValue() {
+    return new Map<string, T>()
+  }
+
+  getValue(key: string): T | undefined {
+    const m = this.getOrRegister()
+    return m.get(key)
+  }
+
+  getValues(): T[] {
+    const m = this.getOrRegister()
+    return Array.from(m.values())
+  }
+
+  getOrSetValue(key: string, value: T): T {
+    const m = this.getOrRegister()
+    const oldValue = m.get(key)
+    if (oldValue) {
+      console.warn(key, 'has been registered twice, use the previous one')
+      return oldValue
+    }
+    m.set(key, value)
+    return value
+  }
+}
+
+export abstract class ListStateStorage<T> extends StateStorage<T[]> {
+  initValue() {
+    return []
+  }
+
+  getValues(): T[] {
+    return this.getOrRegister()
+  }
+
+  addValue(value: T): T {
+    const m = this.getOrRegister()
+    m.push(value)
+    return value
+  }
+}

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

@@ -21,7 +21,7 @@ import { Block, Log } from '@ethersproject/abstract-provider'
 import Long from 'long'
 import { getNetwork, Networkish } from '@ethersproject/providers'
 import { Endpoints } from '../endpoints'
-import { ProcessorState } from '../processor-state'
+import { ProcessorState } from '../state/processor-state'
 import { ProcessorServiceImpl } from '../service'
 import { Trace } from '../core/trace'
 import { setProvider } from '../provider'

package/src/utils/price.ts

@@ -25,7 +25,7 @@ export async function getPriceByType(chainId: string, coinType: string, date: Da
     priceClient = getPriceClient()
   }
 
-  const dateStr = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')
+  const dateStr = dateString(date)
   const key = `${coinType}-${dateStr}`
   let price = priceMap.get(key)
   if (price) {
@@ -48,7 +48,9 @@ export async function getPriceByType(chainId: string, coinType: string, date: Da
     }
   )
   price = response.price
-  priceMap.set(key, price)
+  if (response.timestamp && dateString(response.timestamp) === dateStr) {
+    priceMap.set(key, price)
+  }
   return price
 }
 
@@ -62,7 +64,7 @@ export async function getPriceBySymbol(symbol: string, date: Date): Promise<numb
     priceClient = getPriceClient()
   }
 
-  const dateStr = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')
+  const dateStr = dateString(date)
   const key = `${symbol}-${dateStr}`
   let price = priceMap.get(key)
   if (price) {
@@ -82,6 +84,12 @@ export async function getPriceBySymbol(symbol: string, date: Date): Promise<numb
     }
   )
   price = response.price
-  priceMap.set(key, price)
+  if (response.timestamp && dateString(response.timestamp) === dateStr) {
+    priceMap.set(key, price)
+  }
   return price
 }
+
+function dateString(date: Date) {
+  return [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')
+}

package/lib/processor-state.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"processor-state.js","sourceRoot":"","sources":["../src/processor-state.ts"],"names":[],"mappings":";;;AAgBA,MAAa,cAAc;IACzB,mDAAmD;IACnD,SAAS,GAAG,IAAI,GAAG,EAAsC,CAAA;IACzD,qBAAqB;IACrB,UAAU,GAAwE,EAAE,CAAA;IACpF,oCAAoC;IACpC,YAAY,GAAG,IAAI,GAAG,EAAmC,CAAA;IACzD,0BAA0B;IAC1B,SAAS,GAAgF,EAAE,CAAA;IAC3F,wCAAwC;IACxC,kBAAkB,GAAuB,EAAE,CAAA;IAE3C,gBAAgB,GAA0B,EAAE,CAAA;IAE5C,aAAa,GAAuB,EAAE,CAAA;IAEtC,eAAe,GAAyB,EAAE,CAAA;IAC1C,sBAAsB,GAA4B,EAAE,CAAA;IAEpD,aAAa,GAAmB,EAAE,CAAA;IAElC,SAAS,GAAe,EAAE,CAAA;IAE1B,OAAO,GAAa,EAAE,CAAA;CACvB;AAxBD,wCAwBC","sourcesContent":["import {\n  BaseProcessor,\n  BoundContractView,\n  ContractView,\n  BaseProcessorTemplate,\n  SolanaBaseProcessor,\n  SuiBaseProcessor,\n  EventTracker,\n} from './core'\n\nimport { BaseContract } from 'ethers'\nimport { TemplateInstance } from './gen'\nimport { Metric } from './core/meter'\nimport { Exporter } from './core/exporter'\nimport { AptosBaseProcessor, AptosAccountProcessor } from './aptos/aptos-processor'\n\nexport class ProcessorState {\n  // from abiName_address_chainId => contract wrapper\n  contracts = new Map<string, ContractView<BaseContract>>()\n  // all evm processors\n  processors: BaseProcessor<BaseContract, BoundContractView<BaseContract, any>>[] = []\n  // from abiName_options to contracts\n  processorMap = new Map<string, BaseProcessor<any, any>>()\n  // evm processor templates\n  templates: BaseProcessorTemplate<BaseContract, BoundContractView<BaseContract, any>>[] = []\n  // evm processor template instances spec\n  templatesInstances: TemplateInstance[] = []\n\n  solanaProcessors: SolanaBaseProcessor[] = []\n\n  suiProcessors: SuiBaseProcessor[] = []\n\n  aptosProcessors: AptosBaseProcessor[] = []\n  aptosAccountProcessors: AptosAccountProcessor[] = []\n\n  eventTrackers: EventTracker[] = []\n\n  exporters: Exporter[] = []\n\n  metrics: Metric[] = []\n}\n"]}