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

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

@@ -73,7 +73,7 @@ export class bcs extends SuiBaseProcessor {
 export namespace bcs {
   export class BCS {
     static TYPE_QNAME = "0x2::bcs::BCS";
-    bytes: string;
+    bytes: number[];
   }
 
   export interface BCSInstance extends TypedEventInstance<BCS> {
@@ -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;
   }
@@ -407,8 +403,8 @@ export namespace devnet_nft {
   }
 
   export interface MintPayload
-    extends TypedFunctionPayload<[string, string, string]> {
-    arguments_decoded: [string, string, string];
+    extends TypedFunctionPayload<[number[], number[], number[]]> {
+    arguments_decoded: [number[], number[], number[]];
     type_arguments: [];
   }
 
@@ -450,7 +446,7 @@ export class digest extends SuiBaseProcessor {
 export namespace digest {
   export class Sha3256Digest {
     static TYPE_QNAME = "0x2::digest::Sha3256Digest";
-    digest: string;
+    digest: number[];
   }
 
   export interface Sha3256DigestInstance
@@ -570,7 +566,7 @@ export class elliptic_curve extends SuiBaseProcessor {
 export namespace elliptic_curve {
   export class RistrettoPoint {
     static TYPE_QNAME = "0x2::elliptic_curve::RistrettoPoint";
-    value: string;
+    value: number[];
   }
 
   export interface RistrettoPointInstance
@@ -581,7 +577,7 @@ export namespace elliptic_curve {
 
   export class Scalar {
     static TYPE_QNAME = "0x2::elliptic_curve::Scalar";
-    value: string;
+    value: number[];
   }
 
   export interface ScalarInstance extends TypedEventInstance<Scalar> {
@@ -677,10 +673,10 @@ export class groth16 extends SuiBaseProcessor {
 export namespace groth16 {
   export class PreparedVerifyingKey {
     static TYPE_QNAME = "0x2::groth16::PreparedVerifyingKey";
-    vk_gamma_abc_g1_bytes: string;
-    alpha_g1_beta_g2_bytes: string;
-    gamma_g2_neg_pc_bytes: string;
-    delta_g2_neg_pc_bytes: string;
+    vk_gamma_abc_g1_bytes: number[];
+    alpha_g1_beta_g2_bytes: number[];
+    gamma_g2_neg_pc_bytes: number[];
+    delta_g2_neg_pc_bytes: number[];
   }
 
   export interface PreparedVerifyingKeyInstance
@@ -691,7 +687,7 @@ export namespace groth16 {
 
   export class ProofPoints {
     static TYPE_QNAME = "0x2::groth16::ProofPoints";
-    bytes: string;
+    bytes: number[];
   }
 
   export interface ProofPointsInstance extends TypedEventInstance<ProofPoints> {
@@ -701,7 +697,7 @@ export namespace groth16 {
 
   export class PublicProofInputs {
     static TYPE_QNAME = "0x2::groth16::PublicProofInputs";
-    bytes: string;
+    bytes: number[];
   }
 
   export interface PublicProofInputsInstance
@@ -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: [];
   }
 
@@ -2057,36 +2018,36 @@ export namespace sui_system {
     extends TypedFunctionPayload<
       [
         SuiAddress,
-        string,
-        string,
-        string,
-        string,
-        string,
-        string,
-        string,
-        string,
-        string,
-        string,
-        string,
-        string,
+        number[],
+        number[],
+        number[],
+        number[],
+        number[],
+        number[],
+        number[],
+        number[],
+        number[],
+        number[],
+        number[],
+        coin.Coin<sui.SUI>,
         bigint,
         bigint
       ]
     > {
     arguments_decoded: [
       SuiAddress,
-      string,
-      string,
-      string,
-      string,
-      string,
-      string,
-      string,
-      string,
-      string,
-      string,
-      string,
-      string,
+      number[],
+      number[],
+      number[],
+      number[],
+      number[],
+      number[],
+      number[],
+      number[],
+      number[],
+      number[],
+      number[],
+      coin.Coin<sui.SUI>,
       bigint,
       bigint
     ];
@@ -2170,7 +2131,7 @@ export namespace tx_context {
   export class TxContext {
     static TYPE_QNAME = "0x2::tx_context::TxContext";
     sender: SuiAddress;
-    tx_hash: string;
+    tx_hash: number[];
     epoch: bigint;
     ids_created: 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>> {
@@ -2302,17 +2263,17 @@ export namespace validator {
   export class ValidatorMetadata {
     static TYPE_QNAME = "0x2::validator::ValidatorMetadata";
     sui_address: SuiAddress;
-    pubkey_bytes: string;
-    network_pubkey_bytes: string;
-    worker_pubkey_bytes: string;
-    proof_of_possession: string;
+    pubkey_bytes: number[];
+    network_pubkey_bytes: number[];
+    worker_pubkey_bytes: number[];
+    proof_of_possession: number[];
     name: string;
     description: string;
     image_url: url.Url;
     project_url: url.Url;
-    net_address: string;
-    consensus_address: string;
-    worker_address: string;
+    net_address: number[];
+    consensus_address: number[];
+    worker_address: number[];
     next_epoch_stake: bigint;
     next_epoch_delegation: bigint;
     next_epoch_gas_price: bigint;

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/src/sui/sui-processor.ts

@@ -32,6 +32,7 @@ export class SuiBaseProcessor {
   callHandlers: CallHandler<Data_SuiCall>[] = []
 
   constructor(name: string, options: SuiBindOptions) {
+    this.moduleName = name
     this.config = configure(options)
     SuiProcessorState.INSTANCE.addValue(this)
   }

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;

package/lib/move/ts-type.js

@@ -1,77 +0,0 @@
-import { normalizeToJSName, SPLITTER, VECTOR_STR } from './utils.js';
-export function generateTypeForDescriptor(type, currentAddress, addressType) {
-    if (type.qname.startsWith('&')) {
-        throw Error('Unexpected &');
-    }
-    if (type.reference) {
-        return addressType;
-    }
-    switch (type.qname) {
-        case 'signer': // TODO check this
-        case 'address':
-        case 'Address':
-            return addressType;
-        case '0x2::object::ID':
-        case '0x2::coin::Coin':
-            return 'string';
-        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 generateTypeForDescriptor(type.typeArgs[0], currentAddress, addressType) + '[]';
-    }
-    const simpleName = 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) => generateTypeForDescriptor(t, currentAddress, addressType)).join(',') +
-            '>');
-    }
-    return simpleName;
-}
-function generateSimpleType(type, currentAddress) {
-    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('.');
-}
-//# sourceMappingURL=ts-type.js.map

package/lib/move/ts-type.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ts-type.js","sourceRoot":"","sources":["../../src/move/ts-type.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEpE,MAAM,UAAU,yBAAyB,CAAC,IAAoB,EAAE,cAAsB,EAAE,WAAmB;IACzG,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9B,MAAM,KAAK,CAAC,cAAc,CAAC,CAAA;KAC5B;IACD,IAAI,IAAI,CAAC,SAAS,EAAE;QAClB,OAAO,WAAW,CAAA;KACnB;IAED,QAAQ,IAAI,CAAC,KAAK,EAAE;QAClB,KAAK,QAAQ,CAAC,CAAC,kBAAkB;QACjC,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,WAAW,CAAA;QACpB,KAAK,iBAAiB,CAAC;QACvB,KAAK,iBAAiB;YACpB,OAAO,QAAQ,CAAA;QACjB,KAAK,qBAAqB;YACxB,OAAO,QAAQ,CAAA;QACjB,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,SAAS,CAAA;QAClB,KAAK,IAAI,CAAC;QACV,KAAK,IAAI,CAAC;QACV,KAAK,KAAK,CAAC;QACX,KAAK,KAAK,CAAC;QACX,KAAK,KAAK,CAAC;QACX,KAAK,KAAK;YACR,OAAO,QAAQ,CAAA;QACjB,KAAK,KAAK,CAAC;QACX,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,QAAQ,CAAA;KAClB;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,UAAU,EAAE;QAC3C,2BAA2B;QAC3B,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QAC/C,IAAI,gBAAgB,KAAK,IAAI,IAAI,gBAAgB,KAAK,IAAI,EAAE;YAC1D,OAAO,QAAQ,CAAA;SAChB;QACD,IAAI,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC5E,OAAO,GAAG,gBAAgB,aAAa,CAAA;SACxC;QACD,OAAO,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,WAAW,CAAC,GAAG,IAAI,CAAA;KACvF;IAED,MAAM,UAAU,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,CAAA;IACjE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;KAClC;IACD,IAAI,UAAU,CAAC,WAAW,EAAE,KAAK,UAAU,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,UAAU,GAAG,QAAQ,CAAC,EAAE;QACzG,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;KAC9C;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,oBAAoB;QACpB,OAAO,CACL,UAAU;YACV,GAAG;YACH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,yBAAyB,CAAC,CAAC,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAC7F,GAAG,CACJ,CAAA;KACF;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY,EAAE,cAAsB;IAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAElC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,KAAK,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;KACvC;IAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAA;KAChB;IACD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,cAAc,EAAE;QAC/B,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;KAChC;IACD,OAAO,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC9B,CAAC","sourcesContent":["import { TypeDescriptor } from './types.js'\nimport { normalizeToJSName, SPLITTER, VECTOR_STR } from './utils.js'\n\nexport function generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string, addressType: string): string {\n  if (type.qname.startsWith('&')) {\n    throw Error('Unexpected &')\n  }\n  if (type.reference) {\n    return addressType\n  }\n\n  switch (type.qname) {\n    case 'signer': // TODO check this\n    case 'address':\n    case 'Address':\n      return addressType\n    case '0x2::object::ID':\n    case '0x2::coin::Coin':\n      return 'string'\n    case '0x1::string::String':\n      return 'string'\n    case 'bool':\n    case 'Bool':\n      return 'Boolean'\n    case 'u8':\n    case 'U8':\n    case 'u16':\n    case 'U16':\n    case 'u32':\n    case 'U32':\n      return 'number'\n    case 'u64':\n    case 'U64':\n    case 'u128':\n    case 'U128':\n    case 'u256':\n    case 'U256':\n      return 'bigint'\n  }\n\n  if (type.qname.toLowerCase() === VECTOR_STR) {\n    // vector<u8> as hex string\n    const elementTypeQname = type.typeArgs[0].qname\n    if (elementTypeQname === 'u8' || elementTypeQname === 'U8') {\n      return 'string'\n    }\n    if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {\n      return `${elementTypeQname}[] | string`\n    }\n    return generateTypeForDescriptor(type.typeArgs[0], currentAddress, addressType) + '[]'\n  }\n\n  const simpleName = generateSimpleType(type.qname, currentAddress)\n  if (simpleName.length === 0) {\n    console.error('unexpected error')\n  }\n  if (simpleName.toLowerCase() === VECTOR_STR || simpleName.toLowerCase().startsWith(VECTOR_STR + SPLITTER)) {\n    console.error('unexpected vector type error')\n  }\n  if (type.typeArgs.length > 0) {\n    // return simpleName\n    return (\n      simpleName +\n      '<' +\n      type.typeArgs.map((t) => generateTypeForDescriptor(t, currentAddress, addressType)).join(',') +\n      '>'\n    )\n  }\n  return simpleName\n}\n\nfunction generateSimpleType(type: string, currentAddress: string): string {\n  const parts = type.split(SPLITTER)\n\n  for (let i = 0; i < parts.length; i++) {\n    parts[i] = normalizeToJSName(parts[i])\n  }\n\n  if (parts.length < 2) {\n    return parts[0]\n  }\n  if (parts[0] === currentAddress) {\n    return parts.slice(1).join('.')\n  }\n  return '_' + parts.join('.')\n}\n"]}

package/src/move/ts-type.ts

@@ -1,86 +0,0 @@
-import { TypeDescriptor } from './types.js'
-import { normalizeToJSName, SPLITTER, VECTOR_STR } from './utils.js'
-
-export function generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string, addressType: string): string {
-  if (type.qname.startsWith('&')) {
-    throw Error('Unexpected &')
-  }
-  if (type.reference) {
-    return addressType
-  }
-
-  switch (type.qname) {
-    case 'signer': // TODO check this
-    case 'address':
-    case 'Address':
-      return addressType
-    case '0x2::object::ID':
-    case '0x2::coin::Coin':
-      return 'string'
-    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 generateTypeForDescriptor(type.typeArgs[0], currentAddress, addressType) + '[]'
-  }
-
-  const simpleName = 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) => generateTypeForDescriptor(t, currentAddress, addressType)).join(',') +
-      '>'
-    )
-  }
-  return simpleName
-}
-
-function 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('.')
-}