wowok_agent 0.1.13 → 0.1.16

package/src/call/machine.ts

@@ -1,5 +1,6 @@
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, TransactionBlock, TxbAddress,
     PermissionIndexType, Machine, Machine_Forward, Machine_Node,  Deliverable, ParentProgress, Progress, ProgressNext,
+    ProgressObject,
 } from 'wowok';
 import { CallBase, CallResult, Namedbject } from "./base";
 import { Account } from '../account';
@@ -18,11 +19,11 @@ export interface CallMachine_Data {
     | {op:'remove forward'; data:{prior_node_name:string; node_name:string; forward_name:string}[]}
     bPublished?: boolean;
     progress_new?: {task_address?:string; namedNew?: Namedbject};
-    progress_context_repository?: {progress:string; repository:string};
-    progress_namedOperator?: {progress:string; data:{name:string, operator:string[]}[]};
-    progress_parent?: {progress:string, parent?:ParentProgress};
-    progress_task?: {progress:string; task:string};
-    progress_hold?: {progress:string; data:ProgressNext; bHold:boolean; adminUnhold?:boolean};
+    progress_context_repository?: {progress?:string; repository:string};
+    progress_namedOperator?: {progress?:string; data:{name:string, operator:string[]}[]};
+    progress_parent?: {progress?:string, parent?:ParentProgress};
+    progress_task?: {progress?:string; task:string};
+    progress_hold?: {progress?:string; data:ProgressNext; bHold:boolean; adminUnhold?:boolean};
     progress_next?: {progress:string; data:ProgressNext; deliverable:Deliverable; guard?:string | 'fetch'};
     bPaused?: boolean;
     clone_new?: {namedNew: Namedbject/*, description?:string*/};
@@ -86,7 +87,7 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
                     guards.push(this.data?.progress_next?.guard)
                 } else if (this.data?.object && IsValidAddress(object_address)) { // fetch guard
                     const guard = await Progress.QueryForwardGuard(this.data?.progress_next.progress, object_address, 
-                        Account.Instance().get_address() ?? '0xe386bb9e01b3528b75f3751ad8a1e418b207ad979fea364087deef5250a73d3f', 
+                        await Account.Instance().get_address() ?? '0xe386bb9e01b3528b75f3751ad8a1e418b207ad979fea364087deef5250a73d3f', 
                         this.data.progress_next.data.next_node_name, this.data.progress_next.data.forward);
                     if (guard) {
                         guards.push(guard)
@@ -119,94 +120,114 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
         }
 
         if (obj) {
+            const perm = permission ? permission.get_object() : permission_address;
+            const pst = permission?undefined:passport;
+
             if (this.data?.description !== undefined && object_address) {
-                obj?.set_description(this.data.description, passport);
+                obj?.set_description(this.data.description, pst);
             }
             if (this.data?.endpoint !== undefined && object_address) {
-                obj?.set_endpoint(this.data.endpoint, passport)
+                obj?.set_endpoint(this.data.endpoint, pst)
             }
 
             if (this.data?.consensus_repository !== undefined) {
                 switch (this.data.consensus_repository.op) {
                     case 'add': 
-                        this.data.consensus_repository.repositories.forEach(v=>obj?.add_repository(v, passport)) ;
+                        this.data.consensus_repository.repositories.forEach(v=>obj?.add_repository(v, pst)) ;
                         break;
                     case 'remove': 
-                        obj?.remove_repository(this.data.consensus_repository.repositories, false, passport);
+                        obj?.remove_repository(this.data.consensus_repository.repositories, false, pst);
                         break;
                     case 'removeall': 
-                        obj?.remove_repository([], true, passport);
+                        obj?.remove_repository([], true, pst);
                         break;
                     case 'set':
-                        obj?.remove_repository([], true, passport);
-                        this.data.consensus_repository.repositories.forEach(v=>obj?.add_repository(v, passport)) ;
+                        obj?.remove_repository([], true, pst);
+                        this.data.consensus_repository.repositories.forEach(v=>obj?.add_repository(v, pst)) ;
                         break;
                 }
             }
             if (this.data?.nodes !== undefined) {
                 switch (this.data?.nodes?.op) {
                     case 'add':
-                        obj?.add_node(this.data.nodes.data, passport)
+                        obj?.add_node(this.data.nodes.data, pst)
                         break;
                     case 'remove':
-                        obj?.remove_node(this.data.nodes.names, this.data.nodes?.bTransferMyself, passport)
+                        obj?.remove_node(this.data.nodes.names, this.data.nodes?.bTransferMyself, pst)
                         break;
                     case 'rename node':
-                        this.data.nodes.data.forEach(v => obj?.rename_node(v.old, v.new, passport));
+                        this.data.nodes.data.forEach(v => obj?.rename_node(v.old, v.new, pst));
                         break;
                     case 'add from myself':
-                        obj?.add_node2(this.data.nodes.addresses, passport);
+                        obj?.add_node2(this.data.nodes.addresses, pst);
                         break;
                     case 'add forward':
-                        this.data.nodes.data.forEach(v => obj?.add_forward(v.prior_node_name, v.node_name, v.forward, v.threshold, v.old_need_remove, passport))
+                        this.data.nodes.data.forEach(v => obj?.add_forward(v.prior_node_name, v.node_name, v.forward, v.threshold, v.old_need_remove, pst))
                         break;
                     case 'remove forward':
-                        this.data.nodes.data.forEach(v => obj?.remove_forward(v.prior_node_name, v.node_name, v.forward_name, passport))
+                        this.data.nodes.data.forEach(v => obj?.remove_forward(v.prior_node_name, v.node_name, v.forward_name, pst))
                         break;
                     }
             }
             if (this.data?.bPublished ) {
                 obj?.publish(passport)
             }
+            var new_progress : Progress | undefined;
             if (this.data?.progress_new !== undefined) {
-                const addr = Progress?.New(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_new.task_address, passport).launch();
-                if (addr) {
-                    await this.new_with_mark(txb, addr, this.data?.progress_new?.namedNew, account);
-                }
+                new_progress = Progress?.New(txb, obj?.get_object(), perm, this.data?.progress_new.task_address, pst);
             }
             if (this.data?.progress_context_repository !== undefined) {
-                Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_context_repository.progress)
-                    .set_context_repository(this.data?.progress_context_repository.repository, passport)
+                const p = this.data?.progress_context_repository.progress ?? new_progress?.get_object();
+                if (!p) ERROR(Errors.Fail, 'progress invalid: progress_context_repository');
+
+                Progress.From(txb, obj?.get_object(), perm, p!).set_context_repository(this.data?.progress_context_repository.repository, pst)
             }
             if (this.data?.progress_namedOperator !== undefined) {
-                const p = Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_namedOperator.progress);
-                this.data.progress_namedOperator.data.forEach(v => p.set_namedOperator(v.name, v.operator, passport));
+                const p = this.data?.progress_namedOperator.progress ?? new_progress?.get_object();
+                if (!p) ERROR(Errors.Fail, 'progress invalid: progress_namedOperator');
+
+                let pp = Progress.From(txb, obj?.get_object(), perm, p!);
+                this.data.progress_namedOperator.data.forEach(v => pp.set_namedOperator(v.name, v.operator, pst));
             }
             if (this.data?.progress_parent !== undefined) {
+                const p = this.data?.progress_parent.progress ?? new_progress?.get_object();
+                if (!p) ERROR(Errors.Fail, 'progress invalid: progress_parent');
+
                 if (this.data.progress_parent.parent) {
-                    Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_parent.progress).parent(this.data.progress_parent.parent);
+                    Progress.From(txb, obj?.get_object(), perm, p!).parent(this.data.progress_parent.parent);
                 } else {
-                    Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_parent.progress).parent_none();
+                    Progress.From(txb, obj?.get_object(), perm, p!).parent_none();
                 }
             }
             if (this.data?.progress_task !== undefined) {
-                Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_task.progress).bind_task(this.data.progress_task.task, passport)
+                const p = this.data?.progress_task.progress ?? new_progress?.get_object();
+                if (!p) ERROR(Errors.Fail, 'progress invalid: progress_task');
+
+                Progress.From(txb, obj?.get_object(), perm, p!).bind_task(this.data.progress_task.task, pst)
             }
             if (this.data?.progress_hold !== undefined) {
+                const p = this.data?.progress_hold.progress ?? new_progress?.get_object();
+                if (!p) ERROR(Errors.Fail, 'progress invalid: progress_hold');
+
                 if (this.data?.progress_hold.adminUnhold) {
-                    Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_hold.progress).unhold(this.data.progress_hold.data, passport)
+                    Progress.From(txb, obj?.get_object(), perm, p!).unhold(this.data.progress_hold.data, pst)
                 } else {
-                    Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_hold.progress).hold(this.data.progress_hold.data, this.data.progress_hold.bHold)
+                    Progress.From(txb, obj?.get_object(), perm, p!).hold(this.data.progress_hold.data, this.data.progress_hold.bHold)
                 }
             }
+            const addr = new_progress?.launch();
+            if (addr) {
+                await this.new_with_mark(txb, addr, this.data?.progress_new?.namedNew, account);
+            }
+
             if (this.data?.progress_next !== undefined) {
-                Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_next.progress).next(this.data.progress_next.data, this.data.progress_next.deliverable, passport)
+                Progress.From(txb, obj?.get_object(), perm, this.data?.progress_next.progress).next(this.data.progress_next.data, this.data.progress_next.deliverable, pst)
             }
             if (this.data?.bPaused !== undefined) {
-                obj?.pause(this.data.bPaused, passport)
+                obj?.pause(this.data.bPaused, pst)
             }
             if (this.data?.clone_new !== undefined && obj) {
-                await this.new_with_mark(txb, obj?.clone(true, passport) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj?.clone(true, pst) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
             }
             if (permission) {
                 await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);

package/src/call/repository.ts

@@ -1,10 +1,11 @@
-import { TransactionBlock, CallResponse, Resource, ResourceObject} from 'wowok';
+import { TransactionBlock } from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, PermissionIndexType, Repository,
     Repository_Policy, Repository_Policy_Data, Repository_Policy_Data2, Repository_Policy_Data_Remove,
-    Repository_Policy_Mode, WitnessFill
+    Repository_Policy_Mode, 
 } from 'wowok';
 import { CallBase, CallResult, Namedbject} from "./base";
 
+
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallRepository_Data {
     object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
@@ -70,47 +71,48 @@ export class CallRepository extends CallBase {
         }
 
         if (obj) {
+            const pst = permission?undefined:passport;
             if (this.data?.description !== undefined && object_address) {
-                obj?.set_description(this.data.description, passport);
+                obj?.set_description(this.data.description, pst);
             }
             if (this.data?.reference !== undefined) {
                 switch (this.data.reference.op) {
                     case 'set':
-                        obj?.remove_reference([], true, passport);
-                        obj?.add_reference(this.data.reference.addresses, passport);
+                        obj?.remove_reference([], true, pst);
+                        obj?.add_reference(this.data.reference.addresses, pst);
                         break;
                     case 'add':
-                        obj?.add_reference(this.data.reference.addresses, passport);
+                        obj?.add_reference(this.data.reference.addresses, pst);
                         break;
                     case 'remove':
-                        obj?.remove_reference(this.data.reference.addresses, false, passport);
+                        obj?.remove_reference(this.data.reference.addresses, false, pst);
                         break;
                     case 'removeall':
-                        obj?.remove_reference([], true, passport);
+                        obj?.remove_reference([], true, pst);
                         break;
                 }
             }
             if (this.data?.mode !== undefined && object_address) { //@ priority??
-                obj?.set_policy_mode(this.data.mode, passport)
+                obj?.set_policy_mode(this.data.mode, pst)
             }
             if (this.data?.policy !== undefined) {
                 switch(this.data.policy.op) {
                     case 'set':
-                        obj?.remove_policies([], true, passport);
-                        obj?.add_policies(this.data.policy.data, passport);
+                        obj?.remove_policies([], true, pst);
+                        obj?.add_policies(this.data.policy.data, pst);
                         break;
                     case 'add':
-                        obj?.add_policies(this.data.policy.data, passport);
+                        obj?.add_policies(this.data.policy.data, pst);
                         break;
                     case 'remove':
-                        obj?.remove_policies(this.data.policy.data, false, passport);
+                        obj?.remove_policies(this.data.policy.data, false, pst);
                         break;
                     case 'removeall':
-                        obj?.remove_policies([], true, passport);
+                        obj?.remove_policies([], true, pst);
                         break;
                     case 'rename':
                         this.data.policy.data.forEach((v) => {
-                            obj?.rename_policy(v.old, v.new, passport);
+                            obj?.rename_policy(v.old, v.new, pst);
                         })
                         break;
                 }

package/src/call/service.ts

@@ -1,6 +1,8 @@
 import { TransactionBlock, IsValidArgType, TxbAddress, TagName,  PassportObject, IsValidAddress, Errors, ERROR, Permission, 
     PermissionIndex, PermissionIndexType,  BuyRequiredEnum, Customer_RequiredInfo, DicountDispatch, Service, Service_Buy, 
-    Service_Guard_Percent, Service_Sale, WithdrawPayee, Treasury, 
+    Service_Guard_Percent, Service_Sale, WithdrawPayee, Treasury,
+    OrderObject,
+    OrderResult, 
 } from 'wowok';
 import { query_objects, ObjectService } from '../objects';
 import { CallBase, CallResult, Namedbject } from "./base";
@@ -28,12 +30,13 @@ export interface CallService_Data {
     refund_guard?: {op:'add' | 'set'; guards:Service_Guard_Percent[]} 
         | {op:'removeall'} | {op:'remove', addresses:string[]};
     bPublished?: boolean;
-    order_new?: {buy_items:Service_Buy[], discount?:string, machine?:string, customer_info_crypto?: Customer_RequiredInfo, guard?:string | 'fetch', namedNew?: Namedbject}
-    order_agent?: {order:string; agents: string[]; progress?:string};
-    order_required_info?: {order:string; info:Customer_RequiredInfo};
-    order_refund?: {order:string; guard?:string;} | {order:string; arb:string; arb_token_type:string}; // guard address
-    order_withdrawl?: {order:string; data:WithdrawPayee}; // guard address
-    order_payer?: {order:string; payer_new: string}; // transfer the order payer permission to someaddress
+    order_new?: {buy_items:Service_Buy[], discount?:string, machine?:string, customer_info_crypto?: Customer_RequiredInfo, guard?:string | 'fetch', 
+        namedNewOrder?: Namedbject, namedNewProgress?:Namedbject}
+    order_agent?: {order?:string; agents: string[]; progress?:string};
+    order_required_info?: {order?:string; info:Customer_RequiredInfo};
+    order_refund?: {order?:string; guard?:string;} | {order?:string; arb:string; arb_token_type:string}; // guard address
+    order_withdrawl?: {order?:string; data:WithdrawPayee}; // guard address
+    order_payer?: {order?:string; payer_new:string; progress?:string}; // transfer the order payer permission to someaddress
     buy_guard?: string;
     bPaused?: boolean;
     clone_new?: {token_type_new?:string; namedNew?: Namedbject};
@@ -173,126 +176,130 @@ export class CallService extends CallBase {
         }
 
         if (obj) {
+            //const perm = permission ? permission.get_object() : permission_address;
+            const pst = permission?undefined:passport;
+
             if (this.data?.description !== undefined && object_address) {
-                obj?.set_description(this.data.description, passport);
+                obj?.set_description(this.data.description, pst);
             }
             if (this.data?.endpoint !== undefined) {
-                obj?.set_endpoint(this.data.endpoint, passport)
+                obj?.set_endpoint(this.data.endpoint, pst)
             }
             if (this.data?.payee_treasury !== undefined && object_address) {
-                obj?.set_payee(treasury_address, passport);
+                obj?.set_payee(treasury_address, pst);
             }
             if (this.data?.gen_discount !== undefined) {
-                obj?.discount_transfer(this.data.gen_discount, passport)
+                obj?.discount_transfer(this.data.gen_discount, pst)
             }
             if (this.data?.repository !== undefined) {
                 switch (this.data.repository.op) {
                     case 'add':
-                        this.data.repository.repositories.forEach(v => obj?.add_repository(v, passport))
+                        this.data.repository.repositories.forEach(v => obj?.add_repository(v, pst))
                         break;
                     case 'remove':
-                        obj?.remove_repository(this.data.repository.repositories, false, passport)
+                        obj?.remove_repository(this.data.repository.repositories, false, pst)
                         break;
                     case 'set':
-                        obj?.remove_repository([], true, passport)
-                        this.data.repository.repositories.forEach(v => obj?.add_repository(v, passport))
+                        obj?.remove_repository([], true, pst)
+                        this.data.repository.repositories.forEach(v => obj?.add_repository(v, pst))
                         break;
                     case 'removeall':
-                        obj?.remove_repository([], true, passport)
+                        obj?.remove_repository([], true, pst)
                         break;
                 }
             }
             if (this.data?.extern_withdraw_treasury !== undefined) {
                 switch(this.data.extern_withdraw_treasury.op) {
                     case 'add':
-                        this.data.extern_withdraw_treasury.treasuries.forEach(v=>obj?.add_treasury(v.token_type, v.address, passport))
+                        this.data.extern_withdraw_treasury.treasuries.forEach(v=>obj?.add_treasury(v.token_type, v.address, pst))
                         break;
                     case 'set':
-                        obj?.remove_treasury([], true, passport)
-                        this.data.extern_withdraw_treasury.treasuries.forEach(v=>obj?.add_treasury(v.token_type, v.address, passport))
+                        obj?.remove_treasury([], true, pst)
+                        this.data.extern_withdraw_treasury.treasuries.forEach(v=>obj?.add_treasury(v.token_type, v.address, pst))
                         break;
                     case 'remove':
-                        obj?.remove_treasury(this.data.extern_withdraw_treasury.addresses, false, passport)
+                        obj?.remove_treasury(this.data.extern_withdraw_treasury.addresses, false, pst)
                         break;
                     case 'removeall':
-                        obj?.remove_treasury([], false, passport)
+                        obj?.remove_treasury([], false, pst)
                         break;
                 }
             }
             if (this.data?.machine !== undefined) {
-                obj?.set_machine(this.data.machine, passport)
+                obj?.set_machine(this.data.machine, pst)
             }
             if (this.data?.arbitration !== undefined) {
                 switch(this.data.arbitration.op) {
                     case 'add':
-                        this.data.arbitration.arbitrations.forEach(v=>obj?.add_arbitration(v.address, v.type_parameter, passport))
+                        this.data.arbitration.arbitrations.forEach(v=>obj?.add_arbitration(v.address, v.type_parameter, pst))
                         break;
                     case 'set':
-                        obj?.remove_arbitration([], true, passport)
-                        this.data.arbitration.arbitrations.forEach(v=>obj?.add_arbitration(v.address, v.type_parameter, passport))
+                        obj?.remove_arbitration([], true, pst)
+                        this.data.arbitration.arbitrations.forEach(v=>obj?.add_arbitration(v.address, v.type_parameter, pst))
                         break;
                     case 'remove':
-                        obj?.remove_arbitration(this.data.arbitration.addresses, false, passport)
+                        obj?.remove_arbitration(this.data.arbitration.addresses, false, pst)
                         break;
                     case 'removeall':
-                        obj?.remove_arbitration([], false, passport)
+                        obj?.remove_arbitration([], false, pst)
                         break;
                 }
             }
             if (this.data?.customer_required_info !== undefined) {
                 if (this.data.customer_required_info.required_info && this.data.customer_required_info.pubkey) {
-                    obj?.set_customer_required(this.data.customer_required_info.pubkey, this.data.customer_required_info.required_info, passport);
+                    obj?.set_customer_required(this.data.customer_required_info.pubkey, this.data.customer_required_info.required_info, pst);
                 } else if (this.data.customer_required_info.pubkey) {
-                    obj?.change_required_pubkey(this.data.customer_required_info.pubkey, passport);
+                    obj?.change_required_pubkey(this.data.customer_required_info.pubkey, pst);
                 }
             }
             if (this.data?.sales !== undefined) {
                 switch(this.data.sales.op) {
                     case 'add':
-                        obj?.add_sales(this.data.sales.sales, false, passport)
+                        obj?.add_sales(this.data.sales.sales, false, pst)
                         break;
                     case 'remove':
-                        obj?.remove_sales(this.data.sales.sales_name, passport)
+                        obj?.remove_sales(this.data.sales.sales_name, pst)
                         break;
                 }
             }
             if (this.data?.withdraw_guard !== undefined) {
                 switch(this.data.withdraw_guard.op) {
                     case 'add':
-                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, passport)
+                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, pst)
                         break;
                     case 'set':
-                        obj?.remove_withdraw_guards([], true, passport)
-                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, passport)
+                        obj?.remove_withdraw_guards([], true, pst)
+                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, pst)
                         break;
                     case 'remove':
-                        obj?.remove_withdraw_guards(this.data.withdraw_guard.addresses, false, passport)
+                        obj?.remove_withdraw_guards(this.data.withdraw_guard.addresses, false, pst)
                         break;
                     case 'removeall':
-                        obj?.remove_withdraw_guards([], true, passport)
+                        obj?.remove_withdraw_guards([], true, pst)
                         break;
                 }
             }
             if (this.data?.refund_guard !== undefined) {
                 switch(this.data.refund_guard.op) {
                     case 'add':
-                        obj?.add_refund_guards(this.data.refund_guard.guards, passport)
+                        obj?.add_refund_guards(this.data.refund_guard.guards, pst)
                         break;
                     case 'set':
-                        obj?.remove_refund_guards([], true, passport)
-                        obj?.add_refund_guards(this.data.refund_guard.guards, passport)
+                        obj?.remove_refund_guards([], true, pst)
+                        obj?.add_refund_guards(this.data.refund_guard.guards, pst)
                         break;
                     case 'remove':
-                        obj?.remove_refund_guards(this.data.refund_guard.addresses, false, passport)
+                        obj?.remove_refund_guards(this.data.refund_guard.addresses, false, pst)
                         break;
                     case 'removeall':
-                        obj?.remove_refund_guards([], true, passport)
+                        obj?.remove_refund_guards([], true, pst)
                         break;
                 }
             }
             if (this.data?.bPublished) {
-                obj?.publish(passport)
+                obj?.publish(pst)
             }
+            var order_new : OrderResult | undefined;
             if (this.data?.order_new !== undefined) {
                 let b = BigInt(0); let coin : any;
                 this.data.order_new.buy_items.forEach(v => {
@@ -302,39 +309,64 @@ export class CallService extends CallBase {
                     const coin = await Account.Instance().get_coin_object(txb, b, account, this.data.type_parameter);
                     if (coin) {
                         //@ crypto tools support
-                        const addr = obj.buy(this.data.order_new.buy_items, coin, this.data.order_new.discount, 
-                            this.data.order_new.machine, this.data.order_new.customer_info_crypto, passport) ;
-                        await this.new_with_mark(txb, addr, (this.data?.order_new as any)?.namedNew, account, [TagName.Launch, TagName.Order]);                   
+                        order_new = obj.order(this.data.order_new.buy_items, coin, this.data.order_new.discount, this.data.order_new.machine,
+                            this.data.order_new.customer_info_crypto, pst);
                     }                 
                 }
             }
+        
             if (this.data?.order_agent !== undefined) {
-                obj?.set_order_agent(this.data.order_agent.order, this.data.order_agent.agents, this.data.order_agent.progress)
+                const o = this.data.order_agent.order ?? order_new?.order;
+                if (!o) ERROR(Errors.Fail, 'order invalid: order_agent');
+
+                obj?.set_order_agent(o!, this.data.order_agent.agents, this.data.order_agent.progress)
             }
             if (this.data?.order_required_info !== undefined) {
-                obj?.update_order_required_info(this.data.order_required_info.order, this.data.order_required_info.info)
+                const o = this.data.order_required_info.order ?? order_new?.order;
+                if (!o) ERROR(Errors.Fail, 'order invalid: order_required_info');
+                
+                obj?.update_order_required_info(o!, this.data.order_required_info.info)
             }
             if (this.data?.order_refund !== undefined) {
+                const o = this.data.order_refund.order ?? order_new?.order;
+                if (!o) ERROR(Errors.Fail, 'order invalid: order_refund');
+
                 if ((this.data?.order_refund as any)?.arb && (this.data?.order_refund as any)?.arb_token_type) {
-                    obj?.refund_withArb(this.data.order_refund.order, (this.data?.order_refund as any)?.arb, (this.data?.order_refund as any)?.arb_token_type)
+                    obj?.refund_withArb(o!, (this.data?.order_refund as any)?.arb, (this.data?.order_refund as any)?.arb_token_type)
                 } else {
-                    obj?.refund(this.data.order_refund.order, (this.data?.order_refund as any)?.guard, passport)
+                    obj?.refund(o!, (this.data?.order_refund as any)?.guard, pst)
                 }
             }
-            if (this.data?.order_withdrawl !== undefined && passport) { //@ need withdrawal passport
-                obj?.withdraw(this.data.order_withdrawl.order, this.data.order_withdrawl.data, passport)
+            if (this.data?.order_withdrawl !== undefined && pst) { //@ need withdrawal pst
+                const o = this.data.order_withdrawl.order ?? order_new?.order;
+                if (!o) ERROR(Errors.Fail, 'order invalid: order_withdrawl');
+
+                obj?.withdraw(o!, this.data.order_withdrawl.data, pst)
             }
+
             if (this.data?.order_payer !== undefined && obj) {
-                obj?.change_order_payer(this.data?.order_payer.order, this.data.order_payer.payer_new)
+                const o = this.data.order_payer.order ?? order_new?.order;
+                if (!o) ERROR(Errors.Fail, 'order invalid: order_payer');
+
+                obj?.change_order_payer(o!, this.data.order_payer.payer_new, this.data.order_payer.progress)
             }
+
+            if (order_new && this?.data?.order_new) {
+                const buy = obj.order_launch(order_new);
+                await this.new_with_mark(txb, buy.order, (this.data?.order_new as any)?.namedNewOrder, account, [TagName.Launch, TagName.Order]); 
+                if (buy?.progress) { 
+                    await this.new_with_mark(txb, buy.progress, (this.data?.order_new as any)?.namedNewProgress, account, [TagName.Launch]);                  
+                }
+            }
+
             if (this.data?.buy_guard !== undefined) {
-                obj?.set_buy_guard(this.data.buy_guard, passport)
+                obj?.set_buy_guard(this.data.buy_guard, pst)
             }
             if (this.data?.bPaused !== undefined) {
-                obj?.pause(this.data.bPaused, passport)
+                obj?.pause(this.data.bPaused, pst)
             }
             if (this.data?.clone_new !== undefined && obj) {
-                await this.new_with_mark(txb, obj.clone(this.data.clone_new?.token_type_new, true, passport) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj.clone(this.data.clone_new?.token_type_new, true, pst) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
             }
             if (payee) {
                 await this.new_with_mark(txb, payee.launch(), (this.data?.payee_treasury as any)?.namedNew, account);

package/src/call/treasury.ts

@@ -120,8 +120,9 @@ export class CallTreasury extends CallBase {
         }
 
         if (obj) {
+            const pst = permission?undefined:passport;
             if (this.data?.description !== undefined && object_address) {
-                obj?.set_description(this.data.description, passport);
+                obj?.set_description(this.data.description, pst);
             }
             if (this.data.deposit !== undefined) {
                 const coin = await Account.Instance().get_coin_object(txb, this.data.deposit.data.balance, account, this.data.type_parameter);
@@ -134,34 +135,34 @@ export class CallTreasury extends CallBase {
                 }
             }
             if (this.data?.receive !== undefined) {
-                obj?.receive(this.data.receive.payment, this.data.receive.received_object, passport); 
+                obj?.receive(this.data.receive.payment, this.data.receive.received_object, pst); 
             }
             if (this.data?.withdraw !== undefined) {
-                obj?.withdraw(this.data.withdraw, passport)
+                obj?.withdraw(this.data.withdraw, pst)
             }
 
             if (this.data?.deposit_guard !== undefined) {
-                obj?.set_deposit_guard(this.data.deposit_guard, passport);
+                obj?.set_deposit_guard(this.data.deposit_guard, pst);
             }
             if (this.data?.withdraw_guard !== undefined) {
                 switch (this.data.withdraw_guard.op) {
                     case 'add':
-                        this.data.withdraw_guard.data.forEach(v => obj?.add_withdraw_guard(v.guard, BigInt(v.amount), passport))
+                        this.data.withdraw_guard.data.forEach(v => obj?.add_withdraw_guard(v.guard, BigInt(v.amount), pst))
                         break;
                     case 'remove':
-                        obj?.remove_withdraw_guard(this.data.withdraw_guard.guards, false, passport)
+                        obj?.remove_withdraw_guard(this.data.withdraw_guard.guards, false, pst)
                         break;
                     case 'set':
-                        obj?.remove_withdraw_guard([], true, passport)
-                        this.data.withdraw_guard.data.forEach(v => obj?.add_withdraw_guard(v.guard, BigInt(v.amount), passport))
+                        obj?.remove_withdraw_guard([], true, pst)
+                        this.data.withdraw_guard.data.forEach(v => obj?.add_withdraw_guard(v.guard, BigInt(v.amount), pst))
                         break;
                     case 'removeall':
-                        obj?.remove_withdraw_guard([], true, passport)
+                        obj?.remove_withdraw_guard([], true, pst)
                         break;
                 }
             }
             if (this.data?.withdraw_mode !== undefined) {
-                obj?.set_withdraw_mode(this.data.withdraw_mode, passport)
+                obj?.set_withdraw_mode(this.data.withdraw_mode, pst)
             }
             if (permission) {
                 await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);

package/src/call.ts

@@ -12,7 +12,7 @@ import { CallPersonal, CallPersonal_Data } from "./call/personal";
 import { CallRepository, CallRepository_Data } from "./call/repository";
 import { CallService, CallService_Data } from "./call/service";
 import { CallTreasury, CallTreasury_Data } from "./call/treasury";
-import { CallBase, CallResult, CallWithWitnessParam } from "./call/base";
+import { CallBase, CallResult, GuardInfo_forCall } from "./call/base";
 import { CallGuard, CallGuard_Data } from "./call/guard";
 import { CallObjectPermission, CallObjectPermission_Data } from "./call/object_permission";
 
@@ -23,7 +23,7 @@ export interface CallObject {
     type: CallObjectType;
     data: CallObjectData;
     account?: string;
-    witness?: CallWithWitnessParam;
+    witness?: GuardInfo_forCall;
 }
 
 export const call_object_json = async (json: string) : Promise<string> => {
@@ -40,7 +40,7 @@ export const call_object = async (call: CallObject) : Promise<CallResult> => {
 
     if (obj) {
         if (call.witness) {
-            return obj.call_with_witness(call.witness);
+            return obj.call_with_witness(call.witness, call.account);
         } else {
             return obj.call(call.account);
         }

package/src/index.ts

@@ -15,4 +15,4 @@ export * from './call/guard'
 export * from './call/personal'
 export * from './account'
 export * from './call'
-export * as WOWOK from 'wowok';
+export * as WOWOK from 'wowok'