@sentio/sdk 2.13.0-rc.2 → 2.13.0-rc.4

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'
@@ -39,12 +39,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 {
@@ -129,7 +131,7 @@ export class AptosBaseProcessor {
             idx
           )
           const eventInstance = evt as EventInstance
-          const decoded = MOVE_CODER.decodeEvent<any>(eventInstance)
+          const decoded = processor.coder.decodeEvent<any>(eventInstance)
           await handler(decoded || eventInstance, ctx)
           processResults.push(ctx.getProcessResult())
         }
@@ -177,7 +179,7 @@ export class AptosBaseProcessor {
         )
         if (tx) {
           const payload = tx.payload as TransactionPayload_EntryFunctionPayload
-          const decoded = MOVE_CODER.decodeFunctionPayload(payload)
+          const decoded = processor.coder.decodeFunctionPayload(payload)
           await handler(decoded, ctx)
         }
         return ctx.getProcessResult()
@@ -192,17 +194,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> {

package/src/aptos/builtin/0x1.ts

@@ -5788,4 +5788,5 @@ export function loadAllTypes(coder: MoveCoder) {
   }
 }
 
-loadAllTypes(defaultMoveCoder());
+loadAllTypes(defaultMoveCoder(AptosNetwork.MAIN_NET));
+loadAllTypes(defaultMoveCoder(AptosNetwork.TEST_NET));

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

@@ -1310,4 +1310,5 @@ export function loadAllTypes(coder: MoveCoder) {
   }
 }
 
-loadAllTypes(defaultMoveCoder());
+loadAllTypes(defaultMoveCoder(AptosNetwork.MAIN_NET));
+loadAllTypes(defaultMoveCoder(AptosNetwork.TEST_NET));

package/src/aptos/codegen/codegen.ts

@@ -1,13 +1,10 @@
 import * as fs from 'fs'
-import { MoveModuleBytecode, toInternalModule } from '../move-types.js'
-import { moduleQname, SPLITTER, TypeDescriptor } from '../../move/index.js'
+import { MoveModuleBytecode } from '../move-types.js'
 import chalk from 'chalk'
 import { AptosNetwork } from '../network.js'
-import { AptosClient } from 'aptos-sdk'
-import { getMeaningfulFunctionParams } from '../utils.js'
-import { InternalMoveModule, InternalMoveStruct } from '../../move/internal-models.js'
+import { join } from 'path'
+import { AptosChainAdapter } from '../aptos-chain-adapter.js'
 import { AbstractCodegen } from '../../move/abstract-codegen.js'
-import {join} from "path";
 
 export async function codegen(abisDir: string, outDir = join('src', 'types', 'aptos'), genExample = false) {
   if (!fs.existsSync(abisDir)) {
@@ -18,59 +15,13 @@ export async function codegen(abisDir: string, outDir = join('src', 'types', 'ap
   console.log(chalk.green(`Generated ${numFiles} for Aptos`))
 }
 
-function getRpcEndpoint(network: AptosNetwork): string {
-  switch (network) {
-    case AptosNetwork.TEST_NET:
-      return 'https://testnet.aptoslabs.com/'
-  }
-  return 'https://mainnet.aptoslabs.com/'
-}
-
-function getRpcClient(network: AptosNetwork): AptosClient {
-  return new AptosClient(getRpcEndpoint(network))
-}
-
 class AptosCodegen extends AbstractCodegen<MoveModuleBytecode[], AptosNetwork> {
   ADDRESS_TYPE = 'Address'
   MAIN_NET = AptosNetwork.MAIN_NET
   TEST_NET = AptosNetwork.TEST_NET
   PREFIX = 'Aptos'
 
-  async fetchModules(account: string, network: AptosNetwork): Promise<MoveModuleBytecode[]> {
-    const client = getRpcClient(network)
-    return await client.getAccountModules(account)
-  }
-
-  toInternalModules(modules: MoveModuleBytecode[]): InternalMoveModule[] {
-    return modules.flatMap((m) => (m.abi ? [toInternalModule(m)] : []))
-  }
-
-  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
-    return getMeaningfulFunctionParams(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
+  constructor() {
+    super(AptosChainAdapter.INSTANCE)
   }
 }

package/src/aptos/context.ts

@@ -2,6 +2,7 @@ import { RecordMetaData } from '@sentio/protos'
 import { type Labels, BaseContext, normalizeLabels } from '@sentio/sdk'
 import { Transaction_UserTransaction } from './move-types.js'
 import { AptosNetwork, getChainId } from './network.js'
+import { defaultMoveCoder, MoveCoder } from './move-coder.js'
 
 export class AptosContext extends BaseContext {
   address: string
@@ -10,6 +11,7 @@ export class AptosContext extends BaseContext {
   version: bigint
   transaction: Transaction_UserTransaction
   eventIndex: number
+  coder: MoveCoder
 
   constructor(
     moduleName: string,
@@ -25,6 +27,7 @@ export class AptosContext extends BaseContext {
     this.moduleName = moduleName
     this.version = version
     this.eventIndex = eventIndex
+    this.coder = defaultMoveCoder(network)
     if (transaction) {
       this.transaction = transaction
     }
@@ -54,6 +57,7 @@ export class AptosResourcesContext extends BaseContext {
   network: AptosNetwork
   version: bigint
   timestampInMicros: number
+  coder: MoveCoder
 
   constructor(network: AptosNetwork, address: string, version: bigint, timestampInMicros: number) {
     super()
@@ -61,6 +65,7 @@ export class AptosResourcesContext extends BaseContext {
     this.network = network
     this.version = version
     this.timestampInMicros = timestampInMicros
+    this.coder = defaultMoveCoder(network)
   }
 
   getChainId(): string {

package/src/aptos/ext/aptos-dex.ts

@@ -1,13 +1,7 @@
 import { Gauge } from '@sentio/sdk'
 import { BigDecimal } from '@sentio/bigdecimal'
 import { calculateValueInUsd, getCoinInfo, whitelistCoins, whiteListed } from './coin.js'
-import {
-  AptosResourcesContext,
-  TypedMoveResource,
-  MoveResource,
-  defaultMoveCoder,
-  AptosContext,
-} from '@sentio/sdk/aptos'
+import { AptosResourcesContext, TypedMoveResource, MoveResource, AptosContext } from '@sentio/sdk/aptos'
 
 export interface PoolAdaptor<T> {
   getXReserve(pool: T): bigint
@@ -104,10 +98,7 @@ export class AptosDex<T> {
     ctx: AptosResourcesContext,
     poolsHandler?: (pools: TypedMoveResource<T>[]) => Promise<void> | void
   ) {
-    const pools: TypedMoveResource<T>[] = defaultMoveCoder().filterAndDecodeResources(
-      this.poolAdaptor.poolTypeName,
-      resources
-    )
+    const pools: TypedMoveResource<T>[] = ctx.coder.filterAndDecodeResources(this.poolAdaptor.poolTypeName, resources)
 
     const volumeByCoin = new Map<string, BigDecimal>()
     const timestamp = ctx.timestampInMicros

package/src/aptos/move-coder.ts

@@ -6,12 +6,17 @@ import {
   TransactionPayload_EntryFunctionPayload,
 } from './move-types.js'
 
-import { TypedEventInstance, TypedMoveResource, TypedFunctionPayload } from './models.js'
-import { getMeaningfulFunctionParams } from './utils.js'
+import { TypedEventInstance, TypedFunctionPayload, TypedMoveResource } from './models.js'
 import { AbstractMoveCoder } from '../move/abstract-move-coder.js'
-import { TypeDescriptor } from '../move/index.js'
+import { AptosNetwork } from './network.js'
+import { AptosChainAdapter } from './aptos-chain-adapter.js'
+
+export class MoveCoder extends AbstractMoveCoder<AptosNetwork, MoveModuleBytecode[], Event | MoveResource> {
+  constructor(network: AptosNetwork) {
+    super(network)
+    this.adapter = new AptosChainAdapter()
+  }
 
-export class MoveCoder extends AbstractMoveCoder<Event | MoveResource> {
   load(module: MoveModuleBytecode) {
     if (!module.abi) {
       throw Error('Module without abi')
@@ -35,13 +40,9 @@ export class MoveCoder extends AbstractMoveCoder<Event | MoveResource> {
     return this.filterAndDecodeStruct(typeQname, resources) as any
   }
 
-  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
-    return getMeaningfulFunctionParams(params)
-  }
-
   decodeFunctionPayload(payload: TransactionPayload_EntryFunctionPayload): TransactionPayload_EntryFunctionPayload {
     const func = this.getMoveFunction(payload.function)
-    const params = getMeaningfulFunctionParams(func.params)
+    const params = this.adapter.getMeaningfulFunctionParams(func.params)
     const argumentsDecoded = this.decodeArray(payload.arguments, params)
 
     return {
@@ -51,8 +52,12 @@ export class MoveCoder extends AbstractMoveCoder<Event | MoveResource> {
   }
 }
 
-export const MOVE_CODER = new MoveCoder()
+const MOVE_CODER = new MoveCoder(AptosNetwork.MAIN_NET)
+const TESTNET_MOVE_CODER = new MoveCoder(AptosNetwork.TEST_NET)
 
-export function defaultMoveCoder(): MoveCoder {
-  return MOVE_CODER
+export function defaultMoveCoder(network: AptosNetwork = AptosNetwork.MAIN_NET): MoveCoder {
+  if (network == AptosNetwork.MAIN_NET) {
+    return MOVE_CODER
+  }
+  return TESTNET_MOVE_CODER
 }

package/src/move/abstract-codegen.ts

@@ -12,6 +12,7 @@ import { format } from 'prettier'
 import { isFrameworkAccount, moduleQname, normalizeToJSName, SPLITTER, VECTOR_STR } from './utils.js'
 import { camelCase, upperFirst } from 'lodash-es'
 import { TypeDescriptor } from './types.js'
+import { ChainAdapter } from './chain-adapter.js'
 
 interface OutputFile {
   fileName: string
@@ -33,14 +34,13 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
   GENERATE_CLIENT = false
   GENERATE_ON_ENTRY = true
   PAYLOAD_OPTIONAL = false
+  SYSTEM_MODULES = new Set(['0x1', '0x2', '0x3'])
 
-  abstract fetchModules(account: string, network: NetworkType): Promise<ModuleTypes>
-  abstract toInternalModules(modules: ModuleTypes): InternalMoveModule[]
-  // Get the structs that represent Events
-  abstract getEventStructs(module: InternalMoveModule): Map<string, InternalMoveStruct>
-  // Get the parameters that actually have arguments in runtime
-  // Aptos first signer and Sui's last TxContext are no use
-  abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]
+  chainAdapter: ChainAdapter<NetworkType, ModuleTypes>
+
+  protected constructor(chainAdapter: ChainAdapter<NetworkType, ModuleTypes>) {
+    this.chainAdapter = chainAdapter
+  }
 
   readModulesFile(fullPath: string) {
     return JSON.parse(fs.readFileSync(fullPath, 'utf-8'))
@@ -70,9 +70,9 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
     const loader = new AccountRegister()
 
     // when generating user code, don't need to generate framework account
-    loader.accountImports.set('0x1', new AccountModulesImportInfo('0x1', '0x1'))
-    loader.accountImports.set('0x2', new AccountModulesImportInfo('0x2', '0x2'))
-    loader.accountImports.set('0x3', new AccountModulesImportInfo('0x3', '0x3'))
+    for (const sysModule of this.SYSTEM_MODULES) {
+      loader.accountImports.set(sysModule, new AccountModulesImportInfo(sysModule, sysModule))
+    }
     // const client = getRpcClient(network)
 
     for (const file of files) {
@@ -81,7 +81,7 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
       }
       const fullPath = path.resolve(srcDir, file)
       const abi = this.readModulesFile(fullPath)
-      const modules = this.toInternalModules(abi)
+      const modules = this.chainAdapter.toInternalModules(abi)
 
       for (const module of modules) {
         loader.register(module, path.basename(file, '.json'))
@@ -100,8 +100,8 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
         console.log(`download dependent module for account ${account} at ${network}`)
 
         try {
-          const rawModules = await this.fetchModules(account, network)
-          const modules = this.toInternalModules(rawModules)
+          const rawModules = await this.chainAdapter.fetchModules(account, network)
+          const modules = this.chainAdapter.toInternalModules(rawModules)
 
           fs.writeFileSync(path.resolve(srcDir, account + '.json'), JSON.stringify(rawModules, null, '\t'))
           for (const module of modules) {
@@ -163,7 +163,7 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
     const clientFunctions = this.GENERATE_CLIENT
       ? module.exposedFunctions.map((f) => this.generateClientFunctions(module, f)).filter((s) => s !== '')
       : []
-    const eventStructs = this.getEventStructs(module)
+    const eventStructs = this.chainAdapter.getEventStructs(module)
     const eventTypes = new Set(eventStructs.keys())
     const events = Array.from(eventStructs.values())
       .map((e) => this.generateOnEvents(module, e))
@@ -282,7 +282,7 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
       return
     }
 
-    const fields = this.getMeaningfulFunctionParams(func.params).map((param) => {
+    const fields = this.chainAdapter.getMeaningfulFunctionParams(func.params).map((param) => {
       return this.generateTypeForDescriptor(param, module.address) + (this.PAYLOAD_OPTIONAL ? ' | undefined' : '')
     })
 
@@ -307,7 +307,7 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
     }
     // const moduleName = normalizeToJSName(module.name)
     const funcName = camelCase(func.name)
-    const fields = this.getMeaningfulFunctionParams(func.params).map((param) => {
+    const fields = this.chainAdapter.getMeaningfulFunctionParams(func.params).map((param) => {
       return this.generateTypeForDescriptor(param, module.address)
     })
     const genericString = this.generateFunctionTypeParameters(func)
@@ -514,6 +514,17 @@ export class AccountCodegen<ModuleType, NetworkType> {
       }
     }
 
+    let loadAllTypes = `loadAllTypes(defaultMoveCoder(${
+      this.moduleGen.PREFIX
+    }Network.${this.moduleGen.generateNetworkOption(this.config.network)}))`
+
+    if (this.moduleGen.SYSTEM_MODULES.has(address)) {
+      loadAllTypes = `
+        loadAllTypes(defaultMoveCoder(${this.moduleGen.PREFIX}Network.MAIN_NET))
+        loadAllTypes(defaultMoveCoder(${this.moduleGen.PREFIX}Network.TEST_NET))
+      `
+    }
+
     const source = `
     /* Autogenerated file. Do not edit manually. */
     /* tslint:disable */
@@ -536,7 +547,7 @@ export class AccountCodegen<ModuleType, NetworkType> {
       }
     }
 
-    loadAllTypes(defaultMoveCoder())
+    ${loadAllTypes}
     ` // source
 
     return [

package/src/move/abstract-move-coder.ts

@@ -2,6 +2,7 @@ import { moduleQname, SPLITTER, VECTOR_STR } from './utils.js'
 import { parseMoveType, TypeDescriptor } from './types.js'
 import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js'
 import { bytesToBigInt } from '../utils/index.js'
+import { ChainAdapter } from './chain-adapter.js'
 
 export type StructWithTag<Base> = {
   type: string
@@ -13,16 +14,22 @@ export type DecodedStructWithTag<B, T> = StructWithTag<B> & {
   type_arguments: string[]
 }
 
-export abstract class AbstractMoveCoder<StructType> {
+export abstract class AbstractMoveCoder<Network, ModuleTypes, StructType> {
   private moduleMapping = new Map<string, InternalMoveModule>()
   private typeMapping = new Map<string, InternalMoveStruct>()
   private funcMapping = new Map<string, InternalMoveFunction>()
+  network: Network
+  adapter: ChainAdapter<Network, ModuleTypes>
+
+  protected constructor(network: Network) {
+    this.network = network
+  }
 
   contains(account: string, name: string) {
     return this.moduleMapping.has(account + '::' + name)
   }
 
-  protected abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]
+  // protected abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]
 
   protected toStructWithTag(val: StructType): StructWithTag<StructType> {
     return val as any
@@ -232,7 +239,7 @@ export abstract class AbstractMoveCoder<StructType> {
 
   encodeCallArgs(args: any[], func: string): any[] {
     const f = this.getMoveFunction(func)
-    return this.encodeArray(args, this.getMeaningfulFunctionParams(f.params))
+    return this.encodeArray(args, this.adapter.getMeaningfulFunctionParams(f.params))
   }
 
   decodeCallResult(res: any[], func: string): any[] {

package/src/move/chain-adapter.ts

@@ -0,0 +1,14 @@
+import { InternalMoveModule, InternalMoveStruct } from './internal-models.js'
+import { TypeDescriptor } from './types.js'
+
+export abstract class ChainAdapter<NetworkType, ModuleTypes> {
+  abstract fetchModules(account: string, network: NetworkType): Promise<ModuleTypes>
+
+  abstract fetchModules(account: string, network: NetworkType): Promise<ModuleTypes>
+  abstract toInternalModules(modules: ModuleTypes): InternalMoveModule[]
+  // Get the structs that represent Events
+  abstract getEventStructs(module: InternalMoveModule): Map<string, InternalMoveStruct>
+  // Get the parameters that actually have arguments in runtime
+  // Aptos first signer and Sui's last TxContext are no use
+  abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]
+}

package/src/move/index.ts

@@ -2,3 +2,4 @@ export * from './filter.js'
 export * from './types.js'
 export * from './utils.js'
 export * from './account.js'
+export * from './chain-adapter.js'

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

@@ -268,4 +268,5 @@ export function loadAllTypes(coder: MoveCoder) {
   }
 }
 
-loadAllTypes(defaultMoveCoder());
+loadAllTypes(defaultMoveCoder(SuiNetwork.MAIN_NET));
+loadAllTypes(defaultMoveCoder(SuiNetwork.TEST_NET));

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

@@ -1553,4 +1553,5 @@ export function loadAllTypes(coder: MoveCoder) {
   }
 }
 
-loadAllTypes(defaultMoveCoder());
+loadAllTypes(defaultMoveCoder(SuiNetwork.MAIN_NET));
+loadAllTypes(defaultMoveCoder(SuiNetwork.TEST_NET));

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

@@ -1577,4 +1577,5 @@ export function loadAllTypes(coder: MoveCoder) {
   }
 }
 
-loadAllTypes(defaultMoveCoder());
+loadAllTypes(defaultMoveCoder(SuiNetwork.MAIN_NET));
+loadAllTypes(defaultMoveCoder(SuiNetwork.TEST_NET));

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

@@ -2,6 +2,7 @@ import { RecordMetaData } from '@sentio/protos'
 import { type Labels, BaseContext, normalizeLabels } from '../index.js'
 import { SuiNetwork, getChainId } from './network.js'
 import { SuiTransactionBlockResponse } from '@mysten/sui.js'
+import { MoveCoder, defaultMoveCoder } from './move-coder.js'
 
 export class SuiContext extends BaseContext {
   address: string
@@ -11,6 +12,7 @@ export class SuiContext extends BaseContext {
   slot: bigint
   transaction: SuiTransactionBlockResponse
   eventIndex: number
+  coder: MoveCoder
 
   constructor(
     moduleName: string,
@@ -28,6 +30,7 @@ export class SuiContext extends BaseContext {
     this.timestamp = timestamp
     this.slot = slot
     this.eventIndex = eventIndex
+    this.coder = defaultMoveCoder(network)
     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,
+  SuiMoveNormalizedModules,
   SuiMoveObject,
   SuiRawData,
 } 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,8 +104,12 @@ export class MoveCoder extends AbstractMoveCoder<SuiEvent | SuiMoveObject> {
   }
 }
 
-export const MOVE_CODER = new MoveCoder()
+const MOVE_CODER = new MoveCoder(SuiNetwork.MAIN_NET)
+const TESTNET_MOVE_CODER = new MoveCoder(SuiNetwork.TEST_NET)
 
-export function defaultMoveCoder(): MoveCoder {
-  return MOVE_CODER
+export function defaultMoveCoder(network: SuiNetwork = SuiNetwork.MAIN_NET): MoveCoder {
+  if (network == SuiNetwork.MAIN_NET) {
+    return MOVE_CODER
+  }
+  return TESTNET_MOVE_CODER
 }