wowok 1.0.6 → 1.0.7

package/dist/vote.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.change_permission = exports.agree = exports.vote_lock_guard = exports.vote_expand_deadline = exports.vote_lock_deadline = exports.vote_open_voting = exports.vote_set_max_choice_count = exports.vote_remove_option = exports.vote_add_option = exports.vote_remove_guard = exports.vote_add_guard = exports.vote_set_reference = exports.vote_set_description = exports.destroy = exports.launch = exports.vote = exports.MAX_CHOICE_COUNT = exports.MAX_AGREES_COUNT = void 0;
 const bcs_1 = require("@mysten/bcs");
 const protocol_1 = require("./protocol");
-const util_1 = require("./util");
+const utils_1 = require("./utils");
 exports.MAX_AGREES_COUNT = 200;
 exports.MAX_CHOICE_COUNT = 200;
 function vote(txb, permission, description, minutes_duration, max_choice_count, reference_address, passport) {
@@ -19,7 +19,7 @@ function vote(txb, permission, description, minutes_duration, max_choice_count,
         return false;
     if (reference_address && !(0, protocol_1.IsValidAddress)(reference_address))
         return false;
-    let reference = reference_address ? txb.pure(util_1.BCS_CONVERT.ser_option_address(reference_address)) : (0, protocol_1.OptionNone)(txb);
+    let reference = reference_address ? txb.pure(utils_1.BCS_CONVERT.ser_option_address(reference_address)) : (0, protocol_1.OptionNone)(txb);
     let choice_count = max_choice_count ? max_choice_count : 1;
     if (passport) {
         return txb.moveCall({
@@ -81,7 +81,7 @@ function vote_set_reference(txb, vote, permission, reference_address, passport)
         return false;
     if (reference_address && !(0, protocol_1.IsValidAddress)(reference_address))
         return false;
-    let reference = reference_address ? txb.pure(util_1.BCS_CONVERT.ser_option_address(reference_address)) : (0, protocol_1.OptionNone)(txb);
+    let reference = reference_address ? txb.pure(utils_1.BCS_CONVERT.ser_option_address(reference_address)) : (0, protocol_1.OptionNone)(txb);
     if (passport) {
         txb.moveCall({
             target: protocol_1.PROTOCOL.VoteFn('reference_set_with_passport'),
@@ -134,7 +134,7 @@ function vote_remove_guard(txb, vote, permission, guard_address, removeall, pass
         else {
             txb.moveCall({
                 target: protocol_1.PROTOCOL.VoteFn('guard_remove_with_passport'),
-                arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure((0, util_1.array_unique)(guard_address), 'vector<address>'), (0, protocol_1.TXB_OBJECT)(txb, permission)]
+                arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure((0, utils_1.array_unique)(guard_address), 'vector<address>'), (0, protocol_1.TXB_OBJECT)(txb, permission)]
             });
         }
     }
@@ -148,7 +148,7 @@ function vote_remove_guard(txb, vote, permission, guard_address, removeall, pass
         else {
             txb.moveCall({
                 target: protocol_1.PROTOCOL.VoteFn('guard_remove'),
-                arguments: [(0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure((0, util_1.array_unique)(guard_address), 'vector<address>'), (0, protocol_1.TXB_OBJECT)(txb, permission)]
+                arguments: [(0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure((0, utils_1.array_unique)(guard_address), 'vector<address>'), (0, protocol_1.TXB_OBJECT)(txb, permission)]
             });
         }
     }
@@ -170,7 +170,7 @@ function vote_add_option(txb, vote, permission, options, passport) {
     if (!bValid)
         return false;
     options.forEach((option) => {
-        let reference = option?.reference_address ? txb.pure(util_1.BCS_CONVERT.ser_option_address(option.reference_address)) : (0, protocol_1.OptionNone)(txb);
+        let reference = option?.reference_address ? txb.pure(utils_1.BCS_CONVERT.ser_option_address(option.reference_address)) : (0, protocol_1.OptionNone)(txb);
         if (passport) {
             txb.moveCall({
                 target: protocol_1.PROTOCOL.VoteFn('agrees_add_with_passport'),
@@ -204,7 +204,7 @@ function vote_remove_option(txb, vote, permission, options, removeall, passport)
         else {
             txb.moveCall({
                 target: protocol_1.PROTOCOL.VoteFn('agrees_remove_with_passport'),
-                arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure(util_1.BCS_CONVERT.ser_vector_string((0, util_1.array_unique)(options))), (0, protocol_1.TXB_OBJECT)(txb, permission)]
+                arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure(utils_1.BCS_CONVERT.ser_vector_string((0, utils_1.array_unique)(options))), (0, protocol_1.TXB_OBJECT)(txb, permission)]
             });
         }
     }
@@ -218,7 +218,7 @@ function vote_remove_option(txb, vote, permission, options, removeall, passport)
         else {
             txb.moveCall({
                 target: protocol_1.PROTOCOL.VoteFn('agrees_remove'),
-                arguments: [(0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure(util_1.BCS_CONVERT.ser_vector_string((0, util_1.array_unique)(options))), (0, protocol_1.TXB_OBJECT)(txb, permission)]
+                arguments: [(0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure(utils_1.BCS_CONVERT.ser_vector_string((0, utils_1.array_unique)(options))), (0, protocol_1.TXB_OBJECT)(txb, permission)]
             });
         }
     }
@@ -327,13 +327,13 @@ function agree(txb, vote, options, passport) {
     if (passport) {
         txb.moveCall({
             target: protocol_1.PROTOCOL.VoteFn('vote_with_passport'),
-            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure(util_1.BCS_CONVERT.ser_vector_string((0, util_1.array_unique)(options)))]
+            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure(utils_1.BCS_CONVERT.ser_vector_string((0, utils_1.array_unique)(options)))]
         });
     }
     else {
         txb.moveCall({
             target: protocol_1.PROTOCOL.VoteFn('vote'),
-            arguments: [(0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure(util_1.BCS_CONVERT.ser_vector_string((0, util_1.array_unique)(options)))]
+            arguments: [(0, protocol_1.TXB_OBJECT)(txb, vote), txb.pure(utils_1.BCS_CONVERT.ser_vector_string((0, utils_1.array_unique)(options)))]
         });
     }
     return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wowok",
-  "version": "1.0.6",
-  "description": "AI-oriented web3 collaboration protocol, driving innovaion and making it more likely to happen.",
+  "version": "1.0.7",
+  "description": "AI-oriented web3 collaboration protocol, driving innovaion and making it more likely to happen",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "node",
@@ -13,9 +13,25 @@
     "web3",
     "AI",
     "wowok",
-    "sui"
+    "sui",
+    "collaboration",
+    "protocol",
+    "WOW",
+    "permission",
+    "guard",
+    "service",
+    "order",
+    "machine",
+    "progress",
+    "passport",
+    "demand",
+    "reward",
+    "discount",
+    "mark",
+    "message",
+    "vote"
   ],
-  "author": "wowo",
+  "author": "wowok",
   "license": "Apache License",
   "dependencies": {
     "@mysten/bcs": "^0.11.1",

package/src/guard.ts

@@ -242,12 +242,13 @@ export class SenseMaker {
             this.data.push(bcs.ser(BCS.U8, type).toBytes());
             this.type_validator.push(ValueType.TYPE_STATIC_address);
             break;
-        case ContextType.TYPE_CONTEXT_CURRENT_CLOCK:
+        case ContextType.TYPE_CONTEXT_CLOCK:
             this.data.push(bcs.ser(BCS.U8, type).toBytes());
             this.type_validator.push(ValueType.TYPE_STATIC_u64);
             break;
-        case ContextType.TYPE_CONTEXT_CURRENT_PROGRESS:
+        case ContextType.TYPE_CONTEXT_FUTURE_ID:
             this.data.push(bcs.ser(BCS.U8, type).toBytes());
+            this.data.push(bcs.ser(BCS.ADDRESS, param).toBytes());
             this.type_validator.push(ValueType.TYPE_STATIC_address);
             break;
         default:
@@ -265,9 +266,13 @@ export class SenseMaker {
         return -1;
     }
     // query_index: index(from 0) of array QUERIES 
-    add_query(object_address:string, module:MODULES, query_name:string) : boolean {
+    // TYPE_FUTURE_ORDER_DYNAMIC_QUERY: object_address: service/machine id;  module:order/progress 
+    add_query(type:OperatorType, object_address:string, module:MODULES, query_name:string) : boolean {
         let query_index = this.query_index(module, query_name);
         if (!object_address || query_index == -1) { return false; }
+        // if future type , object_address must be SERVICE OR MACHINE address
+        if (type == OperatorType.TYPE_FUTURE_ORDER_DYNAMIC_QUERY && module != MODULES.order) return false;
+        if (type == OperatorType.TYPE_FUTURE_PROGRESS_DYNAMIC_QUERY && module != MODULES.progress) return false;
 
         let offset = this.type_validator.length - QUERIES[query_index][3].length;
         if (offset < 0) { 
@@ -280,7 +285,7 @@ export class SenseMaker {
         }
         
         const bcs = new BCS(getSuiMoveConfig());
-        this.data.push(bcs.ser(BCS.U8, OperatorType.TYPE_DYNAMIC_QUERY).toBytes()); // TYPE
+        this.data.push(bcs.ser(BCS.U8, type).toBytes()); // TYPE
         this.data.push(bcs.ser(BCS.ADDRESS, object_address).toBytes()); // object address
         this.data.push(bcs.ser(BCS.U8, QUERIES[query_index][2]).toBytes()); // cmd
 
@@ -349,7 +354,7 @@ export function parse_graphql_senses(senses:any) : string[] {
 }
 
 // parse guard senses input bytes of a guard, return [objectids] for 'query_cmd' 
-export function parse_sense_bsc(chain_sense_bsc:Uint8Array)  : boolean | string[] {
+export function parse_sense_bsc(chain_sense_bsc:Uint8Array, future_order?:string[], future_progress?:string[])  : boolean | string[] {
     var arr = [].slice.call(chain_sense_bsc.reverse());
     const bcs = new BCS(getSuiMoveConfig());
     var result = [];
@@ -359,8 +364,7 @@ export function parse_sense_bsc(chain_sense_bsc:Uint8Array)  : boolean | string[
         // console.log(type);
         switch (type as Data_Type) { 
             case ContextType.TYPE_CONTEXT_SIGNER:
-            case ContextType.TYPE_CONTEXT_CURRENT_CLOCK:
-            case ContextType.TYPE_CONTEXT_CURRENT_PROGRESS:
+            case ContextType.TYPE_CONTEXT_CLOCK:
             case OperatorType.TYPE_LOGIC_OPERATOR_U128_GREATER:
             case OperatorType.TYPE_LOGIC_OPERATOR_U128_GREATER_EQUAL:
             case OperatorType.TYPE_LOGIC_OPERATOR_U128_LESSER:
@@ -370,6 +374,9 @@ export function parse_sense_bsc(chain_sense_bsc:Uint8Array)  : boolean | string[
             case OperatorType.TYPE_LOGIC_OPERATOR_HAS_SUBSTRING:
             case OperatorType.TYPE_LOGIC_ALWAYS_TRUE:
             break;    
+        case ContextType.TYPE_CONTEXT_FUTURE_ID: // MACHINE-ID
+            arr.splice(0, 32);
+            break;
         case ValueType.TYPE_STATIC_address: 
             //console.log('0x' + bcs.de(BCS.ADDRESS,  Uint8Array.from(array)).toString());
             arr.splice(0, 32);
@@ -392,6 +399,24 @@ export function parse_sense_bsc(chain_sense_bsc:Uint8Array)  : boolean | string[
             result.push('0x' + bcs.de(BCS.ADDRESS,  Uint8Array.from(arr)).toString());
             arr.splice(0, 33); // address + cmd
             break;
+        case OperatorType.TYPE_FUTURE_PROGRESS_DYNAMIC_QUERY: // SERVICE-ID
+            if (!future_progress) {
+                console.error('OperatorType.TYPE_FUTURE_PROGRESS_DYNAMIC_QUERY need object');
+                console.log(arr)
+                return false; // error                
+            }
+            result.push(future_progress!.shift() as string) // real query object
+            arr.splice(0, 33)
+            break;
+        case OperatorType.TYPE_FUTURE_ORDER_DYNAMIC_QUERY: // 
+            if (!future_order) {
+                console.error('OperatorType.TYPE_FUTURE_ORDER_DYNAMIC_QUERY need object');
+                console.log(arr)
+                return false; // error                
+            }
+            result.push(future_order!.shift() as string)
+            arr.splice(0, 33)
+            break;
         default:
             console.error('parse_sense_bsc:undefined');
             console.log(type as number)

package/src/index.ts

@@ -1,3 +1,4 @@
+
 export *  from './protocol'
 export * from  './passport'
 export { demand, demand_expand_time, demand_refund, demand_set_description, demand_set_guard, demand_yes, deposit as demand_deposit,

package/src/passport.ts

@@ -1,8 +1,9 @@
 import { SuiObjectResponse, SuiObjectDataOptions } from '@mysten/sui.js/client';
 import { TransactionBlock, TransactionResult, type TransactionObjectInput, Inputs } from '@mysten/sui.js/transactions';
-import { PROTOCOL, FnCallType, CLOCK_OBJECT, Query_Param, OBJECTS_TYPE, OBJECTS_TYPE_PREFIX, PassportObject, GuardObject, TXB_OBJECT} from './protocol';
+import { PROTOCOL, FnCallType, CLOCK_OBJECT, Query_Param, OBJECTS_TYPE, OBJECTS_TYPE_PREFIX, PassportObject, GuardObject, TXB_OBJECT, ContextType, IsValidAddress} from './protocol';
 import { parse_object_type, array_unique } from './utils';
 import { rpc_sense_objects_fn } from './guard';
+import { BCS } from '@mysten/bcs';
 
 export const MAX_GUARD_COUNT = 8;
 
@@ -26,7 +27,6 @@ export const passport_queries = async (guards:string[]) : Promise<Guard_Query_Ob
         sense_objects_result = sense_objects_result.concat(value.data);
     });
     sense_objects_result = array_unique(sense_objects_result); // objects in guards
-    // console.log(sense_objects_result);
 
     let queries = sense_objects_result.map((value) => { 
         return {objectid:value, callback:rpc_query_cmd_fn, data:[]} as Query_Param;
@@ -58,7 +58,7 @@ export function verify(txb:TransactionBlock, guards:string[], passport_queries:G
     
     var passport = txb.moveCall({
         target: PROTOCOL.PassportFn('new') as FnCallType,
-        arguments: [ TXB_OBJECT(txb, guards[0]), txb.object(CLOCK_OBJECT)]
+        arguments: [ TXB_OBJECT(txb, guards[0])]
     });
 
     // add others guards, if any
@@ -71,24 +71,34 @@ export function verify(txb:TransactionBlock, guards:string[], passport_queries:G
 
     // rules: 'verify' & 'query' in turns；'verify' at final end.
     for (let i = 0; i < passport_queries.length; i++) {
-        txb.moveCall({
+        let res = txb.moveCall({
             target: PROTOCOL.PassportFn('passport_verify') as FnCallType,
-            arguments: [ passport ]
+            arguments: [ passport, txb.object(CLOCK_OBJECT),  ]
         }); 
         txb.moveCall({
             target: passport_queries[i].target as FnCallType,
-            arguments: [ txb.object(passport_queries[i].object), passport ],
+            arguments: [ txb.object(passport_queries[i].object), passport, res ],
             typeArguments: passport_queries[i].types,
         })
     }
     txb.moveCall({
         target: PROTOCOL.PassportFn('passport_verify') as FnCallType,
-        arguments: [ passport ]
+        arguments: [ passport,  txb.object(CLOCK_OBJECT) ]
     });     
 
     return passport;
 }
 
+export function add_context_address(txb:TransactionBlock, passport:PassportObject, type:ContextType, value:string, witness:string) : Boolean {
+    if (!IsValidAddress(value) || !IsValidAddress(witness)) return false;
+
+    txb.moveCall({
+        target: PROTOCOL.PassportFn('context_add_address') as FnCallType,
+        arguments: [ passport, txb.pure(type, BCS.U8), txb.pure(value, BCS.ADDRESS), txb.pure(witness, BCS.ADDRESS)]   
+    });
+    return true
+}
+
 export function destroy(txb:TransactionBlock, passport:PassportObject) : boolean {
     txb.moveCall({
         target: PROTOCOL.PassportFn('destroy') as FnCallType,

package/src/protocol.ts

@@ -113,6 +113,8 @@ export enum ValueType {
 
 export enum OperatorType {
     TYPE_DYNAMIC_QUERY = 1, // query wowok object
+    TYPE_FUTURE_ORDER_DYNAMIC_QUERY = 2,
+    TYPE_FUTURE_PROGRESS_DYNAMIC_QUERY = 3,
     TYPE_LOGIC_OPERATOR_U128_GREATER = 11,
     TYPE_LOGIC_OPERATOR_U128_GREATER_EQUAL = 12,
     TYPE_LOGIC_OPERATOR_U128_LESSER = 13,
@@ -125,8 +127,8 @@ export enum OperatorType {
 
 export enum ContextType {
     TYPE_CONTEXT_SIGNER  = 60,
-    TYPE_CONTEXT_CURRENT_PROGRESS = 61,
-    TYPE_CONTEXT_CURRENT_CLOCK = 62,
+    TYPE_CONTEXT_CLOCK = 61,
+    TYPE_CONTEXT_FUTURE_ID = 62, // TYPE + MACHINE-ID or SERVICE-ID
 }
 
 export type Data_Type = ValueType | OperatorType | ContextType;
@@ -159,7 +161,7 @@ export class Protocol {
             case ENTRYPOINT.devnet:
                 break;
             case ENTRYPOINT.testnet:
-                this.package = "0x877375bc3bde063e4b95f428df218af7faaeef431993f4a68f2dfa5ceb8acb2e";
+                this.package = "0x0e4c1b57d596cda9a26a36567c79d94dffc8419e5be7ecf659ce4a7242abaeff";
                 this.everyone_guard = "0x78a41fcc4f566360839613f6b917fb101ae015e56b43143f496f265b6422fddc";
                 this.graphql = 'https://sui-testnet.mystenlabs.com/graphql';
                 break;

package/src/service.ts

@@ -1,5 +1,5 @@
 import { TransactionBlock, type TransactionResult } from '@mysten/sui.js/transactions';
-import { BCS } from '@mysten/bcs'; 
+import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig } from '@mysten/bcs';
 import { BCS_CONVERT, array_unique } from './utils'
 import { CLOCK_OBJECT, FnCallType, GuardObject, PROTOCOL, PassportObject, PermissionObject,
     RepositoryObject, MachineObject, ServiceAddress, ServiceObject, IsValidObjects, IsValidArgType, IsValidDesription, 
@@ -72,7 +72,7 @@ export function service_set_description(pay_type:string, txb:TransactionBlock, s
     return true
 }
 export function service_set_price(pay_type:string, txb:TransactionBlock, service:ServiceObject, permission:PermissionObject, 
-    item:string, price:number, passport?:PassportObject) : boolean {
+    item:string, price:number, bNotFoundAssert:boolean=true, passport?:PassportObject) : boolean {
     if (!IsValidObjects([service, permission])) return false;
     if (!IsValidArgType(pay_type)) return false;
     if (!IsValidInt(price) || !IsValidName(item)) return false;
@@ -80,20 +80,22 @@ export function service_set_price(pay_type:string, txb:TransactionBlock, service
     if (passport) {
         txb.moveCall({
             target:PROTOCOL.ServiceFn('price_set_with_passport') as FnCallType,
-            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(item), txb.pure(price, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(item), txb.pure(price, BCS.U64), 
+                txb.pure(bNotFoundAssert, BCS.BOOL), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
         })
     } else {
         txb.moveCall({
             target:PROTOCOL.ServiceFn('price_set') as FnCallType,
-            arguments:[TXB_OBJECT(txb, service), txb.pure(item), txb.pure(price, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[TXB_OBJECT(txb, service), txb.pure(item), txb.pure(price, BCS.U64), 
+                txb.pure(bNotFoundAssert, BCS.BOOL), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
         })
     }
     return true
 }
 export function service_set_stock(pay_type:string, txb:TransactionBlock, service:ServiceObject, permission:PermissionObject, 
-    item:string, stock:number, passport?:PassportObject) : boolean {
+    item:string, stock:number, bNotFoundAssert:boolean=true, passport?:PassportObject) : boolean {
     if (!IsValidObjects([service, permission])) return false;
     if (!IsValidArgType(pay_type)) return false;
     if (!IsValidName(item) || !IsValidInt(stock)) return false;
@@ -101,53 +103,59 @@ export function service_set_stock(pay_type:string, txb:TransactionBlock, service
     if (passport) {
         txb.moveCall({
             target:PROTOCOL.ServiceFn('stock_set_with_passport') as FnCallType,
-            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock, BCS.U64), 
+                txb.pure(bNotFoundAssert, BCS.BOOL), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
         })
     } else {
         txb.moveCall({
             target:PROTOCOL.ServiceFn('stock_set') as FnCallType,
-            arguments:[TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock, BCS.U64), 
+                txb.pure(bNotFoundAssert, BCS.BOOL), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
         })
     }
     return true
 }
 export function service_add_stock(pay_type:string, txb:TransactionBlock, service:ServiceObject, permission:PermissionObject, 
-    item:string, stock_add:number, passport?:PassportObject) : boolean {
+    item:string, stock_add:number, bNotFoundAssert:boolean=true, passport?:PassportObject) : boolean {
     if (!IsValidObjects([service, permission])) return false;
     if (!IsValidArgType(pay_type)) return false;
     if (!IsValidName(item) || !IsValidUint(stock_add)) return false;
     if (passport) {
         txb.moveCall({
             target:PROTOCOL.ServiceFn('stock_add_with_passport') as FnCallType,
-            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock_add, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock_add, BCS.U64), 
+                txb.pure(bNotFoundAssert, BCS.BOOL), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
         })  
     } else {
         txb.moveCall({
             target:PROTOCOL.ServiceFn('stock_add') as FnCallType,
-            arguments:[TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock_add, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock_add, BCS.U64), 
+                txb.pure(bNotFoundAssert, BCS.BOOL), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
         })        
     }
     return true
 }
 export function service_reduce_stock(pay_type:string, txb:TransactionBlock, service:ServiceObject, permission:PermissionObject, 
-    item:string, stock_reduce:number, passport?:PassportObject) : boolean {
+    item:string, stock_reduce:number, bNotFoundAssert:boolean=true, passport?:PassportObject) : boolean {
     if (!IsValidObjects([service, permission])) return false;
     if (!IsValidArgType(pay_type)) return false;
     if (!IsValidName(item) || !IsValidUint(stock_reduce)) return false;
     if (passport) {
         txb.moveCall({
             target:PROTOCOL.ServiceFn('stock_reduce_with_passport') as FnCallType,
-            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock_reduce, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock_reduce, BCS.U64), 
+                txb.pure(bNotFoundAssert, BCS.BOOL), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
         })
     } else {
         txb.moveCall({
             target:PROTOCOL.ServiceFn('stock_reduce') as FnCallType,
-            arguments:[TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock_reduce, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[TXB_OBJECT(txb, service), txb.pure(item), txb.pure(stock_reduce, BCS.U64), 
+                txb.pure(bNotFoundAssert, BCS.BOOL), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
         })
     }
@@ -372,30 +380,44 @@ export type Service_Sale = {
     stock:number;
 }
 
-export function service_add_sale(pay_type:string, txb:TransactionBlock, service:ServiceObject, 
-    permission:PermissionObject, sales:Service_Sale[], passport?:PassportObject) : boolean {
-    if (!IsValidObjects([service, permission])) return false;
-    if (!IsValidArgType(pay_type)) return false;
-    let bValid = true;
+export function is_valid_sale(sales:Service_Sale[]) : boolean {
+    let bValid = true; let names:string[]  = [];
     sales.forEach((v) => {
         if (!IsValidName(v.item)) bValid = false;
         if (!IsValidInt(v.price)) bValid = false;
-        if (!IsValidInt(v.stock)) bValid = false;
+        if (!IsValidUint(v.stock)) bValid = false;
+        if (names.includes(v.item)) bValid = false;
+        names.push(v.item)
     })
+    return bValid
+}
+export function service_add_sale(pay_type:string, txb:TransactionBlock, service:ServiceObject, 
+    permission:PermissionObject, sales:Service_Sale[], passport?:PassportObject) : boolean {
+    if (!IsValidObjects([service, permission])) return false;
+    if (!IsValidArgType(pay_type)) return false;
+    if (!sales) return false;
+    let bValid = is_valid_sale(sales);
     if (!bValid) return false;
+    
+    let names: string[]  = []; let price: number[] = []; let stock: number[] = [];
+    sales.forEach((s) => {
+        names.push(s.item); price.push(s.price); stock.push(s.stock);
+    })
 
     if (passport) {
-        sales.forEach((sale) => txb.moveCall({
+        txb.moveCall({
             target:PROTOCOL.ServiceFn('sales_add_with_passport') as FnCallType,
-            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(sale.item), txb.pure(sale.price, BCS.U64), txb.pure(sale.stock, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[passport, TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(names)), 
+                txb.pure(BCS_CONVERT.ser_vector_u64(price)), txb.pure(BCS_CONVERT.ser_vector_u64(stock)), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
-        }))
+        })
     } else {
-        sales.forEach((sale) => txb.moveCall({
+        txb.moveCall({
             target:PROTOCOL.ServiceFn('sales_add') as FnCallType,
-            arguments:[TXB_OBJECT(txb, service), txb.pure(sale.item), txb.pure(sale.price, BCS.U64), txb.pure(sale.stock, BCS.U64), TXB_OBJECT(txb, permission)],
+            arguments:[TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(names)), 
+                txb.pure(BCS_CONVERT.ser_vector_u64(price)), txb.pure(BCS_CONVERT.ser_vector_u64(stock)), TXB_OBJECT(txb, permission)],
             typeArguments:[pay_type]
-        }))
+        })
     }
     return true
 }
@@ -803,6 +825,7 @@ export function customer_refund(pay_type:string, txb:TransactionBlock, service:S
 }
 export type Service_Buy = {
     item: string;
+    max_price: number;
     count: number;
 }
 
@@ -828,42 +851,45 @@ export function buy(pay_type:string, txb:TransactionBlock, service:ServiceObject
     if (!IsValidArgType(pay_type)) return false;
     if (!buy_items) return false;
 
-    let bValid = true;
+    let bValid = true; let names:string[]  = [];
     buy_items.forEach((v) => {
         if (!IsValidName(v.item)) bValid = false;
+        if (!IsValidInt(v.max_price)) bValid = false;
         if (!IsValidUint(v.count)) bValid = false;
+        if (names.includes(v.item)) bValid = false;
+        names.push(v.item)
     })
     if (!bValid) return false;
 
-    let i:string[] = []; let c:number[] = [];    let order;
-    buy_items.forEach((item) => { i.push(item.item); c.push(item.count); })
+    let name:string[] = []; let price:number[] = [];    let stock:number[] = []; let order;
+    buy_items.forEach((b) => { name.push(b.item); price.push(b.max_price); stock.push(b.count)})
 
     if (passport) {
         if (discount) {
             order = txb.moveCall({
                 target:PROTOCOL.ServiceFn('dicount_buy_with_passport') as FnCallType,
-                arguments: [passport, TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(i)), 
-                    txb.pure(BCS_CONVERT.ser_vector_u64(c)), TXB_OBJECT(txb, coin), TXB_OBJECT(txb, discount), txb.object(CLOCK_OBJECT)],                   
+                arguments: [passport, TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(name)), txb.pure(BCS_CONVERT.ser_vector_u64(price)), 
+                    txb.pure(BCS_CONVERT.ser_vector_u64(stock)), TXB_OBJECT(txb, coin), TXB_OBJECT(txb, discount), txb.object(CLOCK_OBJECT)],                   
                 typeArguments:[pay_type]            
         })} else {
             order = txb.moveCall({
                 target:PROTOCOL.ServiceFn('buy_with_passport') as FnCallType,
-                arguments: [passport, TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(i)), 
-                    txb.pure(BCS_CONVERT.ser_vector_u64(c)), TXB_OBJECT(txb, coin)],
+                arguments: [passport, TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(name)), txb.pure(BCS_CONVERT.ser_vector_u64(price)), 
+                    txb.pure(BCS_CONVERT.ser_vector_u64(stock)), TXB_OBJECT(txb, coin)],
                 typeArguments:[pay_type]            
         })}             
     } else {
         if (discount) {
             order = txb.moveCall({
                 target:PROTOCOL.ServiceFn('disoucnt_buy') as FnCallType,
-                arguments: [TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(i)), 
-                    txb.pure(BCS_CONVERT.ser_vector_u64(c)), TXB_OBJECT(txb, coin), TXB_OBJECT(txb, discount), txb.object(CLOCK_OBJECT)],                
+                arguments: [TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(name)), txb.pure(BCS_CONVERT.ser_vector_u64(price)), 
+                    txb.pure(BCS_CONVERT.ser_vector_u64(stock)), TXB_OBJECT(txb, coin), TXB_OBJECT(txb, discount), txb.object(CLOCK_OBJECT)],                
                 typeArguments:[pay_type]            
         })} else {
             order = txb.moveCall({
                 target:PROTOCOL.ServiceFn('buy') as FnCallType,
-                arguments: [TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(i)), 
-                    txb.pure(BCS_CONVERT.ser_vector_u64(c)), TXB_OBJECT(txb, coin)],
+                arguments: [TXB_OBJECT(txb, service), txb.pure(BCS_CONVERT.ser_vector_string(name)), txb.pure(BCS_CONVERT.ser_vector_u64(price)), 
+                    txb.pure(BCS_CONVERT.ser_vector_u64(stock)), TXB_OBJECT(txb, coin)],
                 typeArguments:[pay_type]            
         })}           
     }