wowok_agent 1.2.45 → 1.3.47

package/src/call/demand.ts

@@ -1,26 +1,30 @@
-import { TransactionBlock, IsValidArgType, IsValidCoinType, Resource, ResourceObject } from 'wowok';
-import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, 
+import { TransactionBlock, IsValidArgType, Service, PassportObject, Errors, ERROR, Permission, PermissionIndex, 
     PermissionIndexType, Demand, } from 'wowok';
-import { query_objects, ObjectDemand } from '../query/objects.js';
-import { CallBase, CallResult, Namedbject } from "./base.js";
+import { ObjectDemand, query_objects } from '../query/objects.js';
+import { CallBase, CallResult, GetObjectExisted, GetObjectMain, GetObjectParam, ObjectTypedMain, TypeNamedObjectWithPermission } from "./base.js";
 import { Account } from '../local/account.js';
 import { LocalMark } from '../local/local.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallDemand_Data {
-    type_parameter: string;
-    object?: {address:string} | {namedNew?: Namedbject}; // undefined or {named_new...} for creating a new object
-    permission?: {address:string} | {namedNew?: Namedbject, description?:string}; 
+    object: ObjectTypedMain;
+    // service to present.  
+    // If Demand.guard.service_id_in_guard is set, the service address must be provided as the service_id_in_guard identifier while Guard verification is performed.
+    // Otherwise, the service address is used to present the service to the Demand.
+    present?: {service?: string; recommend_words:string;}; 
+
     description?: string;
     time_expire?: {op: 'duration'; minutes:number} | {op:'time'; time:number};
     bounty?: {op:'add'; object:{address:string}|{balance:string|number}} | {op:'reward'; service:string} | {op:'refund'} ;
-    present?: {service: string | number; recommend_words:string; service_pay_type:string, guard?:string}; // guard is the present guard of Demand
+    // If service_id_in_guard is set, the service address must be provided as the service_id_in_guard identifier while Guard verification is performed.
     guard?: {address:string; service_id_in_guard?:number};
 }
 
 export class CallDemand extends CallBase {
     data: CallDemand_Data; 
-    content: ObjectDemand | undefined = undefined;
+    object_address: string | undefined = undefined;
+    permission_address: string | undefined = undefined;
+    type_parameter: string | undefined = undefined;
 
     constructor(data: CallDemand_Data) {
         super();
@@ -29,105 +33,102 @@ export class CallDemand extends CallBase {
     async call(account?:string) : Promise<CallResult> {
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = []; 
-        var [permission_address, object_address] = 
-            await LocalMark.Instance().get_many_address(
-                [(this.data?.permission as any)?.address, 
-                (this.data?.object as any)?.address]);
-
-        if (object_address) {
-            if (!this.data.type_parameter || !permission_address) {
-                await this.update_content(object_address, 'Demand');
-                if (this.content) {
-                    permission_address = (this.content as ObjectDemand).permission;     
-                    this.data.type_parameter =  this.content.type_raw!;             
-                }
-            } 
+        this.object_address = (await LocalMark.Instance().get_address(GetObjectExisted(this.data.object)));
+        if (this.object_address) {
+            await this.update_content('Demand', this.object_address);
+            if (!this.content) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.object:' + this.object_address);
+            this.permission_address = (this.content as ObjectDemand).permission;
+            this.type_parameter = Demand.parseObjectType(this.content.type_raw);
         } else {
-            if (!this.data?.type_parameter || !IsValidArgType(this.data.type_parameter)) {
-                ERROR(Errors.IsValidArgType, 'CallDemand_Data.data.type_parameter')
-            }
-        }
+            const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
+            if (!n?.type_parameter || !IsValidArgType(n.type_parameter)) {
+                ERROR(Errors.IsValidArgType, 'CallDemand_Data.data.object.type_parameter');
+            }          
+            this.permission_address = (await LocalMark.Instance().get_address(GetObjectExisted(n?.permission)));
+            this.type_parameter = n.type_parameter;
+        } 
 
-        if (permission_address) {
+        if (this.permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.demand)
             }
-            if (this.data?.description !== undefined && object_address) {
+            if (this.data?.description !== undefined && this.object_address) {
                 perms.push(PermissionIndex.demand_description)
             }
-            if (this.data?.time_expire !== undefined && object_address) {
+            if (this.data?.time_expire !== undefined && this.object_address) {
                 perms.push(PermissionIndex.demand_expand_time)
             }
-            if (this.data?.guard !== undefined) {
-                perms.push(PermissionIndex.demand_guard)
-            }
             if (this.data?.bounty?.op === 'reward') {
                 perms.push(PermissionIndex.demand_yes)
             }
             if (this.data?.bounty?.op === 'refund') {
                 perms.push(PermissionIndex.demand_refund)
             }
-            if (this.data?.present?.guard !== undefined) {
-                if (this.data.present.guard) {
-                    const guard = await LocalMark.Instance().get_address(this.data.present.guard)
+            if (this.data?.guard !== undefined) {
+                perms.push(PermissionIndex.demand_guard)
+            }
+            if (this.data?.present !== undefined) {
+                if (this.object_address) {
+                    if ((this.content as ObjectDemand)?.guard?.object) {
+                        guards.push((this.content as ObjectDemand).guard?.object!);
+                    }
+                } /*else {
+                    const guard = await LocalMark.Instance().get_address(this.data?.guard?.address);
                     if (guard) {
                         guards.push(guard)
-                    } 
-                } else {
-                    if (!object_address) { // new
-                        const guard =  await LocalMark.Instance().get_address(this.data?.guard?.address);
-                        if (guard) {
-                            guards.push(guard)
-                        }
-                    } else {
-                        await this.update_content(object_address, 'Demand');
- 
-                        if ((this.content as ObjectDemand)?.guard?.object) {
-                            guards.push((this.content as ObjectDemand).guard?.object!)
-                        }  
                     }
-                }
+                }*/
             }
-            return await this.check_permission_and_call(permission_address, perms, guards, checkOwner, undefined, account)
+            return await this.check_permission_and_call(this.permission_address, perms, guards, checkOwner, undefined, account)
         }
         return await this.exec(account);
     }
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Demand | undefined ; let permission: any;
-        var [permission_address, object_address] = this?.content ? 
-            [(this.content as ObjectDemand).permission, this.content.object] : 
-            await LocalMark.Instance().get_many_address(
-                [(this.data?.permission as any)?.address, 
-                (this.data?.object as any)?.address]);
 
-        if (!object_address) {
-            if (!permission_address) {
-                const d = (this.data?.permission as any)?.description ?? '';
-                permission = Permission.New(txb, d);
+        if (this.object_address) {
+            obj = Demand.From(txb, this.type_parameter!, this.permission_address!, this.object_address)
+        } else {
+            const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
+            if (!this.permission_address) {
+                permission = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
             }
             
             if (this.data.time_expire !== undefined) {
-                obj = Demand.New(txb, this.data.type_parameter!, this.data.time_expire?.op === 'duration' ? true : false, 
+                obj = Demand.New(txb, this.type_parameter!, this.data.time_expire?.op === 'duration' ? true : false, 
                     this.data.time_expire?.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire?.time,
-                    permission ? permission.get_object(): permission_address, this.data?.description??'', permission?undefined:passport)
-            } else {
-                obj = Demand.New(txb, this.data.type_parameter!, true, 30*24*60, // 30days default
-                    permission ? permission.get_object(): permission_address, this.data?.description??'', permission?undefined:passport)       
-            }
-        } else {
-            if (this.data.type_parameter && permission_address) {
-                obj = Demand.From(txb, this.data.type_parameter, permission_address, object_address)
+                    permission ? permission.get_object(): this.permission_address, this.data?.description??'', permission?undefined:passport)
             } else {
-                ERROR(Errors.InvalidParam, 'CallDemand_Data.data.type_parameter or permission')
+                obj = Demand.New(txb, this.type_parameter!, true, 30*24*60, // 30days default
+                    permission ? permission.get_object(): this.permission_address, this.data?.description??'', permission?undefined:passport)       
             }
         }
 
         if (obj) {
             const pst = permission?undefined:passport;
-            if (this.data?.description !== undefined && object_address) {
+            if (this.data?.present !== undefined) {
+                if ((this.content as ObjectDemand)?.guard?.service_id_in_guard !== undefined && (this.content as ObjectDemand)?.guard?.service_id_in_guard !== null) {
+                    obj?.present((this.content as ObjectDemand)!.guard!.service_id_in_guard!, undefined, this.data.present.recommend_words, pst);
+                } else {
+                    const service_address = await LocalMark.Instance().get_address(this.data.present.service);
+                    if (!service_address) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service');
+                    const r = await query_objects({objects:[service_address]});
+                    if (r?.objects?.length !== 1 || r?.objects[0]?.type !== 'Service') {
+                        ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
+                    }
+                    const service_type = Service.parseOrderObjectType(r.objects[0].type_raw);
+                    if (!service_type) {
+                        ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
+                    }
+
+                    obj?.present(service_address, service_type, this.data.present.recommend_words, pst);
+                }
+            }
+
+            if (this.data?.description !== undefined && this.object_address) {
                 obj?.set_description(this.data.description, pst);
             }
-            if (this.data?.time_expire !== undefined && object_address) {
+            if (this.data?.time_expire !== undefined && this.object_address) {
                 obj?.expand_time(this.data.time_expire.op === 'duration' ? true : false, 
                     this.data.time_expire.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire.time, pst)
             }
@@ -135,12 +136,9 @@ export class CallDemand extends CallBase {
                 if (this.data.bounty.op === 'add') {
                     const bounty = await LocalMark.Instance().get_address((this.data.bounty.object as any)?.address)
                     if (bounty) {
-                        obj.deposit((this.data.bounty.object as any)?.address)
+                        obj.deposit(bounty)
                     } else if ((this.data.bounty.object as any)?.balance !== undefined){
-                        if (!IsValidCoinType(this.data.type_parameter)) {
-                            ERROR(Errors.IsValidCoinType, 'CallDemand_Data.data.type_parameter')
-                        }
-                        const r = await Account.Instance().get_coin_object(txb, (this.data.bounty.object as any)?.balance, account, this.data.type_parameter);
+                        const r = await Account.Instance().get_coin_object(txb, (this.data.bounty.object as any)?.balance, account, this.type_parameter);
                         if (r) obj.deposit(r)
                     }
                 } else if (this.data.bounty.op === 'reward') {
@@ -151,14 +149,6 @@ export class CallDemand extends CallBase {
                     obj?.refund(pst);
                 } 
             }
-            if (this.data?.present !== undefined) {
-                //@ demand guard and its pst, if set
-                const service = typeof(this.data.present.service) === 'string' ? (await LocalMark.Instance().get_address(this.data.present.service)): this.data.present.service;
-                if (service === undefined) {
-                    ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service')
-                }
-                obj?.present(typeof(this.data.present.service) === 'string' ? service : this.data.present.service, this.data.present.service_pay_type, this.data.present.recommend_words, pst);
-            }
             
             if (this.data?.guard !== undefined) {
                 const guard = await LocalMark.Instance().get_address(this.data?.guard.address);
@@ -168,10 +158,11 @@ export class CallDemand extends CallBase {
                 obj?.set_guard(guard, this.data.guard?.service_id_in_guard ?? undefined, pst);
             }
             if (permission) {
-                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
+                await this.new_with_mark('Permission', txb, permission.launch(), GetObjectParam(n?.permission), account);
             }
             if (!this.data.object) {
-                await this.new_with_mark('Demand', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Demand', txb, obj.launch(), GetObjectMain(this.data?.object), account);
             }
         }
     }

package/src/call/machine.ts

@@ -1,16 +1,22 @@
-import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, TransactionBlock, TxbAddress,
+import { PassportObject, 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.js";
-import { Account } from '../local/account.js';
+import { CallBase, CallResult, GetObjectExisted, GetObjectMain, GetObjectParam, Namedbject, ObjectMain, TypeNamedObjectWithPermission } from "./base.js";
 import { ObjectMachine } from '../query/objects.js';
 import { LocalMark } from '../local/local.js';
+import { Account } from '../local/account.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallMachine_Data {
-    object?: {address:string} | {namedNew?: Namedbject}; // undefined or {named_new...} for creating a new object
-    permission?: {address:string} | {namedNew?: Namedbject, description?:string}; 
+    object?: ObjectMain;
+    progress_new?: {task_address?:string, namedNew?: Namedbject};
+    progress_context_repository?: {progress?:string; repository?:string};
+    progress_namedOperator?: {progress?:string; data:{name:string, operators:string[]}[]};
+    progress_parent?: {progress?:string, parent?:ParentProgress};
+    progress_hold?: {progress?:string; operation:ProgressNext; bHold:boolean; adminUnhold?:boolean};
+    progress_task?: {progress:string; task_address:string};
+    progress_next?: {progress:string; operation:ProgressNext; deliverable:Deliverable};
+
     description?: string;
     endpoint?: string;
     consensus_repository?: {op:'set' | 'add' | 'remove' ; repositories:string[]} | {op:'removeall'};
@@ -20,18 +26,14 @@ export interface CallMachine_Data {
     | {op:'add forward'; data: {prior_node_name:string; node_name:string; forward:Machine_Forward; threshold?:number; remove_forward?:string}[]}
     | {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, operators:string[]}[]};
-    progress_parent?: {progress?:string, parent?:ParentProgress};
-    progress_task?: {progress?:string; task:string};
-    progress_hold?: {progress?:string; operation:ProgressNext; bHold:boolean; adminUnhold?:boolean};
-    progress_next?: {progress:string; operation:ProgressNext; deliverable:Deliverable; guard?:string};
     bPaused?: boolean;
     clone_new?: {namedNew?: Namedbject/*, description?:string*/};
 }
 export class CallMachine extends CallBase { //@ todo self-owned node operate
     data: CallMachine_Data;
+    object_address: string | undefined = undefined;
+    permission_address: string | undefined = undefined;
+
     constructor(data:CallMachine_Data) {
         super();
         this.data = data;
@@ -39,28 +41,24 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
     async call(account?:string) : Promise<CallResult>  {
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = []; 
-        var [permission_address, object_address] = 
-            await LocalMark.Instance().get_many_address(
-                [(this.data?.permission as any)?.address, 
-                (this.data?.object as any)?.address]);
-
-        if (object_address) {
-            if (!permission_address) {
-                await this.update_content(object_address, 'Machine');
-                if (this.content) {
-                    permission_address = (this.content as ObjectMachine).permission;     
-                }
-            } 
+        this.object_address = (await LocalMark.Instance().get_address(GetObjectExisted(this.data?.object)));
+        if (this.object_address) {
+            await this.update_content('Machine', this.object_address);
+            if (!this.content) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.object:' + this.object_address);
+            this.permission_address = (this.content as ObjectMachine).permission;
+        } else {
+            const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission; 
+            this.permission_address = (await LocalMark.Instance().get_address(GetObjectExisted(n?.permission)));
         } 
 
-        if (permission_address) {
+        if (this.permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.machine)
             }
-            if (this.data?.description !== undefined && object_address) {
+            if (this.data?.description !== undefined && this.object_address) {
                 perms.push(PermissionIndex.machine_description)
             }
-            if (this.data?.endpoint !== undefined && object_address) {
+            if (this.data?.endpoint !== undefined && this.object_address) {
                 perms.push(PermissionIndex.machine_endpoint)
             }
             if (this.data?.consensus_repository !== undefined) {
@@ -95,115 +93,53 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (this.data?.bPaused !== undefined) {
                 perms.push(PermissionIndex.machine_pause)
             }
+            if (this.data?.clone_new!== undefined) {
+                perms.push(PermissionIndex.machine_clone)
+            }
+
             if (this.data?.progress_next !== undefined) {
-                if (this.data?.progress_next?.guard) {
-                    const guard = await LocalMark.Instance().get_address(this.data?.progress_next?.guard);
+                if (this.object_address) { // fetch guard
+                    const [p, acc] = await Promise.all([
+                        LocalMark.Instance().get_address(this.data?.progress_next.progress), 
+                        Account.Instance().get(account)]);
+
+                    if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_next.progress');
+                    if (!acc) ERROR(Errors.InvalidParam, 'CallMachine_Data.account');
+  
+                    const guard = await Progress.QueryForwardGuard(p, this.object_address, acc.address, 
+                        this.data.progress_next.operation.next_node_name, this.data.progress_next.operation.forward);
                     if (guard) {
                         guards.push(guard);
-                    }                     
-                } else if (object_address) { // fetch guard
-                    const p = await LocalMark.Instance().get_address(this.data?.progress_next.progress);
-                    if (p) {
-                        const guard = await Progress.QueryForwardGuard(this.data?.progress_next.progress, object_address, 
-                            (await Account.Instance().default())?.address ?? '0xe386bb9e01b3528b75f3751ad8a1e418b207ad979fea364087deef5250a73d3f', 
-                            this.data.progress_next.operation.next_node_name, this.data.progress_next.operation.forward);
-                        if (guard) {
-                            guards.push(guard);
-                        }                        
-                    }
+                    }                        
                 }
             }
 
-            return await this.check_permission_and_call(permission_address, perms, guards, checkOwner, undefined, account)
+            return await this.check_permission_and_call(this.permission_address, perms, guards, checkOwner, undefined, account)
         }
         return await this.exec(account);
     }
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Machine | undefined ; let permission: any;
-        var [permission_address, object_address] = this?.content ? 
-            [(this.content as ObjectMachine).permission, this.content.object] : 
-            await LocalMark.Instance().get_many_address(
-                [(this.data?.permission as any)?.address, 
-                (this.data?.object as any)?.address]);
-
-        if (!object_address) {
-            if (!permission_address) {
-                const d = (this.data?.permission as any)?.description ?? '';
-                permission = Permission.New(txb, d);
-            }
-            obj = Machine.New(txb, permission ? permission.get_object() : permission_address, this.data?.description??'', this.data?.endpoint ?? '', permission?undefined:passport);
+        if (this.object_address) {
+            obj = Machine.From(txb, this.permission_address!, this.object_address);
         } else {
-            if (permission_address) {
-                obj = Machine.From(txb, permission_address, object_address)
-            } else {
-                ERROR(Errors.InvalidParam, 'CallMachine_Data.data.permission')
+            const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission;
+            if (!this.permission_address) {
+                permission = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
             }
+
+            obj = Machine.New(txb, permission ? permission.get_object() : this.permission_address, this.data?.description??'', 
+                this.data?.endpoint, permission?undefined:passport);
         }
 
         if (obj) {
-            const perm = permission ? permission.get_object() : permission_address;
             const pst = permission?undefined:passport;
+            const perm = permission ? permission.get_object() : this.permission_address;
 
-            if (this.data?.description !== undefined && object_address) {
-                obj?.set_description(this.data.description, pst);
-            }
-            if (this.data?.endpoint !== undefined && object_address) {
-                obj?.set_endpoint(this.data.endpoint, pst)
-            }
-
-            if (this.data?.consensus_repository !== undefined) {
-                switch (this.data.consensus_repository.op) {
-                    case 'add': 
-                    case 'set':
-                        if (this.data.consensus_repository.op === 'set') {
-                            obj?.remove_repository([], true, pst);
-                        }
-                        var reps = await LocalMark.Instance().get_many_address2(this.data.consensus_repository.repositories);
-                        reps.forEach(v=>obj?.add_repository(v, pst)) ;
-                        break;
-                    case 'remove': 
-                        var reps = await LocalMark.Instance().get_many_address2(this.data.consensus_repository.repositories);
-                        if (reps.length > 0) {
-                            obj?.remove_repository(reps, false, pst);
-                        }
-                        break;
-                    case 'removeall': 
-                        obj?.remove_repository([], true, pst);
-                        break;
-                }
-            }
-            if (this.data?.nodes !== undefined) {
-                switch (this.data?.nodes?.op) {
-                    case 'add':
-                        obj?.add_node(this.data.nodes.data, pst)
-                        break;
-                    case 'remove':
-                        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, pst));
-                        break;
-                    case 'add from myself':
-                        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.remove_forward, pst))
-                        break;
-                    case 'remove forward':
-                        this.data.nodes.data.forEach(v => obj?.remove_forward(v.prior_node_name, v.node_name, v.forward_name, pst))
-                        break;
-                    case 'remove pair':
-                        this.data.nodes.pairs.forEach(v => obj?.remove_pair(v.prior_node_name, v.node_name, pst));
-                        break;
-                    }
-            }
-            if (this.data?.bPublished ) {
-                obj?.publish(passport)
-            }
             var new_progress : Progress | undefined;
             if (this.data?.progress_new !== undefined) {
-                const task = await LocalMark.Instance().get_address(this.data?.progress_new.task_address);
+                const task = await LocalMark.Instance().get_address(this.data?.progress_new?.task_address);
                 new_progress = Progress?.New(txb, obj?.get_object(), perm, task, pst);
             }
             if (this.data?.progress_context_repository !== undefined) {
@@ -239,14 +175,6 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
                     Progress.From(txb, obj?.get_object(), perm, p!).parent_none();
                 }
             }
-            if (this.data?.progress_task !== undefined) {
-                const p = this.data?.progress_task.progress 
-                    ? await LocalMark.Instance().get_address(this.data?.progress_task.progress)
-                    : new_progress?.get_object();
-                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_task.progress');
-                const task = await LocalMark.Instance().get_address(this.data.progress_task.task);
-                if (task) Progress.From(txb, obj?.get_object(), perm, p!).bind_task(task, pst);
-            }
             if (this.data?.progress_hold !== undefined) {
                 const p = this.data?.progress_hold.progress 
                     ? await LocalMark.Instance().get_address(this.data?.progress_hold.progress)
@@ -259,11 +187,12 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
                     Progress.From(txb, obj?.get_object(), perm, p!).hold(this.data.progress_hold.operation, this.data.progress_hold.bHold)
                 }
             }            
-            
+            if (this.data?.progress_task !== undefined) {
+                const [p, task] = await LocalMark.Instance().get_many_address([this.data?.progress_task.progress, this.data?.progress_task.task_address]);
+                if (p && task) Progress.From(txb, obj?.get_object(), perm, p).bind_task(task, pst);
+            }
             if (this.data?.progress_next !== undefined) {
-                const p = this.data?.progress_next.progress 
-                    ? await LocalMark.Instance().get_address(this.data?.progress_next.progress)
-                    : new_progress?.get_object();
+                const p = await LocalMark.Instance().get_address(this.data?.progress_next.progress);
                 if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_next.progress');
                 Progress.From(txb, obj?.get_object(), perm, p!).next(this.data.progress_next.operation, this.data.progress_next.deliverable, pst)
             }
@@ -273,17 +202,75 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
                 await this.new_with_mark('Progress', txb, addr, this.data?.progress_new?.namedNew, account);
             }
 
+            if (this.data?.description !== undefined && this.object_address) {
+                obj?.set_description(this.data.description, pst);
+            }
+            if (this.data?.endpoint !== undefined && this.object_address) {
+                obj?.set_endpoint(this.data.endpoint, pst)
+            }
+
+            if (this.data?.consensus_repository !== undefined) {
+                switch (this.data.consensus_repository.op) {
+                    case 'add': 
+                    case 'set':
+                        if (this.data.consensus_repository.op === 'set') {
+                            obj?.remove_repository([], true, pst);
+                        }
+                        var reps = await LocalMark.Instance().get_many_address2(this.data.consensus_repository.repositories);
+                        reps.forEach(v=>obj?.add_repository(v, pst)) ;
+                        break;
+                    case 'remove': 
+                        var reps = await LocalMark.Instance().get_many_address2(this.data.consensus_repository.repositories);
+                        if (reps.length > 0) {
+                            obj?.remove_repository(reps, false, pst);
+                        }
+                        break;
+                    case 'removeall': 
+                        obj?.remove_repository([], true, pst);
+                        break;
+                }
+            }
+            if (this.data?.nodes !== undefined) {
+                switch (this.data?.nodes?.op) {
+                    case 'add':
+                        obj?.add_node(this.data.nodes.data, pst)
+                        break;
+                    case 'remove':
+                        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, pst));
+                        break;
+                    case 'add from myself':
+                        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.remove_forward, pst))
+                        break;
+                    case 'remove forward':
+                        this.data.nodes.data.forEach(v => obj?.remove_forward(v.prior_node_name, v.node_name, v.forward_name, pst))
+                        break;
+                    case 'remove pair':
+                        this.data.nodes.pairs.forEach(v => obj?.remove_pair(v.prior_node_name, v.node_name, pst));
+                        break;
+                    }
+            }
+            if (this.data?.bPublished ) {
+                obj?.publish(passport)
+            }
+
             if (this.data?.bPaused !== undefined) {
                 obj?.pause(this.data.bPaused, pst)
             }
-            if (this.data?.clone_new !== undefined && object_address) {
+            if (this.data?.clone_new !== undefined && this.object_address) {
                 await this.new_with_mark('Machine', txb, obj?.clone(true, pst) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
             }
             if (permission) {
-                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission;
+                await this.new_with_mark('Permission', txb, permission.launch(), GetObjectParam(n?.permission), account);
             }
-            if (!object_address) {
-                await this.new_with_mark('Machine', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+            if (!this.object_address) {
+                await this.new_with_mark('Machine', txb, obj.launch(), GetObjectMain(this.data?.object), account);
             }
         }
     }

package/src/call/object_permission.ts

@@ -1,5 +1,5 @@
 import { CallBase, CallResult } from "./base.js";
-import { TransactionBlock, PassportObject, IsValidAddress, Errors, ERROR,  Demand, Machine, Service, Treasury, Arbitration, Repository} from 'wowok';
+import { TransactionBlock, PassportObject, Errors, ERROR,  Demand, Machine, Service, Treasury, Arbitration, Repository} from 'wowok';
 import { ObjectArbitration, ObjectDemand, ObjectMachine, ObjectRepository, ObjectService, ObjectTreasury, query_objects } from "../query/objects.js";
 import { LocalMark } from "../local/local.js";