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

package/src/sui/builtin/0x3.ts

@@ -39,7 +39,7 @@ export class genesis extends SuiBaseProcessor {
       event: genesis.GenesisChainParametersInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): genesis {
     this.onMoveEvent(
       func,
@@ -56,7 +56,7 @@ export class genesis extends SuiBaseProcessor {
       event: genesis.GenesisValidatorMetadataInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): genesis {
     this.onMoveEvent(
       func,
@@ -193,7 +193,7 @@ export class staking_pool extends SuiBaseProcessor {
       event: staking_pool.PoolTokenExchangeRateInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): staking_pool {
     this.onMoveEvent(
       func,
@@ -1210,7 +1210,7 @@ export class sui_system_state_inner extends SuiBaseProcessor {
       event: sui_system_state_inner.SystemEpochInfoEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): sui_system_state_inner {
     this.onMoveEvent(
       func,
@@ -1300,7 +1300,7 @@ export class validator extends SuiBaseProcessor {
       event: validator.StakingRequestEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator {
     this.onMoveEvent(
       func,
@@ -1317,7 +1317,7 @@ export class validator extends SuiBaseProcessor {
       event: validator.UnstakingRequestEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator {
     this.onMoveEvent(
       func,
@@ -1435,7 +1435,7 @@ export class validator_set extends SuiBaseProcessor {
       event: validator_set.ValidatorEpochInfoEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator_set {
     this.onMoveEvent(
       func,
@@ -1452,7 +1452,7 @@ export class validator_set extends SuiBaseProcessor {
       event: validator_set.ValidatorJoinEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator_set {
     this.onMoveEvent(
       func,
@@ -1469,7 +1469,7 @@ export class validator_set extends SuiBaseProcessor {
       event: validator_set.ValidatorLeaveEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator_set {
     this.onMoveEvent(
       func,

package/src/sui/codegen/codegen.ts

@@ -1,14 +1,13 @@
-import { Connection, JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.js'
+import { SuiMoveNormalizedModules } from '@mysten/sui.js'
 
 import { SuiNetwork } from '../network.js'
 import * as fs from 'fs'
 import chalk from 'chalk'
 import { InternalMoveModule, InternalMoveStruct } from '../../move/internal-models.js'
 import { AbstractCodegen } from '../../move/abstract-codegen.js'
-import { toInternalModule } from '../move-types.js'
-import { moduleQname, SPLITTER, structQname, TypeDescriptor } from '../../move/index.js'
-import { getMeaningfulFunctionParams } from '../utils.js'
+import { structQname } from '../../move/index.js'
 import { join } from 'path'
+import { SuiChainAdapter } from '../sui-chain-adapter.js'
 
 export async function codegen(abisDir: string, outDir = join('src', 'types', 'sui'), genExample = false) {
   if (!fs.existsSync(abisDir)) {
@@ -19,18 +18,6 @@ export async function codegen(abisDir: string, outDir = join('src', 'types', 'su
   console.log(chalk.green(`Generated ${numFiles} for Sui`))
 }
 
-function getRpcEndpoint(network: SuiNetwork): string {
-  switch (network) {
-    case SuiNetwork.TEST_NET:
-      return 'https://fullnode.testnet.sui.io/'
-  }
-  return 'https://fullnode.mainnet.sui.io/'
-}
-
-function getRpcClient(network: SuiNetwork): JsonRpcProvider {
-  return new JsonRpcProvider(new Connection({ fullnode: getRpcEndpoint(network) }))
-}
-
 class SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {
   ADDRESS_TYPE = 'SuiAddress'
   MAIN_NET = SuiNetwork.MAIN_NET
@@ -40,30 +27,8 @@ class SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {
   // GENERATE_ON_ENTRY = true
   PAYLOAD_OPTIONAL = true
 
-  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {
-    const client = getRpcClient(network)
-    return await client.getNormalizedMoveModulesByPackage({ package: account })
-  }
-
-  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
-    return getMeaningfulFunctionParams(params)
-  }
-
-  toInternalModules(modules: SuiMoveNormalizedModules): InternalMoveModule[] {
-    return Object.values(modules).map(toInternalModule)
-  }
-
-  getEventStructs(module: InternalMoveModule) {
-    const qname = moduleQname(module)
-    const eventMap = new Map<string, InternalMoveStruct>()
-
-    for (const struct of module.structs) {
-      const abilities = new Set(struct.abilities)
-      if (abilities.has('Drop') && abilities.has('Copy')) {
-        eventMap.set(qname + SPLITTER + struct.name, struct)
-      }
-    }
-    return eventMap
+  constructor() {
+    super(new SuiChainAdapter())
   }
 
   readModulesFile(fullPath: string) {

package/src/sui/context.ts

@@ -10,6 +10,7 @@ export class SuiContext extends BaseContext {
   timestamp: Date
   slot: bigint
   transaction: SuiTransactionBlockResponse
+  eventIndex: number
 
   constructor(
     moduleName: string,
@@ -17,7 +18,8 @@ export class SuiContext extends BaseContext {
     address: string,
     timestamp: Date,
     slot: bigint,
-    transaction?: SuiTransactionBlockResponse
+    transaction: SuiTransactionBlockResponse,
+    eventIndex: number
   ) {
     super()
     this.address = address.toLowerCase()
@@ -25,6 +27,7 @@ export class SuiContext extends BaseContext {
     this.moduleName = moduleName
     this.timestamp = timestamp
     this.slot = slot
+    this.eventIndex = eventIndex
     if (transaction) {
       this.transaction = transaction
     }

package/src/sui/move-coder.ts

@@ -2,18 +2,25 @@ import { TypedEventInstance, TypedFunctionPayload, TypedSuiMoveObject } from './
 import { AbstractMoveCoder, StructWithTag } from '../move/abstract-move-coder.js'
 import {
   MoveCallSuiTransaction,
+  SuiCallArg,
   SuiEvent,
   SuiMoveNormalizedModule,
-  SuiCallArg,
   SuiMoveObject,
   SuiRawData,
+  SuiMoveNormalizedModules,
 } from '@mysten/sui.js'
 import { toInternalModule } from './move-types.js'
 import { SPLITTER, TypeDescriptor } from '../move/index.js'
-import { getMeaningfulFunctionParams } from './utils.js'
 import { dynamic_field } from './builtin/0x2.js'
+import { SuiNetwork } from './network.js'
+import { SuiChainAdapter } from './sui-chain-adapter.js'
+
+export class MoveCoder extends AbstractMoveCoder<SuiNetwork, SuiMoveNormalizedModules, SuiEvent | SuiMoveObject> {
+  constructor(network: SuiNetwork) {
+    super(network)
+    this.adapter = new SuiChainAdapter()
+  }
 
-export class MoveCoder extends AbstractMoveCoder<SuiEvent | SuiMoveObject> {
   load(module: SuiMoveNormalizedModule) {
     if (this.contains(module.address, module.name)) {
       return
@@ -65,14 +72,10 @@ export class MoveCoder extends AbstractMoveCoder<SuiEvent | SuiMoveObject> {
     return this.filterAndDecodeStruct(typeQname, objects)
   }
 
-  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
-    return getMeaningfulFunctionParams(params)
-  }
-
   decodeFunctionPayload(payload: MoveCallSuiTransaction, inputs: SuiCallArg[]): MoveCallSuiTransaction {
     const functionType = [payload.package, payload.module, payload.function].join(SPLITTER)
     const func = this.getMoveFunction(functionType)
-    const params = getMeaningfulFunctionParams(func.params)
+    const params = this.adapter.getMeaningfulFunctionParams(func.params)
     const args = []
     for (const value of payload.arguments || []) {
       const argValue = value as any
@@ -101,7 +104,7 @@ export class MoveCoder extends AbstractMoveCoder<SuiEvent | SuiMoveObject> {
   }
 }
 
-export const MOVE_CODER = new MoveCoder()
+export const MOVE_CODER = new MoveCoder(SuiNetwork.MAIN_NET)
 
 export function defaultMoveCoder(): MoveCoder {
   return MOVE_CODER

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

@@ -0,0 +1,50 @@
+import { ChainAdapter, moduleQname, SPLITTER, TypeDescriptor } from '../move/index.js'
+import { toInternalModule } from './move-types.js'
+import { SuiNetwork } from './network.js'
+import { InternalMoveModule, InternalMoveStruct } from '../move/internal-models.js'
+import { Connection, JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.js'
+
+export class SuiChainAdapter extends ChainAdapter<SuiNetwork, SuiMoveNormalizedModules> {
+  static INSTANCE = new SuiChainAdapter()
+
+  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {
+    const client = getRpcClient(network)
+    return await client.getNormalizedMoveModulesByPackage({ package: account })
+  }
+
+  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
+    if (params.length === 0) {
+      return params
+    }
+    return params.slice(0, params.length - 1)
+  }
+
+  toInternalModules(modules: SuiMoveNormalizedModules): InternalMoveModule[] {
+    return Object.values(modules).map(toInternalModule)
+  }
+
+  getEventStructs(module: InternalMoveModule) {
+    const qname = moduleQname(module)
+    const eventMap = new Map<string, InternalMoveStruct>()
+
+    for (const struct of module.structs) {
+      const abilities = new Set(struct.abilities)
+      if (abilities.has('Drop') && abilities.has('Copy')) {
+        eventMap.set(qname + SPLITTER + struct.name, struct)
+      }
+    }
+    return eventMap
+  }
+}
+
+function getRpcEndpoint(network: SuiNetwork): string {
+  switch (network) {
+    case SuiNetwork.TEST_NET:
+      return 'https://fullnode.testnet.sui.io/'
+  }
+  return 'https://fullnode.mainnet.sui.io/'
+}
+
+function getRpcClient(network: SuiNetwork): JsonRpcProvider {
+  return new JsonRpcProvider(new Connection({ fullnode: getRpcEndpoint(network) }))
+}

package/src/sui/sui-processor.ts

@@ -7,7 +7,7 @@ import {
   MoveOnIntervalConfig_OwnerType,
   ProcessResult,
 } from '@sentio/protos'
-import { ListStateStorage } from '@sentio/runtime'
+import { ListStateStorage, mergeProcessResults } from '@sentio/runtime'
 import { getChainId, SuiNetwork } from './network.js'
 import { ServerError, Status } from 'nice-grpc'
 import { SuiContext, SuiObjectsContext } from './context.js'
@@ -19,7 +19,7 @@ import {
   SuiMoveObject,
   SuiTransactionBlockResponse,
 } from '@mysten/sui.js'
-import { CallHandler, EventFilter, EventHandler, FunctionNameAndCallFilter } from '../move/index.js'
+import { CallHandler, EventFilter, EventHandler, FunctionNameAndCallFilter, parseMoveType } from '../move/index.js'
 import { getMoveCalls } from './utils.js'
 import { defaultMoveCoder } from './move-coder.js'
 // import { dynamic_field } from './builtin/0x2.js'
@@ -81,6 +81,7 @@ export class SuiBaseProcessor {
     // 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) {
@@ -92,26 +93,29 @@ export class SuiBaseProcessor {
           throw new ServerError(Status.INVALID_ARGUMENT, 'no event in the transactions')
         }
 
-        const ctx = new SuiContext(
-          processor.moduleName,
-          processor.config.network,
-          processor.config.address,
-          data.timestamp || new Date(0),
-          data.slot,
-          txn
-        )
+        const processResults = []
+        for (const [idx, evt] of (txn.events as SuiEvent[]).entries()) {
+          const typeQname = parseMoveType(evt.type).qname
+          if (!allEventType.has(typeQname)) {
+            continue
+          }
+
+          const ctx = new SuiContext(
+            processor.moduleName,
+            processor.config.network,
+            processor.config.address,
+            data.timestamp || new Date(0),
+            data.slot,
+            txn,
+            idx
+          )
 
-        const events = txn.events
-        txn.events = []
-        for (const evt of events) {
-          // if ('moveEvent' in evt) {
-          //   const eventInstance = evt.moveEvent as SuiEvent
           const decoded = defaultMoveCoder().decodeEvent<any>(evt)
           await handler(decoded || evt, ctx)
-          // }
+          processResults.push(ctx.getProcessResult())
         }
 
-        return ctx.getProcessResult()
+        return mergeProcessResults(processResults)
       },
       filters: _filters,
       fetchConfig: _fetchConfig,
@@ -150,7 +154,8 @@ export class SuiBaseProcessor {
           processor.config.address,
           data.timestamp || new Date(0),
           data.slot,
-          tx
+          tx,
+          0
         )
         if (tx) {
           const calls: MoveCallSuiTransaction[] = getMoveCalls(tx)

package/src/sui/utils.ts

@@ -6,7 +6,6 @@ import {
   ProgrammableTransaction,
   SuiTransaction,
 } from '@mysten/sui.js'
-import { TypeDescriptor } from '../move/index.js'
 
 export function getMoveCalls(txBlock: SuiTransactionBlockResponse) {
   const txKind = getTransactionKind(txBlock)
@@ -33,10 +32,3 @@ export function getMoveCalls(txBlock: SuiTransactionBlockResponse) {
     return []
   })
 }
-
-export function getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
-  if (params.length === 0) {
-    return params
-  }
-  return params.slice(0, params.length - 1)
-}

package/src/testing/sui-facet.ts

@@ -1,4 +1,4 @@
-import { SuiEvent, SuiTransactionBlockResponse, MoveCallSuiTransaction } from '@mysten/sui.js'
+import { SuiTransactionBlockResponse, MoveCallSuiTransaction } from '@mysten/sui.js'
 import { DataBinding, HandlerType } from '@sentio/protos'
 import { getChainId } from '../sui/network.js'
 import { TestProcessorServer } from './test-processor-server.js'
@@ -66,19 +66,8 @@ export class SuiFacet {
     return undefined
   }
 
-  testEvent(
-    transaction: SuiTransactionBlockResponse,
-    event: number | SuiEvent,
-    network: SuiNetwork = SuiNetwork.MAIN_NET
-  ) {
-    if (typeof event !== 'number') {
-      const transaction2: SuiTransactionBlockResponse = {} as any
-      Object.assign(transaction2, transaction)
-      transaction = transaction2
-      transaction.events = [event]
-      event = 0
-    }
-    const binding = this.buildEventBinding(transaction, event, network)
+  testEvent(transaction: SuiTransactionBlockResponse, network: SuiNetwork = SuiNetwork.MAIN_NET) {
+    const binding = this.buildEventBinding(transaction, network)
     if (!binding) {
       throw Error('Invalid test event: ' + JSON.stringify(transaction))
     }
@@ -87,14 +76,9 @@ export class SuiFacet {
 
   private buildEventBinding(
     transaction: SuiTransactionBlockResponse,
-    eventIdx: number,
     network: SuiNetwork = SuiNetwork.MAIN_NET
   ): DataBinding | undefined {
     // const allEvents = new Set(transaction.events.map(e => e.type))
-    const event = transaction.events?.[eventIdx]
-    if (!event) {
-      throw Error('Invaild test transaction, no event located')
-    }
 
     for (const config of this.server.contractConfigs) {
       if (config.contract?.chainId !== getChainId(network)) {
@@ -102,18 +86,19 @@ export class SuiFacet {
       }
       for (const eventConfig of config.moveEventConfigs) {
         for (const eventFilter of eventConfig.filters) {
-          if (config.contract.address + '::' + eventFilter.type === parseMoveType(event.type).qname) {
-            transaction.events = [event]
-            return {
-              data: {
-                suiEvent: {
-                  transaction,
-                  timestamp: new Date(transaction.timestampMs || 0),
-                  slot: 10000n,
+          for (const event of transaction.events || []) {
+            if (config.contract.address + '::' + eventFilter.type === parseMoveType(event.type).qname) {
+              return {
+                data: {
+                  suiEvent: {
+                    transaction,
+                    timestamp: new Date(transaction.timestampMs || 0),
+                    slot: 10000n,
+                  },
                 },
-              },
-              handlerIds: [eventConfig.handlerId],
-              handlerType: HandlerType.SUI_EVENT,
+                handlerIds: [eventConfig.handlerId],
+                handlerType: HandlerType.SUI_EVENT,
+              }
             }
           }
         }

package/lib/aptos/utils.d.ts

@@ -1,2 +0,0 @@
-import { TypeDescriptor } from '../move/index.js';
-export declare function getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[];

package/lib/aptos/utils.js

@@ -1,10 +0,0 @@
-export function getMeaningfulFunctionParams(params) {
-    if (params.length === 0) {
-        return params;
-    }
-    if (params[0].qname === 'signer' && params[0].reference) {
-        params = params.slice(1);
-    }
-    return params;
-}
-//# sourceMappingURL=utils.js.map

package/lib/aptos/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/aptos/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,2BAA2B,CAAC,MAAwB;IAClE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,MAAM,CAAA;KACd;IACD,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE;QACvD,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;KACzB;IACD,OAAO,MAAM,CAAA;AACf,CAAC","sourcesContent":["import { TypeDescriptor } from '../move/index.js'\n\nexport function getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n  if (params.length === 0) {\n    return params\n  }\n  if (params[0].qname === 'signer' && params[0].reference) {\n    params = params.slice(1)\n  }\n  return params\n}\n"]}

package/src/aptos/utils.ts

@@ -1,11 +0,0 @@
-import { TypeDescriptor } from '../move/index.js'
-
-export function getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
-  if (params.length === 0) {
-    return params
-  }
-  if (params[0].qname === 'signer' && params[0].reference) {
-    params = params.slice(1)
-  }
-  return params
-}