wowok_agent 0.1.6 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok_agent",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/cache.ts

@@ -19,16 +19,15 @@ export abstract class CacheData {
 
 export enum CacheName {
     object = 'OBJECT',
-    resource = 'RESOURCE',
+    personal = 'PERSONAL',
+    table = 'TABLE'
 }
 
-export const OBJECT_KEY = (object_address: string) : string => {
-    return object_address + Protocol.Instance().package('wowok_origin') + CacheName.object + '-V2';
-}
-export const PERSONAL_RESOURCE_KEY = (person_address: string) : string => {
-    return person_address + Protocol.Instance().package('wowok_origin') + CacheName.resource + '-V2';
+export const OBJECT_KEY = (object_address: string, name:CacheName) : string => {
+    return object_address + Protocol.Instance().package('wowok_origin') + name + '-V2';
 }
 
+
 export interface PersonalResouceCache {
     address: string;
     resource: string;

package/src/call/arbitration.ts

@@ -1,13 +1,13 @@
-import { TransactionBlock, CallResponse, IsValidArgType, TransactionResult} from 'wowok';
+import { TransactionBlock, IsValidArgType, } from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, PermissionIndexType, Treasury, 
     Arbitration, Dispute, Feedback, Vote, VotingGuard, WithdrawFee, WitnessFill
 } from 'wowok';
 import { query_objects, ObjectArbitration, } from '../objects';
-import { CallBase, CallResult, AddressMark } from "./base";
+import { CallBase, CallResult, AddressMark, Namedbject} from "./base";
 
 export interface CallArbitration_Data {
-    object?: string; // undefined for creating a new object
-    permission?: string; 
+    object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
+    permission?: {address:string} | {namedNew: Namedbject, description?:string}; 
     mark?:AddressMark;
     type_parameter?: string;
     permission_new?: string;
@@ -15,10 +15,10 @@ export interface CallArbitration_Data {
     bPaused?: boolean;
     endpoint?: string;
     fee?: string;
-    fee_treasury?: string;
+    fee_treasury?: {address:string} | {namedNew: Namedbject, description?:string}; 
     usage_guard?: string;
     voting_guard?: {op:'add' | 'set'; data:VotingGuard[]} | {op:'remove', guards:string[]} | {op:'removeall'};
-    arb_new?: {data: Dispute; guard?:string | 'fetch'}; // dispute an order, and a new Arb launched.
+    arb_new?: {data: Dispute; guard?:string | 'fetch'; namedNew?: Namedbject}; // dispute an order, and a new Arb launched.
     arb_withdraw_fee?: {arb:string; data:WithdrawFee};
     arb_vote?: Vote;
     arb_arbitration?: Feedback;
@@ -37,15 +37,18 @@ export class CallArbitration extends CallBase {
 
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = [];  var obj: ObjectArbitration | undefined ;
+        const permission_address = (this.data?.permission as any)?.address;
+        const object_address = (this.data?.object as any)?.address;
+        const treasury_address = (this.data?.fee_treasury as any)?.address;
 
-        if (this.data?.permission && IsValidAddress(this.data.permission)) {
+        if (permission_address && IsValidAddress(permission_address)) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.arbitration)
             }
             if (this.data?.permission_new !== undefined) {
                 checkOwner = true;
             }
-            if (this.data?.description !== undefined && this.data.object) {
+            if (this.data?.description !== undefined && object_address) {
                 perms.push(PermissionIndex.arbitration_description)
             }
             if (this.data?.bPaused !== undefined) {
@@ -54,10 +57,10 @@ export class CallArbitration extends CallBase {
             if (this.data?.endpoint == undefined) { // publish is an irreversible one-time operation 
                 perms.push(PermissionIndex.arbitration_endpoint)
             }
-            if (this.data?.fee !== undefined && this.data.object) {
+            if (this.data?.fee !== undefined && object_address) {
                 perms.push(PermissionIndex.arbitration_fee)
             }
-            if (this.data?.fee_treasury !== undefined && this.data.object) {
+            if (treasury_address !== undefined && object_address) {
                 perms.push(PermissionIndex.arbitration_treasury)
             }
             if (this.data?.usage_guard !== undefined) {
@@ -73,13 +76,13 @@ export class CallArbitration extends CallBase {
                 if (IsValidAddress(this.data.arb_new.guard)) {
                     guards.push(this.data.arb_new.guard)
                 } else {
-                    if (!this.data.object) { // new
+                    if (!object_address) { // new
                         if (this.data?.usage_guard && IsValidAddress(this.data?.usage_guard)) {
                             guards.push(this.data.usage_guard)
                         }
                     } else {
                         if (!obj) {
-                            const r = await query_objects({objects:[this.data.object!], showContent:true});
+                            const r = await query_objects({objects:[object_address], showContent:true});
                             if (r?.objects && r.objects[0].type === 'Arbitration') {
                                 obj = r.objects[0] as ObjectArbitration;
                             }                                
@@ -98,29 +101,36 @@ export class CallArbitration extends CallBase {
                 guards.push(this.data?.arb_vote?.voting_guard)
             }
 
-            return await this.check_permission_and_call(this.data.permission, perms, guards, checkOwner, undefined, account)
+            return await this.check_permission_and_call(permission_address, perms, guards, checkOwner, undefined, account)
         }
         return await this.exec(account);
     }
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Arbitration | undefined ; let permission: any; let withdraw_treasury:any;
-        if (!this.data.object) {
-            if (!this.data?.permission || !IsValidAddress(this.data?.permission)) {
-                permission = Permission.New(txb, '');
+        const permission_address = (this.data?.permission as any)?.address;
+        const object_address = (this.data?.object as any)?.address;
+        const treasury_address = (this.data?.fee_treasury as any)?.address;
+
+        if (!object_address) {
+            if (!permission_address || !IsValidAddress(permission_address)) {
+                const d = (this.data?.permission as any)?.description ?? '';
+                permission = Permission.New(txb, d);
             }
-            if (!this.data?.fee_treasury || !IsValidAddress(this.data?.fee_treasury)) {
-                withdraw_treasury = Treasury.New(txb, this.data?.type_parameter!, permission ?? this.data?.permission, '', permission?undefined:passport);
+            if (!treasury_address || !IsValidAddress(treasury_address)) {
+                const d = (this.data?.fee_treasury as any)?.description ?? '';
+                withdraw_treasury = Treasury.New(txb, this.data?.type_parameter!, permission ?? permission_address, d, permission?undefined:passport);
             }
-            obj = Arbitration.New(txb, this.data.type_parameter!, permission ?? this.data?.permission, this.data?.description??'', 
-                BigInt(this.data?.fee ?? 0), withdraw_treasury??this.data.fee_treasury, permission?undefined:passport);
-        } else if (this.data.object) {
-            if (IsValidAddress(this.data.object) && this.data.type_parameter && this.data.permission && IsValidAddress(this.data?.permission)) {
-                obj = Arbitration.From(txb, this.data.type_parameter, this.data.permission, this.data.object)
+
+            obj = Arbitration.New(txb, this.data.type_parameter!, permission ?? permission_address, this.data?.description??'', 
+                BigInt(this.data?.fee ?? 0), withdraw_treasury??treasury_address, permission?undefined:passport);
+        } else if (object_address) {
+            if (IsValidAddress(object_address) && this.data.type_parameter && permission_address) {
+                obj = Arbitration.From(txb, this.data.type_parameter, permission_address, object_address)
             }
         }
 
         if (obj) {
-            if (this.data?.description !== undefined && this.data.object) {
+            if (this.data?.description !== undefined && object_address) {
                 obj?.set_description(this.data.description, passport);
             }
             if (this.data?.bPaused !== undefined) {
@@ -129,11 +139,11 @@ export class CallArbitration extends CallBase {
             if (this.data?.endpoint !== undefined) {
                 obj?.set_endpoint(this.data.endpoint, passport)
             }
-            if (this.data?.fee !== undefined && this.data.object) {
+            if (this.data?.fee !== undefined && object_address) {
                 obj?.set_fee(BigInt(this.data.fee), passport)
             }
-            if (this.data.fee_treasury !== undefined && this.data.object) {
-                obj?.set_withdrawTreasury(this.data.fee_treasury, passport)
+            if (treasury_address !== undefined && object_address) {
+                obj?.set_withdrawTreasury(treasury_address, passport)
             }
             if (this.data.usage_guard !== undefined) {
                 obj?.set_guard(this.data.usage_guard, passport)
@@ -157,7 +167,7 @@ export class CallArbitration extends CallBase {
             }
             
             if (this.data?.arb_new !== undefined) {
-                obj?.dispute(this.data.arb_new.data, passport)
+                this.new_with_mark(txb, obj?.dispute(this.data.arb_new.data, passport), (this.data?.arb_new as any)?.namedNew, account);
             }
             if (this.data?.arb_arbitration !== undefined) {
                 obj?.arbitration(this.data.arb_arbitration, passport)
@@ -171,22 +181,17 @@ export class CallArbitration extends CallBase {
             if (this.data?.permission_new !== undefined) {
                 obj?.change_permission(this.data.permission_new);
             }
+
             if (withdraw_treasury) {
-                withdraw_treasury.launch();
+                this.new_with_mark(txb, withdraw_treasury.launch(), (this.data?.fee_treasury as any)?.namedNew, account);
             }
             if (permission) {
-                permission.launch();
-            }
-            var mark : TransactionResult | string | undefined ;
-            if (!this.data.object) {
-                mark = obj?.launch();
-            } else {
-                mark = this.data.object;
+                this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
 
-            if (this.data?.mark !== undefined) {
-                this.mark(txb, mark, this.data?.mark, account)
-            }
+            if (!object_address) {
+                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+            } 
         }
     }
 }

package/src/call/base.ts

@@ -1,18 +1,22 @@
 
 
-import { Protocol, TransactionBlock, CallResponse, Guard, TransactionArgument, Entity, IsValidAddress, Resource, TxbObject, TransactionResult} from 'wowok';
+import { Protocol, TransactionBlock, CallResponse, Guard, TransactionArgument, Entity, IsValidAddress, Resource, TxbObject, TransactionResult, TxbAddress, array_unique, TagName} from 'wowok';
 import { PassportObject, Errors, ERROR, Permission, 
     PermissionIndexType, GuardParser, Passport, WitnessFill
 } from 'wowok';
 import { query_permission } from '../permission';
 import { Account } from '../account';
-import { ObjectBase} from '../objects';
-import { query_entity } from '../entity';
+import { ObjectBase, queryTableItem_Personal} from '../objects';
+
+export interface Namedbject {
+    name: string;
+    tags?: string[];
+}
 
 export interface AddressMark {
-    nick_name?:string; 
-    tags:string[]; 
-    groups:string[];
+    address: TxbAddress;
+    name?: string; 
+    tags: string[]; 
 }
 export interface ResponseData extends ObjectBase {
     change:'created' | 'mutated' | string;
@@ -28,7 +32,7 @@ export interface CallWithWitnessParam {
 }
 export type CallResult = GuardInfo_forCall | CallResponse | undefined;
 
-export function ResponseData(response: CallResponse | undefined ) : ResponseData[] {
+export function ResponseData(response: CallResponse | undefined) : ResponseData[] {
     const res : ResponseData[] = [];
     response?.objectChanges?.forEach(v => {
         const type_raw: string | undefined = (v as any)?.objectType;
@@ -41,6 +45,20 @@ export function ResponseData(response: CallResponse | undefined ) : ResponseData
     })
     return res;
 }
+
+export const mark_address = async (txb:TransactionBlock, mark:AddressMark, account?:string) => {
+    const addr = Account.Instance().get_address(account);
+    if (addr) {
+        const r = await queryTableItem_Personal({address:addr}); //@ use cache
+        const resource = r?.mark_object ? Resource.From(txb, r.mark_object) : Resource.From(txb, Entity.From(txb).create_resource2());
+        resource.add(mark.address, mark.tags, mark.name);
+        if (!r?.mark_object) {
+            resource.launch(); // launch new
+        }
+    } else {
+        ERROR(Errors.InvalidParam, 'account - ' + account)
+    }
+}
 export class CallBase {
     // operation implementation for a call
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {};
@@ -136,19 +154,8 @@ export class CallBase {
         });
     }
 
-    protected mark = async (txb:TransactionBlock, object: string | TransactionResult, mark:AddressMark, account?:string) => {
-        const addr = Account.Instance().get_address(account);
-        if (addr) {
-            const r = await query_entity(addr);
-            if (r?.resource) {
-                const resource = Resource.From(txb, r.resource);
-                resource.add_tags(object, mark.nick_name??'', mark.tags);
-                if (mark.groups.length > 0) {
-                    resource.add2(object, mark.groups);
-                }
-            }
-        } else {
-            ERROR(Errors.InvalidParam, 'account - ' + account)
-        }
+    protected new_with_mark(txb:TransactionBlock, object:TxbAddress, named_new?:Namedbject, account?:string, innerTags:string[]=[TagName.Launch]) {
+        const tags = named_new?.tags ? array_unique([...named_new.tags, ...innerTags]) : array_unique([...innerTags]);
+        mark_address(txb, {address:object, name:named_new?.name, tags:tags}, account)
     }
 }

package/src/call/demand.ts

@@ -2,12 +2,13 @@ import { TransactionBlock, IsValidArgType, IsValidCoinType } from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, 
     PermissionIndexType, Demand, } from 'wowok';
 import { query_objects, ObjectDemand } from '../objects';
-import { CallBase, CallResult } from "./base";
+import { CallBase, CallResult, Namedbject } from "./base";
 import { Account } from '../account';
 
 export interface CallDemand_Data {
-    object?: string; // undefined for creating a new object
-    permission?: string; 
+    object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
+    permission?: {address:string} | {namedNew: Namedbject, description?:string}; 
+
     type_parameter?: string;
     guard?: {address:string; service_id_in_guard?:number};
     description?: string;
@@ -30,15 +31,17 @@ export class CallDemand extends CallBase {
 
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = []; 
+        const permission_address = (this.data?.permission as any)?.address;
+        const object_address = (this.data?.object as any)?.address;
 
-        if (this.data?.permission && IsValidAddress(this.data.permission)) {
+        if (permission_address && IsValidAddress(permission_address)) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.demand)
             }
-            if (this.data?.description !== undefined && this.data.object) {
+            if (this.data?.description !== undefined && object_address) {
                 perms.push(PermissionIndex.demand_description)
             }
-            if (this.data?.time_expire !== undefined && this.data.object) {
+            if (this.data?.time_expire !== undefined && object_address) {
                 perms.push(PermissionIndex.demand_expand_time)
             }
             if (this.data?.guard !== undefined) {
@@ -54,12 +57,12 @@ export class CallDemand extends CallBase {
                 if (IsValidAddress(this.data.present.guard)) {
                     guards.push(this.data.present.guard)
                 } else {
-                    if (!this.data.object) { // new
+                    if (!object_address) { // new
                         if (this.data?.guard?.address && IsValidAddress(this.data?.guard.address)) {
                             guards.push(this.data.guard.address)
                         }
                     } else {
-                        const r = await query_objects({objects:[this.data.object], showContent:true});
+                        const r = await query_objects({objects:[object_address], showContent:true});
                         if (r?.objects && r?.objects[0]?.type === 'Demand') {
                             const obj = (r?.objects[0] as ObjectDemand);
                             if (obj?.guard) {
@@ -69,37 +72,40 @@ export class CallDemand extends CallBase {
                     }
                 }
             }
-            return await this.check_permission_and_call(this.data.permission, perms, guards, checkOwner, undefined, account)
+            return await this.check_permission_and_call(permission_address, perms, guards, checkOwner, undefined, account)
         }
         return await this.exec(account);
     }
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Demand | undefined ; let permission: any;
+        const permission_address = (this.data?.permission as any)?.address;
+        const object_address = (this.data?.object as any)?.address;
 
-        if (!this.data.object) {
-            if (!this.data?.permission || !IsValidAddress(this.data?.permission)) {
-                permission = Permission.New(txb, '');
+        if (!object_address) {
+            if (!permission_address || !IsValidAddress(permission_address)) {
+                const d = (this.data?.permission as any)?.description ?? '';
+                permission = Permission.New(txb, d);
             }
             
             if (this.data.time_expire !== undefined) {
                 obj = Demand.New(txb, this.data.type_parameter!, this.data.time_expire?.op === 'duration' ? true : false, 
                     this.data.time_expire?.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire?.time,
-                    permission ? permission.get_object(): this.data?.permission, this.data?.description??'', permission?undefined:passport)
+                    permission ? permission.get_object(): permission_address, this.data?.description??'', permission?undefined:passport)
             } else {
                 obj = Demand.New(txb, this.data.type_parameter!, true, 30*24*60, // 30days default
-                    permission ? permission.get_object(): this.data?.permission, this.data?.description??'', permission?undefined:passport)       
+                    permission ? permission.get_object(): permission_address, this.data?.description??'', permission?undefined:passport)       
             }
         } else {
-            if (IsValidAddress(this.data.object) && this.data.type_parameter && this.data.permission && IsValidAddress(this.data?.permission)) {
-                obj = Demand.From(txb, this.data.type_parameter, this.data.permission, this.data.object)
+            if (IsValidAddress(object_address) && this.data.type_parameter && this.data.permission && IsValidAddress(permission_address)) {
+                obj = Demand.From(txb, this.data.type_parameter, permission_address, object_address)
             }
         }
 
         if (obj) {
-            if (this.data?.description !== undefined && this.data.object) {
+            if (this.data?.description !== undefined && object_address) {
                 obj?.set_description(this.data.description, passport);
             }
-            if (this.data?.time_expire !== undefined && this.data.object) {
+            if (this.data?.time_expire !== undefined && object_address) {
                 obj?.expand_time(this.data.time_expire.op === 'duration' ? true : false, 
                     this.data.time_expire.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire.time, passport)
             }
@@ -128,10 +134,10 @@ export class CallDemand extends CallBase {
                 obj?.set_guard(this.data.guard.address, this.data.guard?.service_id_in_guard ?? undefined, passport)
             }
             if (permission) {
-                permission.launch();
+                this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!this.data.object) {
-                obj?.launch();
+                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/entity_permission.ts

@@ -1,11 +1,11 @@
-import { CallBase, CallResult } from "./base";
+import { CallBase, CallResult, Namedbject } from "./base";
 import { TransactionBlock, CallResponse} from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, UserDefinedIndex,
     PermissionIndexType, WitnessFill
 } from 'wowok';
 
 export interface CallEntityPermission_Data {
-    object?: string; // undefined for creating a new object
+    object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
     builder?: string;
     admin?: {op:'add' | 'remove' | 'set', admins:string[]};
     description?: string;
@@ -23,7 +23,9 @@ export class CallEntityPermission extends CallBase {
 
     async call(account?:string) : Promise<CallResult>   {
         var checkOwner = false; var checkAdmin = false;
-        if (this.data?.object && IsValidAddress(this.data?.object)) {
+        const object_address = (this.data?.object as any)?.address;
+
+        if (object_address && IsValidAddress(object_address)) {
             if (this.data?.builder !== undefined || this.data?.admin !== undefined) {
                 checkOwner = true;
             }
@@ -33,18 +35,18 @@ export class CallEntityPermission extends CallBase {
             if (this.data?.description !== undefined) {
                 checkAdmin = true;
             }
-            return await this.check_permission_and_call(this.data.object, [], [], checkOwner, checkAdmin, account)
+            return await this.check_permission_and_call(object_address, [], [], checkOwner, checkAdmin, account)
         }
         return await this.exec(account)
     }
-    protected async operate (txb:TransactionBlock, passport?:PassportObject) {
+    protected async operate (txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Permission | undefined ; 
-        if (!this.data.object) {
+        const object_address = (this.data?.object as any)?.address;
+
+        if (!object_address || !IsValidAddress(object_address)) {
             obj = Permission.New(txb, this.data?.description??'');
         } else {
-            if (IsValidAddress(this.data.object)) {
-                obj = Permission.From(txb, this.data.object)
-            }
+            obj = Permission.From(txb, object_address)
         }
 
         if (obj) {
@@ -102,8 +104,8 @@ export class CallEntityPermission extends CallBase {
             if (this.data?.builder !== undefined ) {
                 obj?.change_owner(this.data.builder);
             }
-            if (!this.data.object) {
-                obj?.launch();
+            if (!object_address) {
+                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/guard.ts

@@ -7,7 +7,7 @@ import { Bcs, ContextType, ERROR, Errors, IsValidU8, OperatorType, ValueType, GU
     concatenate, TransactionBlock, Protocol, FnCallType, hasDuplicates, insertAtHead, CallResponse, 
     IsValidDesription} from "wowok";
 import { Account } from "../account";
-import { CallBase, CallResult } from "./base";
+import { CallBase, CallResult, Namedbject } from "./base";
 
 export interface GuardConst {
     identifier: number; // 1-255, the same identifier to represent the same data in different nodes
@@ -30,6 +30,7 @@ export type GuardNode = { identifier: number; } // Data from GuardConst
     | {context: ContextType.TYPE_CLOCK | ContextType.TYPE_GUARD | ContextType.TYPE_SIGNER }; // Data from run-time environment
 
 export interface CallGuard_Data {
+    namedNew?: Namedbject;
     description: string;
     table: GuardConst[]; //  data used by multiple logical guard nodes
     root: GuardNode; // root must return ValueType.TYPE_BOOL     
@@ -84,11 +85,12 @@ export class CallGuard extends CallBase {
                 }) 
             }
         })
-        txb.moveCall({
+        const addr = txb.moveCall({
             target:Protocol.Instance().guardFn("create") as FnCallType,
             arguments:[txb.object(obj)]
         });
-    
+        this.new_with_mark(txb, addr, this.data?.namedNew, account);
+
         const pair = Account.Instance().get_pair(account, true);
         if (!pair) ERROR(Errors.Fail, 'account invalid')