@sentio/sdk 2.11.6 → 2.11.7-rc.2

package/lib/sui/codegen/codegen.js

@@ -6,7 +6,7 @@ import { AbstractCodegen } from '../../move/abstract-codegen.js';
 import { toInternalModule } from '../move-types.js';
 import { moduleQname, SPLITTER, structQname } from '../../move/index.js';
 import { getMeaningfulFunctionParams } from '../utils.js';
-import { join } from "path";
+import { join } from 'path';
 export async function codegen(abisDir, outDir = join('src', 'types', 'sui'), genExample = false) {
     if (!fs.existsSync(abisDir)) {
         return;
@@ -30,7 +30,7 @@ class SuiCodegen extends AbstractCodegen {
     MAIN_NET = SuiNetwork.MAIN_NET;
     TEST_NET = SuiNetwork.TEST_NET;
     PREFIX = 'Sui';
-    STRUCT_FIELD_NAME = 'fields';
+    // STRUCT_FIELD_NAME = 'fields'
     // GENERATE_ON_ENTRY = true
     PAYLOAD_OPTIONAL = true;
     async fetchModules(account, network) {

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'\nimport {join} from \"path\";\n\nexport async function codegen(abisDir: string, outDir = join('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  PAYLOAD_OPTIONAL = 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'\nimport { join } from 'path'\n\nexport async function codegen(abisDir: string, outDir = join('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  PAYLOAD_OPTIONAL = 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/move-coder.js

@@ -16,7 +16,8 @@ export class MoveCoder extends AbstractMoveCoder {
             case '0x2::coin::Coin':
                 return data;
             case '0x1::option::Option':
-                return this.decode(data, type.typeArgs[0]);
+                // return this.decode(data, type.typeArgs[0])
+                return data;
             default:
                 return super.decode(data, type);
         }

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, TypedSuiMoveObject } from './models.js'\nimport { AbstractMoveCoder, StructWithTag } from '../move/abstract-move-coder.js'\nimport {\n  MoveCallSuiTransaction,\n  SuiEvent,\n  SuiMoveNormalizedModule,\n  SuiCallArg,\n  SuiMoveObject,\n  SuiRawData,\n} 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 | SuiMoveObject> {\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  toStructWithTag(val: SuiEvent | SuiMoveObject): StructWithTag<SuiEvent> {\n    if (SuiEvent.is(val)) {\n      return {\n        ...val,\n        data: val.parsedJson as any,\n      }\n    }\n    if (SuiRawData.is(val)) {\n      return {\n        ...val,\n        data: val.fields as any,\n      }\n    }\n    return val as any\n  }\n\n  decodeEvent<T>(event: SuiEvent): TypedEventInstance<T> | undefined {\n    return this.decodedStruct<T>(event) as any\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: SuiEvent[]): TypedEventInstance<T>[] {\n    return this.filterAndDecodeStruct(typeQname, resources)\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    return this.filterAndDecodeStruct(typeQname, objects)\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"]}
+{"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 {\n  MoveCallSuiTransaction,\n  SuiEvent,\n  SuiMoveNormalizedModule,\n  SuiCallArg,\n  SuiMoveObject,\n  SuiRawData,\n} 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 | SuiMoveObject> {\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        return data\n      default:\n        return super.decode(data, type)\n    }\n  }\n\n  toStructWithTag(val: SuiEvent | SuiMoveObject): StructWithTag<SuiEvent> {\n    if (SuiEvent.is(val)) {\n      return {\n        ...val,\n        data: val.parsedJson as any,\n      }\n    }\n    if (SuiRawData.is(val)) {\n      return {\n        ...val,\n        data: val.fields as any,\n      }\n    }\n    return val as any\n  }\n\n  decodeEvent<T>(event: SuiEvent): TypedEventInstance<T> | undefined {\n    return this.decodedStruct<T>(event) as any\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: SuiEvent[]): TypedEventInstance<T>[] {\n    return this.filterAndDecodeStruct(typeQname, resources)\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    return this.filterAndDecodeStruct(typeQname, objects)\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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.11.6",
+  "version": "2.11.7-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.28",
-    "@sentio/protos": "^2.11.6",
-    "@sentio/runtime": "^2.11.6",
+    "@sentio/protos": "^2.11.7-rc.2",
+    "@sentio/runtime": "^2.11.7-rc.2",
     "@solana/web3.js": "^1.74.0",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:aptos@^1.7.2",
@@ -88,5 +88,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "7f6db41740fdfeb5cb9c03f8ae8f34c7f73cdac9"
+  "gitHead": "4d7e1b0ca602518e06d0061436ba3548fb3a74da"
 }

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

@@ -69,7 +69,7 @@ export namespace ascii {
   }
 
   export interface CharInstance extends TypedEventInstance<Char> {
-    fields_decoded: Char;
+    data_decoded: Char;
     type_arguments: [];
   }
 
@@ -79,7 +79,7 @@ export namespace ascii {
   }
 
   export interface StringInstance extends TypedEventInstance<String> {
-    fields_decoded: String;
+    data_decoded: String;
     type_arguments: [];
   }
 }
@@ -122,7 +122,7 @@ export namespace bit_vector {
   }
 
   export interface BitVectorInstance extends TypedEventInstance<BitVector> {
-    fields_decoded: BitVector;
+    data_decoded: BitVector;
     type_arguments: [];
   }
 }
@@ -165,7 +165,7 @@ export namespace fixed_point32 {
 
   export interface FixedPoint32Instance
     extends TypedEventInstance<FixedPoint32> {
-    fields_decoded: FixedPoint32;
+    data_decoded: FixedPoint32;
     type_arguments: [];
   }
 }
@@ -211,7 +211,7 @@ export namespace string_ {
   }
 
   export interface StringInstance extends TypedEventInstance<String> {
-    fields_decoded: String;
+    data_decoded: String;
     type_arguments: [];
   }
 }
@@ -251,7 +251,7 @@ export namespace type_name {
   }
 
   export interface TypeNameInstance extends TypedEventInstance<TypeName> {
-    fields_decoded: TypeName;
+    data_decoded: TypeName;
     type_arguments: [];
   }
 }

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

@@ -77,7 +77,7 @@ export namespace bcs {
   }
 
   export interface BCSInstance extends TypedEventInstance<BCS> {
-    fields_decoded: BCS;
+    data_decoded: BCS;
     type_arguments: [];
   }
 }
@@ -266,7 +266,7 @@ export namespace coin {
 
   export interface CurrencyCreatedInstance
     extends TypedEventInstance<CurrencyCreated<any>> {
-    fields_decoded: CurrencyCreated<any>;
+    data_decoded: CurrencyCreated<any>;
     type_arguments: [string];
   }
 
@@ -486,7 +486,7 @@ export namespace display {
 
   export interface DisplayCreatedInstance
     extends TypedEventInstance<DisplayCreated<any>> {
-    fields_decoded: DisplayCreated<any>;
+    data_decoded: DisplayCreated<any>;
     type_arguments: [string];
   }
 
@@ -499,7 +499,7 @@ export namespace display {
 
   export interface VersionUpdatedInstance
     extends TypedEventInstance<VersionUpdated<any>> {
-    fields_decoded: VersionUpdated<any>;
+    data_decoded: VersionUpdated<any>;
     type_arguments: [string];
   }
 
@@ -592,7 +592,7 @@ export namespace dynamic_object_field {
   }
 
   export interface WrapperInstance extends TypedEventInstance<Wrapper<any>> {
-    fields_decoded: Wrapper<any>;
+    data_decoded: Wrapper<any>;
     type_arguments: [string];
   }
 }
@@ -687,7 +687,7 @@ export namespace groth16 {
   }
 
   export interface CurveInstance extends TypedEventInstance<Curve> {
-    fields_decoded: Curve;
+    data_decoded: Curve;
     type_arguments: [];
   }
 
@@ -701,7 +701,7 @@ export namespace groth16 {
 
   export interface PreparedVerifyingKeyInstance
     extends TypedEventInstance<PreparedVerifyingKey> {
-    fields_decoded: PreparedVerifyingKey;
+    data_decoded: PreparedVerifyingKey;
     type_arguments: [];
   }
 
@@ -711,7 +711,7 @@ export namespace groth16 {
   }
 
   export interface ProofPointsInstance extends TypedEventInstance<ProofPoints> {
-    fields_decoded: ProofPoints;
+    data_decoded: ProofPoints;
     type_arguments: [];
   }
 
@@ -722,7 +722,7 @@ export namespace groth16 {
 
   export interface PublicProofInputsInstance
     extends TypedEventInstance<PublicProofInputs> {
-    fields_decoded: PublicProofInputs;
+    data_decoded: PublicProofInputs;
     type_arguments: [];
   }
 }
@@ -810,7 +810,7 @@ export namespace kiosk {
   }
 
   export interface ItemInstance extends TypedEventInstance<Item> {
-    fields_decoded: Item;
+    data_decoded: Item;
     type_arguments: [];
   }
 
@@ -823,7 +823,7 @@ export namespace kiosk {
 
   export interface ItemListedInstance
     extends TypedEventInstance<ItemListed<any>> {
-    fields_decoded: ItemListed<any>;
+    data_decoded: ItemListed<any>;
     type_arguments: [string];
   }
 
@@ -849,7 +849,7 @@ export namespace kiosk {
   }
 
   export interface ListingInstance extends TypedEventInstance<Listing> {
-    fields_decoded: Listing;
+    data_decoded: Listing;
     type_arguments: [];
   }
 
@@ -859,7 +859,7 @@ export namespace kiosk {
   }
 
   export interface LockInstance extends TypedEventInstance<Lock> {
-    fields_decoded: Lock;
+    data_decoded: Lock;
     type_arguments: [];
   }
 
@@ -1333,7 +1333,7 @@ export namespace transfer_policy {
   }
 
   export interface RuleKeyInstance extends TypedEventInstance<RuleKey<any>> {
-    fields_decoded: RuleKey<any>;
+    data_decoded: RuleKey<any>;
     type_arguments: [string];
   }
 
@@ -1357,7 +1357,7 @@ export namespace transfer_policy {
 
   export interface TransferPolicyCreatedInstance
     extends TypedEventInstance<TransferPolicyCreated<any>> {
-    fields_decoded: TransferPolicyCreated<any>;
+    data_decoded: TransferPolicyCreated<any>;
     type_arguments: [string];
   }
 
@@ -1418,7 +1418,7 @@ export namespace url {
   }
 
   export interface UrlInstance extends TypedEventInstance<Url> {
-    fields_decoded: Url;
+    data_decoded: Url;
     type_arguments: [];
   }
 }
@@ -1473,7 +1473,7 @@ export namespace vec_map {
   }
 
   export interface EntryInstance extends TypedEventInstance<Entry<any, any>> {
-    fields_decoded: Entry<any, any>;
+    data_decoded: Entry<any, any>;
     type_arguments: [string, string];
   }
 
@@ -1483,7 +1483,7 @@ export namespace vec_map {
   }
 
   export interface VecMapInstance extends TypedEventInstance<VecMap<any, any>> {
-    fields_decoded: VecMap<any, any>;
+    data_decoded: VecMap<any, any>;
     type_arguments: [string, string];
   }
 }
@@ -1523,7 +1523,7 @@ export namespace vec_set {
   }
 
   export interface VecSetInstance extends TypedEventInstance<VecSet<any>> {
-    fields_decoded: VecSet<any>;
+    data_decoded: VecSet<any>;
     type_arguments: [string];
   }
 }

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

@@ -88,7 +88,7 @@ export namespace genesis {
 
   export interface GenesisChainParametersInstance
     extends TypedEventInstance<GenesisChainParameters> {
-    fields_decoded: GenesisChainParameters;
+    data_decoded: GenesisChainParameters;
     type_arguments: [];
   }
 
@@ -113,7 +113,7 @@ export namespace genesis {
 
   export interface GenesisValidatorMetadataInstance
     extends TypedEventInstance<GenesisValidatorMetadata> {
-    fields_decoded: GenesisValidatorMetadata;
+    data_decoded: GenesisValidatorMetadata;
     type_arguments: [];
   }
 
@@ -215,7 +215,7 @@ export namespace staking_pool {
 
   export interface PoolTokenExchangeRateInstance
     extends TypedEventInstance<PoolTokenExchangeRate> {
-    fields_decoded: PoolTokenExchangeRate;
+    data_decoded: PoolTokenExchangeRate;
     type_arguments: [];
   }
 
@@ -1265,7 +1265,7 @@ export namespace sui_system_state_inner {
 
   export interface SystemEpochInfoEventInstance
     extends TypedEventInstance<SystemEpochInfoEvent> {
-    fields_decoded: SystemEpochInfoEvent;
+    data_decoded: SystemEpochInfoEvent;
     type_arguments: [];
   }
 
@@ -1342,7 +1342,7 @@ export namespace validator {
 
   export interface StakingRequestEventInstance
     extends TypedEventInstance<StakingRequestEvent> {
-    fields_decoded: StakingRequestEvent;
+    data_decoded: StakingRequestEvent;
     type_arguments: [];
   }
 
@@ -1359,7 +1359,7 @@ export namespace validator {
 
   export interface UnstakingRequestEventInstance
     extends TypedEventInstance<UnstakingRequestEvent> {
-    fields_decoded: UnstakingRequestEvent;
+    data_decoded: UnstakingRequestEvent;
     type_arguments: [];
   }
 
@@ -1499,7 +1499,7 @@ export namespace validator_set {
 
   export interface ValidatorEpochInfoEventInstance
     extends TypedEventInstance<ValidatorEpochInfoEvent> {
-    fields_decoded: ValidatorEpochInfoEvent;
+    data_decoded: ValidatorEpochInfoEvent;
     type_arguments: [];
   }
 
@@ -1512,7 +1512,7 @@ export namespace validator_set {
 
   export interface ValidatorJoinEventInstance
     extends TypedEventInstance<ValidatorJoinEvent> {
-    fields_decoded: ValidatorJoinEvent;
+    data_decoded: ValidatorJoinEvent;
     type_arguments: [];
   }
 
@@ -1526,7 +1526,7 @@ export namespace validator_set {
 
   export interface ValidatorLeaveEventInstance
     extends TypedEventInstance<ValidatorLeaveEvent> {
-    fields_decoded: ValidatorLeaveEvent;
+    data_decoded: ValidatorLeaveEvent;
     type_arguments: [];
   }
 

package/src/sui/codegen/codegen.ts

@@ -8,9 +8,9 @@ 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 {join} from "path";
+import { join } from 'path'
 
-export async function codegen(abisDir: string, outDir = join('src','types','sui'), genExample = false) {
+export async function codegen(abisDir: string, outDir = join('src', 'types', 'sui'), genExample = false) {
   if (!fs.existsSync(abisDir)) {
     return
   }
@@ -36,7 +36,7 @@ class SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {
   MAIN_NET = SuiNetwork.MAIN_NET
   TEST_NET = SuiNetwork.TEST_NET
   PREFIX = 'Sui'
-  STRUCT_FIELD_NAME = 'fields'
+  // STRUCT_FIELD_NAME = 'fields'
   // GENERATE_ON_ENTRY = true
   PAYLOAD_OPTIONAL = true
 

package/src/sui/move-coder.ts

@@ -27,7 +27,8 @@ export class MoveCoder extends AbstractMoveCoder<SuiEvent | SuiMoveObject> {
       case '0x2::coin::Coin':
         return data
       case '0x1::option::Option':
-        return this.decode(data, type.typeArgs[0])
+        // return this.decode(data, type.typeArgs[0])
+        return data
       default:
         return super.decode(data, type)
     }