wowok_agent 1.2.44 → 1.3.47

package/src/call/machine.ts

@@ -1,16 +1,22 @@
-import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, TransactionBlock, TxbAddress,
+import { PassportObject, Errors, ERROR, Permission, PermissionIndex, TransactionBlock, TxbAddress,
     PermissionIndexType, Machine, Machine_Forward, Machine_Node,  Deliverable, ParentProgress, Progress, ProgressNext,
-    ProgressObject,
 } from 'wowok';
-import { CallBase, CallResult, Namedbject } from "./base.js";
-import { Account } from '../local/account.js';
+import { CallBase, CallResult, GetObjectExisted, GetObjectMain, GetObjectParam, Namedbject, ObjectMain, TypeNamedObjectWithPermission } from "./base.js";
 import { ObjectMachine } from '../query/objects.js';
 import { LocalMark } from '../local/local.js';
+import { Account } from '../local/account.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallMachine_Data {
-    object?: {address:string} | {namedNew?: Namedbject}; // undefined or {named_new...} for creating a new object
-    permission?: {address:string} | {namedNew?: Namedbject, description?:string}; 
+    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_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};
+
     description?: string;
     endpoint?: string;
     consensus_repository?: {op:'set' | 'add' | 'remove' ; repositories:string[]} | {op:'removeall'};
@@ -20,18 +26,14 @@ export interface CallMachine_Data {
     | {op:'add forward'; data: {prior_node_name:string; node_name:string; forward:Machine_Forward; threshold?:number; remove_forward?:string}[]}
     | {op:'remove forward'; data:{prior_node_name:string; node_name:string; forward_name:string}[]}
     bPublished?: boolean;
-    progress_new?: {task_address?:string; namedNew?: Namedbject};
-    progress_context_repository?: {progress?:string; repository?:string};
-    progress_namedOperator?: {progress?:string; data:{name:string, operators:string[]}[]};
-    progress_parent?: {progress?:string, parent?:ParentProgress};
-    progress_task?: {progress?:string; task:string};
-    progress_hold?: {progress?:string; operation:ProgressNext; bHold:boolean; adminUnhold?:boolean};
-    progress_next?: {progress:string; operation:ProgressNext; deliverable:Deliverable; guard?:string};
     bPaused?: boolean;
     clone_new?: {namedNew?: Namedbject/*, description?:string*/};
 }
 export class CallMachine extends CallBase { //@ todo self-owned node operate
     data: CallMachine_Data;
+    object_address: string | undefined = undefined;
+    permission_address: string | undefined = undefined;
+
     constructor(data:CallMachine_Data) {
         super();
         this.data = data;
@@ -39,28 +41,24 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
     async call(account?:string) : Promise<CallResult>  {
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = []; 
-        var [permission_address, object_address] = 
-            await LocalMark.Instance().get_many_address(
-                [(this.data?.permission as any)?.address, 
-                (this.data?.object as any)?.address]);
-
-        if (object_address) {
-            if (!permission_address) {
-                await this.update_content(object_address, 'Machine');
-                if (this.content) {
-                    permission_address = (this.content as ObjectMachine).permission;     
-                }
-            } 
+        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)));
         } 
 
-        if (permission_address) {
+        if (this.permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.machine)
             }
-            if (this.data?.description !== undefined && object_address) {
+            if (this.data?.description !== undefined && this.object_address) {
                 perms.push(PermissionIndex.machine_description)
             }
-            if (this.data?.endpoint !== undefined && object_address) {
+            if (this.data?.endpoint !== undefined && this.object_address) {
                 perms.push(PermissionIndex.machine_endpoint)
             }
             if (this.data?.consensus_repository !== undefined) {
@@ -95,115 +93,53 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (this.data?.bPaused !== undefined) {
                 perms.push(PermissionIndex.machine_pause)
             }
+            if (this.data?.clone_new!== undefined) {
+                perms.push(PermissionIndex.machine_clone)
+            }
+
             if (this.data?.progress_next !== undefined) {
-                if (this.data?.progress_next?.guard) {
-                    const guard = await LocalMark.Instance().get_address(this.data?.progress_next?.guard);
+                if (this.object_address) { // fetch guard
+                    const [p, acc] = await Promise.all([
+                        LocalMark.Instance().get_address(this.data?.progress_next.progress), 
+                        Account.Instance().get(account)]);
+
+                    if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_next.progress');
+                    if (!acc) ERROR(Errors.InvalidParam, 'CallMachine_Data.account');
+  
+                    const guard = await Progress.QueryForwardGuard(p, this.object_address, acc.address, 
+                        this.data.progress_next.operation.next_node_name, this.data.progress_next.operation.forward);
                     if (guard) {
                         guards.push(guard);
-                    }                     
-                } else if (object_address) { // fetch guard
-                    const p = await LocalMark.Instance().get_address(this.data?.progress_next.progress);
-                    if (p) {
-                        const guard = await Progress.QueryForwardGuard(this.data?.progress_next.progress, object_address, 
-                            (await Account.Instance().default())?.address ?? '0xe386bb9e01b3528b75f3751ad8a1e418b207ad979fea364087deef5250a73d3f', 
-                            this.data.progress_next.operation.next_node_name, this.data.progress_next.operation.forward);
-                        if (guard) {
-                            guards.push(guard);
-                        }                        
-                    }
+                    }                        
                 }
             }
 
-            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 : Machine | undefined ; let permission: any;
-        var [permission_address, object_address] = this?.content ? 
-            [(this.content as ObjectMachine).permission, this.content.object] : 
-            await LocalMark.Instance().get_many_address(
-                [(this.data?.permission as any)?.address, 
-                (this.data?.object as any)?.address]);
-
-        if (!object_address) {
-            if (!permission_address) {
-                const d = (this.data?.permission as any)?.description ?? '';
-                permission = Permission.New(txb, d);
-            }
-            obj = Machine.New(txb, permission ? permission.get_object() : permission_address, this.data?.description??'', this.data?.endpoint ?? '', permission?undefined:passport);
+        if (this.object_address) {
+            obj = Machine.From(txb, this.permission_address!, this.object_address);
         } else {
-            if (permission_address) {
-                obj = Machine.From(txb, permission_address, object_address)
-            } else {
-                ERROR(Errors.InvalidParam, 'CallMachine_Data.data.permission')
+            const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission;
+            if (!this.permission_address) {
+                permission = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
             }
+
+            obj = Machine.New(txb, permission ? permission.get_object() : this.permission_address, this.data?.description??'', 
+                this.data?.endpoint, permission?undefined:passport);
         }
 
         if (obj) {
-            const perm = permission ? permission.get_object() : permission_address;
             const pst = permission?undefined:passport;
+            const perm = permission ? permission.get_object() : this.permission_address;
 
-            if (this.data?.description !== undefined && object_address) {
-                obj?.set_description(this.data.description, pst);
-            }
-            if (this.data?.endpoint !== undefined && 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);
-                        }
-                        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': 
-                        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;
-                    }
-            }
-            if (this.data?.bPublished ) {
-                obj?.publish(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);
+                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) {
@@ -239,14 +175,6 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
                     Progress.From(txb, obj?.get_object(), perm, p!).parent_none();
                 }
             }
-            if (this.data?.progress_task !== undefined) {
-                const p = this.data?.progress_task.progress 
-                    ? await LocalMark.Instance().get_address(this.data?.progress_task.progress)
-                    : new_progress?.get_object();
-                if (!p) ERROR(Errors.InvalidParam, 'CallMachine_Data.data.progress_task.progress');
-                const task = await LocalMark.Instance().get_address(this.data.progress_task.task);
-                if (task) Progress.From(txb, obj?.get_object(), perm, p!).bind_task(task, pst);
-            }
             if (this.data?.progress_hold !== undefined) {
                 const p = this.data?.progress_hold.progress 
                     ? await LocalMark.Instance().get_address(this.data?.progress_hold.progress)
@@ -259,11 +187,12 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
                     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 = this.data?.progress_next.progress 
-                    ? await LocalMark.Instance().get_address(this.data?.progress_next.progress)
-                    : new_progress?.get_object();
+                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)
             }
@@ -273,17 +202,75 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
                 await this.new_with_mark('Progress', txb, addr, this.data?.progress_new?.namedNew, account);
             }
 
+            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);
+                        }
+                        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': 
+                        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;
+                    }
+            }
+            if (this.data?.bPublished ) {
+                obj?.publish(passport)
+            }
+
             if (this.data?.bPaused !== undefined) {
                 obj?.pause(this.data.bPaused, pst)
             }
-            if (this.data?.clone_new !== undefined && object_address) {
+            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) {
-                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission;
+                await this.new_with_mark('Permission', txb, permission.launch(), GetObjectParam(n?.permission), account);
             }
-            if (!object_address) {
-                await this.new_with_mark('Machine', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+            if (!this.object_address) {
+                await this.new_with_mark('Machine', txb, obj.launch(), GetObjectMain(this.data?.object), account);
             }
         }
     }

package/src/call/object_permission.ts

@@ -1,5 +1,5 @@
 import { CallBase, CallResult } from "./base.js";
-import { TransactionBlock, PassportObject, IsValidAddress, Errors, ERROR,  Demand, Machine, Service, Treasury, Arbitration, Repository} from 'wowok';
+import { TransactionBlock, PassportObject, Errors, ERROR,  Demand, Machine, Service, Treasury, Arbitration, Repository} from 'wowok';
 import { ObjectArbitration, ObjectDemand, ObjectMachine, ObjectRepository, ObjectService, ObjectTreasury, query_objects } from "../query/objects.js";
 import { LocalMark } from "../local/local.js";
 

package/src/call/permission.ts

@@ -1,21 +1,42 @@
-import { Account } from "../local/account.js";
 import { LocalMark } from "../local/local.js";
-import { CallBase, CallResult, Namedbject } from "./base.js";
-import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, BizPermission,
-    PermissionIndexType, TransactionBlock,
-    Permission_Index_Entity
+import { AccountOrMark_Address, CallBase, CallResult, GetAccountOrMark_Address, GetManyAccountOrMark_Address, 
+    GetObjectExisted, GetObjectMain, ObjectMain } 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, 
 } from 'wowok';
 
+
+
+export interface Entity_Permission {
+    index: PermissionIndexType;
+    guard?: string;
+}
+
+export interface Permission_Entity {
+    entity: AccountOrMark_Address;
+    permissions:Entity_Permission[];
+}
+
+export interface Permission_Index_Entity {
+    entity: AccountOrMark_Address;
+    guard?: string;
+}
+
+export interface Permission_Index {
+    index: PermissionIndexType;
+    entities: Permission_Index_Entity[];
+}
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallPermission_Data {
-    object?: {address:string} | {namedNew?: Namedbject}; // undefined or {named_new...} for creating a new object
+    object?: ObjectMain;
     description?: string;
-    admin?: {op:'add' | 'remove' | 'set', addresses:string[]} | {op:'removeall'};
     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'; addresses:string[]} | {op:'remove permission'; address:string; index:PermissionIndexType[]} 
-        | {op:'transfer permission', from_address: string; to_address: string};
-    builder?: string;
+        | {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'};
+    builder?: AccountOrMark_Address;
 }
 export class CallPermission extends CallBase {
     data: CallPermission_Data;
@@ -27,7 +48,7 @@ export class CallPermission extends CallBase {
 
     async call(account?:string) : Promise<CallResult>   {
         var checkOwner = false; var checkAdmin = false;
-        this.object_address = await LocalMark.Instance().get_address((this.data?.object as any)?.address);
+        this.object_address = await LocalMark.Instance().get_address(GetObjectExisted(this.data?.object));
 
         if (this.object_address) {
             if (this.data?.builder !== undefined || this.data?.admin !== undefined) {
@@ -53,26 +74,9 @@ export class CallPermission extends CallBase {
         }
 
         if (obj) {
-            if (this.data?.description !== undefined && this.data.object) {
+            if (this.data?.description !== undefined && this.data?.object) {
                 obj?.set_description(this.data.description)
             }
-            if (this.data?.admin !== undefined) {
-                switch(this.data.admin?.op) {
-                    case 'add':
-                    case 'set': 
-                        if (this.data.admin?.op === 'set') obj?.remove_admin([], true);
-                        var addrs = await LocalMark.Instance().get_many_address2(this.data.admin.addresses);
-                        obj?.add_admin(addrs);
-                        break;
-                    case 'remove':
-                        var addrs = await LocalMark.Instance().get_many_address2(this.data.admin.addresses);
-                        obj?.remove_admin(this.data.admin.addresses);
-                        break;
-                    case 'removeall':
-                        obj?.remove_admin([], true);
-                        break;
-                }
-            }
             if (this.data?.biz_permission !== undefined) { // High priority operate
                 switch(this.data.biz_permission.op) {
                     case 'add':
@@ -90,51 +94,70 @@ export class CallPermission extends CallBase {
             if (this.data?.permission !== undefined) {
                 switch (this.data.permission.op) {
                     case 'add entity':
-                        var add = [];
+                        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 LocalMark.Instance().get_address(v.address);
+                            const addr = await GetAccountOrMark_Address(v.entity);
                             if (addr) {
-                                v.address = addr;
-                                add.push(v);
+                                add_entity.push({address:addr, permissions:v.permissions});
                             }
                         }
-                        obj?.add_entity(add);
+                        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:Permission_Index_Entity[] = [];
+                            const e:Wowok_Permission_Index_Entity[] = [];
                             for (let j = 0; j < v.entities.length; ++j) {
-                                const addr = await LocalMark.Instance().get_address(v.entities[j].address);
-                                const guard = (typeof(v.entities[j].guard) === 'string') ?  await LocalMark.Instance().get_address(v.entities[j].guard as string) : undefined;
+                                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})
                                 }
                             }
-                            v.entities = e;
+                            add_permission.push({index:v.index, entities:e});
                         }
-                        obj?.add_entity3(this.data.permission.permissions);
+                        obj?.add_entity3(add_permission);
                         break;
                     case 'remove entity':
-                        obj?.remove_entity(await LocalMark.Instance().get_many_address2(this.data.permission.addresses));
+                        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 LocalMark.Instance().get_address(this.data.permission.address);
+                        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, to] = await LocalMark.Instance().get_many_address([this.data.permission.from_address, this.data.permission.to_address]);
+                        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 Account.Instance().get(this.data.builder);
-                if (b) obj?.change_owner(b.address);
+                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(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Permission', txb, obj.launch(), GetObjectMain(this.data?.object), account);
             }
         }
     }

package/src/call/personal.ts

@@ -1,5 +1,5 @@
-import { TransactionBlock, PassportObject, IsValidAddress, Errors, ERROR, Entity, Entity_Info, Resource} from 'wowok';
-import { CallBase, CallResult, Namedbject } from "./base.js";
+import { TransactionBlock, PassportObject, Errors, ERROR, Entity, Entity_Info, Resource} from 'wowok';
+import { AccountOrMark_Address, CallBase, CallResult, GetAccountOrMark_Address } from "./base.js";
 import { LocalMark } from '../local/local.js';
 import { query_personal } from '../query/objects.js';
 import { Account } from '../local/account.js';
@@ -7,11 +7,11 @@ import { Account } from '../local/account.js';
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallPersonal_Data {
     information?: Entity_Info;
-    mark?: {op:'add'; data:{address:string; name?:string; tags?:string[]}[]}
-        | {op:'remove'; data:{address:string; tags?:string[]}[]}
-        | {op:'removeall'; addresses:string[]}
-        | {op:'transfer'; address: string}
-        | {op:'replace'; address: string}
+    mark?: {op:'add'; data:{entity:AccountOrMark_Address; name?:string; tags?:string[]}[]}
+        | {op:'remove'; data:{entity:AccountOrMark_Address; tags?:string[]}[]}
+        | {op:'removeall'; entities:AccountOrMark_Address[]}
+        | {op:'transfer'; to: AccountOrMark_Address}
+        | {op:'replace'; mark_object: string}
         | {op:'destroy'}
 }
 
@@ -54,13 +54,12 @@ export class CallPersonal extends CallBase {
         if (obj && obj?.get_object()) {
             switch(this.data.mark.op) {
                 case 'add':
-                    const add = [];
+                    const add  = [];
                     for (let i = 0; i < this.data.mark.data.length; ++i) {
                         const v = this.data.mark.data[i];
-                        const addr = await LocalMark.Instance().get_address(v.address);
+                        const addr = await GetAccountOrMark_Address(v.entity);
                         if (addr) {
-                            v.address =  addr;
-                            add.push(v)
+                            add.push({address:addr, tags:v.tags, name:v.name})
                         }
                     }
 
@@ -72,10 +71,9 @@ export class CallPersonal extends CallBase {
                     const remove = [];
                     for (let i = 0; i < this.data.mark.data.length; ++i) {
                         const v = this.data.mark.data[i];
-                        const addr = await LocalMark.Instance().get_address(v.address);
+                        const addr = await GetAccountOrMark_Address(v.entity);
                         if (addr) {
-                            v.address =  addr;
-                            remove.push(v)
+                            remove.push({address:addr, tags:v.tags})
                         }
                     }
                     remove.forEach(v => {
@@ -83,22 +81,22 @@ export class CallPersonal extends CallBase {
                     })                        
                     break;
                 case 'removeall':
-                    for (let i = 0; i < this.data.mark.addresses.length; ++i) {
-                        const v = this.data.mark.addresses[i];
-                        const addr = await LocalMark.Instance().get_address(v);
+                    for (let i = 0; i < this.data.mark.entities.length; ++i) {
+                        const v = this.data.mark.entities[i];
+                        const addr = await GetAccountOrMark_Address(v);
                         if (addr) {
-                            obj?.removeall(v)
+                            obj?.removeall(addr)
                         }
                     }                 
                     break;         
             }
 
             if (this.data?.mark?.op === 'transfer' && obj) {
-                const addr = await LocalMark.Instance().get_address(this.data.mark.address);
+                const addr = await GetAccountOrMark_Address(this.data.mark.to);
                 if (addr) entity.transfer_resource(obj, addr);
             }
             if (this.data?.mark?.op === 'replace') {
-                const addr = await LocalMark.Instance().get_address(this.data.mark.address);
+                const addr = await LocalMark.Instance().get_address(this.data.mark.mark_object);
                 if (addr) entity.use_resource(Resource.From(txb, addr));
             }