wowok 1.2.2 → 1.2.4

package/src/repository.ts

@@ -82,16 +82,7 @@ export class Repository {
             arguments: [Protocol.TXB_OBJECT(txb, this.object)],
         })   
     }
-/* move to: Entity.mark
-    mark(like:'like' | 'unlike', resource:Resource)  {
-        if (!Protocol.IsValidObjects([this.object])) return false;
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.RepositoryFn(like) as FnCallType,
-            arguments: [Protocol.TXB_OBJECT(txb, resource.get_object()), Protocol.TXB_OBJECT(txb, this.object)],
-        })   
-    }
-*/
+
     add_data(data:Repository_Policy_Data)  {
         if (!Repository.IsValidName(data.key)) {
             ERROR(Errors.IsValidName)
@@ -235,7 +226,7 @@ export class Repository {
 
         let txb = this.protocol.CurrentSession();
         policies.forEach((policy) => {
-            let permission_index = policy?.permission ? txb.pure(Bcs.getInstance().ser_option_u64(policy.permission)) : OptionNone(txb);
+            let permission_index = policy?.permission ? txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_U64, policy.permission)) : OptionNone(txb);
             if (passport) {
                 txb.moveCall({
                     target:this.protocol.RepositoryFn('policy_add_with_passport') as FnCallType,
@@ -277,7 +268,7 @@ export class Repository {
                 txb.moveCall({
                     target:this.protocol.RepositoryFn('policy_remove_with_passport') as FnCallType,
                     arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
-                        txb.pure(Bcs.getInstance().ser_vector_string(array_unique(policy_keys))), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(policy_keys))), 
                         Protocol.TXB_OBJECT(txb, this.permission)]
                 })                
             }
@@ -291,7 +282,7 @@ export class Repository {
                 txb.moveCall({
                     target:this.protocol.RepositoryFn('policy_remove') as FnCallType,
                     arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                        txb.pure(Bcs.getInstance().ser_vector_string(array_unique(policy_keys))), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(policy_keys))), 
                         Protocol.TXB_OBJECT(txb, this.permission)]
                 })                
             }
@@ -371,7 +362,7 @@ export class Repository {
             if(!Permission.IsValidPermissionIndex(permission_index)) {
                 ERROR(Errors.IsValidPermissionIndex)
             }
-            index = txb.pure(Bcs.getInstance().ser_option_u64(permission_index));
+            index = txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_U64, permission_index));
         }
 
         if (passport) {

package/src/service.ts

@@ -2,7 +2,7 @@ import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig } from '@mysten/bcs';
 import { IsValidArray, IsValidPercent, IsValidName_AllowEmpty, Bcs, array_unique, IsValidArgType, IsValidDesription, 
     IsValidAddress, IsValidEndpoint, OptionNone, IsValidUint, IsValidInt, IsValidName, } from './utils'
 import { FnCallType, GuardObject, PassportObject, PermissionObject, RepositoryObject, MachineObject, ServiceAddress, 
-    ServiceObject, DiscountObject, OrderObject, OrderAddress, CoinObject, Protocol, 
+    ServiceObject, DiscountObject, OrderObject, OrderAddress, CoinObject, Protocol, ValueType,
     TxbObject} from './protocol';
 import { ERROR, Errors } from './exception';
 import { Resource } from './resource';
@@ -39,10 +39,10 @@ export type Customer_RequiredInfo = {
     customer_info_crypt: string[];
 }
 export enum BuyRequiredEnum {
-    address = 'address',
-    phone = 'phone',
-    name = 'name',
-    postcode = 'postcode'
+    address = 'Address',
+    phone = 'Phone',
+    name = 'Name',
+    postcode = 'Postcode'
 }
 export type Service_Buy = {
     item: string;
@@ -96,7 +96,7 @@ export class Service {
 
         let s = new Service(protocol, pay_token_type, permission);
         let txb = protocol.CurrentSession();
-        let ep = endpoint? txb.pure(Bcs.getInstance().ser_option_string(endpoint)) : OptionNone(txb);
+        let ep = endpoint? txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_STRING, endpoint)) : OptionNone(txb);
         
         if (passport) {
             s.object = txb.moveCall({
@@ -130,16 +130,7 @@ export class Service {
             typeArguments:[this.pay_token_type]
         })   
     }
-/*  move to: Entity.mark
-    mark(like:'like' | 'unlike', resource:Resource) {
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ServiceFn(like) as FnCallType,
-            arguments: [Protocol.TXB_OBJECT(txb, resource.get_object()), Protocol.TXB_OBJECT(txb, this.object)],
-            typeArguments:[this.pay_token_type]
-        })   
-    }
-*/
+
     set_description(description:string, passport?:PassportObject)  {
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)
@@ -510,16 +501,16 @@ export class Service {
         if (passport) {
             txb.moveCall({
                 target:this.protocol.ServiceFn('sales_add_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(names)), 
-                    txb.pure(Bcs.getInstance().ser_vector_u64(price)), txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
+                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, names)), 
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, price)), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, stock)), 
                     Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })
         } else {
             txb.moveCall({
                 target:this.protocol.ServiceFn('sales_add') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(names)), 
-                    txb.pure(Bcs.getInstance().ser_vector_u64(price)), txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
+                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, names)), 
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, price)), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, stock)), 
                     Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })
@@ -545,7 +536,7 @@ export class Service {
             } else {
                 txb.moveCall({
                     target:this.protocol.ServiceFn('sales_remove_with_passport') as FnCallType,
-                    arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(array_unique(sales!))), 
+                    arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(sales!))), 
                         Protocol.TXB_OBJECT(txb, this.permission)],
                     typeArguments:[this.pay_token_type]
                 })            
@@ -560,7 +551,7 @@ export class Service {
             } else {
                 txb.moveCall({
                     target:this.protocol.ServiceFn('sales_remove') as FnCallType,
-                    arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(array_unique(sales!))), 
+                    arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(sales!))), 
                         Protocol.TXB_OBJECT(txb, this.permission)],
                     typeArguments:[this.pay_token_type]
                 })            
@@ -590,9 +581,9 @@ export class Service {
         let txb = this.protocol.CurrentSession();
         discount_dispatch.forEach((discount) => {
             let price_greater = discount.discount?.price_greater ? 
-                txb.pure(Bcs.getInstance().ser_option_u64(discount.discount.price_greater)) : OptionNone(txb);
+                txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_U64, discount.discount.price_greater)) : OptionNone(txb);
             let time_start = discount.discount?.time_start ? 
-                txb.pure(Bcs.getInstance().ser_option_u64(discount.discount.time_start)) : OptionNone(txb);
+                txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_U64, discount.discount.time_start)) : OptionNone(txb);
 
             if (passport) {
                 txb.moveCall({
@@ -711,7 +702,7 @@ export class Service {
         }
 
         let txb = this.protocol.CurrentSession();
-        let ep = endpoint? txb.pure(Bcs.getInstance().ser_option_string(endpoint)) : OptionNone(txb);
+        let ep = endpoint? txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_STRING, endpoint)) : OptionNone(txb);
         
         if (passport) {
             txb.moveCall({
@@ -774,7 +765,7 @@ export class Service {
             txb.moveCall({
                 target:this.protocol.ServiceFn('required_set_with_passport') as FnCallType,
                 arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(Bcs.getInstance().ser_vector_vector_u8(array_unique(customer_required))), 
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_VEC_U8, array_unique(customer_required))), 
                     txb.pure(pubkey, 'vector<u8>'), Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })         
@@ -782,7 +773,7 @@ export class Service {
             txb.moveCall({
                 target:this.protocol.ServiceFn('required_set') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(Bcs.getInstance().ser_vector_vector_u8(array_unique(customer_required))), 
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_VEC_U8, array_unique(customer_required))), 
                     txb.pure(pubkey, 'vector<u8>'), Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })         
@@ -903,7 +894,7 @@ export class Service {
             arguments:[Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, order), 
                 txb.pure(customer_info_crypto.pubkey, 'vector<u8>'), 
                 txb.pure(customer_info_crypto.customer_pubkey, 'vector<u8>'), 
-                txb.pure(Bcs.getInstance().ser_vector_vector_u8(array_unique(customer_info_crypto.customer_info_crypt)))],
+                txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_VEC_U8, array_unique(customer_info_crypto.customer_info_crypt)))],
             typeArguments:[this.pay_token_type]
         })    
         
@@ -935,16 +926,16 @@ export class Service {
             if (discount) {
                 order = txb.moveCall({
                     target:this.protocol.ServiceFn('dicount_buy_with_passport') as FnCallType,
-                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(name)), 
-                        txb.pure(Bcs.getInstance().ser_vector_u64(price)), txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
+                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, name)), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, price)), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, stock)), 
                         Protocol.TXB_OBJECT(txb, coin), Protocol.TXB_OBJECT(txb, discount), txb.object(Protocol.CLOCK_OBJECT)],                   
                     typeArguments:[this.pay_token_type]            
             })} else {
                 order = txb.moveCall({
                     target:this.protocol.ServiceFn('buy_with_passport') as FnCallType,
-                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(name)), 
-                        txb.pure(Bcs.getInstance().ser_vector_u64(price)), 
-                        txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
+                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, name)), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, price)), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, stock)), 
                         Protocol.TXB_OBJECT(txb, coin)],
                     typeArguments:[this.pay_token_type]            
             })}             
@@ -952,18 +943,18 @@ export class Service {
             if (discount) {
                 order = txb.moveCall({
                     target:this.protocol.ServiceFn('disoucnt_buy') as FnCallType,
-                    arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(name)), 
-                        txb.pure(Bcs.getInstance().ser_vector_u64(price)), 
-                        txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
+                    arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, name)), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, price)), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, stock)), 
                         Protocol.TXB_OBJECT(txb, coin), 
                         Protocol.TXB_OBJECT(txb, discount), txb.object(Protocol.CLOCK_OBJECT)],                
                     typeArguments:[this.pay_token_type]            
             })} else {
                 order = txb.moveCall({
                     target:this.protocol.ServiceFn('buy') as FnCallType,
-                    arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(name)), 
-                        txb.pure(Bcs.getInstance().ser_vector_u64(price)), 
-                        txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
+                    arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, name)), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, price)), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, stock)), 
                         Protocol.TXB_OBJECT(txb, coin)],
                     typeArguments:[this.pay_token_type]            
             })}           

package/src/utils.ts

@@ -1,10 +1,11 @@
 import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig, TypeName, StructTypeDefinition } from '@mysten/bcs';
 import { TransactionBlock, Inputs, TransactionResult, TransactionArgument } from '@mysten/sui.js/transactions';
 import { ERROR, Errors } from './exception';
-import { OperatorType } from './protocol';
+import { isValidSuiAddress, isValidSuiObjectId } from '@mysten/sui.js/utils'
+import { ValueType } from './protocol'
 
 export const OPTION_NONE = 0;
-export const readOption = (arr: number[], de:string) : {bNone:boolean, value:any}=> {
+export const readOption = (arr: number[], de:ValueType) : {bNone:boolean, value:any}=> {
     let o = arr.splice(0, 1);
     if (o[0] == 1) { // true
         return {bNone:false,  value:Bcs.getInstance().de(de, Uint8Array.from(arr))};
@@ -16,6 +17,21 @@ export const readOption = (arr: number[], de:string) : {bNone:boolean, value:any
     }
 }
 
+export const readOptionString = (arr: number[]) : {bNone:boolean, value:any}=> {
+    let o = arr.splice(0, 1);
+    if (o[0] == 1) { // true
+        let r = ulebDecode(Uint8Array.from(arr));
+        let value = Bcs.getInstance().de(ValueType.TYPE_STRING, Uint8Array.from(arr));
+        arr.splice(0, r.value+r.length);
+        return {bNone:false,  value:value};
+    } else if (o[0] == 0) {
+        return {bNone:true, value:OPTION_NONE};
+    } else {
+        ERROR(Errors.Fail, 'readOption: option invalid')
+        return {bNone:true, value:OPTION_NONE}
+    }
+}
+
 export const ulebDecode = (arr: Uint8Array) : {value: number, length: number} => {
 	let total = 0;
 	let shift = 0;
@@ -124,63 +140,107 @@ export class Bcs {
         };
         return Bcs._instance;
      }
-    ser_option_string(data:string) : Uint8Array {
-        return this.bcs.ser('Option<string>', {'some': data}).toBytes();
-    }
-    ser_option_u64(data:number) : Uint8Array {
-        return this.bcs.ser('Option<u64>', {'some': data}).toBytes();
-    }
-    ser_option_address(data:string) : Uint8Array {
-        return this.bcs.ser('Option<address>', {'some': data}).toBytes();
-    }
-    ser_vector_string(data:string[]) : Uint8Array {
-        return this.bcs.ser('vector<string>', data).toBytes();
-    }
-    ser_vector_vector_u8(data:string[]) : Uint8Array {
-        return this.bcs.ser('vector<vector<u8>>', data).toBytes();
-    }
-    ser_vector_u64(data:number[]) : Uint8Array {
-        return this.bcs.ser('vector<u64>', data).toBytes();
-    }
-    ser_vector_u8(data:number[])  : Uint8Array {
-        return this.bcs.ser('vector<u8>', data).toBytes();
-    }
-    ser_vector_address(data:number[])  : Uint8Array {
-        return this.bcs.ser('vector<address>', data).toBytes();
-    }
-    ser_vector_bool(data:number[])  : Uint8Array {
-        return this.bcs.ser('vector<bool>', data).toBytes();
-    }
-    ser_vector_u128(data:number[])  : Uint8Array {
-        return this.bcs.ser('vector<u128>', data).toBytes();
+    ser(type:ValueType, data:Uint8Array | any) : Uint8Array {
+        switch(type) {
+            case ValueType.TYPE_BOOL:
+                return this.bcs.ser(BCS.BOOL, data).toBytes();
+            case ValueType.TYPE_ADDRESS:
+                return this.bcs.ser(BCS.ADDRESS, data).toBytes();
+            case ValueType.TYPE_U64:
+                return this.bcs.ser(BCS.U64, data).toBytes();
+            case ValueType.TYPE_U8:
+                return this.bcs.ser(BCS.U8, data).toBytes();
+            case ValueType.TYPE_VEC_U8:
+                return this.bcs.ser('vector<u8>', data).toBytes();
+            case ValueType.TYPE_U128:
+                return this.bcs.ser(BCS.U128, data).toBytes();
+            case ValueType.TYPE_VEC_ADDRESS:
+                return this.bcs.ser('vector<address>', data).toBytes();
+            case ValueType.TYPE_VEC_BOOL:
+                return this.bcs.ser('vector<bool>', data).toBytes();
+            case ValueType.TYPE_VEC_VEC_U8:
+                return this.bcs.ser('vector<vector<u8>>', data).toBytes();
+            case ValueType.TYPE_VEC_U64:
+                return this.bcs.ser('vector<u64>', data).toBytes();
+            case ValueType.TYPE_VEC_U128:
+                return this.bcs.ser('vector<u128>', data).toBytes();
+            case ValueType.TYPE_OPTION_ADDRESS:
+                return this.bcs.ser('Option<address>', {'some': data}).toBytes();
+            case ValueType.TYPE_OPTION_BOOL:
+                return this.bcs.ser('Option<bool>', {'some': data}).toBytes();
+            case ValueType.TYPE_OPTION_U8:
+                return this.bcs.ser('Option<u8>', {'some': data}).toBytes();
+            case ValueType.TYPE_OPTION_U64:
+                return this.bcs.ser('Option<u64>', {'some': data}).toBytes();
+            case ValueType.TYPE_OPTION_U128:
+                return this.bcs.ser('Option<u128>', {'some': data}).toBytes();
+            case ValueType.TYPE_OPTION_U256:
+                return this.bcs.ser('Option<u256>', {'some': data}).toBytes();
+            case ValueType.TYPE_OPTION_STRING:
+                return this.bcs.ser('Option<string>', {'some': data}).toBytes();
+            case ValueType.TYPE_VEC_U256:
+                return this.bcs.ser('vector<u256>', data).toBytes();
+            case ValueType.TYPE_U256:
+                return this.bcs.ser(BCS.U256, data).toBytes();
+            case ValueType.TYPE_STRING:
+                return this.bcs.ser(BCS.STRING, data).toBytes();
+            case ValueType.TYPE_VEC_STRING:
+                return this.bcs.ser('vector<string>', data).toBytes();
+            default:
+                ERROR(Errors.bcsTypeInvalid, 'ser');
+        }
+        return new Uint8Array();
     }
 
-    ser_address(data:string) : Uint8Array {
-        return this.bcs.ser(BCS.ADDRESS, data).toBytes();
-    }
-    ser_bool(data:boolean) : Uint8Array {
-        return this.bcs.ser(BCS.BOOL, data).toBytes();
-    }
-    ser_u8(data:number) : Uint8Array {
-        return this.bcs.ser(BCS.U8, data).toBytes();
-    }
-    ser_u64(data:number) : Uint8Array {
-        return this.bcs.ser(BCS.U64, data).toBytes();
-    }
-    ser_u128(data:number) : Uint8Array {
-        return this.bcs.ser(BCS.U128, data).toBytes();
-    }
-    ser_u256(data:number) : Uint8Array {
-        return this.bcs.ser(BCS.U256, data).toBytes();
-    }
-    ser_string(data:string) : Uint8Array {
-        return this.bcs.ser(BCS.STRING, data).toBytes();
-    }
-    ser(type:TypeName | StructTypeDefinition, data:Uint8Array) {
-        return this.bcs.ser(type, data).toBytes();
-    }
-    de(type:TypeName | StructTypeDefinition, data:Uint8Array) {
-        return this.bcs.de(type, data)
+    de(type:ValueType, data:Uint8Array | any) : any {
+        switch(type) {
+            case ValueType.TYPE_BOOL:
+                return this.bcs.de(BCS.BOOL, data);
+            case ValueType.TYPE_ADDRESS:
+                return this.bcs.de(BCS.ADDRESS, data);
+            case ValueType.TYPE_U64:
+                return this.bcs.de(BCS.U64, data);
+            case ValueType.TYPE_U8:
+                return this.bcs.de(BCS.U8, data);
+            case ValueType.TYPE_VEC_U8:
+                return this.bcs.de('vector<u8>', data);
+            case ValueType.TYPE_U128:
+                return this.bcs.de(BCS.U128, data);
+            case ValueType.TYPE_VEC_ADDRESS:
+                return this.bcs.de('vector<address>', data);
+            case ValueType.TYPE_VEC_BOOL:
+                return this.bcs.de('vector<bool>', data);
+            case ValueType.TYPE_VEC_VEC_U8:
+                return this.bcs.de('vector<vector<u8>>', data);
+            case ValueType.TYPE_VEC_U64:
+                return this.bcs.de('vector<u64>', data);
+            case ValueType.TYPE_VEC_U128:
+                return this.bcs.de('vector<u128>', data);
+            case ValueType.TYPE_OPTION_ADDRESS:
+                return this.bcs.de('Option<address>', data);
+            case ValueType.TYPE_OPTION_BOOL:
+                return this.bcs.de('Option<bool>', data);
+            case ValueType.TYPE_OPTION_U8:
+                return this.bcs.de('Option<u8>', data);
+            case ValueType.TYPE_OPTION_U64:
+                return this.bcs.de('Option<u64>', data);
+            case ValueType.TYPE_OPTION_U128:
+                return this.bcs.de('Option<u128>', data);
+            case ValueType.TYPE_OPTION_U256:
+                return this.bcs.de('Option<u256>', data);
+            case ValueType.TYPE_OPTION_STRING:
+                return this.bcs.de('Option<string>', data);
+            case ValueType.TYPE_VEC_U256:
+                return this.bcs.de('vector<u256>', data);
+            case ValueType.TYPE_STRING:
+                return this.bcs.de(BCS.STRING, data);
+            case ValueType.TYPE_VEC_STRING:
+                return this.bcs.de('vector<string>', data);
+            case ValueType.TYPE_U256:
+                return this.bcs.de(BCS.U256, data);
+            default:
+                ERROR(Errors.bcsTypeInvalid, 'de');
+        }
     }
 }
 
@@ -238,7 +298,7 @@ export const IsValidDesription = (description:string) : boolean => { return desc
 export const IsValidName = (name:string) : boolean => { if(!name) return false; return name.length <= MAX_NAME_LENGTH && name.length != 0 }
 export const IsValidName_AllowEmpty = (name:string) : boolean => { return name.length <= MAX_NAME_LENGTH }
 export const IsValidEndpoint = (endpoint:string) : boolean => { if (!endpoint) return false; return endpoint.length <= MAX_ENDPOINT_LENGTH }
-export const IsValidAddress = (addr:string) : boolean => { if (!addr) return false; return true}
+export const IsValidAddress = (addr:string) : boolean => { if (!addr || !isValidSuiAddress(addr)) return false; return true}
 export const IsValidArgType = (argType: string) : boolean => { if (!argType) return false; return argType.length != 0 }
 export const IsValidUint = (value: number) : boolean => { return Number.isSafeInteger(value) && value != 0 }
 export const IsValidInt = (value: number) : boolean => { return Number.isSafeInteger(value) }

package/src/vote.ts

@@ -2,7 +2,7 @@ import { BCS } from '@mysten/bcs';
 import { FnCallType, PassportObject, PermissionObject, GuardObject, VoteAddress, Protocol, TxbObject} from './protocol';
 import { IsValidDesription, IsValidUint, IsValidAddress, OptionNone, Bcs, array_unique, IsValidArray, IsValidName } from './utils';
 import { ERROR, Errors } from './exception';
-import { Resource } from './resource';
+import { ValueType } from './protocol';
 
 export const MAX_AGREES_COUNT = 200;
 export const MAX_CHOICE_COUNT = 200;
@@ -51,7 +51,7 @@ export class Vote {
 
         let v = new Vote(protocol, permission);    
         let txb  = protocol.CurrentSession();
-        let reference = reference_address?  txb.pure(Bcs.getInstance().ser_option_address(reference_address)) : OptionNone(txb);
+        let reference = reference_address?  txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_ADDRESS, reference_address)) : OptionNone(txb);
         let choice_count = max_choice_count ? max_choice_count : 1;
 
         if (passport) {
@@ -112,7 +112,7 @@ export class Vote {
         }
 
         let txb = this.protocol.CurrentSession();
-        let reference = reference_address?  txb.pure(Bcs.getInstance().ser_option_address(reference_address)) : OptionNone(txb); 
+        let reference = reference_address?  txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_ADDRESS, reference_address)) : OptionNone(txb); 
         if (passport) {
             txb.moveCall({
                 target:this.protocol.VoteFn('reference_set_with_passport') as FnCallType,
@@ -207,7 +207,7 @@ export class Vote {
         let txb = this.protocol.CurrentSession();
         options.forEach((option) => {
             let reference = option?.reference_address ? 
-                txb.pure(Bcs.getInstance().ser_option_address(option.reference_address)) : 
+                txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_ADDRESS, option.reference_address)) : 
                 OptionNone(txb); 
 
             if (passport) {
@@ -244,7 +244,7 @@ export class Vote {
                 txb.moveCall({
                     target:this.protocol.VoteFn('agrees_remove_with_passport') as FnCallType,
                     arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
-                        txb.pure(Bcs.getInstance().ser_vector_string(array_unique(options))), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(options))), 
                         Protocol.TXB_OBJECT(txb, this.permission)]
                 })             
             }
@@ -258,7 +258,7 @@ export class Vote {
                 txb.moveCall({
                     target:this.protocol.VoteFn('agrees_remove') as FnCallType,
                     arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                        txb.pure(Bcs.getInstance().ser_vector_string(array_unique(options))), 
+                        txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(options))), 
                         Protocol.TXB_OBJECT(txb, this.permission)]
                 })        
             }
@@ -360,13 +360,13 @@ export class Vote {
             txb.moveCall({
                 target:this.protocol.VoteFn('with_passport') as FnCallType,
                 arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(Bcs.getInstance().ser_vector_string(array_unique(options)))]
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(options)))]
             })  
         } else {
             txb.moveCall({
                 target:this.protocol.VoteFn('this.object') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(Bcs.getInstance().ser_vector_string(array_unique(options)))]
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(options)))]
             })           
         }