wowok 1.4.31 → 1.4.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.4.31",
+  "version": "1.4.35",
   "description": "Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -38,8 +38,7 @@
     "move language",
     "move",
     "treasury",
-    "payment",
-    "Withholding"
+    "payment"
   ],
   "author": "wowok",
   "license": "Apache-2.0",

package/src/exception.ts

@@ -26,6 +26,6 @@ export enum Errors {
 }
 
 export const ERROR = (error:Errors, info?:any) =>  {
-    const e = error + info ? (' ' + info) : '';
+    const e = error.toString() + (info ? (' ' + info) : '');
     throw e;
 }

package/src/guard.ts

@@ -298,14 +298,29 @@ export class Guard {
         [MODULES.treasury, 'Number of Flow Records', 1402, [], ValueType.TYPE_U64, 'Number of treasury transactions.', []], 
         [MODULES.treasury, 'Inflow Amount', 1403, [], ValueType.TYPE_U128, 'Treasury inflow amount.', []], 
         [MODULES.treasury, 'Outflow Amount', 1404, [], ValueType.TYPE_U128, 'Treasury outflow amount.', []], 
-        [MODULES.treasury, 'Has Payment', 1405, [ValueType.TYPE_ADDRESS], ValueType.TYPE_BOOL, 'Is there a payment in the Treasury flows?', ['payment address']], 
-        [MODULES.treasury, 'Has Deposit Guard', 1406, [], ValueType.TYPE_BOOL, 'Whether the deposit Guard set?', []], 
-        [MODULES.treasury, 'Deposit Guard', 1407, [], ValueType.TYPE_ADDRESS, 'Deposit Guard address.', []], 
-        [MODULES.treasury, 'Number of Withdraw Guards', 1408, [], ValueType.TYPE_U64, 'Number of withdraw guards.', []], 
-        [MODULES.treasury, 'Has Withdraw Guard', 1409, [ValueType.TYPE_ADDRESS], ValueType.TYPE_BOOL, 'Has a Withdraw Guard added?', ['guard address']], 
-        [MODULES.treasury, 'Withdrawal Amount with Guard', 1410, [ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'withdrawal amount corresponding the Guard.', ['guard address']], 
-        [MODULES.treasury, 'Has Payment with operation', 1411, [ValueType.TYPE_ADDRESS, ValueType.TYPE_U8], ValueType.TYPE_BOOL, 'Is there a payment with the operation in the Treasury flows?', ['payment address', 'operation']], 
-        [MODULES.treasury, 'Withdraw Mode', 1412, [], ValueType.TYPE_U8, 'Treasury withdrawal mode', []], 
+        [MODULES.treasury, 'Has Deposit Guard', 1405, [], ValueType.TYPE_BOOL, 'Whether the deposit Guard set?', []], 
+        [MODULES.treasury, 'Deposit Guard', 1406, [], ValueType.TYPE_ADDRESS, 'Deposit Guard address.', []], 
+        [MODULES.treasury, 'Number of Withdraw Guards', 1407, [], ValueType.TYPE_U64, 'Number of withdraw guards.', []], 
+        [MODULES.treasury, 'Has Withdraw Guard', 1408, [ValueType.TYPE_ADDRESS], ValueType.TYPE_BOOL, 'Has a Withdraw Guard added?', ['guard address']], 
+        [MODULES.treasury, 'Withdrawal Amount with Guard', 1409, [ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'withdrawal amount corresponding the Guard.', ['guard address']], 
+        [MODULES.treasury, 'Recent Time with Operation', 1410, [ValueType.TYPE_U8], ValueType.TYPE_U64, 'Time of the most recent fund operation.', ['operation']], 
+        [MODULES.treasury, 'Recent Signer with Operation', 1411, [ValueType.TYPE_U8], ValueType.TYPE_ADDRESS, 'Signer address of the most recent fund operation.', ['operation']], 
+        [MODULES.treasury, 'Recent Payment with Operation', 1412, [ValueType.TYPE_U8], ValueType.TYPE_ADDRESS, 'Payment address of the most recent fund operation.', ['operation']], 
+        [MODULES.treasury, 'Recent Amount with Operation', 1413, [ValueType.TYPE_U8], ValueType.TYPE_U64, 'Amount of the most recent fund operation.', ['operation']], 
+        [MODULES.treasury, 'Recent Time with Op/Pmt', 1414, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'Time of the most recent fund operation with payment specified.', ['operation', 'payment address']], 
+        [MODULES.treasury, 'Recent Signer with Op&Pmt', 1415, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS], ValueType.TYPE_ADDRESS, 'Signer of the most recent fund operationwith payment specified.', ['operation', 'payment address']], 
+        [MODULES.treasury, 'Recent Amount with Op/Pmt', 1416, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'Amount of the most recent fund operation with payment specified.', ['operation', 'payment address']], 
+        [MODULES.treasury, 'Recent Time with Op/Sgr', 1417, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'Time of the most recent fund operation with signer specified.', ['operation', 'signer address']], 
+        [MODULES.treasury, 'Recent Payment with Op/Sgr', 1418, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS], ValueType.TYPE_ADDRESS, 'Payment of the most recent fund operation with singner specified.', ['operation', 'signer address']], 
+        [MODULES.treasury, 'Recent Amount with Op/Sgr', 1419, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'Amount of the most recent fund operation with singer specified.', ['operation', 'signer address']], 
+        [MODULES.treasury, 'Recent Time with Op/Pmt/Sgr', 1420, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS, ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'Time of the most recent fund operation.', ['operation', 'payment address', 'singer address']], 
+        [MODULES.treasury, 'Recent Amount with Op/Pmt/Sgr', 1421, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS, ValueType.TYPE_ADDRESS], ValueType.TYPE_U64, 'Amount of the most recent fund operation.', ['operation', 'payment address', 'singer address']], 
+        [MODULES.treasury, 'Has Operation', 1422, [ValueType.TYPE_U8], ValueType.TYPE_BOOL, 'Whether there was a fund operation?', ['operation']], 
+        [MODULES.treasury, 'Has Operation with Pmt', 1423, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS], ValueType.TYPE_BOOL, 'Whether there was a fund operation with payment specified?', ['operation', 'payment address']], 
+        [MODULES.treasury, 'Has Operation with Sgr', 1424, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS], ValueType.TYPE_BOOL, 'Whether there was a fund operation with singer specified?', ['operation', 'singer address']], 
+        [MODULES.treasury, 'Has Operation with Pmt/Sgr', 1425, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS, ValueType.TYPE_ADDRESS], ValueType.TYPE_BOOL, 'Whether there was a fund operation?', ['operation', 'payment address', 'singer address']], 
+        [MODULES.treasury, 'Operation at Least Times', 1426, [ValueType.TYPE_U8, ValueType.TYPE_U8], ValueType.TYPE_BOOL, 'Does it operate at least a certain number of times?', ['operation', 'at least times']], 
+        [MODULES.treasury, 'Operation at Least Times by a Signer', 1427, [ValueType.TYPE_U8, ValueType.TYPE_ADDRESS, ValueType.TYPE_U8], ValueType.TYPE_BOOL, 'Does it operate at least a certain number of times by a signer?', ['operation', 'signer address', 'at least times']], 
     ];
 
     static BoolCmd = Guard.QUERIES.filter(q => q[4] === ValueType.TYPE_BOOL);
@@ -490,7 +505,9 @@ export class GuardMaker {
 
     // object_address_from: string for static address; number as identifier  inconstant
     add_query(module:MODULES, query_name:string, object_address_from:string | number) : GuardMaker {        
-        let query_index = Guard.QUERIES.findIndex((q) => { return q[0] ==  module && q[1]  == query_name})
+        let query_index = Guard.QUERIES.findIndex((q) => { 
+            return q[0] ==  module && q[1]  == query_name
+        })
         if (query_index == -1)  {
             ERROR(Errors.InvalidParam, 'query_name:'+query_name);
         }
@@ -507,7 +524,7 @@ export class GuardMaker {
 
         let offset = this.type_validator.length - Guard.QUERIES[query_index][3].length;
         if (offset < 0) { 
-            ERROR(Errors.InvalidParam, 'query_name:'+query_name);
+            ERROR(Errors.InvalidParam, 'offset:'+query_name);
         }
 
         let types = this.type_validator.slice(offset);

package/src/permission.ts

@@ -548,12 +548,14 @@ export class  Permission {
             let i = answer.items?.find((v)=>v.query == index); // index maybe string, so ==
             if (i) {
                 return {has:i.permission, guard:i.guard, owner:answer.owner};
-            }    
+            } else {
+                return {has:false, guard:undefined, owner:answer?.owner}
+            }   
         }
         if (bStrict) {
-            return {has:false, guard:undefined, owner:answer?.owner}
+            return {has:false, guard:undefined, owner:false}
         } 
-        return undefined
+        return undefined // basic: !== false ; otherwise: !
     }
 
     static MAX_ADMIN_COUNT = 64;

package/src/protocol.ts

@@ -213,11 +213,11 @@ const TESTNET = {
 }
 */
 const TESTNET = {
-    wowok: "0xdc41a2bf843f25c079205f763b5664d503300590329b01772e227bf62adef4dd",
-    wowok_origin:'0xdc41a2bf843f25c079205f763b5664d503300590329b01772e227bf62adef4dd' ,
+    wowok: "0x93a47e2e77b150258877b31a49d6e2dbda58c7840f14a99aeb658bddb3d0d021",
+    wowok_origin:'0x93a47e2e77b150258877b31a49d6e2dbda58c7840f14a99aeb658bddb3d0d021' ,
     base: '0x7efcdab72af2351e5915e34ad2ac8d4ea7f4f408e08138d3498af35a362db782',
-    wowok_object: '0x346ad6492d083d7a345f233e4af16f451bbd2307cdf7b100faa3bc2a9c8dc8d9',
-    entity_object: '0xd2d1b91a348300915b3213c30310fbf2f112c6b2b273096ca78fd85f7c9b8217',
+    wowok_object: '0xdc4f31084f0f0ceb8c59feb78a361091fa84d54d562e28302f2b02b1d22e2905',
+    entity_object: '0xbf547b1185c458a2498baf7235ce9824740e4c2fce27440354f342f9ccc79de0',
     treasury_cap:'0x538cf8f32d59f58c0450a3a97c1eeed3096f4ce63e07e0bdf343a5cc1464887c',
 }
 const MAINNET = {

package/src/treasury.ts

@@ -136,7 +136,8 @@ export class Treasury {
         }
     }
     
-    deposit(param:DepositParam, passport?:PassportObject) :TxbObject {
+    // return payment address
+    deposit(param:DepositParam, passport?:PassportObject) :TransactionResult {
         if (!Protocol.IsValidObjects([param.coin])) {
             ERROR(Errors.IsValidObjects, 'deposit.param.coin')
         }
@@ -155,7 +156,6 @@ export class Treasury {
 
         const for_obj = this.txb.pure.option('address', param.for_object ?? undefined);
         const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
-
         if (passport) {
             if (param.for_guard) {
                 return this.txb.moveCall({
@@ -192,29 +192,31 @@ export class Treasury {
         
     }
 
-    receive(payment:PaymentObject, received:ReceivedObject, passport?:PassportObject)  {
+    // return current balance
+    receive(payment:PaymentObject, received:ReceivedObject, passport?:PassportObject) : TransactionResult {
         if (!Protocol.IsValidObjects([payment, received])) {
             ERROR(Errors.IsValidArray, 'receive.payment&received');
         }
-
+        const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
         if (passport) {
             return this.txb.moveCall({
                 target:Protocol.Instance().TreasuryFn('receive_with_passport') as FnCallType,
                 arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.object(received), this.txb.object(payment), 
-                    Protocol.TXB_OBJECT(this.txb, this.permission)],
+                    this.txb.object(clock), Protocol.TXB_OBJECT(this.txb, this.permission)],
                 typeArguments:[this.token_type],
             })
         } else {
             return this.txb.moveCall({
                 target:Protocol.Instance().TreasuryFn('receive') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.object(received), this.txb.object(payment), 
-                    Protocol.TXB_OBJECT(this.txb, this.permission)],
+                    this.txb.object(clock), Protocol.TXB_OBJECT(this.txb, this.permission)],
                 typeArguments:[this.token_type],
             })
         }
     }
     
-    withdraw(param:WithdrawParam, passport?:PassportObject)  {
+    // return payment address
+    withdraw(param:WithdrawParam, passport?:PassportObject) : TransactionResult | undefined {
         if (param.items.length === 0) return undefined;
         if (!IsValidArray(param.items, (item:WithdrawItem) => IsValidU64(item.amount) && IsValidAddress(item.address))) {
             ERROR(Errors.IsValidArray, 'withdraw.param.items')
@@ -422,9 +424,10 @@ export class Treasury {
         return parseObjectType(chain_type, 'treasury::Treasury<')
     }
 
-    static OP_WITHDRAW = 0;
-    static OP_DEPOSIT = 1;
-    static OP_RECEIVE = 2;
+    static OP_WITHDRAW = 1;
+    static OP_DEPOSIT = 2;
+    static OP_RECEIVE = 4;
+    
     static MAX_WITHDRAW_GUARD_COUNT = 16;
 }