@sentio/sdk 2.11.0-rc.1 → 2.11.0-rc.2

package/lib/move/abstract-move-coder.d.ts

@@ -1,10 +1,10 @@
 import { TypeDescriptor } from './types.js';
 import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js';
-type StructWithTag<Base> = Base & {
+export type StructWithTag<Base> = Base & {
     type: string;
     data: any;
 };
-type DecodedStructWithTag<B, T> = StructWithTag<B> & {
+export type DecodedStructWithTag<B, T> = StructWithTag<B> & {
     data_decoded: T;
     type_arguments: string[];
 };
@@ -28,4 +28,3 @@ export declare abstract class AbstractMoveCoder<StructType> {
     protected filterAndDecodeInternal<T>(typeQname: string, structs: StructWithTag<StructType>[]): DecodedStructWithTag<StructType, T>[];
     protected decodedInternal<T>(typeStruct: StructWithTag<StructType>): DecodedStructWithTag<StructType, T> | undefined;
 }
-export {};

package/lib/move/abstract-move-coder.js

@@ -204,7 +204,12 @@ export class AbstractMoveCoder {
         }
         const results = [];
         for (const resource of structs) {
-            if (resource.type.split('<')[0] !== typeQname) {
+            if (typeQname.includes('<')) {
+                if (resource.type !== typeQname) {
+                    continue;
+                }
+            }
+            else if (resource.type.split('<')[0] !== typeQname) {
                 continue;
             }
             const result = this.decodedInternal(resource);

package/lib/move/abstract-move-coder.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract-move-coder.js","sourceRoot":"","sources":["../../src/move/abstract-move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { moduleQname, SPLITTER, VECTOR_STR } from './utils.js'\nimport { parseMoveType, TypeDescriptor } from './types.js'\nimport { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js'\nimport { bytesToBigInt } from '../utils/index.js'\n\ntype StructWithTag<Base> = Base & {\n  type: string\n  data: any\n}\n\ntype DecodedStructWithTag<B, T> = StructWithTag<B> & {\n  data_decoded: T\n  type_arguments: string[]\n}\n\nexport abstract class AbstractMoveCoder<StructType> {\n  private moduleMapping = new Map<string, InternalMoveModule>()\n  private typeMapping = new Map<string, InternalMoveStruct>()\n  private funcMapping = new Map<string, InternalMoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  protected abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]\n\n  protected loadInternal(module: InternalMoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposedFunctions) {\n      // if (!func.isEntry) {\n      //   continue\n      // }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  protected decodeBigInt(data: any): bigint {\n    if (Array.isArray(data)) {\n      // Only sui function need this, strange\n      const bytes = data as number[]\n      return bytesToBigInt(new Uint8Array(bytes.slice().reverse()))\n    } else {\n      return BigInt(data)\n    }\n  }\n\n  protected encodeBigInt(data: bigint): any {\n    return '0x' + data.toString(16)\n  }\n\n  getMoveStruct(type: string): InternalMoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type + ' type are not imported anywhere')\n    }\n    return struct\n  }\n\n  getMoveFunction(type: string): InternalMoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function ' + type + ' type are not imported anywhere')\n    }\n    return func\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n        return this.decodeBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  encode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n      case 'u256':\n      case 'U256':\n        return this.encodeBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.encode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.encode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  decodeArray(entries: any[], types: TypeDescriptor[]): any[] {\n    const entriesDecoded: any[] = []\n    for (const [idx, arg] of entries.entries()) {\n      // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n      const argType = types[idx]\n      try {\n        entriesDecoded.push(this.decode(arg, argType))\n      } catch (e) {\n        console.error(e, 'Decoding error for ', JSON.stringify(arg), 'using type', argType)\n        return entries\n      }\n    }\n    return entriesDecoded\n  }\n\n  encodeArray(entriesDecoded: any[], types: TypeDescriptor[]): any[] {\n    const entries: any[] = []\n    for (const [idx, arg] of entriesDecoded.entries()) {\n      // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n      const argType = types[idx]\n      try {\n        entries.push(this.encode(arg, argType))\n      } catch (e) {\n        throw Error('Decoding error for ' + JSON.stringify(arg) + 'using type' + argType + e.toString())\n      }\n    }\n    return entries\n  }\n\n  encodeCallArgs(args: any[], func: string): any[] {\n    const f = this.getMoveFunction(func)\n    return this.encodeArray(args, this.getMeaningfulFunctionParams(f.params))\n  }\n\n  decodeCallResult(res: any[], func: string): any[] {\n    const f = this.getMoveFunction(func)\n    return this.decodeArray(res, f.return)\n  }\n\n  protected filterAndDecodeInternal<T>(\n    typeQname: string,\n    structs: StructWithTag<StructType>[]\n  ): DecodedStructWithTag<StructType, T>[] {\n    if (!structs) {\n      return []\n    }\n    const results: DecodedStructWithTag<StructType, T>[] = []\n    for (const resource of structs) {\n      if (resource.type.split('<')[0] !== typeQname) {\n        continue\n      }\n      const result = this.decodedInternal(resource)\n      if (result) {\n        results.push(result as DecodedStructWithTag<StructType, T>)\n      }\n    }\n    return results\n  }\n\n  protected decodedInternal<T>(typeStruct: StructWithTag<StructType>): DecodedStructWithTag<StructType, T> | undefined {\n    const typeDescriptor = parseMoveType(typeStruct.type)\n    const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())\n\n    let dataTyped = undefined\n    try {\n      dataTyped = this.decode(typeStruct.data, typeDescriptor)\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(typeStruct), e)\n      return undefined\n    }\n    return {\n      ...typeStruct,\n      data_decoded: dataTyped,\n      type_arguments: typeArguments,\n    } as DecodedStructWithTag<StructType, T>\n  }\n}\n"]}
+{"version":3,"file":"abstract-move-coder.js","sourceRoot":"","sources":["../../src/move/abstract-move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { moduleQname, SPLITTER, VECTOR_STR } from './utils.js'\nimport { parseMoveType, TypeDescriptor } from './types.js'\nimport { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js'\nimport { bytesToBigInt } from '../utils/index.js'\n\nexport type StructWithTag<Base> = Base & {\n  type: string\n  data: any\n}\n\nexport type DecodedStructWithTag<B, T> = StructWithTag<B> & {\n  data_decoded: T\n  type_arguments: string[]\n}\n\nexport abstract class AbstractMoveCoder<StructType> {\n  private moduleMapping = new Map<string, InternalMoveModule>()\n  private typeMapping = new Map<string, InternalMoveStruct>()\n  private funcMapping = new Map<string, InternalMoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  protected abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]\n\n  protected loadInternal(module: InternalMoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposedFunctions) {\n      // if (!func.isEntry) {\n      //   continue\n      // }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  protected decodeBigInt(data: any): bigint {\n    if (Array.isArray(data)) {\n      // Only sui function need this, strange\n      const bytes = data as number[]\n      return bytesToBigInt(new Uint8Array(bytes.slice().reverse()))\n    } else {\n      return BigInt(data)\n    }\n  }\n\n  protected encodeBigInt(data: bigint): any {\n    return '0x' + data.toString(16)\n  }\n\n  getMoveStruct(type: string): InternalMoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type + ' type are not imported anywhere')\n    }\n    return struct\n  }\n\n  getMoveFunction(type: string): InternalMoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function ' + type + ' type are not imported anywhere')\n    }\n    return func\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n        return this.decodeBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  encode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n      case 'u256':\n      case 'U256':\n        return this.encodeBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.encode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.encode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  decodeArray(entries: any[], types: TypeDescriptor[]): any[] {\n    const entriesDecoded: any[] = []\n    for (const [idx, arg] of entries.entries()) {\n      // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n      const argType = types[idx]\n      try {\n        entriesDecoded.push(this.decode(arg, argType))\n      } catch (e) {\n        console.error(e, 'Decoding error for ', JSON.stringify(arg), 'using type', argType)\n        return entries\n      }\n    }\n    return entriesDecoded\n  }\n\n  encodeArray(entriesDecoded: any[], types: TypeDescriptor[]): any[] {\n    const entries: any[] = []\n    for (const [idx, arg] of entriesDecoded.entries()) {\n      // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n      const argType = types[idx]\n      try {\n        entries.push(this.encode(arg, argType))\n      } catch (e) {\n        throw Error('Decoding error for ' + JSON.stringify(arg) + 'using type' + argType + e.toString())\n      }\n    }\n    return entries\n  }\n\n  encodeCallArgs(args: any[], func: string): any[] {\n    const f = this.getMoveFunction(func)\n    return this.encodeArray(args, this.getMeaningfulFunctionParams(f.params))\n  }\n\n  decodeCallResult(res: any[], func: string): any[] {\n    const f = this.getMoveFunction(func)\n    return this.decodeArray(res, f.return)\n  }\n\n  protected filterAndDecodeInternal<T>(\n    typeQname: string,\n    structs: StructWithTag<StructType>[]\n  ): DecodedStructWithTag<StructType, T>[] {\n    if (!structs) {\n      return []\n    }\n    const results: DecodedStructWithTag<StructType, T>[] = []\n    for (const resource of structs) {\n      if (typeQname.includes('<')) {\n        if (resource.type !== typeQname) {\n          continue\n        }\n      } else if (resource.type.split('<')[0] !== typeQname) {\n        continue\n      }\n      const result = this.decodedInternal(resource)\n      if (result) {\n        results.push(result as DecodedStructWithTag<StructType, T>)\n      }\n    }\n    return results\n  }\n\n  protected decodedInternal<T>(typeStruct: StructWithTag<StructType>): DecodedStructWithTag<StructType, T> | undefined {\n    const typeDescriptor = parseMoveType(typeStruct.type)\n    const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())\n\n    let dataTyped = undefined\n    try {\n      dataTyped = this.decode(typeStruct.data, typeDescriptor)\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(typeStruct), e)\n      return undefined\n    }\n    return {\n      ...typeStruct,\n      data_decoded: dataTyped,\n      type_arguments: typeArguments,\n    } as DecodedStructWithTag<StructType, T>\n  }\n}\n"]}

package/lib/sui/codegen/codegen.js

@@ -30,7 +30,7 @@ class SuiCodegen extends AbstractCodegen {
     TEST_NET = SuiNetwork.TEST_NET;
     PREFIX = 'Sui';
     STRUCT_FIELD_NAME = 'fields';
-    GENERATE_ON_ENTRY = true;
+    // GENERATE_ON_ENTRY = true
     async fetchModules(account, network) {
         const client = getRpcClient(network);
         return await client.getNormalizedMoveModulesByPackage({ package: account });

package/lib/sui/codegen/codegen.js.map

@@ -1 +1 @@
-{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/sui/codegen/codegen.ts"],"names":[],"mappings":"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","sourcesContent":["import { Connection, JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.js'\n\nimport { SuiNetwork } from '../network.js'\nimport * as fs from 'fs'\nimport chalk from 'chalk'\nimport { InternalMoveModule, InternalMoveStruct } from '../../move/internal-models.js'\nimport { AbstractCodegen } from '../../move/abstract-codegen.js'\nimport { toInternalModule } from '../move-types.js'\nimport { moduleQname, SPLITTER, structQname, TypeDescriptor } from '../../move/index.js'\nimport { getMeaningfulFunctionParams } from '../utils.js'\n\nexport async function codegen(abisDir: string, outDir = 'src/types/sui', genExample = false) {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  const gen = new SuiCodegen()\n  const numFiles = await gen.generate(abisDir, outDir)\n  console.log(chalk.green(`Generated ${numFiles} for Sui`))\n}\n\nfunction getRpcEndpoint(network: SuiNetwork): string {\n  switch (network) {\n    case SuiNetwork.TEST_NET:\n      return 'https://fullnode.testnet.sui.io/'\n  }\n  return 'https://fullnode.mainnet.sui.io/'\n}\n\nfunction getRpcClient(network: SuiNetwork): JsonRpcProvider {\n  return new JsonRpcProvider(new Connection({ fullnode: getRpcEndpoint(network) }))\n}\n\nclass SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {\n  ADDRESS_TYPE = 'SuiAddress'\n  MAIN_NET = SuiNetwork.MAIN_NET\n  TEST_NET = SuiNetwork.TEST_NET\n  PREFIX = 'Sui'\n  STRUCT_FIELD_NAME = 'fields'\n  GENERATE_ON_ENTRY = true\n\n  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {\n    const client = getRpcClient(network)\n    return await client.getNormalizedMoveModulesByPackage({ package: account })\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  toInternalModules(modules: SuiMoveNormalizedModules): InternalMoveModule[] {\n    return Object.values(modules).map(toInternalModule)\n  }\n\n  getEventStructs(module: InternalMoveModule) {\n    const qname = moduleQname(module)\n    const eventMap = new Map<string, InternalMoveStruct>()\n\n    for (const struct of module.structs) {\n      const abilities = new Set(struct.abilities)\n      if (abilities.has('Drop') && abilities.has('Copy')) {\n        eventMap.set(qname + SPLITTER + struct.name, struct)\n      }\n    }\n    return eventMap\n  }\n\n  readModulesFile(fullPath: string) {\n    const res = super.readModulesFile(fullPath)\n    if (res.result) {\n      return res.result\n    }\n    return res\n  }\n\n  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>): string {\n    switch (structQname(module, struct)) {\n      case '0x2::object::ID':\n        return `export type ${struct.name} = string`\n      case '0x2::coin::Coin':\n        return `export type ${struct.name}<T> = string`\n      case '0x1::option::Option':\n        return `export type Option<T> = T | undefined`\n    }\n    return super.generateStructs(module, struct, events)\n  }\n\n  generateOnEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {\n    switch (structQname(module, struct)) {\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::option::Option':\n        return ''\n    }\n    return super.generateOnEvents(module, struct)\n  }\n}\n"]}
+{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/sui/codegen/codegen.ts"],"names":[],"mappings":"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","sourcesContent":["import { Connection, JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.js'\n\nimport { SuiNetwork } from '../network.js'\nimport * as fs from 'fs'\nimport chalk from 'chalk'\nimport { InternalMoveModule, InternalMoveStruct } from '../../move/internal-models.js'\nimport { AbstractCodegen } from '../../move/abstract-codegen.js'\nimport { toInternalModule } from '../move-types.js'\nimport { moduleQname, SPLITTER, structQname, TypeDescriptor } from '../../move/index.js'\nimport { getMeaningfulFunctionParams } from '../utils.js'\n\nexport async function codegen(abisDir: string, outDir = 'src/types/sui', genExample = false) {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  const gen = new SuiCodegen()\n  const numFiles = await gen.generate(abisDir, outDir)\n  console.log(chalk.green(`Generated ${numFiles} for Sui`))\n}\n\nfunction getRpcEndpoint(network: SuiNetwork): string {\n  switch (network) {\n    case SuiNetwork.TEST_NET:\n      return 'https://fullnode.testnet.sui.io/'\n  }\n  return 'https://fullnode.mainnet.sui.io/'\n}\n\nfunction getRpcClient(network: SuiNetwork): JsonRpcProvider {\n  return new JsonRpcProvider(new Connection({ fullnode: getRpcEndpoint(network) }))\n}\n\nclass SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {\n  ADDRESS_TYPE = 'SuiAddress'\n  MAIN_NET = SuiNetwork.MAIN_NET\n  TEST_NET = SuiNetwork.TEST_NET\n  PREFIX = 'Sui'\n  STRUCT_FIELD_NAME = 'fields'\n  // GENERATE_ON_ENTRY = true\n\n  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {\n    const client = getRpcClient(network)\n    return await client.getNormalizedMoveModulesByPackage({ package: account })\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  toInternalModules(modules: SuiMoveNormalizedModules): InternalMoveModule[] {\n    return Object.values(modules).map(toInternalModule)\n  }\n\n  getEventStructs(module: InternalMoveModule) {\n    const qname = moduleQname(module)\n    const eventMap = new Map<string, InternalMoveStruct>()\n\n    for (const struct of module.structs) {\n      const abilities = new Set(struct.abilities)\n      if (abilities.has('Drop') && abilities.has('Copy')) {\n        eventMap.set(qname + SPLITTER + struct.name, struct)\n      }\n    }\n    return eventMap\n  }\n\n  readModulesFile(fullPath: string) {\n    const res = super.readModulesFile(fullPath)\n    if (res.result) {\n      return res.result\n    }\n    return res\n  }\n\n  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>): string {\n    switch (structQname(module, struct)) {\n      case '0x2::object::ID':\n        return `export type ${struct.name} = string`\n      case '0x2::coin::Coin':\n        return `export type ${struct.name}<T> = string`\n      case '0x1::option::Option':\n        return `export type Option<T> = T | undefined`\n    }\n    return super.generateStructs(module, struct, events)\n  }\n\n  generateOnEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {\n    switch (structQname(module, struct)) {\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::option::Option':\n        return ''\n    }\n    return super.generateOnEvents(module, struct)\n  }\n}\n"]}

package/lib/sui/models.d.ts

@@ -1,4 +1,4 @@
-import { SuiEvent, MoveCallSuiTransaction } from '@mysten/sui.js';
+import { SuiEvent, MoveCallSuiTransaction, SuiMoveObject } from '@mysten/sui.js';
 export type TypedEventInstance<T> = SuiEvent & {
     /**
      * decoded data using ABI, undefined if there is decoding error, usually because the ABI/data mismatch
@@ -12,3 +12,7 @@ export type TypedFunctionPayload<T extends Array<any>> = MoveCallSuiTransaction
      */
     arguments_decoded: T;
 };
+export type TypedSuiMoveObject<T> = SuiMoveObject & {
+    data_decoded: T;
+    type_arguments: string[];
+};

package/lib/sui/models.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/sui/models.ts"],"names":[],"mappings":"","sourcesContent":["import { SuiEvent, MoveCallSuiTransaction } from '@mysten/sui.js'\n\nexport type TypedEventInstance<T> = SuiEvent & {\n  /**\n   * decoded data using ABI, undefined if there is decoding error, usually because the ABI/data mismatch\n   */\n  data_decoded: T\n\n  type_arguments: string[]\n}\n\nexport type TypedFunctionPayload<T extends Array<any>> = MoveCallSuiTransaction & {\n  /**\n   * decoded argument data using ABI, undefined if there is decoding error, usually because the ABI/data mismatch\n   */\n  arguments_decoded: T\n}\n"]}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/sui/models.ts"],"names":[],"mappings":"","sourcesContent":["import { SuiEvent, MoveCallSuiTransaction, SuiMoveObject } from '@mysten/sui.js'\n\nexport type TypedEventInstance<T> = SuiEvent & {\n  /**\n   * decoded data using ABI, undefined if there is decoding error, usually because the ABI/data mismatch\n   */\n  data_decoded: T\n\n  type_arguments: string[]\n}\n\nexport type TypedFunctionPayload<T extends Array<any>> = MoveCallSuiTransaction & {\n  /**\n   * decoded argument data using ABI, undefined if there is decoding error, usually because the ABI/data mismatch\n   */\n  arguments_decoded: T\n}\n\nexport type TypedSuiMoveObject<T> = SuiMoveObject & {\n  data_decoded: T\n  type_arguments: string[]\n}\n"]}

package/lib/sui/move-coder.d.ts

@@ -1,12 +1,15 @@
-import { TypedEventInstance } from './models.js';
+import { TypedEventInstance, TypedSuiMoveObject } from './models.js';
 import { AbstractMoveCoder } from '../move/abstract-move-coder.js';
-import { MoveCallSuiTransaction, SuiEvent, SuiMoveNormalizedModule, SuiCallArg } from '@mysten/sui.js';
+import { MoveCallSuiTransaction, SuiEvent, SuiMoveNormalizedModule, SuiCallArg, SuiMoveObject } from '@mysten/sui.js';
 import { TypeDescriptor } from '../move/index.js';
+import { dynamic_field } from './builtin/0x2.js';
 export declare class MoveCoder extends AbstractMoveCoder<SuiEvent> {
     load(module: SuiMoveNormalizedModule): void;
     decode(data: any, type: TypeDescriptor): any;
     decodeEvent<T>(event: SuiEvent): TypedEventInstance<T> | undefined;
     filterAndDecodeEvents<T>(typeQname: string, resources: SuiEvent[]): TypedEventInstance<T>[];
+    getObjectsFromDynamicFields<Name, Value>(objects: SuiMoveObject[]): dynamic_field.Field<Name, Value>[];
+    filterAndDecodeObjects<T>(typeQname: string, objects: SuiMoveObject[]): TypedSuiMoveObject<T>[];
     getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[];
     decodeFunctionPayload(payload: MoveCallSuiTransaction, inputs: SuiCallArg[]): MoveCallSuiTransaction;
 }

package/lib/sui/move-coder.js

@@ -29,7 +29,21 @@ export class MoveCoder extends AbstractMoveCoder {
             return { ...event, data: event.parsedJson, type: event.type };
         }));
         return resp.map((res) => {
-            delete res.data_decoded;
+            delete res.data;
+            const event = res;
+            return { ...event, data_decoded: res?.data_decoded, type_arguments: res?.type_arguments || [] };
+        });
+    }
+    getObjectsFromDynamicFields(objects) {
+        return this.filterAndDecodeObjects(`0x2::dynamic_field::Field`, objects).map((o) => o.data_decoded);
+    }
+    filterAndDecodeObjects(typeQname, objects) {
+        const structs = objects.map((obj) => {
+            return { ...obj, data: obj.fields, type: obj.type };
+        });
+        const resp = this.filterAndDecodeInternal(typeQname, structs);
+        return resp.map((res) => {
+            delete res.data;
             const event = res;
             return { ...event, data_decoded: res?.data_decoded, type_arguments: res?.type_arguments || [] };
         });
@@ -47,7 +61,17 @@ export class MoveCoder extends AbstractMoveCoder {
             if ('Input' in argValue) {
                 const idx = argValue.Input;
                 const arg = inputs[idx];
-                args.push(arg); // TODO check why ts not work using arg.push(arg)
+                if (arg.type === 'pure') {
+                    args.push(arg.value);
+                }
+                else if (arg.type === 'object') {
+                    args.push(arg.objectId);
+                }
+                else {
+                    console.error('unexpected function arg value');
+                    args.push(undefined);
+                }
+                // args.push(arg) // TODO check why ts not work using arg.push(arg)
             }
             else {
                 args.push(undefined);

package/lib/sui/move-coder.js.map

@@ -1 +1 @@
-{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/sui/move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedEventInstance, TypedFunctionPayload } from './models.js'\nimport { AbstractMoveCoder } from '../move/abstract-move-coder.js'\nimport { MoveCallSuiTransaction, SuiEvent, SuiMoveNormalizedModule, SuiCallArg } from '@mysten/sui.js'\nimport { toInternalModule } from './move-types.js'\nimport { SPLITTER, TypeDescriptor } from '../move/index.js'\nimport { getMeaningfulFunctionParams } from './utils.js'\n\nexport class MoveCoder extends AbstractMoveCoder<SuiEvent> {\n  load(module: SuiMoveNormalizedModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.loadInternal(toInternalModule(module))\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    switch (type.qname) {\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n        return data\n      case '0x1::option::Option':\n        return this.decode(data, type.typeArgs[0])\n      default:\n        return super.decode(data, type)\n    }\n  }\n\n  decodeEvent<T>(event: SuiEvent): TypedEventInstance<T> | undefined {\n    const res = this.decodedInternal<T>({ ...event, data: event.parsedJson })\n    return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: SuiEvent[]): TypedEventInstance<T>[] {\n    const resp = this.filterAndDecodeInternal(\n      typeQname,\n      resources.map((event) => {\n        return { ...event, data: event.parsedJson, type: event.type }\n      })\n    )\n    return resp.map((res) => {\n      delete res.data_decoded\n      const event = res as SuiEvent\n      return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n    })\n  }\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  decodeFunctionPayload(payload: MoveCallSuiTransaction, inputs: SuiCallArg[]): MoveCallSuiTransaction {\n    const functionType = [payload.package, payload.module, payload.function].join(SPLITTER)\n    const func = this.getMoveFunction(functionType)\n    const params = getMeaningfulFunctionParams(func.params)\n    const args = []\n    for (const value of payload.arguments || []) {\n      const argValue = value as any\n      if ('Input' in (argValue as any)) {\n        const idx = argValue.Input\n        const arg = inputs[idx]\n        args.push(arg) // TODO check why ts not work using arg.push(arg)\n      } else {\n        args.push(undefined)\n      }\n    }\n\n    const argumentsTyped = this.decodeArray(args, params)\n    return {\n      ...payload,\n      arguments_decoded: argumentsTyped,\n    } as TypedFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}
+{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/sui/move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedEventInstance, TypedFunctionPayload, TypedSuiMoveObject } from './models.js'\nimport { AbstractMoveCoder, StructWithTag } from '../move/abstract-move-coder.js'\nimport { MoveCallSuiTransaction, SuiEvent, SuiMoveNormalizedModule, SuiCallArg, SuiMoveObject } from '@mysten/sui.js'\nimport { toInternalModule } from './move-types.js'\nimport { SPLITTER, TypeDescriptor } from '../move/index.js'\nimport { getMeaningfulFunctionParams } from './utils.js'\nimport { dynamic_field } from './builtin/0x2.js'\n\nexport class MoveCoder extends AbstractMoveCoder<SuiEvent> {\n  load(module: SuiMoveNormalizedModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.loadInternal(toInternalModule(module))\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    switch (type.qname) {\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n        return data\n      case '0x1::option::Option':\n        return this.decode(data, type.typeArgs[0])\n      default:\n        return super.decode(data, type)\n    }\n  }\n\n  decodeEvent<T>(event: SuiEvent): TypedEventInstance<T> | undefined {\n    const res = this.decodedInternal<T>({ ...event, data: event.parsedJson })\n    return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: SuiEvent[]): TypedEventInstance<T>[] {\n    const resp = this.filterAndDecodeInternal(\n      typeQname,\n      resources.map((event) => {\n        return { ...event, data: event.parsedJson, type: event.type }\n      })\n    )\n    return resp.map((res) => {\n      delete res.data\n      const event = res as SuiEvent\n      return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n    })\n  }\n\n  getObjectsFromDynamicFields<Name, Value>(objects: SuiMoveObject[]): dynamic_field.Field<Name, Value>[] {\n    return this.filterAndDecodeObjects(`0x2::dynamic_field::Field`, objects).map((o) => o.data_decoded) as any\n  }\n\n  filterAndDecodeObjects<T>(typeQname: string, objects: SuiMoveObject[]): TypedSuiMoveObject<T>[] {\n    const structs = objects.map((obj) => {\n      return { ...obj, data: obj.fields, type: obj.type }\n    }) as StructWithTag<any>\n    const resp = this.filterAndDecodeInternal(typeQname, structs)\n    return resp.map((res) => {\n      delete res.data\n      const event = res as any as SuiMoveObject\n      return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n    })\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  decodeFunctionPayload(payload: MoveCallSuiTransaction, inputs: SuiCallArg[]): MoveCallSuiTransaction {\n    const functionType = [payload.package, payload.module, payload.function].join(SPLITTER)\n    const func = this.getMoveFunction(functionType)\n    const params = getMeaningfulFunctionParams(func.params)\n    const args = []\n    for (const value of payload.arguments || []) {\n      const argValue = value as any\n      if ('Input' in (argValue as any)) {\n        const idx = argValue.Input\n        const arg = inputs[idx]\n        if (arg.type === 'pure') {\n          args.push(arg.value)\n        } else if (arg.type === 'object') {\n          args.push(arg.objectId)\n        } else {\n          console.error('unexpected function arg value')\n          args.push(undefined)\n        }\n        // args.push(arg) // TODO check why ts not work using arg.push(arg)\n      } else {\n        args.push(undefined)\n      }\n    }\n\n    const argumentsTyped = this.decodeArray(args, params)\n    return {\n      ...payload,\n      arguments_decoded: argumentsTyped,\n    } as TypedFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}

package/lib/sui/utils.js

@@ -11,6 +11,11 @@ export function getMoveCalls(txBlock) {
     return programmableTx.transactions.flatMap((tx) => {
         if ('MoveCall' in tx) {
             const call = tx.MoveCall;
+            let pkg = call.package;
+            if (call.package.startsWith('0x000000000000000000000000000000000000000000000000000000000000000')) {
+                pkg = '0x' + pkg[pkg.length - 1];
+            }
+            call.package = pkg;
             return [call];
         }
         return [];

package/lib/sui/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/sui/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,0BAA0B,GAG3B,MAAM,gBAAgB,CAAA;AAGvB,MAAM,UAAU,YAAY,CAAC,OAAoC;IAC/D,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAC1C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,EAAE,CAAA;KACV;IACD,MAAM,cAAc,GAAwC,0BAA0B,CAAC,MAAM,CAAC,CAAA;IAC9F,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAkB,EAAE,EAAE;QAChE,IAAI,UAAU,IAAI,EAAE,EAAE;YACpB,MAAM,IAAI,GAAG,EAAE,CAAC,QAAkC,CAAA;YAClD,OAAO,CAAC,IAAI,CAAC,CAAA;SACd;QACD,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAAwB;IAClE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,MAAM,CAAA;KACd;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAC3C,CAAC","sourcesContent":["import {\n  SuiTransactionBlockResponse,\n  MoveCallSuiTransaction,\n  getTransactionKind,\n  getProgrammableTransaction,\n  ProgrammableTransaction,\n  SuiTransaction,\n} from '@mysten/sui.js'\nimport { TypeDescriptor } from '../move/index.js'\n\nexport function getMoveCalls(txBlock: SuiTransactionBlockResponse) {\n  const txKind = getTransactionKind(txBlock)\n  if (!txKind) {\n    return []\n  }\n  const programmableTx: ProgrammableTransaction | undefined = getProgrammableTransaction(txKind)\n  if (!programmableTx) {\n    return []\n  }\n\n  return programmableTx.transactions.flatMap((tx: SuiTransaction) => {\n    if ('MoveCall' in tx) {\n      const call = tx.MoveCall as MoveCallSuiTransaction\n      return [call]\n    }\n    return []\n  })\n}\n\nexport function getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n  if (params.length === 0) {\n    return params\n  }\n  return params.slice(0, params.length - 1)\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/sui/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,0BAA0B,GAG3B,MAAM,gBAAgB,CAAA;AAGvB,MAAM,UAAU,YAAY,CAAC,OAAoC;IAC/D,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAC1C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,EAAE,CAAA;KACV;IACD,MAAM,cAAc,GAAwC,0BAA0B,CAAC,MAAM,CAAC,CAAA;IAC9F,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAkB,EAAE,EAAE;QAChE,IAAI,UAAU,IAAI,EAAE,EAAE;YACpB,MAAM,IAAI,GAAG,EAAE,CAAC,QAAkC,CAAA;YAElD,IAAI,GAAG,GAAW,IAAI,CAAC,OAAO,CAAA;YAC9B,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,mEAAmE,CAAC,EAAE;gBAChG,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;aACjC;YACD,IAAI,CAAC,OAAO,GAAG,GAAG,CAAA;YAElB,OAAO,CAAC,IAAI,CAAC,CAAA;SACd;QACD,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAAwB;IAClE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,MAAM,CAAA;KACd;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAC3C,CAAC","sourcesContent":["import {\n  SuiTransactionBlockResponse,\n  MoveCallSuiTransaction,\n  getTransactionKind,\n  getProgrammableTransaction,\n  ProgrammableTransaction,\n  SuiTransaction,\n} from '@mysten/sui.js'\nimport { TypeDescriptor } from '../move/index.js'\n\nexport function getMoveCalls(txBlock: SuiTransactionBlockResponse) {\n  const txKind = getTransactionKind(txBlock)\n  if (!txKind) {\n    return []\n  }\n  const programmableTx: ProgrammableTransaction | undefined = getProgrammableTransaction(txKind)\n  if (!programmableTx) {\n    return []\n  }\n\n  return programmableTx.transactions.flatMap((tx: SuiTransaction) => {\n    if ('MoveCall' in tx) {\n      const call = tx.MoveCall as MoveCallSuiTransaction\n\n      let pkg: string = call.package\n      if (call.package.startsWith('0x000000000000000000000000000000000000000000000000000000000000000')) {\n        pkg = '0x' + pkg[pkg.length - 1]\n      }\n      call.package = pkg\n\n      return [call]\n    }\n    return []\n  })\n}\n\nexport function getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n  if (params.length === 0) {\n    return params\n  }\n  return params.slice(0, params.length - 1)\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.11.0-rc.1",
+  "version": "2.11.0-rc.2",
   "type": "module",
   "scripts": {
     "compile": "tsc && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
@@ -23,8 +23,8 @@
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.25",
-    "@sentio/protos": "^2.11.0-rc.1",
-    "@sentio/runtime": "^2.11.0-rc.1",
+    "@sentio/protos": "^2.11.0-rc.2",
+    "@sentio/runtime": "^2.11.0-rc.2",
     "@solana/web3.js": "^1.73.2",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:aptos@^1.7.1",
@@ -83,5 +83,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "d0bce70cde54e15e5cbd3fded4f61d7bb1d76b8e"
+  "gitHead": "0b842375cc40e5531291dff505f3a6c53e951382"
 }

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

@@ -3,12 +3,12 @@ import { parseMoveType, TypeDescriptor } from './types.js'
 import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js'
 import { bytesToBigInt } from '../utils/index.js'
 
-type StructWithTag<Base> = Base & {
+export type StructWithTag<Base> = Base & {
   type: string
   data: any
 }
 
-type DecodedStructWithTag<B, T> = StructWithTag<B> & {
+export type DecodedStructWithTag<B, T> = StructWithTag<B> & {
   data_decoded: T
   type_arguments: string[]
 }
@@ -245,7 +245,11 @@ export abstract class AbstractMoveCoder<StructType> {
     }
     const results: DecodedStructWithTag<StructType, T>[] = []
     for (const resource of structs) {
-      if (resource.type.split('<')[0] !== typeQname) {
+      if (typeQname.includes('<')) {
+        if (resource.type !== typeQname) {
+          continue
+        }
+      } else if (resource.type.split('<')[0] !== typeQname) {
         continue
       }
       const result = this.decodedInternal(resource)

package/src/sui/codegen/codegen.ts

@@ -36,7 +36,7 @@ class SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {
   TEST_NET = SuiNetwork.TEST_NET
   PREFIX = 'Sui'
   STRUCT_FIELD_NAME = 'fields'
-  GENERATE_ON_ENTRY = true
+  // GENERATE_ON_ENTRY = true
 
   async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {
     const client = getRpcClient(network)

package/src/sui/models.ts

@@ -1,4 +1,4 @@
-import { SuiEvent, MoveCallSuiTransaction } from '@mysten/sui.js'
+import { SuiEvent, MoveCallSuiTransaction, SuiMoveObject } from '@mysten/sui.js'
 
 export type TypedEventInstance<T> = SuiEvent & {
   /**
@@ -15,3 +15,8 @@ export type TypedFunctionPayload<T extends Array<any>> = MoveCallSuiTransaction
    */
   arguments_decoded: T
 }
+
+export type TypedSuiMoveObject<T> = SuiMoveObject & {
+  data_decoded: T
+  type_arguments: string[]
+}

package/src/sui/move-coder.ts

@@ -1,9 +1,10 @@
-import { TypedEventInstance, TypedFunctionPayload } from './models.js'
-import { AbstractMoveCoder } from '../move/abstract-move-coder.js'
-import { MoveCallSuiTransaction, SuiEvent, SuiMoveNormalizedModule, SuiCallArg } from '@mysten/sui.js'
+import { TypedEventInstance, TypedFunctionPayload, TypedSuiMoveObject } from './models.js'
+import { AbstractMoveCoder, StructWithTag } from '../move/abstract-move-coder.js'
+import { MoveCallSuiTransaction, SuiEvent, SuiMoveNormalizedModule, SuiCallArg, SuiMoveObject } 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'
 
 export class MoveCoder extends AbstractMoveCoder<SuiEvent> {
   load(module: SuiMoveNormalizedModule) {
@@ -37,11 +38,28 @@ export class MoveCoder extends AbstractMoveCoder<SuiEvent> {
       })
     )
     return resp.map((res) => {
-      delete res.data_decoded
+      delete res.data
       const event = res as SuiEvent
       return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }
     })
   }
+
+  getObjectsFromDynamicFields<Name, Value>(objects: SuiMoveObject[]): dynamic_field.Field<Name, Value>[] {
+    return this.filterAndDecodeObjects(`0x2::dynamic_field::Field`, objects).map((o) => o.data_decoded) as any
+  }
+
+  filterAndDecodeObjects<T>(typeQname: string, objects: SuiMoveObject[]): TypedSuiMoveObject<T>[] {
+    const structs = objects.map((obj) => {
+      return { ...obj, data: obj.fields, type: obj.type }
+    }) as StructWithTag<any>
+    const resp = this.filterAndDecodeInternal(typeQname, structs)
+    return resp.map((res) => {
+      delete res.data
+      const event = res as any as SuiMoveObject
+      return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }
+    })
+  }
+
   getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
     return getMeaningfulFunctionParams(params)
   }
@@ -56,7 +74,15 @@ export class MoveCoder extends AbstractMoveCoder<SuiEvent> {
       if ('Input' in (argValue as any)) {
         const idx = argValue.Input
         const arg = inputs[idx]
-        args.push(arg) // TODO check why ts not work using arg.push(arg)
+        if (arg.type === 'pure') {
+          args.push(arg.value)
+        } else if (arg.type === 'object') {
+          args.push(arg.objectId)
+        } else {
+          console.error('unexpected function arg value')
+          args.push(undefined)
+        }
+        // args.push(arg) // TODO check why ts not work using arg.push(arg)
       } else {
         args.push(undefined)
       }

package/src/sui/utils.ts

@@ -21,6 +21,13 @@ export function getMoveCalls(txBlock: SuiTransactionBlockResponse) {
   return programmableTx.transactions.flatMap((tx: SuiTransaction) => {
     if ('MoveCall' in tx) {
       const call = tx.MoveCall as MoveCallSuiTransaction
+
+      let pkg: string = call.package
+      if (call.package.startsWith('0x000000000000000000000000000000000000000000000000000000000000000')) {
+        pkg = '0x' + pkg[pkg.length - 1]
+      }
+      call.package = pkg
+
       return [call]
     }
     return []