wowok_agent 0.1.7 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok_agent",
-  "version": "0.1.7",
+  "version": "0.1.11",
   "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/call/arbitration.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock, IsValidArgType, } from 'wowok';
+import { TransactionBlock, IsValidArgType, Resource, ResourceObject, } from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, PermissionIndexType, Treasury, 
     Arbitration, Dispute, Feedback, Vote, VotingGuard, WithdrawFee, WitnessFill
 } from 'wowok';
@@ -9,7 +9,7 @@ export interface CallArbitration_Data {
     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;
+    type_parameter: string;
     permission_new?: string;
     description?: string;
     bPaused?: boolean;
@@ -118,14 +118,17 @@ export class CallArbitration extends CallBase {
             }
             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);
+                withdraw_treasury = Treasury.New(txb, this.data?.type_parameter!, permission ? permission.get_object() : permission_address, 
+                    d, permission?undefined:passport);
             }
 
-            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);
+            obj = Arbitration.New(txb, this.data.type_parameter!, permission ? permission.get_object() : permission_address, this.data?.description??'', 
+                BigInt(this.data?.fee ?? 0), withdraw_treasury? withdraw_treasury.get_object() : 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)
+            } else {
+                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
             }
         }
 
@@ -167,7 +170,7 @@ export class CallArbitration extends CallBase {
             }
             
             if (this.data?.arb_new !== undefined) {
-                this.new_with_mark(txb, obj?.dispute(this.data.arb_new.data, passport), (this.data?.arb_new as any)?.namedNew, account);
+                await 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)
@@ -183,14 +186,14 @@ export class CallArbitration extends CallBase {
             }
 
             if (withdraw_treasury) {
-                this.new_with_mark(txb, withdraw_treasury.launch(), (this.data?.fee_treasury as any)?.namedNew, account);
+                await this.new_with_mark(txb, withdraw_treasury.launch(), (this.data?.fee_treasury as any)?.namedNew, account);
             }
             if (permission) {
-                this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
 
             if (!object_address) {
-                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             } 
         }
     }

package/src/call/base.ts

@@ -1,12 +1,12 @@
 
 
-import { Protocol, TransactionBlock, CallResponse, Guard, TransactionArgument, Entity, IsValidAddress, Resource, TxbObject, TransactionResult, TxbAddress, array_unique, TagName} from 'wowok';
+import { Protocol, TransactionBlock, CallResponse, Guard, TransactionArgument, Entity, IsValidAddress, Resource, TxbObject, TransactionResult, TxbAddress, array_unique, TagName, ResourceObject} from 'wowok';
 import { PassportObject, Errors, ERROR, Permission, 
     PermissionIndexType, GuardParser, Passport, WitnessFill
 } from 'wowok';
 import { query_permission } from '../permission';
 import { Account } from '../account';
-import { ObjectBase, queryTableItem_Personal} from '../objects';
+import { ObjectBase, queryTableItem_Personal, raw2type} from '../objects';
 
 export interface Namedbject {
     name: string;
@@ -36,7 +36,7 @@ export function ResponseData(response: CallResponse | undefined) : ResponseData[
     const res : ResponseData[] = [];
     response?.objectChanges?.forEach(v => {
         const type_raw: string | undefined = (v as any)?.objectType;
-        const type:string | undefined = type_raw ? Protocol.Instance().object_name_from_type_repr(type_raw) : undefined;
+        const type = raw2type(type_raw);
         if (type) {
             res.push({type:type, type_raw:type_raw, object:(v as any)?.objectId, version:(v as any)?.version,
                 owner:(v as any)?.owner, change:v.type
@@ -46,21 +46,9 @@ 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
+    resouceObject:ResourceObject | undefined;
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {};
     constructor () {}
     // return WitnessFill to resolve filling witness, and than 'call_with_witness' to complete the call; 
@@ -70,22 +58,16 @@ export class CallBase {
     async call_with_witness (param: CallWithWitnessParam) : Promise<CallResponse | undefined> {
         if (param.info.guard.length > 0) {         // prepare passport
             const p: GuardParser | undefined = await GuardParser.Create([...param.info.guard]);
-            const pair = Account.Instance().get_pair(param.account, true);
-            if (!pair) ERROR(Errors.Fail, 'account invalid')
 
             if (p) {
                 const query = await p.done(param.info.witness);
                 if (query) {
                     const txb = new TransactionBlock();
                     const passport = new Passport(txb, query!);   
-                    this.operate(new TransactionBlock(), passport?.get_object(), param?.account)
+                    await this.operate(new TransactionBlock(), passport?.get_object(), param?.account)
                     passport.destroy();
-
-                    return await Protocol.Client().signAndExecuteTransaction({
-                        transaction: txb, 
-                        signer: pair!,
-                        options:{showObjectChanges:true},
-                    });
+                    
+                    return await this.sign_and_commit(txb, param.account);
                 }
             } else {
                 ERROR(Errors.Fail, 'guard finish_passport')
@@ -96,11 +78,12 @@ export class CallBase {
     protected async check_permission_and_call (permission:string, permIndex: PermissionIndexType[], guards_needed: string[],
         checkOwner?:boolean, checkAdmin?:boolean, account?:string) : Promise<CallResult>  {
         var guards : string[] = [];
-        const pair = Account.Instance().get_pair(account, true);
-        if (!pair) ERROR(Errors.Fail, 'account invalid')
 
         if (permIndex.length > 0 || checkOwner) {
-            const p = await query_permission({permission_object:permission, address:pair!.toSuiAddress()});
+            const addr = Account.Instance().get_address(account);
+            if (!addr) ERROR(Errors.InvalidParam, 'check_permission_and_call: account invalid');
+
+            const p = await query_permission({permission_object:permission, address:addr!});
             if (checkOwner && !p.owner) ERROR(Errors.noPermission, 'owner');
             if (checkAdmin && !p.admin) ERROR(Errors.noPermission, 'admin');
 
@@ -125,14 +108,10 @@ export class CallBase {
                 if (query) {
                     const txb = new TransactionBlock();
                     const passport = new Passport(txb, query!);   
-                    this.operate(new TransactionBlock(), passport?.get_object(), account)
+                    await this.operate(new TransactionBlock(), passport?.get_object(), account)
                     passport.destroy();
-
-                    return await Protocol.Client().signAndExecuteTransaction({
-                        transaction: txb, 
-                        signer: pair!,
-                        options:{showObjectChanges:true},
-                    });
+                    
+                    return await this.sign_and_commit(txb, account);
                 }
             } 
             
@@ -142,20 +121,45 @@ export class CallBase {
         }
     }
     protected async exec (account?:string) : Promise<CallResponse> {
+        const txb = new TransactionBlock();
+        await this.operate(txb, undefined, account);
+        return await this.sign_and_commit(txb, account);
+    }
+
+    protected async 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]);
+
+        if (!this.resouceObject) {
+            const addr = Account.Instance().get_address(account);
+            if (addr) {
+                const r = await queryTableItem_Personal({address:addr}); //@ use cache
+                if (!r?.mark_object) {
+                    this.resouceObject = Entity.From(txb).create_resource2(); // new 
+                    Resource.From(txb, this.resouceObject).add(object, tags, named_new?.name);
+                } else {
+                    Resource.From(txb, r.mark_object).add(object, tags, named_new?.name);
+                }
+            } else {
+                ERROR(Errors.InvalidParam, 'account - ' + account)
+            }
+        } else {
+            Resource.From(txb, this.resouceObject).add(object, tags, named_new?.name);
+        }
+    }
+
+    protected async sign_and_commit(txb: TransactionBlock, account?: string) : Promise<CallResponse> {
         const pair = Account.Instance().get_pair(account, true);
         if (!pair) ERROR(Errors.Fail, 'account invalid')
-
-        const txb = new TransactionBlock();
-        this.operate(txb, undefined, account);
+        
+        if (this.resouceObject) {
+            Resource.From(txb, this.resouceObject).launch(); //@ resource launch, if created.
+            this.resouceObject = undefined;
+        }
+    
         return await Protocol.Client().signAndExecuteTransaction({
             transaction: txb, 
             signer: pair!,
             options:{showObjectChanges:true},
         });
     }
-
-    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

@@ -1,4 +1,4 @@
-import { TransactionBlock, IsValidArgType, IsValidCoinType } from 'wowok';
+import { TransactionBlock, IsValidArgType, IsValidCoinType, Resource, ResourceObject } from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, 
     PermissionIndexType, Demand, } from 'wowok';
 import { query_objects, ObjectDemand } from '../objects';
@@ -8,8 +8,7 @@ import { Account } from '../account';
 export interface CallDemand_Data {
     object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
     permission?: {address:string} | {namedNew: Namedbject, description?:string}; 
-
-    type_parameter?: string;
+    type_parameter: string;
     guard?: {address:string; service_id_in_guard?:number};
     description?: string;
     time_expire?: {op: 'duration'; minutes:number} | {op:'set'; time:number};
@@ -98,6 +97,8 @@ export class CallDemand extends CallBase {
         } else {
             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)
+            } else {
+                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
             }
         }
 
@@ -134,10 +135,10 @@ export class CallDemand extends CallBase {
                 obj?.set_guard(this.data.guard.address, this.data.guard?.service_id_in_guard ?? undefined, passport)
             }
             if (permission) {
-                this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!this.data.object) {
-                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/guard.ts

@@ -5,8 +5,7 @@
 
 import { Bcs, ContextType, ERROR, Errors, IsValidU8, OperatorType, ValueType, GUARD_QUERIES, IsValidAddress, 
     concatenate, TransactionBlock, Protocol, FnCallType, hasDuplicates, insertAtHead, CallResponse, 
-    IsValidDesription} from "wowok";
-import { Account } from "../account";
+    IsValidDesription, PassportObject} from "wowok";
 import { CallBase, CallResult, Namedbject } from "./base";
 
 export interface GuardConst {
@@ -32,7 +31,7 @@ export type GuardNode = { identifier: number; } // Data from GuardConst
 export interface CallGuard_Data {
     namedNew?: Namedbject;
     description: string;
-    table: GuardConst[]; //  data used by multiple logical guard nodes
+    table?: GuardConst[]; //  data used by multiple logical guard nodes
     root: GuardNode; // root must return ValueType.TYPE_BOOL     
 }
 export class CallGuard extends CallBase {
@@ -42,6 +41,10 @@ export class CallGuard extends CallBase {
         this.data = data;
     }
     async call(account?:string) : Promise<CallResult> {
+        return await this.exec(account)
+    }
+    
+    protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         if (!this.data?.root) {
             ERROR(Errors.InvalidParam, 'guard root node invalid')
         }
@@ -50,28 +53,28 @@ export class CallGuard extends CallBase {
         }
     
         // check const
-        this.data.table.forEach(v => {
+        this.data?.table?.forEach(v => {
             if (!IsValidU8(v.identifier) || v.identifier < 1) ERROR(Errors.InvalidParam, 'table.identifer invalid');
             if (!v.bWitness && v.value === undefined) ERROR(Errors.InvalidParam, 'table.value');
         })
     
-        if (hasDuplicates(this.data.table.map(v => v.identifier))) {
+        if (this.data?.table && hasDuplicates(this.data?.table?.map(v => v.identifier))) {
             ERROR(Errors.InvalidParam, 'table.identifer duplicates')
         }
     
         // check root
         var output : Uint8Array[]= [];
-        buildNode(this.data.root!, ValueType.TYPE_BOOL, this.data.table, output);
+        buildNode(this.data.root!, ValueType.TYPE_BOOL, this.data?.table ?? [], output);
         const bytes = (concatenate(Uint8Array, ...output) as Uint8Array); 
-        const txb = new TransactionBlock();
-    
+
         const obj = txb.moveCall({
             target: Protocol.Instance().guardFn('new') as FnCallType,
             arguments: [txb.pure.string(this.data.description), txb.pure.vector('u8', [].slice.call(bytes.reverse()))],  
         });
-        this.data.table.forEach((v) => {
+        this.data?.table?.forEach((v) => {
             if (v.bWitness) {
                 const n = new Uint8Array(1); n.set([v.value_type], 0);
+                console.log(n)
                 txb.moveCall({
                     target:Protocol.Instance().guardFn("constant_add") as FnCallType,
                     arguments:[txb.object(obj), txb.pure.u8(v.identifier), txb.pure.bool(true), txb.pure.vector('u8', [].slice.call(n)), txb.pure.bool(false)]
@@ -89,16 +92,7 @@ export class CallGuard extends CallBase {
             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')
-    
-        return await Protocol.Client().signAndExecuteTransaction({
-            transaction: txb, 
-            signer: pair!,
-            options:{showObjectChanges:true},
-        });
+        await this.new_with_mark(txb, addr, this.data?.namedNew, account);
     }
 }
 
@@ -122,20 +116,18 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
         } else if (typeof(node.query === 'number')) {
             q = GUARD_QUERIES.find(v=>v[2] === node.query);
         }
-
-        if (q) {
-            checkType(q[4], type_required, node); // Return type checking
-            if ((q[3]).length === node.parameters.length) {
-                for (let i = node.parameters.length - 1; i >= 0; --i) { // stack: first in, last out
-                    buildNode(node.parameters[i], q[3][i], table, output); // Recursive check
-                }
-            } else {
-                ERROR(Errors.InvalidParam, 'node query parameters length not match - ' + node.toString())
+        if (!q) ERROR(Errors.InvalidParam, 'query invalid - ' + node?.query);
+        
+        checkType(q![4], type_required, node); // Return type checking
+        if ((q![3]).length === node.parameters.length) {
+            for (let i = node.parameters.length - 1; i >= 0; --i) { // stack: first in, last out
+                buildNode(node.parameters[i], q![3][i], table, output); // Recursive check
             }
         } else {
-            ERROR(Errors.InvalidParam, 'node query not found - ' + node.toString());
+            ERROR(Errors.InvalidParam, 'node query parameters length not match - ' + node.toString())
         }
 
+        output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, OperatorType.TYPE_QUERY)); // QUERY TYPE + addr + cmd
         if (typeof(node.object) === 'string') {
             if (!IsValidAddress(node.object)) {
                 ERROR(Errors.InvalidParam, 'node object from address string - ' + node.toString())
@@ -152,6 +144,7 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
                 ERROR(Errors.InvalidParam, 'node object from identifier - ' + node.toString());
             }
         }
+        output.push(Bcs.getInstance().ser('u16', q![2])); // cmd(u16)
     } else if (node?.logic !== undefined) {
         checkType(ValueType.TYPE_BOOL, type_required, node); // bool
         switch (node?.logic) {
@@ -177,7 +170,7 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
             case OperatorType.TYPE_LOGIC_AS_U256_LESSER_EQUAL:
             case OperatorType.TYPE_LOGIC_AS_U256_EQUAL:
                 if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node logic parameters length must >= 2'+ node.toString());
-                (node.parameters as GuardNode[]).reverse().forEach(v => buildNode(v, ValueType.TYPE_BOOL, table, output)); 
+                (node.parameters as GuardNode[]).reverse().forEach(v => buildNode(v, 'number', table, output)); 
                 output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.logic)); // TYPE 
                 output.push((Bcs.getInstance().ser(ValueType.TYPE_U8, node.parameters.length)));
                 break;
@@ -190,7 +183,7 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
                 break;               
             case OperatorType.TYPE_LOGIC_HAS_SUBSTRING:
                 if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node logic parameters length must >= 2'+ node.toString());
-                (node.parameters as GuardNode[]).reverse().forEach(v => buildNode(v, ValueType.TYPE_BOOL, table, output)); 
+                (node.parameters as GuardNode[]).reverse().forEach(v => buildNode(v, ValueType.TYPE_STRING, table, output)); 
                 output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.logic)); // TYPE 
                 output.push((Bcs.getInstance().ser(ValueType.TYPE_U8, node.parameters.length)));
                 break;
@@ -198,7 +191,7 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
     } else if (node?.calc !== undefined) {
         checkType(ValueType.TYPE_U256, type_required, node);
         if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node calc parameters length must >= 2'+ node.toString());
-        (node.parameters as GuardNode[]).reverse().forEach(v => buildNode(v, ValueType.TYPE_BOOL, table, output)); 
+        (node.parameters as GuardNode[]).reverse().forEach(v => buildNode(v, 'number', table, output)); 
         output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.calc)); // TYPE 
         output.push((Bcs.getInstance().ser(ValueType.TYPE_U8, node.parameters.length)));
     } else if (node?.value_type !== undefined) {
@@ -258,6 +251,7 @@ const checkType = (type: ValueType | ContextType.TYPE_CLOCK | ContextType.TYPE_G
     if (type !== type_required) {
         var str = '';
         if (node) str = ' - ' + node.toString();
+        console.log(node)
         ERROR(Errors.InvalidParam, 'checkType: ' + type + ' require type: ' + type_required + str);
     }
 }

package/src/call/machine.ts

@@ -1,6 +1,8 @@
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, TransactionBlock,
     PermissionIndexType, Machine, Machine_Forward, Machine_Node,  Deliverable, ParentProgress, Progress, ProgressNext,
     TxbAddress,
+    Resource,
+    ResourceObject,
 } from 'wowok';
 import { CallBase, CallResult, Namedbject } from "./base";
 import { Account } from '../account';
@@ -112,10 +114,12 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
                 const d = (this.data?.permission as any)?.description ?? '';
                 permission = Permission.New(txb, d);
             }
-            obj = Machine.New(txb, permission ?? permission_address, this.data?.description??'', this.data?.endpoint ?? '', permission?undefined:passport);
+            obj = Machine.New(txb, permission ? permission.get_object() : permission_address, this.data?.description??'', this.data?.endpoint ?? '', permission?undefined:passport);
         } else {
             if (IsValidAddress(object_address) &&permission_address && IsValidAddress(permission_address)) {
                 obj = Machine.From(txb, permission_address, object_address)
+            } else {
+                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
             }
         }
 
@@ -126,15 +130,6 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (this.data?.endpoint !== undefined && object_address) {
                 obj?.set_endpoint(this.data.endpoint, passport)
             }
-            if (this.data?.bPaused !== undefined) {
-                obj?.pause(this.data.bPaused, passport)
-            }
-            if (this.data?.bPublished ) {
-                obj?.publish(passport)
-            }
-            if (this.data?.clone_new && obj) {
-                this.new_with_mark(txb, obj?.clone(true, passport) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
-            }
 
             if (this.data?.consensus_repository !== undefined) {
                 switch (this.data.consensus_repository.op) {
@@ -178,7 +173,7 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (this.data?.progress_new !== undefined) {
                 const addr = Progress?.New(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_new.task_address, passport).launch();
                 if (addr) {
-                    this.new_with_mark(txb, addr, this.data?.progress_new?.namedNew, account);
+                    await this.new_with_mark(txb, addr, this.data?.progress_new?.namedNew, account);
                 }
             }
             if (this.data?.progress_context_repository !== undefined) {
@@ -209,11 +204,20 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (this.data?.progress_next !== undefined) {
                 Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_next.progress).next(this.data.progress_next.data, this.data.progress_next.deliverable, passport)
             }
+            if (this.data?.bPaused !== undefined) {
+                obj?.pause(this.data.bPaused, passport)
+            }
+            if (this.data?.bPublished ) {
+                obj?.publish(passport)
+            }
+            if (this.data?.clone_new && obj) {
+                await this.new_with_mark(txb, obj?.clone(true, passport) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
+            }
             if (permission) {
-                this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!this.data.object) {
-                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/{entity_permission.ts → permission.ts}

@@ -1,10 +1,9 @@
 import { CallBase, CallResult, Namedbject } from "./base";
-import { TransactionBlock, CallResponse} from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, UserDefinedIndex,
-    PermissionIndexType, WitnessFill
+    PermissionIndexType, TransactionBlock
 } from 'wowok';
 
-export interface CallEntityPermission_Data {
+export interface CallPermission_Data {
     object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
     builder?: string;
     admin?: {op:'add' | 'remove' | 'set', admins:string[]};
@@ -14,9 +13,9 @@ export interface CallEntityPermission_Data {
         | {op:'transfer permission', from_address: string; to_address: string};
     biz_permission?: {op:'add'; data: UserDefinedIndex[]} | {op:'remove'; permissions: PermissionIndexType[]};
 }
-export class CallEntityPermission extends CallBase {
-    data: CallEntityPermission_Data;
-    constructor(data:CallEntityPermission_Data) {
+export class CallPermission extends CallBase {
+    data: CallPermission_Data;
+    constructor(data:CallPermission_Data) {
         super();
         this.data = data;
     }
@@ -50,20 +49,6 @@ export class CallEntityPermission extends CallBase {
         }
 
         if (obj) {
-            if (this.data?.admin !== undefined) {
-                switch(this.data.admin.op) {
-                    case 'add':
-                        obj?.add_admin(this.data.admin.admins);
-                        break;
-                    case 'remove':
-                        obj?.remove_admin(this.data.admin.admins);
-                        break;
-                    case 'set':
-                        obj?.remove_admin([], true);
-                        obj?.add_admin(this.data.admin.admins);
-                        break
-                }
-            }
             if (this.data?.biz_permission !== undefined) { // High priority operate
                 switch(this.data.biz_permission.op) {
                     case 'add':
@@ -100,12 +85,25 @@ export class CallEntityPermission extends CallBase {
                         break;
                 }
             }
-
+            if (this.data?.admin !== undefined) {
+                switch(this.data.admin.op) {
+                    case 'add':
+                        obj?.add_admin(this.data.admin.admins);
+                        break;
+                    case 'remove':
+                        obj?.remove_admin(this.data.admin.admins);
+                        break;
+                    case 'set':
+                        obj?.remove_admin([], true);
+                        obj?.add_admin(this.data.admin.admins);
+                        break
+                }
+            }
             if (this.data?.builder !== undefined ) {
                 obj?.change_owner(this.data.builder);
             }
             if (!object_address) {
-                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/personal.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock } from 'wowok';
+import { ResourceObject, TransactionBlock } from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Entity, Entity_Info, TagName, Resource} from 'wowok';
 import { CallBase, CallResult, Namedbject } from "./base";
 
@@ -65,7 +65,7 @@ export class CallPersonal extends CallBase {
             }
 
             if (!object_address && obj) {
-                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/repository.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock, CallResponse} from 'wowok';
+import { TransactionBlock, CallResponse, Resource, ResourceObject} from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, PermissionIndexType, Repository,
     Repository_Policy, Repository_Policy_Data, Repository_Policy_Data2, Repository_Policy_Data_Remove,
     Repository_Policy_Mode, WitnessFill
@@ -59,10 +59,12 @@ export class CallRepository extends CallBase {
                 permission = Permission.New(txb, d);
             }
             
-            obj = Repository.New(txb, permission ?? permission_address, this.data?.description??'', this.data?.mode, permission?undefined:passport)
+            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)) {
                 obj = Repository.From(txb, permission_address, object_address)
+            } else {
+                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
             }
         }
 
@@ -70,9 +72,6 @@ export class CallRepository extends CallBase {
             if (this.data?.description !== undefined && object_address) {
                 obj?.set_description(this.data.description, passport);
             }
-            if (this.data?.mode !== undefined && object_address) { //@ priority??
-                obj?.set_policy_mode(this.data.mode, passport)
-            }
             if (this.data?.reference !== undefined) {
                 switch (this.data.reference.op) {
                     case 'set':
@@ -90,6 +89,20 @@ export class CallRepository extends CallBase {
                         break;
                 }
             }
+            if (this.data?.data !== undefined) {
+                switch(this.data.data.op) {
+                    case 'add':
+                        if ((this.data.data?.data as any)?.key !== undefined) {
+                            obj?.add_data(this.data.data.data as Repository_Policy_Data);
+                        } else if ((this.data.data?.data as any)?.address !== undefined) {
+                            obj?.add_data2(this.data.data.data as Repository_Policy_Data2);
+                        }
+                        break;
+                    case 'remove':
+                        obj?.remove(this.data.data.data.address, this.data.data.data.key);
+                        break;
+                }
+            }
             if (this.data?.policy !== undefined) {
                 switch(this.data.policy.op) {
                     case 'set':
@@ -112,25 +125,14 @@ export class CallRepository extends CallBase {
                         break;
                 }
             }
-            if (this.data?.data !== undefined) {
-                switch(this.data.data.op) {
-                    case 'add':
-                        if ((this.data.data?.data as any)?.key !== undefined) {
-                            obj?.add_data(this.data.data.data as Repository_Policy_Data);
-                        } else if ((this.data.data?.data as any)?.address !== undefined) {
-                            obj?.add_data2(this.data.data.data as Repository_Policy_Data2);
-                        }
-                        break;
-                    case 'remove':
-                        obj?.remove(this.data.data.data.address, this.data.data.data.key);
-                        break;
-                }
+            if (this.data?.mode !== undefined && object_address) { //@ priority??
+                obj?.set_policy_mode(this.data.mode, passport)
             }
             if (permission) {
-                this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!this.data.object) {
-                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     };

package/src/call/service.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock, CallResponse, IsValidArgType, TxbAddress, TagName} from 'wowok';
+import { TransactionBlock, CallResponse, IsValidArgType, TxbAddress, TagName, Resource, ResourceObject} from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex,
     PermissionIndexType,  BuyRequiredEnum, Customer_RequiredInfo, DicountDispatch, Service, Service_Buy, 
     Service_Guard_Percent, Service_Sale, WithdrawPayee, Treasury, WitnessFill
@@ -10,7 +10,7 @@ import { Account } from '../account';
 export interface CallService_Data {
     object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
     permission?: {address:string} | {namedNew: Namedbject, description?:string}; 
-    type_parameter?: string;
+    type_parameter: string;
     bPaused?: boolean;
     bPublished?: boolean;
     description?: string;
@@ -95,7 +95,7 @@ export class CallService extends CallBase {
             if (this.data?.machine !== undefined) {
                 perms.push(PermissionIndex.service_machine)
             }
-            if (this.data?.payee_treasury !== undefined && object_address) {
+            if (treasury_address !== undefined && object_address) {
                 perms.push(PermissionIndex.service_payee)
             }
             if (this.data?.withdraw_guard !== undefined) {
@@ -161,10 +161,13 @@ export class CallService extends CallBase {
                 const d = (this.data?.payee_treasury as any)?.description ?? '';
                 payee = Treasury.New(txb, this.data?.type_parameter!, permission ?? permission_address, d, permission?undefined:passport);
             }
-            obj = Service.New(txb, this.data.type_parameter!, permission??permission_address, this.data?.description??'', payee??treasury_address, permission?undefined:passport)
+            obj = Service.New(txb, this.data.type_parameter!, permission?permission.get_object():permission_address, 
+                this.data?.description??'', payee?payee.get_object():treasury_address, permission?undefined:passport)
         } else {
             if (IsValidAddress(object_address) && this.data.type_parameter && permission_address && IsValidAddress(permission_address)) {
                 obj = Service.From(txb, this.data.type_parameter, permission_address, object_address)
+            } else {
+                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
             }
         }
 
@@ -178,18 +181,6 @@ export class CallService extends CallBase {
             if (this.data?.endpoint !== undefined) {
                 obj?.set_endpoint(this.data.endpoint, passport)
             }
-            if (this.data?.buy_guard !== undefined) {
-                obj?.set_buy_guard(this.data.buy_guard, passport)
-            }
-            if (this.data?.bPaused !== undefined) {
-                obj?.pause(this.data.bPaused, passport)
-            }
-            if (this.data?.bPublished) {
-                obj?.publish(passport)
-            }
-            if (this.data?.clone_new !== undefined && obj) {
-                this.new_with_mark(txb, obj.clone(this.data.clone_new?.token_type_new, true, passport) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
-            }
             if (this.data?.machine !== undefined) {
                 obj?.set_machine(this.data.machine, passport)
             }
@@ -244,51 +235,9 @@ export class CallService extends CallBase {
                         break;
                 }
             }
-            if (this.data?.customer_required_info !== undefined) {
-                if (this.data.customer_required_info.required_info && this.data.customer_required_info.pubkey) {
-                    obj?.set_customer_required(this.data.customer_required_info.pubkey, this.data.customer_required_info.required_info, passport);
-                } else if (this.data.customer_required_info.pubkey) {
-                    obj?.change_required_pubkey(this.data.customer_required_info.pubkey, passport);
-                }
-            }
-            if (this.data?.refund_guard !== undefined) {
-                switch(this.data.refund_guard.op) {
-                    case 'add':
-                        obj?.add_refund_guards(this.data.refund_guard.guards, passport)
-                        break;
-                    case 'set':
-                        obj?.remove_refund_guards([], true, passport)
-                        obj?.add_refund_guards(this.data.refund_guard.guards, passport)
-                        break;
-                    case 'remove':
-                        obj?.remove_refund_guards(this.data.refund_guard.addresses, false, passport)
-                        break;
-                    case 'removeall':
-                        obj?.remove_refund_guards([], true, passport)
-                        break;
-                }
-            }
             if (this.data?.gen_discount !== undefined) {
                 obj?.discount_transfer(this.data.gen_discount, passport)
             }
-            if (this.data?.withdraw_guard !== undefined) {
-                switch(this.data.withdraw_guard.op) {
-                    case 'add':
-                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, passport)
-                        break;
-                    case 'set':
-                        obj?.remove_withdraw_guards([], true, passport)
-                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, passport)
-                        break;
-                    case 'remove':
-                        obj?.remove_withdraw_guards(this.data.withdraw_guard.addresses, false, passport)
-                        break;
-                    case 'removeall':
-                        obj?.remove_withdraw_guards([], true, passport)
-                        break;
-                }
-            }
-
             if (this.data?.sales !== undefined) {
                 switch(this.data.sales.op) {
                     case 'add':
@@ -310,7 +259,7 @@ export class CallService extends CallBase {
                         //@ crypto tools support
                         const addr = obj.buy(this.data.order_new.buy_items, coin, this.data.order_new.discount, 
                             this.data.order_new.machine, this.data.order_new.customer_info_crypto, passport) ;
-                        this.new_with_mark(txb, addr, (this.data?.order_new as any)?.namedNew, account, [TagName.Launch, TagName.Order]);                   
+                        await this.new_with_mark(txb, addr, (this.data?.order_new as any)?.namedNew, account, [TagName.Launch, TagName.Order]);                   
                     }                 
                 }
             }
@@ -333,14 +282,67 @@ export class CallService extends CallBase {
             if (this.data?.order_withdrawl !== undefined && passport) { //@ need withdrawal passport
                 obj?.withdraw(this.data.order_withdrawl.order, this.data.order_withdrawl.data, passport)
             }
+            if (this.data?.customer_required_info !== undefined) {
+                if (this.data.customer_required_info.required_info && this.data.customer_required_info.pubkey) {
+                    obj?.set_customer_required(this.data.customer_required_info.pubkey, this.data.customer_required_info.required_info, passport);
+                } else if (this.data.customer_required_info.pubkey) {
+                    obj?.change_required_pubkey(this.data.customer_required_info.pubkey, passport);
+                }
+            }
+            if (this.data?.withdraw_guard !== undefined) {
+                switch(this.data.withdraw_guard.op) {
+                    case 'add':
+                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, passport)
+                        break;
+                    case 'set':
+                        obj?.remove_withdraw_guards([], true, passport)
+                        obj?.add_withdraw_guards(this.data.withdraw_guard.guards, passport)
+                        break;
+                    case 'remove':
+                        obj?.remove_withdraw_guards(this.data.withdraw_guard.addresses, false, passport)
+                        break;
+                    case 'removeall':
+                        obj?.remove_withdraw_guards([], true, passport)
+                        break;
+                }
+            }
+            if (this.data?.refund_guard !== undefined) {
+                switch(this.data.refund_guard.op) {
+                    case 'add':
+                        obj?.add_refund_guards(this.data.refund_guard.guards, passport)
+                        break;
+                    case 'set':
+                        obj?.remove_refund_guards([], true, passport)
+                        obj?.add_refund_guards(this.data.refund_guard.guards, passport)
+                        break;
+                    case 'remove':
+                        obj?.remove_refund_guards(this.data.refund_guard.addresses, false, passport)
+                        break;
+                    case 'removeall':
+                        obj?.remove_refund_guards([], true, passport)
+                        break;
+                }
+            }
+            if (this.data?.buy_guard !== undefined) {
+                obj?.set_buy_guard(this.data.buy_guard, passport)
+            }
+            if (this.data?.bPaused !== undefined) {
+                obj?.pause(this.data.bPaused, passport)
+            }
+            if (this.data?.bPublished) {
+                obj?.publish(passport)
+            }
+            if (this.data?.clone_new !== undefined && obj) {
+                await this.new_with_mark(txb, obj.clone(this.data.clone_new?.token_type_new, true, passport) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
+            }
             if (payee) {
-                this.new_with_mark(txb, payee.launch(), (this.data?.payee_treasury as any)?.namedNew, account);
+                await this.new_with_mark(txb, payee.launch(), (this.data?.payee_treasury as any)?.namedNew, account);
             }
             if (permission) {
-                this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!object_address) {
-                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             } 
         }
     }

package/src/call/treasury.ts

@@ -1,4 +1,4 @@
-import { TransactionBlock, CallResponse, IsValidArgType} from 'wowok';
+import { TransactionBlock, CallResponse, IsValidArgType, Resource, ResourceObject} from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex,
     PermissionIndexType, DepositParam, Treasury, Treasury_WithdrawMode, WithdrawParam, WitnessFill
 } from 'wowok';
@@ -9,10 +9,10 @@ import { Account } from '../account';
 export interface CallTreasury_Data {
     object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
     permission?: {address:string} | {namedNew: Namedbject, description?:string}; 
-    type_parameter?: string;
+    type_parameter: string;
     description?: string;
     withdraw_mode?: Treasury_WithdrawMode;
-    withdraw_guard?: {op:'add' | 'set'; data:{guard:string, amount:string}[]} | {op:'remove', guards:string[]} | {op:'removeall'};
+    withdraw_guard?: {op:'add' | 'set'; data:{guard:string, amount:string|number}[]} | {op:'remove', guards:string[]} | {op:'removeall'};
     deposit_guard?: string;
     deposit?: {data:{balance:string|number; index?:number; remark?:string; for_object?:string; for_guard?:string}; guard?:string | 'fetch'};
     receive?: {payment:string; received_object:string};
@@ -96,7 +96,6 @@ export class CallTreasury extends CallBase {
             } else {
                 perms.push(PermissionIndex.treasury_withdraw)
             }
-
             return await this.check_permission_and_call(permission_address, perms, guards, checkOwner, undefined, account)
         }
         return await this.exec(account);
@@ -111,23 +110,38 @@ export class CallTreasury extends CallBase {
                 const d = (this.data?.permission as any)?.description ?? '';
                 permission = Permission.New(txb, d);
             }
-            obj = Treasury.New(txb, this.data.type_parameter!, permission ?? permission_address, this.data?.description??'', permission?undefined:passport)
+            obj = Treasury.New(txb, this.data.type_parameter!, permission ? permission.get_object() : permission_address, this.data?.description??'', permission?undefined:passport)
         } else {
             if (IsValidAddress(object_address) && this.data.type_parameter && permission_address && IsValidAddress(permission_address)) {
                 obj = Treasury.From(txb, this.data.type_parameter, permission_address, object_address)
+            } else {
+                ERROR(Errors.InvalidParam, 'object or permission address invalid.')
             }
         }
 
         if (obj) {
+            if (this.data.deposit !== undefined) {
+                const coin = await Account.Instance().get_coin_object(txb, this.data.deposit.data.balance, account, this.data.type_parameter);
+                if (coin) {
+                    const index = this.data.deposit.data?.index ?? 0;
+                    obj?.deposit({coin:coin, index:BigInt(index), remark:this.data.deposit.data.remark ??'', 
+                        for_guard:this.data.deposit.data?.for_guard,
+                        for_object: this.data.deposit.data?.for_object
+                    })
+                }
+            }
+            if (this.data?.withdraw !== undefined) {
+                obj?.withdraw(this.data.withdraw, passport)
+            }
+            if (this.data?.receive !== undefined) {
+                obj?.receive(this.data.receive.payment, this.data.receive.received_object, passport); 
+            }
             if (this.data?.description !== undefined && object_address) {
                 obj?.set_description(this.data.description, passport);
             }
             if (this.data?.deposit_guard !== undefined) {
                 obj?.set_deposit_guard(this.data.deposit_guard, passport);
             }
-            if (this.data?.withdraw_mode !== undefined) {
-                obj?.set_withdraw_mode(this.data.withdraw_mode, passport)
-            }
             if (this.data?.withdraw_guard !== undefined) {
                 switch (this.data.withdraw_guard.op) {
                     case 'add':
@@ -145,28 +159,14 @@ export class CallTreasury extends CallBase {
                         break;
                 }
             }
-            if (this.data?.withdraw !== undefined) {
-                obj?.withdraw(this.data.withdraw, passport)
-            }
-            if (this.data?.receive !== undefined) {
-                obj?.receive(this.data.receive.payment, this.data.receive.received_object, passport); 
-            }
-            if (this.data.deposit !== undefined) {
-                const coin = await Account.Instance().get_coin_object(txb, this.data.deposit.data.balance, account, this.data.type_parameter);
-                if (coin) {
-                    const index = this.data.deposit.data?.index ?? 0;
-                    obj?.deposit({coin:coin, index:BigInt(index), remark:this.data.deposit.data.remark ??'', 
-                        for_guard:this.data.deposit.data?.for_guard,
-                        for_object: this.data.deposit.data?.for_object
-                    })
-                }
+            if (this.data?.withdraw_mode !== undefined) {
+                obj?.set_withdraw_mode(this.data.withdraw_mode, passport)
             }
             if (permission) {
-                this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
-
             if (!object_address) {
-                this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             } 
         }
     }

package/src/call.ts

@@ -1,14 +1,13 @@
 
 /**
  * Provide a this interface for AI
- * Operation sequence Priority: common operation > Guard change > permission change
- * Recommended: Changes to guard and permission are committed on-chain separately to avoid permission dependencies for other operations.
+ * Restrictive prioritization, such as setting a deposit first and setting a deposit guard later (only subsequent deposits are affected).
  */
 
 import { CallArbitration, CallArbitration_Data } from "./call/arbitration";
 import { CallDemand, CallDemand_Data } from "./call/demand";
 import { CallMachine, CallMachine_Data } from "./call/machine";
-import { CallEntityPermission, CallEntityPermission_Data } from "./call/entity_permission";
+import { CallPermission, CallPermission_Data } from "./call/permission";
 import { CallPersonal, CallPersonal_Data } from "./call/personal";
 import { CallRepository, CallRepository_Data } from "./call/repository";
 import { CallService, CallService_Data } from "./call/service";
@@ -19,8 +18,8 @@ import { CallObjectPermission, CallObjectPermission_Data } from "./call/object_p
 
  
 export interface CallObjectData {
-    type: 'Demand' | 'Service' | 'Machine' | 'Treasury' | 'Arbitration' | 'Guard' | 'Repository' | 'Personal' | 'EntityPermission' | 'ObjectPermission';
-    data: CallDemand_Data | CallMachine_Data | CallArbitration_Data | CallEntityPermission_Data | CallObjectPermission_Data
+    type: 'Demand' | 'Service' | 'Machine' | 'Treasury' | 'Arbitration' | 'Guard' | 'Repository' | 'Personal' | 'Permission' | 'ObjectPermission';
+    data: CallDemand_Data | CallMachine_Data | CallArbitration_Data | CallPermission_Data | CallObjectPermission_Data
     | CallTreasury_Data | CallService_Data  | CallRepository_Data;
     account?: string;
     witness?: CallWithWitnessParam;
@@ -65,8 +64,8 @@ function call_object_new (call: CallObjectData) : CallBase | undefined {
             return new CallRepository(call.data as CallRepository_Data);
         case 'Personal':
             return new CallPersonal(call.data as CallPersonal_Data);
-        case 'EntityPermission':
-            return new CallEntityPermission(call.data as CallEntityPermission_Data);
+        case 'Permission':
+            return new CallPermission(call.data as CallPermission_Data);
         case 'ObjectPermission':
             return new CallObjectPermission(call.data as CallObjectPermission_Data);
     }

package/src/index.ts

@@ -3,10 +3,10 @@ export * from './permission'
 export * from './events'
 export * from './cache'
 export * from './call/base'
-export * from './call/entity_permission'
+export * from './call/permission'
 export * from './call/arbitration'
 export * from './call/treasury'
-export * from './call/entity_permission'
+export * from './call/object_permission'
 export * from './call/demand'
 export * from './call/machine'
 export * from './call/repository'
@@ -15,3 +15,4 @@ export * from './call/guard'
 export * from './call/personal'
 export * from './account'
 export * from './call'
+export * as WOWOK from 'wowok';

package/src/objects.ts

@@ -5,17 +5,17 @@
 
 import { Protocol, Machine_Node, Machine, Treasury_WithdrawMode, Treasury_Operation,
     Repository_Type, Repository_Policy_Mode, Repository_Policy, Service_Discount_Type, Service_Sale,
-    Progress, History, ERROR, Errors, IsValidAddress, Bcs,
-    Entity_Info, Tags
- } from 'wowok';
+    Progress, History, ERROR, Errors, IsValidAddress, Bcs, Entity_Info, Tags } from 'wowok';
 import {WowokCache, OBJECT_KEY, CacheExpire, CacheName, CachedData} from './cache'
 
-export interface ObjectBase {
-    object: string;
-    type?: string | 'Demand' | 'Progress' | 'Service' | 'Machine' | 'Order' | 'Treasury' | 'Arbitration' | 'Arb' | 'Payment' | 'Guard' |
-        'Personal' | 'Permission' | 'Mark' | 'Repository' | 'TableItem_ProgressHistory' | 'TableItem_PermissionEntity' | 
+export type ObjectBaseType = 'Demand' | 'Progress' | 'Service' | 'Machine' | 'Order' | 'Treasury' | 'Arbitration' | 'Arb' | 'Payment' | 'Guard' | 'Discount' |
+        'Personal' | 'Permission' | 'PersonalMark' | 'Repository' | 'TableItem_ProgressHistory' | 'TableItem_PermissionEntity' | 
         'TableItem_DemandPresenter' | 'TableItem_MachineNode' | 'TableItem_ServiceSale' | 'TableItem_TreasuryHistory' | 'TableItem_ArbVote' |
         'TableItem_RepositoryData' | 'TableItem_PersonalMark';
+
+export interface ObjectBase {
+    object: string;
+    type?: ObjectBaseType;
     type_raw?: string;
     owner?: any;
     version?: string;
@@ -230,7 +230,7 @@ export interface ObjectMark extends ObjectBase {
     tag_count: number;
 }
 
-export interface TableItem_MarkTag extends ObjectBase, Tags {
+export interface TableItem_PersonalMark extends ObjectBase, Tags {
 }
 
 export enum CacheType {
@@ -298,10 +298,10 @@ export const query_table_json = async (json:string) : Promise<string> => {
 }
 
 // query personal information; json: ObjectsAnswer; return ObjectPersonal | undefined .
-export const query_personal = async (json:string) : Promise<string> => {
+export const query_personal_json = async (json:string) : Promise<string> => {
     try {
         const q : PersonalQuery = JSON.parse(json);
-        return JSON.stringify({data:(await queryTableItem_Personal(q)) ?? ''});
+        return JSON.stringify({data:(await queryTableItem_Personal(q) ?? '')});
     } catch (e) {
         return JSON.stringify({error:e?.toString()})
     }
@@ -362,35 +362,34 @@ export const queryTableItem_Personal = async (query:PersonalQuery) : Promise<Obj
     if (!IsValidAddress(query.address))  ERROR(Errors.IsValidAddress, 'entity.address')
     const time = new Date().getTime();
     const cache = WowokCache.Instance().get(CacheName.personal);
+
     if (cache && !query.no_cache) {
         try {
             let data = cache.load(OBJECT_KEY(query.address, CacheName.personal))
             
             if (data) {
                 const r:CachedData = JSON.parse(data);
-
                 if (r?.expire === 'INFINITE' || r.expire <= time) { 
-                    const d = data2object(JSON.parse(r.data));
-                    d.cache_expire = r.expire;    
-                    return d as ObjectPersonal;                         
+                    const d = JSON.parse(r.data) as ObjectPersonal;
+                    d.cache_expire = r.expire;  
+                    return d;                         
                 }
             }                 
         } catch (e) {
             console.log(e)
         }
     } 
-    const res = await Protocol.Client().getDynamicFieldObject({parentId:Protocol.Instance().objectEntity(), name:{type:'address', value:query.address}});
-    if (res?.data) {
-        const ret = data2object(res?.data) as ObjectPersonal;
+    const res = await tableItem(tableItemQuery_byAddress(Protocol.Instance().objectEntity(), query.address));
+    if (res.type === 'Personal') {
         if (cache) {
             try {
                 const expire = cache.expire_time()+((new Date()).getTime()); // guard & payment immutable
-                const r:CachedData = {expire:expire, data:JSON.stringify(res.data)}
+                const r:CachedData = {expire:expire, data:JSON.stringify(res)}
                 cache.save(OBJECT_KEY(query.address, CacheName.personal), JSON.stringify(r));
-                ret.cache_expire = expire;
+                res.cache_expire = expire;
             } catch(e) { console.log(e)}               
         }
-        return ret
+        return res as ObjectPersonal;
     }
 }
 
@@ -457,13 +456,53 @@ const tableItem = async (query:TableItemQuery) : Promise<ObjectBase> => {
     return data2object(res?.data)
 }
 
+export function raw2type(type_raw:string | undefined) : ObjectBaseType | undefined {
+    if (!type_raw) return undefined;
+
+    const t = Protocol.Instance().object_name_from_type_repr(type_raw);
+    if (t === 'Permission' || t === 'Demand' || t === 'Machine' || t === 'Progress' || t === 'Order' || t === 'Service' || 
+        t === 'Treasury' || t === 'Arb' || t === 'Repository' || t === 'Payment' || t === 'Discount' || t === 'Guard') {
+        return t
+    } else if (t === 'Resource') {
+        return 'PersonalMark';
+    }
+    const start = type_raw?.indexOf('0x2::dynamic_field::Field<');
+    if (start === 0) {
+        const end = type_raw?.substring('0x2::dynamic_field::Field<'.length);
+        if(end && Protocol.Instance().hasPackage(end)) {
+            if (end.includes('::demand::Tips>')) {
+                return 'TableItem_DemandPresenter';
+            } else if (end.includes('::machine::NodePair>>>')) {
+                return 'TableItem_MachineNode';
+            } else if (end.includes('::progress::History>')) {
+                return 'TableItem_ProgressHistory';
+            } else if (end.includes('::service::Sale>')) {
+                return 'TableItem_ServiceSale';
+            } else if (end.includes('::treasury::Record>')) {
+                return 'TableItem_TreasuryHistory';
+            } else if (end.includes('::arb::Voted>')) {
+                return 'TableItem_ArbVote';
+            } else if (end.includes('::permission::Perm>>')) {
+                return 'TableItem_PermissionEntity';
+            } else if (end.includes('::repository::DataKey')) {
+                return 'TableItem_RepositoryData';
+            } else if (end.includes('::entity::Ent>')) {
+                return 'Personal';
+            } else if (end.includes('::resource::Tags>')) {
+                return 'TableItem_PersonalMark';
+            }
+        }
+    }
+    return undefined;
+}
+
 export function data2object(data?:any) : ObjectBase {
     const content = (data?.content as any)?.fields;
     const id = data?.objectId ?? (content?.id?.id ?? undefined);
     const type_raw:string | undefined = data?.type ?? (data?.content?.type ?? undefined);
     const version = data?.version ?? undefined;
     const owner = data?.owner ?? undefined;
-    const type:string | undefined = type_raw ? Protocol.Instance().object_name_from_type_repr(type_raw) : undefined;
+    const type:string | undefined = raw2type(type_raw);
 
     if (type) {
         switch(type) {
@@ -603,80 +642,68 @@ export function data2object(data?:any) : ObjectBase {
                     return {id:v?.fields?.identifier, bWitness:v?.fields?.bWitness, value:Uint8Array.from(v?.fields?.value)}
                 })
             } as ObjectGuard;  
-        case 'Resource' :
+        case 'PersonalMark' :
             return {
                 object:id, type:type, type_raw:type_raw, owner:owner, version:version,
                 tag_count:parseInt(content?.tags?.fields?.size)
             } as ObjectMark;   
+        case 'TableItem_DemandPresenter':
+            return {
+                object:id, type:type, type_raw:type_raw, owner:owner, version:version,
+                service:content?.name, presenter:content?.value?.fields?.who, recommendation:content?.value?.fields?.tips
+            } as TableItem_DemandPresenter;
+        case 'TableItem_ProgressHistory':
+            return {
+                object:id, type:type, type_raw:type_raw, owner:owner, version:version,
+                history:Progress.DeHistory(content)
+            } as TableItem_ProgressHistory;
+        case 'TableItem_ServiceSale':
+            return {
+                object:id, type:type, type_raw:type_raw, owner:owner, version:version,
+                item:{item:content?.name, stock:content?.value?.fields?.stock, price:content?.value?.fields?.price,
+                    endpoint:content?.value?.fields?.endpoint
+                }
+            } as TableItem_ServiceSale;
+        case 'TableItem_TreasuryHistory':
+            return {
+                object:id, type:type, type_raw:type_raw, owner:owner, version:version,
+                id: content?.name, payment:content?.value?.fields?.payment, signer:content?.value?.fields?.signer,
+                operation: content?.value?.fields?.op, amount: content?.value?.fields?.amount, time:content?.value?.fields?.time
+            } as TableItem_TreasuryHistory;
+        case 'TableItem_ArbVote':
+            return {
+                object:id, type:type, type_raw:type_raw, owner:owner, version:version,
+                singer:content?.name, vote:content?.value?.fields?.agrees, time: content?.value?.fields?.time,
+                weight:content?.value?.fields?.weight
+            } as TableItem_ArbVote;
+        case 'TableItem_PermissionEntity':
+            return {
+                object:id, type:type, type_raw:type_raw, owner:owner, version:version,
+                entity:content?.name, permission:content?.value?.map((v:any) => {
+                    return {id:v?.fields.index, guard:v?.fields.guard}
+                })
+            } as TableItem_PermissionEntity;
+        case 'TableItem_RepositoryData':
+            return {
+                object:id, type:type, type_raw:type_raw, owner:owner, version:version,
+                address:content?.name?.fields?.id, key:content?.name?.fields?.key, data:Uint8Array.from(content?.value)
+            } as TableItem_RepositoryData;
+        case 'Personal':
+            const info = Bcs.getInstance().de_entInfo(Uint8Array.from(content?.value?.fields?.avatar));
+            return {
+                object:id, type:type, type_raw:type_raw, owner:owner, version:version,
+                address:content?.name, like:content?.value?.fields?.like, dislike:content?.value?.fields?.dislike, 
+                mark_object: content?.value?.fields?.resource, lastActive_digest: data?.previousTransaction, 
+                info : {homepage:info?.homepage, name:info?.name, avatar:info?.avatar, twitter:info?.twitter, discord:info?.discord, 
+                description:info?.description}
+            } as ObjectPersonal;
+        case 'TableItem_PersonalMark':
+            return {object:id, type:type, type_raw:type_raw, owner:owner, version:version,
+                address:content?.name, name:content?.value?.fields?.nick, tags:content?.value?.fields?.tags
+            } as TableItem_PersonalMark;
         }
     } 
-    
-    const start = type_raw?.indexOf('0x2::dynamic_field::Field<');
-    if (start === 0) {
-        const end = type_raw?.substring('0x2::dynamic_field::Field<'.length);
-        if(end && Protocol.Instance().hasPackage(end)) {
-            if (end.includes('::demand::Tips>')) {
-                return {
-                    object:id, type:'DemandTable_Presenter', type_raw:type_raw, owner:owner, version:version,
-                    service:content?.name, presenter:content?.value?.fields?.who, recommendation:content?.value?.fields?.tips
-                } as TableItem_DemandPresenter;
-            } else if (end.includes('::machine::NodePair>>>')) {
-                return {
-                    object:id, type:'MachineTable_Node', type_raw:type_raw, owner:owner, version:version,
-                    node:{name:content?.name, pairs:Machine.rpc_de_pair(content?.value)}
-                } as TableItem_MachineNode;
-            } else if (end.includes('::progress::History>')) {
-                return {
-                    object:id, type:'ProgressTable_History', type_raw:type_raw, owner:owner, version:version,
-                    history:Progress.DeHistory(content)
-                } as TableItem_ProgressHistory;
-            } else if (end.includes('::service::Sale>')) {
-                return {
-                    object:id, type:'ServiceTable_Sale', type_raw:type_raw, owner:owner, version:version,
-                    item:{item:content?.name, stock:content?.value?.fields?.stock, price:content?.value?.fields?.price,
-                        endpoint:content?.value?.fields?.endpoint
-                    }
-                } as TableItem_ServiceSale;
-            } else if (end.includes('::treasury::Record>')) {
-                return {
-                    object:id, type:'TreasuryTable_History', type_raw:type_raw, owner:owner, version:version,
-                    id: content?.name, payment:content?.value?.fields?.payment, signer:content?.value?.fields?.signer,
-                    operation: content?.value?.fields?.op, amount: content?.value?.fields?.amount, time:content?.value?.fields?.time
-                } as TableItem_TreasuryHistory;
-            } else if (end.includes('::arb::Voted>')) {
-                return {
-                    object:id, type:'ArbTable_Vote', type_raw:type_raw, owner:owner, version:version,
-                    singer:content?.name, vote:content?.value?.fields?.agrees, time: content?.value?.fields?.time,
-                    weight:content?.value?.fields?.weight
-                } as TableItem_ArbVote;
-            } else if (end.includes('::permission::Perm>>')) {
-                return {
-                    object:id, type:'TableItem_PermissionEntity', type_raw:type_raw, owner:owner, version:version,
-                    entity:content?.name, permission:content?.value?.map((v:any) => {
-                        return {id:v?.fields.index, guard:v?.fields.guard}
-                    })
-                } as TableItem_PermissionEntity;
-            } else if (end.includes('::repository::DataKey')) {
-                return {
-                    object:id, type:'TableItem_RepositoryData', type_raw:type_raw, owner:owner, version:version,
-                    address:content?.name?.fields?.id, key:content?.name?.fields?.key, data:Uint8Array.from(content?.value)
-                } as TableItem_RepositoryData;
-            } else if (end.includes('::entity::Ent>')) {
-                const info = Bcs.getInstance().de_entInfo(Uint8Array.from(content?.value?.fields?.avatar));
-                return {
-                    object:id, type:'Entity', type_raw:type_raw, owner:owner, version:version,
-                    address:content?.name, like:content?.value?.fields?.like, dislike:content?.value?.fields?.dislike, 
-                    mark_object: content?.value?.fields?.resource, lastActive_digest: data?.previousTransaction, 
-                    info : {homepage:info?.homepage, name:info?.name, avatar:info?.avatar, twitter:info?.twitter, discord:info?.discord, 
-                    description:info?.description}
-                } as ObjectPersonal;
-            } else if (end.includes('::resource::Tags>')) {
-                return {object:id, type:'TableItem_MarkTag', type_raw:type_raw, owner:owner, version:version,
-                    address:content?.name, name:content?.value?.fields?.nick, tags:content?.value?.fields?.tags
-                } as TableItem_MarkTag;
-            }
-        }
-    }
-    return {object:id, type:type, type_raw:type_raw, owner:owner, version:version}
+
+    return {object:id, type:undefined, type_raw:type_raw, owner:owner, version:version}
 }