wowok 1.2.4 → 1.2.7

package/src/service.ts

@@ -1,5 +1,5 @@
 import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig } from '@mysten/bcs';
-import { IsValidArray, IsValidPercent, IsValidName_AllowEmpty, Bcs, array_unique, IsValidArgType, IsValidDesription, 
+import { IsValidArray, IsValidPercent, IsValidName_AllowEmpty, Bcs, array_unique, IsValidTokenType, IsValidDesription, 
     IsValidAddress, IsValidEndpoint, OptionNone, IsValidUint, IsValidInt, IsValidName, } from './utils'
 import { FnCallType, GuardObject, PassportObject, PermissionObject, RepositoryObject, MachineObject, ServiceAddress, 
     ServiceObject, DiscountObject, OrderObject, OrderAddress, CoinObject, Protocol, ValueType,
@@ -15,6 +15,7 @@ export type Service_Sale = {
     item:string;
     price:number;
     stock:number;
+    endpoint?:string;
 }
 export enum Service_Discount_Type {
     ratio = 0, // -off%
@@ -39,11 +40,12 @@ 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;
     max_price: number;
@@ -62,6 +64,8 @@ export class Service {
     protected object : TxbObject;
     protected protocol;
 
+    //static token2coin = (token:string) => { return '0x2::coin::Coin<' + token + '>'};
+
     get_pay_type() {  return this.pay_token_type }
     get_object() { return this.object }
     private constructor(protocol: Protocol, pay_token_type:string, permission:PermissionObject) {
@@ -70,18 +74,18 @@ export class Service {
         this.permission = permission
         this.object = ''
     }
-    static From(protocol: Protocol, pay_token_type:string, permission:PermissionObject, object:TxbObject) : Service {
-        let s = new Service(protocol, pay_token_type, permission);
+    static From(protocol: Protocol, token_type:string, permission:PermissionObject, object:TxbObject) : Service {
+        let s = new Service(protocol, token_type, permission);
         s.object = Protocol.TXB_OBJECT(protocol.CurrentSession(), object);
         return s
     }
-    static New(protocol: Protocol, pay_token_type:string, permission:PermissionObject, description:string, 
+    static New(protocol: Protocol, token_type:string, permission:PermissionObject, description:string, 
         payee_address:string, endpoint?:string, passport?:PassportObject) : Service {
         if (!Protocol.IsValidObjects([permission])) {
             ERROR(Errors.IsValidObjects)
         }
-        if (!IsValidArgType(pay_token_type)) {
-            ERROR(Errors.IsValidArgType, 'this.pay_token_type')
+        if (!IsValidTokenType(token_type)) {
+            ERROR(Errors.IsValidTokenType, 'New: pay_token_type') 
         }
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)
@@ -94,10 +98,12 @@ export class Service {
             ERROR(Errors.IsValidEndpoint)
         }
 
+        let pay_token_type = token_type;
         let s = new Service(protocol, pay_token_type, permission);
         let txb = protocol.CurrentSession();
         let ep = endpoint? txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_STRING, endpoint)) : OptionNone(txb);
         
+
         if (passport) {
             s.object = txb.moveCall({
                 target:protocol.ServiceFn('new_with_passport') as FnCallType,
@@ -107,7 +113,7 @@ export class Service {
         } else {
             s.object = txb.moveCall({
                 target:protocol.ServiceFn('new') as FnCallType,
-                arguments:[txb.pure(description), txb.pure(payee_address, BCS.ADDRESS), ep, Protocol.TXB_OBJECT(txb, permission)],
+                arguments:[txb.pure(description, BCS.STRING), txb.pure(payee_address, BCS.ADDRESS), ep, Protocol.TXB_OBJECT(txb, permission)],
                 typeArguments:[pay_token_type],
             })
         }
@@ -251,6 +257,32 @@ export class Service {
             })
         }
     }
+    set_sale_endpoint(item:string, endpoint?:string, bNotFoundAssert:boolean=true, passport?:PassportObject) {
+        if (!IsValidName(item)) {
+            ERROR(Errors.IsValidName, 'set_sale_endpoint')
+        }
+        if (endpoint && !IsValidEndpoint(endpoint)) {
+            ERROR(Errors.IsValidEndpoint, 'set_sale_endpoint')
+        }
+        let txb = this.protocol.CurrentSession();
+        let ep = endpoint? txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_STRING, endpoint)) : OptionNone(txb);
+        if (passport) {
+            txb.moveCall({
+                target:this.protocol.ServiceFn('sale_endpoint_set_with_passport') as FnCallType,
+                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(item), ep, 
+                    txb.pure(bNotFoundAssert, BCS.BOOL), Protocol.TXB_OBJECT(txb, this.permission)],
+                typeArguments:[this.pay_token_type]
+            })
+        } else {
+            txb.moveCall({
+                target:this.protocol.ServiceFn('sale_endpoint_set') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(item), ep, 
+                    txb.pure(bNotFoundAssert, BCS.BOOL), Protocol.TXB_OBJECT(txb, this.permission)],
+                typeArguments:[this.pay_token_type]
+            })
+        }        
+    }
+
     set_payee(payee:string, passport?:PassportObject)  {
         if (!IsValidAddress(payee)) {
             ERROR(Errors.IsValidAddress, 'payee');
@@ -272,8 +304,9 @@ export class Service {
         }
     }
     repository_add(repository:RepositoryObject, passport?:PassportObject) {
-        if (!Protocol.IsValidObjects([this.object, this.permission, repository])) return false;
-        if (!IsValidArgType(this.pay_token_type)) return false;
+        if (!Protocol.IsValidObjects([repository])) {
+            ERROR(Errors.IsValidObjects, 'repository_add');
+        }
 
         let txb = this.protocol.CurrentSession();
         if (passport) {
@@ -287,9 +320,8 @@ export class Service {
                 target:this.protocol.ServiceFn('repository_add') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, repository), Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
-            })
+            })  
         }
-        
     }
     repository_remove(repository_address?:string[], removeall?:boolean, passport?:PassportObject) {
         if (!removeall && !repository_address) {
@@ -487,14 +519,17 @@ export class Service {
         return bValid
     }
 
-    add_sale(sales:Service_Sale[], passport?:PassportObject) {
+    add_sale(sales:Service_Sale[], bExistAssert:boolean=false, passport?:PassportObject) {
         if (!sales || !this.is_valid_sale(sales)) {
-            ERROR(Errors.InvalidParam, 'Service_Sale')
+            ERROR(Errors.InvalidParam, 'add_sale')
         }
         
-        let names: string[]  = []; let price: number[] = []; let stock: number[] = [];
+        let names: string[]  = []; let price: number[] = []; let stock: number[] = []; let endpoint: string[] = [];
         sales.forEach((s) => {
-            names.push(s.item); price.push(s.price); stock.push(s.stock);
+            if (s.endpoint && !IsValidEndpoint(s.endpoint)) {
+                ERROR(Errors.IsValidEndpoint, 'add_sale')
+            }
+            names.push(s.item); price.push(s.price); stock.push(s.stock); endpoint.push(s.endpoint ?? '')
         })
 
         let txb = this.protocol.CurrentSession();
@@ -502,7 +537,8 @@ export class Service {
             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(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)), 
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, endpoint)), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, price)), 
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, stock)), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_BOOL, bExistAssert)),
                     Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })
@@ -510,15 +546,16 @@ export class Service {
             txb.moveCall({
                 target:this.protocol.ServiceFn('sales_add') as FnCallType,
                 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_STRING, endpoint)),
                     txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, price)), txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_U64, stock)), 
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_BOOL, bExistAssert)),
                     Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })
         }
-        
     }
-    remove_sales(sales?:string[], removeall?:boolean, passport?:PassportObject) {
-        if (!removeall && !sales) {
+    remove_sales(sales?:string[], passport?:PassportObject) {
+        if (!sales) {
             ERROR(Errors.AllInvalid, 'sales & removeall')
         }
         if (sales && !IsValidArray(sales, IsValidName)) {
@@ -527,35 +564,19 @@ export class Service {
 
         let txb = this.protocol.CurrentSession();
         if (passport) {
-            if (removeall) {
-                txb.moveCall({
-                    target:this.protocol.ServiceFn('sales_remove_all_with_passport') as FnCallType,
-                    arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.permission)],
-                    typeArguments:[this.pay_token_type]
-                })    
-            } 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(ValueType.TYPE_VEC_STRING, array_unique(sales!))), 
-                        Protocol.TXB_OBJECT(txb, this.permission)],
-                    typeArguments:[this.pay_token_type]
-                })            
-            }
+            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(ValueType.TYPE_VEC_STRING, array_unique(sales!))), 
+                    Protocol.TXB_OBJECT(txb, this.permission)],
+                typeArguments:[this.pay_token_type]
+            })            
         } else {
-            if (removeall) {
-                txb.moveCall({
-                    target:this.protocol.ServiceFn('sales_remove_all') as FnCallType,
-                    arguments:[Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.permission)],
-                    typeArguments:[this.pay_token_type]
-                })      
-            } else {
-                txb.moveCall({
-                    target:this.protocol.ServiceFn('sales_remove') as FnCallType,
-                    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]
-                })            
-            }
+            txb.moveCall({
+                target:this.protocol.ServiceFn('sales_remove') as FnCallType,
+                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]
+            })            
         }     
     }
 
@@ -760,21 +781,22 @@ export class Service {
             ERROR(Errors.InvalidParam, 'customer_required')
         }
 
+        let req = array_unique(customer_required) as string[];
         let txb = this.protocol.CurrentSession();
         if (passport) {
             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(ValueType.TYPE_VEC_VEC_U8, array_unique(customer_required))), 
-                    txb.pure(pubkey, 'vector<u8>'), Protocol.TXB_OBJECT(txb, this.permission)],
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, req)), 
+                    txb.pure(pubkey, BCS.STRING), Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })         
         } else {
             txb.moveCall({
                 target:this.protocol.ServiceFn('required_set') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                    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)],
+                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, req)), 
+                    txb.pure(pubkey, BCS.STRING), Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })         
         }
@@ -915,7 +937,7 @@ export class Service {
             names.push(v.item)
         })
         if (!bValid) {
-            ERROR(Errors.InvalidParam, 'buy_items')
+            ERROR(Errors.InvalidParam, 'buy_items 2')
         }
 
         let name:string[] = []; let price:number[] = [];    let stock:number[] = []; let order;
@@ -1007,5 +1029,26 @@ export class Service {
     }
 
     static MAX_DISCOUNT_COUNT_ONCE = 200;
-    static MAX_DISCOUNT_RECEIVER_COUNT = 200;
+    static MAX_DISCOUNT_RECEIVER_COUNT = 20;
+    static MAX_GUARD_COUNT = 16;
+    static MAX_REPOSITORY_COUNT = 16;
+    
+    static parseObjectType = (chain_type:string | undefined | null) : string =>  {
+        if (chain_type) {
+            const s = 'service::Service<'
+            const i = chain_type.indexOf(s);
+            if (i > 0) {
+                return chain_type.slice(i + s.length, chain_type.length-1);
+            }
+        }
+        return '';
+    }
+    static endpoint = (service_endpoint:string, item_endpoint:string, item_name:string) => {
+        if (item_endpoint) {
+            return item_endpoint
+        } else if  (service_endpoint) {
+            return service_endpoint + '/sales/' + encodeURI(item_name);
+        }
+    }
+
 }

package/src/utils.ts

@@ -1,10 +1,64 @@
-import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig, TypeName, StructTypeDefinition } from '@mysten/bcs';
+import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig, TypeName, BcsReader } from '@mysten/bcs';
 import { TransactionBlock, Inputs, TransactionResult, TransactionArgument } from '@mysten/sui.js/transactions';
 import { ERROR, Errors } from './exception';
 import { isValidSuiAddress, isValidSuiObjectId } from '@mysten/sui.js/utils'
-import { ValueType } from './protocol'
+import { RepositoryValueType, ValueType } from './protocol'
+
+export const MAX_U8 = BigInt('256');
+export const MAX_U64 = BigInt('18446744073709551615');
+export const MAX_U128 = BigInt('340282366920938463463374607431768211455');
+export const MAX_U256 = BigInt('115792089237316195423570985008687907853269984665640564039457584007913129639935');
 
 export const OPTION_NONE = 0;
+
+export const ValueTypeConvert = (type:ValueType | null | undefined) : RepositoryValueType | number => {
+    if (type === ValueType.TYPE_U8 || type === ValueType.TYPE_U64 || type === ValueType.TYPE_U128 || 
+        type === ValueType.TYPE_U256 || type === ValueType.TYPE_BOOL) {
+            return RepositoryValueType.PositiveNumber
+    } else if (type === ValueType.TYPE_VEC_U8 || type === ValueType.TYPE_VEC_U64 || type === ValueType.TYPE_VEC_U128 || 
+        type === ValueType.TYPE_VEC_U256|| type === ValueType.TYPE_VEC_BOOL) {
+            return RepositoryValueType.PositiveNumber_Vec
+    } else if (type === ValueType.TYPE_ADDRESS) {
+        return RepositoryValueType.Address
+    } else if (type === ValueType.TYPE_VEC_ADDRESS) {
+        return RepositoryValueType.Address_Vec
+    } else if (type === ValueType.TYPE_STRING) {
+        return RepositoryValueType.String
+    } else if (type === ValueType.TYPE_VEC_STRING) {
+        return RepositoryValueType.String_Vec
+    } 
+    return -1;
+}
+
+export const ResolveRepositoryData = (dataType:RepositoryValueType, data:Uint8Array) : {type:ValueType, data: Uint8Array} | undefined =>  {
+    if (dataType === RepositoryValueType.String) { 
+        return {type: ValueType.TYPE_STRING, data: Bcs.getInstance().ser(ValueType.TYPE_VEC_U8, new TextEncoder().encode(data.toString()))}
+   } else if (dataType === RepositoryValueType.PositiveNumber) {
+        try {
+            const value = BigInt(data.toString());
+            var t = ValueType.TYPE_U8;
+            if (value <= MAX_U8) {
+            } else if (value <= MAX_U64) {
+                t = ValueType.TYPE_U64;
+            } else if (value <= MAX_U128) {
+                t = ValueType.TYPE_U128;
+            } else if (value <= MAX_U256) {
+                t = ValueType.TYPE_U256;
+            } else {
+                return undefined
+            }
+        } catch (e) {
+            console.log(e)
+            return undefined
+        }
+        return {type:t, data:Bcs.getInstance().ser(t, data)}
+   } else if (dataType === RepositoryValueType.Address) {
+        return {type:ValueType.TYPE_ADDRESS, data:Bcs.getInstance().ser(ValueType.TYPE_ADDRESS, data)}
+   } 
+   //@ todo vector....
+   return undefined
+}
+
 export const readOption = (arr: number[], de:ValueType) : {bNone:boolean, value:any}=> {
     let o = arr.splice(0, 1);
     if (o[0] == 1) { // true
@@ -133,6 +187,20 @@ export class Bcs {
             'none': null,
             'some': 'T',
         });
+        this.bcs.registerStructType('EntStruct', {
+            'avatar': 'vector<u8>',
+            'resource': "Option<address>",
+            'like': BCS.U32,
+            'dislike': BCS.U32,
+        })
+        this.bcs.registerStructType('PersonalInfo', {
+            'name': 'vector<u8>',
+            'description': 'vector<u8>',
+            'avatar': BCS.STRING,
+            'twitter': BCS.STRING,
+            'discord': BCS.STRING,
+            'homepage': BCS.STRING,
+        })
     }
     static getInstance() : Bcs { 
         if (!Bcs._instance) {
@@ -140,6 +208,7 @@ export class Bcs {
         };
         return Bcs._instance;
      }
+
     ser(type:ValueType, data:Uint8Array | any) : Uint8Array {
         switch(type) {
             case ValueType.TYPE_BOOL:
@@ -201,6 +270,7 @@ export class Bcs {
             case ValueType.TYPE_U64:
                 return this.bcs.de(BCS.U64, data);
             case ValueType.TYPE_U8:
+                console.log(data)
                 return this.bcs.de(BCS.U8, data);
             case ValueType.TYPE_VEC_U8:
                 return this.bcs.de('vector<u8>', data);
@@ -242,6 +312,30 @@ export class Bcs {
                 ERROR(Errors.bcsTypeInvalid, 'de');
         }
     }
+
+    de_ent(data:Uint8Array) : any {
+        const struct_vec = this.bcs.de('vector<u8>', data);
+        return this.bcs.de('EntStruct', Uint8Array.from(struct_vec));
+/*        const reader = new BcsReader(data);
+        const total_len = reader.readULEB();
+        console.log(avatar_len)
+        const avatar = reader.readBytes(avatar_len);
+        console.log(avatar)
+        const option_resource = reader.read8();
+        var resource = '';
+        if (option_resource != 0) {
+            resource = reader.read256();
+        }
+        const like = reader.read32();
+        const dislike = reader.read32();
+        return {avatar:avatar, resource:resource, like:like, dislike:dislike}*/
+    }    
+    de_entInfo(data:Uint8Array) : any {
+        let r = this.bcs.de('PersonalInfo', data);
+        r.name = new TextDecoder().decode(Uint8Array.from(r.name));
+        r.description = new TextDecoder().decode(Uint8Array.from(r.description));
+        return r
+    }        
 }
 
 export function stringToUint8Array(str:string) : Uint8Array {
@@ -264,7 +358,6 @@ export function numToUint8Array(num:number) : Uint8Array {
     return new Uint8Array(a)
 } 
 
-// 判断是否为数组
 export const isArr = (origin: any): boolean => {
     let str = '[object Array]'
     return Object.prototype.toString.call(origin) == str ? true : false
@@ -298,19 +391,85 @@ 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 || !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) }
-export const IsValidPercent = (value: number) : boolean => { return Number.isSafeInteger(value) && value > 0 && value <= 100 }
+export const IsValidAddress = (addr:string) : boolean => { 
+    if (!addr || !isValidSuiAddress(addr)) {
+        return false; 
+    }
+    return true
+}
+export const IsValidTokenType = (argType: string) : boolean => { 
+    if (!argType || argType.length === 0) {
+        return false; 
+    }
+    let arr = argType.split('::');
+    if (arr.length !== 3) {
+        return false;
+    } 
+    if ((!IsValidAddress(arr[0]) && arr[0] != '0x2') || arr[1].length === 0 || arr[2].length === 0) {
+        return false;
+    }
+    return true;
+}
+export const IsValidArgType = (argType: string) : boolean => { 
+    if (!argType || argType.length === 0) {
+        return false; 
+    }
+    let arr = argType.split('::');
+    if (arr.length < 3) {
+        return false;
+    } 
+    return true;
+}
+export const IsValidUint = (value: number | string) : boolean => { 
+    if (typeof(value) === 'string') {
+        value = parseInt(value as string);
+    }
+    return Number.isSafeInteger(value) && value > 0 
+}
+export const IsValidInt = (value: number | string) : boolean => { 
+    if (typeof(value) === 'string') {
+        value = parseInt(value as string);
+    }
+    return Number.isSafeInteger(value) 
+}
+export const IsValidPercent = (value: number | string) : boolean => { 
+    if (typeof(value) === 'string') {
+        value = parseInt(value as string);
+    }
+    return Number.isSafeInteger(value) && value > 0 && value <= 100 
+}
 export const IsValidArray = (arr: any[], validFunc:any) : boolean => {
-    let bValid = true;
-    arr.forEach((v) => {
-        if (!validFunc(v)) {
-            bValid = false; 
+    for (let i = 0; i < arr.length; ++i) {
+        if (!validFunc(arr[i])) {
+            return false
         }
-    })
-    return bValid;
+    }
+    return true
+}
+
+export const ResolveU64 = (value:bigint) : bigint => {
+    const max = MAX_U64;
+    if (value > max) {
+        return max;
+    } else {
+        return value
+    }
+}
+
+export const ResolveBalance = (balance:string, decimals:number) : string => {
+    if (!balance) return ''
+    if (balance === '0') return '0'
+    if (decimals <= 0) return balance;
+    var pos = decimals - balance.length;
+    if (pos === 0) {
+       return '.' + balance;
+    } else if (pos < 0) {
+        let start = balance.slice(0, Math.abs(pos));
+        let end = balance.slice(Math.abs(pos));
+        return start + '.' + end;
+    } else {
+        return '.' + balance.padStart(pos, '0');
+    }
 }
 
 export const OptionNone = (txb:TransactionBlock) : TransactionArgument => { return txb.pure([], BCS.U8) };
@@ -321,13 +480,18 @@ export type ArgType = {
     token: string;
 }
 export const ParseType = (type:string) : ArgType => {
-    let i = type.indexOf('<');
-    if (i > 0 && type.length > 12) {
-        let c = type.slice(0, i);
-        if (c === '0x2::coin::Coin' || c === '0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin') {
-            let coin = type.slice(i+1, type.length-1); // < >>
-            let t = coin.lastIndexOf('::');
-            return {isCoin:true, coin:coin, token:coin.slice(t+2)}
+    if (type) {
+        const COIN = '0x2::coin::Coin<';
+        let i = type.indexOf(COIN);
+        if (i >= 0) {
+            let coin = type.slice(i+COIN.length, type.length-1);
+            if (coin.indexOf('<') === -1) {
+                while (coin[coin.length-1] == '>') {
+                    coin = coin.slice(0, -1);
+                };
+                let t = coin.lastIndexOf('::');      
+                return {isCoin:true, coin:coin, token:coin.slice(t+2)}         
+            }
         }
     }
     return  {isCoin:false, coin:'', token:''}
@@ -360,5 +524,5 @@ export function isValidHttpUrl(url:string) : boolean {
       return false;  
     }
   
-    return r.protocol === "http:" || r.protocol === "https:";
+    return r.protocol === "http:" || r.protocol === "https:" || r.protocol === 'ipfs:';
 }

package/src/vote.ts

@@ -28,7 +28,7 @@ export class Vote {
         v.object = Protocol.TXB_OBJECT(protocol.CurrentSession(), object)
         return v
     }
-    static New(protocol:Protocol, permission:PermissionObject, description:string, minutes_duration:number, 
+    static New(protocol:Protocol, permission:PermissionObject, description:string, minutes_duration:boolean,  time:number,
         max_choice_count?:number, reference_address?:string, passport?:PassportObject) : Vote {
         if (!Protocol.IsValidObjects([permission])) {
             ERROR(Errors.IsValidObjects,  'permission')
@@ -36,8 +36,8 @@ export class Vote {
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)
         }
-        if (!IsValidUint(minutes_duration)) {
-            ERROR(Errors.IsValidUint, 'minutes_duration')
+        if (!IsValidUint(time)) {
+            ERROR(Errors.IsValidUint, 'time')
         }
         if (max_choice_count && !IsValidUint(max_choice_count)) {
             ERROR(Errors.IsValidUint, 'max_choice_count')
@@ -57,14 +57,14 @@ export class Vote {
         if (passport) {
             v.object = txb.moveCall({
                 target:protocol.VoteFn('new_with_passport') as FnCallType,
-                arguments:[passport, txb.pure(description), reference, txb.pure(Protocol.CLOCK_OBJECT), 
-                    txb.pure(minutes_duration, BCS.U64), txb.pure(choice_count, BCS.U8), Protocol.TXB_OBJECT(txb, permission)]
+                arguments:[passport, txb.pure(description), reference, txb.pure(Protocol.CLOCK_OBJECT), txb.pure(minutes_duration, BCS.BOOL),
+                    txb.pure(time, BCS.U64), txb.pure(choice_count, BCS.U8), Protocol.TXB_OBJECT(txb, permission)]
             })
         } else {
             v.object = txb.moveCall({
                 target:protocol.VoteFn('new') as FnCallType,
-                arguments:[txb.pure(description), reference, txb.pure(Protocol.CLOCK_OBJECT), 
-                    txb.pure(minutes_duration, BCS.U64), txb.pure(choice_count, BCS.U8), Protocol.TXB_OBJECT(txb, permission)]
+                arguments:[txb.pure(description), reference, txb.pure(Protocol.CLOCK_OBJECT), txb.pure(minutes_duration, BCS.BOOL),
+                    txb.pure(time, BCS.U64), txb.pure(choice_count, BCS.U8), Protocol.TXB_OBJECT(txb, permission)]
             })
         }
         return v
@@ -314,23 +314,23 @@ export class Vote {
         }
     }
 
-    expand_deadline(minutes_expand:number, passport?:PassportObject)  {
-        if (!IsValidUint(minutes_expand)) {
-            ERROR(Errors.IsValidUint, 'minutes_expand')
+    expand_deadline(ms_expand:boolean, time:number, passport?:PassportObject)  {
+        if (!IsValidUint(time)) {
+            ERROR(Errors.IsValidUint, 'time')
         }
 
         let txb = this.protocol.CurrentSession();
         if (passport) {
             txb.moveCall({
                 target:this.protocol.VoteFn('deadline_expand_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(minutes_expand, BCS.U64), Protocol.TXB_OBJECT(txb, this.permission)]
+                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(ms_expand, BCS.BOOL),
+                    txb.pure(time, BCS.U64), Protocol.TXB_OBJECT(txb, this.permission)]
             })  
         } else {
             txb.moveCall({
                 target:this.protocol.VoteFn('deadline_expand') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(minutes_expand, BCS.U64), Protocol.TXB_OBJECT(txb, this.permission)]
+                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(ms_expand, BCS.BOOL),
+                    txb.pure(time, BCS.U64), Protocol.TXB_OBJECT(txb, this.permission)]
             })  
         }