wowok 1.2.5 → 1.2.8

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';
 
@@ -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,10 +36,10 @@ export class Vote {
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)
         }
-        if (!IsValidUint(minutes_duration)) {
-            ERROR(Errors.IsValidUint, 'minutes_duration')
+        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) {
@@ -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
@@ -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')
         }
 
@@ -314,23 +310,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 (!IsValidUintLarge(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)]
             })  
         } 
         
@@ -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)]
         })
     }
 }