@sentio/sdk 2.13.2-rc.4 → 2.13.2-rc.5

package/lib/sui/codegen/codegen.js

@@ -33,20 +33,25 @@ class SuiCodegen extends AbstractCodegen {
         return res;
     }
     generateStructs(module, struct, events) {
+        let content = '';
         switch (structQname(module, struct)) {
             // TODO they should still have module code generated
             case '0x1::ascii::Char':
             case '0x1::ascii::String':
             case '0x2::object::ID':
-                return `export type ${struct.name} = string`;
+                content += `export type ${struct.name} = string`;
+                break;
             case '0x2::coin::Coin':
-                return `export type ${struct.name}<T> = string`;
+                content += `export type ${struct.name}<T> = string`;
+                break;
             case '0x2::balance::Balance':
-                return `export type ${struct.name}<T> = bigint`;
+                content += `export type ${struct.name}<T> = bigint`;
+                break;
             case '0x1::option::Option':
-                return `export type Option<T> = T | undefined`;
+                content += `export type Option<T> = T | undefined`;
+                break;
         }
-        return super.generateStructs(module, struct, events);
+        return content + super.generateStructs(module, struct, events, content !== '');
     }
     generateOnEvents(module, struct) {
         switch (structQname(module, struct)) {

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

@@ -1 +1 @@
-{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/sui/codegen/codegen.ts"],"names":[],"mappings":"AAEA,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,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEzD,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,OAAe,EACf,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EACpC,UAAU,GAAG,KAAK,EAClB,OAAO,GAAG,KAAK;IAEf,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAM;KACP;IACD,MAAM,GAAG,GAAG,IAAI,UAAU,EAAE,CAAA;IAC5B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,QAAQ,UAAU,CAAC,CAAC,CAAA;AAC3D,CAAC;AAED,MAAM,UAAW,SAAQ,eAA8E;IACrG,YAAY,GAAG,YAAY,CAAA;IAC3B,0BAA0B;IAC1B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;IAC9B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;IAC9B,MAAM,GAAG,KAAK,CAAA;IACd,+BAA+B;IAC/B,2BAA2B;IAC3B,gBAAgB,GAAG,IAAI,CAAA;IAEvB;QACE,KAAK,CAAC,IAAI,eAAe,EAAE,CAAC,CAAA;IAC9B,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;IAED,eAAe,CAAC,MAA0B,EAAE,MAA0B,EAAE,MAAmB;QACzF,QAAQ,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACnC,oDAAoD;YACpD,KAAK,kBAAkB,CAAC;YACxB,KAAK,oBAAoB,CAAC;YAC1B,KAAK,iBAAiB;gBACpB,OAAO,eAAe,MAAM,CAAC,IAAI,WAAW,CAAA;YAC9C,KAAK,iBAAiB;gBACpB,OAAO,eAAe,MAAM,CAAC,IAAI,cAAc,CAAA;YACjD,KAAK,uBAAuB;gBAC1B,OAAO,eAAe,MAAM,CAAC,IAAI,cAAc,CAAA;YACjD,KAAK,qBAAqB;gBACxB,OAAO,uCAAuC,CAAA;SACjD;QACD,OAAO,KAAK,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IACtD,CAAC;IAED,gBAAgB,CAAC,MAA0B,EAAE,MAA0B;QACrE,QAAQ,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACnC,KAAK,kBAAkB,CAAC;YACxB,KAAK,oBAAoB,CAAC;YAC1B,KAAK,iBAAiB,CAAC;YACvB,KAAK,iBAAiB,CAAC;YACvB,KAAK,qBAAqB,CAAC;YAC3B,KAAK,uBAAuB;gBAC1B,OAAO,EAAE,CAAA;SACZ;QACD,OAAO,KAAK,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/C,CAAC;CACF","sourcesContent":["import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject } 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 { structQname } from '../../move/index.js'\nimport { join } from 'path'\nimport { SuiChainAdapter } from '../sui-chain-adapter.js'\n\nexport async function codegen(\n  abisDir: string,\n  outDir = join('src', 'types', 'sui'),\n  genExample = false,\n  builtin = false\n) {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  const gen = new SuiCodegen()\n  const numFiles = await gen.generate(abisDir, outDir, builtin)\n  console.log(chalk.green(`Generated ${numFiles} for Sui`))\n}\n\nclass SuiCodegen extends AbstractCodegen<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject> {\n  ADDRESS_TYPE = 'SuiAddress'\n  // ADDRESS_TYPE = 'string'\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  constructor() {\n    super(new SuiChainAdapter())\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      // TODO they should still have module code generated\n      case '0x1::ascii::Char':\n      case '0x1::ascii::String':\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 '0x2::balance::Balance':\n        return `export type ${struct.name}<T> = bigint`\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 '0x1::ascii::Char':\n      case '0x1::ascii::String':\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::option::Option':\n      case '0x2::balance::Balance':\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 { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject } 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 { structQname } from '../../move/index.js'\nimport { join } from 'path'\nimport { SuiChainAdapter } from '../sui-chain-adapter.js'\n\nexport async function codegen(\n  abisDir: string,\n  outDir = join('src', 'types', 'sui'),\n  genExample = false,\n  builtin = false\n) {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  const gen = new SuiCodegen()\n  const numFiles = await gen.generate(abisDir, outDir, builtin)\n  console.log(chalk.green(`Generated ${numFiles} for Sui`))\n}\n\nclass SuiCodegen extends AbstractCodegen<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject> {\n  ADDRESS_TYPE = 'SuiAddress'\n  // ADDRESS_TYPE = 'string'\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  constructor() {\n    super(new SuiChainAdapter())\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    let content = ''\n    switch (structQname(module, struct)) {\n      // TODO they should still have module code generated\n      case '0x1::ascii::Char':\n      case '0x1::ascii::String':\n      case '0x2::object::ID':\n        content += `export type ${struct.name} = string`\n        break\n      case '0x2::coin::Coin':\n        content += `export type ${struct.name}<T> = string`\n        break\n      case '0x2::balance::Balance':\n        content += `export type ${struct.name}<T> = bigint`\n        break\n      case '0x1::option::Option':\n        content += `export type Option<T> = T | undefined`\n        break\n    }\n    return content + super.generateStructs(module, struct, events, content !== '')\n  }\n\n  generateOnEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {\n    switch (structQname(module, struct)) {\n      case '0x1::ascii::Char':\n      case '0x1::ascii::String':\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::option::Option':\n      case '0x2::balance::Balance':\n        return ''\n    }\n    return super.generateOnEvents(module, struct)\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.13.2-rc.4",
+  "version": "2.13.2-rc.5",
   "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.13.2-rc.4",
-    "@sentio/runtime": "^2.13.2-rc.4",
+    "@sentio/protos": "^2.13.2-rc.5",
+    "@sentio/runtime": "^2.13.2-rc.5",
     "@solana/web3.js": "^1.74.0",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:aptos@^1.8.3",
@@ -88,5 +88,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "219e58354c9bc8276061e94dbf41d6de24003e15"
+  "gitHead": "919872e118404b5327a255f793a69e43cb12b380"
 }

package/src/move/abstract-codegen.ts

@@ -220,7 +220,7 @@ export abstract class AbstractCodegen<NetworkType, ModuleTypes, StructType> {
   `
   }
 
-  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>) {
+  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>, typeOnly = false) {
     const typeParams = struct.typeParams || []
     const genericString = this.generateStructTypeParameters(struct)
     const genericStringAny = this.generateStructTypeParameters(struct, true)
@@ -232,17 +232,6 @@ export abstract class AbstractCodegen<NetworkType, ModuleTypes, StructType> {
       return `${field.name}: ${type}`
     })
 
-    let eventPayload = ''
-    if (events.has(moduleQname(module) + SPLITTER + struct.name)) {
-      eventPayload = `
-    export interface ${structName}Instance extends
-        TypedEventInstance<${structName}${genericStringAny}> {
-      ${this.STRUCT_FIELD_NAME}_decoded: ${structName}${genericStringAny}
-      type_arguments: [${struct.typeParams.map((_) => 'string').join(', ')}]
-    }
-    `
-    }
-
     const typeParamApplyArg = typeParams
       .map((v, idx) => {
         return `arg${idx}: TypeDescriptor<T${idx}> = ANY_TYPE`
@@ -254,23 +243,38 @@ export abstract class AbstractCodegen<NetworkType, ModuleTypes, StructType> {
       })
       .join(',')
 
-    const typeWithArg = `
+    const typeDescriptor = `
+  export namespace ${structName}{
+    export const TYPE_QNAME = '${module.address}::${module.name}::${struct.name}'
+    
+    const TYPE = new TypeDescriptor<${structName}${genericStringAny}>(${structName}.TYPE_QNAME)
+
   export function type${genericString}(${typeParamApplyArg}): TypeDescriptor<${structName}${genericString}> {
     return TYPE.apply(${typeParamApply})
-  }`
+  }
+}
+`
+    if (typeOnly) {
+      return typeDescriptor
+    }
+
+    let eventPayload = ''
+    if (events.has(moduleQname(module) + SPLITTER + struct.name)) {
+      eventPayload = `
+    export interface ${structName}Instance extends
+        TypedEventInstance<${structName}${genericStringAny}> {
+      ${this.STRUCT_FIELD_NAME}_decoded: ${structName}${genericStringAny}
+      type_arguments: [${struct.typeParams.map((_) => 'string').join(', ')}]
+    }
+    `
+    }
 
     return `
   export interface ${structName}${genericString} {
     ${fields.join('\n')}
   }
   
-  export namespace ${structName}{
-    export const TYPE_QNAME = '${module.address}::${module.name}::${struct.name}'
-    
-    const TYPE = new TypeDescriptor<${structName}${genericStringAny}>(${structName}.TYPE_QNAME)
-
-    ${typeWithArg}
-  }
+  ${typeDescriptor}
 
   ${eventPayload}
   `

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

@@ -22,7 +22,26 @@ export namespace address {}
 
 export namespace ascii {
   export type Char = string;
+  export namespace Char {
+    export const TYPE_QNAME = "0x1::ascii::Char";
+
+    const TYPE = new TypeDescriptor<Char>(Char.TYPE_QNAME);
+
+    export function type(): TypeDescriptor<Char> {
+      return TYPE.apply();
+    }
+  }
+
   export type String = string;
+  export namespace String {
+    export const TYPE_QNAME = "0x1::ascii::String";
+
+    const TYPE = new TypeDescriptor<String>(String.TYPE_QNAME);
+
+    export function type(): TypeDescriptor<String> {
+      return TYPE.apply();
+    }
+  }
 }
 
 export namespace bcs {}
@@ -133,6 +152,17 @@ export namespace hash {}
 
 export namespace option {
   export type Option<T> = T | undefined;
+  export namespace Option {
+    export const TYPE_QNAME = "0x1::option::Option";
+
+    const TYPE = new TypeDescriptor<Option<any>>(Option.TYPE_QNAME);
+
+    export function type<T0>(
+      arg0: TypeDescriptor<T0> = ANY_TYPE
+    ): TypeDescriptor<Option<T0>> {
+      return TYPE.apply(arg0);
+    }
+  }
 }
 
 export class string_ extends SuiBaseProcessor {

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

@@ -41,6 +41,17 @@ export namespace bag {
 
 export namespace balance {
   export type Balance<T> = bigint;
+  export namespace Balance {
+    export const TYPE_QNAME = "0x2::balance::Balance";
+
+    const TYPE = new TypeDescriptor<Balance<any>>(Balance.TYPE_QNAME);
+
+    export function type<T0>(
+      arg0: TypeDescriptor<T0> = ANY_TYPE
+    ): TypeDescriptor<Balance<T0>> {
+      return TYPE.apply(arg0);
+    }
+  }
 
   export interface Supply<T0> {
     value: bigint;
@@ -303,6 +314,17 @@ export class coin extends SuiBaseProcessor {
 
 export namespace coin {
   export type Coin<T> = string;
+  export namespace Coin {
+    export const TYPE_QNAME = "0x2::coin::Coin";
+
+    const TYPE = new TypeDescriptor<Coin<any>>(Coin.TYPE_QNAME);
+
+    export function type<T0>(
+      arg0: TypeDescriptor<T0> = ANY_TYPE
+    ): TypeDescriptor<Coin<T0>> {
+      return TYPE.apply(arg0);
+    }
+  }
 
   export interface CoinMetadata<T0> {
     id: object_.UID;
@@ -1176,6 +1198,15 @@ export namespace math {}
 
 export namespace object_ {
   export type ID = string;
+  export namespace ID {
+    export const TYPE_QNAME = "0x2::object::ID";
+
+    const TYPE = new TypeDescriptor<ID>(ID.TYPE_QNAME);
+
+    export function type(): TypeDescriptor<ID> {
+      return TYPE.apply();
+    }
+  }
 
   export interface UID {
     id: object_.ID;

package/src/sui/codegen/codegen.ts

@@ -46,20 +46,25 @@ class SuiCodegen extends AbstractCodegen<SuiNetwork, SuiMoveNormalizedModule, Su
   }
 
   generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>): string {
+    let content = ''
     switch (structQname(module, struct)) {
       // TODO they should still have module code generated
       case '0x1::ascii::Char':
       case '0x1::ascii::String':
       case '0x2::object::ID':
-        return `export type ${struct.name} = string`
+        content += `export type ${struct.name} = string`
+        break
       case '0x2::coin::Coin':
-        return `export type ${struct.name}<T> = string`
+        content += `export type ${struct.name}<T> = string`
+        break
       case '0x2::balance::Balance':
-        return `export type ${struct.name}<T> = bigint`
+        content += `export type ${struct.name}<T> = bigint`
+        break
       case '0x1::option::Option':
-        return `export type Option<T> = T | undefined`
+        content += `export type Option<T> = T | undefined`
+        break
     }
-    return super.generateStructs(module, struct, events)
+    return content + super.generateStructs(module, struct, events, content !== '')
   }
 
   generateOnEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {