wowok 1.4.22 → 1.4.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.4.22",
+  "version": "1.4.25",
   "description": "Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/demand.ts

@@ -1,6 +1,6 @@
 import { type TransactionResult, Transaction as TransactionBlock } from '@mysten/sui/transactions';
 import { FnCallType, Protocol, PassportObject, PermissionObject, GuardObject, DemandAddress, TxbObject, ResourceObject} from './protocol';
-import { IsValidDesription, IsValidUintLarge, IsValidAddress, IsValidArgType, } from './utils'
+import { IsValidDesription, IsValidAddress, IsValidArgType, IsValidU64, } from './utils'
 import { Errors, ERROR}  from './exception'
 
 export class Demand {
@@ -35,7 +35,7 @@ export class Demand {
         if (!IsValidArgType(bounty_type)) {
             ERROR(Errors.IsValidArgType, bounty_type);
         }
-        if (!IsValidUintLarge(time)) {
+        if (!IsValidU64(time)) {
             ERROR(Errors.IsValidUint, 'time')
         }
         
@@ -95,7 +95,7 @@ export class Demand {
     
     // minutes_duration TRUE , time is minutes count; otherwise, the deadline time
     expand_time(minutes_duration:boolean, time: number, passport?:PassportObject) {
-        if (!IsValidUintLarge(time)) {
+        if (!IsValidU64(time)) {
             ERROR(Errors.IsValidUint, 'time');
         }
         const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);

package/src/guard.ts

@@ -250,17 +250,18 @@ export class Guard {
         [MODULES.vote, 'Vote-Guard Wight', 1110, [ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'The voting weight corresponding to the Vote-Guard.', ['guard address']],   
         [MODULES.vote, 'Has Voted by Address', 1111, [ValueType.TYPE_ADDRESS], ValueType.TYPE_BOOL, 'Whether an address has already voted?', ['address']], 
         [MODULES.vote, 'Voted Weight by Address', 1112, [ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'The weight of whether an address has been voted on.', ['adddress']], 
-        [MODULES.vote, 'Has Option', 1113, [ValueType.TYPE_STRING], ValueType.TYPE_BOOL, 'Whether a voting option is included?', ['option name']],
-        [MODULES.vote, 'Has Object of Option', 1114, [ValueType.TYPE_STRING], ValueType.TYPE_BOOL, 'Whether a voting option refers to an object?', ['option name']],   
-        [MODULES.vote, 'Option Object', 1115, [ValueType.TYPE_STRING], ValueType.TYPE_ADDRESS, 'The object referenced by a voting option.', ['option name']], 
-        [MODULES.vote, 'Option Counts', 1116, [ValueType.TYPE_STRING], ValueType.TYPE_U64, 'The number of votes for the voting option.', ['option name']], 
-        [MODULES.vote, 'Option Votes', 1117, [ValueType.TYPE_STRING], ValueType.TYPE_U64, 'The number of voted addresses for the voting option.', ['option name']], 
+        [MODULES.vote, 'Has Option', 1113, [ValueType.TYPE_STRING], ValueType.TYPE_BOOL, 'Whether a voting option is included?', ['option content']],
+        [MODULES.vote, 'Has Object of Option', 1114, [ValueType.TYPE_STRING], ValueType.TYPE_BOOL, 'Whether a voting option refers to an object?', ['option content']],   
+        [MODULES.vote, 'Option Object', 1115, [ValueType.TYPE_STRING], ValueType.TYPE_ADDRESS, 'The object referenced by a voting option.', ['option content']], 
+        [MODULES.vote, 'Option Counts', 1116, [ValueType.TYPE_STRING], ValueType.TYPE_U64, 'The number of votes for the voting option.', ['option content']], 
+        [MODULES.vote, 'Option Votes', 1117, [ValueType.TYPE_STRING], ValueType.TYPE_U64, 'The number of voted addresses for the voting option.', ['option content']], 
         [MODULES.vote, 'Address Count Voted', 1118, [], ValueType.TYPE_U64, 'Total number of addresses voted.', []],   
-        [MODULES.vote, 'Top1 Option by Addresses', 1119, [], ValueType.TYPE_STRING, 'The name of the voting option ranked first by the number of voting addresses.', []], 
+        [MODULES.vote, 'Top1 Option by Addresses', 1119, [], ValueType.TYPE_STRING, 'The content of the voting option ranked first by the number of voting addresses.', []], 
         [MODULES.vote, 'Top1 Counts by Addresses', 1120, [], ValueType.TYPE_U64, 'Number of votes for the top voting option by number of voting addresses.', []], 
-        [MODULES.vote, 'Top1 Option by Votes', 1121, [], ValueType.TYPE_STRING, 'The name of the voting option ranked first by the number of votes.', []], 
+        [MODULES.vote, 'Top1 Option by Votes', 1121, [], ValueType.TYPE_STRING, 'The content of the voting option ranked first by the number of votes.', []], 
         [MODULES.vote, 'Top1 Counts by Votes', 1122, [], ValueType.TYPE_U64, 'Number of votes for the top voting option by number of votes.', []], 
-
+        [MODULES.vote, 'Voted Time by Address', 1113, [ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'The time of whether an address has been voted on.', ['adddress']], 
+ 
         [MODULES.payment, 'Sender', 1200, [], ValueType.TYPE_ADDRESS, 'Payment originator address.', []], 
         [MODULES.payment, 'Total Amount', 1201, [], ValueType.TYPE_U64, "Payment amount.", []], 
         [MODULES.payment, 'Tips', 1202, [], ValueType.TYPE_STRING, 'Payment remarks.', ['address']], 

package/src/index.ts

@@ -13,4 +13,5 @@ export * from './service'
 export * from './graphql'
 export * from './entity'
 export * from './wowok'
-export * from './resource'
+export * from './resource'
+export * from './treasury'

package/src/machine.ts

@@ -1,9 +1,7 @@
 import { Transaction as TransactionBlock, TransactionObjectArgument, type TransactionResult } from '@mysten/sui/transactions';
 import { Protocol, FnCallType, PermissionObject, RepositoryObject,  PassportObject, MachineObject, MachineAddress,  GuardObject, TxbObject} from './protocol';
 import { IsValidInt, Bcs, array_unique, IsValidArray, IsValidAddress, IsValidName, IsValidName_AllowEmpty, 
-    IsValidEndpoint, IsValidDesription,
-    IsValidUintLarge,
-    IsValidU64} from './utils'
+    IsValidEndpoint, IsValidDesription, IsValidU64 } from './utils'
 import { Permission, PermissionIndexType } from './permission';
 import { Errors, ERROR}  from './exception'
 import { ValueType } from './protocol';

package/src/permission.ts

@@ -1,7 +1,6 @@
 import { FnCallType, TxbObject, PermissionObject, PermissionAddress, GuardObject, Protocol} from './protocol';
-import { array_unique, IsValidAddress, IsValidArray,  IsValidDesription, IsValidUintLarge, Bcs, IsValidName} from './utils';
+import { array_unique, IsValidAddress, IsValidArray,  IsValidDesription, Bcs, IsValidName, IsValidU64} from './utils';
 import { ERROR, Errors } from './exception';
-import { ValueType } from './protocol';
 import { BCS } from '@mysten/bcs';
 import { Transaction as TransactionBlock } from '@mysten/sui/transactions';
 
@@ -565,7 +564,7 @@ export class  Permission {
     static BUSINESS_PERMISSIONS_START = PermissionIndex.user_defined_start;
 
     static IsValidUserDefinedIndex = (index:number)  => { 
-        return index >= Permission.BUSINESS_PERMISSIONS_START && IsValidUintLarge(index)
+        return index >= Permission.BUSINESS_PERMISSIONS_START && IsValidU64(index)
     }
     
     static IsValidPermissionIndex = (index:PermissionIndexType) : boolean  => {

package/src/protocol.ts

@@ -3,7 +3,7 @@ import { SuiClient, SuiObjectResponse, SuiObjectDataOptions, SuiTransactionBlock
 import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
 import { toHEX, fromHEX, BcsReader } from '@mysten/bcs';
 import { Transaction as TransactionBlock, Inputs, TransactionResult, TransactionArgument } from '@mysten/sui/transactions';
-import { capitalize, IsValidAddress, IsValidArray, IsValidU128, IsValidU64, IsValidU8, IsValidUintLarge } from './utils'
+import { capitalize, IsValidAddress, IsValidArray, IsValidU128, IsValidU256, IsValidU64, IsValidU8 } from './utils'
 import { GuardConstant } from './guard';
 import { isValidSuiAddress, isValidSuiObjectId } from '@mysten/sui/utils'
 
@@ -190,7 +190,7 @@ export const SER_VALUE: ValueTypeString[] = [
     {type: ValueType.TYPE_VEC_STRING, name: '[string]', description:'ascii string array. eg:["abc", "hi"]'},
     {type: ValueType.TYPE_STRING, name: 'string', description:'eg:"wowok"', },
     {type: ValueType.TYPE_OPTION_STRING, name: 'option', description:'option of string. eg:none or string value'},
-    {type: ValueType.TYPE_U256, name: 'number', description:'unsigned-256 number. eg:12345678901233', validator:IsValidUintLarge},
+    {type: ValueType.TYPE_U256, name: 'number', description:'unsigned-256 number. eg:12345678901233', validator:IsValidU256},
 ]
 
 //export type ConstantType = ValueType | ContextType.TYPE_WITNESS_ID;
@@ -211,10 +211,10 @@ const TESTNET = {
 }
 */
 const TESTNET = {
-    package: "0xf108d64c8143ec040da0d5538e834a67f0a9c661f92011195b60f51b3bc33a46",
-    wowok_object: '0xc4fc2a42a5fbcfc68b3d8ac079e4d5a07f637c541e0183446a9da655965cda5e',
-    entity_object: '0x8bbab9023092dc89c3c60c766b204c0dfbe3da46a2de486d8ab92ba91a4c905f',
-    treasury_cap:'0x07e7b3c355b63bade82c1e0e2653e655a1b20da6cc531db5707ad1292fd418e4',
+    package: "0x0a0a86d4d364ba566d5392cd8ba7d980f4d65fc1e1586e5b2e49b0ecd8dfeae4",
+    wowok_object: '0x8e5424a7899597dc75b456d597dd0a741296c1363282a72d52421b1c85d2460e',
+    entity_object: '0xd88aaf554750437ab4148acca27e0ba51cff97c13882722a4a89289e57a7b8fa',
+    treasury_cap:'0x01079f2baa2c320afc52e0f2680167c44bbaad9a6a21514bfd2e56356028be9d',
 }
 const MAINNET = {
     package: "",

package/src/reward.ts

@@ -1,6 +1,6 @@
 import { TransactionArgument, Transaction as TransactionBlock, type TransactionResult, } from '@mysten/sui/transactions';
 import { FnCallType, GuardObject, PassportObject, PermissionObject, RewardAddress, Protocol, TxbObject, } from './protocol';
-import { array_unique, IsValidAddress, IsValidArgType, IsValidArray, IsValidDesription,  IsValidUintLarge, } from './utils';
+import { array_unique, IsValidAddress, IsValidArgType, IsValidArray, IsValidDesription, IsValidU64} from './utils';
 import { ERROR, Errors } from './exception';
 
 export type CoinReward = TransactionResult;
@@ -39,7 +39,7 @@ export class Reward {
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)
         }
-        if (!IsValidUintLarge(time)) {
+        if (!IsValidU64(time)) {
             ERROR(Errors.IsValidUint, 'time')
         }
 
@@ -96,7 +96,7 @@ export class Reward {
     }
 
     expand_time(ms_expand:boolean, time:number, passport?:PassportObject)  {
-        if (!IsValidUintLarge(time)) {
+        if (!IsValidU64(time)) {
             ERROR(Errors.IsValidUint, 'minutes_expand')
         }
         
@@ -117,20 +117,20 @@ export class Reward {
         }
     }
 
-    add_guard(gurads:RewardGuardPortions[], passport?:PassportObject)  {
-        if (gurads.length === 0) return;
+    add_guard(guards:RewardGuardPortions[], passport?:PassportObject)  {
+        if (guards.length === 0) return;
 
         let bValid = true;
-        gurads.forEach((v) => {
-            if (!IsValidUintLarge(v.portions) || v.portions > Reward.MAX_PORTIONS_COUNT) bValid = false;
+        guards.forEach((v) => {
+            if (!IsValidU64(v.portions) || v.portions > Reward.MAX_PORTIONS_COUNT) bValid = false;
             if (!Protocol.IsValidObjects([v.guard])) bValid = false;
         })
         if (!bValid) {
-            ERROR(Errors.InvalidParam, 'gurads')
+            ERROR(Errors.InvalidParam, 'guards')
         }
 
         if (passport) {
-            gurads.forEach((guard) => 
+            guards.forEach((guard) => 
                 this.txb.moveCall({
                     target:Protocol.Instance().RewardFn('guard_add_with_passport') as FnCallType,
                     arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), 
@@ -140,7 +140,7 @@ export class Reward {
                 })
             )
         } else {
-            gurads.forEach((guard) => 
+            guards.forEach((guard) => 
                 this.txb.moveCall({
                     target:Protocol.Instance().RewardFn('guard_add') as FnCallType,
                     arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, guard.guard), 

package/src/treasury.ts

@@ -86,7 +86,7 @@ export class Treasury {
         }
     }
     
-    deposit(coin:CoinObject, tips:string, for_object?:string, index?:number, from_object?:string, passport?:PassportObject) :TxbObject {
+    deposit(coin:CoinObject, tips:string, for_object?:string, index?:bigint, from_object?:string, passport?:PassportObject) :TxbObject {
         if (!Protocol.IsValidObjects([coin])) {
             ERROR(Errors.IsValidObjects, 'deposit.coin')
         }
@@ -99,7 +99,7 @@ export class Treasury {
         if (from_object && !IsValidAddress(from_object)) {
             ERROR(Errors.IsValidAddress, 'deposit.from_object')
         }
-        if (index !== undefined && IsValidU64(index)) {
+        if (index !== undefined && !IsValidU64(index)) {
             ERROR(Errors.InvalidParam, 'deposit.index')
         }
         const for_obj = this.txb.pure.option('address', for_object ?? undefined);
@@ -116,7 +116,7 @@ export class Treasury {
             })
         } else {
             return this.txb.moveCall({
-                target:Protocol.Instance().TreasuryFn('deposit_with_passport') as FnCallType,
+                target:Protocol.Instance().TreasuryFn('deposit') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, coin), 
                     this.txb.pure.string(tips), for_obj, idx, from_obj, this.txb.object(clock), Protocol.TXB_OBJECT(this.txb, this.permission)],
                 typeArguments:[this.token_type],
@@ -137,7 +137,7 @@ export class Treasury {
         if (from_object && !IsValidAddress(from_object)) {
             ERROR(Errors.IsValidAddress, 'free_deposit.from_object')
         }
-        if (index !== undefined && IsValidU64(index)) {
+        if (index !== undefined && !IsValidU64(index)) {
             ERROR(Errors.InvalidParam, 'free_deposit.index')
         }
         const for_obj = this.txb.pure.option('address', for_object ?? undefined);
@@ -153,7 +153,7 @@ export class Treasury {
         })  
     }
     
-    withdraw(amount:number, tips:string, for_object?:string, index?:number, to_object?:string, passport?:PassportObject) : CoinObject {
+    withdraw(amount:bigint, tips:string, for_object?:string, index?:bigint, to_object?:string, passport?:PassportObject) : CoinObject {
         if (!IsValidU64(amount)) {
             ERROR(Errors.IsValidObjects, 'withdraw.amount')
         }
@@ -166,7 +166,7 @@ export class Treasury {
         if (to_object && !IsValidAddress(to_object)) {
             ERROR(Errors.IsValidAddress, 'withdraw.to_object')
         }
-        if (index !== undefined && IsValidU64(index)) {
+        if (index !== undefined && !IsValidU64(index)) {
             ERROR(Errors.InvalidParam, 'withdraw.index')
         }
         const for_obj = this.txb.pure.option('address', for_object ?? undefined);

package/src/utils.ts

@@ -399,20 +399,17 @@ export const IsValidBigint = (value:string | number | undefined | bigint, max:bi
     }; return false
 }
 
-export const IsValidUintLarge = (value:string | number | undefined | bigint) : boolean => {
-    return IsValidBigint(value, MAX_U64, BigInt(0))
+export const IsValidU8 = (value:string | number | undefined | bigint, min=0) : boolean => {
+    return IsValidBigint(value, MAX_U8, BigInt(min))
 }
-export const IsValidU8 = (value:string | number | undefined | bigint) : boolean => {
-    return IsValidBigint(value, MAX_U8, BigInt(0))
+export const IsValidU64 = (value:string | number | undefined | bigint, min=0) : boolean => {
+    return IsValidBigint(value, MAX_U64, BigInt(min))
 }
-export const IsValidU64 = (value:string | number | undefined | bigint) : boolean => {
-    return IsValidBigint(value, MAX_U64, BigInt(0))
+export const IsValidU128 = (value:string | number | undefined | bigint, min=0) : boolean => {
+    return IsValidBigint(value, MAX_U128, BigInt(min))
 }
-export const IsValidU128 = (value:string | number | undefined | bigint) : boolean => {
-    return IsValidBigint(value, MAX_U128, BigInt(0))
-}
-export const IsValidU256 = (value:string | number | undefined | bigint) : boolean => {
-    return IsValidBigint(value, MAX_U256, BigInt(0))
+export const IsValidU256 = (value:string | number | undefined | bigint, min=0) : boolean => {
+    return IsValidBigint(value, MAX_U256, BigInt(min))
 }
 
 export const IsValidTokenType = (argType: string) : boolean => { 

package/src/vote.ts

@@ -1,16 +1,27 @@
 import { FnCallType, PassportObject, PermissionObject, GuardObject, VoteAddress, Protocol, TxbObject} from './protocol';
-import { IsValidDesription, IsValidUintLarge, IsValidAddress, Bcs, array_unique, IsValidArray, IsValidName } from './utils';
+import { IsValidDesription, IsValidAddress, Bcs, array_unique, IsValidArray, IsValidName, IsValidU64, IsValidU256, IsValidU8 } from './utils';
 import { ERROR, Errors } from './exception';
 import { ValueType } from './protocol';
 import { Transaction as TransactionBlock} from '@mysten/sui/transactions';
 
-
-
 export type VoteOption = {
     name:string;
     reference_address?:string;
 }
 
+export type QueryVotedResult = {
+    who: string;
+    voted: number[]
+    weight: bigint;
+    error?: string;
+}
+
+export type VoteGuardWeight = {
+    guard: GuardObject;
+    weight: bigint;
+}
+
+export type OnQueryVoted = (result: QueryVotedResult) => void;
 export class Vote {
     protected permission;
     protected object : TxbObject;
@@ -35,10 +46,10 @@ export class Vote {
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)
         }
-        if (!IsValidUintLarge(time)) {
+        if (!IsValidU64(time)) {
             ERROR(Errors.IsValidUint, 'time')
         }
-        if (max_choice_count && !IsValidUintLarge(max_choice_count)) {
+        if (max_choice_count && !IsValidU64(max_choice_count)) {
             ERROR(Errors.IsValidUint, 'max_choice_count')
         }
         if (max_choice_count && max_choice_count > Vote.MAX_CHOICE_COUNT) {
@@ -120,25 +131,32 @@ export class Vote {
         }
         
     }
-    add_guard(guard:GuardObject, weight:number, passport?:PassportObject)   {
-        if (!Protocol.IsValidObjects([guard])) {
-            ERROR(Errors.IsValidObjects, 'add_guard')
-        }
-        if (!IsValidUintLarge(weight)) {
-            ERROR(Errors.IsValidUint, 'add_guard')
+    add_guard(guards:VoteGuardWeight[], passport?:PassportObject)   {
+        if (guards.length === 0) return;
+        let bValid = true;
+        guards.forEach((v) => {
+            if (!IsValidU64(v.weight) || v.weight === BigInt(0)) bValid = false;
+            if (!Protocol.IsValidObjects([v.guard])) bValid = false;
+        })
+        if (!bValid) {
+            ERROR(Errors.InvalidParam, 'add_guard.gurads')
         }
 
         if (passport) {
-            this.txb.moveCall({
-                target:Protocol.Instance().VoteFn('guard_add_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, guard), 
-                    this.txb.pure.u64(weight), Protocol.TXB_OBJECT(this.txb, this.permission)]
+            guards.forEach((guard) => {
+                this.txb.moveCall({
+                    target:Protocol.Instance().VoteFn('guard_add_with_passport') as FnCallType,
+                    arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, guard.guard), 
+                        this.txb.pure.u64(guard.weight), Protocol.TXB_OBJECT(this.txb, this.permission)]
+                })
             })
         } else {
-            this.txb.moveCall({
-                target:Protocol.Instance().VoteFn('guard_add') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, guard), 
-                    this.txb.pure.u64(weight), Protocol.TXB_OBJECT(this.txb, this.permission)]
+            guards.forEach((guard) => {
+                this.txb.moveCall({
+                    target:Protocol.Instance().VoteFn('guard_add') as FnCallType,
+                    arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, guard.guard), 
+                        this.txb.pure.u64(guard.weight), Protocol.TXB_OBJECT(this.txb, this.permission)]
+                })
             })
         }
     }
@@ -186,7 +204,7 @@ export class Vote {
         let bValid = true;
         options.forEach((v) => {
             if (!IsValidName(v.name)) bValid = false;
-            if (v?.reference_address && IsValidAddress(v.reference_address)) bValid = false;
+            if (v?.reference_address && !IsValidAddress(v.reference_address)) bValid = false;
         })
         if (!bValid) {
             ERROR(Errors.InvalidParam, 'options')
@@ -214,8 +232,8 @@ export class Vote {
         if (!removeall && options.length===0) {
             return
         }
-        if (options && !IsValidArray(options, IsValidAddress)) {
-            ERROR(Errors.IsValidArray, 'remove_option')
+        if (!IsValidArray(options, IsValidName)) {
+            ERROR(Errors.IsValidArray, 'remove_option.options')
         }
         
         if (passport) {
@@ -249,7 +267,7 @@ export class Vote {
         }
     }
     set_max_choice_count(max_choice_count:number, passport?:PassportObject)  {
-        if (!IsValidUintLarge(max_choice_count) || max_choice_count > Vote.MAX_CHOICE_COUNT) {
+        if (!IsValidU64(max_choice_count) || max_choice_count > Vote.MAX_CHOICE_COUNT) {
             ERROR(Errors.InvalidParam, 'max_choice_count')
         }
 
@@ -297,7 +315,7 @@ export class Vote {
     }
 
     expand_deadline(ms_expand:boolean, time:number, passport?:PassportObject)  {
-        if (!IsValidUintLarge(time)) {
+        if (!IsValidU64(time)) {
             ERROR(Errors.IsValidUint, 'time')
         }
         
@@ -319,38 +337,57 @@ export class Vote {
     lock_guard(passport?:PassportObject)  {
         if (passport) {
             this.txb.moveCall({
-                target:Protocol.Instance().VoteFn('guard_lock_with_passport') as FnCallType,
+                target:Protocol.Instance().VoteFn('guard_locked_with_passport') as FnCallType,
                 arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.permission)]
             })   
         } else {
             this.txb.moveCall({
-                target:Protocol.Instance().VoteFn('guard_lock') as FnCallType,
+                target:Protocol.Instance().VoteFn('guard_locked') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.permission)]
             })   
         }
     }
 
-    agree(options:string[], passport?:PassportObject)  {
+    agree(options:number[], passport?:PassportObject)  {
         if (options.length === 0) return;
         if (options.length > Vote.MAX_CHOICE_COUNT) {
-            ERROR(Errors.InvalidParam, 'agree')
+            ERROR(Errors.InvalidParam, 'agree.options')
+        }
+        if (!IsValidArray(options, (v:any) => {
+            return IsValidU8(v) && v <= Vote.MAX_AGREES_COUNT;
+        })) {
+            ERROR(Errors.IsValidArray, 'agree.options')
         }
 
+        const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
+
         if (passport) {
             this.txb.moveCall({
-                target:Protocol.Instance().VoteFn('with_passport') as FnCallType,
+                target:Protocol.Instance().VoteFn('vote_with_passport') as FnCallType,
                 arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), 
-                    this.txb.pure.vector('string', array_unique(options))]
+                    this.txb.pure.vector('u8', array_unique(options)), this.txb.object(clock)]
             })  
         } else {
             this.txb.moveCall({
-                target:Protocol.Instance().VoteFn('this.object') as FnCallType,
+                target:Protocol.Instance().VoteFn('vote') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(this.txb, this.object), 
-                    this.txb.pure.vector('string', array_unique(options))]
+                    this.txb.pure.vector('u8', array_unique(options)), this.txb.object(clock)]
             })           
         }
     }
+    QueryVoted(address_queried:string, event:OnQueryVoted, sender?:string) {
+        Protocol.Client().devInspectTransactionBlock({sender:sender ?? address_queried, transactionBlock:this.txb}).then((res) => {
+            if (res.results && res.results[0].returnValues && res.results[0].returnValues.length !== 3 )  {
+                event({who:address_queried, error:'not match', voted:[], weight:BigInt(0)});
+                return 
+            }
+            console.log((res.results as any)[0].returnValues);
 
+        }).catch((e) => {
+            console.log(e);
+            event({who:address_queried, error:'error', weight:BigInt(0), voted:[]});
+        })
+    }
     change_permission(new_permission:PermissionObject)  {
         if (!Protocol.IsValidObjects([new_permission])) {
             ERROR(Errors.IsValidObjects)
@@ -364,5 +401,6 @@ export class Vote {
     }
 
     static  MAX_AGREES_COUNT = 100;
-    static  MAX_CHOICE_COUNT = 100;
+    static  MAX_CHOICE_COUNT = 100; 
+    static  MAX_GUARD_COUNT = 16;
 }