wowok_agent 1.3.47 → 1.3.49

package/src/call/machine.ts

@@ -1,25 +1,34 @@
 import { PassportObject, Errors, ERROR, Permission, PermissionIndex, TransactionBlock, TxbAddress,
-    PermissionIndexType, Machine, Machine_Forward, Machine_Node,  Deliverable, ParentProgress, Progress, ProgressNext,
+    PermissionIndexType, Machine, Machine_Forward, Machine_Node, ParentProgress, Progress, ProgressNext,
+    PermissionObject,
+    OrderWrap,
+    Service,
 } from 'wowok';
-import { CallBase, CallResult, GetObjectExisted, GetObjectMain, GetObjectParam, Namedbject, ObjectMain, TypeNamedObjectWithPermission } from "./base.js";
-import { ObjectMachine } from '../query/objects.js';
+import { AccountOrMark_Address, CallBase, CallResult, GetAccountOrMark_Address, GetManyAccountOrMark_Address, GetObjectExisted, GetObjectMain, GetObjectParam, Namedbject, ObjectMain, ObjectsOp, TypeNamedObjectWithPermission } from "./base.js";
+import { ObjectMachine, query_objects } from '../query/objects.js';
 import { LocalMark } from '../local/local.js';
 import { Account } from '../local/account.js';
 
+
+export interface ProgressDeliverable {
+    msg: string;
+    orders: string[];
+}
+
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallMachine_Data {
     object?: ObjectMain;
     progress_new?: {task_address?:string, namedNew?: Namedbject};
     progress_context_repository?: {progress?:string; repository?:string};
-    progress_namedOperator?: {progress?:string; data:{name:string, operators:string[]}[]};
+    progress_namedOperator?: {progress?:string; data:{name:string, operators:AccountOrMark_Address[]}[]};
     progress_parent?: {progress?:string, parent?:ParentProgress};
     progress_hold?: {progress?:string; operation:ProgressNext; bHold:boolean; adminUnhold?:boolean};
     progress_task?: {progress:string; task_address:string};
-    progress_next?: {progress:string; operation:ProgressNext; deliverable:Deliverable};
+    progress_next?: {progress:string; operation:ProgressNext; deliverable:ProgressDeliverable};
 
     description?: string;
     endpoint?: string;
-    consensus_repository?: {op:'set' | 'add' | 'remove' ; repositories:string[]} | {op:'removeall'};
+    consensus_repository?: ObjectsOp;
     nodes?: {op: 'add'; data: Machine_Node[]} | {op: 'remove'; names: string[], bTransferMyself?:boolean} 
     | {op:'rename node'; data:{old:string; new:string}[]} | {op:'add from myself'; addresses: string[]}
     | {op:'remove pair'; pairs: {prior_node_name:string; node_name:string}[]}
@@ -38,19 +47,26 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
         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('Machine', this.object_address);
+                if (!this.content) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.object:' + this.object_address);
+                this.permission_address = (this.content as ObjectMachine).permission;
+            } else {
+                const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission; 
+                this.permission_address = (await LocalMark.Instance().get_address(GetObjectExisted(n?.permission)));
+            } 
+        }
+    }
+
     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('Machine', this.object_address);
-            if (!this.content) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.object:' + this.object_address);
-            this.permission_address = (this.content as ObjectMachine).permission;
-        } else {
-            const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission; 
-            this.permission_address = (await LocalMark.Instance().get_address(GetObjectExisted(n?.permission)));
-        } 
-
+        
+        await this.prepare();
         if (this.permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.machine)
@@ -120,158 +136,181 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
     }
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
-        let obj : Machine | undefined ; let permission: any;
+        let obj : Machine | undefined ; let perm: Permission | undefined;
+        let permission : PermissionObject | undefined;
+        
         if (this.object_address) {
             obj = Machine.From(txb, 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();
             }
-
-            obj = Machine.New(txb, permission ? permission.get_object() : this.permission_address, this.data?.description??'', 
+            
+            obj = Machine.New(txb, permission, this.data?.description??'', 
                 this.data?.endpoint, permission?undefined:passport);
         }
 
-        if (obj) {
-            const pst = permission?undefined:passport;
-            const perm = permission ? permission.get_object() : this.permission_address;
+        if (!obj) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.object');
+        if (!permission) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.object.permission');
 
-            var new_progress : Progress | undefined;
-            if (this.data?.progress_new !== undefined) {
-                const task = await LocalMark.Instance().get_address(this.data?.progress_new?.task_address);
-                new_progress = Progress?.New(txb, obj?.get_object(), perm, task, pst);
-            }
-            if (this.data?.progress_context_repository !== undefined) {
-                const p = this.data?.progress_context_repository.progress 
-                    ? await LocalMark.Instance().get_address(this.data?.progress_context_repository.progress)
-                    : new_progress?.get_object();
-                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_context_repository.progress');
-                const rep = await LocalMark.Instance().get_address(this.data?.progress_context_repository.repository);
-                Progress.From(txb, obj?.get_object(), perm, p!).set_context_repository(rep, pst)
-            }
-            if (this.data?.progress_namedOperator !== undefined) {
-                const p = this.data?.progress_namedOperator.progress 
-                    ? await LocalMark.Instance().get_address(this.data?.progress_namedOperator.progress)
-                    : new_progress?.get_object();
-                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_namedOperator.progress');
+        const pst = perm?undefined:passport;
+        var new_progress : Progress | undefined;
+        if (this.data?.progress_new !== undefined) {
+            const task = await LocalMark.Instance().get_address(this.data?.progress_new?.task_address);
+            new_progress = Progress?.New(txb, obj?.get_object(), permission, task, pst);
+        }
+        if (this.data?.progress_context_repository !== undefined) {
+            const p = this.data?.progress_context_repository.progress 
+                ? await LocalMark.Instance().get_address(this.data?.progress_context_repository.progress)
+                : new_progress?.get_object();
+            if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_context_repository.progress');
+            const rep = await LocalMark.Instance().get_address(this.data?.progress_context_repository.repository);
+            Progress.From(txb, obj?.get_object(), permission, p!).set_context_repository(rep, pst)
+        }
+        if (this.data?.progress_namedOperator !== undefined) {
+            const p = this.data?.progress_namedOperator.progress 
+                ? await LocalMark.Instance().get_address(this.data?.progress_namedOperator.progress)
+                : new_progress?.get_object();
+            if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_namedOperator.progress');
 
-                let pp = Progress.From(txb, obj?.get_object(), perm, p!);
-                this.data.progress_namedOperator.data.forEach(v => pp.set_namedOperator(v.name, v.operators, pst));
+            let pp = Progress.From(txb, obj?.get_object(), permission, p!);
+            for(let i=0; i<this.data.progress_namedOperator.data.length; i++) {
+                const v = this.data.progress_namedOperator.data[i];
+                const addrs = await GetManyAccountOrMark_Address(v.operators);
+                pp.set_namedOperator(v.name, addrs, pst);
             }
-            if (this.data?.progress_parent !== undefined) {
-                const p = this.data?.progress_parent.progress 
-                    ? await LocalMark.Instance().get_address(this.data?.progress_parent.progress)
-                    : new_progress?.get_object();
-                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_parent.progress');
+        }
+        if (this.data?.progress_parent !== undefined) {
+            const p = this.data?.progress_parent.progress 
+                ? await LocalMark.Instance().get_address(this.data?.progress_parent.progress)
+                : new_progress?.get_object();
+            if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_parent.progress');
 
-                if (this.data.progress_parent.parent) {
-                    const parent = await LocalMark.Instance().get_address(this.data.progress_parent.parent.parent_id);
-                    if (parent) {
-                        this.data.progress_parent.parent.parent_id = parent;
-                        Progress.From(txb, obj?.get_object(), perm, p!).parent(this.data.progress_parent.parent);
-                    }
-                } else {
-                    Progress.From(txb, obj?.get_object(), perm, p!).parent_none();
+            if (this.data.progress_parent.parent) {
+                const parent = await LocalMark.Instance().get_address(this.data.progress_parent.parent.parent_id);
+                if (parent) {
+                    this.data.progress_parent.parent.parent_id = parent;
+                    Progress.From(txb, obj?.get_object(), permission, p!).parent(this.data.progress_parent.parent);
                 }
+            } else {
+                Progress.From(txb, obj?.get_object(), permission, p!).parent_none();
             }
-            if (this.data?.progress_hold !== undefined) {
-                const p = this.data?.progress_hold.progress 
-                    ? await LocalMark.Instance().get_address(this.data?.progress_hold.progress)
-                    : new_progress?.get_object();
-                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_hold.progress');
+        }
+        if (this.data?.progress_hold !== undefined) {
+            const p = this.data?.progress_hold.progress 
+                ? await LocalMark.Instance().get_address(this.data?.progress_hold.progress)
+                : new_progress?.get_object();
+            if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_hold.progress');
 
-                if (this.data?.progress_hold.adminUnhold) {
-                    Progress.From(txb, obj?.get_object(), perm, p!).unhold(this.data.progress_hold.operation, pst)
-                } else {
-                    Progress.From(txb, obj?.get_object(), perm, p!).hold(this.data.progress_hold.operation, this.data.progress_hold.bHold)
-                }
-            }            
-            if (this.data?.progress_task !== undefined) {
-                const [p, task] = await LocalMark.Instance().get_many_address([this.data?.progress_task.progress, this.data?.progress_task.task_address]);
-                if (p && task) Progress.From(txb, obj?.get_object(), perm, p).bind_task(task, pst);
-            }
-            if (this.data?.progress_next !== undefined) {
-                const p = await LocalMark.Instance().get_address(this.data?.progress_next.progress);
-                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_next.progress');
-                Progress.From(txb, obj?.get_object(), perm, p!).next(this.data.progress_next.operation, this.data.progress_next.deliverable, pst)
-            }
+            if (this.data?.progress_hold.adminUnhold) {
+                Progress.From(txb, obj?.get_object(), permission, p!).unhold(this.data.progress_hold.operation, pst)
+            } else {
+                Progress.From(txb, obj?.get_object(), permission, p!).hold(this.data.progress_hold.operation, this.data.progress_hold.bHold)
+            }
+        }            
+        if (this.data?.progress_task !== undefined) {
+            const [p, task] = await LocalMark.Instance().get_many_address([this.data?.progress_task.progress, this.data?.progress_task.task_address]);
+            if (p && task) Progress.From(txb, obj?.get_object(), permission, p).bind_task(task, pst);
+        }
+        if (this.data?.progress_next !== undefined) {
+            const p = await LocalMark.Instance().get_address(this.data?.progress_next.progress);
+            if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_next.progress');
+            var t: OrderWrap[] = [];
 
-            const addr = new_progress?.launch();
-            if (addr) {
-                await this.new_with_mark('Progress', txb, addr, this.data?.progress_new?.namedNew, account);
+            if (this.data.progress_next.deliverable.orders.length > 0) {
+                const o = await query_objects({objects:this.data.progress_next.deliverable.orders});
+                if (o?.objects?.length !== this.data.progress_next.deliverable.orders.length) {
+                    ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_next.deliverable.orders');
+                }                
+                t = o.objects.map(v => {
+                    if (v.type !== 'Order') {
+                        ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_next.deliverable.orders');
+                    }
+                    return {object:v.object, pay_token_type:Service.parseOrderObjectType(v.type_raw)}
+                })
             }
+            Progress.From(txb, obj?.get_object(), permission, p!).next(this.data.progress_next.operation, 
+                {msg:this.data.progress_next.deliverable.msg, orders:t}, pst);
+        }
 
-            if (this.data?.description !== undefined && this.object_address) {
-                obj?.set_description(this.data.description, pst);
-            }
-            if (this.data?.endpoint !== undefined && this.object_address) {
-                obj?.set_endpoint(this.data.endpoint, pst)
-            }
+        const addr = new_progress?.launch();
+        if (addr) {
+            await this.new_with_mark('Progress', txb, addr, this.data?.progress_new?.namedNew, account);
+        }
 
-            if (this.data?.consensus_repository !== undefined) {
-                switch (this.data.consensus_repository.op) {
-                    case 'add': 
-                    case 'set':
-                        if (this.data.consensus_repository.op === 'set') {
-                            obj?.remove_repository([], true, pst);
-                        }
-                        var reps = await LocalMark.Instance().get_many_address2(this.data.consensus_repository.repositories);
-                        reps.forEach(v=>obj?.add_repository(v, pst)) ;
-                        break;
-                    case 'remove': 
-                        var reps = await LocalMark.Instance().get_many_address2(this.data.consensus_repository.repositories);
-                        if (reps.length > 0) {
-                            obj?.remove_repository(reps, false, pst);
-                        }
-                        break;
-                    case 'removeall': 
+        if (this.data?.description !== undefined && this.object_address) {
+            obj?.set_description(this.data.description, pst);
+        }
+        if (this.data?.endpoint !== undefined && this.object_address) {
+            obj?.set_endpoint(this.data.endpoint, pst)
+        }
+
+        if (this.data?.consensus_repository !== undefined) {
+            switch (this.data.consensus_repository.op) {
+                case 'add': 
+                case 'set':
+                    if (this.data.consensus_repository.op === 'set') {
                         obj?.remove_repository([], true, pst);
-                        break;
-                }
-            }
-            if (this.data?.nodes !== undefined) {
-                switch (this.data?.nodes?.op) {
-                    case 'add':
-                        obj?.add_node(this.data.nodes.data, pst)
-                        break;
-                    case 'remove':
-                        obj?.remove_node(this.data.nodes.names, this.data.nodes?.bTransferMyself, pst)
-                        break;
-                    case 'rename node':
-                        this.data.nodes.data.forEach(v => obj?.rename_node(v.old, v.new, pst));
-                        break;
-                    case 'add from myself':
-                        obj?.add_node2(this.data.nodes.addresses, pst);
-                        break;
-                    case 'add forward':
-                        this.data.nodes.data.forEach(v => obj?.add_forward(v.prior_node_name, v.node_name, v.forward, v.threshold, v.remove_forward, pst))
-                        break;
-                    case 'remove forward':
-                        this.data.nodes.data.forEach(v => obj?.remove_forward(v.prior_node_name, v.node_name, v.forward_name, pst))
-                        break;
-                    case 'remove pair':
-                        this.data.nodes.pairs.forEach(v => obj?.remove_pair(v.prior_node_name, v.node_name, pst));
-                        break;
                     }
+                    var reps = await LocalMark.Instance().get_many_address2(this.data.consensus_repository.objects);
+                    reps.forEach(v=>obj?.add_repository(v, pst)) ;
+                    break;
+                case 'remove': 
+                    var reps = await LocalMark.Instance().get_many_address2(this.data.consensus_repository.objects);
+                    if (reps.length > 0) {
+                        obj?.remove_repository(reps, false, pst);
+                    }
+                    break;
+                case 'removeall': 
+                    obj?.remove_repository([], true, pst);
+                    break;
             }
-            if (this.data?.bPublished ) {
-                obj?.publish(passport)
-            }
+        }
+        if (this.data?.nodes !== undefined) {
+            switch (this.data?.nodes?.op) {
+                case 'add':
+                    obj?.add_node(this.data.nodes.data, pst)
+                    break;
+                case 'remove':
+                    obj?.remove_node(this.data.nodes.names, this.data.nodes?.bTransferMyself, pst)
+                    break;
+                case 'rename node':
+                    this.data.nodes.data.forEach(v => obj?.rename_node(v.old, v.new, pst));
+                    break;
+                case 'add from myself':
+                    obj?.add_node2(this.data.nodes.addresses, pst);
+                    break;
+                case 'add forward':
+                    this.data.nodes.data.forEach(v => obj?.add_forward(v.prior_node_name, v.node_name, v.forward, v.threshold, v.remove_forward, pst))
+                    break;
+                case 'remove forward':
+                    this.data.nodes.data.forEach(v => obj?.remove_forward(v.prior_node_name, v.node_name, v.forward_name, pst))
+                    break;
+                case 'remove pair':
+                    this.data.nodes.pairs.forEach(v => obj?.remove_pair(v.prior_node_name, v.node_name, pst));
+                    break;
+                }
+        }
+        if (this.data?.bPublished ) {
+            obj?.publish(passport)
+        }
 
-            if (this.data?.bPaused !== undefined) {
-                obj?.pause(this.data.bPaused, pst)
-            }
-            if (this.data?.clone_new !== undefined && this.object_address) {
-                await this.new_with_mark('Machine', txb, obj?.clone(true, pst) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
-            }
-            if (permission) {
-                const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission;
-                await this.new_with_mark('Permission', txb, permission.launch(), GetObjectParam(n?.permission), account);
-            }
-            if (!this.object_address) {
-                await this.new_with_mark('Machine', txb, obj.launch(), GetObjectMain(this.data?.object), account);
-            }
+        if (this.data?.bPaused !== undefined) {
+            obj?.pause(this.data.bPaused, pst)
+        }
+        if (this.data?.clone_new !== undefined && this.object_address) {
+            await this.new_with_mark('Machine', txb, obj?.clone(true, pst) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
+        }
+        if (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('Machine', txb, obj.launch(), GetObjectMain(this.data?.object), account);
         }
     }
 }       

package/src/call/permission.ts

@@ -1,9 +1,12 @@
 import { LocalMark } from "../local/local.js";
 import { AccountOrMark_Address, CallBase, CallResult, GetAccountOrMark_Address, GetManyAccountOrMark_Address, 
-    GetObjectExisted, GetObjectMain, ObjectMain } from "./base.js";
+    GetObjectExisted, GetObjectMain, ObjectMain, 
+    ObjectPermissionMain} from "./base.js";
 import { PassportObject, Permission,  BizPermission,
     PermissionIndexType, TransactionBlock, Permission_Entity as Wowok_Permission_Entity, 
-    Permission_Index as Wowok_Permission_Index, Permission_Index_Entity as Wowok_Permission_Index_Entity, 
+    Permission_Index as Wowok_Permission_Index, Permission_Index_Entity as Wowok_Permission_Index_Entity,
+    ERROR,
+    Errors, 
 } from 'wowok';
 
 
@@ -14,12 +17,12 @@ export interface Entity_Permission {
 }
 
 export interface Permission_Entity {
-    entity: AccountOrMark_Address;
+    address: AccountOrMark_Address;
     permissions:Entity_Permission[];
 }
 
 export interface Permission_Index_Entity {
-    entity: AccountOrMark_Address;
+    address: AccountOrMark_Address;
     guard?: string;
 }
 
@@ -29,13 +32,13 @@ export interface Permission_Index {
 }
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallPermission_Data {
-    object?: ObjectMain;
+    object?: ObjectPermissionMain;
     description?: string;
     biz_permission?: {op:'add'; data: BizPermission[]} | {op:'remove'; permissions: PermissionIndexType[]};
     permission?: {op:'add entity'; entities:Permission_Entity[]} | {op:'add permission'; permissions:Permission_Index[]} 
-        | {op:'remove entity'; entities:AccountOrMark_Address[]} | {op:'remove permission'; entity:AccountOrMark_Address; index:PermissionIndexType[]} 
-        | {op:'transfer permission', from_entity: AccountOrMark_Address; to_entity: AccountOrMark_Address};
-    admin?: {op:'add' | 'remove' | 'set', entities:AccountOrMark_Address[]} | {op:'removeall'};
+        | {op:'remove entity'; addresses:AccountOrMark_Address[]} | {op:'remove permission'; address:AccountOrMark_Address; index:PermissionIndexType[]} 
+        | {op:'transfer permission', from: AccountOrMark_Address, to: AccountOrMark_Address};
+    admin?: {op:'add' | 'remove' | 'set', addresses:AccountOrMark_Address[]} | {op:'removeall'};
     builder?: AccountOrMark_Address;
 }
 export class CallPermission extends CallBase {
@@ -46,10 +49,15 @@ export class CallPermission extends CallBase {
         this.data = data;
     }
 
+    protected async prepare(): Promise<void> {
+        if (!this.object_address) {
+            this.object_address = await LocalMark.Instance().get_address(GetObjectExisted(this.data?.object));
+        }
+    }
     async call(account?:string) : Promise<CallResult>   {
         var checkOwner = false; var checkAdmin = false;
-        this.object_address = await LocalMark.Instance().get_address(GetObjectExisted(this.data?.object));
-
+        
+        await this.prepare();
         if (this.object_address) {
             if (this.data?.builder !== undefined || this.data?.admin !== undefined) {
                 checkOwner = true;
@@ -73,92 +81,92 @@ export class CallPermission extends CallBase {
             obj = Permission.From(txb, this.object_address)
         }
 
-        if (obj) {
-            if (this.data?.description !== undefined && this.data?.object) {
-                obj?.set_description(this.data.description)
-            }
-            if (this.data?.biz_permission !== undefined) { // High priority operate
-                switch(this.data.biz_permission.op) {
-                    case 'add':
-                        this.data.biz_permission.data.forEach(v => {
-                            obj?.add_bizPermission(v.index, v.name);
-                        })
-                        break;
-                    case 'remove':
-                        this.data.biz_permission.permissions.forEach(v => {
-                            obj?.remove_bizPermission(v);
-                        })
-                        break;
-                }
+        if (!obj)  ERROR(Errors.InvalidParam, 'CallPermission_Data.data.object');
+
+        if (this.data?.description !== undefined && this.data?.object) {
+            obj?.set_description(this.data.description)
+        }
+        if (this.data?.biz_permission !== undefined) { // High priority operate
+            switch(this.data.biz_permission.op) {
+                case 'add':
+                    this.data.biz_permission.data.forEach(v => {
+                        obj?.add_bizPermission(v.index, v.name);
+                    })
+                    break;
+                case 'remove':
+                    this.data.biz_permission.permissions.forEach(v => {
+                        obj?.remove_bizPermission(v);
+                    })
+                    break;
             }
-            if (this.data?.permission !== undefined) {
-                switch (this.data.permission.op) {
-                    case 'add entity':
-                        var add_entity:Wowok_Permission_Entity[] = [];
-                        for (let i = 0; i < this.data.permission.entities.length; ++i) {
-                            const v = this.data.permission.entities[i];
-                            const addr = await GetAccountOrMark_Address(v.entity);
-                            if (addr) {
-                                add_entity.push({address:addr, permissions:v.permissions});
-                            }
+        }
+        if (this.data?.permission !== undefined) {
+            switch (this.data.permission.op) {
+                case 'add entity':
+                    var add_entity:Wowok_Permission_Entity[] = [];
+                    for (let i = 0; i < this.data.permission.entities.length; ++i) {
+                        const v = this.data.permission.entities[i];
+                        const addr = await GetAccountOrMark_Address(v.address);
+                        if (addr) {
+                            add_entity.push({address:addr, permissions:v.permissions});
                         }
-                        obj?.add_entity(add_entity);
-                        break;
-                    case 'add permission':
-                        var add_permission: Wowok_Permission_Index[] = [];
-                        for (let i = 0; i < this.data.permission.permissions.length; ++i) {
-                            const v = this.data.permission.permissions[i];
-                            const e:Wowok_Permission_Index_Entity[] = [];
-                            for (let j = 0; j < v.entities.length; ++j) {
-                                const addr = await GetAccountOrMark_Address(v.entities[j].entity);
-                                const guard = await LocalMark.Instance().get_address(v.entities[j].guard as string) ;
-                                if (addr) {
-                                    e.push({address:addr, guard:guard})
-                                }
+                    }
+                    obj?.add_entity(add_entity);
+                    break;
+                case 'add permission':
+                    var add_permission: Wowok_Permission_Index[] = [];
+                    for (let i = 0; i < this.data.permission.permissions.length; ++i) {
+                        const v = this.data.permission.permissions[i];
+                        const e:Wowok_Permission_Index_Entity[] = [];
+                        for (let j = 0; j < v.entities.length; ++j) {
+                            const addr = await GetAccountOrMark_Address(v.entities[j].address);
+                            const guard = await LocalMark.Instance().get_address(v.entities[j].guard as string) ;
+                            if (addr) {
+                                e.push({address:addr, guard:guard})
                             }
-                            add_permission.push({index:v.index, entities:e});
                         }
-                        obj?.add_entity3(add_permission);
-                        break;
-                    case 'remove entity':
-                        const entities:string[] = (await GetManyAccountOrMark_Address(this.data.permission.entities)).filter((v): v is string => v!== undefined);
-                        obj?.remove_entity(entities);
-                        break;
-                    case 'remove permission':
-                        const addr = await GetAccountOrMark_Address(this.data.permission.entity);
-                        if (addr) obj?.remove_index(addr, this.data.permission.index);
-                        break;
-                    case 'transfer permission':
-                        const from = await GetAccountOrMark_Address(this.data.permission.from_entity);
-                        const to = await GetAccountOrMark_Address(this.data.permission.to_entity);
-                        if (from && to)  obj?.transfer_permission(from, to);
-                        break;
-                }
-            }
-            if (this.data?.admin !== undefined) {
-                switch(this.data.admin?.op) {
-                    case 'add':
-                    case 'set': 
-                        if (this.data.admin?.op === 'set') obj?.remove_admin([], true);
-                        const add = await GetManyAccountOrMark_Address(this.data.admin.entities);
-                        obj?.add_admin(add.filter((v): v is string => v!== undefined));
-                        break;
-                    case 'remove':
-                        const remove = await GetManyAccountOrMark_Address(this.data.admin.entities);
-                        obj?.remove_admin(remove.filter((v): v is string => typeof(v) === 'string'));
-                        break;
-                    case 'removeall':
-                        obj?.remove_admin([], true);
-                        break;
-                }
-            }
-            if (this.data?.builder !== undefined ) {
-                const b = await GetAccountOrMark_Address(this.data.builder);
-                if (b) obj?.change_owner(b);
+                        add_permission.push({index:v.index, entities:e});
+                    }
+                    obj?.add_entity3(add_permission);
+                    break;
+                case 'remove entity':
+                    const entities:string[] = (await GetManyAccountOrMark_Address(this.data.permission.addresses)).filter((v): v is string => v!== undefined);
+                    obj?.remove_entity(entities);
+                    break;
+                case 'remove permission':
+                    const addr = await GetAccountOrMark_Address(this.data.permission.address);
+                    if (addr) obj?.remove_index(addr, this.data.permission.index);
+                    break;
+                case 'transfer permission':
+                    const from = await GetAccountOrMark_Address(this.data.permission.from);
+                    const to = await GetAccountOrMark_Address(this.data.permission.to);
+                    if (from && to)  obj?.transfer_permission(from, to);
+                    break;
             }
-            if (!this.object_address) {
-                await this.new_with_mark('Permission', txb, obj.launch(), GetObjectMain(this.data?.object), account);
+        }
+        if (this.data?.admin !== undefined) {
+            switch(this.data.admin?.op) {
+                case 'add':
+                case 'set': 
+                    if (this.data.admin?.op === 'set') obj?.remove_admin([], true);
+                    const add = await GetManyAccountOrMark_Address(this.data.admin.addresses);
+                    obj?.add_admin(add.filter((v): v is string => v!== undefined));
+                    break;
+                case 'remove':
+                    const remove = await GetManyAccountOrMark_Address(this.data.admin.addresses);
+                    obj?.remove_admin(remove.filter((v): v is string => typeof(v) === 'string'));
+                    break;
+                case 'removeall':
+                    obj?.remove_admin([], true);
+                    break;
             }
         }
+        if (this.data?.builder !== undefined ) {
+            const b = await GetAccountOrMark_Address(this.data.builder);
+            if (b) obj?.change_owner(b);
+        }
+        if (!this.object_address) {
+            await this.new_with_mark('Permission', txb, obj.launch(), GetObjectMain(this.data?.object), account);
+        }
     }
 }