wowok_agent 0.1.11 → 0.1.13

package/src/call/permission.ts

@@ -1,17 +1,18 @@
 import { CallBase, CallResult, Namedbject } from "./base";
-import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, UserDefinedIndex,
+import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, BizPermission,
     PermissionIndexType, TransactionBlock
 } from 'wowok';
 
+/// The execution priority is determined by the order in which the object attributes are arranged
 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[]};
     description?: string;
+    admin?: {op:'add' | 'remove' | 'set', address:string[]};
+    biz_permission?: {op:'add'; data: BizPermission[]} | {op:'remove'; permissions: PermissionIndexType[]};
     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[]};
+    builder?: string;
 }
 export class CallPermission extends CallBase {
     data: CallPermission_Data;
@@ -49,23 +50,37 @@ export class CallPermission extends CallBase {
         }
 
         if (obj) {
+            if (this.data?.description !== undefined && this.data.object) {
+                obj?.set_description(this.data.description)
+            }
+            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?.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;
                 }
             }
-            if (this.data?.description !== undefined && this.data.object) {
-                obj?.set_description(this.data.description)
-            }
             if (this.data?.permission !== undefined) {
                 switch (this.data.permission.op) {
                     case 'add entity':
@@ -85,20 +100,6 @@ export class CallPermission 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);
             }

package/src/call/personal.ts

@@ -2,14 +2,16 @@ import { ResourceObject, TransactionBlock } from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Entity, Entity_Info, TagName, Resource} from 'wowok';
 import { CallBase, CallResult, Namedbject } from "./base";
 
+/// The execution priority is determined by the order in which the object attributes are arranged
 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 +33,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,8 +62,11 @@ 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) {

package/src/call/repository.ts

@@ -5,12 +5,13 @@ import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIn
 } from 'wowok';
 import { CallBase, CallResult, Namedbject} from "./base";
 
+/// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallRepository_Data {
     object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
     permission?: {address:string} | {namedNew: Namedbject, description?:string}; 
     description?: string;
-    mode?: Repository_Policy_Mode; // default: 'Relax' (POLICY_MODE_FREE) 
     reference?: {op:'set' | 'add' | 'remove' ; addresses:string[]} | {op:'removeall'};
+    mode?: Repository_Policy_Mode; // default: 'Relax' (POLICY_MODE_FREE) 
     policy?: {op:'add' | 'set'; data:Repository_Policy[]} | {op:'remove'; data:string[]} | {op:'removeall'} | {op:'rename'; data:{old:string; new:string}[]};
     data?: {op:'add', data: Repository_Policy_Data | Repository_Policy_Data2} | {op:'remove'; data: Repository_Policy_Data_Remove};
 }
@@ -89,19 +90,8 @@ 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 (this.data?.policy !== undefined) {
                 switch(this.data.policy.op) {
@@ -125,9 +115,21 @@ export class CallRepository extends CallBase {
                         break;
                 }
             }
-            if (this.data?.mode !== undefined && object_address) { //@ priority??
-                obj?.set_policy_mode(this.data.mode, passport)
+            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 (permission) {
                 await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }

package/src/call/service.ts

@@ -1,43 +1,44 @@
-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
+import { TransactionBlock, IsValidArgType, TxbAddress, TagName,  PassportObject, IsValidAddress, Errors, ERROR, Permission, 
+    PermissionIndex, PermissionIndexType,  BuyRequiredEnum, Customer_RequiredInfo, DicountDispatch, Service, Service_Buy, 
+    Service_Guard_Percent, Service_Sale, WithdrawPayee, Treasury, 
 } from 'wowok';
 import { query_objects, ObjectService } from '../objects';
 import { CallBase, CallResult, Namedbject } from "./base";
 import { Account } from '../account';
 
+/// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallService_Data {
+    type_parameter: string;
     object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
     permission?: {address:string} | {namedNew: Namedbject, description?:string}; 
-    type_parameter: string;
-    bPaused?: boolean;
-    bPublished?: boolean;
     description?: string;
-    gen_discount?: DicountDispatch[];
-    arbitration?: {op:'set' | 'add'; arbitrations:{address:string, token_type:string}[]} 
-        | {op:'removeall'} | {op:'remove', addresses:string[]};
-    buy_guard?: string;
     endpoint?: string;
+    payee_treasury?:{address:string} | {namedNew: Namedbject, description?:string}; 
+    gen_discount?: DicountDispatch[];
+    repository?: {op:'set' | 'add' | 'remove' ; repositories:string[]} | {op:'removeall'};
     extern_withdraw_treasury?: {op:'set' | 'add'; treasuries:{address:string, token_type:string}[]} 
         | {op:'removeall'} | {op:'remove', addresses:string[]};
     machine?: string;
-    payee_treasury?:{address:string} | {namedNew: Namedbject, description?:string}; 
-    clone_new?: {token_type_new?:string; namedNew?: Namedbject};
-    repository?: {op:'set' | 'add' | 'remove' ; repositories:string[]} | {op:'removeall'};
+    arbitration?: {op:'set' | 'add'; arbitrations:{address:string, type_parameter:string}[]} 
+        | {op:'removeall'} | {op:'remove', addresses:string[]};
+    customer_required_info?: {pubkey:string; required_info:(string | BuyRequiredEnum)[]};
+    sales?: {op:'add', sales:Service_Sale[]} | {op:'remove'; sales_name:string[]}
     withdraw_guard?: {op:'add' | 'set'; guards:Service_Guard_Percent[]} 
         | {op:'removeall'} | {op:'remove', addresses:string[]};
     refund_guard?: {op:'add' | 'set'; guards:Service_Guard_Percent[]} 
         | {op:'removeall'} | {op:'remove', addresses:string[]};
-    customer_required_info?: {pubkey:string; required_info:(string | BuyRequiredEnum)[]};
-    sales?: {op:'add', sales:Service_Sale[]} | {op:'remove'; sales_name:string[]}
+    bPublished?: boolean;
     order_new?: {buy_items:Service_Buy[], discount?:string, machine?:string, customer_info_crypto?: Customer_RequiredInfo, guard?:string | 'fetch', namedNew?: Namedbject}
+    order_agent?: {order:string; agents: string[]; progress?:string};
     order_required_info?: {order:string; info:Customer_RequiredInfo};
     order_refund?: {order:string; guard?:string;} | {order:string; arb:string; arb_token_type:string}; // guard address
     order_withdrawl?: {order:string; data:WithdrawPayee}; // guard address
     order_payer?: {order:string; payer_new: string}; // transfer the order payer permission to someaddress
-    order_agent?: {order:string; agents: string[]; progress?:string};
+    buy_guard?: string;
+    bPaused?: boolean;
+    clone_new?: {token_type_new?:string; namedNew?: Namedbject};
 }
+
 export class CallService extends CallBase {
     data: CallService_Data;
     constructor(data: CallService_Data) {
@@ -175,14 +176,14 @@ export class CallService extends CallBase {
             if (this.data?.description !== undefined && object_address) {
                 obj?.set_description(this.data.description, passport);
             }
-            if (this.data?.payee_treasury !== undefined && object_address) {
-                obj?.set_payee(treasury_address, passport);
-            }
             if (this.data?.endpoint !== undefined) {
                 obj?.set_endpoint(this.data.endpoint, passport)
             }
-            if (this.data?.machine !== undefined) {
-                obj?.set_machine(this.data.machine, passport)
+            if (this.data?.payee_treasury !== undefined && object_address) {
+                obj?.set_payee(treasury_address, 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) {
@@ -218,14 +219,17 @@ export class CallService extends CallBase {
                         break;
                 }
             }
+            if (this.data?.machine !== undefined) {
+                obj?.set_machine(this.data.machine, passport)
+            }
             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)
@@ -235,8 +239,12 @@ export class CallService extends CallBase {
                         break;
                 }
             }
-            if (this.data?.gen_discount !== undefined) {
-                obj?.discount_transfer(this.data.gen_discount, 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?.sales !== undefined) {
                 switch(this.data.sales.op) {
@@ -248,47 +256,6 @@ export class CallService extends CallBase {
                         break;
                 }
             }
-            if (this.data?.order_new !== undefined) {
-                let b = BigInt(0); let coin : any;
-                this.data.order_new.buy_items.forEach(v => {
-                    b += BigInt(v.max_price) * BigInt(v.count)
-                })
-                if (b > BigInt(0)) {
-                    const coin = await Account.Instance().get_coin_object(txb, b, account, this.data.type_parameter);
-                    if (coin) {
-                        //@ 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) ;
-                        await this.new_with_mark(txb, addr, (this.data?.order_new as any)?.namedNew, account, [TagName.Launch, TagName.Order]);                   
-                    }                 
-                }
-            }
-            if (this.data?.order_payer !== undefined && obj) {
-                obj?.change_order_payer(this.data?.order_payer.order, this.data.order_payer.payer_new)
-            }
-            if (this.data?.order_agent !== undefined) {
-                obj?.set_order_agent(this.data.order_agent.order, this.data.order_agent.agents, this.data.order_agent.progress)
-            }
-            if (this.data?.order_required_info !== undefined) {
-                obj?.update_order_required_info(this.data.order_required_info.order, this.data.order_required_info.info)
-            }
-            if (this.data?.order_refund !== undefined) {
-                if ((this.data?.order_refund as any)?.arb && (this.data?.order_refund as any)?.arb_token_type) {
-                    obj?.refund_withArb(this.data.order_refund.order, (this.data?.order_refund as any)?.arb, (this.data?.order_refund as any)?.arb_token_type)
-                } else {
-                    obj?.refund(this.data.order_refund.order, (this.data?.order_refund as any)?.guard, passport)
-                }
-            }
-            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':
@@ -323,15 +290,49 @@ export class CallService extends CallBase {
                         break;
                 }
             }
+            if (this.data?.bPublished) {
+                obj?.publish(passport)
+            }
+            if (this.data?.order_new !== undefined) {
+                let b = BigInt(0); let coin : any;
+                this.data.order_new.buy_items.forEach(v => {
+                    b += BigInt(v.max_price) * BigInt(v.count)
+                })
+                if (b > BigInt(0)) {
+                    const coin = await Account.Instance().get_coin_object(txb, b, account, this.data.type_parameter);
+                    if (coin) {
+                        //@ 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) ;
+                        await this.new_with_mark(txb, addr, (this.data?.order_new as any)?.namedNew, account, [TagName.Launch, TagName.Order]);                   
+                    }                 
+                }
+            }
+            if (this.data?.order_agent !== undefined) {
+                obj?.set_order_agent(this.data.order_agent.order, this.data.order_agent.agents, this.data.order_agent.progress)
+            }
+            if (this.data?.order_required_info !== undefined) {
+                obj?.update_order_required_info(this.data.order_required_info.order, this.data.order_required_info.info)
+            }
+            if (this.data?.order_refund !== undefined) {
+                if ((this.data?.order_refund as any)?.arb && (this.data?.order_refund as any)?.arb_token_type) {
+                    obj?.refund_withArb(this.data.order_refund.order, (this.data?.order_refund as any)?.arb, (this.data?.order_refund as any)?.arb_token_type)
+                } else {
+                    obj?.refund(this.data.order_refund.order, (this.data?.order_refund as any)?.guard, passport)
+                }
+            }
+            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?.order_payer !== undefined && obj) {
+                obj?.change_order_payer(this.data?.order_payer.order, this.data.order_payer.payer_new)
+            }
             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);
             }

package/src/call/treasury.ts

@@ -1,22 +1,22 @@
-import { TransactionBlock, CallResponse, IsValidArgType, Resource, ResourceObject} from 'wowok';
-import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex,
-    PermissionIndexType, DepositParam, Treasury, Treasury_WithdrawMode, WithdrawParam, WitnessFill
+import { TransactionBlock, IsValidArgType, PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex,
+    PermissionIndexType, Treasury, Treasury_WithdrawMode, WithdrawParam, 
 } from 'wowok';
 import { query_objects, ObjectTreasury } from '../objects';
 import { CallBase, CallResult, Namedbject } from "./base";
 import { Account } from '../account';
 
+/// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallTreasury_Data {
+    type_parameter: string;
     object?: {address:string} | {namedNew: Namedbject}; // undefined or {named_new...} for creating a new object
     permission?: {address:string} | {namedNew: Namedbject, description?:string}; 
-    type_parameter: string;
     description?: string;
-    withdraw_mode?: Treasury_WithdrawMode;
-    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};
     withdraw?:WithdrawParam;
+    deposit_guard?: string;
+    withdraw_guard?: {op:'add' | 'set'; data:{guard:string, amount:string|number}[]} | {op:'remove', guards:string[]} | {op:'removeall'};
+    withdraw_mode?: Treasury_WithdrawMode;
 }
 export class CallTreasury extends CallBase {
     data: CallTreasury_Data;
@@ -120,6 +120,9 @@ export class CallTreasury extends CallBase {
         }
 
         if (obj) {
+            if (this.data?.description !== undefined && object_address) {
+                obj?.set_description(this.data.description, 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) {
@@ -130,15 +133,13 @@ export class CallTreasury extends CallBase {
                     })
                 }
             }
-            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?.withdraw !== undefined) {
+                obj?.withdraw(this.data.withdraw, passport)
             }
+
             if (this.data?.deposit_guard !== undefined) {
                 obj?.set_deposit_guard(this.data.deposit_guard, passport);
             }

package/src/call.ts

@@ -1,6 +1,6 @@
 
 /**
- * Provide a this interface for AI
+ * Provide an operate interface for AI
  * Restrictive prioritization, such as setting a deposit first and setting a deposit guard later (only subsequent deposits are affected).
  */
 
@@ -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' | 'Permission' | 'ObjectPermission';
-    data: CallDemand_Data | CallMachine_Data | CallArbitration_Data | CallPermission_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);

package/src/objects.ts

@@ -461,7 +461,7 @@ export function raw2type(type_raw:string | undefined) : ObjectBaseType | undefin
 
     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 === 'Treasury' || t === 'Arb' || t === 'Repository' || t === 'Payment' || t === 'Discount' || t === 'Guard' || t === 'Arbitration') {
         return t
     } else if (t === 'Resource') {
         return 'PersonalMark';

package/src/permission.ts

@@ -3,9 +3,7 @@
  * not only the permission table, but also the administrator or Builder identity.
  */
 
-import { TransactionBlock, } from 'wowok';
-import { Protocol, Bcs, IsValidAddress, Errors, ERROR, Permission, PermissionAnswer, BCS} from 'wowok';
-
+import { TransactionBlock, Protocol, Bcs, IsValidAddress, Errors, ERROR, Permission, PermissionAnswer, BCS} from 'wowok';
 
 export interface PermissionQuery {
     permission_object: string;