wowok_agent 1.2.45 → 1.3.48

package/src/call/arbitration.ts

@@ -1,31 +1,32 @@
 import { TransactionBlock, IsValidArgType, PassportObject, Errors, ERROR, Permission, PermissionIndex, 
-    PermissionIndexType, Treasury, Arbitration, VotingGuard, WithdrawFee, ArbObject,
+    PermissionIndexType, Treasury, Arbitration, VotingGuard, ArbObject, Service,
+    PermissionObject,
 } from 'wowok';
-import { ObjectArbitration, } from '../query/objects.js';
-import { CallBase, CallResult, Namedbject} from "./base.js";
+import { ObjectArbitration, query_objects, } from '../query/objects.js';
+import { CallBase, CallResult, GetObjectExisted, GetObjectMain, GetObjectParam, Namedbject, 
+    ObjectParam, ObjectTypedMain, SetWithdrawFee, TypeNamedObjectWithPermission, WithdrawParam } from "./base.js";
 import { Account } from '../local/account.js';
 import { LocalMark } from '../local/local.js';
 export interface DisputeData {
     order: string,
-    order_token_type: string,
     description: string,
     votable_proposition: string[],
-    fee: string | number,
+    max_fee: string | number,
 }
 
+
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallArbitration_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;
+    arb_new?: {data: DisputeData; namedNew?: Namedbject}; // dispute an order, and a Arb object will be created.
+    arb_withdraw_fee?: {arb:string; data:WithdrawParam};
+    arb_vote?: {arb?: string; voting_guard?: string; agrees: number[]};
+    arb_arbitration?: {arb?:string; feedback:string; indemnity?:string|number};
+
     description?: string;
     endpoint?: string;
     fee?: string | number;
-    fee_treasury?: {address:string} | {namedNew?: Namedbject, description?:string}; 
-    arb_new?: {data: DisputeData; guard?:string; namedNew?: Namedbject}; // dispute an order, and a new Arb launched.
-    arb_withdraw_fee?: {arb?:string; data:WithdrawFee};
-    arb_vote?: {arb?: string; voting_guard?: string; agrees: number[]};
-    arb_arbitration?: {arb?:string; feedback:string; indemnity?:string|number};
+    fee_treasury?: ObjectParam;
     guard?: string;
     voting_guard?: {op:'add' | 'set'; data:VotingGuard[]} | {op:'remove', guards:string[]} | {op:'removeall'};
     bPaused?: boolean;
@@ -33,40 +34,44 @@ export interface CallArbitration_Data {
 
 export class CallArbitration extends CallBase {
     data: CallArbitration_Data;
+    object_address: string | undefined = undefined;
+    permission_address: string | undefined = undefined;
+    type_parameter: string | undefined = undefined; // type of the object, e.g. '00x2::sui::SUI'
 
     constructor (data: CallArbitration_Data) {
         super();
         this.data  = data;
     }
 
+    protected async prepare()  {
+        if (!this.object_address) {
+            this.object_address = (await LocalMark.Instance().get_address(GetObjectExisted(this.data.object)));
+            if (this.object_address) {
+                await this.update_content('Arbitration', this.object_address);
+                if (!this.content) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.object:' + this.data.object);
+                this.permission_address = (this.content as ObjectArbitration).permission;
+                this.type_parameter = Arbitration.parseObjectType(this.content.type_raw);
+            } else {
+                const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
+                if (!IsValidArgType(n?.type_parameter)) {
+                    ERROR(Errors.IsValidArgType, 'CallArbitration_Data.data.object.type_parameter');
+                }          
+                this.permission_address = await LocalMark.Instance().get_address(GetObjectExisted(n?.permission));
+                this.type_parameter = n.type_parameter;
+            }             
+        }
+    }
+
     async call(account?:string) : Promise<CallResult> {
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = []; 
-        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?.fee_treasury as any)?.address]);
-
-        if (object_address) {
-            if (!this.data.type_parameter || !permission_address) {
-                await this.update_content(object_address, 'Arbitration');
-                if (this.content) {
-                    permission_address = (this.content as ObjectArbitration).permission;     
-                    this.data.type_parameter =  this.content.type_raw!;             
-                }
-            } 
-        } else {
-            if (!this.data?.type_parameter || !IsValidArgType(this.data.type_parameter)) {
-                ERROR(Errors.IsValidArgType, 'CallArbitration_Data.data.type_parameter')
-            }
-        }
 
-        if (permission_address) {
+        await this.prepare();
+        if (this.permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.arbitration)
             }
-            if (this.data?.description !== undefined && object_address) {
+            if (this.data?.description !== undefined && this.object_address) {
                 perms.push(PermissionIndex.arbitration_description)
             }
             if (this.data?.bPaused !== undefined) {
@@ -75,10 +80,10 @@ export class CallArbitration extends CallBase {
             if (this.data?.endpoint == undefined) { // publish is an irreversible one-time operation 
                 perms.push(PermissionIndex.arbitration_endpoint)
             }
-            if (this.data?.fee !== undefined && object_address) {
+            if (this.data?.fee !== undefined && this.object_address) {
                 perms.push(PermissionIndex.arbitration_fee)
             }
-            if (treasury_address !== undefined && object_address) {
+            if (this.data.fee_treasury !== undefined && this.object_address) {
                 perms.push(PermissionIndex.arbitration_treasury)
             }
             if (this.data?.guard !== undefined) {
@@ -90,27 +95,15 @@ export class CallArbitration extends CallBase {
             if (this.data?.arb_arbitration !== undefined) {
                 perms.push(PermissionIndex.arbitration_arbitration)
             }
-            if (this.data?.arb_new?.guard !== undefined) {
-                if (this.data?.arb_new?.guard) {
-                    const guard = await LocalMark.Instance().get_address(this.data?.arb_new?.guard);
-                    if (guard) {
-                        guards.push(guard)
-                    } 
-                } else {
-                    if (!object_address) { // new
-                        const guard = await LocalMark.Instance().get_address(this.data.guard);
-                        if (guard) {
-                            guards.push(guard);
-                        }
-                    } else {
-                        await this.update_content(object_address, 'Arbitration');
- 
-                        if ((this.content as ObjectArbitration)?.usage_guard) {
-                            guards.push((this.content as ObjectArbitration).usage_guard!)
-                        }                   
-                    }
+
+            if (this.data?.arb_new !== undefined) { // new arb with guard and permission
+                if (this.object_address) { 
+                    if ((this.content as ObjectArbitration)?.usage_guard) {
+                        guards.push((this.content as ObjectArbitration).usage_guard!)
+                    }   
                 }
             }
+
             if (this.data?.arb_vote !== undefined) {
                 perms.push(PermissionIndex.arbitration_vote);
 
@@ -120,135 +113,159 @@ export class CallArbitration extends CallBase {
                 } 
             }
 
-            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 : Arbitration | undefined ; let permission: any; let withdraw_treasury:any;
-        var [permission_address, object_address] = this?.content ? 
-        [(this.content as ObjectArbitration).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?.fee_treasury as any)?.address);
-
-        if (!object_address) {
-            if (!permission_address) {
-                const d = (this.data?.permission as any)?.description ?? '';
-                permission = Permission.New(txb, d);
+        let obj : Arbitration | undefined ; let perm: Permission | undefined;
+        let permission : PermissionObject | undefined;
+        let withdraw_treasury:Treasury | undefined;
+
+        if (this.object_address) {
+            obj = Arbitration.From(txb, this.type_parameter!, this.permission_address!, this.object_address);
+            permission = this.permission_address;
+        } else {
+            const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission;
+            permission = await LocalMark.Instance().get_address(GetObjectExisted(n?.permission));
+            if (!permission) {
+                perm = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
+                permission =  perm.get_object();
             }
+            const treasury_address = await LocalMark.Instance().get_address(GetObjectExisted(this.data.fee_treasury));
             if (!treasury_address) {
-                const d = (this.data?.fee_treasury as any)?.description ?? '';
-                withdraw_treasury = Treasury.New(txb, this.data?.type_parameter!, permission ? permission.get_object() : permission_address, 
-                    d, permission?undefined:passport);
-            }
-            obj = Arbitration.New(txb, this.data.type_parameter!, permission ? permission.get_object() : permission_address, this.data?.description??'', 
-                BigInt(this.data?.fee ?? 0), withdraw_treasury? withdraw_treasury.get_object() : treasury_address, permission?undefined:passport);
-        } else {
-            if (this.data.type_parameter && permission_address) {
-                obj = Arbitration.From(txb, this.data.type_parameter, permission_address, object_address)
-            } else {
-                ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.type_parameter or permission')
+                withdraw_treasury = Treasury.New(txb, this.type_parameter!, permission, 
+                    GetObjectParam(this.data.fee_treasury)?.description ?? '', perm?undefined:passport);
             }
+            const t = withdraw_treasury ? withdraw_treasury.get_object() : treasury_address;
+            if (!t) {   
+                ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.fee_treasury')
+            }   
+            obj = Arbitration.New(txb, this.type_parameter!, permission, this.data?.description??'', 
+                BigInt(this.data?.fee ?? 0), t, perm?undefined:passport);
         }
 
-        if (obj) {
-            const pst = permission?undefined:passport;
-            if (this.data?.description !== undefined && object_address) {
-                obj?.set_description(this.data.description, pst);
-            }
-            if (this.data?.endpoint !== undefined) {
-                obj?.set_endpoint(this.data.endpoint, pst)
-            }
-            if (this.data?.fee !== undefined && object_address) {
-                obj?.set_fee(BigInt(this.data.fee), pst)
-            }
-            if (treasury_address !== undefined && object_address) {
-                obj?.set_withdrawTreasury(treasury_address, pst)
+        if (!obj) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.object');
+        if (!permission) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.object.permission');
+            
+        const pst = perm?undefined:passport;
+        var arb_new : ArbObject | undefined;
+        if (this.data?.arb_new !== undefined) {
+            const d = this.data?.arb_new.data; 
+            const order = await LocalMark.Instance().get_address(d.order);
+            const fee = BigInt((this.object_address ? (this.content as ObjectArbitration)?.fee : this.data?.fee) ?? 0);
+            const max_fee = BigInt(d.max_fee);
+            if (!order) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_new.order');
+            const r = await query_objects({objects:[order]});
+            if (r?.objects?.length !== 1 || r?.objects[0]?.type !== 'Order') {
+                ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_new.order is not an Order object');
             }
-            var arb_new : ArbObject | undefined;
-            if (this.data?.arb_new !== undefined) {
-                const d = this.data?.arb_new.data; 
-                const order = await LocalMark.Instance().get_address(d.order);
-                if (order) {
-                    const b = BigInt(d.fee); 
-                    arb_new = obj?.arb({order:d.order, order_token_type:d.order_token_type, description:d.description, votable_proposition:d.votable_proposition, 
-                        fee: b>BigInt(0) ? await Account.Instance().get_coin_object(txb, b, account, this.data.type_parameter) : undefined
-                    }, pst);                    
-                }
+            const order_type = Service.parseOrderObjectType(r.objects[0].type_raw);
+            if (!order_type) {
+                ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_new.order type invalid');
             }
 
-            if (this.data?.arb_arbitration !== undefined) {
-                const a = await LocalMark.Instance().get_address(this.data.arb_arbitration.arb) ?? arb_new;
-                if (!a) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_arbitration.arb');
+            if (fee > max_fee) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_new.fee > max_fee');
 
-                obj?.arbitration({arb:a!, feedback:this.data.arb_arbitration.feedback, indemnity:this.data.arb_arbitration.indemnity}, pst)
-            }
+            arb_new = obj?.arb({order:d.order, order_token_type:order_type, description:d.description, votable_proposition:d.votable_proposition, 
+                fee: fee>BigInt(0) ? await Account.Instance().get_coin_object(txb, fee, account, this.type_parameter) : undefined
+            }, pst);                    
+            
+        }
 
-            if (this.data?.arb_vote !== undefined) {
-                const a = await LocalMark.Instance().get_address(this.data.arb_vote.arb) ?? arb_new;
-                if (!a) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_vote.arb');
+        if (this.data?.arb_arbitration !== undefined) {
+            const a = await LocalMark.Instance().get_address(this.data.arb_arbitration.arb) ?? arb_new;
+            if (!a) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_arbitration.arb');
 
-                obj?.vote({arb:a!, voting_guard:this.data.arb_vote.voting_guard, agrees:this.data.arb_vote.agrees}, pst)
-            }
+            obj?.arbitration({arb:a!, feedback:this.data.arb_arbitration.feedback, indemnity:this.data.arb_arbitration.indemnity}, pst)
+        }
 
-            if (this.data?.arb_withdraw_fee !== undefined) {
-                const a = await LocalMark.Instance().get_address(this.data.arb_withdraw_fee.arb) ?? arb_new;
-                if (!a) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_withdraw_fee.arb');
+        if (this.data?.arb_vote !== undefined) {
+            const a = await LocalMark.Instance().get_address(this.data.arb_vote.arb) ?? arb_new;
+            if (!a) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_vote.arb');
 
-                obj?.withdraw_fee(a!, this.data.arb_withdraw_fee.data, pst)
-            }
+            obj?.vote({arb:a!, voting_guard:this.data.arb_vote.voting_guard, agrees:this.data.arb_vote.agrees}, pst)
+        }
+
+        if (this.data?.arb_withdraw_fee !== undefined) {
+            const a = await LocalMark.Instance().get_address(this.data.arb_withdraw_fee.arb);
+            if (!a) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_withdraw_fee.arb');
+    
+            obj?.withdraw_fee(a!, await SetWithdrawFee(this.data.arb_withdraw_fee.data, (this.content as ObjectArbitration).fee_treasury), pst);
+        }
+
+        if (arb_new) {
+            await this.new_with_mark('Arb', txb, obj?.arb_launch(arb_new), (this.data?.arb_new as any)?.namedNew, account);
+        }
 
-            if (arb_new) {
-                await this.new_with_mark('Arb', txb, obj?.arb_launch(arb_new), (this.data?.arb_new as any)?.namedNew, account);
+        if (this.data?.description !== undefined && this.object_address) {
+            obj?.set_description(this.data.description, pst);
+        }
+        if (this.data?.endpoint !== undefined) {
+            obj?.set_endpoint(this.data.endpoint, pst)
+        }
+        if (this.data?.fee !== undefined && this.object_address) {
+            obj?.set_fee(BigInt(this.data.fee), pst)
+        }
+        if (this.data?.fee_treasury !== undefined && this.object_address) {
+            const treasury_address = await LocalMark.Instance().get_address(GetObjectExisted(this.data.fee_treasury));
+            if (!treasury_address) {
+                withdraw_treasury = Treasury.New(txb, this.type_parameter!, permission, 
+                    GetObjectParam(this.data.fee_treasury)?.description ?? '', pst);
             }
-            
-            if (this.data?.voting_guard !== undefined) {
-                switch (this.data.voting_guard.op) {
-                    case 'add':
-                    case 'set':
-                        for (let i = 0; i < this.data.voting_guard.data.length; ++ i) {
-                            const v = this.data.voting_guard.data[i];
-                            if (typeof(v.guard) === 'string') {
-                                const g = await LocalMark.Instance().get_address(v.guard);
-                                if (!g) {
-                                    ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.voting_guard')
-                                } 
-                                v.guard = g;
+            const t = withdraw_treasury ? withdraw_treasury.get_object() : treasury_address;
+            if (!t) {   
+                ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.fee_treasury')
+            }   
+            obj?.set_withdrawTreasury(t, pst)
+        }
+        
+        const guard = await LocalMark.Instance().get_address(this.data.guard);
+        if (guard) {
+            obj?.set_guard(guard, pst)
+        }
+
+        if (this.data?.voting_guard !== undefined) {
+            switch (this.data.voting_guard.op) {
+                case 'add':
+                case 'set':
+                    for (let i = 0; i < this.data.voting_guard.data.length; ++ i) {
+                        const v = this.data.voting_guard.data[i];
+                        if (typeof(v.guard) === 'string') {
+                            const g = await LocalMark.Instance().get_address(v.guard);
+                            if (!g) {
+                                ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.voting_guard')
                             } 
-                        }
-                        if (this.data.voting_guard.op === 'set') {
-                            obj?.remove_voting_guard([], true, pst)
-                        }
-                        obj?.add_voting_guard(this.data.voting_guard.data, pst);
-                        break;
-                    case 'remove':
-                        obj?.remove_voting_guard(await LocalMark.Instance().get_many_address2(this.data.voting_guard.guards), false, pst)
-                        break;
-                    case 'removeall':
+                            v.guard = g;
+                        } 
+                    }
+                    if (this.data.voting_guard.op === 'set') {
                         obj?.remove_voting_guard([], true, pst)
-                        break;
-                }
-            }
-            const guard = await LocalMark.Instance().get_address(this.data.guard);
-            if (guard) {
-                obj?.set_guard(guard, pst)
-            }
-
-            if (this.data?.bPaused !== undefined) {
-                obj?.pause(this.data.bPaused, pst);
-            }
-            if (withdraw_treasury) {
-                await this.new_with_mark('Treasury', txb, withdraw_treasury.launch(), (this.data?.fee_treasury as any)?.namedNew, account);
-            }
-            if (permission) {
-                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                    }
+                    obj?.add_voting_guard(this.data.voting_guard.data, pst);
+                    break;
+                case 'remove':
+                    obj?.remove_voting_guard(await LocalMark.Instance().get_many_address2(this.data.voting_guard.guards), false, pst)
+                    break;
+                case 'removeall':
+                    obj?.remove_voting_guard([], true, pst)
+                    break;
             }
+        }
 
-            if (!object_address) {
-                await this.new_with_mark('Arbitration', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
-            } 
+        if (this.data?.bPaused !== undefined) {
+            obj?.pause(this.data.bPaused, pst);
         }
+        if (withdraw_treasury) {
+            await this.new_with_mark('Treasury', txb, withdraw_treasury.launch(), GetObjectParam(this.data?.fee_treasury), account);
+        }
+        if (perm) {
+            const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
+            await this.new_with_mark('Permission', txb, perm.launch(), GetObjectParam(n?.permission), account);
+        }
+
+        if (!this.object_address) {
+            await this.new_with_mark('Arbitration', txb, obj.launch(), GetObjectMain(this.data?.object), account);
+        } 
     }
 }

package/src/call/base.ts

@@ -1,21 +1,95 @@
 
 
 import { Entity, Resource, TxbAddress, array_unique, TagName, ResourceObject, PassportObject, Errors, ERROR, Permission, 
-    PermissionIndexType, GuardParser, Passport, WitnessFill, CallResponse, TransactionBlock
+    PermissionIndexType, GuardParser, Passport, WitnessFill, CallResponse, TransactionBlock,
+    WithdrawFee, TreasuryObject
 } from 'wowok';
 import { query_permission } from '../query/permission.js';
 import { Account } from '../local/account.js';
-import { ObjectArbitration, ObjectBase, ObjectBaseType, query_objects, query_personal, raw2type} from '../query/objects.js';
+import { ObjectBase, ObjectBaseType, query_objects, query_personal, raw2type} from '../query/objects.js';
 import { LocalMark } from '../local/local.js';
 
 export interface Namedbject {
-    name?: string; 
-    tags?: string[];
+    name?: string;  // name of the object, if not defined, the object will be created without name      
+    tags?: string[]; // tags of the object, if not defined, the object will be created without tags
     // true: use address as the name if the name exist; otherwise, use this name and change the original name to its address
     useAddressIfNameExist?: boolean; 
-    onChain?: boolean; // true: onchain, false: local(default)
+    onChain?: boolean; // true: onchain mark, false: local mark(default)
+}
+
+export interface NamedObjectWithDescription extends Namedbject {
+    description?:string; // description of the new object, if not defined, the object will be created with no description.
+}
+
+export interface NamedObjectWithPermission extends Namedbject {
+    // permission object, undefined or {named_new...} for creating a new object;  if defined, the permission object must exist. 
+    permission?: ObjectParam; 
+}
+
+export interface TypeNamedObjectWithPermission extends NamedObjectWithPermission {
+    // type of the object, e.g. '0x2::coin::Coin<0x2::sui::SUI>'
+    type_parameter: string;  
+};
+
+/// object address or namedNew for creating a new object
+export type ObjectTypedMain = string |  TypeNamedObjectWithPermission ;
+export type ObjectMain = string | NamedObjectWithPermission ;
+export type ObjectPermissionMain = string | Namedbject;
+export type ObjectParam = string | NamedObjectWithDescription;
+
+export const GetObjectExisted = (object: ObjectMain | ObjectTypedMain | ObjectParam | ObjectPermissionMain | undefined) : string | undefined => {
+    return (typeof object === 'string' ) ? object : undefined;
+}
+
+export const GetObjectMain = (object: ObjectMain | ObjectTypedMain | ObjectPermissionMain | undefined) : NamedObjectWithPermission | TypeNamedObjectWithPermission | Namedbject | undefined => {
+   if (typeof object === 'object' && object !== null && 'type_parameter' in object) {
+       return (object as TypeNamedObjectWithPermission);
+   } else if (typeof object === 'object' && object !== null && 'permission' in object) {
+       return (object as NamedObjectWithPermission);
+   } else if (typeof object === 'object') {
+       return (object as Namedbject);
+   }
+}
+
+export const GetObjectParam = (object: ObjectParam | undefined) : NamedObjectWithDescription | undefined => {
+    return (typeof object === 'object' && object!== null && 'description' in object)? (object as NamedObjectWithDescription) : undefined;
 }
 
+// address from local Account or local Mark.
+export type AccountOrMark_Address = {account?: string} | {name_or_address: string};
+
+export const GetAccountOrMark_Address = async (entity?: AccountOrMark_Address) : Promise<string | undefined> => {
+    if (typeof((entity as any)?.name_or_address) === 'string') {
+        return await LocalMark.Instance().get_address((entity as any).name_or_address);
+    } else {
+        const acc = await Account.Instance().get((entity as any)?.account);
+        return acc?.address;
+    }
+}
+
+export const GetManyAccountOrMark_Address = async (entities: AccountOrMark_Address[]) : Promise<(string | undefined)[]> => {
+    const res = [];
+    for (let i = 0; i < entities.length; ++i) {
+        const addr = await GetAccountOrMark_Address(entities[i]);
+        if (addr) res.push(addr);
+    }
+    return res;
+}
+
+export interface WithdrawParam {
+    index: bigint | string | number,
+    remark: string,
+    for_object?: string,
+    for_guard?: string,
+}
+
+export const SetWithdrawFee = async (param: WithdrawParam, treasury?:TreasuryObject) : Promise<WithdrawFee> => {
+    if (!treasury) {
+        ERROR(Errors.InvalidParam, 'WithdrawFee: treasury_address invalid');
+    }
+    const [object, guard] = await LocalMark.Instance().get_many_address([param.for_object, param.for_guard]);
+    return {index:BigInt(param.index), remark:param.remark, for_object:object, for_guard:guard, treasury:treasury};
+}
 export interface AddressMark {
     address: TxbAddress;
     name?: string; 
@@ -53,6 +127,7 @@ export class CallBase {
     content: ObjectBase | undefined = undefined;
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {};
+    protected async prepare() {};
     constructor () {}
     // return WitnessFill to resolve filling witness, and than 'call_with_witness' to complete the call; 
     // return ResponseData when the call has completed; 
@@ -67,6 +142,7 @@ export class CallBase {
                 if (query) {
                     const txb = new TransactionBlock();
                     const passport = new Passport(txb, query!);   
+                    await this.prepare();
                     await this.operate(txb, passport?.get_object(), account)
                     passport.destroy();
                     
@@ -99,7 +175,6 @@ export class CallBase {
         if (guards_needed.length > 0) {
             guards = guards.concat(guards_needed);
         }
-
         if (guards.length > 0) {         // prepare passport
             const p: GuardParser | undefined = await GuardParser.Create([...guards]);
             const futures = p ? p.future_fills() : []; 
@@ -156,10 +231,10 @@ export class CallBase {
         }
     }
 
-    protected async update_content(object:string, type:ObjectBaseType)  {
-        if (this.content)   return ;
+    protected async update_content(type:ObjectBaseType, object?:string)  {
+        if (this.content || !object)   return ;
 
-        const r = await query_objects({objects:[object]});
+        const r = await query_objects({objects:[object], no_cache:true});
         if (r?.objects?.length !== 1 || r?.objects[0]?.type !== type) {
             ERROR(Errors.Fail, `Fetch ${type} object ${object} failed`)
         }
@@ -173,7 +248,6 @@ export class CallBase {
             this.resouceObject = undefined;
         }
         const r = await Account.Instance().sign_and_commit(txb, account);
-        
         if (!r) {
             ERROR(Errors.Fail, 'sign and commit failed');
         }

package/src/call/call.ts

@@ -20,27 +20,32 @@ export interface CallDemandObject {
     data: CallDemand_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
+    no_cache?: boolean;
 }
 
 export interface CallServiceObject {
     data: CallService_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
+    no_cache?: boolean;
 }
 export interface CallMachineObject {
     data: CallMachine_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
+    no_cache?: boolean; // true: no cache to query the machine, false: use cache if exist
 }
 export interface CallTreasuryObject {
     data: CallTreasury_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
+    no_cache?: boolean;
 }
 export interface CallArbitrationObject {
     data: CallArbitration_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
+    no_cache?: boolean;
 }
 export interface CallGuardObject {
     data: CallGuard_Data;
@@ -50,6 +55,7 @@ export interface CallRepositoryObject {
     data: CallRepository_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
+    no_cache?: boolean;
 }
 export interface CallPersonalObject {
     data: CallPersonal_Data;