wowok 1.2.7 → 1.2.9

package/src/service.ts

@@ -1,6 +1,6 @@
 import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig } from '@mysten/bcs';
 import { IsValidArray, IsValidPercent, IsValidName_AllowEmpty, Bcs, array_unique, IsValidTokenType, IsValidDesription, 
-    IsValidAddress, IsValidEndpoint, OptionNone, IsValidUint, IsValidInt, IsValidName, } from './utils'
+    IsValidAddress, IsValidEndpoint, OptionNone, IsValidUintLarge, IsValidInt, IsValidName, } from './utils'
 import { FnCallType, GuardObject, PassportObject, PermissionObject, RepositoryObject, MachineObject, ServiceAddress, 
     ServiceObject, DiscountObject, OrderObject, OrderAddress, CoinObject, Protocol, ValueType,
     TxbObject} from './protocol';
@@ -113,7 +113,7 @@ export class Service {
         } else {
             s.object = txb.moveCall({
                 target:protocol.ServiceFn('new') as FnCallType,
-                arguments:[txb.pure(description, BCS.STRING), txb.pure(payee_address, BCS.ADDRESS), ep, Protocol.TXB_OBJECT(txb, permission)],
+                arguments:[txb.pure(description), txb.pure(payee_address, BCS.ADDRESS), ep, Protocol.TXB_OBJECT(txb, permission)],
                 typeArguments:[pay_token_type],
             })
         }
@@ -211,7 +211,7 @@ export class Service {
         if (!IsValidName(item)) {
             ERROR(Errors.IsValidName, 'item')
         }
-        if (!IsValidUint(stock_add)) {
+        if (!IsValidUintLarge(stock_add)) {
             ERROR(Errors.IsValidUint, 'stock_add')
         }
 
@@ -236,7 +236,7 @@ export class Service {
         if (!IsValidName(item)) {
             ERROR(Errors.IsValidName, 'item')
         }
-        if (!IsValidUint(stock_reduce)) {
+        if (!IsValidUintLarge(stock_reduce)) {
             ERROR(Errors.IsValidUint, 'stock_reduce')
         }
 
@@ -323,11 +323,10 @@ export class Service {
             })  
         }
     }
-    repository_remove(repository_address?:string[], removeall?:boolean, passport?:PassportObject) {
-        if (!removeall && !repository_address) {
-            ERROR(Errors.AllInvalid,  'removeall & repository_address');
-        }
-        if (repository_address && !IsValidArray(repository_address, IsValidAddress)) {
+    repository_remove(repository_address:string[], removeall?:boolean, passport?:PassportObject) {
+        if (!removeall && repository_address.length===0)  return;
+        
+        if (!IsValidArray(repository_address, IsValidAddress)) {
             ERROR(Errors.IsValidArray,  'repository_address');
         }
 
@@ -366,6 +365,8 @@ export class Service {
     }
 
     add_withdraw_guards(guards:Service_Guard_Percent[], passport?:PassportObject) {
+        if (guards.length === 0) return;
+
         let bValid = true;
         guards.forEach((v) => {
             if (!Protocol.IsValidObjects([v.guard])) bValid  = false;
@@ -394,12 +395,12 @@ export class Service {
             }
         })
     }
-    remove_withdraw_guards(guard_address?:string[], removeall?:boolean, passport?:PassportObject) {
-        if (!removeall && !guard_address) {
-            ERROR(Errors.AllInvalid, 'guard_address & removeall')
+    remove_withdraw_guards(guard_address:string[], removeall?:boolean, passport?:PassportObject) {
+        if (!removeall && guard_address.length===0) {
+            return
         }
 
-        if (guard_address && !IsValidArray(guard_address, IsValidAddress)) {
+        if (!IsValidArray(guard_address, IsValidAddress)) {
             ERROR(Errors.IsValidArray, 'guard_address')
         }
 
@@ -437,6 +438,8 @@ export class Service {
         }
     }
     add_refund_guards(guards:Service_Guard_Percent[], passport?:PassportObject) {
+        if (guards.length === 0) return;
+
         let bValid = true;
         guards.forEach((v) => {
             if (!Protocol.IsValidObjects([v.guard])) bValid = false;
@@ -465,11 +468,9 @@ export class Service {
             }
         })
     }
-    remove_refund_guards(guard_address?:string[], removeall?:boolean, passport?:PassportObject) {
-        if (!guard_address && !removeall) {
-            ERROR(Errors.AllInvalid, 'guard_address & removeall');
-        }
-        if (guard_address && !IsValidArray(guard_address, IsValidAddress)) {
+    remove_refund_guards(guard_address:string[], removeall?:boolean, passport?:PassportObject) {
+        if (guard_address.length===0 && !removeall) return ;
+        if (!IsValidArray(guard_address, IsValidAddress)) {
             ERROR(Errors.InvalidParam, 'guard_address')
         }
 
@@ -512,22 +513,24 @@ export class Service {
         sales.forEach((v) => {
             if (!IsValidName(v.item)) bValid = false;
             if (!IsValidInt(v.price)) bValid = false;
-            if (!IsValidUint(v.stock)) bValid = false;
+            if (!IsValidUintLarge(v.stock)) bValid = false;
             if (names.includes(v.item)) bValid = false;
             names.push(v.item)
         })
         return bValid
     }
 
-    add_sale(sales:Service_Sale[], bExistAssert:boolean=false, passport?:PassportObject) {
-        if (!sales || !this.is_valid_sale(sales)) {
-            ERROR(Errors.InvalidParam, 'add_sale')
+    add_sales(sales:Service_Sale[], bExistAssert:boolean=false, passport?:PassportObject) {
+        if (sales.length === 0) return;
+
+        if (!this.is_valid_sale(sales)) {
+            ERROR(Errors.InvalidParam, 'add_sales')
         }
         
         let names: string[]  = []; let price: number[] = []; let stock: number[] = []; let endpoint: string[] = [];
         sales.forEach((s) => {
             if (s.endpoint && !IsValidEndpoint(s.endpoint)) {
-                ERROR(Errors.IsValidEndpoint, 'add_sale')
+                ERROR(Errors.IsValidEndpoint, 'add_sales')
             }
             names.push(s.item); price.push(s.price); stock.push(s.stock); endpoint.push(s.endpoint ?? '')
         })
@@ -554,12 +557,11 @@ export class Service {
             })
         }
     }
-    remove_sales(sales?:string[], passport?:PassportObject) {
-        if (!sales) {
-            ERROR(Errors.AllInvalid, 'sales & removeall')
-        }
-        if (sales && !IsValidArray(sales, IsValidName)) {
-            ERROR(Errors.IsValidArray, 'sales')
+    remove_sales(sales:string[], passport?:PassportObject) {
+        if (sales.length === 0) return;
+
+        if (!IsValidArray(sales, IsValidName)) {
+            ERROR(Errors.IsValidArray, 'remove_sales')
         }
 
         let txb = this.protocol.CurrentSession();
@@ -588,11 +590,11 @@ export class Service {
         let bValid = true;
         discount_dispatch.forEach((v) => {
             if (!IsValidAddress(v.receiver)) bValid = false;
-            if (!IsValidUint(v.count) || v.count > Service.MAX_DISCOUNT_COUNT_ONCE) bValid = false;
+            if (!IsValidUintLarge(v.count) || v.count > Service.MAX_DISCOUNT_COUNT_ONCE) bValid = false;
             if (!IsValidName_AllowEmpty(v.discount.name)) bValid = false;
             if (v.discount.type == Service_Discount_Type.ratio && !IsValidPercent(v.discount.off)) bValid = false;
-            if (!IsValidUint(v.discount.duration_minutes)) bValid = false;
-            if (v.discount?.time_start && !IsValidUint(v.discount.time_start)) bValid = false;
+            if (!IsValidUintLarge(v.discount.duration_minutes)) bValid = false;
+            if (v.discount?.time_start && !IsValidUintLarge(v.discount.time_start)) bValid = false;
             if (v.discount?.price_greater && !IsValidInt(v.discount.price_greater))  bValid = false;
         })
         if (!bValid) {
@@ -932,7 +934,7 @@ export class Service {
         buy_items.forEach((v) => {
             if (!IsValidName(v.item)) bValid = false;
             if (!IsValidInt(v.max_price)) bValid = false;
-            if (!IsValidUint(v.count)) bValid = false;
+            if (!IsValidUintLarge(v.count)) bValid = false;
             if (names.includes(v.item)) bValid = false;
             names.push(v.item)
         })

package/src/utils.ts

@@ -1,10 +1,11 @@
 import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig, TypeName, BcsReader } from '@mysten/bcs';
 import { TransactionBlock, Inputs, TransactionResult, TransactionArgument } from '@mysten/sui.js/transactions';
+import { SuiObjectResponse, DynamicFieldPage } from '@mysten/sui.js/client';
 import { ERROR, Errors } from './exception';
 import { isValidSuiAddress, isValidSuiObjectId } from '@mysten/sui.js/utils'
-import { RepositoryValueType, ValueType } from './protocol'
+import { RepositoryValueType, ValueType, Protocol } from './protocol'
 
-export const MAX_U8 = BigInt('256');
+export const MAX_U8 = BigInt('255');
 export const MAX_U64 = BigInt('18446744073709551615');
 export const MAX_U128 = BigInt('340282366920938463463374607431768211455');
 export const MAX_U256 = BigInt('115792089237316195423570985008687907853269984665640564039457584007913129639935');
@@ -30,36 +31,7 @@ export const ValueTypeConvert = (type:ValueType | null | undefined) : Repository
     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}=> {
+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))};
@@ -209,7 +181,15 @@ export class Bcs {
         return Bcs._instance;
      }
 
-    ser(type:ValueType, data:Uint8Array | any) : Uint8Array {
+    ser_option_u32(data:Uint8Array | any) : Uint8Array {
+        return this.bcs.ser('Option<u32>', {'some': data}).toBytes();
+    }
+
+    ser(type:ValueType | string, data:Uint8Array | any) : Uint8Array {
+        if (typeof(type) === 'string') {
+            return this.bcs.ser(type, data).toBytes();
+        }
+
         switch(type) {
             case ValueType.TYPE_BOOL:
                 return this.bcs.ser(BCS.BOOL, data).toBytes();
@@ -375,7 +355,6 @@ export const deepClone = <T>(origin: T, target?: Record<string, any> | T ): T =>
             } else {
                 tar[key] = origin[key]
             }
-
         }
     }
 
@@ -391,12 +370,36 @@ 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 => { 
+export const IsValidAddress = (addr:string | undefined) : boolean => { 
     if (!addr || !isValidSuiAddress(addr)) {
         return false; 
     }
     return true
 }
+export const IsValidBigint = (value:string | number | undefined, max:bigint=MAX_U256) : boolean => {
+    if (value === '' || value === undefined) return false;
+    try {
+        const v = BigInt(value);
+        if (v <= max) {
+            return true   
+        }
+    } catch (e) {
+    }; return false
+}
+
+export const IsValidUintLarge = (value:string | number | undefined) : boolean => {
+    return IsValidBigint(value)
+}
+export const IsValidU8 = (value:string | number | undefined) : boolean => {
+    return IsValidBigint(value, MAX_U8)
+}
+export const IsValidU64 = (value:string | number | undefined) : boolean => {
+    return IsValidBigint(value, MAX_U64)
+}
+export const IsValidU128 = (value:string | number | undefined) : boolean => {
+    return IsValidBigint(value, MAX_U128)
+}
+
 export const IsValidTokenType = (argType: string) : boolean => { 
     if (!argType || argType.length === 0) {
         return false; 
@@ -420,12 +423,6 @@ export const IsValidArgType = (argType: string) : boolean => {
     } 
     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);
@@ -468,7 +465,7 @@ export const ResolveBalance = (balance:string, decimals:number) : string => {
         let end = balance.slice(Math.abs(pos));
         return start + '.' + end;
     } else {
-        return '.' + balance.padStart(pos, '0');
+        return '.' + balance.padStart(decimals, '0');
     }
 }
 
@@ -525,4 +522,52 @@ export function isValidHttpUrl(url:string) : boolean {
     }
   
     return r.protocol === "http:" || r.protocol === "https:" || r.protocol === 'ipfs:';
-}
+}
+
+export interface query_object_param {
+    id:string;
+    onBegin?:(id:string)=>void;
+    onObjectRes?:(id:string, res:SuiObjectResponse)=>void;
+    onDynamicRes?:(id:string, res:DynamicFieldPage)=>void;
+    onFieldsRes?:(id:string, fields_res:SuiObjectResponse[])=>void;
+    onObjectErr?:(id:string, err:any)=>void;
+    onDynamicErr?:(id:string, err:any)=>void;
+    onFieldsErr?:(id:string, err:any)=>void;
+}
+
+export const query_object = (param:query_object_param) => {
+    if (param.id) {
+      if(param?.onBegin) param.onBegin(param.id);
+      Protocol.Client().getObject({id:param.id, options:{showContent:true, showType:true}}).then((res) => {
+        if (res.error) {
+            if(param?.onObjectErr) param.onObjectErr(param.id, res.error);
+        } else {
+            if(param?.onObjectRes) param.onObjectRes(param.id, res);
+        }
+      }).catch((err) => {
+        console.log(err)
+        if (param?.onObjectErr) param.onObjectErr(param.id, err);
+      });
+
+      Protocol.Client().getDynamicFields({parentId:param.id}).then((res) => {
+        if (param?.onDynamicRes) param.onDynamicRes(param.id, res);
+        
+        if (res.data.length > 0) {
+          Protocol.Client().multiGetObjects({ids:res.data.map(v => v.objectId), options:{showContent:true}}).then((fields) => {
+            if (param?.onFieldsRes) param.onFieldsRes(param.id, fields);
+          }).catch((err) => {
+            console.log(err)
+            if (param?.onFieldsErr) param.onFieldsErr(param.id, err);
+          })          
+        } 
+      }).catch((err) => {
+        console.log(err)
+        if (param?.onDynamicErr) param.onDynamicErr(param.id, err);
+      })
+    }
+  }
+
+  export const FirstLetterUppercase = (str:string) => {
+    if (!str) return str;
+    return str.substring(0, 1).toUpperCase() + str.substring(1);
+  }

package/src/vote.ts

@@ -1,6 +1,6 @@
 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 { IsValidDesription, IsValidUintLarge, IsValidAddress, OptionNone, Bcs, array_unique, IsValidArray, IsValidName } from './utils';
 import { ERROR, Errors } from './exception';
 import { ValueType } from './protocol';
 
@@ -36,10 +36,10 @@ export class Vote {
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)
         }
-        if (!IsValidUint(time)) {
+        if (!IsValidUintLarge(time)) {
             ERROR(Errors.IsValidUint, 'time')
         }
-        if (max_choice_count && !IsValidUint(max_choice_count)) {
+        if (max_choice_count && !IsValidUintLarge(max_choice_count)) {
             ERROR(Errors.IsValidUint, 'max_choice_count')
         }
         if (max_choice_count && max_choice_count > MAX_CHOICE_COUNT) {
@@ -128,10 +128,10 @@ export class Vote {
     }
     add_guard(guard:GuardObject, weight:number, passport?:PassportObject)   {
         if (!Protocol.IsValidObjects([guard])) {
-            ERROR(Errors.IsValidObjects, 'guard')
+            ERROR(Errors.IsValidObjects, 'add_guard')
         }
-        if (!IsValidUint(weight)) {
-            ERROR(Errors.IsValidUint, 'weight')
+        if (!IsValidUintLarge(weight)) {
+            ERROR(Errors.IsValidUint, 'add_guard')
         }
 
         let txb = this.protocol.CurrentSession();
@@ -151,12 +151,10 @@ export class Vote {
     }
 
     remove_guard(guard_address:string[], removeall?:boolean, passport?:PassportObject)  {
-        if (!removeall && !guard_address) {
-            ERROR(Errors.AllInvalid, 'guard_address & removeall')
-        }
+        if (!removeall && guard_address.length===0)   return;
 
-        if (guard_address && !IsValidArray(guard_address, IsValidAddress)) {
-            ERROR(Errors.IsValidArray, 'guard_address')
+        if (!IsValidArray(guard_address, IsValidAddress)) {
+            ERROR(Errors.IsValidArray, 'remove_guard')
         }
 
         let txb = this.protocol.CurrentSession();
@@ -191,9 +189,7 @@ export class Vote {
     }
 
     add_option(options:VoteOption[], passport?:PassportObject)   {
-        if (!options) {
-            ERROR(Errors.InvalidParam, 'options')
-        }
+        if (options.length === 0) return ;
 
         let bValid = true;
         options.forEach((v) => {
@@ -226,11 +222,11 @@ export class Vote {
         })
     }
     remove_option(options:string[], removeall?:boolean, passport?:PassportObject)  {
-        if (!removeall && !options) {
-            ERROR(Errors.AllInvalid, 'options & removeall')
+        if (!removeall && options.length===0) {
+            return
         }
         if (options && !IsValidArray(options, IsValidAddress)) {
-            ERROR(Errors.IsValidArray, 'options')
+            ERROR(Errors.IsValidArray, 'remove_option')
         }
 
         let txb = this.protocol.CurrentSession();
@@ -265,7 +261,7 @@ export class Vote {
         }
     }
     set_max_choice_count(max_choice_count:number, passport?:PassportObject)  {
-        if (!IsValidUint(max_choice_count) || max_choice_count > MAX_CHOICE_COUNT) {
+        if (!IsValidUintLarge(max_choice_count) || max_choice_count > MAX_CHOICE_COUNT) {
             ERROR(Errors.InvalidParam, 'max_choice_count')
         }
 
@@ -315,7 +311,7 @@ export class Vote {
     }
 
     expand_deadline(ms_expand:boolean, time:number, passport?:PassportObject)  {
-        if (!IsValidUint(time)) {
+        if (!IsValidUintLarge(time)) {
             ERROR(Errors.IsValidUint, 'time')
         }
 
@@ -351,8 +347,9 @@ export class Vote {
     }
 
     agree(options:string[], passport?:PassportObject)  {
-        if (!options || options.length > MAX_CHOICE_COUNT) {
-            ERROR(Errors.InvalidParam, 'options')
+        if (options.length === 0) return;
+        if (options.length > MAX_CHOICE_COUNT) {
+            ERROR(Errors.InvalidParam, 'agree')
         }
 
         let txb = this.protocol.CurrentSession();

package/src/wowok.ts

@@ -28,7 +28,7 @@ export class Wowok {
         let txb = this.protocol.CurrentSession();
         txb.moveCall({
             target:this.protocol.WowokFn('grantor_register') as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(name, BCS.STRING), txb.object(Protocol.CLOCK_OBJECT), 
+            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(name), txb.object(Protocol.CLOCK_OBJECT), 
                 Protocol.TXB_OBJECT(txb, grantee_permission)]
         })
     }
@@ -49,7 +49,7 @@ export class Wowok {
         let txb = this.protocol.CurrentSession();
         txb.moveCall({
             target:this.protocol.WowokFn('grantor_time_expand_1year') as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(new_name, BCS.STRING)]
+            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(new_name)]
         })
     }
 }