@sentio/sdk 1.30.2 → 1.31.0

package/src/service.ts

@@ -33,10 +33,15 @@ 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'
+import { AccountProcessorState } from './core/account-processor'
 ;(BigInt.prototype as any).toJSON = function () {
   return this.toString()
 }
@@ -109,7 +114,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       })
     }
 
-    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,
@@ -127,7 +132,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       })
     }
 
-    // Part 1, prepare EVM processors
+    // Part 1.a, prepare EVM processors
     for (const processor of global.PROCESSOR_STATE.processors) {
       // If server favor incremental update this need to change
       // Start basic config for contract
@@ -191,6 +196,8 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
             throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')
           }
           const logFilter: LogFilter = {
+            addressType: undefined,
+            address: contractConfig.contract?.address,
             topics: [],
           }
 
@@ -212,6 +219,52 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       this.contractConfigs.push(contractConfig)
     }
 
+    // part 1.b prepare EVM account processors
+    for (const processor of AccountProcessorState.INSTANCE.getValues()) {
+      const accountConfig: AccountConfig = {
+        address: processor.config.address,
+        chainId: processor.getChainId().toString(),
+        startBlock: processor.config.startBlock ? Long.fromValue(processor.config.startBlock) : Long.ZERO,
+        aptosIntervalConfigs: [],
+        intervalConfigs: [],
+        logConfigs: [],
+      }
+      // TODO add interval
+      for (const eventsHandler of processor.eventHandlers) {
+        // associate id with filter
+        const handlerId = this.eventHandlers.push(eventsHandler.handler) - 1
+        const logConfig: LogHandlerConfig = {
+          handlerId: handlerId,
+          filters: [],
+        }
+
+        for (const filter of eventsHandler.filters) {
+          if (!filter.topics) {
+            throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')
+          }
+          const logFilter: LogFilter = {
+            addressType: filter.addressType,
+            address: filter.address,
+            topics: [],
+          }
+
+          for (const ts of filter.topics) {
+            let hashes: string[] = []
+            if (Array.isArray(ts)) {
+              hashes = hashes.concat(ts)
+            } else if (ts) {
+              hashes.push(ts)
+            }
+            logFilter.topics.push({ hashes: hashes })
+          }
+          logConfig.filters.push(logFilter)
+        }
+        accountConfig.logConfigs.push(logConfig)
+      }
+
+      this.accountConfigs.push(accountConfig)
+    }
+
     // Part 2, prepare solana constractors
     for (const solanaProcessor of global.PROCESSOR_STATE.solanaProcessors) {
       const contractConfig: ContractConfig = {
@@ -263,7 +316,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: {
@@ -316,13 +369,14 @@ 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(),
         startBlock: Long.fromValue(aptosProcessor.config.startVersion.toString()),
         aptosIntervalConfigs: [],
         intervalConfigs: [],
+        logConfigs: [],
       }
       for (const handler of aptosProcessor.resourcesHandlers) {
         const handlerId = this.aptosResourceHandlers.push(handler.handler) - 1
@@ -414,6 +468,8 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         return this.processAptosEvent(request)
       case HandlerType.APT_RESOURCE:
         return this.processAptosResource(request)
+      case HandlerType.ETH_LOG:
+        return this.processLog(request)
       default:
         throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)
     }
@@ -426,24 +482,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
 
     const promises: Promise<ProcessResult>[] = []
     for (const l of request.bindings) {
-      if (!l.data) {
-        throw new ServerError(Status.INVALID_ARGUMENT, "Log can't be null")
-      }
-      // const jsonString = Buffer.from(l.log.raw.buffer).toString("utf-8")
-      // const jsonString = String.fromCharCode.apply(null, l.log.raw)
-
-      try {
-        const jsonString = Utf8ArrayToStr(l.data.raw)
-        const log: Log = JSON.parse(jsonString)
-        const handler = this.eventHandlers[l.handlerId]
-        const promise = handler(log).catch((e) => {
-          throw new ServerError(Status.INTERNAL, 'error processing log: ' + jsonString + '\n' + errorString(e))
-        })
-
-        promises.push(promise)
-      } catch (e) {
-        throw new ServerError(Status.INTERNAL, 'error parse log: ' + l)
-      }
+      promises.push(this.processLog(l))
     }
 
     const result = mergeProcessResults(await Promise.all(promises))
@@ -464,6 +503,23 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     }
   }
 
+  async processLog(l: DataBinding): Promise<ProcessResult> {
+    if (!l.data) {
+      throw new ServerError(Status.INVALID_ARGUMENT, "Log can't be null")
+    }
+
+    try {
+      const jsonString = Utf8ArrayToStr(l.data.raw)
+      const log: Log = JSON.parse(jsonString)
+      const handler = this.eventHandlers[l.handlerId]
+      return handler(log).catch((e) => {
+        throw new ServerError(Status.INTERNAL, 'error processing log: ' + jsonString + '\n' + errorString(e))
+      })
+    } catch (e) {
+      throw new ServerError(Status.INTERNAL, 'error parse log: ' + l)
+    }
+  }
+
   async processTransactions(
     request: ProcessTransactionsRequest,
     context: CallContext
@@ -497,31 +553,6 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       await Promise.all(processorPromises)
     }
 
-    // if (request.chainId.toLowerCase().startsWith('apt') && global.PROCESSOR_STATE.aptosProcessors) {
-    //   const processorPromises: Promise<void>[] = []
-    //   for (const txn of request.transactions) {
-    //     processorPromises.push(
-    //       new Promise((resolve, _) => {
-    //         for (const processor of global.PROCESSOR_STATE.aptosProcessors) {
-    //           if (processor.address === txn.programAccountId!) {
-    //             const res = processor.handleTransaction(
-    //               JSON.parse(new TextDecoder().decode(txn.raw)),
-    //               txn.slot ?? Long.fromNumber(0)
-    //             )
-    //             if (res) {
-    //               res.gauges.forEach((g) => result.gauges.push(g))
-    //               res.counters.forEach((c) => result.counters.push(c))
-    //               res.logs.forEach((l) => result.logs.push(l))
-    //             }
-    //           }
-    //         }
-    //         resolve()
-    //       })
-    //     )
-    //   }
-    //   await Promise.all(processorPromises)
-    // }
-
     recordRuntimeInfo(result, HandlerType.TRANSACTION)
     return {
       result,

package/src/state/processor-state.ts

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

package/src/state/state-storage.ts

@@ -47,3 +47,19 @@ export abstract class MapStateStorage<T> extends StateStorage<Map<string, T>> {
     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

@@ -1,4 +1,5 @@
 import {
+  AccountConfig,
   BlockBinding,
   ContractConfig,
   DataBinding,
@@ -25,6 +26,7 @@ import { ProcessorState } from '../state/processor-state'
 import { ProcessorServiceImpl } from '../service'
 import { Trace } from '../core/trace'
 import { setProvider } from '../provider'
+import { account } from '../builtin/aptos/0x1'
 
 export const TEST_CONTEXT: CallContext = <CallContext>{}
 
@@ -37,7 +39,8 @@ export function cleanTest() {
 
 export class TestProcessorServer implements ProcessorServiceImplementation {
   service: ProcessorServiceImpl
-  contractConfig: ContractConfig[]
+  contractConfigs: ContractConfig[]
+  accountConfigs: AccountConfig[]
 
   constructor(loader: () => void, httpEndpoints: Record<string, string> = {}) {
     cleanTest()
@@ -58,7 +61,9 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
 
   async start(request: StartRequest = { templateInstances: [] }, context = TEST_CONTEXT): Promise<Empty> {
     const res = await this.service.start(request, context)
-    this.contractConfig = (await this.getConfig({})).contractConfigs
+    const config = await this.getConfig({})
+    this.contractConfigs = config.contractConfigs
+    this.accountConfigs = config.accountConfigs
     return res
   }
 
@@ -114,7 +119,7 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
     }
     const signature = trace.action.input.slice(0, 10)
 
-    for (const contract of this.contractConfig) {
+    for (const contract of this.contractConfigs) {
       if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {
         continue
       }
@@ -155,7 +160,7 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
   }
 
   buildLogBinding(log: Log, network: Networkish = 1): DataBinding | undefined {
-    for (const contract of this.contractConfig) {
+    for (const contract of this.contractConfigs) {
       if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {
         continue
       }
@@ -197,6 +202,67 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
     }
     return undefined
   }
+  testAccountLog(address: string, log: Log, network: Networkish = 1): Promise<ProcessBindingResponse> {
+    return this.testAccountLogs(address, [log], network)
+  }
+
+  testAccountLogs(address: string, logs: Log[], network: Networkish = 1): Promise<ProcessBindingResponse> {
+    const bindings = []
+    for (const log of logs) {
+      const binding = this.buildAccountLogBinding(address, log, network)
+      if (!binding) {
+        throw Error('Invalid test log: ' + JSON.stringify(log))
+      }
+      bindings.push(binding)
+    }
+    return this.processLogs({
+      bindings: bindings,
+    })
+  }
+
+  buildAccountLogBinding(address: string, log: Log, network: Networkish = 1): DataBinding | undefined {
+    for (const account of this.accountConfigs) {
+      if (account.chainId !== getNetwork(network).chainId.toString()) {
+        continue
+      }
+      if (address.toLowerCase() !== account.address.toLowerCase()) {
+        continue
+      }
+      for (const config of account.logConfigs) {
+        for (const filter of config.filters) {
+          // if (filter.topics.length != log.topics.length) {
+          //   continue
+          // }
+
+          let match = true
+          for (const topicIdx in filter.topics) {
+            const logTopic = log.topics[topicIdx]
+            const possibleTopic = filter.topics[topicIdx].hashes
+            if (possibleTopic.length === 0) {
+              // match all
+              continue
+            }
+            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {
+              // find one
+              continue
+            }
+            match = false
+            break
+          }
+          if (match) {
+            return {
+              data: {
+                raw: toBytes(log),
+              },
+              handlerId: config.handlerId,
+              handlerType: HandlerType.ETH_LOG,
+            }
+          }
+        }
+      }
+    }
+    return undefined
+  }
 
   testBlock(block: Partial<Block> & { number: number }, network: Networkish = 1): Promise<ProcessBindingResponse> {
     return this.testBlocks([block], network)
@@ -223,7 +289,7 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
       },
       handlerIds: [],
     }
-    for (const contract of this.contractConfig) {
+    for (const contract of this.contractConfigs) {
       if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {
         continue
       }

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('-')
+}