@sentio/sdk 2.5.0-rc.3 → 2.5.1-rc.1

package/src/move/types.ts

@@ -1,20 +1,15 @@
 import { SPLITTER, VECTOR_STR } from './utils.js'
 
 export class TypeDescriptor {
-  // type: string
-
-  // TODO add reference flag
-
-  // qualified name without type parameters
   qname: string
   reference: boolean
-  // account?: string
-  // module?: string
-
+  mutable: boolean
   typeArgs: TypeDescriptor[]
 
   constructor(symbol: string, typeParams?: TypeDescriptor[]) {
     this.qname = symbol
+    this.reference = false
+    this.mutable = false
     this.typeArgs = typeParams || []
   }
 
@@ -97,20 +92,15 @@ export class TypeDescriptor {
 }
 
 export function parseMoveType(type: string): TypeDescriptor {
-  // type = type.replace('&', '')
-
-  type = type.replaceAll('&mut ', '&')
-  type = type.replaceAll('mut ', '')
-
-  // TODO replace ' ' is not exactly safe, need to double check this
-  type = type.replaceAll(' ', '')
-
   const stack: TypeDescriptor[] = [new TypeDescriptor('')]
   let buffer = []
 
   // xxx:asdf<g1<a,<c,d>>, b, g2<a,b>, e>
   for (let i = 0; i < type.length; i++) {
     const ch = type[i]
+    if (ch === ' ') {
+      continue
+    }
     if (ch === '<') {
       // const symbol = type.slice(symbolStart, i)
       // symbolStart =
@@ -121,7 +111,7 @@ export function parseMoveType(type: string): TypeDescriptor {
       stack.push(new TypeDescriptor(''))
       continue
     }
-    if (ch === '>') {
+    if (ch === '>' || ch === ',') {
       const typeParam = stack.pop()
       if (!typeParam) {
         throw Error('Unexpected stack size')
@@ -132,25 +122,11 @@ export function parseMoveType(type: string): TypeDescriptor {
       }
       adjustType(typeParam)
       stack[stack.length - 1].typeArgs.push(typeParam)
-      continue
-    }
-    if (ch === ',') {
-      const typeParam = stack.pop()
-      if (!typeParam) {
-        throw Error('Unexpected stack size')
-      }
-      if (buffer.length > 0) {
-        typeParam.qname = buffer.join('')
-        buffer = []
+      if (ch === ',') {
+        stack.push(new TypeDescriptor(''))
       }
-      adjustType(typeParam)
-
-      stack[stack.length - 1].typeArgs.push(typeParam)
-      // continue parse next param
-      stack.push(new TypeDescriptor(''))
       continue
     }
-
     buffer.push(ch)
   }
 
@@ -171,4 +147,8 @@ function adjustType(type: TypeDescriptor) {
     type.reference = true
     type.qname = type.qname.slice(1)
   }
+  if (type.qname.startsWith('mut')) {
+    type.mutable = true
+    type.qname = type.qname.slice(3)
+  }
 }

package/src/sui/codegen/codegen.ts

@@ -1,10 +1,10 @@
 import { SuiNetwork } from '../network.js'
 import * as fs from 'fs'
 import chalk from 'chalk'
-import { NeutralMoveModule, NeutralMoveStruct } from '../../move/neutral-models.js'
+import { InternalMoveModule, InternalMoveStruct } from '../../move/internal-models.js'
 import { AbstractCodegen } from '../../move/abstract-codegen.js'
 import { JsonRpcProvider, SuiMoveNormalizedModules } from '@mysten/sui.js'
-import { toNeutralModule } from '../move-types.js'
+import { toInternalModule } from '../move-types.js'
 import { moduleQname, SPLITTER, TypeDescriptor } from '../../move/index.js'
 
 export async function codegen(abisDir: string, outDir = 'src/types/sui') {
@@ -12,7 +12,7 @@ export async function codegen(abisDir: string, outDir = 'src/types/sui') {
     return
   }
   console.log(chalk.green('Generated Types for Sui'))
-  const gen = new SuiCodeGen()
+  const gen = new SuiCodegen()
   await gen.generate(abisDir, outDir)
 }
 
@@ -28,7 +28,7 @@ function getRpcClient(network: SuiNetwork): JsonRpcProvider {
   return new JsonRpcProvider(getRpcEndpoint(network))
 }
 
-class SuiCodeGen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {
+class SuiCodegen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {
   ADDRESS_TYPE = 'SuiAddress'
   MAIN_NET = SuiNetwork.MAIN_NET
   TEST_NET = SuiNetwork.TEST_NET
@@ -44,13 +44,13 @@ class SuiCodeGen extends AbstractCodegen<SuiMoveNormalizedModules, SuiNetwork> {
     return params.slice(0, params.length - 1)
   }
 
-  toNeutral(modules: SuiMoveNormalizedModules): NeutralMoveModule[] {
-    return Object.values(modules).map(toNeutralModule)
+  toInternalModules(modules: SuiMoveNormalizedModules): InternalMoveModule[] {
+    return Object.values(modules).map(toInternalModule)
   }
 
-  getEventStructs(module: NeutralMoveModule) {
+  getEventStructs(module: InternalMoveModule) {
     const qname = moduleQname(module)
-    const eventMap = new Map<string, NeutralMoveStruct>()
+    const eventMap = new Map<string, InternalMoveStruct>()
 
     for (const struct of module.structs) {
       const abilities = new Set(struct.abilities)

package/src/sui/move-coder.ts

@@ -1,7 +1,7 @@
 import { TypedEventInstance, TypedEntryFunctionPayload } from './models.js'
 import { AbstractMoveCoder } from '../move/abstract-move-coder.js'
 import { MoveCall, MoveEvent, SuiMoveNormalizedModule } from '@mysten/sui.js'
-import { toNeutralModule } from './move-types.js'
+import { toInternalModule } from './move-types.js'
 import { SPLITTER } from '../move/index.js'
 
 export class MoveCoder extends AbstractMoveCoder<MoveEvent> {
@@ -9,7 +9,7 @@ export class MoveCoder extends AbstractMoveCoder<MoveEvent> {
     if (this.contains(module.address, module.name)) {
       return
     }
-    this.loadNeutral(toNeutralModule(module))
+    this.loadInternal(toInternalModule(module))
   }
 
   decodeEvent<T>(event: MoveEvent): TypedEventInstance<T> | undefined {

package/src/sui/move-types.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   SuiMoveNormalizedField,
   SuiMoveNormalizedFunction,
   SuiMoveNormalizedModule,
@@ -6,102 +6,103 @@ import {
   SuiMoveNormalizedType,
 } from '@mysten/sui.js'
 import {
-  NeutralMoveFunction,
-  NeutralMoveFunctionVisibility,
-  NeutralMoveModule,
-  NeutralMoveStruct,
-  NeutralMoveStructField,
-} from '../move/neutral-models.js'
+  InternalMoveFunction,
+  InternalMoveFunctionVisibility,
+  InternalMoveModule,
+  InternalMoveStruct,
+  InternalMoveStructField,
+} from '../move/internal-models.js'
 import { SPLITTER, TypeDescriptor } from '../move/index.js'
 
 export type { SuiAddress } from '@mysten/sui.js'
 
-export function toNeutralModule(module: SuiMoveNormalizedModule): NeutralMoveModule {
+export function toInternalModule(module: SuiMoveNormalizedModule): InternalMoveModule {
   return {
     address: module.address,
-    exposed_functions: Object.entries(module.exposed_functions).map(([n, f]) => toNeutralFunction(n, f)),
+    exposedFunctions: Object.entries(module.exposed_functions).map(([n, f]) => toInternalFunction(n, f)),
     name: module.name,
-    structs: Object.entries(module.structs).map(([n, s]) => toNeutralStruct(n, s)),
+    structs: Object.entries(module.structs).map(([n, s]) => toInternalStruct(n, s)),
   }
 }
 
-export function toNeutralFunction(name: string, func: SuiMoveNormalizedFunction): NeutralMoveFunction {
+export function toInternalFunction(name: string, func: SuiMoveNormalizedFunction): InternalMoveFunction {
   let visibility
   switch (func.visibility) {
     case 'Private':
-      visibility = NeutralMoveFunctionVisibility.PRIVATE
+      visibility = InternalMoveFunctionVisibility.PRIVATE
       break
     case 'Public':
-      visibility = NeutralMoveFunctionVisibility.PUBLIC
+      visibility = InternalMoveFunctionVisibility.PUBLIC
       break
     case 'Friend':
-      visibility = NeutralMoveFunctionVisibility.FRIEND
+      visibility = InternalMoveFunctionVisibility.FRIEND
       break
+    default:
+      throw Error('No visibility for function' + name)
   }
   return {
-    generic_type_params: func.type_parameters.map((p) => {
+    typeParams: func.type_parameters.map((p: any) => {
       return { constraints: p.abilities }
     }),
-    is_entry: func.is_entry,
+    isEntry: func.is_entry,
     name: name,
-    params: func.parameters.map(convertToTypeDescriptor),
-    return: func.return_.map(convertToTypeDescriptor),
+    params: func.parameters.map(toTypeDescriptor),
+    return: func.return_.map(toTypeDescriptor),
     visibility: visibility,
   }
 }
 
-export function toNeutralStruct(name: string, struct: SuiMoveNormalizedStruct): NeutralMoveStruct {
+export function toInternalStruct(name: string, struct: SuiMoveNormalizedStruct): InternalMoveStruct {
   return {
     abilities: struct.abilities.abilities,
-    fields: struct.fields.map(toNeutralField),
-    generic_type_params: struct.type_parameters.map((p) => {
+    fields: struct.fields.map(toInternalField),
+    typeParams: struct.type_parameters.map((p: any) => {
       return { constraints: p.constraints.abilities }
     }),
-    is_native: false,
+    isNative: false,
     name: name,
   }
 }
 
-export function toNeutralField(module: SuiMoveNormalizedField): NeutralMoveStructField {
+export function toInternalField(module: SuiMoveNormalizedField): InternalMoveStructField {
   return {
     name: module.name,
-    type: convertToTypeDescriptor(module.type_),
+    type: toTypeDescriptor(module.type_),
   }
 }
 
-export function convertToTypeDescriptor(normalizedType: SuiMoveNormalizedType): TypeDescriptor {
+export function toTypeDescriptor(normalizedType: SuiMoveNormalizedType): TypeDescriptor {
   if (typeof normalizedType === 'string') {
     return new TypeDescriptor(normalizedType)
   }
 
   if ('Struct' in normalizedType) {
-    // normalizedType.Struct.
-    // return normalizedType;
     const qname = [normalizedType.Struct.address, normalizedType.Struct.module, normalizedType.Struct.name].join(
       SPLITTER
     )
 
-    const args = normalizedType.Struct.type_arguments.map(convertToTypeDescriptor)
+    const args = normalizedType.Struct.type_arguments.map(toTypeDescriptor)
 
     return new TypeDescriptor(qname, args)
   }
 
   if ('Vector' in normalizedType) {
-    return new TypeDescriptor('vector', [convertToTypeDescriptor(normalizedType.Vector)])
+    return new TypeDescriptor('vector', [toTypeDescriptor(normalizedType.Vector)])
   }
   if ('TypeParameter' in normalizedType) {
     return new TypeDescriptor('T' + normalizedType.TypeParameter)
   }
 
   if ('Reference' in normalizedType) {
-    const res = convertToTypeDescriptor(normalizedType.Reference)
+    const res = toTypeDescriptor(normalizedType.Reference)
     res.reference = true
     return res
   }
 
   if ('MutableReference' in normalizedType) {
-    const res = convertToTypeDescriptor(normalizedType.MutableReference)
+    const res = toTypeDescriptor(normalizedType.MutableReference)
     res.reference = true
+    res.mutable = true
     return res
   }
 

package/src/sui/utils.ts

@@ -1,7 +1,7 @@
-import { SuiTransactionResponse, getMoveCallTransaction, MoveCall } from '@mysten/sui.js'
+import { SuiTransactionResponse, getMoveCallTransaction, SuiTransactionKind } from '@mysten/sui.js'
 
 export function getMoveCalls(tx: SuiTransactionResponse) {
-  return tx.certificate.data.transactions.flatMap((tx) => {
+  return tx.certificate.data.transactions.flatMap((tx: SuiTransactionKind) => {
     const call = getMoveCallTransaction(tx)
     if (call) {
       return [call]

package/lib/move/neutral-models.d.ts

@@ -1,34 +0,0 @@
-import { TypeDescriptor } from './types.js';
-export interface NeutralMoveModule {
-    address: string;
-    name: string;
-    exposed_functions: Array<NeutralMoveFunction>;
-    structs: Array<NeutralMoveStruct>;
-}
-export interface NeutralMoveFunction {
-    name: string;
-    visibility: NeutralMoveFunctionVisibility;
-    is_entry: boolean;
-    generic_type_params: Array<NeutralMoveGenericTypeParam>;
-    params: Array<TypeDescriptor>;
-    return: Array<TypeDescriptor>;
-}
-export interface NeutralMoveStruct {
-    name: string;
-    is_native: boolean;
-    abilities: Array<string>;
-    generic_type_params: Array<NeutralMoveGenericTypeParam>;
-    fields: Array<NeutralMoveStructField>;
-}
-export interface NeutralMoveStructField {
-    name: string;
-    type: TypeDescriptor;
-}
-export declare enum NeutralMoveFunctionVisibility {
-    PRIVATE = "private",
-    PUBLIC = "public",
-    FRIEND = "friend"
-}
-export type NeutralMoveGenericTypeParam = {
-    constraints: Array<string>;
-};

package/lib/move/neutral-models.js

@@ -1,7 +0,0 @@
-export var NeutralMoveFunctionVisibility;
-(function (NeutralMoveFunctionVisibility) {
-    NeutralMoveFunctionVisibility["PRIVATE"] = "private";
-    NeutralMoveFunctionVisibility["PUBLIC"] = "public";
-    NeutralMoveFunctionVisibility["FRIEND"] = "friend";
-})(NeutralMoveFunctionVisibility || (NeutralMoveFunctionVisibility = {}));
-//# sourceMappingURL=neutral-models.js.map

package/lib/move/neutral-models.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"neutral-models.js","sourceRoot":"","sources":["../../src/move/neutral-models.ts"],"names":[],"mappings":"AAoCA,MAAM,CAAN,IAAY,6BAIX;AAJD,WAAY,6BAA6B;IACvC,oDAAmB,CAAA;IACnB,kDAAiB,CAAA;IACjB,kDAAiB,CAAA;AACnB,CAAC,EAJW,6BAA6B,KAA7B,6BAA6B,QAIxC","sourcesContent":["import { TypeDescriptor } from './types.js'\n\nexport interface NeutralMoveModule {\n  address: string\n  name: string\n\n  exposed_functions: Array<NeutralMoveFunction>\n  structs: Array<NeutralMoveStruct>\n}\n\nexport interface NeutralMoveFunction {\n  name: string\n  visibility: NeutralMoveFunctionVisibility\n  is_entry: boolean\n  generic_type_params: Array<NeutralMoveGenericTypeParam>\n  params: Array<TypeDescriptor>\n  return: Array<TypeDescriptor>\n}\n\nexport interface NeutralMoveStruct {\n  name: string\n\n  is_native: boolean\n\n  abilities: Array<string>\n\n  generic_type_params: Array<NeutralMoveGenericTypeParam>\n\n  fields: Array<NeutralMoveStructField>\n}\n\nexport interface NeutralMoveStructField {\n  name: string\n  type: TypeDescriptor\n}\n\nexport enum NeutralMoveFunctionVisibility {\n  PRIVATE = 'private',\n  PUBLIC = 'public',\n  FRIEND = 'friend',\n}\n\nexport type NeutralMoveGenericTypeParam = {\n  constraints: Array<string>\n}\n"]}

package/src/move/neutral-models.ts

@@ -1,45 +0,0 @@
-import { TypeDescriptor } from './types.js'
-
-export interface NeutralMoveModule {
-  address: string
-  name: string
-
-  exposed_functions: Array<NeutralMoveFunction>
-  structs: Array<NeutralMoveStruct>
-}
-
-export interface NeutralMoveFunction {
-  name: string
-  visibility: NeutralMoveFunctionVisibility
-  is_entry: boolean
-  generic_type_params: Array<NeutralMoveGenericTypeParam>
-  params: Array<TypeDescriptor>
-  return: Array<TypeDescriptor>
-}
-
-export interface NeutralMoveStruct {
-  name: string
-
-  is_native: boolean
-
-  abilities: Array<string>
-
-  generic_type_params: Array<NeutralMoveGenericTypeParam>
-
-  fields: Array<NeutralMoveStructField>
-}
-
-export interface NeutralMoveStructField {
-  name: string
-  type: TypeDescriptor
-}
-
-export enum NeutralMoveFunctionVisibility {
-  PRIVATE = 'private',
-  PUBLIC = 'public',
-  FRIEND = 'friend',
-}
-
-export type NeutralMoveGenericTypeParam = {
-  constraints: Array<string>
-}