@sentio/sdk 2.12.3 → 2.13.0-rc.10

package/src/aptos/aptos-chain-adapter.ts

@@ -0,0 +1,81 @@
+import { ChainAdapter, moduleQname, SPLITTER, TypeDescriptor } from '../move/index.js'
+import { Event, MoveModuleBytecode, MoveResource, toInternalModule } from './move-types.js'
+import { AptosNetwork } from './network.js'
+import { InternalMoveModule, InternalMoveStruct } from '../move/internal-models.js'
+import { AptosClient } from 'aptos-sdk'
+
+export class AptosChainAdapter extends ChainAdapter<AptosNetwork, MoveModuleBytecode, Event | MoveResource> {
+  static INSTANCE = new AptosChainAdapter()
+
+  async fetchModules(account: string, network: AptosNetwork): Promise<MoveModuleBytecode[]> {
+    const client = getRpcClient(network)
+    return await client.getAccountModules(account)
+  }
+
+  async fetchModule(account: string, module: string, network: AptosNetwork): Promise<MoveModuleBytecode> {
+    const client = getRpcClient(network)
+    return await client.getAccountModule(account, module)
+  }
+
+  toInternalModules(modules: MoveModuleBytecode[]): InternalMoveModule[] {
+    return modules.flatMap((m) => (m.abi ? [toInternalModule(m)] : []))
+  }
+
+  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
+    if (params.length === 0) {
+      return params
+    }
+    if (params[0].qname === 'signer' && params[0].reference) {
+      params = params.slice(1)
+    }
+    return params
+  }
+
+  getEventStructs(module: InternalMoveModule) {
+    const qname = moduleQname(module)
+    const structMap = new Map<string, InternalMoveStruct>()
+    const eventMap = new Map<string, InternalMoveStruct>()
+
+    for (const struct of module.structs) {
+      structMap.set(qname + SPLITTER + struct.name, struct)
+    }
+
+    for (const struct of module.structs) {
+      for (const field of struct.fields) {
+        const t = field.type
+        if (t.qname === '0x1::event::EventHandle') {
+          const event = t.typeArgs[0].qname
+          const eventStruct = structMap.get(event)
+          if (eventStruct) {
+            eventMap.set(event, eventStruct)
+          }
+        }
+      }
+    }
+
+    return eventMap
+  }
+
+  getType(data: Event | MoveResource): string {
+    return data.type
+  }
+
+  getData(data: Event | MoveResource) {
+    if ('data' in data && 'type' in data) {
+      return data.data
+    }
+    return data
+  }
+}
+
+function getRpcClient(network: AptosNetwork): AptosClient {
+  return new AptosClient(getRpcEndpoint(network))
+}
+
+function getRpcEndpoint(network: AptosNetwork): string {
+  switch (network) {
+    case AptosNetwork.TEST_NET:
+      return 'https://testnet.aptoslabs.com/'
+  }
+  return 'https://mainnet.aptoslabs.com/'
+}

package/src/aptos/aptos-plugin.ts

@@ -96,6 +96,7 @@ export class AptosPlugin extends Plugin {
             minutesInterval: handler.timeIntervalInMinutes,
             slot: 0,
             slotInterval: handler.versionInterval,
+            fetchConfig: undefined,
           },
           type: handler.type || '',
         })
@@ -107,6 +108,7 @@ export class AptosPlugin extends Plugin {
             minutesInterval: handler.timeIntervalInMinutes,
             slot: 0,
             slotInterval: handler.versionInterval,
+            fetchConfig: undefined,
           },
           type: handler.type || '',
           ownerType: MoveOnIntervalConfig_OwnerType.ADDRESS,

package/src/aptos/aptos-processor.ts

@@ -1,10 +1,10 @@
 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'
-import { ListStateStorage } from '@sentio/runtime'
+import { ListStateStorage, mergeProcessResults } from '@sentio/runtime'
 import {
   MoveFetchConfig,
   Data_AptResource,
@@ -14,7 +14,13 @@ import {
   Data_AptCall,
 } from '@sentio/protos'
 import { ServerError, Status } from 'nice-grpc'
-import { CallHandler, EventFilter, EventHandler, FunctionNameAndCallFilter } from '../move/index.js'
+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
@@ -72,7 +80,8 @@ export class AptosBaseProcessor {
           processor.config.network,
           processor.config.address,
           BigInt(data.transaction.version),
-          call
+          call,
+          0
         )
         await handler(call, ctx)
         return ctx.getProcessResult()
@@ -86,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
@@ -97,10 +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) => processor.config.address + '::' + f.type))
 
     this.eventHandlers.push({
       handler: async function (data) {
@@ -112,23 +121,28 @@ export class AptosBaseProcessor {
           throw new ServerError(Status.INVALID_ARGUMENT, 'no event in the transactions')
         }
 
-        const ctx = new AptosContext(
-          processor.moduleName,
-          processor.config.network,
-          processor.config.address,
-          BigInt(txn.version),
-          txn
-        )
-
-        const events = txn.events
-        txn.events = []
-        for (const evt of events) {
+        const processResults = []
+        for (const [idx, evt] of txn.events.entries()) {
+          const typeQname = parseMoveType(evt.type).qname
+          if (!allEventType.has(typeQname)) {
+            continue
+          }
+
+          const ctx = new AptosContext(
+            processor.moduleName,
+            processor.config.network,
+            processor.config.address,
+            BigInt(txn.version),
+            txn,
+            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())
         }
 
-        return ctx.getProcessResult()
+        return mergeProcessResults(processResults)
       },
       filters: _filters,
       fetchConfig: _fetchConfig,
@@ -137,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?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): this {
     let _filters: FunctionNameAndCallFilter[] = []
-    const _fetchConfig = fetchConfig || MoveFetchConfig.fromPartial({})
+    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...fetchConfig })
 
     if (Array.isArray(filter)) {
       _filters = filter
@@ -166,11 +180,12 @@ export class AptosBaseProcessor {
           processor.config.network,
           processor.config.address,
           BigInt(tx.version),
-          tx
+          tx,
+          0
         )
         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()
@@ -185,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> {
@@ -221,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
@@ -251,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
@@ -268,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