@sentio/sdk 2.13.0-rc.1 → 2.13.0-rc.10

package/src/aptos/aptos-processor.ts

@@ -1,6 +1,6 @@
 import { MoveResource, Transaction_UserTransaction, TransactionPayload_EntryFunctionPayload } from './move-types.js'
 
-import { MOVE_CODER, MoveCoder } from './move-coder.js'
+import { defaultMoveCoder, MoveCoder } from './move-coder.js'
 import { AptosBindOptions, AptosNetwork, getChainId } from './network.js'
 import { AptosContext, AptosResourcesContext } from './context.js'
 import { EventInstance } from './models.js'
@@ -15,6 +15,12 @@ import {
 } from '@sentio/protos'
 import { ServerError, Status } from 'nice-grpc'
 import { CallHandler, EventFilter, EventHandler, FunctionNameAndCallFilter, parseMoveType } from '../move/index.js'
+import { PromiseOrVoid } from '../core/index.js'
+
+const DEFAULT_FETCH_CONFIG: MoveFetchConfig = {
+  resourceChanges: false,
+  allEvents: true,
+}
 
 type IndexConfigure = {
   address: string
@@ -39,12 +45,14 @@ export class AptosBaseProcessor {
   config: IndexConfigure
   eventHandlers: EventHandler<Data_AptEvent>[] = []
   callHandlers: CallHandler<Data_AptCall>[] = []
+  coder: MoveCoder
 
   constructor(moduleName: string, options: AptosBindOptions) {
     this.moduleName = moduleName
     this.config = configure(options)
     AptosProcessorState.INSTANCE.addValue(this)
-    this.loadTypes(MOVE_CODER)
+    this.coder = defaultMoveCoder(this.config.network)
+    // this.loadTypes(this.coder)
   }
 
   // getABI(): MoveModule | undefined {
@@ -52,11 +60,11 @@ export class AptosBaseProcessor {
   // }
 
   public onTransaction(
-    handler: (transaction: Transaction_UserTransaction, ctx: AptosContext) => void,
+    handler: (transaction: Transaction_UserTransaction, ctx: AptosContext) => PromiseOrVoid,
     includedFailed = false,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): this {
-    const _fetchConfig = fetchConfig || MoveFetchConfig.fromPartial({})
+    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...fetchConfig })
 
     // const address = this.config.address
     // const moduleName = this.moduleName
@@ -87,10 +95,10 @@ export class AptosBaseProcessor {
   public onMoveEvent(
     handler: (event: EventInstance, ctx: AptosContext) => void,
     filter: EventFilter | EventFilter[],
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): this {
     let _filters: EventFilter[] = []
-    const _fetchConfig = fetchConfig || MoveFetchConfig.fromPartial({})
+    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...fetchConfig })
 
     if (Array.isArray(filter)) {
       _filters = filter
@@ -98,11 +106,10 @@ export class AptosBaseProcessor {
       _filters.push(filter)
     }
 
-    const address = this.config.address
     // const moduleName = this.moduleName
 
     const processor = this
-    const allEventType = new Set(_filters.map((f) => address + '::' + f.type))
+    const allEventType = new Set(_filters.map((f) => processor.config.address + '::' + f.type))
 
     this.eventHandlers.push({
       handler: async function (data) {
@@ -114,11 +121,8 @@ export class AptosBaseProcessor {
           throw new ServerError(Status.INVALID_ARGUMENT, 'no event in the transactions')
         }
 
-        const events = txn.events
-        txn.events = []
         const processResults = []
-
-        for (const [idx, evt] of events.entries()) {
+        for (const [idx, evt] of txn.events.entries()) {
           const typeQname = parseMoveType(evt.type).qname
           if (!allEventType.has(typeQname)) {
             continue
@@ -133,7 +137,7 @@ export class AptosBaseProcessor {
             idx
           )
           const eventInstance = evt as EventInstance
-          const decoded = MOVE_CODER.decodeEvent<any>(eventInstance)
+          const decoded = await processor.coder.decodeEvent<any>(eventInstance)
           await handler(decoded || eventInstance, ctx)
           processResults.push(ctx.getProcessResult())
         }
@@ -147,12 +151,12 @@ export class AptosBaseProcessor {
   }
 
   public onEntryFunctionCall(
-    handler: (call: TransactionPayload_EntryFunctionPayload, ctx: AptosContext) => void,
+    handler: (call: TransactionPayload_EntryFunctionPayload, ctx: AptosContext) => PromiseOrVoid,
     filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[],
     fetchConfig?: Partial<MoveFetchConfig>
   ): this {
     let _filters: FunctionNameAndCallFilter[] = []
-    const _fetchConfig = MoveFetchConfig.fromPartial(fetchConfig || {})
+    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...fetchConfig })
 
     if (Array.isArray(filter)) {
       _filters = filter
@@ -181,7 +185,7 @@ export class AptosBaseProcessor {
         )
         if (tx) {
           const payload = tx.payload as TransactionPayload_EntryFunctionPayload
-          const decoded = MOVE_CODER.decodeFunctionPayload(payload)
+          const decoded = await processor.coder.decodeFunctionPayload(payload)
           await handler(decoded, ctx)
         }
         return ctx.getProcessResult()
@@ -196,17 +200,17 @@ export class AptosBaseProcessor {
     return getChainId(this.config.network)
   }
 
-  loadTypes(registry: MoveCoder) {
-    if (registry.contains(this.config.address, this.moduleName)) {
-      return
-    }
-    this.loadTypesInternal(registry)
-  }
-
-  protected loadTypesInternal(registry: MoveCoder) {
-    // should be override by subclass
-    console.log('')
-  }
+  // loadTypes(registry: MoveCoder) {
+  //   if (registry.contains(this.config.address, this.moduleName)) {
+  //     return
+  //   }
+  //   this.loadTypesInternal(registry)
+  // }
+  //
+  // protected loadTypesInternal(registry: MoveCoder) {
+  //   // should be override by subclass
+  //   console.log('')
+  // }
 }
 
 export class AptosAccountProcessorState extends ListStateStorage<AptosResourcesProcessor> {
@@ -232,7 +236,7 @@ export class AptosResourcesProcessor {
   }
 
   private onInterval(
-    handler: (resources: MoveResource[], ctx: AptosResourcesContext) => void,
+    handler: (resources: MoveResource[], ctx: AptosResourcesContext) => PromiseOrVoid,
     timeInterval: HandleInterval | undefined,
     versionInterval: HandleInterval | undefined,
     type: string | undefined
@@ -262,7 +266,7 @@ export class AptosResourcesProcessor {
   }
 
   public onTimeInterval(
-    handler: (resources: MoveResource[], ctx: AptosResourcesContext) => void,
+    handler: (resources: MoveResource[], ctx: AptosResourcesContext) => PromiseOrVoid,
     timeIntervalInMinutes = 60,
     backfillTimeIntervalInMinutes = 240,
     type?: string
@@ -279,7 +283,7 @@ export class AptosResourcesProcessor {
   }
 
   public onVersionInterval(
-    handler: (resources: MoveResource[], ctx: AptosResourcesContext) => void,
+    handler: (resources: MoveResource[], ctx: AptosResourcesContext) => PromiseOrVoid,
     versionInterval = 100000,
     backfillVersionInterval = 400000,
     typePrefix?: string