wowok_agent 1.2.38 → 1.2.40

package/src/call/object_permission.ts

@@ -1,6 +1,7 @@
 import { CallBase, CallResult } from "./base.js";
 import { TransactionBlock, PassportObject, IsValidAddress, 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";
 
 export interface CallObjectPermission_Data {
     objects: string[];
@@ -9,14 +10,17 @@ export interface CallObjectPermission_Data {
 
 export class CallObjectPermission extends CallBase {
     data: CallObjectPermission_Data;
+    new_perm: string | undefined = undefined;
+
     constructor(data:CallObjectPermission_Data) {
         super();
         this.data = data;
     }
 
     async call(account?:string) : Promise<CallResult>   {
-        if (!IsValidAddress(this.data.new_permission)) {
-            ERROR(Errors.InvalidParam, 'CallObjectPermission_Data.new_permission' + this.data.new_permission)
+        this.new_perm = await LocalMark.Instance().get_address(this.data.new_permission);
+        if (!this.new_perm) {
+            ERROR(Errors.InvalidParam, 'CallObjectPermission_Data.new_permission:' + this.data.new_permission)
         }
 
         if (this.data?.objects.length > 0) {
@@ -29,27 +33,27 @@ export class CallObjectPermission extends CallBase {
             switch(v.type) {
             case 'Demand':
                 const demand = v as ObjectDemand;
-                Demand.From(txb, Demand.parseObjectType(demand.type_raw), demand.permission, demand.object).change_permission(this.data.new_permission);
+                Demand.From(txb, Demand.parseObjectType(demand.type_raw), demand.permission, demand.object).change_permission(this.new_perm!);
                 break;
             case 'Machine':
                 const machine = v as ObjectMachine;
-                Machine.From(txb, machine.permission, machine.object).change_permission(this.data.new_permission);
+                Machine.From(txb, machine.permission, machine.object).change_permission(this.new_perm!);
                 break;
             case 'Service':
                 const service = v as ObjectService;
-                Service.From(txb, Service.parseObjectType(service.type_raw), service.permission, service.object).change_permission(this.data.new_permission);
+                Service.From(txb, Service.parseObjectType(service.type_raw), service.permission, service.object).change_permission(this.new_perm!);
                 break;
             case 'Treasury':
                 const treasury = v as ObjectTreasury;
-                Treasury.From(txb, Treasury.parseObjectType(treasury.type_raw), treasury.permission, treasury.object).change_permission(this.data.new_permission);
+                Treasury.From(txb, Treasury.parseObjectType(treasury.type_raw), treasury.permission, treasury.object).change_permission(this.new_perm!);
                 break;
             case 'Arbitration':
                 const arbitraion = v as ObjectArbitration;
-                Arbitration.From(txb, Arbitration.parseObjectType(arbitraion.type_raw), arbitraion.permission, arbitraion.object).change_permission(this.data.new_permission);
+                Arbitration.From(txb, Arbitration.parseObjectType(arbitraion.type_raw), arbitraion.permission, arbitraion.object).change_permission(this.new_perm!);
                 break;
             case 'Repository':
                 const repository = v as ObjectRepository;
-                Repository.From(txb, repository.permission, repository.object).change_permission(this.data.new_permission);
+                Repository.From(txb, repository.permission, repository.object).change_permission(this.new_perm!);
                 break;
             }
         })

package/src/call/permission.ts

@@ -1,6 +1,8 @@
+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
+    PermissionIndexType, TransactionBlock,
+    Permission_Index_Entity
 } from 'wowok';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
@@ -16,6 +18,7 @@ export interface CallPermission_Data {
 }
 export class CallPermission extends CallBase {
     data: CallPermission_Data;
+    object_address: string | undefined = undefined;
     constructor(data:CallPermission_Data) {
         super();
         this.data = data;
@@ -23,9 +26,9 @@ export class CallPermission extends CallBase {
 
     async call(account?:string) : Promise<CallResult>   {
         var checkOwner = false; var checkAdmin = false;
-        const object_address = (this.data?.object as any)?.address;
+        this.object_address = await LocalMark.Instance().get_address((this.data?.object as any)?.address);
 
-        if (object_address && IsValidAddress(object_address)) {
+        if (this.object_address) {
             if (this.data?.builder !== undefined || this.data?.admin !== undefined) {
                 checkOwner = true;
             }
@@ -35,18 +38,17 @@ export class CallPermission extends CallBase {
             if (this.data?.description !== undefined) {
                 checkAdmin = true;
             }
-            return await this.check_permission_and_call(object_address, [], [], checkOwner, checkAdmin, account)
+            return await this.check_permission_and_call(this.object_address, [], [], checkOwner, checkAdmin, account)
         }
         return await this.exec(account)
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Permission | undefined ; 
-        const object_address = (this.data?.object as any)?.address;
 
-        if (!object_address || !IsValidAddress(object_address)) {
+        if (!this.object_address) {
             obj = Permission.New(txb, this.data?.description??'');
         } else {
-            obj = Permission.From(txb, object_address)
+            obj = Permission.From(txb, this.object_address)
         }
 
         if (obj) {
@@ -56,15 +58,15 @@ export class CallPermission extends CallBase {
             if (this.data?.admin !== undefined) {
                 switch(this.data.admin?.op) {
                     case 'add':
-                        obj?.add_admin(this.data.admin.addresses);
+                    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 'set':
-                        obj?.remove_admin([], true);
-                        obj?.add_admin(this.data.admin.addresses);
-                        break
                     case 'removeall':
                         obj?.remove_admin([], true);
                         break;
@@ -87,26 +89,50 @@ export class CallPermission extends CallBase {
             if (this.data?.permission !== undefined) {
                 switch (this.data.permission.op) {
                     case 'add entity':
-                        obj?.add_entity(this.data.permission.entities);
+                        var add = [];
+                        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);
+                            if (addr) {
+                                v.address = addr;
+                                add.push(v);
+                            }
+                        }
+                        obj?.add_entity(add);
                         break;
                     case 'add permission':
+                        for (let i = 0; i < this.data.permission.permissions.length; ++i) {
+                            const v = this.data.permission.permissions[i];
+                            const e: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;
+                                if (addr) {
+                                    e.push({address:addr, guard:guard})
+                                }
+                            }
+                            v.entities = e;
+                        }
                         obj?.add_entity3(this.data.permission.permissions);
                         break;
                     case 'remove entity':
-                        obj?.remove_entity(this.data.permission.addresses);
+                        obj?.remove_entity(await LocalMark.Instance().get_many_address2(this.data.permission.addresses));
                         break;
                     case 'remove permission':
-                        obj?.remove_index(this.data.permission.address, this.data.permission.index);
+                        const addr = await LocalMark.Instance().get_address(this.data.permission.address);
+                        if (addr) obj?.remove_index(addr, this.data.permission.index);
                         break;
                     case 'transfer permission':
-                        obj?.transfer_permission(this.data.permission.from_address, this.data.permission.to_address);
+                        const [from, to] = await LocalMark.Instance().get_many_address([this.data.permission.from_address, this.data.permission.to_address]);
+                        if (from && to)  obj?.transfer_permission(from, to);
                         break;
                 }
             }
             if (this.data?.builder !== undefined ) {
-                obj?.change_owner(this.data.builder);
+                const b = await LocalMark.Instance().get_account(this.data.builder);
+                if (b) obj?.change_owner(b);
             }
-            if (!object_address) {
+            if (!this.object_address) {
                 await this.new_with_mark('Permission', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }

package/src/call/personal.ts

@@ -1,11 +1,12 @@
 import { TransactionBlock, PassportObject, IsValidAddress, Errors, ERROR, Entity, Entity_Info, Resource} from 'wowok';
 import { CallBase, CallResult, Namedbject } from "./base.js";
+import { LocalMark } from '../local/local.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallPersonal_Data {
     mark_object?: {address:string} | {namedNew?: Namedbject}; // undefined or {named_new...} for creating a new personal resource object ; // undefined for creating personal resource object
     information?: Entity_Info;
-    mark?: {op:'add or set'; data:{address:string; name?:string; tags?:string[]}[]}
+    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}
@@ -33,8 +34,8 @@ export class CallPersonal extends CallBase {
             return ;
         }
         
-        const object_address = (this.data?.mark_object as any)?.address;
-        if (!object_address || !IsValidAddress(object_address)) {
+        const object_address = await LocalMark.Instance().get_address((this.data?.mark_object as any)?.address);
+        if (!object_address) {
             obj = Resource.From(txb, entity.create_resource2());
         } else {
             obj = Resource.From(txb, object_address)
@@ -47,28 +48,53 @@ export class CallPersonal extends CallBase {
 
         if (obj && obj?.get_object()) {
             switch(this.data.mark.op) {
-                case 'add or set':
-                    this.data.mark.data.forEach(v => {
+                case '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);
+                        if (addr) {
+                            v.address =  addr;
+                            add.push(v)
+                        }
+                    }
+
+                    add.forEach(v => {
                         obj?.add(v.address, v.tags ?? [], v.name)
                     })
                     break;
                 case 'remove':
-                    this.data.mark.data.forEach(v => {
+                    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);
+                        if (addr) {
+                            v.address =  addr;
+                            remove.push(v)
+                        }
+                    }
+                    remove.forEach(v => {
                         obj?.remove(v.address, v.tags ?? [])
                     })                        
                     break;
                 case 'removeall':
-                    this.data.mark.addresses.forEach(v => {
-                        obj?.removeall(v)
-                    })                        
+                    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);
+                        if (addr) {
+                            obj?.removeall(v)
+                        }
+                    }                 
                     break;         
             }
 
-            if (this.data?.mark?.op === 'transfer' && obj && IsValidAddress(this.data.mark.address)) {
-                entity.transfer_resource(obj, this.data.mark.address);
+            if (this.data?.mark?.op === 'transfer' && obj) {
+                const addr = await LocalMark.Instance().get_address(this.data.mark.address);
+                if (addr) entity.transfer_resource(obj, addr);
             }
-            if (this.data?.mark?.op === 'replace' && IsValidAddress(this.data.mark.address)) {
-                entity.use_resource(Resource.From(txb, this.data.mark.address));
+            if (this.data?.mark?.op === 'replace') {
+                const addr = await LocalMark.Instance().get_address(this.data.mark.address);
+                if (addr) entity.use_resource(Resource.From(txb, addr));
             }
 
             if (!object_address) {

package/src/call/repository.ts

@@ -3,6 +3,8 @@ import { TransactionBlock, PassportObject, IsValidAddress, Errors, ERROR, Permis
     Repository_Policy_Data_Remove, Repository_Policy_Mode, 
 } from 'wowok';
 import { CallBase, CallResult, Namedbject} from "./base.js";
+import { LocalMark } from '../local/local.js';
+import { ObjectRepository } from '../query/objects.js';
 
 
 /// The execution priority is determined by the order in which the object attributes are arranged
@@ -25,10 +27,21 @@ export class CallRepository extends CallBase {
     async call(account?:string) : Promise<CallResult>   {
         var checkOwner = false;
         const perms : PermissionIndexType[] = []; 
-        const permission_address = (this.data?.permission as any)?.address;
-        const object_address = (this.data?.object as any)?.address;
+        var [permission_address, object_address] = 
+            await LocalMark.Instance().get_many_address(
+                [(this.data?.permission as any)?.address, 
+                (this.data?.object as any)?.address]);
 
-        if (permission_address && IsValidAddress(permission_address)) {
+        if (object_address) {
+            if (!permission_address) {
+                await this.update_content(object_address, 'Repository');
+                if (this.content) {
+                    permission_address = (this.content as ObjectRepository).permission;     
+                }
+            } 
+        } 
+
+        if (permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.repository)
             }
@@ -51,21 +64,24 @@ export class CallRepository extends CallBase {
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Repository | undefined ; let permission: any;
-        const permission_address = (this.data?.permission as any)?.address;
-        const object_address = (this.data?.object as any)?.address;
+        var [permission_address, object_address] = this?.content ? 
+            [(this.content as ObjectRepository).permission, this.content.object] : 
+            await LocalMark.Instance().get_many_address(
+                [(this.data?.permission as any)?.address, 
+                (this.data?.object as any)?.address]);
 
         if (!object_address) {
-            if (!permission_address || !IsValidAddress(permission_address)) {
+            if (!permission_address) {
                 const d = (this.data?.permission as any)?.description ?? '';
                 permission = Permission.New(txb, d);
             }
             
             obj = Repository.New(txb, permission ? permission.get_object() : permission_address, this.data?.description??'', this.data?.mode, permission?undefined:passport)
         } else {
-            if (IsValidAddress(object_address) && this.data.permission && IsValidAddress(permission_address)) {
+            if (permission_address) {
                 obj = Repository.From(txb, permission_address, object_address)
             } else {
-                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
+                ERROR(Errors.InvalidParam, 'CallRepository_Data.data.permission')
             }
         }
 
@@ -77,14 +93,12 @@ export class CallRepository extends CallBase {
             if (this.data?.reference !== undefined) {
                 switch (this.data.reference.op) {
                     case 'set':
-                        obj?.remove_reference([], true, pst);
-                        obj?.add_reference(this.data.reference.addresses, pst);
-                        break;
                     case 'add':
-                        obj?.add_reference(this.data.reference.addresses, pst);
+                        if (this.data.reference.op === 'set') obj?.remove_reference([], true, pst);
+                        obj?.add_reference(await LocalMark.Instance().get_many_address2(this.data.reference.addresses), pst);
                         break;
                     case 'remove':
-                        obj?.remove_reference(this.data.reference.addresses, false, pst);
+                        obj?.remove_reference(await LocalMark.Instance().get_many_address2(this.data.reference.addresses), false, pst);
                         break;
                     case 'removeall':
                         obj?.remove_reference([], true, pst);