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

package/src/move/abstract-codegen.ts

@@ -34,6 +34,7 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
   GENERATE_CLIENT = false
   GENERATE_ON_ENTRY = true
   PAYLOAD_OPTIONAL = false
+  SYSTEM_MODULES = new Set(['0x1', '0x2', '0x3'])
 
   chainAdapter: ChainAdapter<NetworkType, ModuleTypes>
 
@@ -69,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) {
@@ -449,14 +450,14 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
 export class AccountCodegen<ModuleType, NetworkType> {
   modules: InternalMoveModule[]
   config: Config<NetworkType>
-  abi: ModuleType
+  abi: ModuleType[]
   loader: AccountRegister
   moduleGen: AbstractCodegen<ModuleType, NetworkType>
 
   constructor(
     moduleGen: AbstractCodegen<ModuleType, NetworkType>,
     loader: AccountRegister,
-    abi: ModuleType,
+    abi: ModuleType[],
     modules: InternalMoveModule[],
     config: Config<NetworkType>
   ) {
@@ -513,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 */
@@ -535,7 +547,7 @@ export class AccountCodegen<ModuleType, NetworkType> {
       }
     }
 
-    loadAllTypes(defaultMoveCoder())
+    ${loadAllTypes}
     ` // source
 
     return [

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

@@ -14,12 +14,12 @@ export type DecodedStructWithTag<B, T> = StructWithTag<B> & {
   type_arguments: string[]
 }
 
-export abstract class AbstractMoveCoder<Network, ModuleTypes, StructType> {
+export abstract class AbstractMoveCoder<Network, ModuleType, 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>
+  adapter: ChainAdapter<Network, ModuleType>
 
   protected constructor(network: Network) {
     this.network = network

package/src/move/chain-adapter.ts

@@ -1,11 +1,11 @@
 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>
+export abstract class ChainAdapter<NetworkType, ModuleType> {
+  abstract fetchModule(account: string, module: string, network: NetworkType): Promise<ModuleType>
 
-  abstract fetchModules(account: string, network: NetworkType): Promise<ModuleTypes>
-  abstract toInternalModules(modules: ModuleTypes): InternalMoveModule[]
+  abstract fetchModules(account: string, network: NetworkType): Promise<ModuleType[]>
+  abstract toInternalModules(modules: ModuleType[]): InternalMoveModule[]
   // Get the structs that represent Events
   abstract getEventStructs(module: InternalMoveModule): Map<string, InternalMoveStruct>
   // Get the parameters that actually have arguments in runtime

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,4 +1,4 @@
-import { SuiMoveNormalizedModules } from '@mysten/sui.js'
+import { SuiMoveNormalizedModule } from '@mysten/sui.js'
 
 import { SuiNetwork } from '../network.js'
 import * as fs from 'fs'
@@ -18,7 +18,7 @@ export async function codegen(abisDir: string, outDir = join('src', 'types', 'su
   console.log(chalk.green(`Generated ${numFiles} for Sui`))
 }
 
-class SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {
+class SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModule, SuiNetwork> {
   ADDRESS_TYPE = 'SuiAddress'
   MAIN_NET = SuiNetwork.MAIN_NET
   TEST_NET = SuiNetwork.TEST_NET

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

@@ -7,7 +7,6 @@ import {
   SuiMoveNormalizedModule,
   SuiMoveObject,
   SuiRawData,
-  SuiMoveNormalizedModules,
 } from '@mysten/sui.js'
 import { toInternalModule } from './move-types.js'
 import { SPLITTER, TypeDescriptor } from '../move/index.js'
@@ -15,7 +14,7 @@ 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> {
+export class MoveCoder extends AbstractMoveCoder<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject> {
   constructor(network: SuiNetwork) {
     super(network)
     this.adapter = new SuiChainAdapter()
@@ -104,8 +103,12 @@ export class MoveCoder extends AbstractMoveCoder<SuiNetwork, SuiMoveNormalizedMo
   }
 }
 
-export const MOVE_CODER = new MoveCoder(SuiNetwork.MAIN_NET)
+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
 }

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

@@ -2,14 +2,20 @@ import { ChainAdapter, moduleQname, SPLITTER, TypeDescriptor } from '../move/ind
 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'
+import { Connection, JsonRpcProvider, SuiMoveNormalizedModule } from '@mysten/sui.js'
 
-export class SuiChainAdapter extends ChainAdapter<SuiNetwork, SuiMoveNormalizedModules> {
+export class SuiChainAdapter extends ChainAdapter<SuiNetwork, SuiMoveNormalizedModule> {
   static INSTANCE = new SuiChainAdapter()
 
-  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {
+  async fetchModule(account: string, module: string, network: SuiNetwork): Promise<SuiMoveNormalizedModule> {
     const client = getRpcClient(network)
-    return await client.getNormalizedMoveModulesByPackage({ package: account })
+    return await client.getNormalizedMoveModule({ package: account, module })
+  }
+
+  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModule[]> {
+    const client = getRpcClient(network)
+    const modules = await client.getNormalizedMoveModulesByPackage({ package: account })
+    return Object.values(modules)
   }
 
   getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
@@ -19,7 +25,7 @@ export class SuiChainAdapter extends ChainAdapter<SuiNetwork, SuiMoveNormalizedM
     return params.slice(0, params.length - 1)
   }
 
-  toInternalModules(modules: SuiMoveNormalizedModules): InternalMoveModule[] {
+  toInternalModules(modules: SuiMoveNormalizedModule[]): InternalMoveModule[] {
     return Object.values(modules).map(toInternalModule)
   }
 

package/src/sui/sui-processor.ts

@@ -21,7 +21,7 @@ import {
 } from '@mysten/sui.js'
 import { CallHandler, EventFilter, EventHandler, FunctionNameAndCallFilter, parseMoveType } from '../move/index.js'
 import { getMoveCalls } from './utils.js'
-import { defaultMoveCoder } from './move-coder.js'
+import { defaultMoveCoder, MoveCoder } from './move-coder.js'
 // import { dynamic_field } from './builtin/0x2.js'
 
 class IndexConfigure {
@@ -52,11 +52,13 @@ export class SuiBaseProcessor {
 
   eventHandlers: EventHandler<Data_SuiEvent>[] = []
   callHandlers: CallHandler<Data_SuiCall>[] = []
+  coder: MoveCoder
 
   constructor(name: string, options: SuiBindOptions) {
     this.moduleName = name
     this.config = configure(options)
     SuiProcessorState.INSTANCE.addValue(this)
+    this.coder = defaultMoveCoder(this.config.network)
   }
 
   getChainId(): string {
@@ -110,7 +112,7 @@ export class SuiBaseProcessor {
             idx
           )
 
-          const decoded = defaultMoveCoder().decodeEvent<any>(evt)
+          const decoded = processor.coder.decodeEvent<any>(evt)
           await handler(decoded || evt, ctx)
           processResults.push(ctx.getProcessResult())
         }
@@ -169,7 +171,7 @@ export class SuiBaseProcessor {
           const programmableTx = getProgrammableTransaction(txKind)
 
           const payload = calls[0]
-          const decoded = defaultMoveCoder().decodeFunctionPayload(payload, programmableTx?.inputs || [])
+          const decoded = processor.coder.decodeFunctionPayload(payload, programmableTx?.inputs || [])
           await handler(decoded, ctx)
         }
         return ctx.getProcessResult()