wowok 1.5.43 → 1.5.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.5.43",
+  "version": "1.5.45",
   "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/arbitration.ts

@@ -1,7 +1,8 @@
 import { IsValidArray,  array_unique, IsValidTokenType, IsValidDesription, parseObjectType,
     IsValidAddress, IsValidEndpoint, IsValidU64, IsValidName, } from './utils'
 import { FnCallType, GuardObject, PassportObject, PermissionObject, CoinObject, Protocol,
-    TxbObject, ArbitrationAddress, OrderObject, ArbObject, PaymentAddress, TreasuryObject} from './protocol';
+    TxbObject, ArbitrationAddress, OrderObject, ArbObject, PaymentAddress, TreasuryObject,
+    ArbAddress} from './protocol';
 import { ERROR, Errors } from './exception';
 import { Transaction as TransactionBlock,  } from '@mysten/sui/transactions';
 
@@ -438,7 +439,7 @@ export class Arbitration {
         }
     }
 
-    dispute(param:Dispute, passport?:PassportObject) {
+    dispute(param:Dispute, passport?:PassportObject) : ArbAddress {
         if (!Protocol.IsValidObjects([param.order])) {
             ERROR(Errors.IsValidObjects, 'dispute.param.order')
         }
@@ -454,14 +455,14 @@ export class Arbitration {
 
         if (passport) {
             if (param.fee) {
-                this.txb.moveCall({
+                return this.txb.moveCall({
                     target:Protocol.Instance().ArbitrationFn('dispute_with_passport') as FnCallType,
                     arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.object(param.order), this.txb.pure.string(param.description),
                         this.txb.pure.vector('string', array_unique(param.votable_proposition)), this.txb.object(param.fee)],
                     typeArguments:[this.pay_token_type, param.order_token_type]
                 })
             } else {
-                this.txb.moveCall({
+                return this.txb.moveCall({
                     target:Protocol.Instance().ArbitrationFn('free_dispute_with_passport') as FnCallType,
                     arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.object(param.order), this.txb.pure.string(param.description),
                         this.txb.pure.vector('string', array_unique(param.votable_proposition))],
@@ -470,14 +471,14 @@ export class Arbitration {
             }
         } else {
             if (param.fee) {
-                this.txb.moveCall({
+                return this.txb.moveCall({
                     target:Protocol.Instance().ArbitrationFn('dispute') as FnCallType,
                     arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.object(param.order), this.txb.pure.string(param.description),
                         this.txb.pure.vector('string', array_unique(param.votable_proposition)), this.txb.object(param.fee)],
                     typeArguments:[this.pay_token_type, param.order_token_type]
                 })
             } else {
-                this.txb.moveCall({
+                return this.txb.moveCall({
                     target:Protocol.Instance().ArbitrationFn('free_dispute') as FnCallType,
                     arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.object(param.order), this.txb.pure.string(param.description),
                         this.txb.pure.vector('string', array_unique(param.votable_proposition))],

package/src/guard.ts

@@ -727,10 +727,12 @@ export class GuardMaker {
             type === OperatorType.TYPE_LOGIC_EQUAL ||
             type === OperatorType.TYPE_LOGIC_HAS_SUBSTRING ||
             type === OperatorType.TYPE_LOGIC_AND ||
-            type === OperatorType.TYPE_LOGIC_OR)
+            type === OperatorType.TYPE_LOGIC_OR || 
+            type === OperatorType.TYPE_NUMBER_ADD ||
+            type === OperatorType.TYPE_NUMBER_DEVIDE ||
+            type === OperatorType.TYPE_NUMBER_MULTIPLY ||
+            type === OperatorType.TYPE_NUMBER_SUBTRACT ||
+            type === OperatorType.TYPE_NUMBER_MOD)
     }
 }
 
-
-
-

package/src/passport.ts

@@ -67,7 +67,6 @@ export class GuardParser {
         // console.log(constants)
         
         let inputs : DeGuardInput[] = GuardParser.parse_bcs(constants, guard_input_bytes);
-
         // console.log(data);
         if (!inputs || inputs.length == 0) ERROR(Errors.Fail, 'GuardObject: data parsed error');
         let stack: DeGuardData[] = [];
@@ -149,6 +148,7 @@ export class GuardParser {
                 current.ret_type = ValueType.TYPE_BOOL;
                 if (stack.length < current.value || current.value < 2) ERROR(Errors.Fail, 'ResolveData: ' + current.type);
                 var p0 = stack.pop() as DeGuardData;
+                current.child.push(p0);
                 for (let i = 1; i < current.value; ++i) {
                     var p = stack.pop() as DeGuardData;
                     if (!p.ret_type || (p.ret_type != p0.ret_type))  ERROR(Errors.Fail, 'ResolveData: ' + current.type + ' INVALID param type');
@@ -184,7 +184,7 @@ export class GuardParser {
                 current.ret_type = r[4];
 
                 if (stack.length < r[3].length) ERROR(Errors.Fail, 'OperateParamCount: cmd param lost ' + current.type);
-                r[3].forEach((e:number) => {
+                r[3].forEach((e:number) => {    
                     let d = stack.pop() as DeGuardData;
                     if (!d?.ret_type || d.ret_type != e) {
                         ERROR(Errors.Fail, 'OperateParamCount: cmd param not match ' + current.type);

package/src/service.ts

@@ -360,22 +360,24 @@ export class Service {
             }
         }
     }
-    add_arbitration(arbitraion:ArbitrationObject, passport?:PassportObject) {
+    add_arbitration(arbitraion:ArbitrationObject, arbitraion_token_type:string, passport?:PassportObject) {
         if (!Protocol.IsValidObjects([arbitraion])) {
-            ERROR(Errors.IsValidObjects, 'arbitration_add');
+            ERROR(Errors.IsValidObjects, 'add_arbitration.arbitraion');
+        }
+        if (!IsValidTokenType(arbitraion_token_type)) {
+            ERROR(Errors.IsValidTokenType, 'add_arbitration.arbitraion_token_type')
         }
-        
         if (passport) {
             this.txb.moveCall({
                 target:Protocol.Instance().ServiceFn('arbitration_add_with_passport') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, arbitraion), Protocol.TXB_OBJECT(this.txb, this.permission)],
-                typeArguments:[this.pay_token_type]
+                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, arbitraion), Protocol.TXB_OBJECT(this.txb, this.permission)],
+                typeArguments:[this.pay_token_type, arbitraion_token_type]
             })
         } else {
             this.txb.moveCall({
-                target:Protocol.Instance().ServiceFn('repository_add') as FnCallType,
+                target:Protocol.Instance().ServiceFn('arbitration_add') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, arbitraion), Protocol.TXB_OBJECT(this.txb, this.permission)],
-                typeArguments:[this.pay_token_type]
+                typeArguments:[this.pay_token_type, arbitraion_token_type]
             })  
         }
     }
@@ -383,7 +385,7 @@ export class Service {
         if (!removeall && address.length===0)  return;
         
         if (!IsValidArray(address, IsValidAddress)) {
-            ERROR(Errors.IsValidArray,  'arbitration_remove.address');
+            ERROR(Errors.IsValidArray,  'remove_arbitration.address');
         }
         
         if (passport) {