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

package/lib/sui/codegen/codegen.js

@@ -4,7 +4,7 @@ import chalk from 'chalk';
 import { AbstractCodegen } from '../../move/abstract-codegen.js';
 import { JsonRpcProvider } from '@mysten/sui.js';
 import { toInternalModule } from '../move-types.js';
-import { moduleQname, SPLITTER } from '../../move/index.js';
+import { moduleQname, SPLITTER, structQname } from '../../move/index.js';
 import { getMeaningfulFunctionParams } from '../utils.js';
 export async function codegen(abisDir, outDir = 'src/types/sui') {
     if (!fs.existsSync(abisDir)) {
@@ -58,5 +58,25 @@ class SuiCodegen extends AbstractCodegen {
         }
         return res;
     }
+    generateStructs(module, struct, events) {
+        switch (structQname(module, struct)) {
+            case '0x2::object::ID':
+                return `export type ${struct.name} = string`;
+            case '0x2::coin::Coin':
+                return `export type ${struct.name}<T> = string`;
+            case '0x1::option::Option':
+                return `export type Option<T> = T | undefined`;
+        }
+        return super.generateStructs(module, struct, events);
+    }
+    generateOnEvents(module, struct) {
+        switch (structQname(module, struct)) {
+            case '0x2::object::ID':
+            case '0x2::coin::Coin':
+            case '0x1::option::Option':
+                return '';
+        }
+        return super.generateOnEvents(module, struct);
+    }
 }
 //# sourceMappingURL=codegen.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/sui/codegen/codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,eAAe,EAA4B,MAAM,gBAAgB,CAAA;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAkB,MAAM,qBAAqB,CAAA;AAC3E,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;AAEzD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAe,EAAE,MAAM,GAAG,eAAe;IACrE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAM;KACP;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAA;IACnD,MAAM,GAAG,GAAG,IAAI,UAAU,EAAE,CAAA;IAC5B,MAAM,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;AACrC,CAAC;AAED,SAAS,cAAc,CAAC,OAAmB;IACzC,QAAQ,OAAO,EAAE;QACf,KAAK,UAAU,CAAC,QAAQ;YACtB,OAAO,kCAAkC,CAAA;KAC5C;IACD,OAAO,kCAAkC,CAAA;AAC3C,CAAC;AAED,SAAS,YAAY,CAAC,OAAmB;IACvC,OAAO,IAAI,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAA;AACrD,CAAC;AAED,MAAM,UAAW,SAAQ,eAAqD;IAC5E,YAAY,GAAG,YAAY,CAAA;IAC3B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;IAC9B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;IAC9B,MAAM,GAAG,KAAK,CAAA;IACd,iBAAiB,GAAG,QAAQ,CAAA;IAE5B,KAAK,CAAC,YAAY,CAAC,OAAe,EAAE,OAAmB;QACrD,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;QACpC,OAAO,MAAM,MAAM,CAAC,iCAAiC,CAAC,OAAO,CAAC,CAAA;IAChE,CAAC;IAED,2BAA2B,CAAC,MAAwB;QAClD,OAAO,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;IAED,iBAAiB,CAAC,OAAiC;QACjD,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;IACrD,CAAC;IAED,eAAe,CAAC,MAA0B;QACxC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;QACjC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAA;QAEtD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAC3C,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAClD,QAAQ,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;aACrD;SACF;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,eAAe,CAAC,QAAgB;QAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC3C,IAAI,GAAG,CAAC,MAAM,EAAE;YACd,OAAO,GAAG,CAAC,MAAM,CAAA;SAClB;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CACF","sourcesContent":["import { 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 { JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.js'\nimport { toInternalModule } from '../move-types.js'\nimport { moduleQname, SPLITTER, TypeDescriptor } from '../../move/index.js'\nimport { getMeaningfulFunctionParams } from '../utils.js'\n\nexport async function codegen(abisDir: string, outDir = 'src/types/sui') {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  console.log(chalk.green('Generated Types for Sui'))\n  const gen = new SuiCodegen()\n  await gen.generate(abisDir, outDir)\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(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\n  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {\n    const client = getRpcClient(network)\n    return await client.getNormalizedMoveModulesByPackage(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"]}
+{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/sui/codegen/codegen.ts"],"names":[],"mappings":"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","sourcesContent":["import { 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 { JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.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') {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  console.log(chalk.green('Generated Types for Sui'))\n  const gen = new SuiCodegen()\n  await gen.generate(abisDir, outDir)\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(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\n  async fetchModules(account: string, network: SuiNetwork): Promise<SuiMoveNormalizedModules> {\n    const client = getRpcClient(network)\n    return await client.getNormalizedMoveModulesByPackage(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.d.ts

@@ -4,6 +4,7 @@ import { MoveCall, MoveEvent, SuiMoveNormalizedModule } from '@mysten/sui.js';
 import { TypeDescriptor } from '../move/index.js';
 export declare class MoveCoder extends AbstractMoveCoder<MoveEvent> {
     load(module: SuiMoveNormalizedModule): void;
+    decode(data: any, type: TypeDescriptor): any;
     decodeEvent<T>(event: MoveEvent): TypedEventInstance<T> | undefined;
     filterAndDecodeEvents<T>(typeQname: string, resources: MoveEvent[]): TypedEventInstance<T>[];
     getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[];

package/lib/sui/move-coder.js

@@ -9,6 +9,17 @@ export class MoveCoder extends AbstractMoveCoder {
         }
         this.loadInternal(toInternalModule(module));
     }
+    decode(data, type) {
+        switch (type.qname) {
+            case '0x2::object::ID':
+            case '0x2::coin::Coin':
+                return data;
+            case '0x1::option::Option':
+                return this.decode(data, type.typeArgs[0]);
+            default:
+                return super.decode(data, type);
+        }
+    }
     decodeEvent(event) {
         const res = this.decodedInternal({ ...event, data: event.fields });
         return { ...event, fields_decoded: res?.data_decoded, type_arguments: res?.type_arguments || [] };

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

@@ -1 +1 @@
-{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/sui/move-coder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAElE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAA;AAC3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AAExD,MAAM,OAAO,SAAU,SAAQ,iBAA4B;IACzD,IAAI,CAAC,MAA+B;QAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE;YAC9C,OAAM;SACP;QACD,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7C,CAAC;IAED,WAAW,CAAI,KAAgB;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAI,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;QACrE,OAAO,EAAE,GAAG,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,YAAiB,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,IAAI,EAAE,EAAE,CAAA;IACxG,CAAC;IACD,qBAAqB,CAAI,SAAiB,EAAE,SAAsB;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,uBAAuB,CACvC,SAAS,EACT,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,OAAO,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAA;QAC3D,CAAC,CAAC,CACH,CAAA;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACtB,OAAO,GAAG,CAAC,YAAY,CAAA;YACvB,MAAM,KAAK,GAAG,GAAgB,CAAA;YAC9B,OAAO,EAAE,GAAG,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,YAAiB,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,IAAI,EAAE,EAAE,CAAA;QACxG,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,2BAA2B,CAAC,MAAwB;QAClD,OAAO,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;IAED,qBAAqB,CAAC,OAAiB;QACrC,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChG,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAG,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvD,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,EAAE,MAAM,CAAC,CAAA;QACxE,OAAO;YACL,GAAG,OAAO;YACV,iBAAiB,EAAE,cAAc;SACL,CAAA;IAChC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,SAAS,EAAE,CAAA;AAEzC,MAAM,UAAU,gBAAgB;IAC9B,OAAO,UAAU,CAAA;AACnB,CAAC","sourcesContent":["import { TypedEventInstance, TypedFunctionPayload } from './models.js'\nimport { AbstractMoveCoder } from '../move/abstract-move-coder.js'\nimport { MoveCall, MoveEvent, SuiMoveNormalizedModule } 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<MoveEvent> {\n  load(module: SuiMoveNormalizedModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.loadInternal(toInternalModule(module))\n  }\n\n  decodeEvent<T>(event: MoveEvent): TypedEventInstance<T> | undefined {\n    const res = this.decodedInternal<T>({ ...event, data: event.fields })\n    return { ...event, fields_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: MoveEvent[]): TypedEventInstance<T>[] {\n    const resp = this.filterAndDecodeInternal(\n      typeQname,\n      resources.map((event) => {\n        return { ...event, data: event.fields, type: event.type }\n      })\n    )\n    return resp.map((res) => {\n      delete res.data_decoded\n      const event = res as MoveEvent\n      return { ...event, fields_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: MoveCall): MoveCall {\n    const functionType = [payload.package.objectId, payload.module, payload.function].join(SPLITTER)\n    const func = this.getMoveFunction(functionType)\n    const params = getMeaningfulFunctionParams(func.params)\n    const argumentsTyped = this.decodeArray(payload.arguments || [], 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 } from './models.js'\nimport { AbstractMoveCoder } from '../move/abstract-move-coder.js'\nimport { MoveCall, MoveEvent, SuiMoveNormalizedModule } 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<MoveEvent> {\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: MoveEvent): TypedEventInstance<T> | undefined {\n    const res = this.decodedInternal<T>({ ...event, data: event.fields })\n    return { ...event, fields_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: MoveEvent[]): TypedEventInstance<T>[] {\n    const resp = this.filterAndDecodeInternal(\n      typeQname,\n      resources.map((event) => {\n        return { ...event, data: event.fields, type: event.type }\n      })\n    )\n    return resp.map((res) => {\n      delete res.data_decoded\n      const event = res as MoveEvent\n      return { ...event, fields_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: MoveCall): MoveCall {\n    const functionType = [payload.package.objectId, payload.module, payload.function].join(SPLITTER)\n    const func = this.getMoveFunction(functionType)\n    const params = getMeaningfulFunctionParams(func.params)\n    const argumentsTyped = this.decodeArray(payload.arguments || [], 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.6.0-rc.1",
+  "version": "2.6.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.6.0-rc.1",
-    "@sentio/runtime": "^2.6.0-rc.1",
+    "@sentio/protos": "^2.6.0-rc.2",
+    "@sentio/runtime": "^2.6.0-rc.2",
     "@solana/web3.js": "^1.73.2",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:@sentio/aptos@^1.6.0",
@@ -78,5 +78,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "a2a7d907dd4ade18db09226ab9274f11302a6cb2"
+  "gitHead": "80a22e106432ebcd65371bda09d36d0c3b11f2e4"
 }

package/src/move/abstract-codegen.ts

@@ -9,8 +9,7 @@ import fs from 'fs'
 import { AccountModulesImportInfo, AccountRegister } from './account.js'
 import chalk from 'chalk'
 import { format } from 'prettier'
-import { isFrameworkAccount, moduleQname, normalizeToJSName, SPLITTER } from './utils.js'
-import { generateTypeForDescriptor } from './ts-type.js'
+import { isFrameworkAccount, moduleQname, normalizeToJSName, SPLITTER, VECTOR_STR } from './utils.js'
 import { camelCase, upperFirst } from 'lodash-es'
 import { TypeDescriptor } from './types.js'
 
@@ -219,7 +218,7 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
     const structName = normalizeToJSName(struct.name)
 
     const fields = struct.fields.map((field) => {
-      const type = generateTypeForDescriptor(field.type, module.address, this.ADDRESS_TYPE)
+      const type = this.generateTypeForDescriptor(field.type, module.address)
       return `${field.name}: ${type}`
     })
 
@@ -277,7 +276,7 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
     }
 
     const fields = this.getMeaningfulFunctionParams(func.params).map((param) => {
-      return generateTypeForDescriptor(param, module.address, this.ADDRESS_TYPE)
+      return this.generateTypeForDescriptor(param, module.address)
     })
 
     const camelFuncName = upperFirst(camelCase(func.name))
@@ -302,12 +301,12 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
     // const moduleName = normalizeToJSName(module.name)
     const funcName = camelCase(func.name)
     const fields = this.getMeaningfulFunctionParams(func.params).map((param) => {
-      return generateTypeForDescriptor(param, module.address, this.ADDRESS_TYPE)
+      return this.generateTypeForDescriptor(param, module.address)
     })
     const genericString = this.generateFunctionTypeParameters(func)
 
     const returns = func.return.map((param) => {
-      return generateTypeForDescriptor(param, module.address, this.ADDRESS_TYPE)
+      return this.generateTypeForDescriptor(param, module.address)
     })
 
     const source = `
@@ -363,6 +362,81 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
   `
     return source
   }
+
+  generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string): string {
+    if (type.reference) {
+      return this.ADDRESS_TYPE
+    }
+
+    switch (type.qname) {
+      case 'signer': // TODO check this
+      case 'address':
+      case 'Address':
+        return this.ADDRESS_TYPE
+      case '0x1::string::String':
+        return 'string'
+      case 'bool':
+      case 'Bool':
+        return 'Boolean'
+      case 'u8':
+      case 'U8':
+      case 'u16':
+      case 'U16':
+      case 'u32':
+      case 'U32':
+        return 'number'
+      case 'u64':
+      case 'U64':
+      case 'u128':
+      case 'U128':
+      case 'u256':
+      case 'U256':
+        return 'bigint'
+    }
+
+    if (type.qname.toLowerCase() === VECTOR_STR) {
+      // vector<u8> as hex string
+      const elementTypeQname = type.typeArgs[0].qname
+      if (elementTypeQname === 'u8' || elementTypeQname === 'U8') {
+        return 'string'
+      }
+      if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {
+        return `${elementTypeQname}[] | string`
+      }
+      return this.generateTypeForDescriptor(type.typeArgs[0], currentAddress) + '[]'
+    }
+
+    const simpleName = this.generateSimpleType(type.qname, currentAddress)
+    if (simpleName.length === 0) {
+      console.error('unexpected error')
+    }
+    if (simpleName.toLowerCase() === VECTOR_STR || simpleName.toLowerCase().startsWith(VECTOR_STR + SPLITTER)) {
+      console.error('unexpected vector type error')
+    }
+    if (type.typeArgs.length > 0) {
+      // return simpleName
+      return (
+        simpleName + '<' + type.typeArgs.map((t) => this.generateTypeForDescriptor(t, currentAddress)).join(',') + '>'
+      )
+    }
+    return simpleName
+  }
+
+  generateSimpleType(type: string, currentAddress: string): string {
+    const parts = type.split(SPLITTER)
+
+    for (let i = 0; i < parts.length; i++) {
+      parts[i] = normalizeToJSName(parts[i])
+    }
+
+    if (parts.length < 2) {
+      return parts[0]
+    }
+    if (parts[0] === currentAddress) {
+      return parts.slice(1).join('.')
+    }
+    return '_' + parts.join('.')
+  }
 }
 
 export class AccountCodegen<ModuleType, NetworkType> {

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

@@ -84,8 +84,6 @@ export abstract class AbstractMoveCoder<StructType> {
       case 'signer': // TODO check this, aptos only
       case 'address':
       case 'Address':
-      case '0x2::object::ID':
-      case '0x2::coin::Coin':
       case '0x1::string::String':
       case 'bool':
       case 'Bool':

package/src/move/index.ts

@@ -1,5 +1,4 @@
 export * from './filter.js'
 export * from './types.js'
-export * from './ts-type.js'
 export * from './utils.js'
 export * from './account.js'

package/src/move/utils.ts

@@ -1,3 +1,5 @@
+import { InternalMoveModule, InternalMoveStruct } from './internal-models.js'
+
 export const SPLITTER = '::'
 
 export const VECTOR_STR = 'vector'
@@ -23,3 +25,7 @@ export function moduleQnameForType(type: string): [string, string] {
 export function moduleQname(module: { address: string; name: string }): string {
   return module.address.toLowerCase() + SPLITTER + module.name
 }
+
+export function structQname(module: InternalMoveModule, struct: InternalMoveStruct): string {
+  return [module.address, module.name, struct.name].join(SPLITTER)
+}

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

@@ -172,44 +172,8 @@ export namespace fixed_point32 {
 
 export namespace hash {}
 
-export class option extends SuiBaseProcessor {
-  constructor(options: SuiBindOptions) {
-    super("option", options);
-  }
-  static DEFAULT_OPTIONS: SuiBindOptions = {
-    address: "0x1",
-    network: SuiNetwork.MAIN_NET,
-  };
-
-  static bind(options: Partial<SuiBindOptions> = {}): option {
-    return new option({ ...option.DEFAULT_OPTIONS, ...options });
-  }
-
-  onEventOption(
-    func: (event: option.OptionInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
-  ): option {
-    this.onMoveEvent(
-      func,
-      {
-        type: "option::Option",
-      },
-      fetchConfig
-    );
-    return this;
-  }
-}
-
 export namespace option {
-  export class Option<T0> {
-    static TYPE_QNAME = "0x1::option::Option";
-    vec: T0[] | string;
-  }
-
-  export interface OptionInstance extends TypedEventInstance<Option<any>> {
-    fields_decoded: Option<any>;
-    type_arguments: [string];
-  }
+  export type Option<T> = T | undefined;
 }
 
 export class string_ extends SuiBaseProcessor {

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

@@ -227,11 +227,7 @@ export class coin extends SuiBaseProcessor {
 }
 
 export namespace coin {
-  export class Coin<T0> {
-    static TYPE_QNAME = "0x2::coin::Coin";
-    id: object_.UID;
-    balance: balance.Balance<T0>;
-  }
+  export type Coin<T> = string;
 
   export class CoinMetadata<T0> {
     static TYPE_QNAME = "0x2::coin::CoinMetadata";
@@ -390,7 +386,7 @@ export namespace devnet_nft {
 
   export class MintNFTEvent {
     static TYPE_QNAME = "0x2::devnet_nft::MintNFTEvent";
-    object_id: string;
+    object_id: object_.ID;
     creator: SuiAddress;
     name: string;
   }
@@ -838,8 +834,8 @@ export namespace locked_coin {
   }
 
   export interface LockCoinPayload<T0 = any>
-    extends TypedFunctionPayload<[string, SuiAddress, bigint]> {
-    arguments_decoded: [string, SuiAddress, bigint];
+    extends TypedFunctionPayload<[coin.Coin<T0>, SuiAddress, bigint]> {
+    arguments_decoded: [coin.Coin<T0>, SuiAddress, bigint];
     type_arguments: [string];
   }
 
@@ -852,48 +848,12 @@ export namespace locked_coin {
 
 export namespace math {}
 
-export class object_ extends SuiBaseProcessor {
-  constructor(options: SuiBindOptions) {
-    super("object", options);
-  }
-  static DEFAULT_OPTIONS: SuiBindOptions = {
-    address: "0x2",
-    network: SuiNetwork.MAIN_NET,
-  };
-
-  static bind(options: Partial<SuiBindOptions> = {}): object_ {
-    return new object_({ ...object_.DEFAULT_OPTIONS, ...options });
-  }
-
-  onEventID(
-    func: (event: object_.IDInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
-  ): object_ {
-    this.onMoveEvent(
-      func,
-      {
-        type: "object::ID",
-      },
-      fetchConfig
-    );
-    return this;
-  }
-}
-
 export namespace object_ {
-  export class ID {
-    static TYPE_QNAME = "0x2::object::ID";
-    bytes: SuiAddress;
-  }
-
-  export interface IDInstance extends TypedEventInstance<ID> {
-    fields_decoded: ID;
-    type_arguments: [];
-  }
+  export type ID = string;
 
   export class UID {
     static TYPE_QNAME = "0x2::object::UID";
-    id: string;
+    id: object_.ID;
   }
 }
 
@@ -1059,8 +1019,8 @@ export namespace pay {
   }
 
   export interface JoinVecAndTransferPayload<T0 = any>
-    extends TypedFunctionPayload<[string[]]> {
-    arguments_decoded: [string[]];
+    extends TypedFunctionPayload<[coin.Coin<T0>[]]> {
+    arguments_decoded: [coin.Coin<T0>[]];
     type_arguments: [string];
   }
 
@@ -1222,26 +1182,26 @@ export namespace safe {
   export class OwnerCapability<T0> {
     static TYPE_QNAME = "0x2::safe::OwnerCapability";
     id: object_.UID;
-    safe_id: string;
+    safe_id: object_.ID;
   }
 
   export class Safe<T0> {
     static TYPE_QNAME = "0x2::safe::Safe";
     id: object_.UID;
     balance: balance.Balance<T0>;
-    allowed_safes: vec_set.VecSet<string>;
+    allowed_safes: vec_set.VecSet<object_.ID>;
   }
 
   export class TransferCapability<T0> {
     static TYPE_QNAME = "0x2::safe::TransferCapability";
     id: object_.UID;
-    safe_id: string;
+    safe_id: object_.ID;
     amount: bigint;
   }
 
   export interface CreatePayload<T0 = any>
-    extends TypedFunctionPayload<[string]> {
-    arguments_decoded: [string];
+    extends TypedFunctionPayload<[coin.Coin<T0>]> {
+    arguments_decoded: [coin.Coin<T0>];
     type_arguments: [string];
   }
 
@@ -1421,7 +1381,7 @@ export namespace staking_pool {
   export class Delegation {
     static TYPE_QNAME = "0x2::staking_pool::Delegation";
     id: object_.UID;
-    staked_sui_id: string;
+    staked_sui_id: object_.ID;
     pool_tokens: balance.Balance<staking_pool.DelegationToken>;
     principal_sui_amount: bigint;
   }
@@ -1480,7 +1440,7 @@ export namespace staking_pool {
     rewards_pool: balance.Balance<sui.SUI>;
     delegation_token_supply: balance.Supply<staking_pool.DelegationToken>;
     pending_delegations: linked_table.LinkedTable<
-      string,
+      object_.ID,
       staking_pool.PendingDelegationEntry
     >;
     pending_withdraws: table_vec.TableVec<staking_pool.PendingWithdrawEntry>;
@@ -1547,8 +1507,9 @@ export namespace sui {
     dummy_field: Boolean;
   }
 
-  export interface TransferPayload extends TypedFunctionPayload<[string]> {
-    arguments_decoded: [string];
+  export interface TransferPayload
+    extends TypedFunctionPayload<[coin.Coin<sui.SUI>]> {
+    arguments_decoded: [coin.Coin<sui.SUI>];
     type_arguments: [];
   }
 }
@@ -1991,18 +1952,18 @@ export namespace sui_system {
   }
 
   export interface RequestAddDelegationPayload
-    extends TypedFunctionPayload<[SuiAddress, string, SuiAddress]> {
-    arguments_decoded: [SuiAddress, string, SuiAddress];
+    extends TypedFunctionPayload<[SuiAddress, coin.Coin<sui.SUI>, SuiAddress]> {
+    arguments_decoded: [SuiAddress, coin.Coin<sui.SUI>, SuiAddress];
     type_arguments: [];
   }
 
   export interface RequestAddDelegationMulCoinPayload
     extends TypedFunctionPayload<
-      [SuiAddress, string[], _0x1.option.Option<bigint>, SuiAddress]
+      [SuiAddress, coin.Coin<sui.SUI>[], _0x1.option.Option<bigint>, SuiAddress]
     > {
     arguments_decoded: [
       SuiAddress,
-      string[],
+      coin.Coin<sui.SUI>[],
       _0x1.option.Option<bigint>,
       SuiAddress
     ];
@@ -2040,8 +2001,8 @@ export namespace sui_system {
   }
 
   export interface RequestAddStakePayload
-    extends TypedFunctionPayload<[SuiAddress, string]> {
-    arguments_decoded: [SuiAddress, string];
+    extends TypedFunctionPayload<[SuiAddress, coin.Coin<sui.SUI>]> {
+    arguments_decoded: [SuiAddress, coin.Coin<sui.SUI>];
     type_arguments: [];
   }
 
@@ -2068,7 +2029,7 @@ export namespace sui_system {
         string,
         string,
         string,
-        string,
+        coin.Coin<sui.SUI>,
         bigint,
         bigint
       ]
@@ -2086,7 +2047,7 @@ export namespace sui_system {
       string,
       string,
       string,
-      string,
+      coin.Coin<sui.SUI>,
       bigint,
       bigint
     ];
@@ -2207,7 +2168,7 @@ export class typed_id extends SuiBaseProcessor {
 export namespace typed_id {
   export class TypedID<T0> {
     static TYPE_QNAME = "0x2::typed_id::TypedID";
-    id: string;
+    id: object_.ID;
   }
 
   export interface TypedIDInstance extends TypedEventInstance<TypedID<any>> {

package/src/sui/codegen/codegen.ts

@@ -5,7 +5,7 @@ import { InternalMoveModule, InternalMoveStruct } from '../../move/internal-mode
 import { AbstractCodegen } from '../../move/abstract-codegen.js'
 import { JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.js'
 import { toInternalModule } from '../move-types.js'
-import { moduleQname, SPLITTER, TypeDescriptor } from '../../move/index.js'
+import { moduleQname, SPLITTER, structQname, TypeDescriptor } from '../../move/index.js'
 import { getMeaningfulFunctionParams } from '../utils.js'
 
 export async function codegen(abisDir: string, outDir = 'src/types/sui') {
@@ -69,4 +69,26 @@ class SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {
     }
     return res
   }
+
+  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>): string {
+    switch (structQname(module, struct)) {
+      case '0x2::object::ID':
+        return `export type ${struct.name} = string`
+      case '0x2::coin::Coin':
+        return `export type ${struct.name}<T> = string`
+      case '0x1::option::Option':
+        return `export type Option<T> = T | undefined`
+    }
+    return super.generateStructs(module, struct, events)
+  }
+
+  generateOnEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {
+    switch (structQname(module, struct)) {
+      case '0x2::object::ID':
+      case '0x2::coin::Coin':
+      case '0x1::option::Option':
+        return ''
+    }
+    return super.generateOnEvents(module, struct)
+  }
 }

package/src/sui/move-coder.ts

@@ -13,6 +13,18 @@ export class MoveCoder extends AbstractMoveCoder<MoveEvent> {
     this.loadInternal(toInternalModule(module))
   }
 
+  decode(data: any, type: TypeDescriptor): any {
+    switch (type.qname) {
+      case '0x2::object::ID':
+      case '0x2::coin::Coin':
+        return data
+      case '0x1::option::Option':
+        return this.decode(data, type.typeArgs[0])
+      default:
+        return super.decode(data, type)
+    }
+  }
+
   decodeEvent<T>(event: MoveEvent): TypedEventInstance<T> | undefined {
     const res = this.decodedInternal<T>({ ...event, data: event.fields })
     return { ...event, fields_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }

package/lib/move/ts-type.d.ts

@@ -1,2 +0,0 @@
-import { TypeDescriptor } from './types.js';
-export declare function generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string, addressType: string): string;