wowok_agent 1.2.41 → 1.2.44

package/dist/query/permission.js

@@ -2,7 +2,8 @@
  * Provides permission lookup for an address:
  * not only the permission table, but also the administrator or Builder identity.
  */
-import { TransactionBlock, Protocol, Bcs, IsValidAddress, Errors, ERROR, Permission, BCS } from 'wowok';
+import { LocalMark } from '../local/local.js';
+import { TransactionBlock, Protocol, Bcs, Errors, ERROR, Permission, BCS } from 'wowok';
 /*json: PermissionQuery; return PermissionAnswer */
 export const query_permission_json = async (json) => {
     try {
@@ -14,28 +15,27 @@ export const query_permission_json = async (json) => {
     }
 };
 export const query_permission = async (query) => {
-    if (!IsValidAddress(query.permission_object)) {
-        ERROR(Errors.IsValidAddress, 'permission.permission_object');
-    } /*
-    if (!IsValidAddress(query.address)) {
-        ERROR(Errors.IsValidAddress, 'permission.address')
-    }*/
+    const object_address = await LocalMark.Instance().get_address(query.object_address_or_name);
+    const entity_address = await LocalMark.Instance().get_address(query.entity_address_or_name);
+    if (!object_address || !entity_address) {
+        ERROR(Errors.InvalidParam, 'query.object_address_or_name or query.entity_address_or_name');
+    }
     const txb = new TransactionBlock();
-    const object = Permission.From(txb, query.permission_object);
-    object.query_permissions_all(query.address);
-    const res = await Protocol.Client().devInspectTransactionBlock({ sender: query.address, transactionBlock: txb });
+    const object = Permission.From(txb, object_address);
+    object.query_permissions_all(entity_address);
+    const res = await Protocol.Client().devInspectTransactionBlock({ sender: entity_address, transactionBlock: txb });
     if (res.results && res.results[0].returnValues && res.results[0].returnValues.length !== 2) {
         ERROR(Errors.Fail, 'permission.retValues');
     }
     const perm = Bcs.getInstance().de(BCS.U8, Uint8Array.from(res.results[0].returnValues[0][0]));
     if (perm === Permission.PERMISSION_ADMIN || perm === Permission.PERMISSION_OWNER_AND_ADMIN) {
-        return { who: query.address, admin: true, owner: perm % 2 === 1, items: [], object: query.permission_object };
+        return { who: entity_address, admin: true, owner: perm % 2 === 1, items: [], object: object_address };
     }
     else {
         const perms = Bcs.getInstance().de_perms(Uint8Array.from(res.results[0].returnValues[1][0]));
-        return { who: query.address, admin: false, owner: perm % 2 === 1, items: perms.map((v) => {
+        return { who: entity_address, admin: false, owner: perm % 2 === 1, items: perms.map((v) => {
                 return { query: v?.index, permission: true, guard: v?.guard };
-            }), object: query.permission_object };
+            }), object: object_address };
     }
 };
 //# sourceMappingURL=permission.js.map

package/dist/query/permission.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/query/permission.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/query/permission.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wowok_agent",
-  "version": "1.2.41",
-  "description": "Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.",
+  "version": "1.2.44",
+  "description": "Agent for WoWok: Unlock Co-Creation, Lighting Transaction, Empower Potential.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "module": "node",

package/src/call/base.ts

@@ -86,7 +86,7 @@ export class CallBase {
             const addr = await Account.Instance().get(account);
             if (!addr) ERROR(Errors.InvalidParam, 'check_permission_and_call: account invalid');
 
-            const p = await query_permission({permission_object:permission, address:addr.address});
+            const p = await query_permission({object_address_or_name:permission, entity_address_or_name:addr.address});
             if (checkOwner && !p.owner) ERROR(Errors.noPermission, 'owner');
             if (checkAdmin && !p.admin) ERROR(Errors.noPermission, 'admin');
 
@@ -184,7 +184,7 @@ export class CallBase {
                 const namedNew = this.traceMarkNew.get(v.type);
                 if (namedNew) {
                     LocalMark.Instance().put(namedNew.name, 
-                        {object:v.object, tags:namedNew?.tags ? [...namedNew?.tags, v.type] : [v.type]}, 
+                        {address:v.object, tags:namedNew?.tags ? [...namedNew?.tags, v.type] : [v.type]}, 
                         namedNew?.useAddressIfNameExist);
                 }
             }

package/src/call/object_permission.ts

@@ -24,6 +24,15 @@ export class CallObjectPermission extends CallBase {
         }
 
         if (this.data?.objects.length > 0) {
+            for(let i=0; i < this.data.objects.length; i++) {
+                const obj = await LocalMark.Instance().get_address(this.data.objects[i]);
+
+                if (!obj) {
+                    ERROR(Errors.InvalidParam, 'CallObjectPermission_Data.objects[' + i + ']:' + this.data.objects[i])
+                }
+
+                this.data.objects[i] = obj;
+            }
             return await this.exec(account)
         }
     }

package/src/call/personal.ts

@@ -1,10 +1,11 @@
 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';
+import { query_personal } from '../query/objects.js';
+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 {
-    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'; data:{address:string; name?:string; tags?:string[]}[]}
         | {op:'remove'; data:{address:string; tags?:string[]}[]}
@@ -24,7 +25,18 @@ export class CallPersonal extends CallBase {
         return await this.exec(account)
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject, account?: string) {
+        const entity_address = (await Account.Instance().get(account))?.address;
+        if (!entity_address) {
+            ERROR(Errors.InvalidParam, 'account - ' + account)
+        };
+
         let obj : Resource | undefined ; let entity: Entity = Entity.From(txb);
+        const entity_data = await query_personal({address:entity_address});
+        if (entity_data?.mark_object) {
+            obj = Resource.From(txb, entity_data.mark_object);
+        } else {
+            obj = Resource.From(txb, entity.create_resource2());
+        }
 
         if (this.data?.information !== undefined ) {
             entity.update(this.data.information)
@@ -33,13 +45,6 @@ export class CallPersonal extends CallBase {
         if (this.data?.mark === undefined) {
             return ;
         }
-        
-        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)
-        }
 
         if (this.data?.mark?.op === 'destroy') {
             entity.destroy_resource(obj)
@@ -97,8 +102,8 @@ export class CallPersonal extends CallBase {
                 if (addr) entity.use_resource(Resource.From(txb, addr));
             }
 
-            if (!object_address) {
-                await this.new_with_mark('PersonalMark', txb, obj.launch(), (this.data?.mark_object as any)?.namedNew, account);
+            if (!entity_data?.mark_object) {
+                obj.launch();
             }
         }
     }

package/src/local/account.ts

@@ -147,7 +147,7 @@ export class Account {
         }
         return address_or_names.map(v => undefined);
     }
-    async set_name(name:string, address?:string) : Promise<boolean> {
+    async set_name(name:string, address_or_name?:string) : Promise<boolean> {
         if (!IsValidName(name)) {
             ERROR(Errors.IsValidName, `Name ${name} is not valid`);
         }
@@ -159,7 +159,7 @@ export class Account {
                 ERROR(Errors.IsValidName, `Name ${name} already exists`); 
             }
 
-            if (!address) {
+            if (!address_or_name) {
                 const f = s.find(v => v.default);
                 if (f) {
                     f.name = name;
@@ -167,7 +167,7 @@ export class Account {
                     return true;
                 } 
             } else {
-                const f = s.find(v => v.address === address);
+                const f = s.find(v => v.address === address_or_name || v.name === address_or_name);
                 if (f) {
                     f.name = name;
                     await this.storage.put(AccountKey, JSON.stringify(s));
@@ -199,14 +199,17 @@ export class Account {
                 const f = s.find(v => v.default);
                 if (f) {
                     f.suspended = suspend;
+                    f.name = undefined;
+                    await this.storage.put(AccountKey, JSON.stringify(s));
                 } 
             } else {
                 const f = s.find(v => v.address === address_or_name || v.name === address_or_name);
                 if (f) {
                     f.suspended = suspend;
+                    f.name = undefined;
+                    await this.storage.put(AccountKey, JSON.stringify(s));
                 } 
             }
-            await this.storage.put(AccountKey, JSON.stringify(s));
         }
     }
 
@@ -220,7 +223,6 @@ export class Account {
 
     async sign_and_commit(txb: TransactionBlock, address_or_name?:string) : Promise<CallResponse | undefined> {
         const a = await this.get_imp(address_or_name);
-        console.log('sign_and_commit', a, address_or_name);
         if (a) {
             const pair = Ed25519Keypair.fromSecretKey(fromHEX(a.secret!));
             if (pair) {

package/src/local/index.ts

@@ -65,7 +65,7 @@ export interface AccountOperation {
     gen?: {name?:string, default?: boolean} | null; // generate a new account, if not specified, generate a new default account.
     default?: {name_or_address: string} | null; // set the default account.
     suspend?: {name_or_address?: string, suspend?:boolean} | null; // suspend the account, if not specified, suspend the default account.
-    name?: {name:string, address?:string} | null; // name the account, if not specified, name the default account.
+    name?: {new_name:string, name_or_address?:string} | null; // name the account, if not specified, name the default account.
     transfer?: {name_or_address_from?: string, name_or_address_to?:string, amount:number|string, token_type?: string} | null;   // transfer the token.
 }
 
@@ -87,11 +87,11 @@ export const account_operation = async(op: AccountOperation) : Promise<AccountOp
         await Account.Instance().suspend(op.suspend.name_or_address, op.suspend.suspend);
     }
     if (op.name) {
-        await Account.Instance().set_name(op.name.name, op.name.address); 
+        await Account.Instance().set_name(op.name.new_name, op.name.name_or_address); 
     }
 
     if(op.transfer) {
-        res.transfer = await Account.Instance().transfer(op.transfer.amount, op.transfer.token_type, op.transfer.name_or_address_from, op.transfer.name_or_address_to);
+        res.transfer = await Account.Instance().transfer(op.transfer.amount, op.transfer.token_type, op.transfer.name_or_address_to, op.transfer.name_or_address_from);
     }
     return res;
 }
@@ -108,7 +108,7 @@ export const local_mark_operation = async(op: LocalMarkOperation) : Promise<void
         case 'add':
             for (let i = 0; i < op.data.data.length; ++ i) {
                 const v = op.data.data[i];
-                await LocalMark.Instance().put(v.name, {object: v.address, tags: v.tags}, v.useAddressIfNameExist);
+                await LocalMark.Instance().put(v.name, {address: v.address, tags: v.tags} as MarkData, v.useAddressIfNameExist);
             };
             return ;
         case 'remove':

package/src/local/local.ts

@@ -1,6 +1,6 @@
 
 /**
- * manage object's name and tags locally
+ * manage address name and tags locally
  */
 
 import path from "path";
@@ -10,7 +10,7 @@ import { isBrowser } from "../common.js";
 import { ERROR, Errors, IsValidAddress, TagName } from "wowok";
 
 export interface MarkData {
-    object: string;
+    address: string;
     tags?: string[];
 }
 
@@ -22,7 +22,7 @@ export interface InfoData {
 export interface LocalMarkFilter {
   name?: string;
   tags?: string[];
-  object?: string;
+  address?: string;
 }
 
 export const LocalMarkLocation = 'wowok-mark';
@@ -51,14 +51,14 @@ export class LocalMark {
     // otherwise, use this name and change the original name to its address.
     async put(name:string | undefined | null, mark:MarkData, useAddressIfNameExist?:boolean) : Promise<string> {
       // object address invalid
-      if (!IsValidAddress(mark.object) && mark.object !== '0x2' && mark.object !== '0x6') { 
-        ERROR(Errors.InvalidParam, `LocalMark.put.mark.object: ${mark.object}`)
+      if (!IsValidAddress(mark.address) && mark.address !== '0x2' && mark.address !== '0x6') { 
+        ERROR(Errors.InvalidParam, `LocalMark.put.mark.address: ${mark.address}`)
       };
 
       // use address as name if name is undefined or null
       if (name === undefined || name === null) {
-        this.storage.put(mark.object, JSON.stringify(mark));
-        return mark.object
+        this.storage.put(mark.address, JSON.stringify(mark));
+        return mark.address
       }
 
       if (name.length > LocalMarkNameMaxLength) {
@@ -68,11 +68,11 @@ export class LocalMark {
       const r = await this.storage.get(name);
       if (r) {
         if (useAddressIfNameExist) {
-          this.storage.put(mark.object, JSON.stringify(mark));
-          return mark.object
+          this.storage.put(mark.address, JSON.stringify(mark));
+          return mark.address
         } else {
           const obj = JSON.parse(r) as MarkData;
-          await this.storage.put(obj.object, r)
+          await this.storage.put(obj.address, r)
         }
       }
 
@@ -95,7 +95,7 @@ export class LocalMark {
       if (name_or_address !== undefined && name_or_address !== null) {
         const r = await this.storage.get(name_or_address);
         if (r) {
-            return JSON.parse(r).object;
+            return JSON.parse(r).address;
         }     
       }
     }
@@ -109,7 +109,7 @@ export class LocalMark {
         if (check(v)) {
           const r = q.shift();
           if (r) {
-            return JSON.parse(q.shift()!)?.object;
+            return JSON.parse(q.shift()!)?.address;
           } 
         } 
         return v
@@ -169,7 +169,7 @@ export class LocalMark {
       return (await this.storage.iterator().all()).filter(v => {
         const obj = JSON.parse(v[1]) as MarkData;
         if (filter?.name && v[0] !== filter.name) return false;
-        if (filter?.object && obj.object !== filter.object) return false;
+        if (filter?.address && obj.address !== filter.address) return false;
 
         if (filter?.tags && filter.tags.length > 0) {
           if (!obj.tags || obj.tags.length === 0) return false;

package/src/query/permission.ts

@@ -3,11 +3,12 @@
  * not only the permission table, but also the administrator or Builder identity.
  */
 
+import { LocalMark } from '../local/local.js';
 import { TransactionBlock, Protocol, Bcs, IsValidAddress, Errors, ERROR, Permission, PermissionAnswer, BCS} from 'wowok';
 
 export interface PermissionQuery {
-    permission_object: string;
-    address: string;
+    object_address_or_name: string;
+    entity_address_or_name: string;
 }
 
 /*json: PermissionQuery; return PermissionAnswer */
@@ -21,29 +22,31 @@ export const query_permission_json = async (json:string) : Promise<string> => {
 }
 
 export const query_permission = async (query:PermissionQuery) : Promise<PermissionAnswer> => {
-    if (!IsValidAddress(query.permission_object)) {
-        ERROR(Errors.IsValidAddress, 'permission.permission_object');
-    }/*
-    if (!IsValidAddress(query.address)) {
-        ERROR(Errors.IsValidAddress, 'permission.address')
-    }*/
+    const object_address = await LocalMark.Instance().get_address(query.object_address_or_name);
+    const entity_address = await LocalMark.Instance().get_address(query.entity_address_or_name);
+
+    if (!object_address || !entity_address) {
+        ERROR(Errors.InvalidParam, 'query.object_address_or_name or query.entity_address_or_name');
+    }
+    
     const txb = new TransactionBlock();
-    const object = Permission.From(txb, query.permission_object);
-    object.query_permissions_all(query.address);
+    const object = Permission.From(txb, object_address);
+    
+    object.query_permissions_all(entity_address);
 
-    const res = await Protocol.Client().devInspectTransactionBlock({sender:query.address, transactionBlock:txb});
+    const res = await Protocol.Client().devInspectTransactionBlock({sender:entity_address, transactionBlock:txb});
     if (res.results && res.results[0].returnValues && res.results[0].returnValues.length !== 2 )  {
         ERROR(Errors.Fail, 'permission.retValues')
     }
 
     const perm = Bcs.getInstance().de(BCS.U8, Uint8Array.from((res.results as any)[0].returnValues[0][0]));
     if (perm === Permission.PERMISSION_ADMIN || perm === Permission.PERMISSION_OWNER_AND_ADMIN) {
-        return {who:query.address, admin:true, owner:perm%2===1, items:[], object:query.permission_object}
+        return {who:entity_address, admin:true, owner:perm%2===1, items:[], object:object_address}
     } else {
         const perms = Bcs.getInstance().de_perms(Uint8Array.from((res.results as any)[0].returnValues[1][0]));
-        return {who:query.address, admin:false, owner:perm%2===1, items:perms.map((v:any)=>{
+        return {who:entity_address, admin:false, owner:perm%2===1, items:perms.map((v:any)=>{
             return {query:v?.index, permission:true, guard:v?.guard}
-        }), object:query.permission_object};  
+        }), object:object_address};  
     }
 }