wowok_agent 1.3.47 → 1.3.48

package/src/call/arbitration.ts

@@ -1,5 +1,6 @@
 import { TransactionBlock, IsValidArgType, PassportObject, Errors, ERROR, Permission, PermissionIndex, 
     PermissionIndexType, Treasury, Arbitration, VotingGuard, ArbObject, Service,
+    PermissionObject,
 } from 'wowok';
 import { ObjectArbitration, query_objects, } from '../query/objects.js';
 import { CallBase, CallResult, GetObjectExisted, GetObjectMain, GetObjectParam, Namedbject, 
@@ -42,24 +43,30 @@ export class CallArbitration extends CallBase {
         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[] = []; 
-        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 (!n?.type_parameter || !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;
-        } 
 
+        await this.prepare();
         if (this.permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.arbitration)
@@ -94,12 +101,7 @@ export class CallArbitration extends CallBase {
                     if ((this.content as ObjectArbitration)?.usage_guard) {
                         guards.push((this.content as ObjectArbitration).usage_guard!)
                     }   
-                }/* else {
-                    const guard = await LocalMark.Instance().get_address(this.data.guard);
-                    if (guard) {
-                        guards.push(guard);
-                    }
-                }*/ 
+                }
             }
 
             if (this.data?.arb_vote !== undefined) {
@@ -116,151 +118,154 @@ export class CallArbitration extends CallBase {
         return await this.exec(account);
     }
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
-        let obj : Arbitration | undefined ; 
-        let permission: any; 
+        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;
-            if (!this.permission_address) {
-                permission = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
+            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) {
-                withdraw_treasury = Treasury.New(txb, this.type_parameter!, permission ? permission.get_object() : this.permission_address, 
-                    GetObjectParam(this.data.fee_treasury)?.description ?? '', permission?undefined:passport);
+                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 ? permission.get_object() : this.permission_address, this.data?.description??'', 
-                BigInt(this.data?.fee ?? 0), t, permission?undefined:passport);
+            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;
-            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');
-                }
-                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 (!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');
+            }
+            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 (fee > max_fee) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_new.fee > max_fee');
+            if (fee > max_fee) ERROR(Errors.InvalidParam, 'CallArbitration_Data.data.arb_new.fee > max_fee');
 
-                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);                    
-                
-            }
+            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_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 (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?.arbitration({arb:a!, feedback:this.data.arb_arbitration.feedback, indemnity:this.data.arb_arbitration.indemnity}, pst)
-            }
+            obj?.arbitration({arb:a!, feedback:this.data.arb_arbitration.feedback, indemnity:this.data.arb_arbitration.indemnity}, 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_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?.vote({arb:a!, voting_guard:this.data.arb_vote.voting_guard, agrees:this.data.arb_vote.agrees}, 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 (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 ? permission.get_object() : this.permission_address, 
-                        GetObjectParam(this.data.fee_treasury)?.description ?? '', permission?undefined:passport);
-                }
-                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?.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);
             }
+            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')
-                                } 
-                                v.guard = g;
+        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;
-                }
-            }
-
-            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 (permission) {
-                const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
-                await this.new_with_mark('Permission', txb, permission.launch(), GetObjectParam(n?.permission), 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 (!this.object_address) {
-                await this.new_with_mark('Arbitration', txb, obj.launch(), GetObjectMain(this.data?.object), 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

@@ -34,17 +34,21 @@ export interface TypeNamedObjectWithPermission extends NamedObjectWithPermission
 /// 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 | undefined) : string | undefined => {
+export const GetObjectExisted = (object: ObjectMain | ObjectTypedMain | ObjectParam | ObjectPermissionMain | undefined) : string | undefined => {
     return (typeof object === 'string' ) ? object : undefined;
 }
 
-export const GetObjectMain = (object: ObjectMain | ObjectTypedMain | undefined) : NamedObjectWithPermission | TypeNamedObjectWithPermission | undefined => {
-    return (typeof object === 'object' && object !== null && 'type_parameter' in object) ? 
-        (object as TypeNamedObjectWithPermission) : 
-        (typeof object === 'object' && object !== null && 'permission' in object) ? 
-            (object as NamedObjectWithPermission) : 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 => {
@@ -123,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; 
@@ -137,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();
                     

package/src/call/demand.ts

@@ -1,9 +1,11 @@
 import { TransactionBlock, IsValidArgType, Service, PassportObject, Errors, ERROR, Permission, PermissionIndex, 
-    PermissionIndexType, Demand, } from 'wowok';
+    PermissionIndexType, Demand,
+    PermissionObject, } from 'wowok';
 import { ObjectDemand, query_objects } from '../query/objects.js';
 import { CallBase, CallResult, GetObjectExisted, GetObjectMain, GetObjectParam, ObjectTypedMain, TypeNamedObjectWithPermission } from "./base.js";
 import { Account } from '../local/account.js';
 import { LocalMark } from '../local/local.js';
+import { off } from 'process';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallDemand_Data {
@@ -30,24 +32,30 @@ export class CallDemand extends CallBase {
         super();
         this.data = data;
     }
+
+    protected async prepare(): Promise<void> {
+        if (!this.object_address) {
+            this.object_address = (await LocalMark.Instance().get_address(GetObjectExisted(this.data.object)));
+            if (this.object_address) {
+                await this.update_content('Demand', this.object_address);
+                if (!this.content) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.object:' + this.object_address);
+                this.permission_address = (this.content as ObjectDemand).permission;
+                this.type_parameter = Demand.parseObjectType(this.content.type_raw);
+            } else {
+                const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
+                if (!IsValidArgType(n?.type_parameter)) {
+                    ERROR(Errors.IsValidArgType, 'CallDemand_Data.data.object.type_parameter');
+                }          
+                this.permission_address = (await LocalMark.Instance().get_address(GetObjectExisted(n?.permission)));
+                this.type_parameter = n.type_parameter;
+            }             
+        }
+    }
     async call(account?:string) : Promise<CallResult> {
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = []; 
-        this.object_address = (await LocalMark.Instance().get_address(GetObjectExisted(this.data.object)));
-        if (this.object_address) {
-            await this.update_content('Demand', this.object_address);
-            if (!this.content) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.object:' + this.object_address);
-            this.permission_address = (this.content as ObjectDemand).permission;
-            this.type_parameter = Demand.parseObjectType(this.content.type_raw);
-        } else {
-            const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
-            if (!n?.type_parameter || !IsValidArgType(n.type_parameter)) {
-                ERROR(Errors.IsValidArgType, 'CallDemand_Data.data.object.type_parameter');
-            }          
-            this.permission_address = (await LocalMark.Instance().get_address(GetObjectExisted(n?.permission)));
-            this.type_parameter = n.type_parameter;
-        } 
 
+        await this.prepare();
         if (this.permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.demand)
@@ -72,98 +80,98 @@ export class CallDemand extends CallBase {
                     if ((this.content as ObjectDemand)?.guard?.object) {
                         guards.push((this.content as ObjectDemand).guard?.object!);
                     }
-                } /*else {
-                    const guard = await LocalMark.Instance().get_address(this.data?.guard?.address);
-                    if (guard) {
-                        guards.push(guard)
-                    }
-                }*/
+                } 
             }
             return await this.check_permission_and_call(this.permission_address, perms, guards, checkOwner, undefined, account)
         }
         return await this.exec(account);
     }
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
-        let obj : Demand | undefined ; let permission: any;
+        let obj : Demand | undefined ; let perm: Permission | undefined;
+        let permission : PermissionObject | undefined;
 
         if (this.object_address) {
-            obj = Demand.From(txb, this.type_parameter!, this.permission_address!, this.object_address)
+            obj = Demand.From(txb, this.type_parameter!, this.permission_address!, this.object_address);
+            permission = this.permission_address;
         } else {
             const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
-            if (!this.permission_address) {
-                permission = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
+            permission = await LocalMark.Instance().get_address(GetObjectExisted(n?.permission));
+            if (!permission) {
+                perm = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
+                permission =  perm.get_object();
             }
             
             if (this.data.time_expire !== undefined) {
                 obj = Demand.New(txb, this.type_parameter!, this.data.time_expire?.op === 'duration' ? true : false, 
                     this.data.time_expire?.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire?.time,
-                    permission ? permission.get_object(): this.permission_address, this.data?.description??'', permission?undefined:passport)
+                    permission, this.data?.description??'', perm?undefined:passport)
             } else {
                 obj = Demand.New(txb, this.type_parameter!, true, 30*24*60, // 30days default
-                    permission ? permission.get_object(): this.permission_address, this.data?.description??'', permission?undefined:passport)       
+                    permission, this.data?.description??'', perm?undefined:passport)       
             }
         }
 
-        if (obj) {
-            const pst = permission?undefined:passport;
-            if (this.data?.present !== undefined) {
-                if ((this.content as ObjectDemand)?.guard?.service_id_in_guard !== undefined && (this.content as ObjectDemand)?.guard?.service_id_in_guard !== null) {
-                    obj?.present((this.content as ObjectDemand)!.guard!.service_id_in_guard!, undefined, this.data.present.recommend_words, pst);
-                } else {
-                    const service_address = await LocalMark.Instance().get_address(this.data.present.service);
-                    if (!service_address) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service');
-                    const r = await query_objects({objects:[service_address]});
-                    if (r?.objects?.length !== 1 || r?.objects[0]?.type !== 'Service') {
-                        ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
-                    }
-                    const service_type = Service.parseOrderObjectType(r.objects[0].type_raw);
-                    if (!service_type) {
-                        ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
-                    }
+        if (!obj)   ERROR(Errors.InvalidParam, 'CallDemand_Data.data.object');
+        if (!permission)   ERROR(Errors.InvalidParam, 'CallDemand_Data.data.object.permission');
 
-                    obj?.present(service_address, service_type, this.data.present.recommend_words, pst);
+        const pst = perm?undefined:passport;
+        if (this.data?.present !== undefined) {
+            if ((this.content as ObjectDemand)?.guard?.service_id_in_guard !== undefined && (this.content as ObjectDemand)?.guard?.service_id_in_guard !== null) {
+                obj?.present((this.content as ObjectDemand)!.guard!.service_id_in_guard!, undefined, this.data.present.recommend_words, pst);
+            } else {
+                const service_address = await LocalMark.Instance().get_address(this.data.present.service);
+                if (!service_address) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service');
+                const r = await query_objects({objects:[service_address]});
+                if (r?.objects?.length !== 1 || r?.objects[0]?.type !== 'Service') {
+                    ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
+                }
+                const service_type = Service.parseOrderObjectType(r.objects[0].type_raw);
+                if (!service_type) {
+                    ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
                 }
-            }
 
-            if (this.data?.description !== undefined && this.object_address) {
-                obj?.set_description(this.data.description, pst);
+                obj?.present(service_address, service_type, this.data.present.recommend_words, pst);
             }
-            if (this.data?.time_expire !== undefined && this.object_address) {
-                obj?.expand_time(this.data.time_expire.op === 'duration' ? true : false, 
-                    this.data.time_expire.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire.time, pst)
-            }
-            if (this.data?.bounty !== undefined) {
-                if (this.data.bounty.op === 'add') {
-                    const bounty = await LocalMark.Instance().get_address((this.data.bounty.object as any)?.address)
-                    if (bounty) {
-                        obj.deposit(bounty)
-                    } else if ((this.data.bounty.object as any)?.balance !== undefined){
-                        const r = await Account.Instance().get_coin_object(txb, (this.data.bounty.object as any)?.balance, account, this.type_parameter);
-                        if (r) obj.deposit(r)
-                    }
-                } else if (this.data.bounty.op === 'reward') {
-                    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?.guard !== undefined) {
-                const guard = await LocalMark.Instance().get_address(this.data?.guard.address);
-                if (!guard) { 
-                    ERROR(Errors.InvalidParam, 'CallDemand_Data.data.guard.address')
+        }
+
+        if (this.data?.description !== undefined && this.object_address) {
+            obj?.set_description(this.data.description, pst);
+        }
+        if (this.data?.time_expire !== undefined && this.object_address) {
+            obj?.expand_time(this.data.time_expire.op === 'duration' ? true : false, 
+                this.data.time_expire.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire.time, pst)
+        }
+        if (this.data?.bounty !== undefined) {
+            if (this.data.bounty.op === 'add') {
+                const bounty = await LocalMark.Instance().get_address((this.data.bounty.object as any)?.address)
+                if (bounty) {
+                    obj.deposit(bounty)
+                } else if ((this.data.bounty.object as any)?.balance !== undefined){
+                    const r = await Account.Instance().get_coin_object(txb, (this.data.bounty.object as any)?.balance, account, this.type_parameter);
+                    if (r) obj.deposit(r)
                 }
-                obj?.set_guard(guard, this.data.guard?.service_id_in_guard ?? undefined, pst);
-            }
-            if (permission) {
-                const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
-                await this.new_with_mark('Permission', txb, permission.launch(), GetObjectParam(n?.permission), account);
-            }
-            if (!this.data.object) {
-                await this.new_with_mark('Demand', txb, obj.launch(), GetObjectMain(this.data?.object), account);
+            } else if (this.data.bounty.op === 'reward') {
+                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?.guard !== undefined) {
+            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 (perm) {
+            const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
+            await this.new_with_mark('Permission', txb, perm.launch(), GetObjectParam(n?.permission), account);
+        }
+        if (!this.data.object) {
+            await this.new_with_mark('Demand', txb, obj.launch(), GetObjectMain(this.data?.object), account);
         }
     }
 }