wowok 1.2.12 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.2.12",
+  "version": "1.3.3",
   "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,5 +1,4 @@
 import { type TransactionResult, Transaction as TransactionBlock } from '@mysten/sui/transactions';
-import { BCS } from '@mysten/bcs';
 import { FnCallType, Protocol, PassportObject, PermissionObject, GuardObject, DemandAddress, TxbObject, ResourceObject} from './protocol';
 import { IsValidDesription, IsValidUintLarge, IsValidAddress, IsValidArgType, } from './utils'
 import { Errors, ERROR}  from './exception'

package/src/entity.ts

@@ -1,4 +1,3 @@
-import { BCS, encodeStr, getSuiMoveConfig } from '@mysten/bcs';
 import { Protocol, FnCallType, TxbObject, ResourceAddress, PermissionObject, ResourceObject} from './protocol';
 import { IsValidDesription, IsValidAddress, IsValidName, isValidHttpUrl, Bcs,  } from './utils';
 import { ERROR, Errors } from './exception';

package/src/guard.ts

@@ -1,5 +1,5 @@
 
-import { BCS } from '@mysten/bcs';
+
 import { Protocol, LogicsInfo, GuardAddress, FnCallType, Data_Type, MODULES, ContextType, ValueType,  OperatorType, ConstantType, SER_VALUE} from './protocol';
 import { concatenate, array_equal } from './utils';
 import { IsValidDesription, Bcs, IsValidInt, IsValidAddress, FirstLetterUppercase } from './utils';

package/src/machine.ts

@@ -1,9 +1,9 @@
 import { Transaction as TransactionBlock, TransactionObjectArgument, type TransactionResult } from '@mysten/sui/transactions';
-import { BCS } from '@mysten/bcs';
 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} from './utils'
+    IsValidUintLarge,
+    IsValidU64} from './utils'
 import { Permission, PermissionIndexType } from './permission';
 import { Errors, ERROR}  from './exception'
 import { ValueType } from './protocol';
@@ -26,6 +26,14 @@ export interface Machine_Node {
     pairs: Machine_Node_Pair[];
 }
 
+export interface QueryGuardParam {
+    node: string;
+    prior_node: string;
+    forward: string;
+    txb: TransactionBlock;
+    guard: string | null;
+}
+export type OnQueryGuard = (param: QueryGuardParam) => void;
 export class Machine {
     protected txb;
     protected object : TxbObject;
@@ -83,7 +91,7 @@ export class Machine {
                 if (!IsValidName_AllowEmpty(p.prior_node)) { bValid = false; }
                 if (p?.threshold && !IsValidInt(p.threshold)) { bValid = false; }
                 p.forwards.forEach((f) => {
-                    if (!Machine.isValidForward(f)) bValid = false;
+                    if (Machine.checkValidForward(f) !== '') bValid = false;
                 })
             })
         })
@@ -120,21 +128,30 @@ export class Machine {
 
     forward(forward:Machine_Forward) : TransactionResult {
         let weight = forward?.weight ? forward.weight : 1;
-        let perm = this.txb.pure.option('u64', forward?.permission); 
-        let namedOperator = forward?.namedOperator ?  this.txb.pure.string(forward.namedOperator) : this.txb.pure.string('');
         let f:any;
 
-        if (forward?.guard) {
+        // namedOperator first.
+        if (forward?.namedOperator && IsValidName(forward.namedOperator)) {
+            if (forward?.guard) {
+                f = this.txb.moveCall({ 
+                    target:Protocol.Instance().MachineFn('forward') as FnCallType,
+                        arguments:[this.txb.pure.string(forward.namedOperator), this.txb.pure.u16(weight), this.txb.object(Protocol.TXB_OBJECT(this.txb, forward.guard))]
+                });                        
+            } else {
+                f = this.txb.moveCall({ 
+                    target:Protocol.Instance().MachineFn('forward2') as FnCallType,
+                        arguments:[this.txb.pure.string(forward.namedOperator), this.txb.pure.u16(weight)]
+                });                
+            }            
+        } else if (forward?.permission !== undefined && IsValidU64(forward.permission)) {
             f = this.txb.moveCall({ 
-                target:Protocol.Instance().MachineFn('forward') as FnCallType,
-                    arguments:[namedOperator, this.txb.pure.u16(weight), this.txb.object(Protocol.TXB_OBJECT(this.txb, forward.guard)), perm]
-            });                        
+                target:Protocol.Instance().MachineFn('forward3') as FnCallType,
+                    arguments:[this.txb.pure.u64(forward.permission), this.txb.pure.u16(weight)]
+            });    
         } else {
-            f = this.txb.moveCall({ 
-                target:Protocol.Instance().MachineFn('forward2') as FnCallType,
-                    arguments:[namedOperator, this.txb.pure.u16(weight), perm]
-            });                
+            ERROR(Errors.InvalidParam, 'forward')
         }
+
         return f
     }
 
@@ -373,10 +390,10 @@ export class Machine {
         this.permission = new_permission;   
     }
 
-    add_forward(node_prior:string, node_name:string, foward: Machine_Forward, threshold?:number, passport?:PassportObject) {
+    add_forward(node_prior:string, node_name:string, foward: Machine_Forward, threshold?:number, old_forward_name?:string, passport?:PassportObject) {
         if (!IsValidName_AllowEmpty(node_prior)) ERROR(Errors.IsValidName_AllowEmpty, 'add_forward');
         if (!IsValidName(node_name)) ERROR(Errors.IsValidName, 'add_forward');
-        if (!Machine.isValidForward(foward)) ERROR(Errors.InvalidParam, 'add_forward');
+        const err = Machine.checkValidForward(foward); if (err) ERROR(Errors.InvalidParam, err);
 
         let n : any;
         if (passport) {
@@ -397,6 +414,14 @@ export class Machine {
             target:Protocol.Instance().MachineFn('forward_add') as FnCallType,
             arguments:[n, this.txb.pure.string(node_prior), this.txb.pure.string(foward.name), t, f],
         })
+        
+        if (old_forward_name && old_forward_name !== foward.name) {
+            this.txb.moveCall({
+                target:Protocol.Instance().MachineFn('forward_remove') as FnCallType,
+                arguments:[n, this.txb.pure.string(node_prior), this.txb.pure.string(old_forward_name)],
+            })
+        }
+        this.add_node2([n], passport);
     }
 
     remove_forward(node_prior:string, node_name:string, foward_name: string, passport?:PassportObject) {
@@ -420,6 +445,7 @@ export class Machine {
             target:Protocol.Instance().MachineFn('forward_remove') as FnCallType,
             arguments:[n, this.txb.pure.string(node_prior), this.txb.pure.string(foward_name)],
         })
+        this.add_node2([n], passport);
     }
 
     static rpc_de_nodes(fields: any) : Machine_Node[] {
@@ -458,15 +484,37 @@ export class Machine {
         return ret;
     }
 
-    static isValidForward(forward:Machine_Forward) {
-        if (!IsValidName(forward.name)) return false
-        if (forward?.namedOperator && !IsValidName_AllowEmpty(forward?.namedOperator)) return false;
-        if (forward?.permission && !Permission.IsValidPermissionIndex(forward?.permission)) return false;
-        if (!forward?.permission && !forward?.namedOperator) return false;
-        if (forward?.weight && !IsValidUintLarge(forward.weight)) return false;
-        return true
+    static checkValidForward(forward:Machine_Forward) : string {
+        if (!IsValidName(forward.name)) return 'Forward name invalid'
+        if (forward?.namedOperator && !IsValidName_AllowEmpty(forward?.namedOperator)) return 'Progress Operator invalid';
+        if (forward?.permission && !Permission.IsValidPermissionIndex(forward?.permission)) return 'Permission index invalid';
+        if (!forward?.permission && !forward?.namedOperator) return 'Both Permission index and Progress Operator empty';
+        if (forward?.weight && !IsValidUintLarge(forward.weight)) return 'Weight invalid';
+        return ''
     }
 
+
+    QueryForwardGuard(sender:string, node:string, prior_node:string, forward:string, onGuard:OnQueryGuard) {
+        if (!node || !forward) { // prior_node maybe ''
+            ERROR(Errors.InvalidParam, 'QueryForwardGuard');
+            return ;
+        }
+
+        this.txb.moveCall({
+            target:Protocol.Instance().MachineFn('query_guard') as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(node), 
+                this.txb.pure.string(prior_node), this.txb.pure.string(forward)],
+        });
+
+        Protocol.Client().devInspectTransactionBlock({sender:sender, transactionBlock:this.txb}).then((res) => {
+            if (res.results?.length === 1 && res.results[0].returnValues?.length === 1) {
+                const guard = Bcs.getInstance().de('Option<address>', Uint8Array.from(res.results[0].returnValues[0][0]));
+                onGuard({node:node, prior_node:prior_node, forward:forward, guard:guard?.some?('0x'+guard?.some):'', txb:this.txb});
+            }
+        }).catch(e=>{
+            console.log(e);
+        })
+    }
     static INITIAL_NODE_NAME = '';
 /*    static NODE_NAME_RESERVED = 'origin';
     static IsNodeNameReserved = (name:string) => { 

package/src/passport.ts

@@ -3,10 +3,8 @@ import { SuiObjectResponse } from '@mysten/sui/client';
 import { FnCallType, GuardObject, Protocol, ContextType, OperatorType, Data_Type,
     ValueType, SER_VALUE, IsValidOperatorType } from './protocol';
 import { parse_object_type, array_unique, Bcs, ulebDecode, IsValidAddress, IsValidArray,  OPTION_NONE, readOption, readOptionString } from './utils';
-import { BCS, BcsReader } from '@mysten/bcs';
 import { ERROR, Errors } from './exception';
 import { Guard } from './guard';
-import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils';
 
 export type Guard_Query_Object = {
     target: FnCallType, // object fnCall
@@ -769,6 +767,51 @@ export class Passport {
             arguments: [ this.passport ]
         });  
     }
+
+    query_result(sender:string, handleResult:OnQueryPassportResult) {
+        this.txb.moveCall({
+            target: Protocol.Instance().PassportFn('query_result') as FnCallType,
+            arguments: [ this.passport ]
+        });  
+
+        Protocol.Client().devInspectTransactionBlock({sender:sender, transactionBlock:this.txb}).then((res) => {
+            const r = Passport.ResolveQueryRes(this.txb, res);
+            if (r) handleResult(r);
+        }).catch(e=>{
+            console.log(e);
+        })
+    }
+
+    query_result_async = async (sender:string) : Promise<QueryPassportResult | undefined> => {
+        this.txb.moveCall({
+            target: Protocol.Instance().PassportFn('query_result') as FnCallType,
+            arguments: [ this.passport ]
+        });  
+
+        const res = await Protocol.Client().devInspectTransactionBlock({sender:sender, transactionBlock:this.txb});
+        return Passport.ResolveQueryRes(this.txb, res);
+    }
+
+    private static  ResolveQueryRes(txb:TransactionBlock, res:any) : QueryPassportResult | undefined {
+        for (let i = 0; i < res.results?.length; ++ i) {
+            const v = res.results[i];
+            if (v?.returnValues && v.returnValues.length === 2 && 
+                v.returnValues[0][1] === 'bool' && v.returnValues[1][1] === 'vector<address>') { // (bool, vector<address>)
+                const result = Bcs.getInstance().de('bool', Uint8Array.from(v.returnValues[0][0]));
+                const guards = Bcs.getInstance().de('vector<address>', Uint8Array.from(v.returnValues[1][0])).map((v:string)=>'0x'+v);
+                return {txb:txb, result:result, guards:guards}
+            }
+        }
+        return undefined
+    }
 }
 
+export interface QueryPassportResult {
+    txb: TransactionBlock;
+    result: boolean;
+    guards: string[];
+}
+
+export type OnQueryPassportResult = (result:QueryPassportResult) => void;
+
 

package/src/permission.ts

@@ -1,37 +1,36 @@
-import { BCS } from '@mysten/bcs';
 import { FnCallType, TxbObject, PermissionObject, PermissionAddress, GuardObject, Protocol} from './protocol';
 import { array_unique, IsValidAddress, IsValidArray,  IsValidDesription, IsValidUintLarge, Bcs, IsValidName} from './utils';
 import { ERROR, Errors } from './exception';
 import { ValueType } from './protocol';
-import { Passport } from './passport';
+import { BCS } from '@mysten/bcs';
 import { Transaction as TransactionBlock } from '@mysten/sui/transactions';
 
 export enum PermissionIndex {
     repository = 100,
-    repository_set_description_set = 101,
-    repository_set_policy_mode = 102,
-    repository_add_remove_policies = 103,
-    repository_set_policy_description = 105,
-    repository_set_policy_permission = 106,
+    repository_description = 101,
+    repository_policy_mode = 102,
+    repository_policies = 103,
+    repository_policy_description = 105,
+    repository_policy_permission = 106,
     repository_reference = 107,
 
     vote = 150,
-    vote_set_description = 151,
-    vote_set_reference = 152, 
+    vote_description = 151,
+    vote_reference = 152, 
     vote_guard = 153,
     vote_option = 155,
-    vote_set_max_choice_count = 157,
+    vote_max_choice_count = 157,
     vote_open_voting = 158,
     vote_lock_deadline = 159,
     vote_expand_deadline = 160,
     vote_lock_guard = 161,
 
     service = 200,
-    service_set_description = 201,
-    service_set_price = 202,
-    service_set_add_reduce_stock = 203,
-    service_set_sale_endpoint = 204,
-    service_set_payee = 205,
+    service_description = 201,
+    service_price = 202,
+    service_stock = 203,
+    service_sale_endpoint = 204,
+    service_payee = 205,
     service_repository = 206,
     service_withdraw_guards = 208,
     service_refund_guards = 210,
@@ -39,9 +38,9 @@ export enum PermissionIndex {
     service_remove_sales = 213,
     service_discount_transfer = 214,
     service_withdraw = 216,
-    service_set_buy_guard = 217,
-    service_set_machine = 218,
-    service_set_endpoint = 219,
+    service_buy_guard = 217,
+    service_machine = 218,
+    service_endpoint = 219,
     service_publish = 220,
     service_clone = 221,
     service_customer_required = 222,
@@ -52,30 +51,33 @@ export enum PermissionIndex {
     reward_refund = 241,
     reward_expand_time = 242,
     reward_guard = 243,
-    reward_set_description = 245,
+    reward_description = 245,
     reward_lock_guards = 246,
+    reward_claim_repeatably = 247,
+    reward_allow_claiming = 248,
 
     demand = 260,
     demand_refund = 261,
     demand_expand_time = 262,
-    demand_set_guard = 263,
-    demand_set_description = 264,
+    demand_guard = 263,
+    demand_description = 264,
     demand_yes = 265,
 
     machine = 600,
-    machine_set_description = 601,
+    machine_description = 601,
     machine_repository = 602,
     machine_clone =  604,
     machine_node = 606,
-    machine_set_endpoint = 608,
+    machine_endpoint = 608,
     machine_pause = 609,
     machine_publish = 610,
 
     progress = 650,
-    progress_set_namedOperator = 651,
+    progress_namedOperator = 651,
     progress_bind_task = 652,
-    progress_set_context_repository = 653,
+    progress_context_repository = 653,
     progress_unhold = 654,
+    progress_parent = 655,
     user_defined_start = 10000,
 }
 
@@ -92,6 +94,7 @@ export interface PermissionAnswer {
     owner?: boolean;
     admin?: boolean;
     items?: PermissionAnswerItem[]; // items === undefined, while errors
+    object: string; // permission object
 }
 export interface PermissionAnswerItem {
     query: PermissionIndexType;
@@ -102,29 +105,29 @@ export type OnPermissionAnswer = (answer: PermissionAnswer) => void;
 
 export const PermissionInfo : PermissionInfoType[] = [
     {index:PermissionIndex.repository, name:'Repository', description:'Launch new Repository', module: 'repository'},
-    {index:PermissionIndex.repository_set_description_set, name:'Description', description:'Set Repository description', module: 'repository'},
-    {index:PermissionIndex.repository_set_policy_mode, name:'Policy mode', description:'Set Repository policy mode', module: 'repository'},
-    {index:PermissionIndex.repository_add_remove_policies, name:'Policy', description:'Add/Remove Repository policy', module: 'repository'},
-    {index:PermissionIndex.repository_set_policy_description, name:'Policy Description', description:'Set Repository policy description', module: 'repository'},
-    {index:PermissionIndex.repository_set_policy_permission, name:'Policy Permission', description:'Set Repository policy permission',  module: 'repository'},
+    {index:PermissionIndex.repository_description, name:'Description', description:'Set Repository description', module: 'repository'},
+    {index:PermissionIndex.repository_policy_mode, name:'Policy mode', description:'Set Repository policy mode', module: 'repository'},
+    {index:PermissionIndex.repository_policies, name:'Policy', description:'Add/Remove/Edit Repository policy', module: 'repository'},
+    {index:PermissionIndex.repository_policy_description, name:'Policy Description', description:'Set Repository policy description', module: 'repository'},
+    {index:PermissionIndex.repository_policy_permission, name:'Policy Permission', description:'Set Repository policy permission',  module: 'repository'},
     {index:PermissionIndex.repository_reference, name:'Reference', description:'Set Repository reference', module: 'repository'},
 
     {index:PermissionIndex.vote, name:'Vote', description:'Launch new Vote', module: 'vote'},
-    {index:PermissionIndex.vote_set_description, name:'Description', description:'Set Vote description', module: 'vote'},
-    {index:PermissionIndex.vote_set_reference, name:'Reference', description:'Set Vote reference', module: 'vote'},
+    {index:PermissionIndex.vote_description, name:'Description', description:'Set Vote description', module: 'vote'},
+    {index:PermissionIndex.vote_reference, name:'Reference', description:'Set Vote reference', module: 'vote'},
     {index:PermissionIndex.vote_guard, name:'Guard', description:'Set Vote guards', module: 'vote'},
     {index:PermissionIndex.vote_option, name:'Option', description:'Set Vote options', module: 'vote'},
-    {index:PermissionIndex.vote_set_max_choice_count, name:'Choice count', description:'Set Vote max choice count', module: 'vote'},
+    {index:PermissionIndex.vote_max_choice_count, name:'Choice count', description:'Set Vote max choice count', module: 'vote'},
     {index:PermissionIndex.vote_open_voting, name:'Open voting', description:'Open voting', module: 'vote'},
     {index:PermissionIndex.vote_lock_deadline, name:'Lock deadline', description:'Set Vote deadline immutable', module: 'vote'},
     {index:PermissionIndex.vote_expand_deadline, name:'Expand deadline', description:'Expand Vote deadline', module: 'vote'},
     {index:PermissionIndex.vote_lock_guard, name:'Lock Guard', description:'Set Vote guards immutable', module: 'vote'},
 
     {index:PermissionIndex.service, name:'Service', description:'Launch new Service', module: 'service'},
-    {index:PermissionIndex.service_set_description, name:'Description', description:'Set Service description', module: 'service'},
-    {index:PermissionIndex.service_set_price, name:'Price', description:'Set Service item price', module: 'service'},
-    {index:PermissionIndex.service_set_add_reduce_stock, name:'Inventory', description:'Set Service item inventory', module: 'service'},
-    {index:PermissionIndex.service_set_payee, name:'Payee', description:'Set Service payee', module: 'service'},
+    {index:PermissionIndex.service_description, name:'Description', description:'Set Service description', module: 'service'},
+    {index:PermissionIndex.service_price, name:'Price', description:'Set Service item price', module: 'service'},
+    {index:PermissionIndex.service_stock, name:'Inventory', description:'Set Service item inventory', module: 'service'},
+    {index:PermissionIndex.service_payee, name:'Payee', description:'Set Service payee', module: 'service'},
     {index:PermissionIndex.service_repository, name:'Repository', description:'Set Service repositories', module: 'service'},
     {index:PermissionIndex.service_withdraw_guards, name:'Withdraw Guard', description:'Set Service withdraw guards', module: 'service'},
     {index:PermissionIndex.service_refund_guards, name:'Refund Guard', description:'Set Service refund guards', module: 'service'},
@@ -132,9 +135,9 @@ export const PermissionInfo : PermissionInfoType[] = [
     {index:PermissionIndex.service_remove_sales, name:'Remove sales', description:'Remove sale items for Service', module: 'service'},
     {index:PermissionIndex.service_discount_transfer, name:'Discount', description:'Launch discounts for Service', module: 'service'},
     {index:PermissionIndex.service_withdraw, name:'Withdraw', description:'Widthraw from Service orders', module: 'service'},
-    {index:PermissionIndex.service_set_buy_guard, name:'Buyer Guard', description:'Set Guard of buying for Service', module: 'service'},
-    {index:PermissionIndex.service_set_machine, name:'Machine', description:'Set Machine for Service', module: 'service'},
-    {index:PermissionIndex.service_set_endpoint, name:'Endpoint', description:'Set Service endpoint', module: 'service'},
+    {index:PermissionIndex.service_buy_guard, name:'Buyer Guard', description:'Set Guard of buying for Service', module: 'service'},
+    {index:PermissionIndex.service_machine, name:'Machine', description:'Set Machine for Service', module: 'service'},
+    {index:PermissionIndex.service_endpoint, name:'Endpoint', description:'Set Service endpoint', module: 'service'},
     {index:PermissionIndex.service_publish, name:'Publish', description:'Publish Service', module: 'service'},
     {index:PermissionIndex.service_clone, name:'Clone', description:'Clone Service', module: 'service'},
     {index:PermissionIndex.service_customer_required, name:'Buyer info', description:'Set Service buyer info required', module: 'service'},
@@ -144,31 +147,34 @@ export const PermissionInfo : PermissionInfoType[] = [
     {index:PermissionIndex.reward, name:'Reward', description:'Launch new Reward', module: 'reward'},
     {index:PermissionIndex.reward_refund, name:'Refund', description:'Refund from Reward', module: 'reward'},
     {index:PermissionIndex.reward_expand_time, name:'Expand deadline', description:'Expand Reward deadline', module: 'reward'},
-    {index:PermissionIndex.reward_guard, name:'Guard', description:'build machine', module: 'Set Reward guard'},
-    {index:PermissionIndex.reward_set_description, name:'Description', description:'Set Reward description', module: 'reward'},
+    {index:PermissionIndex.reward_guard, name:'Guard', description:'Set Reward guard', module: 'reward'},
+    {index:PermissionIndex.reward_description, name:'Description', description:'Set Reward description', module: 'reward'},
     {index:PermissionIndex.reward_lock_guards, name:'Lock Guard', description:'Set Reward guard immutable', module: 'reward'},
+    {index:PermissionIndex.reward_claim_repeatably, name:'Claim repeatably', description:'Allow claimming repeatably', module: 'reward'},
+    {index:PermissionIndex.reward_allow_claiming, name:'Allow claiming', description:'Allow claiming', module: 'reward'},
 
     {index:PermissionIndex.demand, name:'Demand', description:'Launch new Demand', module: 'demand'},
     {index:PermissionIndex.demand_refund, name:'Refund', description:'Refund from Demand', module: 'demand'},
     {index:PermissionIndex.demand_expand_time, name:'Expand deadline', description:'Expand Demand deadline', module: 'demand'},
-    {index:PermissionIndex.demand_set_guard, name:'Guard', description:'Set Demand guard', module: 'demand'},
-    {index:PermissionIndex.demand_set_description, name:'Description', description:'Set Demand description', module: 'demand'},
+    {index:PermissionIndex.demand_guard, name:'Guard', description:'Set Demand guard', module: 'demand'},
+    {index:PermissionIndex.demand_description, name:'Description', description:'Set Demand description', module: 'demand'},
     {index:PermissionIndex.demand_yes, name:'Yes', description:'Pick the Deamand serice', module: 'demand'},
 
     {index:PermissionIndex.machine, name: 'Machine', description:'Launch new Machine', module: 'machine'},
-    {index:PermissionIndex.machine_set_description, name: 'Description', description:'Set Machine description', module: 'machine'},
+    {index:PermissionIndex.machine_description, name: 'Description', description:'Set Machine description', module: 'machine'},
     {index:PermissionIndex.machine_repository, name: 'Repository', description:'Set Machine repository', module: 'machine'},
     {index:PermissionIndex.machine_clone, name: 'Clone', description:'Clone Machine', module: 'machine'},
     {index:PermissionIndex.machine_node, name: 'Node', description:'Set Machine nodes', module: 'machine'},
-    {index:PermissionIndex.machine_set_endpoint, name: 'Endpoint', description:'Set Machine endpoint', module: 'machine'},
+    {index:PermissionIndex.machine_endpoint, name: 'Endpoint', description:'Set Machine endpoint', module: 'machine'},
     {index:PermissionIndex.machine_pause, name: 'Pause', description:'Pause/Unpause Machine', module: 'machine'},
     {index:PermissionIndex.machine_publish, name: 'Publish', description:'Publish Machine', module: 'machine'},
 
     {index:PermissionIndex.progress, name: 'Progress', description:'Launch new Progress', module: 'progress'},
-    {index:PermissionIndex.progress_set_namedOperator, name: 'Operator', description:'Set Progress operators', module: 'progress'},
+    {index:PermissionIndex.progress_namedOperator, name: 'Operator', description:'Set Progress operators', module: 'progress'},
     {index:PermissionIndex.progress_bind_task, name: 'Bind', description:'Set Progress task', module: 'progress'},
-    {index:PermissionIndex.progress_set_context_repository, name: 'Repository', description:'Set Progress repository', module: 'progress'},
+    {index:PermissionIndex.progress_context_repository, name: 'Repository', description:'Set Progress repository', module: 'progress'},
     {index:PermissionIndex.progress_unhold, name: 'Unhold', description:'Release Progress holdings', module: 'progress'},
+    {index:PermissionIndex.progress_parent, name: 'Parent', description:'Set Progress parent', module: 'progress'},
 ]
 
 export type PermissionIndexType = PermissionIndex | number;
@@ -328,7 +334,7 @@ export class  Permission {
         guards.forEach(({entity_address, index, guard}) => {
             this.txb.moveCall({
                 target:Protocol.Instance().PermissionFn('guard_set') as FnCallType,
-                arguments:[ Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure(entity_address, BCS.ADDRESS), 
+                arguments:[ Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.address(entity_address), 
                     this.txb.pure.u64(index), Protocol.TXB_OBJECT(this.txb, guard)]
             })
         })
@@ -339,7 +345,7 @@ export class  Permission {
         if (!IsValidAddress(entity_address)) {
             ERROR(Errors.IsValidAddress, 'entity_address')
         }
-        if(!Permission.IsValidPermissionIndex(index)) {
+        if(!Permission.IsValidPermissionIndex(index) && !Permission.IsValidUserDefinedIndex(index)) {
             ERROR(Errors.IsValidPermissionIndex, 'index')
         }
 
@@ -396,7 +402,9 @@ export class  Permission {
     }
 
     add_admin(admin:string[])  {
-        if (!admin || !IsValidArray(admin, IsValidAddress)) {
+        if (admin.length === 0) return ;
+
+        if (!IsValidArray(admin, IsValidAddress)) {
             ERROR(Errors.IsValidArray)
         }
 
@@ -407,7 +415,7 @@ export class  Permission {
     }
 
     remove_admin(admin:string[], removeall?:boolean)  {
-        if (!removeall &&  admin.length === 0)  return
+        if (!removeall &&  admin.length === 0)  return;
         if (!IsValidArray(admin, IsValidAddress)) {
             ERROR(Errors.IsValidArray, 'admin')
         }
@@ -447,27 +455,29 @@ export class  Permission {
 
         this.txb.moveCall({
             target:Protocol.Instance().PermissionFn('query_permissions') as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.address(address_queried), this.txb.pure.vector('u64', permissions)]
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.address(address_queried), 
+                this.txb.pure.vector('u64', permissions)]
         })   
     }
 
-    QueryPermissions(txb:TransactionBlock, address_queried:string, permissions:PermissionIndexType[], onPermissionAnswer:OnPermissionAnswer, sender?:string) {
+    QueryPermissions(permission:string, address_queried:string, permissions:PermissionIndexType[], onPermissionAnswer:OnPermissionAnswer, sender?:string) {
+        //@ be the same txb
         this.query_permissions(address_queried, permissions);
-        Protocol.Client().devInspectTransactionBlock({sender:sender ?? address_queried, transactionBlock:txb}).then((res) => {
+        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 )  {
-                onPermissionAnswer({who:address_queried});
+                onPermissionAnswer({who:address_queried, object:permission});
                 return 
             }
 
             const perm = Bcs.getInstance().de(BCS.U8, Uint8Array.from((res.results as any)[0].returnValues[0][0]));
 
             if (perm === Permission.PERMISSION_ADMIN || perm === Permission.PERMISSION_OWNER_AND_ADMIN) {
-                onPermissionAnswer({who:address_queried, admin:true, owner:perm%2===1, items:[]})
+                onPermissionAnswer({who:address_queried, admin:true, owner:perm%2===1, items:[], object:permission})
             } else {
                 const perms = Bcs.getInstance().de('vector<u8>', Uint8Array.from((res.results as any)[0].returnValues[1][0]));
                 const guards = Bcs.getInstance().de('vector<address>', Uint8Array.from((res.results as any)[0].returnValues[2][0]));
                 if (perms.length !== permissions.length) {
-                    onPermissionAnswer({who:address_queried});
+                    onPermissionAnswer({who:address_queried, object:permission});
                     return
                 }
 
@@ -479,22 +489,25 @@ export class  Permission {
                     }
                     return {query:v, permission:p, guard:g} 
                 })
-                onPermissionAnswer({who:address_queried, admin:false, owner:perm%2===1, items:items});
+                onPermissionAnswer({who:address_queried, admin:false, owner:perm%2===1, items:items, object:permission});
             }
         }).catch((e) => {
             console.log(e);
-            onPermissionAnswer({who:address_queried});
+            onPermissionAnswer({who:address_queried, object:permission});
         })
     }
-    static HasPermission(answer:PermissionAnswer|undefined, index:PermissionIndexType) : {has:boolean, guard?:string, owner?:boolean} {
+    static HasPermission(answer:PermissionAnswer|undefined, index:PermissionIndexType, bStrict:boolean=false) : {has:boolean, guard?:string, owner?:boolean} | undefined {
         if (answer) {
             if (answer.admin) return {has:true, owner:answer.owner}; // admin
             let i = answer.items?.find((v)=>v.query === index);
             if (i) {
                 return {has:i.permission, guard:i.guard, owner:answer.owner};
-            }          
+            }    
         }
-        return {has:false}
+        if (bStrict) {
+            return {has:false, guard:undefined, owner:answer?.owner}
+        } 
+        return undefined
     }
 
     static MAX_ADMIN_COUNT = 64;

package/src/progress.ts

@@ -1,4 +1,4 @@
-import { BCS } from '@mysten/bcs';
+
 import { FnCallType, PermissionObject, RepositoryObject, PassportObject, MachineObject, 
     ProgressObject, ProgressAddress, Protocol, ValueType,
     TxbObject} from './protocol';
@@ -158,7 +158,6 @@ export class Progress {
             ERROR(Errors.IsValidObjects, 'repository')
         }
 
-        
         if (passport) {
             if (repository) {
                 this.txb.moveCall({
@@ -189,8 +188,9 @@ export class Progress {
         }
     }
     unhold(next:ProgressNext, passport?:PassportObject)  {
+        console.log(next)
         if (!Progress.IsValidProgressNext(next)) {
-            ERROR(Errors.InvalidParam, 'next')
+            ERROR(Errors.InvalidParam, 'unhold')
         }
         
         if (passport) {
@@ -210,7 +210,6 @@ export class Progress {
         }
     }
     parent_none(passport?:PassportObject) {
-        
         if (passport) {
             this.txb.moveCall({
                 target:Protocol.Instance().ProgressFn('parent_none_with_passport') as FnCallType,
@@ -234,7 +233,6 @@ export class Progress {
             ERROR(Errors.InvalidParam, 'parent')
         }
 
-        
         if (passport) {
             this.txb.moveCall({
                 target:Protocol.Instance().ProgressFn('parent_set_with_passport') as FnCallType,
@@ -259,6 +257,7 @@ export class Progress {
     }
 
     next(next:ProgressNext, deliverables_address?:string, sub_id?:string, passport?:PassportObject)  {
+        console.log(next)
         if (!Progress.IsValidProgressNext(next)) {
             ERROR(Errors.InvalidParam, 'next')
         }
@@ -268,12 +267,12 @@ export class Progress {
         if (sub_id && !IsValidAddress(sub_id)) {
             ERROR(Errors.IsValidAddress, 'sub_id');
         }
-
         
         let diliverable = this.txb.pure.option('address', deliverables_address ? deliverables_address  : undefined);
         let sub = this.txb.pure.option('address', sub_id ? sub_id : undefined);
         
         if (passport) {
+            console.log(11111)
             this.txb.moveCall({
                 target:Protocol.Instance().ProgressFn('next_with_passport') as FnCallType,
                 arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine), 
@@ -292,9 +291,8 @@ export class Progress {
 
     hold(next:ProgressNext, hold:boolean)  {
         if (!Progress.IsValidProgressNext(next)) {
-            ERROR(Errors.InvalidParam, 'next')
+            ERROR(Errors.InvalidParam, 'hold')
         }
-
         
         this.txb.moveCall({
             target:Protocol.Instance().ProgressFn('hold') as FnCallType,
@@ -302,6 +300,7 @@ export class Progress {
                 this.txb.pure.string(next.forward), this.txb.pure.bool(hold), Protocol.TXB_OBJECT(this.txb, this.permission)],
         })  
     }
+
     static rpc_de_sessions = (session: any) : Session[] => {
         let sessions : Session[] = [];
         session?.fields?.contents?.forEach((v:any) => {

package/src/protocol.ts

@@ -1,7 +1,7 @@
 import { SuiClient, SuiObjectResponse, SuiObjectDataOptions, SuiTransactionBlockResponseOptions, 
     SuiTransactionBlockResponse, SuiObjectChange } from '@mysten/sui/client';
 import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
-import { BCS, getSuiMoveConfig, toHEX, fromHEX, BcsReader } from '@mysten/bcs';
+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 { GuardConstant } from './guard';
@@ -191,9 +191,9 @@ export enum ENTRYPOINT {
 }
 
 const TESTNET = {
-    package: "0xc5bcb215cb4bc861203739b7378199969d4f60f5e8130fa1ebf87987bdee0b6a",
-    wowok_object: '0xe9fdb9c3ad7aa81ee32d3fc9618d6e69637111253445e864f898d29179d11a4d',
-    entity_object: '0xe1205f43507c943a82d5a67cb7d2b3b251ff4a80f3b38e815a78291ed53125ce',
+    package: "0x8f547c4bd00eedc72307d67c8c1c7b22da88c29ac530cce57bbfe7b6add45a91",
+    wowok_object: '0x1ccee2dbac69f76db35d92869cc4840fb537020a927dd035cdac811803d9d191',
+    entity_object: '0xb75b6953254cf9a426fb06b1ceb711784031cf7817b66630ba00daf5660ab04e',
 }
 
 const MAINNET = {
@@ -320,7 +320,6 @@ export class Protocol {
             transaction: this.CurrentSession(), 
             signer: keypair,
             options,
-            
         });
         this.txb = undefined; // reset the txb to undefine
         return response;

package/src/repository.ts

@@ -1,4 +1,3 @@
-import { BCS } from '@mysten/bcs';
 import { Protocol, FnCallType, ValueType, RepositoryValueType, RepositoryAddress, PermissionObject, PassportObject, TxbObject} from './protocol';
 import { PermissionIndexType, Permission } from './permission'
 import { Bcs, array_unique, IsValidDesription, IsValidAddress, IsValidArray, IsValidName,  ValueTypeConvert} from './utils';
@@ -222,7 +221,7 @@ export class Repository {
         }
 
         policies.forEach((policy) => {
-            let permission_index = this.txb.pure.option('u64', policy?.permission);
+            let permission_index = this.txb.pure.option('u64', policy?.permission ? policy?.permission : undefined);
             if (passport) {
                 this.txb.moveCall({
                     target:Protocol.Instance().RepositoryFn('policy_add_with_passport') as FnCallType,

package/src/resource.ts

@@ -1,4 +1,3 @@
-import { BCS } from '@mysten/bcs';
 import { Protocol, FnCallType, TxbObject, ResourceAddress} from './protocol';
 import { IsValidDesription, IsValidAddress, IsValidName, IsValidArray,  } from './utils';
 import { ERROR, Errors } from './exception';

package/src/reward.ts

@@ -1,9 +1,7 @@
 import { TransactionArgument, Transaction as TransactionBlock, type TransactionResult, } from '@mysten/sui/transactions';
-import { BCS} from '@mysten/bcs';
 import { FnCallType, GuardObject, PassportObject, PermissionObject, RewardAddress, Protocol, TxbObject, } from './protocol';
 import { array_unique, IsValidAddress, IsValidArgType, IsValidArray, IsValidDesription,  IsValidUintLarge, } from './utils';
 import { ERROR, Errors } from './exception';
-import { Resource } from './resource';
 
 export type CoinReward = TransactionResult;
 export type RewardGuardPortions = {

package/src/service.ts

@@ -1,4 +1,3 @@
-import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig } from '@mysten/bcs';
 import { IsValidArray, IsValidPercent, IsValidName_AllowEmpty, Bcs, array_unique, IsValidTokenType, IsValidDesription, 
     IsValidAddress, IsValidEndpoint, IsValidUintLarge, IsValidInt, IsValidName, } from './utils'
 import { FnCallType, GuardObject, PassportObject, PermissionObject, RepositoryObject, MachineObject, ServiceAddress, 
@@ -594,8 +593,8 @@ export class Service {
         }
         const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
         discount_dispatch.forEach((discount) => {
-            let price_greater = this.txb.pure.option('u64', discount.discount?.price_greater);
-            let time_start = this.txb.pure.option('u64', discount.discount?.time_start);
+            let price_greater = this.txb.pure.option('u64', discount.discount?.price_greater ? discount.discount?.price_greater : undefined);
+            let time_start = this.txb.pure.option('u64', discount.discount?.time_start ? discount.discount?.time_start : undefined);
 
             if (passport) {
                 this.txb.moveCall({

package/src/utils.ts

@@ -314,7 +314,8 @@ export class Bcs {
         const dislike = reader.read32();
         return {avatar:avatar, resource:resource, like:like, dislike:dislike}*/
     }    
-    de_entInfo(data:Uint8Array) : any {
+    de_entInfo(data:Uint8Array | undefined) : any {
+        if (!data || data.length === 0) return ''
         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));
@@ -473,8 +474,6 @@ export const ResolveBalance = (balance:string, decimals:number) : string => {
     }
 }
 
-//export const OptionNone = (txb:TransactionBlock) : TransactionArgument => { return txb.pure.option([], BCS.U8) };
-
 export type ArgType = {
     isCoin: boolean;
     coin: string;

package/src/wowok.ts

@@ -1,4 +1,3 @@
-import { BCS } from '@mysten/bcs';
 import { Protocol, FnCallType, TxbObject, ResourceAddress, PermissionObject} from './protocol';
 import { IsValidDesription, IsValidAddress, IsValidName, IsValidArray,  } from './utils';
 import { ERROR, Errors } from './exception';