wowok_agent 0.1.11 → 0.1.12

package/package.json

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

@@ -8,7 +8,6 @@ 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;
     permission_new?: string;
     description?: string;
@@ -121,10 +120,9 @@ 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 {
@@ -136,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)
             }
@@ -148,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) {
@@ -168,23 +175,12 @@ export class CallArbitration extends CallBase {
                         break;
                 }
             }
-            
-            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.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) {
                 await this.new_with_mark(txb, withdraw_treasury.launch(), (this.data?.fee_treasury as any)?.namedNew, account);
             }

package/src/call/base.ts

@@ -9,7 +9,7 @@ import { Account } from '../account';
 import { ObjectBase, queryTableItem_Personal, raw2type} from '../objects';
 
 export interface Namedbject {
-    name: string;
+    name?: string;
     tags?: string[];
 }
 
@@ -32,6 +32,7 @@ export interface CallWithWitnessParam {
 }
 export type CallResult = GuardInfo_forCall | CallResponse | undefined;
 
+
 export function ResponseData(response: CallResponse | undefined) : ResponseData[] {
     const res : ResponseData[] = [];
     response?.objectChanges?.forEach(v => {

package/src/call/guard.ts

@@ -5,7 +5,8 @@
 
 import { Bcs, ContextType, ERROR, Errors, IsValidU8, OperatorType, ValueType, GUARD_QUERIES, IsValidAddress, 
     concatenate, TransactionBlock, Protocol, FnCallType, hasDuplicates, insertAtHead, CallResponse, 
-    IsValidDesription, PassportObject} from "wowok";
+    IsValidDesription, PassportObject,
+    IsValidGuardIdentifier} from "wowok";
 import { CallBase, CallResult, Namedbject } from "./base";
 
 export interface GuardConst {
@@ -26,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 {
@@ -74,7 +76,6 @@ export class CallGuard extends CallBase {
         this.data?.table?.forEach((v) => {
             if (v.bWitness) {
                 const n = new Uint8Array(1); n.set([v.value_type], 0);
-                console.log(n)
                 txb.moveCall({
                     target:Protocol.Instance().guardFn("constant_add") as FnCallType,
                     arguments:[txb.object(obj), txb.pure.u8(v.identifier), txb.pure.bool(true), txb.pure.vector('u8', [].slice.call(n)), txb.pure.bool(false)]
@@ -107,13 +108,13 @@ 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) ERROR(Errors.InvalidParam, 'query invalid - ' + node?.query);
@@ -124,13 +125,13 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
                 buildNode(node.parameters[i], q![3][i], table, output); // Recursive check
             }
         } else {
-            ERROR(Errors.InvalidParam, 'node query parameters length not match - ' + 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             
@@ -141,7 +142,7 @@ 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)
@@ -149,18 +150,18 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
         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;
@@ -169,20 +170,20 @@ 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());
+                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());
+                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)));
@@ -190,13 +191,13 @@ const buildNode = (guard_node:GuardNode, type_required:ValueType | 'number' | 'v
         }
     } else if (node?.calc !== undefined) {
         checkType(ValueType.TYPE_U256, type_required, node);
-        if (node.parameters.length < 2) ERROR(Errors.InvalidParam, 'node calc parameters length must >= 2'+ node.toString());
+        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) {
@@ -219,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))
     }
 }
 
@@ -250,8 +258,7 @@ const checkType = (type: ValueType | ContextType.TYPE_CLOCK | ContextType.TYPE_G
 
     if (type !== type_required) {
         var str = '';
-        if (node) str = ' - ' + node.toString();
-        console.log(node)
+        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;
@@ -210,13 +210,13 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (this.data?.bPublished ) {
                 obj?.publish(passport)
             }
-            if (this.data?.clone_new && obj) {
+            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) {
                 await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
-            if (!this.data.object) {
+            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/permission.ts

@@ -1,17 +1,17 @@
 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';
 
 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 CallPermission extends CallBase {
     data: CallPermission_Data;
@@ -53,12 +53,12 @@ export class CallPermission extends CallBase {
                 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;
                 }
@@ -88,14 +88,14 @@ export class CallPermission extends CallBase {
             if (this.data?.admin !== undefined) {
                 switch(this.data.admin.op) {
                     case 'add':
-                        obj?.add_admin(this.data.admin.admins);
+                        obj?.add_admin(this.data.admin.address);
                         break;
                     case 'remove':
-                        obj?.remove_admin(this.data.admin.admins);
+                        obj?.remove_admin(this.data.admin.address);
                         break;
                     case 'set':
                         obj?.remove_admin([], true);
-                        obj?.add_admin(this.data.admin.admins);
+                        obj?.add_admin(this.data.admin.address);
                         break
                 }
             }

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,8 +61,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/service.ts

@@ -15,7 +15,7 @@ export interface CallService_Data {
     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;
@@ -184,6 +184,9 @@ export class CallService extends CallBase {
             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':
@@ -221,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)
@@ -235,9 +238,6 @@ export class CallService extends CallBase {
                         break;
                 }
             }
-            if (this.data?.gen_discount !== undefined) {
-                obj?.discount_transfer(this.data.gen_discount, passport)
-            }
             if (this.data?.sales !== undefined) {
                 switch(this.data.sales.op) {
                     case 'add':

package/src/call.ts

@@ -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';