wowok_agent 0.1.9 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok_agent",
-  "version": "0.1.9",
+  "version": "0.1.12",
   "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/account.ts

@@ -240,7 +240,6 @@ export class Account {
 
         if (addr && b > BigInt(0)) {
             if (!token_type || token_type === '0x2::sui::SUI' || token_type === '0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI') {
-                console.log(1)
                 return txb.splitCoins(txb.gas, [balance_required]);
             } else {
                 const r = await Protocol.Client().getCoins({owner: addr, coinType:token_type});

package/src/call/arbitration.ts

@@ -8,8 +8,7 @@ import { CallBase, CallResult, AddressMark, Namedbject} from "./base";
 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;
@@ -121,12 +120,13 @@ export class CallArbitration extends CallBase {
                 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.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) {
+        } else {
             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.')
             }
         }
 
@@ -134,9 +134,6 @@ export class CallArbitration extends CallBase {
             if (this.data?.description !== undefined && object_address) {
                 obj?.set_description(this.data.description, passport);
             }
-            if (this.data?.bPaused !== undefined) {
-                obj?.pause(this.data.bPaused, passport);
-            }
             if (this.data?.endpoint !== undefined) {
                 obj?.set_endpoint(this.data.endpoint, passport)
             }
@@ -146,8 +143,20 @@ export class CallArbitration extends CallBase {
             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)
+            if (this.data?.arb_new !== undefined) {
+                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)
+            }
+            if (this.data?.arb_vote !== undefined) {
+                obj?.vote(this.data.arb_vote, passport)
+            }
+            if (this.data?.arb_withdraw_fee !== undefined) {
+                obj?.withdraw_fee(this.data.arb_withdraw_fee.arb, this.data.arb_withdraw_fee.data, passport)
+            }
+            if (this.data?.permission_new !== undefined) {
+                obj?.change_permission(this.data.permission_new);
             }
             if (this.data?.voting_guard !== undefined) {
                 switch (this.data.voting_guard.op) {
@@ -166,32 +175,21 @@ export class CallArbitration extends CallBase {
                         break;
                 }
             }
-            
-            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);
-            }
-            if (this.data?.arb_arbitration !== undefined) {
-                obj?.arbitration(this.data.arb_arbitration, passport)
-            }
-            if (this.data?.arb_vote !== undefined) {
-                obj?.vote(this.data.arb_vote, passport)
-            }
-            if (this.data?.arb_withdraw_fee !== undefined) {
-                obj?.withdraw_fee(this.data.arb_withdraw_fee.arb, this.data.arb_withdraw_fee.data, passport)
+            if (this.data.usage_guard !== undefined) {
+                obj?.set_guard(this.data.usage_guard, passport)
             }
-            if (this.data?.permission_new !== undefined) {
-                obj?.change_permission(this.data.permission_new);
+            if (this.data?.bPaused !== undefined) {
+                obj?.pause(this.data.bPaused, passport);
             }
-
             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

@@ -6,10 +6,10 @@ import { PassportObject, Errors, ERROR, Permission,
 } 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;
+    name?: string;
     tags?: string[];
 }
 
@@ -32,11 +32,12 @@ export interface CallWithWitnessParam {
 }
 export type CallResult = GuardInfo_forCall | CallResponse | undefined;
 
+
 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
@@ -135,25 +136,22 @@ export class CallBase {
                 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);
-                    return
                 }
             } else {
                 ERROR(Errors.InvalidParam, 'account - ' + account)
             }
-        }
-        if (this.resouceObject) {
-            Resource.From(txb, this.resouceObject).add(object, tags, named_new?.name);
         } else {
-            ERROR(Errors.Fail, 'invalid personal mark')
+            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')
-
+        
         if (this.resouceObject) {
             Resource.From(txb, this.resouceObject).launch(); //@ resource launch, if created.
             this.resouceObject = undefined;

package/src/call/demand.ts

@@ -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,11 +5,8 @@
 
 import { Bcs, ContextType, ERROR, Errors, IsValidU8, OperatorType, ValueType, GUARD_QUERIES, IsValidAddress, 
     concatenate, TransactionBlock, Protocol, FnCallType, hasDuplicates, insertAtHead, CallResponse, 
-    IsValidDesription,
-    Resource,
-    ResourceObject,
-    PassportObject} from "wowok";
-import { Account } from "../account";
+    IsValidDesription, PassportObject,
+    IsValidGuardIdentifier} from "wowok";
 import { CallBase, CallResult, Namedbject } from "./base";
 
 export interface GuardConst {
@@ -30,6 +27,7 @@ export type GuardNode = { identifier: number; } // Data from GuardConst
     | {calc: OperatorType.TYPE_NUMBER_ADD | OperatorType.TYPE_NUMBER_DEVIDE | OperatorType.TYPE_NUMBER_MOD 
         | OperatorType.TYPE_NUMBER_MULTIPLY | OperatorType.TYPE_NUMBER_SUBTRACT; parameters: GuardNode[];}
     | {value_type: ValueType; value:any; } // Data 
+    | {identifier: number} // data from GuardConst
     | {context: ContextType.TYPE_CLOCK | ContextType.TYPE_GUARD | ContextType.TYPE_SIGNER }; // Data from run-time environment
 
 export interface CallGuard_Data {
@@ -70,7 +68,7 @@ export class CallGuard extends CallBase {
         var output : Uint8Array[]= [];
         buildNode(this.data.root!, ValueType.TYPE_BOOL, this.data?.table ?? [], output);
         const bytes = (concatenate(Uint8Array, ...output) as Uint8Array); 
-    
+
         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()))],  
@@ -95,7 +93,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);
+        await this.new_with_mark(txb, addr, this.data?.namedNew, account);
     }
 }
 
@@ -110,32 +108,30 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
             output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, ContextType.TYPE_CONSTANT)); 
             output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.identifier))
         } else {
-            ERROR(Errors.InvalidParam, 'node identifier - ' + node.toString());
+            ERROR(Errors.InvalidParam, 'node identifier - ' + JSON.stringify(node));
         }
     } else if (node?.query !== undefined) {
         var q: any[] | undefined;
-        if (typeof(node.query === 'string')) {
+        if (typeof(node.query) === 'string') {
             q = GUARD_QUERIES.find(v=>v[1] === node.query);
-        } else if (typeof(node.query === 'number')) {
+        } 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 - ' + JSON.stringify(node))
         }
 
+        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())
+                ERROR(Errors.InvalidParam, 'node object from address string - ' + JSON.stringify(node))
             }
             output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, ValueType.TYPE_ADDRESS)); 
             output.push(Bcs.getInstance().ser(ValueType.TYPE_ADDRESS, node.object)); // object address             
@@ -146,25 +142,26 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
                 output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, ContextType.TYPE_CONSTANT));
                 output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.object)); // object id
             } else {
-                ERROR(Errors.InvalidParam, 'node object from identifier - ' + node.toString());
+                ERROR(Errors.InvalidParam, 'node object from identifier - ' + JSON.stringify(node));
             }
         }
+        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) {
             case OperatorType.TYPE_LOGIC_ALWAYS_TRUE:
-                if (node.parameters.length !== 0) ERROR(Errors.InvalidParam, 'node logic parameters length must be 0'+ node.toString());
+                if (node.parameters.length !== 0) ERROR(Errors.InvalidParam, 'node logic parameters length must be 0'+ JSON.stringify(node));
                 output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.logic)); // TYPE 
                 break;
             case OperatorType.TYPE_LOGIC_AND:
             case OperatorType.TYPE_LOGIC_OR:
-                if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node logic parameters length must >= 2'+ node.toString()); 
+                if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node logic parameters length must >= 2'+ JSON.stringify(node)); 
                 (node.parameters as GuardNode[]).reverse().forEach(v => buildNode(v, ValueType.TYPE_BOOL, table, output)); // reserve
                 output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.logic)); // TYPE 
                 output.push((Bcs.getInstance().ser(ValueType.TYPE_U8, node.parameters.length)));
                 break;
             case OperatorType.TYPE_LOGIC_NOT:
-                if (node.parameters.length !== 1) ERROR(Errors.InvalidParam, 'node logic parameters length must be 1'+ node.toString());
+                if (node.parameters.length !== 1) ERROR(Errors.InvalidParam, 'node logic parameters length must be 1'+ JSON.stringify(node));
                 (node.parameters as GuardNode[]).reverse().forEach(v => buildNode(v, ValueType.TYPE_BOOL, table, output)); // reserve
                 output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.logic)); // TYPE 
                 break;
@@ -173,34 +170,34 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
             case OperatorType.TYPE_LOGIC_AS_U256_LESSER:
             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)); 
+                if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node logic parameters length must >= 2'+ JSON.stringify(node));
+                (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;
             case OperatorType.TYPE_LOGIC_EQUAL:
-                if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node logic parameters length must >= 2'+ node.toString());
+                if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node logic parameters length must >= 2'+ JSON.stringify(node));
                 var any_type: any = 'variable';
                 (node.parameters as GuardNode[]).reverse().forEach(v => buildNode(v, any_type, 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;               
             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)); 
+                if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node logic parameters length must >= 2'+ JSON.stringify(node));
+                (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;
         }
     } 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)); 
+        if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node calc parameters length must >= 2'+ JSON.stringify(node));
+        (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) {
         checkType(node?.value_type, type_required, node);
-        if (node?.value === undefined) ERROR(Errors.InvalidParam, 'node value undefined - ' + node.toString());
+        if (node?.value === undefined) ERROR(Errors.InvalidParam, 'node value undefined - ' + JSON.stringify(node));
         output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.value_type)); // TYPE
 
         if (node.value_type == ValueType.TYPE_STRING || node.value_type === ValueType.TYPE_VEC_U8) {
@@ -223,8 +220,15 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
                 checkType(ValueType.TYPE_ADDRESS, type_required, node);
                 break;
         }
+    } else if (node?.identifier !== undefined) {
+        if (!IsValidGuardIdentifier(node.identifier)) ERROR(Errors.IsValidGuardIdentifier, 'node - '+JSON.stringify(node));
+        const i = table.find(v => v.identifier === node.identifier);
+        if (!i) ERROR(Errors.InvalidParam, 'identifier not found. node - '+JSON.stringify(node));
+        checkType(i!.value_type, type_required, node);
+        output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, ContextType.TYPE_CONSTANT)); 
+        output.push(Bcs.getInstance().ser(ValueType.TYPE_U8, node.identifier)); 
     } else {
-        ERROR(Errors.InvalidParam, 'node - ' + node.toString())
+        ERROR(Errors.InvalidParam, 'node - ' + JSON.stringify(node))
     }
 }
 
@@ -254,7 +258,7 @@ const checkType = (type: ValueType | ContextType.TYPE_CLOCK | ContextType.TYPE_G
 
     if (type !== type_required) {
         var str = '';
-        if (node) str = ' - ' + node.toString();
+        if (node) str = ' - ' + JSON.stringify(node);
         ERROR(Errors.InvalidParam, 'checkType: ' + type + ' require type: ' + type_required + str);
     }
 }

package/src/call/machine.ts

@@ -30,7 +30,7 @@ export interface CallMachine_Data {
     progress_next?: {progress:string; data:ProgressNext; deliverable:Deliverable; guard?:string | 'fetch'};
 }
 export class CallMachine extends CallBase { //@ todo self-owned node operate
-    data: CallMachine_Data
+    data: CallMachine_Data;
     constructor(data:CallMachine_Data) {
         super();
         this.data = data;
@@ -118,6 +118,8 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
         } 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.')
             }
         }
 
@@ -128,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) {
@@ -180,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) {
@@ -211,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 !== undefined && 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);
+            if (!object_address) {
+                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/object_permission.ts

@@ -1,8 +1,5 @@
 import { CallBase, CallResult } from "./base";
-import { TransactionBlock, CallResponse, Protocol, Demand, DemandObject, Machine, Service, Treasury, Arbitration, Repository} from 'wowok';
-import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, UserDefinedIndex,
-    PermissionIndexType, WitnessFill
-} from 'wowok';
+import { TransactionBlock, PassportObject, IsValidAddress, Errors, ERROR,  Demand, Machine, Service, Treasury, Arbitration, Repository} from 'wowok';
 import { ObjectArbitration, ObjectDemand, ObjectMachine, ObjectRepository, ObjectService, ObjectTreasury, query_objects } from "../objects";
 
 export interface CallObjectPermission_Data {

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

@@ -1,22 +1,21 @@
 import { CallBase, CallResult, Namedbject } from "./base";
-import { TransactionBlock, CallResponse, Resource, ResourceObject} from 'wowok';
-import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, UserDefinedIndex,
-    PermissionIndexType, WitnessFill
+import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, BizPermission,
+    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[]};
+    admin?: {op:'add' | 'remove' | 'set', address:string[]};
     description?: string;
     permission?: {op:'add entity'; entities:Permission_Entity[]} | {op:'add permission'; permissions:Permission_Index[]} 
         | {op:'remove entity'; addresses:string[]} | {op:'remove permission'; address:string; index:PermissionIndexType[]} 
         | {op:'transfer permission', from_address: string; to_address: string};
-    biz_permission?: {op:'add'; data: UserDefinedIndex[]} | {op:'remove'; permissions: PermissionIndexType[]};
+    biz_permission?: {op:'add'; data: BizPermission[]} | {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,30 +49,16 @@ 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':
                         this.data.biz_permission.data.forEach(v => {
-                            obj?.add_userdefine(v.index, v.name);
+                            obj?.add_bizPermission(v.index, v.name);
                         })
                         break;
                     case 'remove':
                         this.data.biz_permission.permissions.forEach(v => {
-                            obj?.remove_userdefine(v);
+                            obj?.remove_bizPermission(v);
                         })
                         break;
                 }
@@ -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.address);
+                        break;
+                    case 'remove':
+                        obj?.remove_admin(this.data.admin.address);
+                        break;
+                    case 'set':
+                        obj?.remove_admin([], true);
+                        obj?.add_admin(this.data.admin.address);
+                        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

@@ -5,11 +5,12 @@ import { CallBase, CallResult, Namedbject } from "./base";
 export interface CallPersonal_Data {
     object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
     information?: Entity_Info;
-    transfer_to?: string;
     mark?: {op:'add'; data:{address:string; name?:string; tags:string[]}[]}
         | {op:'remove'; data:{address:string; tags:string[]}[]}
-        | {op:'removeall'; address:string[]};
-    close?: boolean; // close a personal resource
+        | {op:'removeall'; address:string[],}
+        | {op:'transfer'; address: string}
+        | {op:'destroy';}
+        | {op:'replace'; address: string};
 }
 
 export class CallPersonal extends CallBase {
@@ -31,7 +32,7 @@ export class CallPersonal extends CallBase {
             obj = Resource.From(txb, object_address)
         }
 
-        if (this.data?.close) {
+        if (this.data?.mark?.op === 'destroy') {
             entity.destroy_resource(obj)
             return ; //@ return 
         }
@@ -60,12 +61,15 @@ export class CallPersonal extends CallBase {
                         break;         
                 }
             }
-            if (this.data?.transfer_to !== undefined && obj) {
-                entity.transfer_resource(obj, this.data.transfer_to);
+            if (this.data?.mark?.op === 'transfer' && obj && IsValidAddress(this.data.mark.address)) {
+                entity.transfer_resource(obj, this.data.mark.address);
+            }
+            if (this.data?.mark?.op === 'replace' && IsValidAddress(this.data.mark.address)) {
+                entity.use_resource(Resource.From(txb, this.data.mark.address));
             }
 
             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

@@ -63,6 +63,8 @@ export class CallRepository extends CallBase {
         } 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.')
             }
         }
 
@@ -87,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':
@@ -109,28 +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

@@ -10,12 +10,12 @@ 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;
     gen_discount?: DicountDispatch[];
-    arbitration?: {op:'set' | 'add'; arbitrations:{address:string, token_type:string}[]} 
+    arbitration?: {op:'set' | 'add'; arbitrations:{address:string, type_parameter:string}[]} 
         | {op:'removeall'} | {op:'remove', addresses:string[]};
     buy_guard?: string;
     endpoint?: string;
@@ -166,6 +166,8 @@ export class CallService extends CallBase {
         } 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.')
             }
         }
 
@@ -179,21 +181,12 @@ 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)
             }
+            if (this.data?.gen_discount !== undefined) {
+                obj?.discount_transfer(this.data.gen_discount, passport)
+            }
             if (this.data?.repository !== undefined) {
                 switch (this.data.repository.op) {
                     case 'add':
@@ -231,11 +224,11 @@ export class CallService extends CallBase {
             if (this.data?.arbitration !== undefined) {
                 switch(this.data.arbitration.op) {
                     case 'add':
-                        this.data.arbitration.arbitrations.forEach(v=>obj?.add_arbitration(v.address, v.token_type, passport))
+                        this.data.arbitration.arbitrations.forEach(v=>obj?.add_arbitration(v.address, v.type_parameter, passport))
                         break;
                     case 'set':
                         obj?.remove_arbitration([], true, passport)
-                        this.data.arbitration.arbitrations.forEach(v=>obj?.add_arbitration(v.address, v.token_type, passport))
+                        this.data.arbitration.arbitrations.forEach(v=>obj?.add_arbitration(v.address, v.type_parameter, passport))
                         break;
                     case 'remove':
                         obj?.remove_arbitration(this.data.arbitration.addresses, false, passport)
@@ -245,51 +238,6 @@ 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':
@@ -311,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]);                   
                     }                 
                 }
             }
@@ -334,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

@@ -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};
@@ -114,19 +114,34 @@ export class CallTreasury extends CallBase {
         } 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':
@@ -144,26 +159,12 @@ 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) {
                 await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
-
             if (!object_address) {
                 await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             } 

package/src/call.ts

@@ -7,7 +7,7 @@
 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";
@@ -16,25 +16,26 @@ import { CallBase, CallResult, CallWithWitnessParam } from "./call/base";
 import { CallGuard, CallGuard_Data } from "./call/guard";
 import { CallObjectPermission, CallObjectPermission_Data } from "./call/object_permission";
 
- 
-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
-    | CallTreasury_Data | CallService_Data  | CallRepository_Data;
+export type CallObjectType = 'Demand' | 'Service' | 'Machine' | 'Treasury' | 'Arbitration' | 'Guard' | 'Repository' | 'Personal' | 'Permission' | 'ObjectPermission';
+export type CallObjectData = CallDemand_Data | CallMachine_Data | CallArbitration_Data | CallPermission_Data | CallObjectPermission_Data
+| CallTreasury_Data | CallService_Data  | CallRepository_Data;
+export interface CallObject {
+    type: CallObjectType;
+    data: CallObjectData;
     account?: string;
     witness?: CallWithWitnessParam;
 }
 
 export const call_object_json = async (json: string) : Promise<string> => {
     try {
-        const c : CallObjectData = JSON.parse(json);
+        const c : CallObject = JSON.parse(json);
         return JSON.stringify({data:await call_object(c)});
     } catch (e) {
         return JSON.stringify({error:e?.toString()})
     }
 }
 
-export const call_object = async (call: CallObjectData) : Promise<CallResult> => {
+export const call_object = async (call: CallObject) : Promise<CallResult> => {
     var obj = call_object_new(call);
 
     if (obj) {
@@ -46,7 +47,7 @@ export const call_object = async (call: CallObjectData) : Promise<CallResult> =>
     }
 }
 
-function call_object_new (call: CallObjectData) : CallBase | undefined {
+function call_object_new (call: CallObject) : CallBase | undefined {
     switch (call.type) {
         case 'Demand':
             return new CallDemand(call.data as CallDemand_Data);
@@ -64,8 +65,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' | 'Discount' |
-        'Personal' | 'EntityPermission' | 'PersonalMark' | '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;
@@ -456,18 +456,58 @@ 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' || t === 'Arbitration') {
+        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) {
         case 'Permission':
-            return {object:id, type:'EntityPermission', type_raw:type_raw, owner:owner, version:version,
+            return {object:id, type:type, type_raw:type_raw, owner:owner, version:version,
                 builder: content?.builder ??'', admin:content?.admin, description:content?.description??'',
                 entity_count: parseInt(content?.table?.fields?.size), 
                 biz_permission:content?.user_define?.fields?.contents?.map((v:any) => {
@@ -602,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:'PersonalMark', type_raw:type_raw, owner:owner, version:version,
+                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:'TableItem_DemandPresenter', 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:'TableItem_MachineNode', 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:'TableItem_ProgressHistory', 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:'TableItem_ServiceSale', 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:'TableItem_TreasuryHistory', 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:'TableItem_ArbVote', 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:'Personal', 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_PersonalMark', type_raw:type_raw, owner:owner, version:version,
-                    address:content?.name, name:content?.value?.fields?.nick, tags:content?.value?.fields?.tags
-                } as TableItem_PersonalMark;
-            }
-        }
-    }
-    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}
 }