wowok_agent 1.2.38 → 1.2.40

package/src/call/base.ts

@@ -5,7 +5,7 @@ import { Entity, Resource, TxbAddress, array_unique, TagName, ResourceObject, Pa
 } from 'wowok';
 import { query_permission } from '../query/permission.js';
 import { Account } from '../local/account.js';
-import { ObjectBase, ObjectBaseType, query_personal, raw2type} from '../query/objects.js';
+import { ObjectArbitration, ObjectBase, ObjectBaseType, query_objects, query_personal, raw2type} from '../query/objects.js';
 import { LocalMark } from '../local/local.js';
 
 export interface Namedbject {
@@ -50,6 +50,7 @@ export class CallBase {
     // operation implementation for a call
     private resouceObject:ResourceObject | undefined;
     private traceMarkNew = new Map<ObjectBaseType, Namedbject>();
+    content: ObjectBase | undefined = undefined;
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {};
     constructor () {}
@@ -128,13 +129,12 @@ export class CallBase {
 
     protected async new_with_mark(type:ObjectBaseType, txb:TransactionBlock, object:TxbAddress, named_new?:Namedbject, account?:string, innerTags:string[]=[TagName.Launch]) {
         const tags = named_new?.tags ? array_unique([...named_new.tags, ...innerTags]) : array_unique([...innerTags]);
-        if (!named_new?.onChain) {
-            if (named_new) {
-                named_new.tags = tags; 
-                this.traceMarkNew.set(type, named_new)
-            }
-            return ;
-        } ;
+        if (named_new) {
+            named_new.tags = tags; 
+            this.traceMarkNew.set(type, named_new)
+        }
+
+        if (!named_new?.onChain) return ;
 
         // onchain mark
         if (!this.resouceObject) {
@@ -154,7 +154,17 @@ export class CallBase {
         } else {
             Resource.From(txb, this.resouceObject).add(object, tags, named_new?.name);
         }
-    
+    }
+
+    protected async update_content(object:string, type:ObjectBaseType)  {
+        if (this.content)   return ;
+
+        const r = await query_objects({objects:[object]});
+        if (r?.objects?.length !== 1 || r?.objects[0]?.type !== type) {
+            ERROR(Errors.Fail, `Fetch ${type} object ${object} failed`)
+        }
+
+        this.content = r?.objects[0];
     }
 
     protected async sign_and_commit(txb: TransactionBlock, address?: string) : Promise<CallResponse> {
@@ -162,8 +172,8 @@ export class CallBase {
             Resource.From(txb, this.resouceObject).launch(); //@ resource launch, if created.
             this.resouceObject = undefined;
         }
-
-        const r = await Account.Instance().sign_and_commit(txb, address);
+        const addr = address !== undefined ? await LocalMark.Instance().get_address(address) : undefined;
+        const r = await Account.Instance().sign_and_commit(txb, addr);
         if (!r) {
             ERROR(Errors.Fail, 'sign and commit failed');
         }
@@ -175,7 +185,7 @@ export class CallBase {
                 const namedNew = this.traceMarkNew.get(v.type);
                 if (namedNew) {
                     LocalMark.Instance().put(namedNew.name, 
-                        {object:v.object, tags:namedNew?.tags}, 
+                        {object:v.object, tags:namedNew?.tags ? [...namedNew?.tags, v.type] : [v.type]}, 
                         namedNew?.useAddressIfNameExist);
                 }
             }

package/src/call/call.ts

@@ -18,53 +18,53 @@ import { CallObjectPermission, CallObjectPermission_Data } from "./object_permis
 
 export interface CallDemandObject {
     data: CallDemand_Data;
-    account?: string;
-    witness?: GuardInfo_forCall;
+    account?: string | null;
+    witness?: GuardInfo_forCall | null;
 }
 
 export interface CallServiceObject {
     data: CallService_Data;
-    account?: string;
-    witness?: GuardInfo_forCall;
+    account?: string | null;
+    witness?: GuardInfo_forCall | null;
 }
 export interface CallMachineObject {
     data: CallMachine_Data;
-    account?: string;
-    witness?: GuardInfo_forCall;
+    account?: string | null;
+    witness?: GuardInfo_forCall | null;
 }
 export interface CallTreasuryObject {
     data: CallTreasury_Data;
-    account?: string;
-    witness?: GuardInfo_forCall;
+    account?: string | null;
+    witness?: GuardInfo_forCall | null;
 }
 export interface CallArbitrationObject {
     data: CallArbitration_Data;
-    account?: string;
-    witness?: GuardInfo_forCall;
+    account?: string | null;
+    witness?: GuardInfo_forCall | null;
 }
 export interface CallGuardObject {
     data: CallGuard_Data;
-    account?: string;
+    account?: string | null;
 }
 export interface CallRepositoryObject {
     data: CallRepository_Data;
-    account?: string;
-    witness?: GuardInfo_forCall;
+    account?: string | null;
+    witness?: GuardInfo_forCall | null;
 }
 export interface CallPersonalObject {
     data: CallPersonal_Data;
-    account?: string;
+    account?: string | null;
 }
 export interface CallPermissionObject {
     data: CallPermission_Data;
-    account?: string;
-    witness?: GuardInfo_forCall;
+    account?: string | null;
+    witness?: GuardInfo_forCall | null;
 }
 
 export interface CallTransferPermissionObject {
     data: CallObjectPermission_Data;
-    account?: string;
-    witness?: GuardInfo_forCall;
+    account?: string | null;
+    witness?: GuardInfo_forCall | null;
 }
 
 export const call_demand_json = async (json: string) : Promise<string> => {
@@ -101,10 +101,13 @@ export const call_repository_json = async (json: string) : Promise<string> => {
     }
 }
 export const call_permission_json = async (json: string) : Promise<string> => {
+    console.log(1)
     try {
         const c : CallPermissionObject = JSON.parse(json);
+        console.log(c)
         return JSON.stringify({data:await call_permission(c)});
     } catch (e) {
+        console.log(e)
         return JSON.stringify({error:e?.toString()})
     }
 }
@@ -190,10 +193,10 @@ export const call_arbitration = async (call:CallArbitrationObject) : Promise<Cal
     return call_object(obj, call.account, call.witness)
 }
 
-const call_object = async (object: CallBase, account?: string, witness?: GuardInfo_forCall) : Promise<CallResult> => {
+const call_object = async (object: CallBase, account?: string | null, witness?: GuardInfo_forCall | null) : Promise<CallResult> => {
     if (witness) {
-        return object.call_with_witness(witness, account);
+        return object.call_with_witness(witness, account ?? undefined);
     } else {
-        return object.call(account);
+        return object.call(account ?? undefined);
     }
 }

package/src/call/demand.ts

@@ -4,6 +4,7 @@ import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIn
 import { query_objects, ObjectDemand } from '../query/objects.js';
 import { CallBase, CallResult, Namedbject } 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 {
@@ -13,27 +14,41 @@ export interface CallDemand_Data {
     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 | 'fetch'}; // guard is the present guard of Demand
+    present?: {service: string | number; recommend_words:string; service_pay_type:string, guard?:string}; // guard is the present guard of Demand
     guard?: {address:string; service_id_in_guard?:number};
 }
 
 export class CallDemand extends CallBase {
-    data: CallDemand_Data;
+    data: CallDemand_Data; 
+    content: ObjectDemand | undefined = undefined;
+
     constructor(data: CallDemand_Data) {
         super();
         this.data = data;
     }
     async call(account?:string) : Promise<CallResult> {
-        if (!this.data?.type_parameter || !IsValidArgType(this.data.type_parameter)) {
-            ERROR(Errors.IsValidArgType, 'demand.type_parameter')
-        }
-
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = []; 
-        const permission_address = (this.data?.permission as any)?.address;
-        const object_address = (this.data?.object as any)?.address;
+        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!;             
+                }
+            } 
+        } else {
+            if (!this.data?.type_parameter || !IsValidArgType(this.data.type_parameter)) {
+                ERROR(Errors.IsValidArgType, 'CallDemand_Data.data.type_parameter')
+            }
+        }
 
-        if (permission_address && IsValidAddress(permission_address)) {
+        if (permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.demand)
             }
@@ -53,21 +68,21 @@ export class CallDemand extends CallBase {
                 perms.push(PermissionIndex.demand_refund)
             }
             if (this.data?.present?.guard !== undefined) {
-                if (IsValidAddress(this.data.present.guard)) {
-                    guards.push(this.data.present.guard)
+                const guard = await LocalMark.Instance().get_address(this.data.present.guard)
+                if (guard) {
+                    guards.push(guard)
                 } else {
                     if (!object_address) { // new
-                        if (this.data?.guard?.address && IsValidAddress(this.data?.guard.address)) {
-                            guards.push(this.data.guard.address)
+                        const guard =  await LocalMark.Instance().get_address(this.data?.guard?.address);
+                        if (guard) {
+                            guards.push(guard)
                         }
                     } else {
-                        const r = await query_objects({objects:[object_address]});
-                        if (r?.objects && r?.objects[0]?.type === 'Demand') {
-                            const obj = (r?.objects[0] as ObjectDemand);
-                            if (obj?.guard) {
-                                guards.push(obj?.guard.object);
-                            }
-                        }
+                        await this.update_content(object_address, 'Demand');
+ 
+                        if ((this.content as ObjectDemand)?.guard?.object) {
+                            guards.push((this.content as ObjectDemand).guard?.object!)
+                        }  
                     }
                 }
             }
@@ -77,11 +92,14 @@ export class CallDemand extends CallBase {
     }
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Demand | undefined ; let permission: any;
-        const permission_address = (this.data?.permission as any)?.address;
-        const object_address = (this.data?.object as any)?.address;
+        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 || !IsValidAddress(permission_address)) {
+            if (!permission_address) {
                 const d = (this.data?.permission as any)?.description ?? '';
                 permission = Permission.New(txb, d);
             }
@@ -95,10 +113,10 @@ export class CallDemand extends CallBase {
                     permission ? permission.get_object(): permission_address, this.data?.description??'', permission?undefined:passport)       
             }
         } else {
-            if (IsValidAddress(object_address) && this.data.type_parameter && this.data.permission && IsValidAddress(permission_address)) {
+            if (this.data.type_parameter && permission_address) {
                 obj = Demand.From(txb, this.data.type_parameter, permission_address, object_address)
             } else {
-                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
+                ERROR(Errors.InvalidParam, 'CallDemand_Data.data.type_parameter or permission')
             }
         }
 
@@ -113,27 +131,39 @@ export class CallDemand extends CallBase {
             }
             if (this.data?.bounty !== undefined) {
                 if (this.data.bounty.op === 'add') {
-                    if (IsValidAddress((this.data.bounty.object as any)?.address)) {
+                    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)
                     } else if ((this.data.bounty.object as any)?.balance !== undefined){
                         if (!IsValidCoinType(this.data.type_parameter)) {
-                            ERROR(Errors.IsValidCoinType, 'demand bounty')
+                            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);
                         if (r) obj.deposit(r)
                     }
                 } else if (this.data.bounty.op === 'reward') {
-                    obj?.yes(this.data.bounty.service, pst);
+                    const service = await localStorage.Instance().get_address(this.data.bounty.service);
+                    if (!service) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.bounty.service');
+                    obj?.yes(service, pst);
                 } else if (this.data.bounty.op === 'refund') {
                     obj?.refund(pst);
                 } 
             }
             if (this.data?.present !== undefined) {
                 //@ demand guard and its pst, if set
-                obj?.present(this.data.present.service, this.data.present.service_pay_type, this.data.present.recommend_words, pst);
+                const service = typeof(this.data.present.service) === 'string' ? await LocalMark.Instance().get_account(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) {
-                obj?.set_guard(this.data.guard.address, this.data.guard?.service_id_in_guard ?? undefined, pst)
+                const guard = await LocalMark.Instance().get_address(this.data?.guard.address);
+                if (!guard) { 
+                    ERROR(Errors.InvalidParam, 'CallDemand_Data.data.guard.address')
+                }
+                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);

package/src/call/guard.ts

@@ -5,9 +5,10 @@
 
 import { Bcs, ContextType, ERROR, Errors, IsValidU8, OperatorType, ValueType, GUARD_QUERIES, IsValidAddress, 
     concatenate, TransactionBlock, Protocol, FnCallType, hasDuplicates, insertAtHead,
-    IsValidDesription, PassportObject, IsValidGuardIdentifier, GuardQuery
+    IsValidDesription, PassportObject, IsValidGuardIdentifier, GuardQuery, 
     } from "wowok";
 import { CallBase, CallResult, Namedbject } from "./base.js";
+import { LocalMark } from "../local/local.js";
 
 export interface GuardConst {
     identifier: number; // 1-255, the same identifier to represent the same data in different nodes
@@ -71,22 +72,30 @@ export class CallGuard extends CallBase {
             target: Protocol.Instance().guardFn('new') as FnCallType,
             arguments: [txb.pure.string(this.data.description ?? ''), txb.pure.vector('u8', [].slice.call(bytes.reverse()))],  
         });
-        this.data?.table?.forEach((v) => {
-            if (v.bWitness) {
-                const n = new Uint8Array(1); n.set([v.value_type], 0);
-                txb.moveCall({
-                    target:Protocol.Instance().guardFn("constant_add") as FnCallType,
-                    arguments:[txb.object(obj), txb.pure.u8(v.identifier), txb.pure.bool(true), txb.pure.vector('u8', [].slice.call(n)), txb.pure.bool(false)]
-                }) 
-            } else {
-                const tmp = Uint8Array.from(Bcs.getInstance().ser(v.value_type, v.value));
-                const n = insertAtHead(tmp, v.value_type);
-                txb.moveCall({
-                    target:Protocol.Instance().guardFn("constant_add") as FnCallType,
-                    arguments:[txb.object(obj), txb.pure.u8(v.identifier), txb.pure.bool(false),  txb.pure.vector('u8', [].slice.call(n)), txb.pure.bool(false)]
-                }) 
+        if (this.data.table) {
+            for (let i = 0; i < this.data?.table?.length; ++ i) {
+                const v = this.data.table[i];
+                if (v.bWitness) {
+                    const n = new Uint8Array(1); n.set([v.value_type], 0);
+                    txb.moveCall({
+                        target:Protocol.Instance().guardFn("constant_add") as FnCallType,
+                        arguments:[txb.object(obj), txb.pure.u8(v.identifier), txb.pure.bool(true), txb.pure.vector('u8', [].slice.call(n)), txb.pure.bool(false)]
+                    }) 
+                } else {
+                    if (v.value_type === ValueType.TYPE_ADDRESS) {
+                        v.value = await LocalMark.Instance().get_address(v.value);
+                        if (!v.value) { ERROR(Errors.InvalidParam, `CallGuard_Data.data.table address`)}
+                    };
+                    const tmp = Uint8Array.from(Bcs.getInstance().ser(v.value_type, v.value));
+                    const n = insertAtHead(tmp, v.value_type);
+                    txb.moveCall({
+                        target:Protocol.Instance().guardFn("constant_add") as FnCallType,
+                        arguments:[txb.object(obj), txb.pure.u8(v.identifier), txb.pure.bool(false),  txb.pure.vector('u8', [].slice.call(n)), txb.pure.bool(false)]
+                    }) 
+                }
             }
-        })
+        }
+
         const addr = txb.moveCall({
             target:Protocol.Instance().guardFn("create") as FnCallType,
             arguments:[txb.object(obj)]

package/src/call/machine.ts

@@ -4,6 +4,8 @@ import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIn
 } from 'wowok';
 import { CallBase, CallResult, Namedbject } from "./base.js";
 import { Account } from '../local/account.js';
+import { ObjectMachine } from '../query/objects.js';
+import { LocalMark } from '../local/local.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallMachine_Data {
@@ -24,7 +26,7 @@ export interface CallMachine_Data {
     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 | 'fetch'};
+    progress_next?: {progress:string; operation:ProgressNext; deliverable:Deliverable; guard?:string};
     bPaused?: boolean;
     clone_new?: {namedNew?: Namedbject/*, description?:string*/};
 }
@@ -37,10 +39,21 @@ 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[] = []; 
-        const permission_address = (this.data?.permission as any)?.address;
-        const object_address = (this.data?.object as any)?.address;
+        var [permission_address, object_address] = 
+            await LocalMark.Instance().get_many_address(
+                [(this.data?.permission as any)?.address, 
+                (this.data?.object as any)?.address]);
 
-        if (permission_address && IsValidAddress(permission_address)) {
+        if (object_address) {
+            if (!permission_address) {
+                await this.update_content(object_address, 'Machine');
+                if (this.content) {
+                    permission_address = (this.content as ObjectMachine).permission;     
+                }
+            } 
+        } 
+
+        if (permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.machine)
             }
@@ -82,15 +95,19 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (this.data?.bPaused !== undefined) {
                 perms.push(PermissionIndex.machine_pause)
             }
-            if (this.data?.progress_next?.guard !== undefined) {
-                if (IsValidAddress(this.data?.progress_next?.guard)) {
-                    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, 
-                        await Account.Instance().default() ?? '0xe386bb9e01b3528b75f3751ad8a1e418b207ad979fea364087deef5250a73d3f', 
-                        this.data.progress_next.operation.next_node_name, this.data.progress_next.operation.forward);
-                    if (guard) {
-                        guards.push(guard)
+            if (this.data?.progress_next !== undefined) {
+                const guard = await LocalMark.Instance().get_address(this.data?.progress_next?.guard);
+                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() ?? '0xe386bb9e01b3528b75f3751ad8a1e418b207ad979fea364087deef5250a73d3f', 
+                            this.data.progress_next.operation.next_node_name, this.data.progress_next.operation.forward);
+                        if (guard) {
+                            guards.push(guard)
+                        }                        
                     }
                 }
             }
@@ -102,20 +119,23 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Machine | undefined ; let permission: any;
-        const permission_address = (this.data?.permission as any)?.address;
-        const object_address = (this.data?.object as any)?.address;
+        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 || !IsValidAddress(permission_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);
         } else {
-            if (IsValidAddress(object_address) &&permission_address && IsValidAddress(permission_address)) {
+            if (permission_address) {
                 obj = Machine.From(txb, permission_address, object_address)
             } else {
-                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
+                ERROR(Errors.InvalidParam, 'CallMachine_Data.data.permission')
             }
         }
 
@@ -133,18 +153,22 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             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, pst)) ;
+                    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': 
-                        obj?.remove_repository(this.data.consensus_repository.repositories, false, pst);
+                        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;
-                    case 'set':
-                        obj?.remove_repository([], true, pst);
-                        this.data.consensus_repository.repositories.forEach(v=>obj?.add_repository(v, pst)) ;
-                        break;
                 }
             }
             if (this.data?.nodes !== undefined) {
@@ -177,40 +201,55 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             }
             var new_progress : Progress | undefined;
             if (this.data?.progress_new !== undefined) {
-                new_progress = Progress?.New(txb, obj?.get_object(), perm, this.data?.progress_new.task_address, pst);
+                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) {
-                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)
+                const p = this.data?.progress_context_repository.progress 
+                    ? await LocalMark.Instance().get_address(this.data?.progress_context_repository.progress)
+                    : new_progress?.get_object();
+                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_context_repository.progress');
+                const rep = await LocalMark.Instance().get_address(this.data?.progress_context_repository.repository);
+                Progress.From(txb, obj?.get_object(), perm, p!).set_context_repository(rep, pst)
             }
             if (this.data?.progress_namedOperator !== undefined) {
-                const p = this.data?.progress_namedOperator.progress ?? new_progress?.get_object();
-                if (!p) ERROR(Errors.Fail, 'progress invalid: progress_namedOperator');
+                const p = this.data?.progress_namedOperator.progress 
+                    ? await LocalMark.Instance().get_address(this.data?.progress_namedOperator.progress)
+                    : new_progress?.get_object();
+                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_namedOperator.progress');
 
                 let pp = Progress.From(txb, obj?.get_object(), perm, p!);
                 this.data.progress_namedOperator.data.forEach(v => pp.set_namedOperator(v.name, v.operators, 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');
+                const p = this.data?.progress_parent.progress 
+                    ? await LocalMark.Instance().get_address(this.data?.progress_parent.progress)
+                    : new_progress?.get_object();
+                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_parent.progress');
 
                 if (this.data.progress_parent.parent) {
-                    Progress.From(txb, obj?.get_object(), perm, p!).parent(this.data.progress_parent.parent);
+                    const parent = await LocalMark.Instance().get_address(this.data.progress_parent.parent.parent_id);
+                    if (parent) {
+                        this.data.progress_parent.parent.parent_id = parent;
+                        Progress.From(txb, obj?.get_object(), perm, p!).parent(this.data.progress_parent.parent);
+                    }
                 } else {
                     Progress.From(txb, obj?.get_object(), perm, p!).parent_none();
                 }
             }
             if (this.data?.progress_task !== undefined) {
-                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)
+                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 ?? new_progress?.get_object();
-                if (!p) ERROR(Errors.Fail, 'progress invalid: progress_hold');
+                const p = this.data?.progress_hold.progress 
+                    ? await LocalMark.Instance().get_address(this.data?.progress_hold.progress)
+                    : new_progress?.get_object();
+                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_hold.progress');
 
                 if (this.data?.progress_hold.adminUnhold) {
                     Progress.From(txb, obj?.get_object(), perm, p!).unhold(this.data.progress_hold.operation, pst)