@typemove/sui 1.6.3 → 1.6.4

package/src/codegen/codegen.ts

@@ -1,4 +1,4 @@
-import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiClient } from '@mysten/sui.js/client'
+import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiClient } from '@mysten/sui/client'
 
 import * as fs from 'fs'
 import chalk from 'chalk'
@@ -168,13 +168,13 @@ export class SuiCodegen extends AbstractCodegen<
       ${
         typeParamArg.length > 0 ? `typeArguments: [${typeParamArg}]` : ``
       } ): Promise<TypedDevInspectResults<${returnType}>> {
-      const tx = new TransactionBlock()
+      const tx = new Transaction()
       builder.${camel(normalizeToJSName(func.name))}(tx, args ${typeParamArg.length > 0 ? `, typeArguments` : ''})
       const inspectRes = await client.devInspectTransactionBlock({
         transactionBlock: tx,
         sender: ZERO_ADDRESS
       })
-      
+
       return (await getMoveCoder(client)).decodeDevInspectResult<${returnType}>(inspectRes)
     }`
   }
@@ -203,13 +203,13 @@ export class SuiCodegen extends AbstractCodegen<
       })
       .join(',')
 
-    return `export function ${camel(normalizeToJSName(func.name))}${genericString}(tx: TransactionBlock, 
+    return `export function ${camel(normalizeToJSName(func.name))}${genericString}(tx: Transaction,
       args: [${args.map((a) => a.paramType).join(',')}],
       ${typeParamArg.length > 0 ? `typeArguments: [${typeParamArg}]` : ``} ):
        TransactionArgument & [ ${'TransactionArgument,'.repeat(args.length)} ] {
       const _args: any[] = []
       ${args.map((a) => a.callValue).join('\n')}
-      
+
       // @ts-ignore
       return tx.moveCall({
         target: "${address}::${module.name}::${func.name}",
@@ -223,8 +223,8 @@ export class SuiCodegen extends AbstractCodegen<
     return `
       ${super.generateImports()}
       import { ZERO_ADDRESS, TypedDevInspectResults, getMoveCoder } from '@typemove/sui'
-      import { TransactionBlock, TransactionArgument, TransactionObjectArgument } from '@mysten/sui.js/transactions'
-      import { SuiClient } from '@mysten/sui.js/client'
+      import { Transaction, TransactionArgument, TransactionObjectArgument } from '@mysten/sui/transactions'
+      import { SuiClient } from '@mysten/sui/client'
       import { transactionArgumentOrObject, transactionArgumentOrPure, transactionArgumentOrVec } from '@typemove/sui'
     `
   }

package/src/codegen/run.ts

@@ -5,7 +5,7 @@ import { Command } from 'commander'
 import { createRequire } from 'module'
 import fs from 'fs'
 import path from 'path'
-import { SuiClient } from '@mysten/sui.js/client'
+import { SuiClient } from '@mysten/sui/client'
 const require = createRequire(import.meta.url)
 let pkg = undefined
 try {

package/src/models.ts

@@ -1,4 +1,4 @@
-import type { SuiEvent, MoveCallSuiTransaction, SuiMoveObject, DevInspectResults } from '@mysten/sui.js/client'
+import type { SuiEvent, MoveCallSuiTransaction, SuiMoveObject, DevInspectResults } from '@mysten/sui/client'
 import { DecodedStruct } from '@typemove/move'
 
 export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000000000000000000000000000'

package/src/move-coder.ts

@@ -16,24 +16,22 @@ import {
   SuiMoveObject,
   DevInspectResults,
   SuiClient
-} from '@mysten/sui.js/client'
+} from '@mysten/sui/client'
 import { toInternalModule } from './to-internal.js'
 import { SuiChainAdapter } from './sui-chain-adapter.js'
 import { dynamic_field } from './builtin/0x2.js'
-import { BCS, getSuiMoveConfig, StructTypeDefinition } from '@mysten/bcs'
+import { BcsType, bcs } from '@mysten/sui/bcs'
 
 // import { Encoding } from '@mysten/bcs/types', this doesn't get exported correctly
 export type Encoding = 'base58' | 'base64' | 'hex'
 
-import { normalizeSuiObjectId, normalizeSuiAddress } from '@mysten/sui.js/utils'
+import { normalizeSuiObjectId, normalizeSuiAddress } from '@mysten/sui/utils'
 
 export class MoveCoder extends AbstractMoveCoder<
   // SuiNetwork,
   SuiMoveNormalizedModule,
   SuiEvent | SuiMoveObject
 > {
-  bcs = new BCS(getSuiMoveConfig())
-
   constructor(client: SuiClient) {
     super(new SuiChainAdapter(client))
   }
@@ -177,30 +175,62 @@ export class MoveCoder extends AbstractMoveCoder<
     } as TypedFunctionPayload<any>
   }
 
-  private async _registerBCSType(qname: string): Promise<void> {
-    if (this.bcs.hasType(qname)) {
-      return
-    }
-    const moveStruct = await this.getMoveStruct(qname)
-    const structDef: StructTypeDefinition = {}
+  private bcsRegistered = new Set<string>()
+  private bcsRegistry = new Map<string, BcsType<any>>()
 
-    for (const field of moveStruct.fields) {
-      structDef[field.name] = field.type.getNormalizedSignature()
+  private async getBCSTypeWithArgs(type: TypeDescriptor, args: BcsType<any>[] = []): Promise<BcsType<any>> {
+    const qname = type.qname
+    const sig = type.getNormalizedSignature()
+    const cached = this.bcsRegistry.get(sig)
+    if (cached) {
+      return cached
     }
-    let typeName = qname
-    const generics = moveStruct.typeParams.map((p, idx) => 'T' + idx).join(', ')
-    if (generics) {
-      typeName = typeName + '<' + generics + '>'
+    const lowerQname = qname.toLowerCase()
+    switch (lowerQname) {
+      case 'u8':
+      case 'u16':
+      case 'u32':
+      case 'u64':
+      case 'u128':
+      case 'u256':
+      case 'bool':
+        return bcs[lowerQname]()
+      case 'address':
+        return bcs.Address
+      case 'vector':
+        return bcs.vector(args[0])
+      default:
+        if (!qname.includes('::')) {
+          throw `Unimplemented builtin type ${qname}`
+        }
     }
-
-    this.bcs.registerStructType(typeName, structDef)
-
+    let moveStruct
+    try {
+      moveStruct = await this.getMoveStruct(qname)
+    } catch (e) {
+      console.error('Invalid move address', qname)
+      throw e
+    }
+    const structDef: Record<string, any> = {}
     for (const field of moveStruct.fields) {
-      await this.registerBCSTypes(field.type)
+      if (field.type.qname.startsWith('T') && args.length) {
+        const index = +field.type.qname.slice(1)
+        structDef[field.name] = args[index]
+      } else if (field.type.typeArgs.length && args.length) {
+        structDef[field.name] = await this.getBCSTypeWithArgs(field.type, args)
+      } else {
+        structDef[field.name] = await this.getBCSType(field.type)
+      }
     }
+    return bcs.struct(qname, structDef)
   }
 
-  private bcsRegistered = new Set<string>()
+  async getBCSType(type: TypeDescriptor): Promise<BcsType<any>> {
+    const args = await Promise.all(type.typeArgs.map((x) => this.getBCSType(x)))
+    const bcsType = await this.getBCSTypeWithArgs(type, args)
+    this.bcsRegistry.set(type.getNormalizedSignature(), bcsType)
+    return bcsType
+  }
 
   async registerBCSTypes(type: TypeDescriptor): Promise<void> {
     const sig = type.getNormalizedSignature()
@@ -209,16 +239,18 @@ export class MoveCoder extends AbstractMoveCoder<
     }
     this.bcsRegistered.add(sig)
 
-    await this._registerBCSType('0x1::string::String')
-
-    for (const typeArg of type.dependedTypes()) {
-      await this._registerBCSType(typeArg)
-    }
+    const bcsType = await this.getBCSType(type)
+    this.bcsRegistry.set(type.getNormalizedSignature(), bcsType)
   }
 
   async decodeBCS(type: TypeDescriptor, data: Uint8Array | string, encoding?: Encoding): Promise<any> {
     await this.registerBCSTypes(type)
-    return this.bcs.de(type.getNormalizedSignature(), data, encoding)
+    if (typeof data == 'string') {
+      const buf = Buffer.from(data, encoding as any)
+      data = new Uint8Array(buf, buf.byteOffset, buf.byteLength)
+    }
+    const bcsType = this.bcsRegistry.get(type.getNormalizedSignature())
+    return bcsType?.parse(data)
   }
 
   async decodeDevInspectResult<T extends any[]>(inspectRes: DevInspectResults): Promise<TypedDevInspectResults<T>> {

package/src/sui-chain-adapter.ts

@@ -8,7 +8,7 @@ import {
   TypeDescriptor
 } from '@typemove/move'
 
-import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiClient } from '@mysten/sui.js/client'
+import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiClient } from '@mysten/sui/client'
 
 export class SuiChainAdapter extends ChainAdapter<
   // SuiNetwork,

package/src/tests/types/testnet/0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5.ts

@@ -15,11 +15,11 @@ import {
   getMoveCoder,
 } from "@typemove/sui";
 import {
-  TransactionBlock,
+  Transaction,
   TransactionArgument,
   TransactionObjectArgument,
-} from "@mysten/sui.js/transactions";
-import { SuiClient } from "@mysten/sui.js/client";
+} from "@mysten/sui/transactions";
+import { SuiClient } from "@mysten/sui/client";
 import {
   transactionArgumentOrObject,
   transactionArgumentOrPure,
@@ -95,7 +95,7 @@ export namespace oracle {
 
   export namespace builder {
     export function copyKey<T0 = any>(
-      tx: TransactionBlock,
+      tx: Transaction,
       args: [
         string | TransactionObjectArgument | TransactionArgument,
         string | TransactionArgument,
@@ -119,7 +119,7 @@ export namespace oracle {
       });
     }
     export function getOracle<T0 = any>(
-      tx: TransactionBlock,
+      tx: Transaction,
       args: [string | TransactionObjectArgument | TransactionArgument],
       typeArguments: [TypeDescriptor<T0> | string],
     ): TransactionArgument & [TransactionArgument] {
@@ -139,7 +139,7 @@ export namespace oracle {
       });
     }
     export function newOracle<T0 = any>(
-      tx: TransactionBlock,
+      tx: Transaction,
       args: [bigint | TransactionArgument],
       typeArguments: [TypeDescriptor<T0> | string],
     ): TransactionArgument & [TransactionArgument] {
@@ -159,7 +159,7 @@ export namespace oracle {
       });
     }
     export function update<T0 = any>(
-      tx: TransactionBlock,
+      tx: Transaction,
       args: [
         string | TransactionObjectArgument | TransactionArgument,
         string | TransactionObjectArgument | TransactionArgument,
@@ -205,7 +205,7 @@ export namespace oracle {
       ],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[]>> {
-      const tx = new TransactionBlock();
+      const tx = new Transaction();
       builder.copyKey(tx, args, typeArguments);
       const inspectRes = await client.devInspectTransactionBlock({
         transactionBlock: tx,
@@ -221,7 +221,7 @@ export namespace oracle {
       args: [string | TransactionObjectArgument | TransactionArgument],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[bigint, bigint, bigint, bigint]>> {
-      const tx = new TransactionBlock();
+      const tx = new Transaction();
       builder.getOracle(tx, args, typeArguments);
       const inspectRes = await client.devInspectTransactionBlock({
         transactionBlock: tx,
@@ -237,7 +237,7 @@ export namespace oracle {
       args: [bigint | TransactionArgument],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[]>> {
-      const tx = new TransactionBlock();
+      const tx = new Transaction();
       builder.newOracle(tx, args, typeArguments);
       const inspectRes = await client.devInspectTransactionBlock({
         transactionBlock: tx,
@@ -259,7 +259,7 @@ export namespace oracle {
       ],
       typeArguments: [TypeDescriptor<T0> | string],
     ): Promise<TypedDevInspectResults<[]>> {
-      const tx = new TransactionBlock();
+      const tx = new Transaction();
       builder.update(tx, args, typeArguments);
       const inspectRes = await client.devInspectTransactionBlock({
         transactionBlock: tx,