wowok_agent 1.2.38 → 1.2.41

package/src/call/service.ts

@@ -5,6 +5,8 @@ import { TransactionBlock, IsValidArgType, TxbAddress, TagName,  PassportObject,
 import { query_objects, ObjectService } from '../query/objects.js';
 import { CallBase, CallResult, Namedbject } from "./base.js";
 import { Account } from '../local/account.js';
+import { LocalMark } from '../local/local.js';
+import { get_object_address } from '../common.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallService_Data {
@@ -28,7 +30,7 @@ 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', 
+    order_new?: {buy_items:Service_Buy[], discount?:string, machine?:string, customer_info_crypto?: Customer_RequiredInfo, guard?:string, 
         namedNewOrder?: Namedbject, namedNewProgress?:Namedbject}
     order_agent?: {order?:string; agents: string[]; progress?:string};
     order_required_info?: {order?:string; info?:Customer_RequiredInfo};
@@ -53,11 +55,27 @@ export class CallService extends CallBase {
 
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = [];  var obj: ObjectService | undefined;
-        const permission_address = (this.data?.permission as any)?.address;
-        const object_address = (this.data?.object as any)?.address;
-        const treasury_address = (this.data?.payee_treasury as any)?.address;
+        var [permission_address, object_address, treasury_address] = 
+            await LocalMark.Instance().get_many_address(
+                [(this.data?.permission as any)?.address, 
+                (this.data?.object as any)?.address, 
+                (this.data?.payee_treasury as any)?.address]);
 
-        if (permission_address && IsValidAddress(permission_address)) {
+        if (object_address) {
+            if (!this.data.type_parameter || !permission_address) {
+                await this.update_content(object_address, 'Service');
+                if (this.content) {
+                    permission_address = (this.content as ObjectService).permission;     
+                    this.data.type_parameter =  this.content.type_raw!;             
+                }
+            } 
+        } else {
+            if (!this.data?.type_parameter || !IsValidArgType(this.data.type_parameter)) {
+                ERROR(Errors.IsValidArgType, 'CallService_Data.data.type_parameter')
+            }
+        }
+
+        if (permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.service)
             }
@@ -112,36 +130,39 @@ export class CallService extends CallBase {
             if (this.data?.sales !== undefined) {
                 perms.push(PermissionIndex.service_sales)
             }
-            if (this.data?.order_new?.guard !== undefined) {
-                if (IsValidAddress(this.data.order_new.guard)) {
-                    guards.push(this.data.order_new.guard)
+            if (this.data?.order_new !== undefined) {
+                if (this.data.order_new.guard) { 
+                    const guard = await LocalMark.Instance().get_address(this.data.order_new.guard);
+                    if (guard) {
+                        guards.push(guard)
+                    }
                 } else {
-                    if (!this.data.object) {
-                        if (this.data?.buy_guard && IsValidAddress(this.data.buy_guard)) {
-                            guards.push(this.data?.buy_guard)
+                    if (!object_address) {
+                        const buy_guard = await LocalMark.Instance().get_address(this.data?.buy_guard);
+                        if (buy_guard) {
+                            guards.push(buy_guard)
                         }
                     } else {
-                        if (!obj) {
-                            const r = await query_objects({objects:[object_address]});
-                            if (r?.objects && r.objects[0].type === 'Service') {
-                                obj = r.objects[0] as ObjectService;
-                            }                        
-                        }
-                        if (obj?.buy_guard) {
-                            guards.push(obj?.buy_guard)
-                        }                        
+                        await this.update_content(object_address, 'Service');
+
+                        if ((this.content as ObjectService)?.buy_guard) {
+                            guards.push((this.content as ObjectService).buy_guard!)
+                        }                         
                     }
                 }
             }
-            if (IsValidAddress((this.data?.order_refund as any)?.guard)) {
-                guards.push((this.data?.order_refund as any)?.guard)
+            if (this.data.order_refund !== undefined) {
+                const guard = await LocalMark.Instance().get_address((this.data?.order_refund as any)?.guard);
+                if (guard) guards.push(guard);
             }
+
             if (this.data.order_withdrawl !== undefined) { // permission(may be guard) + withdraw_guard
                 perms.push(PermissionIndex.service_withdraw)
             }
 
-            if (typeof(this.data?.order_withdrawl?.data?.withdraw_guard) === 'string' && IsValidAddress(this.data?.order_withdrawl?.data?.withdraw_guard)) {
-                guards.push(this.data?.order_withdrawl?.data?.withdraw_guard)
+            if (typeof(this.data?.order_withdrawl?.data?.withdraw_guard) === 'string') {
+                const guard = await LocalMark.Instance().get_address(this.data?.order_withdrawl?.data?.withdraw_guard);
+                if (guard) guards.push(guard);
             }
 
             return await this.check_permission_and_call(permission_address, perms, guards, checkOwner, undefined, account)
@@ -150,9 +171,12 @@ export class CallService extends CallBase {
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Service | undefined ; let permission: any;  let payee: any;
-        const permission_address = (this.data?.permission as any)?.address;
-        const object_address = (this.data?.object as any)?.address;
-        const treasury_address = (this.data?.payee_treasury as any)?.address;
+        var [permission_address, object_address] = this?.content ? 
+            [(this.content as ObjectService).permission, this.content.object] : 
+            await LocalMark.Instance().get_many_address(
+                [(this.data?.permission as any)?.address, 
+                (this.data?.object as any)?.address]);
+        const treasury_address = await LocalMark.Instance().get_address((this.data?.payee_treasury as any)?.address);
 
         if (!object_address) {
             if (!permission_address || !IsValidAddress(permission_address)) {
@@ -166,10 +190,10 @@ export class CallService extends CallBase {
             obj = Service.New(txb, this.data.type_parameter!, permission?permission.get_object():permission_address, 
                 this.data?.description??'', payee?payee.get_object():treasury_address, permission?undefined:passport)
         } else {
-            if (IsValidAddress(object_address) && this.data.type_parameter && permission_address && IsValidAddress(permission_address)) {
+            if (this.data.type_parameter && permission_address) {
                 obj = Service.From(txb, this.data.type_parameter, permission_address, object_address)
             } else {
-                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
+                ERROR(Errors.InvalidParam, 'CallService_Data.data.type_parameter or permission')
             }
         }
 
@@ -183,23 +207,36 @@ export class CallService extends CallBase {
             if (this.data?.endpoint !== undefined) {
                 obj?.set_endpoint(this.data.endpoint, pst)
             }
-            if (this.data?.payee_treasury !== undefined && object_address) {
+            if (treasury_address !== undefined && object_address) {
                 obj?.set_payee(treasury_address, pst);
             }
             if (this.data?.gen_discount !== undefined) {
-                obj?.discount_transfer(this.data.gen_discount, pst)
+                const add = [];
+                for (let i = 0; i < this.data.gen_discount.length; ++ i) {
+                    let  v = this.data.gen_discount[i];
+                    const addr = await LocalMark.Instance().get_address(v.receiver);
+                    if (addr) {
+                        v.receiver = addr;
+                        add.push(v)
+                    }
+                }
+                obj?.discount_transfer(add, pst)
             }
             if (this.data?.repository !== undefined) {
                 switch (this.data.repository.op) {
                     case 'add':
-                        this.data.repository.repositories.forEach(v => obj?.add_repository(v, pst))
+                    case 'set':
+                        if (this.data.repository.op === 'set') obj?.remove_repository([], true, pst);
+                        for (let i = 0; i < this.data.repository.repositories.length; ++ i) {
+                            let  v = this.data.repository.repositories[i];
+                            const addr = await LocalMark.Instance().get_address(v);
+                            if (addr) {
+                                obj?.add_repository(v, pst)
+                            }
+                        }
                         break;
                     case 'remove':
-                        obj?.remove_repository(this.data.repository.repositories, false, pst)
-                        break;
-                    case 'set':
-                        obj?.remove_repository([], true, pst)
-                        this.data.repository.repositories.forEach(v => obj?.add_repository(v, pst))
+                        obj?.remove_repository(await LocalMark.Instance().get_many_address2(this.data.repository.repositories), false, pst)
                         break;
                     case 'removeall':
                         obj?.remove_repository([], true, pst)
@@ -209,14 +246,19 @@ export class CallService extends CallBase {
             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, pst))
-                        break;
                     case 'set':
-                        obj?.remove_treasury([], true, pst)
-                        this.data.extern_withdraw_treasury.treasuries.forEach(v=>obj?.add_treasury(v.token_type, v.address, pst))
+                        if (this.data.extern_withdraw_treasury.op === 'set') obj?.remove_treasury([], true, pst);
+
+                        for (let i = 0; i < this.data.extern_withdraw_treasury.treasuries.length; ++ i) {
+                            let  v = this.data.extern_withdraw_treasury.treasuries[i];
+                            const addr = await LocalMark.Instance().get_address(v.address);
+                            if (addr && v.token_type) {
+                                obj?.add_treasury(v.token_type, v.address, pst);
+                            }
+                        }
                         break;
                     case 'remove':
-                        obj?.remove_treasury(this.data.extern_withdraw_treasury.addresses, false, pst)
+                        obj?.remove_treasury(await LocalMark.Instance().get_many_address2(this.data.extern_withdraw_treasury.addresses), false, pst)
                         break;
                     case 'removeall':
                         obj?.remove_treasury([], false, pst)
@@ -224,19 +266,25 @@ export class CallService extends CallBase {
                 }
             }
             if (this.data?.machine !== undefined) {
-                obj?.set_machine(this.data.machine, pst)
+                const machine = await LocalMark.Instance().get_address(this.data.machine);
+                obj?.set_machine(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.token_type, pst))
-                        break;
                     case 'set':
-                        obj?.remove_arbitration([], true, pst)
-                        this.data.arbitration.arbitrations.forEach(v=>obj?.add_arbitration(v.address, v.token_type, pst))
+                        if (this.data.arbitration.op === 'set') obj?.remove_arbitration([], true, pst);
+                        for (let i = 0; i < this.data.arbitration.arbitrations.length; ++ i) {
+                            let  v = this.data.arbitration.arbitrations[i];
+                            const addr = await LocalMark.Instance().get_address(v.address);
+                            if (addr && v.token_type) {
+                                obj?.add_arbitration(v.address, v.token_type, pst)
+                            }
+                        }
+
                         break;
                     case 'remove':
-                        obj?.remove_arbitration(this.data.arbitration.addresses, false, pst)
+                        obj?.remove_arbitration(await LocalMark.Instance().get_many_address2(this.data.arbitration.addresses), false, pst)
                         break;
                     case 'removeall':
                         obj?.remove_arbitration([], false, pst)
@@ -263,14 +311,22 @@ export class CallService extends CallBase {
             if (this.data?.withdraw_guard !== undefined) {
                 switch(this.data.withdraw_guard.op) {
                     case 'add':
-                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, pst)
-                        break;
                     case 'set':
-                        obj?.remove_withdraw_guards([], true, pst)
-                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, pst)
+                        if (this.data.withdraw_guard.op === 'set')  obj?.remove_withdraw_guards([], true, pst);
+
+                        const add = []
+                        for (let i = 0; i < this.data.withdraw_guard.guards.length; ++ i) {
+                            let  v = this.data.withdraw_guard.guards[i];
+                            const addr = typeof(v.guard) === 'string' ? await LocalMark.Instance().get_address(v.guard as string) : v.guard;
+                            if (addr) {
+                                v.guard = addr;
+                                add.push(v)
+                            }
+                        }
+                        obj?.add_withdraw_guards(add, pst)
                         break;
                     case 'remove':
-                        obj?.remove_withdraw_guards(this.data.withdraw_guard.addresses, false, pst)
+                        obj?.remove_withdraw_guards(await LocalMark.Instance().get_many_address2(this.data.withdraw_guard.addresses), false, pst)
                         break;
                     case 'removeall':
                         obj?.remove_withdraw_guards([], true, pst)
@@ -280,14 +336,23 @@ export class CallService extends CallBase {
             if (this.data?.refund_guard !== undefined) {
                 switch(this.data.refund_guard.op) {
                     case 'add':
-                        obj?.add_refund_guards(this.data.refund_guard.guards, pst)
-                        break;
                     case 'set':
-                        obj?.remove_refund_guards([], true, pst)
-                        obj?.add_refund_guards(this.data.refund_guard.guards, pst)
+                        if (this.data.refund_guard.op ===  'set') obj?.remove_refund_guards([], true, pst);
+                        const add = []
+                        for (let i = 0; i < this.data.refund_guard.guards.length; ++ i) {
+                            let  v = this.data.refund_guard.guards[i];
+                            const addr = typeof(v.guard) === 'string' ? await LocalMark.Instance().get_address(v.guard as string) : v.guard;
+                            if (addr) {
+                                v.guard = addr;
+                                add.push(v)
+                            }
+                        }
+                        obj?.add_refund_guards(add, pst)
                         break;
+                    
+      
                     case 'remove':
-                        obj?.remove_refund_guards(this.data.refund_guard.addresses, false, pst)
+                        obj?.remove_refund_guards(await LocalMark.Instance().get_many_address2(this.data.refund_guard.addresses), false, pst)
                         break;
                     case 'removeall':
                         obj?.remove_refund_guards([], true, pst)
@@ -314,39 +379,53 @@ export class CallService extends CallBase {
             }
         
             if (this.data?.order_agent !== undefined) {
-                const o = this.data.order_agent.order ?? order_new?.order;
-                if (!o) ERROR(Errors.Fail, 'order invalid: order_agent');
+                const o = this.data.order_agent.order ? await LocalMark.Instance().get_address(this.data.order_agent.order) : order_new?.order;
+                if (!o) ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_agent.order}`);
 
-                obj?.set_order_agent(o!, this.data.order_agent.agents, this.data.order_agent.progress)
+                const p = this.data.order_agent.progress ? await LocalMark.Instance().get_address(this.data.order_agent.progress) : order_new?.progress;
+                if (!p) ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.progress:${this.data.order_agent.progress}`);
+
+                obj?.set_order_agent(o, await LocalMark.Instance().get_many_address2(this.data.order_agent.agents), p)
             }
             if (this.data?.order_required_info !== undefined && this.data.order_required_info.info !== undefined) {
-                const o = this.data.order_required_info.order ?? order_new?.order;
-                if (!o) ERROR(Errors.Fail, 'order invalid: order_required_info');
+                const o = this.data.order_required_info.order ? await LocalMark.Instance().get_address(this.data.order_required_info.order) : order_new?.order;
+                if (!o) ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_required_info.order}`);
                 
                 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');
+                const o = this.data.order_refund.order ? await LocalMark.Instance().get_address(this.data.order_refund.order) : order_new?.order;
+                if (!o) ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_refund.order}`);
+
 
                 if ((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)
+                    const arb = await LocalMark.Instance().get_address((this.data?.order_refund as any)?.arb);
+                    if (arb) {
+                        obj?.refund_withArb(o!, arb, (this.data?.order_refund as any)?.arb_token_type)
+                    }
                 } else {
-                    obj?.refund(o!, (this.data?.order_refund as any)?.guard, pst)
+                    const guard = await LocalMark.Instance().get_address((this.data?.order_refund as any)?.guard);
+                    if (guard) obj?.refund(o!, guard, pst)
                 }
             }
             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');
-
+                const o = this.data.order_withdrawl.order ? await LocalMark.Instance().get_address(this.data.order_withdrawl.order) : order_new?.order;
+                if (!o) ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_withdrawl.order}`);
+                this.data.order_withdrawl.data.for_guard = await get_object_address(this.data.order_withdrawl.data.for_guard);
+                this.data.order_withdrawl.data.for_object = await get_object_address(this.data.order_withdrawl.data.for_object);
+                this.data.order_withdrawl.data.treasury = await get_object_address(this.data.order_withdrawl.data.treasury);
+                this.data.order_withdrawl.data.withdraw_guard = await get_object_address(this.data.order_withdrawl.data.withdraw_guard);
                 obj?.withdraw(o!, this.data.order_withdrawl.data, pst)
             }
 
             if (this.data?.order_payer !== undefined && obj) {
-                const o = this.data.order_payer.order ?? order_new?.order;
-                if (!o) ERROR(Errors.Fail, 'order invalid: order_payer');
+                const o = this.data.order_payer.order ? await LocalMark.Instance().get_address(this.data.order_payer.order) : order_new?.order;
+                if (!o) ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_payer.order}`);
+                const p = this.data.order_payer.progress ? await LocalMark.Instance().get_address(this.data.order_payer.progress) : order_new?.progress;
+                if (!p) ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.progress:${this.data.order_payer.progress}`);
 
-                obj?.change_order_payer(o!, this.data.order_payer.payer_new, this.data.order_payer.progress)
+                const payer = await LocalMark.Instance().get_address(this.data.order_payer.payer_new);
+                if (payer)  obj?.change_order_payer(o, payer, p)
             }
 
             if (order_new && this?.data?.order_new) {

package/src/call/treasury.ts

@@ -4,6 +4,8 @@ import { TransactionBlock, IsValidArgType, PassportObject, IsValidAddress, Error
 import { query_objects, ObjectTreasury } from '../query/objects.js';
 import { CallBase, CallResult, Namedbject } from "./base.js";
 import { Account } from '../local/account.js';
+import { LocalMark } from '../local/local.js';
+import { get_object_address } from '../common.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallTreasury_Data {
@@ -11,7 +13,7 @@ export interface CallTreasury_Data {
     object?: {address:string} | {namedNew?: Namedbject}; // undefined or {named_new...} for creating a new object
     permission?: {address:string} | {namedNew?: Namedbject, description?:string}; 
     description?: string;
-    deposit?: {data:{balance:string|number; index?:number|string; remark?:string; for_object?:string; for_guard?:string}; guard?:string | 'fetch'};
+    deposit?: {data:{balance:string|number; index?:number|string; remark?:string; for_object?:string; for_guard?:string}; guard?:string};
     receive?: {payment:string; received_object:string};
     withdraw?: WithdrawParam;
     deposit_guard?: string;
@@ -32,10 +34,26 @@ export class CallTreasury extends CallBase {
 
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = [];  var obj: ObjectTreasury | undefined ;
-        const permission_address = (this.data?.permission as any)?.address;
-        const object_address = (this.data?.object as any)?.address;
+        var [permission_address, object_address, treasury_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 (!this.data.type_parameter || !permission_address) {
+                await this.update_content(object_address, 'Treasury');
+                if (this.content) {
+                    permission_address = (this.content as ObjectTreasury).permission;     
+                    this.data.type_parameter =  this.content.type_raw!;             
+                }
+            } 
+        } else {
+            if (!this.data?.type_parameter || !IsValidArgType(this.data.type_parameter)) {
+                ERROR(Errors.IsValidArgType, 'CallTreasury_Data.data.type_parameter')
+            }
+        }
+
+        if (permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.treasury)
             }
@@ -54,46 +72,36 @@ export class CallTreasury extends CallBase {
             if (this.data?.deposit_guard !== undefined) {
                 perms.push(PermissionIndex.treasury_deposit_guard)
             }
-            if (this.data?.deposit?.guard !== undefined) {
-                if (IsValidAddress(this.data.deposit.guard)) {
-                    guards.push(this.data.deposit.guard)
+            if (this.data?.deposit !== undefined) {
+                if (this.data.deposit.guard) {
+                    const guard = await LocalMark.Instance().get_address(this.data?.deposit?.guard);
+                    if (guard) {
+                        guards.push(guard)
+                    }
                 } else {
-                    if (!this.data.object) {
-                        if (this.data?.deposit_guard && IsValidAddress(this.data?.deposit_guard)) {
-                            guards.push(this.data.deposit_guard)
+                    if (!object_address) {
+                        const guard = await LocalMark.Instance().get_address(this.data.deposit_guard);
+                        if (guard) {
+                            guards.push(guard);
                         }
                     } else {
-                        if (!obj) {
-                            const r = await query_objects({objects:[object_address]});
-                            if (r?.objects && r.objects[0].type === 'Treasury') {
-                                obj = r.objects[0] as ObjectTreasury;
-                            }
-                        }
-                        if (obj?.deposit_guard) {
-                            guards.push(obj?.deposit_guard)
-                        }                        
+                        await this.update_content(object_address, 'Treasury');
+    
+                        if ((this.content as ObjectTreasury)?.deposit_guard) {
+                            guards.push((this.content as ObjectTreasury).deposit_guard!)
+                        }                         
                     }
-
                 }
             }
             if (this.data?.receive !== undefined) {
                 perms.push(PermissionIndex.treasury_receive)
             }
-            if (this.data?.withdraw?.withdraw_guard !== undefined) {
-                if (typeof(this.data.withdraw.withdraw_guard) === 'string' && IsValidAddress(this.data.withdraw.withdraw_guard)) {
-                    guards.push(this.data.withdraw.withdraw_guard)
-                } else if (this.data.object) {
-                    if (!obj) {
-                        const r = await query_objects({objects:[object_address]});
-                        if (r?.objects && r.objects[0].type === 'Treasury') {
-                            obj = r.objects[0] as ObjectTreasury;
-                        }
-                    }
-                    if (typeof(obj?.withdraw_guard) === 'string') {
-                        guards.push(obj?.withdraw_guard)
-                    }
-                }
-            } else {
+            if (this.data?.withdraw?.withdraw_guard !== undefined) { // withdraw with guard
+                const guard = await get_object_address(this.data.withdraw.withdraw_guard);
+                if (guard) {
+                    guards.push(guard)
+                } 
+            } else { // withdraw with permission
                 perms.push(PermissionIndex.treasury_withdraw)
             }
             return await this.check_permission_and_call(permission_address, perms, guards, checkOwner, undefined, account)
@@ -102,20 +110,23 @@ export class CallTreasury extends CallBase {
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Treasury | 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 ObjectTreasury).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 = Treasury.New(txb, this.data.type_parameter!, permission ? permission.get_object() : permission_address, this.data?.description??'', permission?undefined:passport)
         } else {
-            if (IsValidAddress(object_address) && this.data.type_parameter && permission_address && IsValidAddress(permission_address)) {
+            if (this.data.type_parameter && permission_address) {
                 obj = Treasury.From(txb, this.data.type_parameter, permission_address, object_address)
             } else {
-                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
+                ERROR(Errors.InvalidParam, 'CallTreasury_Data.data.type_parameter or permission')
             }
         }
 
@@ -129,33 +140,42 @@ export class CallTreasury extends CallBase {
                 if (coin) {
                     const index = this.data.deposit.data?.index ?? 0;
                     obj?.deposit({coin:coin, index:BigInt(index), remark:this.data.deposit.data.remark ??'', 
-                        for_guard:this.data.deposit.data?.for_guard,
-                        for_object: this.data.deposit.data?.for_object
+                        for_guard:await get_object_address(this.data.deposit.data?.for_guard),
+                        for_object:await get_object_address(this.data.deposit.data?.for_object)
                     })
                 }
             }
             if (this.data?.receive !== undefined) {
-                obj?.receive(this.data.receive.payment, this.data.receive.received_object, pst); 
+                const [payment, receive] = await LocalMark.Instance().get_many_address([this.data.receive.payment, this.data.receive.received_object])
+                if (payment && receive) obj?.receive(payment, receive, pst); 
             }
+
             if (this.data?.withdraw !== undefined) {
+                this.data.withdraw.for_guard = await get_object_address(this.data.withdraw.for_guard);
+                this.data.withdraw.for_object = await get_object_address(this.data.withdraw.for_object);
+                this.data.withdraw.withdraw_guard = await get_object_address(this.data.withdraw.withdraw_guard);
                 obj?.withdraw(this.data.withdraw, pst)
             }
 
             if (this.data?.deposit_guard !== undefined) {
-                obj?.set_deposit_guard(this.data.deposit_guard, pst);
+                const guard = await LocalMark.Instance().get_address(this.data?.deposit_guard);
+                obj?.set_deposit_guard(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), pst))
+                    case 'set':
+                        if (this.data.withdraw_guard.op === 'set') obj?.remove_withdraw_guard([], true, pst);
+                        for (let i = 0; i < this.data.withdraw_guard.data.length; ++ i) {
+                            let v = this.data.withdraw_guard.data[i];
+                            const guard = await LocalMark.Instance().get_address(v.guard);
+                            if (guard) obj?.add_withdraw_guard(guard, BigInt(v.amount), pst);
+                        }
                         break;
                     case 'remove':
-                        obj?.remove_withdraw_guard(this.data.withdraw_guard.guards, false, pst)
-                        break;
-                    case 'set':
-                        obj?.remove_withdraw_guard([], true, pst)
-                        this.data.withdraw_guard.data.forEach(v => obj?.add_withdraw_guard(v.guard, BigInt(v.amount), pst))
+                        obj?.remove_withdraw_guard(await LocalMark.Instance().get_many_address2(this.data.withdraw_guard.guards), false, pst)
                         break;
+
                     case 'removeall':
                         obj?.remove_withdraw_guard([], true, pst)
                         break;

package/src/common.ts

@@ -1,5 +1,14 @@
+import { LocalMark } from "./local/local.js";
 
 
 export const isBrowser = ()  => {
     return typeof window !== 'undefined' && typeof indexedDB !== 'undefined';
+}
+
+export const get_object_address = async (object: any) => {
+    if (typeof(object) === 'string') {
+        return await LocalMark.Instance().get_address(object)
+    } else {
+        return object
+    }
 }

package/src/index.ts

@@ -17,5 +17,6 @@ export * from './local/account.js'
 export * from './local/cache.js'
 export * from './local/local.js'
 export * from './local/index.js'
+export * from './common.js'
 
 export * as WOWOK from 'wowok'