@typemove/sui 1.1.0 → 1.2.0-rc.2

package/dist/esm/sui-chain-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sui-chain-adapter.d.ts","sourceRoot":"","sources":["../../src/sui-chain-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,YAAY,EAGZ,cAAc,EACf,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,aAAa,EAAa,MAAM,uBAAuB,CAAA;AAEnG,qBAAa,eAAgB,SAAQ,YAAY,CAE/C,uBAAuB,EACvB,QAAQ,GAAG,aAAa,CACzB;IAGO,WAAW,CACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GAEb,OAAO,CAAC,uBAAuB,CAAC;IAK7B,YAAY,CAChB,OAAO,EAAE,MAAM,GAEd,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAQrC,2BAA2B,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE;IAQvE,iBAAiB,CAAC,OAAO,EAAE,uBAAuB,EAAE,GAAG,kBAAkB,EAAE;IAI3E,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAgBlF,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,aAAa,GAAG,MAAM;IAI/C,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,aAAa;CA2BtC"}
+{"version":3,"file":"sui-chain-adapter.d.ts","sourceRoot":"","sources":["../../src/sui-chain-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,YAAY,EAGZ,cAAc,EACf,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,aAAa,EAAa,MAAM,uBAAuB,CAAA;AAEnG,qBAAa,eAAgB,SAAQ,YAAY,CAE/C,uBAAuB,EACvB,QAAQ,GAAG,aAAa,CACzB;IAGO,WAAW,CACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GAEb,OAAO,CAAC,uBAAuB,CAAC;IAK7B,YAAY,CAChB,OAAO,EAAE,MAAM,GAEd,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAQrC,2BAA2B,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE;IAQvE,iBAAiB,CAAC,OAAO,EAAE,uBAAuB,EAAE,GAAG,kBAAkB,EAAE;IAI3E,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAgBlF,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,aAAa,GAAG,MAAM;IAI/C,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,aAAa;CA8BtC"}

package/dist/esm/sui-chain-adapter.js

@@ -1,5 +1,5 @@
 import { toInternalModule } from './to-internal.js';
-import { ChainAdapter, moduleQname, SPLITTER, } from '@typemove/move';
+import { ChainAdapter, moduleQname, SPLITTER } from '@typemove/move';
 import { SuiClient } from '@mysten/sui.js/client';
 export class SuiChainAdapter extends ChainAdapter {
     // static INSTANCE = new SuiChainAdapter()
@@ -14,7 +14,7 @@ export class SuiChainAdapter extends ChainAdapter {
     ) {
         const client = getRpcClient(this.endpoint);
         const modules = await client.getNormalizedMoveModulesByPackage({
-            package: account,
+            package: account
         });
         return Object.values(modules);
     }
@@ -48,6 +48,9 @@ export class SuiChainAdapter extends ChainAdapter {
         // if (val.parsedJson) {
         //   return val.parsedJson as any
         // }
+        if (val === undefined) {
+            throw Error('val is undefined');
+        }
         if ('parsedJson' in val) {
             return val.parsedJson;
         }

package/dist/esm/sui-chain-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"sui-chain-adapter.js","sourceRoot":"","sources":["../../src/sui-chain-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sui-chain-adapter.js","sourceRoot":"","sources":["../../src/sui-chain-adapter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typemove/sui",
-  "version": "1.1.0",
+  "version": "1.2.0-rc.2",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -34,7 +34,7 @@
     "@mysten/sui.js": "^0.41.2",
     "chalk": "^5.3.0",
     "radash": "^11.0.0",
-    "@typemove/move": "1.1.0"
+    "@typemove/move": "1.2.0-rc.2"
   },
   "url": "https://github.com/sentioxyz/typemove",
   "scripts": {

package/src/move-coder.ts

@@ -6,24 +6,28 @@ import {
   parseMoveType,
   SPLITTER,
   TypeDescriptor,
-  InternalMoveModule,
+  InternalMoveModule
 } from '@typemove/move'
 import {
   MoveCallSuiTransaction,
   SuiCallArg,
   SuiEvent,
   SuiMoveNormalizedModule,
-  SuiMoveObject,
+  SuiMoveObject
 } from '@mysten/sui.js/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, Encoding } from '@mysten/bcs'
+import { normalizeSuiObjectId, normalizeSuiAddress } from '@mysten/sui.js/utils'
 
 export class MoveCoder extends AbstractMoveCoder<
   // SuiNetwork,
   SuiMoveNormalizedModule,
   SuiEvent | SuiMoveObject
 > {
+  bcs = new BCS(getSuiMoveConfig())
+
   constructor(network: string) {
     super(new SuiChainAdapter(network))
   }
@@ -38,20 +42,67 @@ export class MoveCoder extends AbstractMoveCoder<
     return m
   }
 
-  protected decode(data: any, type: TypeDescriptor): any {
+  protected async decode(data: any, type: TypeDescriptor): Promise<any> {
     switch (type.qname) {
       case '0x1::ascii::Char':
+        if (data !== undefined && typeof data !== 'string') {
+          // bcs
+          const byte = (await super.decode(data, type)).byte as number
+          return String.fromCharCode(byte)
+        }
       case '0x1::ascii::String':
+        if (data !== undefined && typeof data !== 'string') {
+          // bcs verified
+          const bytes = (await super.decode(data, type)).bytes as number[]
+          return new TextDecoder().decode(new Uint8Array(bytes))
+        }
       case '0x2::object::ID':
+        if (data !== undefined && typeof data !== 'string') {
+          // bcs verified
+          const bytes = (await super.decode(data, type)).bytes as string
+          return normalizeSuiObjectId(bytes)
+        }
+      case '0x2::url::Url':
+        if (data !== undefined && typeof data !== 'string') {
+          // bcs
+          return (await super.decode(data, type)).url
+        }
       case '0x2::coin::Coin':
+        if (data !== undefined && typeof data !== 'string') {
+          // bcs
+          const bytes = (await super.decode(data, type)).id.id.bytes as number[]
+          return new TextDecoder().decode(new Uint8Array(bytes))
+        }
         return data
       case '0x2::balance::Balance':
+        if (data.value) {
+          // bcs verfied
+          const balance = await super.decode(data, type)
+          return balance.value
+        }
         return BigInt(data)
       case '0x1::option::Option':
         if (data === null) {
           return data
         }
+        if (data.vec) {
+          // bcs verifed
+          let vec = await super.decode(data, type)
+          vec = vec.vec
+          if (vec.length === 0) {
+            return null
+          }
+          return vec[0]
+        }
         return this.decode(data, type.typeArgs[0])
+      case 'Address':
+        const str = data as string
+        return normalizeSuiAddress(str)
+      case '0x1::string::String':
+        if (typeof data !== 'string') {
+          // bcs
+          return new TextDecoder().decode(new Uint8Array(data.bytes))
+        }
       default:
         return super.decode(data, type)
     }
@@ -115,9 +166,46 @@ export class MoveCoder extends AbstractMoveCoder<
     const argumentsTyped = await this.decodeArray(args, params, false)
     return {
       ...payload,
-      arguments_decoded: argumentsTyped,
+      arguments_decoded: argumentsTyped
     } 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 = {}
+
+    for (const field of moveStruct.fields) {
+      structDef[field.name] = field.type.getNormalizedSignature()
+    }
+    let typeName = qname
+    const generics = moveStruct.typeParams.map((p, idx) => 'T' + idx).join(', ')
+    if (generics) {
+      typeName = typeName + '<' + generics + '>'
+    }
+
+    this.bcs.registerStructType(typeName, structDef)
+
+    for (const field of moveStruct.fields) {
+      await this.registerBCSTypes(field.type)
+    }
+  }
+
+  async registerBCSTypes(type: TypeDescriptor): Promise<void> {
+    // TODO maybe can we get rid of this
+    await this._registerBCSType('0x1::string::String')
+
+    for (const typeArg of type.dependedTypes()) {
+      await this._registerBCSType(typeArg)
+    }
+  }
+
+  async decodeBCS(type: TypeDescriptor, data: Uint8Array | string, encoding?: Encoding): Promise<any> {
+    await this.registerBCSTypes(type)
+    return this.bcs.de(type.getNormalizedSignature(), data, encoding)
+  }
 }
 
 const DEFAULT_ENDPOINT = 'https://fullnode.mainnet.sui.io/'

package/src/sui-chain-adapter.ts

@@ -5,7 +5,7 @@ import {
   ChainAdapter,
   moduleQname,
   SPLITTER,
-  TypeDescriptor,
+  TypeDescriptor
 } from '@typemove/move'
 
 import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiClient } from '@mysten/sui.js/client'
@@ -32,7 +32,7 @@ export class SuiChainAdapter extends ChainAdapter<
   ): Promise<SuiMoveNormalizedModule[]> {
     const client = getRpcClient(this.endpoint)
     const modules = await client.getNormalizedMoveModulesByPackage({
-      package: account,
+      package: account
     })
     return Object.values(modules)
   }
@@ -73,6 +73,9 @@ export class SuiChainAdapter extends ChainAdapter<
     // if (val.parsedJson) {
     //   return val.parsedJson as any
     // }
+    if (val === undefined) {
+      throw Error('val is undefined')
+    }
     if ('parsedJson' in val) {
       return val.parsedJson as any
     }