wowok_agent 0.0.1 → 0.1.3

package/src/call/treasury.ts

@@ -1,12 +1,14 @@
-import { TransactionBlock, CallResponse} from 'wowok';
+import { TransactionBlock, CallResponse, IsValidArgType} from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex,
     PermissionIndexType, DepositParam, Treasury, Treasury_WithdrawMode, WithdrawParam, WitnessFill
 } from 'wowok';
-import { OBJECT_QUERY, ObjectTreasury } from '../objects';
-import { CallBase } from "./call";
+import { query_objects, ObjectTreasury } from '../objects';
+import { CallBase, CallResult } from "./base";
 
-export class CallTreasury extends CallBase {
-    type_parameter: string;
+export interface CallTreasury_Data {
+    object?: string; // undefined for creating a new object
+    permission?: string; 
+    type_parameter?: string;
     permission_new?: string;
     description?: string;
     withdraw_mode?: Treasury_WithdrawMode;
@@ -15,61 +17,75 @@ export class CallTreasury extends CallBase {
     deposit?: {data:DepositParam, guard?:string | 'fetch'};
     receive?: {payment:string; received_object:string};
     withdraw?:WithdrawParam;
-    constructor(type_parameter:string, object: string | 'new' = 'new') { 
-        super(object) 
-        this.type_parameter = type_parameter;
+}
+export class CallTreasury extends CallBase {
+    data: CallTreasury_Data;
+    constructor(data:CallTreasury_Data) {
+        super();
+        this.data = data;
     }
-    async call(account?:string) : Promise<WitnessFill[] | CallResponse | undefined>   {
-        if (!this.type_parameter) ERROR(Errors.InvalidParam, 'type_parameter');
+    
+    async call(account?:string) : Promise<CallResult>  {
+        if (!this.data.type_parameter || !IsValidArgType(this.data.type_parameter)) {
+            ERROR(Errors.IsValidArgType, 'treasury.type_parameter');
+        }
+
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = [];  var obj: ObjectTreasury | undefined ;
 
-        if (this?.permission && IsValidAddress(this.permission)) {
-            if (this?.object === 'new') {
+        if (this.data?.permission && IsValidAddress(this.data.permission)) {
+            if (!this.data?.object) {
                 perms.push(PermissionIndex.treasury)
             }
-            if (this?.permission_new !== undefined) {
+            if (this.data?.permission_new !== undefined) {
                 checkOwner = true;
             }
-            if (this?.description !== undefined && this.object !== 'new') {
+            if (this.data?.description !== undefined && this.data.object) {
                 perms.push(PermissionIndex.treasury_descritption)
             }
-            if (this?.withdraw_mode !== undefined) {
+            if (this.data?.withdraw_mode !== undefined) {
                 perms.push(PermissionIndex.treasury_withdraw_mode)
             }
-            if (this?.withdraw_guard == undefined) { // publish is an irreversible one-time operation 
+            if (this.data?.withdraw_guard == undefined) { // publish is an irreversible one-time operation 
                 perms.push(PermissionIndex.treasury_withdraw_guard)
             }
-            if (this?.deposit_guard !== undefined) {
+            if (this.data?.deposit_guard !== undefined) {
                 perms.push(PermissionIndex.treasury_deposit_guard)
             }
-            if (this?.deposit_guard !== undefined) {
+            if (this.data?.deposit_guard !== undefined) {
                 perms.push(PermissionIndex.treasury_deposit_guard)
             }
-            if (this?.deposit?.guard !== undefined) {
-                if (IsValidAddress(this.deposit.guard)) {
-                    guards.push(this.deposit.guard)
+            if (this.data?.deposit?.guard !== undefined) {
+                if (IsValidAddress(this.data.deposit.guard)) {
+                    guards.push(this.data.deposit.guard)
                 } else {
-                    if (!obj) {
-                        const r = await OBJECT_QUERY.objects({objects:[this.object], showContent:true});
-                        if (r?.objects && r.objects[0].type === 'Treasury') {
-                            obj = r.objects[0] as ObjectTreasury;
+                    if (!this.data.object) {
+                        if (this.data?.deposit_guard && IsValidAddress(this.data?.deposit_guard)) {
+                            guards.push(this.data.deposit_guard)
                         }
+                    } else {
+                        if (!obj) {
+                            const r = await query_objects({objects:[this.data.object], showContent:true});
+                            if (r?.objects && r.objects[0].type === 'Treasury') {
+                                obj = r.objects[0] as ObjectTreasury;
+                            }
+                        }
+                        if (obj?.deposit_guard) {
+                            guards.push(obj?.deposit_guard)
+                        }                        
                     }
-                    if (obj?.deposit_guard) {
-                        guards.push(obj?.deposit_guard)
-                    }
+
                 }
             }
-            if (this?.receive !== undefined) {
+            if (this.data?.receive !== undefined) {
                 perms.push(PermissionIndex.treasury_receive)
             }
-            if (this?.withdraw?.withdraw_guard !== undefined) {
-                if (typeof(this.withdraw.withdraw_guard) === 'string' && IsValidAddress(this.withdraw.withdraw_guard)) {
-                    guards.push(this.withdraw.withdraw_guard)
-                } else {
+            if (this.data?.withdraw?.withdraw_guard !== undefined) {
+                if (typeof(this.data.withdraw.withdraw_guard) === 'string' && IsValidAddress(this.data.withdraw.withdraw_guard)) {
+                    guards.push(this.data.withdraw.withdraw_guard)
+                } else if (this.data.object) {
                     if (!obj) {
-                        const r = await OBJECT_QUERY.objects({objects:[this.object], showContent:true});
+                        const r = await query_objects({objects:[this.data.object], showContent:true});
                         if (r?.objects && r.objects[0].type === 'Treasury') {
                             obj = r.objects[0] as ObjectTreasury;
                         }
@@ -82,66 +98,66 @@ export class CallTreasury extends CallBase {
                 perms.push(PermissionIndex.treasury_withdraw)
             }
 
-            return await this.check_permission_and_call(this.permission, perms, guards, checkOwner, undefined, account)
+            return await this.check_permission_and_call(this.data.permission, perms, guards, checkOwner, undefined, account)
         }
         return this.exec(account);
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject) {
         let obj : Treasury | undefined ; let permission: any; 
-        if (this.object === 'new' && this?.type_parameter) {
-            if (!this?.permission || !IsValidAddress(this?.permission)) {
+        if (!this.data.object) {
+            if (!this.data?.permission || !IsValidAddress(this.data?.permission)) {
                 permission = Permission.New(txb, '');
             }
-            obj = Treasury.New(txb, this.type_parameter, permission ?? this?.permission, this?.description??'', permission?undefined:passport)
+            obj = Treasury.New(txb, this.data.type_parameter!, permission ?? this.data?.permission, this.data?.description??'', permission?undefined:passport)
         } else {
-            if (IsValidAddress(this.object) && this.type_parameter && this.permission && IsValidAddress(this?.permission)) {
-                obj = Treasury.From(txb, this.type_parameter, this.permission, this.object)
+            if (IsValidAddress(this.data.object) && this.data.type_parameter && this.data.permission && IsValidAddress(this.data?.permission)) {
+                obj = Treasury.From(txb, this.data.type_parameter, this.data.permission, this.data.object)
             }
         }
 
         if (obj) {
-            if (this?.description !== undefined && this.object !== 'new') {
-                obj?.set_description(this.description, passport);
+            if (this.data?.description !== undefined && this.data.object) {
+                obj?.set_description(this.data.description, passport);
             }
-            if (this?.deposit_guard !== undefined) {
-                obj?.set_deposit_guard(this.deposit_guard, passport);
+            if (this.data?.deposit_guard !== undefined) {
+                obj?.set_deposit_guard(this.data.deposit_guard, passport);
             }
-            if (this?.withdraw_mode !== undefined) {
-                obj?.set_withdraw_mode(this.withdraw_mode, passport)
+            if (this.data?.withdraw_mode !== undefined) {
+                obj?.set_withdraw_mode(this.data.withdraw_mode, passport)
             }
-            if (this?.withdraw_guard !== undefined) {
-                switch (this.withdraw_guard.op) {
+            if (this.data?.withdraw_guard !== undefined) {
+                switch (this.data.withdraw_guard.op) {
                     case 'add':
-                        this.withdraw_guard.data.forEach(v => obj?.add_withdraw_guard(v.guard, BigInt(v.amount), passport))
+                        this.data.withdraw_guard.data.forEach(v => obj?.add_withdraw_guard(v.guard, BigInt(v.amount), passport))
                         break;
                     case 'remove':
-                        obj?.remove_withdraw_guard(this.withdraw_guard.guards, false, passport)
+                        obj?.remove_withdraw_guard(this.data.withdraw_guard.guards, false, passport)
                         break;
                     case 'set':
                         obj?.remove_withdraw_guard([], true, passport)
-                        this.withdraw_guard.data.forEach(v => obj?.add_withdraw_guard(v.guard, BigInt(v.amount), passport))
+                        this.data.withdraw_guard.data.forEach(v => obj?.add_withdraw_guard(v.guard, BigInt(v.amount), passport))
                         break;
                     case 'removeall':
                         obj?.remove_withdraw_guard([], true, passport)
                         break;
                 }
             }
-            if (this?.withdraw !== undefined) {
-                obj?.withdraw(this.withdraw, passport)
+            if (this.data?.withdraw !== undefined) {
+                obj?.withdraw(this.data.withdraw, passport)
             }
-            if (this?.receive !== undefined) {
-                obj?.receive(this.receive.payment, this.receive.received_object, passport); 
+            if (this.data?.receive !== undefined) {
+                obj?.receive(this.data.receive.payment, this.data.receive.received_object, passport); 
             }
-            if (this.deposit !== undefined) {
-                obj?.deposit(this.deposit.data, passport)
+            if (this.data.deposit !== undefined) {
+                obj?.deposit(this.data.deposit.data, passport)
             }
-            if (this?.permission_new !== undefined) {
-                obj?.change_permission(this.permission_new);
+            if (this.data?.permission_new !== undefined) {
+                obj?.change_permission(this.data.permission_new);
             }
             if (permission) {
                 permission.launch();
             }
-            if (this.object === 'new') {
+            if (!this.data.object) {
                 obj?.launch();
             }
         }

package/src/call.ts

@@ -0,0 +1,70 @@
+
+/**
+ * Provide a this interface for AI
+ * Operation sequence Priority: common operation > Guard change > permission change
+ * Recommended: Changes to guard and permission are committed on-chain separately to avoid permission dependencies for other operations.
+ */
+
+import { CallArbitration, CallArbitration_Data } from "./call/arbitration";
+import { CallDemand, CallDemand_Data } from "./call/demand";
+import { CallMachine, CallMachine_Data } from "./call/machine";
+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";
+import { CallTreasury, CallTreasury_Data } from "./call/treasury";
+import { CallBase, CallResult, CallWithWitnessParam } from "./call/base";
+import { CallGuard, CallGuard_Data } from "./call/guard";
+
+ 
+export interface CallObjectData {
+    type: 'Demand' | 'Service' | 'Machine' | 'Treasury' | 'Arbitration' | 'Guard' | 'Repository' | 'Personal' | 'Permission';
+    data: CallDemand_Data | CallMachine_Data | CallArbitration_Data | CallPermission_Data | CallPermission_Data
+    | CallTreasury_Data | CallService_Data | CallPermission_Data | CallRepository_Data;
+    account?: string;
+    witness?: CallWithWitnessParam;
+}
+
+export const call_object_json = async (json: string) : Promise<string> => {
+    try {
+        const c : CallObjectData = 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> => {
+    var obj = call_object_new(call);
+
+    if (obj) {
+        if (call.witness) {
+            return obj.call_with_witness(call.witness);
+        } else {
+            return obj.call(call.account);
+        }
+    }
+}
+
+function call_object_new (call: CallObjectData) : CallBase | undefined {
+    switch (call.type) {
+        case 'Demand':
+            return new CallDemand(call.data as CallDemand_Data);
+        case 'Service':
+            return new CallService(call.data as CallService_Data);
+        case 'Machine':
+            return new CallMachine(call.data as CallMachine_Data);
+        case 'Treasury':
+            return new CallTreasury(call.data as CallTreasury_Data);
+        case 'Arbitration':
+            return new CallArbitration(call.data as CallArbitration_Data);
+        case 'Guard':
+            return new CallGuard(call.data as CallGuard_Data);
+        case 'Repository':
+            return new CallRepository(call.data as CallRepository_Data);
+        case 'Personal':
+            return new CallPersonal(call.data as CallPersonal_Data);
+        case 'Permission':
+            return new CallPermission(call.data as CallPermission_Data);
+    }
+}

package/src/index.ts

@@ -2,7 +2,7 @@ export * from './objects'
 export * from './permission'
 export * from './events'
 export * from './cache'
-export * from './call/call'
+export * from './call/base'
 export * from './call/permission'
 export * from './call/arbitration'
 export * from './call/treasury'
@@ -11,3 +11,5 @@ export * from './call/demand'
 export * from './call/machine'
 export * from './call/repository'
 export * from './call/service'
+export * from './call/guard'
+export * from './account'