wowok 1.0.3 → 1.0.4

package/dist/machine.js

@@ -1,172 +1,222 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.change_permission = exports.machine_publish = exports.machine_pause = exports.machine_set_endpoint = exports.machine_clone = exports.machine_remove_repository = exports.machine_add_repository = exports.machine_set_description = exports.launch = exports.destroy = exports.machine = exports.machine_remove_node = exports.machine_add_node2 = exports.machine_add_node = exports.is_valid_name = exports.INITIAL_NODE_NAME = void 0;
-const bcs_1 = require("@mysten/bcs");
+exports.change_permission = exports.machine_publish = exports.machine_pause = exports.machine_set_endpoint = exports.machine_clone = exports.machine_remove_repository = exports.machine_add_repository = exports.machine_set_description = exports.launch = exports.destroy = exports.machine = exports.machine_remove_node = exports.machine_add_node2 = exports.machine_add_node = exports.INITIAL_NODE_NAME = void 0;
 const protocol_1 = require("./protocol");
 const util_1 = require("./util");
+const permission_1 = require("./permission");
 exports.INITIAL_NODE_NAME = '';
-// node & forward & forward permission string length validation
-function is_valid_name(name) { return name.length > 0 && name.length < 33; }
-exports.is_valid_name = is_valid_name;
 // 创建新的node加入到machine
 function machine_add_node(txb, machine, permission, nodes, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission]))
+        return false;
+    let bValid = true;
+    nodes.forEach((node) => {
+        if (!(0, protocol_1.IsValidDesription)(node.description) || !(0, protocol_1.IsValidName)(node.name)) {
+            bValid = false;
+        }
+        node.pairs.forEach((p) => {
+            if (!(0, protocol_1.IsValidName_AllowEmpty)(p.prior_node)) {
+                bValid = false;
+            }
+            if (p?.threshold && !(0, protocol_1.IsValidInt)(p.threshold)) {
+                bValid = false;
+            }
+            p.forwards.forEach((f) => {
+                if (!(0, protocol_1.IsValidName)(f.name)) {
+                    bValid = false;
+                }
+                if (f?.namedOperator && !(0, protocol_1.IsValidName_AllowEmpty)(f?.namedOperator)) {
+                    bValid = false;
+                }
+                if (f?.permission && !(0, permission_1.IsValidPermissionIndex)(f?.permission)) {
+                    bValid = false;
+                }
+                if (!f?.permission && !f?.namedOperator) {
+                    bValid = false;
+                }
+                if (f?.weight && !(0, protocol_1.IsValidUint)(f.weight)) {
+                    bValid = false;
+                }
+            });
+        });
+    });
+    if (!bValid)
+        return false;
     let new_nodes = [];
     nodes.forEach((node) => {
         let n = txb.moveCall({
             target: protocol_1.PROTOCOL.NodeFn('new'),
-            arguments: [txb.pure((0, protocol_1.name_data)(node.name)), txb.pure((0, protocol_1.description_data)(node.description))]
+            arguments: [txb.pure(node.name), txb.pure(node.description)]
         });
         node.pairs.forEach((pair) => {
+            let threshold = pair?.threshold ? txb.pure(util_1.BCS_CONVERT.ser_option_u64(pair.threshold)) : (0, protocol_1.OptionNone)(txb);
             pair.forwards.forEach((forward) => {
-                if (!forward?.namedOperator && !forward?.permission) {
-                    return;
-                }
-                let weight = txb.pure(1);
-                if (forward?.weight && forward.weight > 0) {
-                    weight = txb.pure(forward.weight);
-                }
-                let per = txb.pure([], bcs_1.BCS.U8);
-                if (forward?.permission) {
-                    per = txb.pure(util_1.BCS_CONVERT.ser_option_u64(forward.permission));
-                }
-                ;
-                let namedOperator = txb.pure('');
-                if (forward?.namedOperator) {
-                    namedOperator = txb.pure(forward.namedOperator);
-                }
-                ;
+                let weight = forward?.weight ? forward.weight : 1;
+                let perm = forward?.permission ? txb.pure(util_1.BCS_CONVERT.ser_option_u64(forward.permission)) : (0, protocol_1.OptionNone)(txb);
+                let namedOperator = forward?.namedOperator ? txb.pure(forward.namedOperator) : txb.pure('');
                 let f;
-                if (forward?.guard_address) {
+                if (forward?.guard) {
                     f = txb.moveCall({
                         target: protocol_1.PROTOCOL.NodeFn('forward'),
-                        arguments: [namedOperator, weight, txb.object(forward.guard_address), per]
+                        arguments: [namedOperator, txb.pure(weight), txb.object((0, protocol_1.TXB_OBJECT)(txb, forward.guard)), perm]
                     });
                 }
                 else {
                     f = txb.moveCall({
                         target: protocol_1.PROTOCOL.NodeFn('forward2'),
-                        arguments: [namedOperator, weight, per]
+                        arguments: [namedOperator, txb.pure(weight), perm]
                     });
                 }
                 txb.moveCall({
                     target: protocol_1.PROTOCOL.NodeFn('forward_add'),
-                    arguments: [n, txb.pure(pair.prior_node), txb.pure((0, protocol_1.name_data)(forward.name)),
-                        txb.pure(util_1.BCS_CONVERT.ser_option_u64(pair.threshold)), f]
+                    arguments: [n, txb.pure(pair.prior_node), txb.pure(forward.name), threshold, f]
                 });
             });
         });
         new_nodes.push(n);
     });
-    machine_add_node2(txb, machine, permission, new_nodes, passport);
+    return machine_add_node2(txb, machine, permission, new_nodes, passport);
 }
 exports.machine_add_node = machine_add_node;
 // 把个人拥有的node加入到machine
 function machine_add_node2(txb, machine, permission, nodes, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission]))
+        return false;
+    if (!nodes)
+        return false;
     if (passport) {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('node_add_with_passport'),
-            arguments: [passport, machine, txb.makeMoveVec({ objects: nodes }), permission]
+            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), txb.makeMoveVec({ objects: nodes }), (0, protocol_1.TXB_OBJECT)(txb, permission)]
         });
     }
     else {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('node_add'),
-            arguments: [machine, txb.makeMoveVec({ objects: nodes }), permission]
+            arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), txb.makeMoveVec({ objects: nodes }), (0, protocol_1.TXB_OBJECT)(txb, permission)]
         });
     }
+    return true;
 }
 exports.machine_add_node2 = machine_add_node2;
 // 从machine把node移动到个人地址
-function machine_remove_node(txb, machine, permission, nodes_name, receive_address, passport) {
+function machine_remove_node(txb, machine, permission, nodes_name, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission]))
+        return false;
+    if (!nodes_name || !(0, protocol_1.IsValidArray)(nodes_name, protocol_1.IsValidName))
+        return false;
     if (passport) {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('node_remove_with_passport'),
-            arguments: [passport, machine, txb.pure(util_1.BCS_CONVERT.ser_vector_string(nodes_name)), permission],
+            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), txb.pure(util_1.BCS_CONVERT.ser_vector_string(nodes_name)), permission],
         });
     }
     else {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('node_remove'),
-            arguments: [machine, txb.pure(util_1.BCS_CONVERT.ser_vector_string(nodes_name)), permission],
+            arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), txb.pure(util_1.BCS_CONVERT.ser_vector_string(nodes_name)), permission],
         });
     }
+    return true;
 }
 exports.machine_remove_node = machine_remove_node;
-function machine(txb, permission, description, endpoint_url, passport) {
-    if (endpoint_url && endpoint_url.length > protocol_1.MAX_ENDPOINT_LENGTH)
-        return undefined;
-    let endpoint = endpoint_url ? txb.pure(util_1.BCS_CONVERT.ser_option_string(endpoint_url)) : txb.pure([], bcs_1.BCS.U8);
+function machine(txb, permission, description, endpoint, passport) {
+    if (!(0, protocol_1.IsValidObjects)([permission]))
+        return false;
+    if ((0, protocol_1.IsValidDesription)(description))
+        return false;
+    if (endpoint && !(0, protocol_1.IsValidEndpoint)(endpoint))
+        return false;
+    let ep = endpoint ? txb.pure(util_1.BCS_CONVERT.ser_option_string(endpoint)) : (0, protocol_1.OptionNone)(txb);
     if (passport) {
         return txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('new_with_passport'),
-            arguments: [passport, txb.pure((0, protocol_1.description_data)(description)), endpoint, permission],
+            arguments: [passport, txb.pure(description), ep, (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
     else {
-        //console.log(endpoint)
         return txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('new'),
-            arguments: [txb.pure((0, protocol_1.description_data)(description)), endpoint, permission],
+            arguments: [txb.pure(description), ep, (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
 }
 exports.machine = machine;
 function destroy(txb, machine) {
-    return txb.moveCall({
+    if (!(0, protocol_1.IsValidObjects)([machine]))
+        return false;
+    txb.moveCall({
         target: protocol_1.PROTOCOL.MachineFn('destroy'),
-        arguments: [machine],
+        arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine)],
     });
+    return true;
 }
 exports.destroy = destroy;
 function launch(txb, machine) {
+    if (!(0, protocol_1.IsValidObjects)([machine]))
+        return false;
     return txb.moveCall({
         target: protocol_1.PROTOCOL.MachineFn('create'),
-        arguments: [machine],
+        arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine)],
     });
 }
 exports.launch = launch;
 function machine_set_description(txb, machine, permission, description, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission]))
+        return false;
+    if (!(0, protocol_1.IsValidDesription)(description))
+        return false;
     if (passport) {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('description_set_with_passport'),
-            arguments: [passport, machine, txb.pure((0, protocol_1.description_data)(description)), permission],
+            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), txb.pure(description), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
     else {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('description_set'),
-            arguments: [machine, txb.pure((0, protocol_1.description_data)(description)), permission],
+            arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), txb.pure(description), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
+    return true;
 }
 exports.machine_set_description = machine_set_description;
 function machine_add_repository(txb, machine, permission, repository, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission, repository]))
+        return false;
     if (passport) {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('repository_add_with_passport'),
-            arguments: [passport, machine, repository, permission],
+            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), (0, protocol_1.TXB_OBJECT)(txb, repository), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
     else {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('repository_add'),
-            arguments: [machine, repository, permission],
+            arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), (0, protocol_1.TXB_OBJECT)(txb, repository), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
+    return true;
 }
 exports.machine_add_repository = machine_add_repository;
 function machine_remove_repository(txb, machine, permission, repositories, removeall, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission]))
+        return false;
+    if (!removeall && !repositories)
+        return false;
+    if (!(0, protocol_1.IsValidArray)(repositories, protocol_1.IsValidAddress))
+        return false;
     if (passport) {
         if (removeall) {
             txb.moveCall({
                 target: protocol_1.PROTOCOL.MachineFn('repository_remove_all_with_passport'),
-                arguments: [passport, machine, permission],
+                arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), (0, protocol_1.TXB_OBJECT)(txb, machine)],
             });
         }
         else {
             txb.moveCall({
                 target: protocol_1.PROTOCOL.MachineFn('repository_remove_with_passport'),
-                arguments: [passport, machine, txb.pure(repositories, 'vector<address>'), permission],
+                arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), txb.pure(repositories, 'vector<address>'), (0, protocol_1.TXB_OBJECT)(txb, permission)],
             });
         }
     }
@@ -174,86 +224,101 @@ function machine_remove_repository(txb, machine, permission, repositories, remov
         if (removeall) {
             txb.moveCall({
                 target: protocol_1.PROTOCOL.MachineFn('repository_remove_all'),
-                arguments: [machine, permission],
+                arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), (0, protocol_1.TXB_OBJECT)(txb, permission)],
             });
         }
         else {
             txb.moveCall({
                 target: protocol_1.PROTOCOL.MachineFn('repository_remove'),
-                arguments: [machine, txb.pure(repositories, 'vector<address>'), permission],
+                arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), txb.pure(repositories, 'vector<address>'), (0, protocol_1.TXB_OBJECT)(txb, permission)],
             });
         }
     }
+    return true;
 }
 exports.machine_remove_repository = machine_remove_repository;
 function machine_clone(txb, machine, permission, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission]))
+        return false;
     if (passport) {
         return txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('clone_with_passport'),
-            arguments: [passport, machine, permission],
+            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
     else {
         return txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('clone'),
-            arguments: [machine, permission],
+            arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
 }
 exports.machine_clone = machine_clone;
-function machine_set_endpoint(txb, machine, permission, endpoint_url, passport) {
-    if (endpoint_url && endpoint_url.length > protocol_1.MAX_ENDPOINT_LENGTH)
-        return undefined;
-    let endpoint = endpoint_url ? txb.pure(util_1.BCS_CONVERT.ser_option_string(endpoint_url)) : txb.pure([], bcs_1.BCS.U8);
+function machine_set_endpoint(txb, machine, permission, endpoint, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission]))
+        return false;
+    if (endpoint && !(0, protocol_1.IsValidEndpoint)(endpoint))
+        return false;
+    let ep = endpoint ? txb.pure(util_1.BCS_CONVERT.ser_option_string(endpoint)) : (0, protocol_1.OptionNone)(txb);
     if (passport) {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('endpoint_set_with_passport'),
-            arguments: [passport, machine, endpoint, permission],
+            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), ep, (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
     else {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('endpoint_set'),
-            arguments: [machine, endpoint, permission],
+            arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), ep, (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
+    return true;
 }
 exports.machine_set_endpoint = machine_set_endpoint;
 function machine_pause(txb, machine, permission, bPaused, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission]))
+        return false;
     if (passport) {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('pause_with_passport'),
-            arguments: [passport, machine, txb.pure(bPaused), permission],
+            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), txb.pure(bPaused), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
     else {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('pause'),
-            arguments: [machine, txb.pure(bPaused), permission],
+            arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), txb.pure(bPaused), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
+    return true;
 }
 exports.machine_pause = machine_pause;
 function machine_publish(txb, machine, permission, passport) {
+    if (!(0, protocol_1.IsValidObjects)([machine, permission]))
+        return false;
     if (passport) {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('publish_with_passport'),
-            arguments: [passport, machine, permission],
+            arguments: [passport, (0, protocol_1.TXB_OBJECT)(txb, machine), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
     else {
         txb.moveCall({
             target: protocol_1.PROTOCOL.MachineFn('publish'),
-            arguments: [machine, permission],
+            arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), (0, protocol_1.TXB_OBJECT)(txb, permission)],
         });
     }
+    return true;
 }
 exports.machine_publish = machine_publish;
 function change_permission(txb, machine, old_permission, new_permission) {
+    if (!(0, protocol_1.IsValidObjects)([machine, old_permission, new_permission]))
+        return false;
     txb.moveCall({
         target: protocol_1.PROTOCOL.MachineFn('permission_set'),
-        arguments: [machine, old_permission, new_permission],
+        arguments: [(0, protocol_1.TXB_OBJECT)(txb, machine), (0, protocol_1.TXB_OBJECT)(txb, old_permission), (0, protocol_1.TXB_OBJECT)(txb, new_permission)],
         typeArguments: []
     });
+    return true;
 }
 exports.change_permission = change_permission;

package/dist/passport.js

@@ -1,12 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.query_cmd_fn = exports.destroy = exports.verify = exports.passport_quries = exports.MAX_GUARD_COUNT = void 0;
+exports.query_cmd_fn = exports.destroy = exports.verify = exports.passport_queries = exports.MAX_GUARD_COUNT = void 0;
 const transactions_1 = require("@mysten/sui.js/transactions");
 const protocol_1 = require("./protocol");
 const util_1 = require("./util");
 const guard_1 = require("./guard");
-exports.MAX_GUARD_COUNT = 4;
-const passport_quries = async (guards) => {
+exports.MAX_GUARD_COUNT = 8;
+// passport verify for some guards, MUST be in ONE pxb:
+// 0. construct Guard_Query_Objects(passport_quries) from queries for guards of objects
+// 1. create passport
+// 2. add all guards
+// 3. verify passport
+// 4. ops using passport(guard set on object)
+// 5. ops using passport(guard set on object)
+// 6. destroy passport
+const passport_queries = async (guards) => {
     let sense_objects = guards.map((value) => {
         return { objectid: value, callback: guard_1.sense_objects_fn, data: [] };
     });
@@ -25,11 +33,11 @@ const passport_quries = async (guards) => {
         return value.data;
     });
 };
-exports.passport_quries = passport_quries;
+exports.passport_queries = passport_queries;
 // return passport object for using
 function verify(txb, passport_queries) {
     if (passport_queries.length == 0 || passport_queries.length > exports.MAX_GUARD_COUNT) {
-        return undefined;
+        return false;
     }
     let guard_ids = passport_queries.map((value) => value.id);
     var passport = txb.moveCall({
@@ -67,6 +75,7 @@ function destroy(txb, passport) {
         target: protocol_1.PROTOCOL.PassportFn('destroy'),
         arguments: [passport]
     });
+    return true;
 }
 exports.destroy = destroy;
 // construct Guard_Query_Object of wowok objects for passport verify