wowok 1.1.0 → 1.1.2

package/dist/guard.js

@@ -1,131 +1,22 @@
 import { BCS } from '@mysten/bcs';
 import { MODULES, ContextType, ValueType, OperatorType } from './protocol';
 import { concatenate, array_equal } from './utils';
-import { IsValidDesription, BCS_CONVERT, IsValidInt, IsValidAddress } from './utils';
+import { IsValidDesription, Bcs, IsValidInt, IsValidAddress } from './utils';
 import { ERROR, Errors } from './exception';
-export var Guard_Sense_Binder;
-(function (Guard_Sense_Binder) {
-    Guard_Sense_Binder[Guard_Sense_Binder["AND"] = 0] = "AND";
-    Guard_Sense_Binder[Guard_Sense_Binder["OR"] = 1] = "OR";
-})(Guard_Sense_Binder || (Guard_Sense_Binder = {}));
 export class Guard {
-    static MAX_SENSE_COUNT = 16;
-    static IsValidGuardVirableType = (type) => {
-        if (type == OperatorType.TYPE_FUTURE_QUERY || type == ContextType.TYPE_CONTEXT_FUTURE_ID || type == OperatorType.TYPE_QUERY_FROM_CONTEXT ||
-            type == ContextType.TYPE_CONTEXT_bool || type == ContextType.TYPE_CONTEXT_address || type == ContextType.TYPE_CONTEXT_u64 ||
-            type == ContextType.TYPE_CONTEXT_u8 || type == ContextType.TYPE_CONTEXT_vec_u8) {
-            return true;
-        }
-        ;
-        return false;
-    };
-    static IsValidIndentifier = (identifier) => {
-        if (!IsValidInt(identifier) || identifier > 255)
-            return false;
-        return true;
-    };
-    static get_variable_value(variables, identifier, type) {
-        if (variables.has(identifier)) {
-            let v = variables.get(identifier);
-            if (v?.value && v.type == type) {
-                return v.value;
-            }
-        }
-        return false;
-    }
-    static get_variable_witness(variables, identifier, type) {
-        if (variables.has(identifier)) {
-            let v = variables.get(identifier);
-            if (v?.witness && v.type == type) {
-                return v.witness;
-            }
-        }
-        return false;
-    }
-    static add_future_variable(variables, identifier, type, witness, value, bNeedSerialize = true) {
-        if (!Guard.IsValidIndentifier(identifier))
-            return false;
-        if (!Guard.IsValidGuardVirableType(type))
-            return false;
-        if (!witness && !value)
-            return false;
-        switch (type) {
-            case OperatorType.TYPE_FUTURE_QUERY:
-            case ContextType.TYPE_CONTEXT_FUTURE_ID:
-                if (variables.has(identifier)) {
-                    let v = variables.get(identifier);
-                    if (bNeedSerialize) {
-                        v.value = value ? BCS_CONVERT.ser_address(value) : undefined;
-                        v.witness = witness ? BCS_CONVERT.ser_address(witness) : undefined;
-                    }
-                    else {
-                        v.value = value ? value : undefined;
-                        v.witness = witness ? witness : undefined;
-                    }
-                }
-                else {
-                    if (bNeedSerialize) {
-                        variables.set(identifier, { type: type, value: value ? BCS_CONVERT.ser_address(value) : undefined, witness: witness ? BCS_CONVERT.ser_address(witness) : undefined });
-                    }
-                    else {
-                        variables.set(identifier, { type: type, value: value ? value : undefined, witness: witness ? witness : undefined });
-                    }
-                }
-                return true;
-        }
-        return false;
-    }
-    static add_variable(variables, identifier, type, value, bNeedSerialize = true) {
-        if (!Guard.IsValidIndentifier(identifier))
-            return false;
-        if (!Guard.IsValidGuardVirableType(type))
-            return false;
-        if (!value)
-            return false;
-        switch (type) {
-            case ContextType.TYPE_CONTEXT_bool:
-                bNeedSerialize ? variables.set(identifier, { type: type, value: BCS_CONVERT.ser_bool(value) }) :
-                    variables.set(identifier, { type: type, value: value });
-                return true;
-            case ContextType.TYPE_CONTEXT_address:
-            case OperatorType.TYPE_QUERY_FROM_CONTEXT:
-                bNeedSerialize ? variables.set(identifier, { type: type, value: BCS_CONVERT.ser_address(value) }) :
-                    variables.set(identifier, { type: type, value: value });
-                return true;
-            case ContextType.TYPE_CONTEXT_u64:
-                bNeedSerialize ? variables.set(identifier, { type: type, value: BCS_CONVERT.ser_u64(value) }) :
-                    variables.set(identifier, { type: type, value: value });
-                return true;
-            case ContextType.TYPE_CONTEXT_u8:
-                bNeedSerialize ? variables.set(identifier, { type: type, value: BCS_CONVERT.ser_u8(value) }) :
-                    variables.set(identifier, { type: type, value: value });
-                return true;
-            case ContextType.TYPE_CONTEXT_vec_u8:
-                bNeedSerialize ? variables.set(identifier, { type: type, value: BCS_CONVERT.ser_string(value) }) :
-                    variables.set(identifier, { type: type, value: value });
-                return true;
-        }
-        return false;
-    }
+    static MAX_INPUT_LENGTH = 2048;
     static launch(protocol, creation) {
         if (!IsValidDesription(creation.description)) {
             ERROR(Errors.IsValidDesription);
         }
-        if (creation.senses.length == 0 || creation.senses.length > Guard.MAX_SENSE_COUNT) {
-            ERROR(Errors.InvalidParam, 'creation.senses');
+        if (creation.input.length == 0 || creation.input.length > Guard.MAX_INPUT_LENGTH) {
+            ERROR(Errors.InvalidParam, 'creation.input');
         }
         let bValid = true;
-        creation.senses.forEach((v) => {
-            if (!v.input || v.input.length == 0)
-                bValid = false;
-        });
-        if (!bValid) {
-            ERROR(Errors.InvalidParam, 'creation.senses');
-        }
         creation?.variables?.forEach((v, k) => {
-            if (!Guard.IsValidIndentifier(k))
+            if (!GuardVariableMaker.IsValidIndentifier(k))
                 bValid = false;
-            if (!Guard.IsValidGuardVirableType(v.type))
+            if (!GuardVariableMaker.IsValidGuardVirableType(v.type))
                 bValid = false;
             if (!v.value && !v.witness)
                 bValid = false;
@@ -134,18 +25,11 @@ export class Guard {
             ERROR(Errors.InvalidParam, 'creation.variables');
         }
         let txb = protocol.CurrentSession();
+        let input = new Uint8Array(creation.input); // copy new uint8array to reserve!
+        // reserve the  bytes for guard
         let guard = txb.moveCall({
             target: protocol.GuardFn('new'),
-            arguments: [txb.pure(creation.description, BCS.STRING)],
-        });
-        creation.senses.forEach((sense) => {
-            txb.moveCall({
-                target: protocol.GuardFn('sense_add'),
-                arguments: [guard, txb.pure([].slice.call(sense.input)),
-                    txb.pure(sense.notAfterSense, BCS.BOOL),
-                    txb.pure(sense.binder, BCS.U8),
-                ]
-            });
+            arguments: [txb.pure(creation.description, BCS.STRING), txb.pure([].slice.call(input.reverse()))],
         });
         creation?.variables?.forEach((v, k) => {
             if (v.type == OperatorType.TYPE_FUTURE_QUERY || v.type == ContextType.TYPE_CONTEXT_FUTURE_ID) {
@@ -206,6 +90,8 @@ export class Guard {
         [MODULES.repository, 'value', 9, [ValueType.TYPE_STATIC_address, ValueType.TYPE_STATIC_vec_u8], ValueType.TYPE_STATIC_vec_u8],
         [MODULES.repository, 'type', 10, [], ValueType.TYPE_STATIC_u8],
         [MODULES.repository, 'policy_mode', 11, [], ValueType.TYPE_STATIC_u8],
+        [MODULES.repository, 'reference_count', 12, [], ValueType.TYPE_STATIC_u64],
+        [MODULES.repository, 'has_reference', 13, [ValueType.TYPE_STATIC_address], ValueType.TYPE_STATIC_bool],
         [MODULES.machine, 'permission', 1, [], ValueType.TYPE_STATIC_address],
         [MODULES.machine, 'has_paused', 2, [], ValueType.TYPE_STATIC_bool],
         [MODULES.machine, 'has_published', 3, [], ValueType.TYPE_STATIC_bool],
@@ -324,7 +210,106 @@ export const graphql_query_objects = (protocol: Protocol, nodes:any) : Guard_Que
     })
     return ret
 } */
-export class SenseMaker {
+export class GuardVariableMaker {
+    static IsValidGuardVirableType = (type) => {
+        if (type == OperatorType.TYPE_FUTURE_QUERY || type == ContextType.TYPE_CONTEXT_FUTURE_ID || type == OperatorType.TYPE_QUERY_FROM_CONTEXT ||
+            type == ContextType.TYPE_CONTEXT_bool || type == ContextType.TYPE_CONTEXT_address || type == ContextType.TYPE_CONTEXT_u64 ||
+            type == ContextType.TYPE_CONTEXT_u8 || type == ContextType.TYPE_CONTEXT_vec_u8) {
+            return true;
+        }
+        ;
+        return false;
+    };
+    static IsValidIndentifier = (identifier) => {
+        if (!IsValidInt(identifier) || identifier > 255)
+            return false;
+        return true;
+    };
+    static get_variable_value(variables, identifier, type) {
+        if (variables.has(identifier)) {
+            let v = variables.get(identifier);
+            if (v?.value && v.type == type) {
+                return v.value;
+            }
+        }
+        return false;
+    }
+    static get_variable_witness(variables, identifier, type) {
+        if (variables.has(identifier)) {
+            let v = variables.get(identifier);
+            if (v?.witness && v.type == type) {
+                return v.witness;
+            }
+        }
+        return false;
+    }
+    static add_future_variable(variables, identifier, type, witness, value, bNeedSerialize = true) {
+        if (!GuardVariableMaker.IsValidIndentifier(identifier))
+            return false;
+        if (!GuardVariableMaker.IsValidGuardVirableType(type))
+            return false;
+        if (!witness && !value)
+            return false;
+        switch (type) {
+            case OperatorType.TYPE_FUTURE_QUERY:
+            case ContextType.TYPE_CONTEXT_FUTURE_ID:
+                if (variables.has(identifier)) {
+                    let v = variables.get(identifier);
+                    if (bNeedSerialize) {
+                        v.value = value ? Bcs.getInstance().ser_address(value) : undefined;
+                        v.witness = witness ? Bcs.getInstance().ser_address(witness) : undefined;
+                    }
+                    else {
+                        v.value = value ? value : undefined;
+                        v.witness = witness ? witness : undefined;
+                    }
+                }
+                else {
+                    if (bNeedSerialize) {
+                        variables.set(identifier, { type: type, value: value ? Bcs.getInstance().ser_address(value) : undefined, witness: witness ? Bcs.getInstance().ser_address(witness) : undefined });
+                    }
+                    else {
+                        variables.set(identifier, { type: type, value: value ? value : undefined, witness: witness ? witness : undefined });
+                    }
+                }
+                return true;
+        }
+        return false;
+    }
+    static add_variable(variables, identifier, type, value, bNeedSerialize = true) {
+        if (!GuardVariableMaker.IsValidIndentifier(identifier))
+            return false;
+        if (!GuardVariableMaker.IsValidGuardVirableType(type))
+            return false;
+        if (!value)
+            return false;
+        switch (type) {
+            case ContextType.TYPE_CONTEXT_bool:
+                bNeedSerialize ? variables.set(identifier, { type: type, value: Bcs.getInstance().ser_bool(value) }) :
+                    variables.set(identifier, { type: type, value: value });
+                return true;
+            case ContextType.TYPE_CONTEXT_address:
+            case OperatorType.TYPE_QUERY_FROM_CONTEXT:
+                bNeedSerialize ? variables.set(identifier, { type: type, value: Bcs.getInstance().ser_address(value) }) :
+                    variables.set(identifier, { type: type, value: value });
+                return true;
+            case ContextType.TYPE_CONTEXT_u64:
+                bNeedSerialize ? variables.set(identifier, { type: type, value: Bcs.getInstance().ser_u64(value) }) :
+                    variables.set(identifier, { type: type, value: value });
+                return true;
+            case ContextType.TYPE_CONTEXT_u8:
+                bNeedSerialize ? variables.set(identifier, { type: type, value: Bcs.getInstance().ser_u8(value) }) :
+                    variables.set(identifier, { type: type, value: value });
+                return true;
+            case ContextType.TYPE_CONTEXT_vec_u8:
+                bNeedSerialize ? variables.set(identifier, { type: type, value: Bcs.getInstance().ser_string(value) }) :
+                    variables.set(identifier, { type: type, value: value });
+                return true;
+        }
+        return false;
+    }
+}
+export class GuardInputMaker {
     data = [];
     type_validator = [];
     constructor() { }
@@ -333,46 +318,46 @@ export class SenseMaker {
         switch (type) {
             case ValueType.TYPE_STATIC_address:
                 if (!param)
-                    return false;
-                this.data.push(BCS_CONVERT.ser_u8(type));
-                this.data.push(BCS_CONVERT.ser_address(param));
+                    ERROR(Errors.InvalidParam, 'param');
+                this.data.push(Bcs.getInstance().ser_u8(type));
+                this.data.push(Bcs.getInstance().ser_address(param));
                 this.type_validator.push(type);
                 break;
             case ValueType.TYPE_STATIC_bool:
                 if (!param)
-                    return false;
-                this.data.push(BCS_CONVERT.ser_u8(type));
-                this.data.push(BCS_CONVERT.ser_bool(param));
+                    ERROR(Errors.InvalidParam, 'param');
+                this.data.push(Bcs.getInstance().ser_u8(type));
+                this.data.push(Bcs.getInstance().ser_bool(param));
                 this.type_validator.push(type);
                 break;
             case ValueType.TYPE_STATIC_u8:
                 if (!param)
-                    return false;
-                this.data.push(BCS_CONVERT.ser_u8(type));
-                this.data.push(BCS_CONVERT.ser_u8(param));
+                    ERROR(Errors.InvalidParam, 'param');
+                this.data.push(Bcs.getInstance().ser_u8(type));
+                this.data.push(Bcs.getInstance().ser_u8(param));
                 this.type_validator.push(type);
                 break;
             case ValueType.TYPE_STATIC_u64:
                 if (!param)
-                    return false;
-                this.data.push(BCS_CONVERT.ser_u8(type));
-                this.data.push(BCS_CONVERT.ser_u64(param));
+                    ERROR(Errors.InvalidParam, 'param');
+                this.data.push(Bcs.getInstance().ser_u8(type));
+                this.data.push(Bcs.getInstance().ser_u64(param));
                 this.type_validator.push(type);
                 break;
             case ValueType.TYPE_STATIC_vec_u8:
                 if (!param)
-                    return false;
-                this.data.push(BCS_CONVERT.ser_u8(type));
-                this.data.push(BCS_CONVERT.ser_string(param));
+                    ERROR(Errors.InvalidParam, 'param');
+                this.data.push(Bcs.getInstance().ser_u8(type));
+                this.data.push(Bcs.getInstance().ser_string(param));
                 this.type_validator.push(type);
                 // this.data[this.data.length-1].forEach((item : number) => console.log(item))
                 break;
             case ContextType.TYPE_CONTEXT_SIGNER:
-                this.data.push(BCS_CONVERT.ser_u8(type));
+                this.data.push(Bcs.getInstance().ser_u8(type));
                 this.type_validator.push(ValueType.TYPE_STATIC_address);
                 break;
             case ContextType.TYPE_CONTEXT_CLOCK:
-                this.data.push(BCS_CONVERT.ser_u8(type));
+                this.data.push(Bcs.getInstance().ser_u8(type));
                 this.type_validator.push(ValueType.TYPE_STATIC_u64);
                 break;
             case ContextType.TYPE_CONTEXT_bool:
@@ -381,16 +366,16 @@ export class SenseMaker {
             case ContextType.TYPE_CONTEXT_vec_u8:
             case ContextType.TYPE_CONTEXT_address:
             case ContextType.TYPE_CONTEXT_FUTURE_ID:
-                if (!variable || !param)
-                    return false;
-                if (typeof (param) != 'number')
-                    return false;
-                if (!IsValidInt(param) || param > 255)
-                    return false;
+                if (!variable || !param) {
+                    ERROR(Errors.InvalidParam, 'variable or param');
+                }
+                if (typeof (param) != 'number' || !IsValidInt(param) || param > 255) {
+                    ERROR(Errors.InvalidParam, 'param');
+                }
                 var v = variable.get(param);
                 if (v?.type == type) {
-                    this.data.push(BCS_CONVERT.ser_u8(type));
-                    this.data.push(BCS_CONVERT.ser_u8(param));
+                    this.data.push(Bcs.getInstance().ser_u8(type));
+                    this.data.push(Bcs.getInstance().ser_u8(param));
                     if (type == ContextType.TYPE_CONTEXT_bool) {
                         this.type_validator.push(ValueType.TYPE_STATIC_bool);
                     }
@@ -412,12 +397,11 @@ export class SenseMaker {
                     break;
                 }
                 ;
-                return false;
+                ERROR(Errors.InvalidParam, 'variable');
             default:
-                return false;
+                ERROR(Errors.InvalidParam, 'type');
         }
         ;
-        return true;
     }
     static query_index(module, query_name) {
         for (let i = 0; i < Guard.QUERIES.length; i++) {
@@ -428,105 +412,142 @@ export class SenseMaker {
         return -1;
     }
     add_future_query(identifier, module, query_name, variable) {
-        let query_index = SenseMaker.query_index(module, query_name);
-        if (!Guard.IsValidIndentifier(identifier) || query_index == -1)
-            return false;
-        if (module != MODULES.order && module != MODULES.progress)
-            return false;
-        if (!variable || variable.get(identifier)?.type != OperatorType.TYPE_FUTURE_QUERY)
-            return false;
+        let query_index = GuardInputMaker.query_index(module, query_name);
+        if (!GuardVariableMaker.IsValidIndentifier(identifier) || query_index == -1) {
+            ERROR(Errors.InvalidParam, 'identifier or query_name');
+        }
+        if (module != MODULES.order && module != MODULES.progress) {
+            ERROR(Errors.InvalidParam, 'module');
+        }
+        if (!variable || variable.get(identifier)?.type != OperatorType.TYPE_FUTURE_QUERY) {
+            ERROR(Errors.InvalidParam, 'variable');
+        }
         let offset = this.type_validator.length - Guard.QUERIES[query_index][3].length;
         if (offset < 0) {
-            return false;
+            ERROR(Errors.InvalidParam, 'query_name');
         }
         let types = this.type_validator.slice(offset);
         if (!array_equal(types, Guard.QUERIES[query_index][3])) { // type validate 
-            return false;
+            ERROR(Errors.Fail, 'array_equal');
         }
-        this.data.push(BCS_CONVERT.ser_u8(OperatorType.TYPE_FUTURE_QUERY)); // TYPE
-        this.data.push(BCS_CONVERT.ser_u8(identifier)); // variable identifier
-        this.data.push(BCS_CONVERT.ser_u8(Guard.QUERIES[query_index][2])); // cmd
+        this.data.push(Bcs.getInstance().ser_u8(OperatorType.TYPE_FUTURE_QUERY)); // TYPE
+        this.data.push(Bcs.getInstance().ser_u8(identifier)); // variable identifier
+        this.data.push(Bcs.getInstance().ser_u8(Guard.QUERIES[query_index][2])); // cmd
         this.type_validator.splice(offset, Guard.QUERIES[query_index][3].length); // delete type stack
         this.type_validator.push(Guard.QUERIES[query_index][4]); // add the return value type to type stack
         // console.log(this.type_validator)
-        return true;
     }
     // object_address_from: string for static address; number as identifier  for variable
     add_query(module, query_name, object_address_from) {
-        let query_index = SenseMaker.query_index(module, query_name); // query_index: index(from 0) of array Guard.QUERIES 
-        if (query_index == -1)
-            return false;
+        let query_index = GuardInputMaker.query_index(module, query_name); // query_index: index(from 0) of array Guard.QUERIES 
+        if (query_index == -1) {
+            ERROR(Errors.InvalidParam, 'query_name');
+        }
         if (typeof (object_address_from) == 'number') {
-            if (!Guard.IsValidIndentifier(object_address_from))
-                return false;
+            if (!GuardVariableMaker.IsValidIndentifier(object_address_from)) {
+                ERROR(Errors.InvalidParam, 'object_address_from');
+            }
         }
         else {
-            if (!IsValidAddress(object_address_from))
-                return false;
+            if (!IsValidAddress(object_address_from)) {
+                ERROR(Errors.InvalidParam, 'object_address_from');
+            }
         }
         let offset = this.type_validator.length - Guard.QUERIES[query_index][3].length;
         if (offset < 0) {
-            return false;
+            ERROR(Errors.InvalidParam, 'query_name');
         }
         let types = this.type_validator.slice(offset);
         if (!array_equal(types, Guard.QUERIES[query_index][3])) { // type validate 
-            return false;
+            ERROR(Errors.Fail, 'array_equal');
         }
         if (typeof (object_address_from) == 'string') {
-            this.data.push(BCS_CONVERT.ser_u8(OperatorType.TYPE_QUERY)); // TYPE
-            this.data.push(BCS_CONVERT.ser_address(object_address_from)); // object address            
+            this.data.push(Bcs.getInstance().ser_u8(OperatorType.TYPE_QUERY)); // TYPE
+            this.data.push(Bcs.getInstance().ser_address(object_address_from)); // object address            
         }
         else {
-            this.data.push(BCS_CONVERT.ser_u8(OperatorType.TYPE_QUERY_FROM_CONTEXT)); // TYPE
-            this.data.push(BCS_CONVERT.ser_u8(object_address_from)); // object identifer in variables
+            this.data.push(Bcs.getInstance().ser_u8(OperatorType.TYPE_QUERY_FROM_CONTEXT)); // TYPE
+            this.data.push(Bcs.getInstance().ser_u8(object_address_from)); // object identifer in variables
         }
-        this.data.push(BCS_CONVERT.ser_u8(Guard.QUERIES[query_index][2])); // cmd
+        this.data.push(Bcs.getInstance().ser_u8(Guard.QUERIES[query_index][2])); // cmd
         this.type_validator.splice(offset, Guard.QUERIES[query_index][3].length); // delete type stack
         this.type_validator.push(Guard.QUERIES[query_index][4]); // add the return value type to type stack
         // console.log(this.type_validator)
-        return true;
     }
     add_logic(type) {
+        let splice_len = 2;
         switch (type) {
             case OperatorType.TYPE_LOGIC_OPERATOR_U128_GREATER:
             case OperatorType.TYPE_LOGIC_OPERATOR_U128_GREATER_EQUAL:
             case OperatorType.TYPE_LOGIC_OPERATOR_U128_LESSER:
             case OperatorType.TYPE_LOGIC_OPERATOR_U128_LESSER_EQUAL:
             case OperatorType.TYPE_LOGIC_OPERATOR_U128_EQUAL:
-                if (this.type_validator.length < 2) {
-                    return false;
+                if (this.type_validator.length < splice_len) {
+                    ERROR(Errors.Fail, 'type_validator.length');
                 }
-                if (!SenseMaker.match_u128(this.type_validator[this.type_validator.length - 1])) {
-                    return false;
+                if (!GuardInputMaker.match_u128(this.type_validator[this.type_validator.length - 1])) {
+                    ERROR(Errors.Fail, 'type_validator check');
                 }
-                if (!SenseMaker.match_u128(this.type_validator[this.type_validator.length - 2])) {
-                    return false;
+                if (!GuardInputMaker.match_u128(this.type_validator[this.type_validator.length - 2])) {
+                    ERROR(Errors.Fail, 'type_validator check');
                 }
                 break;
             case OperatorType.TYPE_LOGIC_OPERATOR_EQUAL:
+                if (this.type_validator.length < splice_len) {
+                    ERROR(Errors.Fail, 'type_validator.length');
+                }
+                break;
             case OperatorType.TYPE_LOGIC_OPERATOR_HAS_SUBSTRING:
-                if (this.type_validator.length < 2) {
-                    return false;
+                if (this.type_validator.length < splice_len) {
+                    ERROR(Errors.Fail, 'type_validator.length');
+                }
+                break;
+            case OperatorType.TYPE_LOGIC_NOT:
+                splice_len = 1;
+                if (this.type_validator.length < splice_len) {
+                    ERROR(Errors.Fail, 'type_validator.length');
+                }
+                if (this.type_validator[this.type_validator.length - 1] != ValueType.TYPE_STATIC_bool) {
+                    ERROR(Errors.Fail, 'type_validator check');
+                }
+                break;
+            case OperatorType.TYPE_LOGIC_AND:
+            case OperatorType.TYPE_LOGIC_OR:
+                if (this.type_validator.length < splice_len) {
+                    ERROR(Errors.Fail, 'type_validator.length');
+                }
+                if (this.type_validator[this.type_validator.length - 1] != ValueType.TYPE_STATIC_bool) {
+                    ERROR(Errors.Fail, 'type_validator check');
+                }
+                if (this.type_validator[this.type_validator.length - 2] != ValueType.TYPE_STATIC_bool) {
+                    ERROR(Errors.Fail, 'type_validator check');
                 }
                 break;
             default:
-                return false;
+                ERROR(Errors.InvalidParam, 'type');
         }
-        this.data.push(BCS_CONVERT.ser_u8(type)); // TYPE     
-        this.type_validator.splice(this.type_validator.length - 2); // delete type stack   
+        this.data.push(Bcs.getInstance().ser_u8(type)); // TYPE     
+        this.type_validator.splice(this.type_validator.length - splice_len); // delete type stack   
         this.type_validator.push(ValueType.TYPE_STATIC_bool); // add bool to type stack
-        return true;
     }
-    make(bNotAfterSense = false, binder = Guard_Sense_Binder.AND) {
+    make(bNot = false) {
         //console.log(this.type_validator);
         //this.data.forEach((value:Uint8Array) => console.log(value));
         if (this.type_validator.length != 1 || this.type_validator[0] != ValueType.TYPE_STATIC_bool) {
             console.log(this.type_validator);
-            return false;
+            ERROR(Errors.Fail, 'type_validator check');
         } // ERROR
-        let input = concatenate(Uint8Array, ...this.data);
-        const sense = { input: input, notAfterSense: bNotAfterSense, binder: binder };
-        return sense;
+        if (bNot) {
+            this.add_logic(OperatorType.TYPE_LOGIC_NOT);
+        }
+        return concatenate(Uint8Array, ...this.data);
+    }
+    static combine(input1, input2, bAnd = true) {
+        let op = bAnd ? OperatorType.TYPE_LOGIC_AND : OperatorType.TYPE_LOGIC_OR;
+        return concatenate(Uint8Array, input1, input2, Bcs.getInstance().ser_u8(op));
+    }
+    static not(input) {
+        return concatenate(Uint8Array, input, Bcs.getInstance().ser_u8(OperatorType.TYPE_LOGIC_NOT));
     }
     static match_u128(type) {
         if (type == ValueType.TYPE_STATIC_u8 ||

package/dist/index.d.ts

@@ -10,4 +10,5 @@ export * from './protocol';
 export * from './passport';
 export * from './machine';
 export * from './service';
+export * from './graphql';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAe,YAAY,CAAA;AAC3B,cAAe,UAAU,CAAA;AACzB,cAAe,SAAS,CAAA;AACxB,cAAe,cAAc,CAAA;AAC7B,cAAe,SAAS,CAAA;AACxB,cAAe,cAAc,CAAA;AAC7B,cAAe,QAAQ,CAAA;AACvB,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAe,YAAY,CAAA;AAC3B,cAAe,UAAU,CAAA;AACzB,cAAe,SAAS,CAAA;AACxB,cAAe,cAAc,CAAA;AAC7B,cAAe,SAAS,CAAA;AACxB,cAAe,cAAc,CAAA;AAC7B,cAAe,QAAQ,CAAA;AACvB,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}

package/dist/index.js

@@ -10,3 +10,4 @@ export * from './protocol';
 export * from './passport';
 export * from './machine';
 export * from './service';
+export * from './graphql';

package/dist/machine.d.ts

@@ -2,23 +2,23 @@ import { type TransactionResult } from '@mysten/sui.js/transactions';
 import { Protocol, PermissionObject, RepositoryObject, PassportObject, MachineObject, MachineAddress, GuardObject, TxbObject } from './protocol';
 import { PermissionIndexType } from './permission';
 export type MachineNodeObject = TransactionResult | String;
-export type Machine_Forward = {
+export interface Machine_Forward {
     name: string;
     namedOperator?: string;
     permission?: PermissionIndexType;
     weight?: number;
     guard?: GuardObject;
-};
-export type Machine_Node_Pair = {
+}
+export interface Machine_Node_Pair {
     prior_node: string;
     forwards: Machine_Forward[];
     threshold?: number;
-};
-export type Machine_Node = {
+}
+export interface Machine_Node {
     name: string;
     description: string;
     pairs: Machine_Node_Pair[];
-};
+}
 export declare class Machine {
     protected protocol: Protocol;
     protected object: TxbObject;

package/dist/machine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../src/machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAE/F,OAAO,EAAE,QAAQ,EAAc,gBAAgB,EAAE,gBAAgB,EAAG,cAAc,EAAE,aAAa,EAAE,cAAc,EAAG,WAAW,EAAE,SAAS,EAAC,MAAM,YAAY,CAAC;AAG9J,OAAO,EAAc,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAI/D,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,GAAG,MAAM,CAAC;AAE3D,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,WAAW,CAAC;CACvB,CAAA;AACD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAA;AACD,MAAM,MAAM,YAAY,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC9B,CAAA;AAED,qBAAa,OAAO;IAChB,SAAS,CAAC,QAAQ,WAAC;IACnB,SAAS,CAAC,MAAM,EAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,UAAU,mBAAC;IAErB,UAAU;IAEV,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAC,QAAQ,EAAE,UAAU,EAAC,gBAAgB,EAAE,MAAM,EAAC,SAAS,GAAI,OAAO;IAMvF,OAAO;IAKP,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAC,QAAQ,EAAE,UAAU,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAC,cAAc,GAAI,OAAO;IA8BpI,QAAQ,CAAC,KAAK,EAAC,YAAY,EAAE,EAAE,QAAQ,CAAC,EAAC,cAAc;IA2DvD,SAAS,CAAC,KAAK,EAAC,iBAAiB,EAAE,EAAE,QAAQ,CAAC,EAAC,cAAc;IAyB7D,WAAW,CAAC,UAAU,EAAC,MAAM,EAAE,EAAE,eAAe,GAAC,OAAe,EAAE,QAAQ,CAAC,EAAC,cAAc;IAoB1F,OAAO;IAQP,MAAM,IAAK,cAAc;IAQzB,eAAe,CAAC,WAAW,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAC,cAAc;IAkB5D,cAAc,CAAC,UAAU,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAC,cAAc;IAepE,iBAAiB,CAAC,YAAY,EAAC,MAAM,EAAE,EAAE,SAAS,CAAC,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAC,cAAc;IAsCrF,KAAK,CAAC,QAAQ,CAAC,EAAC,cAAc,GAAI,aAAa;IAe/C,YAAY,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAC,cAAc;IAoBvD,KAAK,CAAC,OAAO,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAC,cAAc;IAc/C,OAAO,CAAC,QAAQ,CAAC,EAAC,cAAc;IAgBhC,iBAAiB,CAAC,cAAc,EAAC,gBAAgB;IAcjD,MAAM,CAAC,iBAAiB,SAAM;IAC9B,MAAM,CAAC,oBAAoB,SAAiB;CAC/C"}
+{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../src/machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAE/F,OAAO,EAAE,QAAQ,EAAc,gBAAgB,EAAE,gBAAgB,EAAG,cAAc,EAAE,aAAa,EAAE,cAAc,EAAG,WAAW,EAAE,SAAS,EAAC,MAAM,YAAY,CAAC;AAG9J,OAAO,EAAc,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAI/D,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,GAAG,MAAM,CAAC;AAE3D,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,WAAW,CAAC;CACvB;AACD,MAAM,WAAW,iBAAiB;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AACD,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED,qBAAa,OAAO;IAChB,SAAS,CAAC,QAAQ,WAAC;IACnB,SAAS,CAAC,MAAM,EAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,UAAU,mBAAC;IAErB,UAAU;IAEV,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAC,QAAQ,EAAE,UAAU,EAAC,gBAAgB,EAAE,MAAM,EAAC,SAAS,GAAI,OAAO;IAMvF,OAAO;IAKP,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAC,QAAQ,EAAE,UAAU,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAC,cAAc,GAAI,OAAO;IA8BpI,QAAQ,CAAC,KAAK,EAAC,YAAY,EAAE,EAAE,QAAQ,CAAC,EAAC,cAAc;IA2DvD,SAAS,CAAC,KAAK,EAAC,iBAAiB,EAAE,EAAE,QAAQ,CAAC,EAAC,cAAc;IAyB7D,WAAW,CAAC,UAAU,EAAC,MAAM,EAAE,EAAE,eAAe,GAAC,OAAe,EAAE,QAAQ,CAAC,EAAC,cAAc;IAoB1F,OAAO;IAQP,MAAM,IAAK,cAAc;IAQzB,eAAe,CAAC,WAAW,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAC,cAAc;IAkB5D,cAAc,CAAC,UAAU,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAC,cAAc;IAepE,iBAAiB,CAAC,YAAY,EAAC,MAAM,EAAE,EAAE,SAAS,CAAC,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAC,cAAc;IAsCrF,KAAK,CAAC,QAAQ,CAAC,EAAC,cAAc,GAAI,aAAa;IAe/C,YAAY,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAC,cAAc;IAoBvD,KAAK,CAAC,OAAO,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAC,cAAc;IAc/C,OAAO,CAAC,QAAQ,CAAC,EAAC,cAAc;IAgBhC,iBAAiB,CAAC,cAAc,EAAC,gBAAgB;IAcjD,MAAM,CAAC,iBAAiB,SAAM;IAC9B,MAAM,CAAC,oBAAoB,SAAiB;CAC/C"}