wowok 2.1.13 → 2.1.16

package/dist/cjs/w/call/demand.js

@@ -1,34 +1,18 @@
-"use strict";
 // Copyright (c) Wowok.
 // SPDX-License-Identifier: Apache-2.0
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_FEEDBACK_COUNT = exports.MAX_GUARD_COUNT = exports.MAX_REWARD_COUNT = exports.CallDemand = void 0;
-exports.create = create;
-exports.present = present;
-exports.newDemand = newDemand;
-exports.description_set = description_set;
-exports.location_set = location_set;
-exports.guard_add = guard_add;
-exports.guard_remove = guard_remove;
-exports.guard_clear = guard_clear;
-exports.reward_add = reward_add;
-exports.reward_remove = reward_remove;
-exports.reward_clear = reward_clear;
-exports.feedback = feedback;
-exports.um_set = um_set;
-const sui_types_js_1 = require("../../utils/sui-types.js");
-const common_js_1 = require("../common.js");
-const exception_js_1 = require("../exception.js");
-const index_js_1 = require("../local/index.js");
-const local_js_1 = require("../local/local.js");
-const object_js_1 = require("../query/object.js");
-const received_js_1 = require("../query/received.js");
-const util_js_1 = require("../query/util.js");
-const util_js_2 = require("../util.js");
-const base_js_1 = require("./base.js");
-const permission_js_1 = require("./permission.js");
-const permission_js_2 = require("./permission.js");
-class CallDemand extends base_js_1.CallBase {
+import { isValidWowAddress } from "../../utils/sui-types.js";
+import { toTxObject, toTxString, isValidDescription, MAX_DESCRIPTION_LENGTH, isValidLongName, PackageAddress, IsValidArgType, MAX_LONG_NAME_LENGTH, isValidU8, GetObjectExisted, GetObject, GetObjectDescription, ValueType, parseValueType, demandFn, } from "../common.js";
+import { W_ERROR, WErrors } from "../exception.js";
+import { GetAccountOrMark_Address } from "../local/index.js";
+import { LocalMark } from "../local/local.js";
+import { ObjectType } from "../query/object.js";
+import { query_received } from "../query/received.js";
+import { queryObjectsWithType, queryObjectWithType } from "../query/util.js";
+import { owner_receive, validObjects } from "../util.js";
+import { CallBase } from "./base.js";
+import { BuiltinPermissionIndex, newPermission } from "./permission.js";
+import { create as permissionCreate } from "./permission.js";
+export class CallDemand extends CallBase {
     data;
     object_address = undefined;
     permission_address = undefined;
@@ -40,18 +24,18 @@ class CallDemand extends base_js_1.CallBase {
     async prepare(env) {
         await super.prepare(env);
         if (!this.object_address) {
-            this.object_address = await (0, common_js_1.GetObjectExisted)(this.data?.object);
+            this.object_address = await GetObjectExisted(this.data?.object);
         }
         if (this.object_address) {
-            await this.update_content(env, object_js_1.ObjectType.Demand, this.object_address);
+            await this.update_content(env, ObjectType.Demand, this.object_address);
             if (!this.content)
-                (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, "CallDemand_Data.data.object:" + this.object_address);
+                W_ERROR(WErrors.InvalidParam, "CallDemand_Data.data.object:" + this.object_address);
             this.permission_address = this.content.permission;
         }
         else {
-            const n = (0, common_js_1.GetObject)(this.data.object);
-            this.permission_address = await (0, common_js_1.GetObjectExisted)(n?.permission);
-            this.new_permission_description = (0, common_js_1.GetObjectDescription)(n?.permission);
+            const n = GetObject(this.data.object);
+            this.permission_address = await GetObjectExisted(n?.permission);
+            this.new_permission_description = GetObjectDescription(n?.permission);
         }
     }
     async call(env) {
@@ -64,50 +48,50 @@ class CallDemand extends base_js_1.CallBase {
             }
         };
         if (this.permission_address && !this.object_address) {
-            add_perm(permission_js_1.BuiltinPermissionIndex.DEMAND_NEW);
+            add_perm(BuiltinPermissionIndex.DEMAND_NEW);
         }
         if (this.data.present?.by_guard != null) {
             if (!this.content) {
-                (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, "CallDemand_Data.data.present.by_guard fail because the Demand content not ready");
+                W_ERROR(WErrors.InvalidParam, "CallDemand_Data.data.present.by_guard fail because the Demand content not ready");
             }
-            this.data.present.by_guard = await local_js_1.LocalMark.Instance().get_address(this.data.present.by_guard);
+            this.data.present.by_guard = await LocalMark.Instance().get_address(this.data.present.by_guard);
             if (this.data.present.by_guard) {
                 const f = this.content?.guards.find((v) => v.guard === this.data.present.by_guard);
                 if (f) {
                     guards.push(this.data.present.by_guard);
                 }
                 else {
-                    (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `guard ${this.data.present.by_guard} not found in guards: ${this.content.guards.map((v) => v.guard)}`);
+                    W_ERROR(WErrors.InvalidParam, `guard ${this.data.present.by_guard} not found in guards: ${this.content.guards.map((v) => v.guard)}`);
                 }
             }
             else if (this.content &&
                 this.content.guards.length > 0) {
                 // 一定要提供guard！
-                (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `guard is required when present guards ${this.content.guards.map((v) => v.guard)} is not empty`);
+                W_ERROR(WErrors.InvalidParam, `guard is required when present guards ${this.content.guards.map((v) => v.guard)} is not empty`);
             }
         }
         if (this.permission_address &&
             this.data?.description != null &&
             this.object_address) {
-            add_perm(permission_js_1.BuiltinPermissionIndex.DEMAND_DESCRIPTION);
+            add_perm(BuiltinPermissionIndex.DEMAND_DESCRIPTION);
         }
         if (this.permission_address && this.data?.location != null) {
-            add_perm(permission_js_1.BuiltinPermissionIndex.DEMAND_LOCATION);
+            add_perm(BuiltinPermissionIndex.DEMAND_LOCATION);
         }
         if (this.permission_address && this.data?.rewards != null) {
-            add_perm(permission_js_1.BuiltinPermissionIndex.DEMAND_REWARD);
+            add_perm(BuiltinPermissionIndex.DEMAND_REWARD);
         }
         if (this.permission_address && this.data?.feedback != null) {
-            add_perm(permission_js_1.BuiltinPermissionIndex.DEMAND_FEEDBACK);
+            add_perm(BuiltinPermissionIndex.DEMAND_FEEDBACK);
         }
         if (this.permission_address && this.data?.guards != null) {
-            add_perm(permission_js_1.BuiltinPermissionIndex.DEMAND_GUARD);
+            add_perm(BuiltinPermissionIndex.DEMAND_GUARD);
         }
         if (this.permission_address && this.data?.owner_receive != null) {
-            add_perm(permission_js_1.BuiltinPermissionIndex.DEMAND_OWNER_RECEIVE);
+            add_perm(BuiltinPermissionIndex.DEMAND_OWNER_RECEIVE);
         }
         if (this.permission_address && this.data.um !== undefined) {
-            add_perm(permission_js_1.BuiltinPermissionIndex.DEMAND_UM);
+            add_perm(BuiltinPermissionIndex.DEMAND_UM);
         }
         if (this.permission_address || guards.length > 0) {
             return await this.check_permission_and_call(env, this.permission_address, perms, guards);
@@ -119,14 +103,14 @@ class CallDemand extends base_js_1.CallBase {
         let object = this.object_address;
         if (!this.object_address) {
             if (!permission) {
-                permission = (0, permission_js_1.newPermission)(tx, this.new_permission_description ?? "");
+                permission = newPermission(tx, this.new_permission_description ?? "");
             }
             if (permission) {
-                object = newDemand(tx, (0, common_js_1.toTxObject)(tx, permission), this.data?.description ?? "", passport);
+                object = newDemand(tx, toTxObject(tx, permission), this.data?.description ?? "", passport);
             }
         }
         if (!object || !permission) {
-            (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, "CallDemand_Data.data.object:" + this.object_address);
+            W_ERROR(WErrors.InvalidParam, "CallDemand_Data.data.object:" + this.object_address);
         }
         if (this.data.present != null && this.content) {
             // 处理submission验证
@@ -139,16 +123,16 @@ class CallDemand extends base_js_1.CallBase {
                         Number(f.service_identifier));
                     //console.dir(sub);
                     const subValueType = sub
-                        ? (0, common_js_1.parseValueType)(sub.value_type)
+                        ? parseValueType(sub.value_type)
                         : undefined;
                     if (sub &&
-                        subValueType === common_js_1.ValueType.Address &&
+                        subValueType === ValueType.Address &&
                         sub.value &&
-                        (0, sui_types_js_1.isValidWowAddress)(sub.value)) {
+                        isValidWowAddress(sub.value)) {
                         this.data.present.service = undefined; // 使用submission无需指定service
                     }
                     else {
-                        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `submission ${f.service_identifier} invalid in the guard ${this.data.present.by_guard}`);
+                        W_ERROR(WErrors.InvalidParam, `submission ${f.service_identifier} invalid in the guard ${this.data.present.by_guard}`);
                     }
                 }
             }
@@ -157,13 +141,13 @@ class CallDemand extends base_js_1.CallBase {
             let serviceType = undefined;
             if (typeof this.data.present.service === "string" &&
                 this.data.present.service) {
-                const serviceResult = await (0, util_js_1.queryObjectWithType)(env, this.data.present.service, object_js_1.ObjectType.Service, "service::Service");
+                const serviceResult = await queryObjectWithType(env, this.data.present.service, ObjectType.Service, "service::Service");
                 if (serviceResult) {
                     serviceObject = serviceResult.object;
                     serviceType = serviceResult.type;
                 }
                 else {
-                    (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `service ${this.data.present.service} not found`);
+                    W_ERROR(WErrors.InvalidParam, `service ${this.data.present.service} not found`);
                 }
             }
             // 调用present函数
@@ -179,8 +163,8 @@ class CallDemand extends base_js_1.CallBase {
             switch (this.data?.rewards.op) {
                 case "set":
                 case "add": {
-                    if (this.data.rewards.objects.length > exports.MAX_REWARD_COUNT) {
-                        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `rewards count exceeds maximum limit ${exports.MAX_REWARD_COUNT}`);
+                    if (this.data.rewards.objects.length > MAX_REWARD_COUNT) {
+                        W_ERROR(WErrors.InvalidParam, `rewards count exceeds maximum limit ${MAX_REWARD_COUNT}`);
                     }
                     if (this.data.rewards.op === "set") {
                         reward_clear(tx, object, permission, passport);
@@ -188,7 +172,7 @@ class CallDemand extends base_js_1.CallBase {
                     // 批量查询string类型的reward
                     let rewardResults = [];
                     if (this.data.rewards.objects.length > 0) {
-                        rewardResults = await (0, util_js_1.queryObjectsWithType)(env, this.data.rewards.objects, object_js_1.ObjectType.Reward, "reward::Reward");
+                        rewardResults = await queryObjectsWithType(env, this.data.rewards.objects, ObjectType.Reward, "reward::Reward");
                     }
                     // 处理查询结果
                     rewardResults.forEach((rewardResult) => {
@@ -197,10 +181,10 @@ class CallDemand extends base_js_1.CallBase {
                     break;
                 }
                 case "remove": {
-                    if (this.data.rewards.objects.length > exports.MAX_REWARD_COUNT) {
-                        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `rewards count exceeds maximum limit ${exports.MAX_REWARD_COUNT}`);
+                    if (this.data.rewards.objects.length > MAX_REWARD_COUNT) {
+                        W_ERROR(WErrors.InvalidParam, `rewards count exceeds maximum limit ${MAX_REWARD_COUNT}`);
                     }
-                    const rewardAddrs = await local_js_1.LocalMark.Instance().get_many_address_availables(this.data.rewards.objects);
+                    const rewardAddrs = await LocalMark.Instance().get_many_address_availables(this.data.rewards.objects);
                     reward_remove(tx, object, permission, rewardAddrs, passport);
                     break;
                 }
@@ -211,11 +195,11 @@ class CallDemand extends base_js_1.CallBase {
             }
         }
         if (this.data?.feedback != null) {
-            if (this.data.feedback.length > exports.MAX_FEEDBACK_COUNT) {
-                (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `feedback count exceeds maximum limit ${exports.MAX_FEEDBACK_COUNT}`);
+            if (this.data.feedback.length > MAX_FEEDBACK_COUNT) {
+                W_ERROR(WErrors.InvalidParam, `feedback count exceeds maximum limit ${MAX_FEEDBACK_COUNT}`);
             }
             for (const v of this.data.feedback) {
-                const who = await (0, index_js_1.GetAccountOrMark_Address)(v.who);
+                const who = await GetAccountOrMark_Address(v.who);
                 if (who) {
                     feedback(tx, object, permission, who, v.acceptance_score, v.feedback, passport);
                 }
@@ -225,14 +209,14 @@ class CallDemand extends base_js_1.CallBase {
             switch (this.data?.guards.op) {
                 case "set":
                 case "add": {
-                    if (this.data.guards.guard.length > exports.MAX_GUARD_COUNT) {
-                        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `guards count exceeds maximum limit ${exports.MAX_GUARD_COUNT}`);
+                    if (this.data.guards.guard.length > MAX_GUARD_COUNT) {
+                        W_ERROR(WErrors.InvalidParam, `guards count exceeds maximum limit ${MAX_GUARD_COUNT}`);
                     }
                     if (this.data.guards.op === "set") {
                         guard_clear(tx, object, permission, passport);
                     }
                     for (const guard of this.data.guards.guard) {
-                        const addr = await local_js_1.LocalMark.Instance().get_address(guard.guard);
+                        const addr = await LocalMark.Instance().get_address(guard.guard);
                         //@ 没有严格检查
                         if (addr) {
                             guard_add(tx, object, permission, addr, guard.service_identifier, passport);
@@ -241,10 +225,10 @@ class CallDemand extends base_js_1.CallBase {
                     break;
                 }
                 case "remove": {
-                    if (this.data.guards.guard.length > exports.MAX_GUARD_COUNT) {
-                        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `guards count exceeds maximum limit ${exports.MAX_GUARD_COUNT}`);
+                    if (this.data.guards.guard.length > MAX_GUARD_COUNT) {
+                        W_ERROR(WErrors.InvalidParam, `guards count exceeds maximum limit ${MAX_GUARD_COUNT}`);
                     }
-                    const guardAddrs = await local_js_1.LocalMark.Instance().get_many_address_availables(this.data.guards.guard);
+                    const guardAddrs = await LocalMark.Instance().get_many_address_availables(this.data.guards.guard);
                     guard_remove(tx, object, permission, guardAddrs, passport);
                     break;
                 }
@@ -256,75 +240,74 @@ class CallDemand extends base_js_1.CallBase {
         }
         if (this.data?.owner_receive != null && this.object_address) {
             if (this.data.owner_receive === "recently") {
-                this.data.owner_receive = await (0, received_js_1.query_received)({
+                this.data.owner_receive = await query_received({
                     object: this.object_address,
                     all_type: true,
                     no_cache: env.no_cache,
                     network: env.network,
                 });
             }
-            await (0, util_js_2.owner_receive)(tx, object, permission, this.data.owner_receive, undefined, (name) => `${common_js_1.PackageAddress}::demand::${name}`, passport);
+            await owner_receive(tx, object, permission, this.data.owner_receive, undefined, (name) => `${PackageAddress}::demand::${name}`, passport);
         }
         // 处理 um
         if (this.data.um !== undefined) {
             let um_address = null;
             if (this.data.um) {
                 um_address =
-                    (await local_js_1.LocalMark.Instance().get_address(this.data.um)) ||
+                    (await LocalMark.Instance().get_address(this.data.um)) ||
                         null;
                 if (!um_address) {
-                    (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, "CallDemand_Data.data.um:" + this.data.um);
+                    W_ERROR(WErrors.InvalidParam, "CallDemand_Data.data.um:" + this.data.um);
                 }
             }
             um_set(tx, object, permission, um_address, passport);
         }
         if (!this.permission_address) {
-            const p = (0, common_js_1.GetObject)(this.data?.object);
-            await this.new_with_mark(env, tx, object_js_1.ObjectType.Permission, (0, permission_js_2.create)(tx, permission), (0, common_js_1.GetObject)(p.permission));
+            const p = GetObject(this.data?.object);
+            await this.new_with_mark(env, tx, ObjectType.Permission, permissionCreate(tx, permission), GetObject(p.permission));
         }
         if (!this.object_address) {
-            await this.new_with_mark(env, tx, object_js_1.ObjectType.Demand, create(tx, object), (0, common_js_1.GetObject)(this.data?.object));
+            await this.new_with_mark(env, tx, ObjectType.Demand, create(tx, object), GetObject(this.data?.object));
         }
     }
 }
-exports.CallDemand = CallDemand;
 // ================================================
 // 常量定义
-exports.MAX_REWARD_COUNT = 20;
-exports.MAX_GUARD_COUNT = 20;
-exports.MAX_FEEDBACK_COUNT = 20;
+export const MAX_REWARD_COUNT = 20;
+export const MAX_GUARD_COUNT = 20;
+export const MAX_FEEDBACK_COUNT = 20;
 // ================================================
 // 公共函数调用
-function create(tx, demand) {
-    (0, util_js_2.validObjects)([demand]);
+export function create(tx, demand) {
+    validObjects([demand]);
     return tx.moveCall({
-        target: (0, common_js_1.demandFn)("create"),
-        arguments: [(0, common_js_1.toTxObject)(tx, demand)],
+        target: demandFn("create"),
+        arguments: [toTxObject(tx, demand)],
     });
 }
-function present(tx, demand, recommend, by_guard, service, service_type, passport) {
-    (0, util_js_2.validObjects)([demand, service, by_guard, passport]);
+export function present(tx, demand, recommend, by_guard, service, service_type, passport) {
+    validObjects([demand, service, by_guard, passport]);
     recommend = recommend || "";
-    if (typeof recommend === "string" && !(0, common_js_1.isValidDescription)(recommend)) {
-        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.IsValidDescription, `Recommend exceeds maximum length ${common_js_1.MAX_DESCRIPTION_LENGTH}`);
+    if (typeof recommend === "string" && !isValidDescription(recommend)) {
+        W_ERROR(WErrors.IsValidDescription, `Recommend exceeds maximum length ${MAX_DESCRIPTION_LENGTH}`);
     }
-    if (service && !(0, common_js_1.IsValidArgType)(service_type)) {
-        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.IsValidArgType, `Service type ${service_type} is not valid`);
+    if (service && !IsValidArgType(service_type)) {
+        W_ERROR(WErrors.IsValidArgType, `Service type ${service_type} is not valid`);
     }
     if (by_guard) {
         if (!passport) {
-            (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `Passport is required when by_guard ${by_guard} is present`);
+            W_ERROR(WErrors.InvalidParam, `Passport is required when by_guard ${by_guard} is present`);
         }
         if (service) {
             // 调用 present_service_with_passport
             tx.moveCall({
-                target: (0, common_js_1.demandFn)("present_service_with_passport"),
+                target: demandFn("present_service_with_passport"),
                 arguments: [
-                    (0, common_js_1.toTxObject)(tx, demand),
-                    (0, common_js_1.toTxObject)(tx, by_guard),
-                    (0, common_js_1.toTxObject)(tx, passport),
-                    (0, common_js_1.toTxString)(tx, recommend),
-                    (0, common_js_1.toTxObject)(tx, service),
+                    toTxObject(tx, demand),
+                    toTxObject(tx, by_guard),
+                    toTxObject(tx, passport),
+                    toTxString(tx, recommend),
+                    toTxObject(tx, service),
                     tx.object.clock(),
                 ],
                 typeArguments: [service_type],
@@ -332,12 +315,12 @@ function present(tx, demand, recommend, by_guard, service, service_type, passpor
         }
         else {
             tx.moveCall({
-                target: (0, common_js_1.demandFn)("present_with_passport"),
+                target: demandFn("present_with_passport"),
                 arguments: [
-                    (0, common_js_1.toTxObject)(tx, demand),
-                    (0, common_js_1.toTxObject)(tx, by_guard),
-                    (0, common_js_1.toTxObject)(tx, passport),
-                    (0, common_js_1.toTxString)(tx, recommend),
+                    toTxObject(tx, demand),
+                    toTxObject(tx, by_guard),
+                    toTxObject(tx, passport),
+                    toTxString(tx, recommend),
                     tx.object.clock(),
                 ],
             });
@@ -346,11 +329,11 @@ function present(tx, demand, recommend, by_guard, service, service_type, passpor
     else if (service) {
         // 调用 present_service
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("present_service"),
+            target: demandFn("present_service"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxString)(tx, recommend),
-                (0, common_js_1.toTxObject)(tx, service),
+                toTxObject(tx, demand),
+                toTxString(tx, recommend),
+                toTxObject(tx, service),
                 tx.object.clock(),
             ],
             typeArguments: [service_type],
@@ -359,10 +342,10 @@ function present(tx, demand, recommend, by_guard, service, service_type, passpor
     else {
         // 调用 present
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("present"),
+            target: demandFn("present"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxString)(tx, recommend),
+                toTxObject(tx, demand),
+                toTxString(tx, recommend),
                 tx.object.clock(),
             ],
         });
@@ -370,18 +353,18 @@ function present(tx, demand, recommend, by_guard, service, service_type, passpor
 }
 // ================================================
 // 构造函数和设置函数
-function newDemand(tx, permission, description, passport) {
-    (0, util_js_2.validObjects)([permission, passport]);
-    if (typeof description === "string" && !(0, common_js_1.isValidDescription)(description)) {
-        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.IsValidDescription, `Description exceeds maximum length ${common_js_1.MAX_DESCRIPTION_LENGTH}`);
+export function newDemand(tx, permission, description, passport) {
+    validObjects([permission, passport]);
+    if (typeof description === "string" && !isValidDescription(description)) {
+        W_ERROR(WErrors.IsValidDescription, `Description exceeds maximum length ${MAX_DESCRIPTION_LENGTH}`);
     }
     if (passport) {
         return tx.moveCall({
-            target: (0, common_js_1.demandFn)("new_with_passport"),
+            target: demandFn("new_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
-                (0, common_js_1.toTxString)(tx, description),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
+                toTxString(tx, description),
                 tx.object.mutRegistrar(),
                 tx.object.clock(),
             ],
@@ -389,85 +372,85 @@ function newDemand(tx, permission, description, passport) {
     }
     else {
         return tx.moveCall({
-            target: (0, common_js_1.demandFn)("new"),
+            target: demandFn("new"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxString)(tx, description),
+                toTxObject(tx, permission),
+                toTxString(tx, description),
                 tx.object.mutRegistrar(),
                 tx.object.clock(),
             ],
         });
     }
 }
-function description_set(tx, demand, permission, description, passport) {
-    (0, util_js_2.validObjects)([demand, permission, passport]);
-    if (typeof description === "string" && !(0, common_js_1.isValidDescription)(description)) {
-        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.IsValidDescription, `Description ${description} exceeds maximum length ${common_js_1.MAX_DESCRIPTION_LENGTH}`);
+export function description_set(tx, demand, permission, description, passport) {
+    validObjects([demand, permission, passport]);
+    if (typeof description === "string" && !isValidDescription(description)) {
+        W_ERROR(WErrors.IsValidDescription, `Description ${description} exceeds maximum length ${MAX_DESCRIPTION_LENGTH}`);
     }
     if (passport) {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("description_set_with_passport"),
+            target: demandFn("description_set_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
-                (0, common_js_1.toTxString)(tx, description),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
+                toTxString(tx, description),
             ],
         });
     }
     else {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("description_set"),
+            target: demandFn("description_set"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxString)(tx, description),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxString(tx, description),
             ],
         });
     }
 }
-function location_set(tx, demand, permission, location, passport) {
-    (0, util_js_2.validObjects)([demand, permission, passport]);
-    if (typeof location === "string" && !(0, common_js_1.isValidLongName)(location)) {
-        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.InvalidParam, `Location ${location} exceeds maximum length ${common_js_1.MAX_LONG_NAME_LENGTH}`);
+export function location_set(tx, demand, permission, location, passport) {
+    validObjects([demand, permission, passport]);
+    if (typeof location === "string" && !isValidLongName(location)) {
+        W_ERROR(WErrors.InvalidParam, `Location ${location} exceeds maximum length ${MAX_LONG_NAME_LENGTH}`);
     }
     if (passport) {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("location_set_with_passport"),
+            target: demandFn("location_set_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
-                (0, common_js_1.toTxString)(tx, location),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
+                toTxString(tx, location),
             ],
         });
     }
     else {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("location_set"),
+            target: demandFn("location_set"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxString)(tx, location),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxString(tx, location),
             ],
         });
     }
 }
-function guard_add(tx, demand, permission, guard, service_identifier, passport) {
-    (0, util_js_2.validObjects)([demand, permission, guard, passport]);
+export function guard_add(tx, demand, permission, guard, service_identifier, passport) {
+    validObjects([demand, permission, guard, passport]);
     if (typeof service_identifier === "number") {
-        if (!(0, common_js_1.isValidU8)(service_identifier)) {
-            (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.IsValidU8, `Service identifier ${service_identifier} is invalid`);
+        if (!isValidU8(service_identifier)) {
+            W_ERROR(WErrors.IsValidU8, `Service identifier ${service_identifier} is invalid`);
         }
     }
     if (passport) {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("guard_add_with_passport"),
+            target: demandFn("guard_add_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
-                (0, common_js_1.toTxObject)(tx, guard),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
+                toTxObject(tx, guard),
                 tx.pure.option("u8", service_identifier ?? null),
                 tx.object.mutRegistrar(),
                 tx.object.clock(),
@@ -476,11 +459,11 @@ function guard_add(tx, demand, permission, guard, service_identifier, passport)
     }
     else {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("guard_add"),
+            target: demandFn("guard_add"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, guard),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, guard),
                 tx.pure.option("u8", service_identifier ?? null),
                 tx.object.mutRegistrar(),
                 tx.object.clock(),
@@ -488,18 +471,18 @@ function guard_add(tx, demand, permission, guard, service_identifier, passport)
         });
     }
 }
-function guard_remove(tx, demand, permission, guards, passport) {
+export function guard_remove(tx, demand, permission, guards, passport) {
     if (guards.length === 0) {
         return;
     }
-    (0, util_js_2.validObjects)([demand, permission, passport, ...guards]);
+    validObjects([demand, permission, passport, ...guards]);
     if (passport) {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("guard_remove_with_passport"),
+            target: demandFn("guard_remove_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
                 tx.pure.vector("address", guards),
                 tx.object.mutRegistrar(),
             ],
@@ -507,52 +490,52 @@ function guard_remove(tx, demand, permission, guards, passport) {
     }
     else {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("guard_remove"),
+            target: demandFn("guard_remove"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
                 tx.pure.vector("address", guards),
                 tx.object.mutRegistrar(),
             ],
         });
     }
 }
-function guard_clear(tx, demand, permission, passport) {
+export function guard_clear(tx, demand, permission, passport) {
     if (passport) {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("guard_clear_with_passport"),
+            target: demandFn("guard_clear_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
                 tx.object.mutRegistrar(),
             ],
         });
     }
     else {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("guard_clear"),
+            target: demandFn("guard_clear"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
                 tx.object.mutRegistrar(),
             ],
         });
     }
 }
-function reward_add(tx, demand, permission, reward, reward_type, passport) {
-    (0, util_js_2.validObjects)([demand, permission, passport, reward]);
-    if (!(0, common_js_1.IsValidArgType)(reward_type)) {
-        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.IsValidArgType, `Reward type ${reward_type} is invalid`);
+export function reward_add(tx, demand, permission, reward, reward_type, passport) {
+    validObjects([demand, permission, passport, reward]);
+    if (!IsValidArgType(reward_type)) {
+        W_ERROR(WErrors.IsValidArgType, `Reward type ${reward_type} is invalid`);
     }
     if (passport) {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("reward_add_with_passport"),
+            target: demandFn("reward_add_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
-                (0, common_js_1.toTxObject)(tx, reward),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
+                toTxObject(tx, reward),
                 tx.object.mutRegistrar(),
                 tx.object.clock(),
             ],
@@ -561,11 +544,11 @@ function reward_add(tx, demand, permission, reward, reward_type, passport) {
     }
     else {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("reward_add"),
+            target: demandFn("reward_add"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, reward),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, reward),
                 tx.object.mutRegistrar(),
                 tx.object.clock(),
             ],
@@ -573,18 +556,18 @@ function reward_add(tx, demand, permission, reward, reward_type, passport) {
         });
     }
 }
-function reward_remove(tx, demand, permission, rewards, passport) {
+export function reward_remove(tx, demand, permission, rewards, passport) {
     if (rewards.length === 0) {
         return;
     }
-    (0, util_js_2.validObjects)([demand, permission, passport, ...rewards]);
+    validObjects([demand, permission, passport, ...rewards]);
     if (passport) {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("reward_remove_with_passport"),
+            target: demandFn("reward_remove_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
                 tx.pure.vector("address", rewards),
                 tx.object.mutRegistrar(),
             ],
@@ -592,55 +575,55 @@ function reward_remove(tx, demand, permission, rewards, passport) {
     }
     else {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("reward_remove"),
+            target: demandFn("reward_remove"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
                 tx.pure.vector("address", rewards),
                 tx.object.mutRegistrar(),
             ],
         });
     }
 }
-function reward_clear(tx, demand, permission, passport) {
-    (0, util_js_2.validObjects)([demand, permission, passport]);
+export function reward_clear(tx, demand, permission, passport) {
+    validObjects([demand, permission, passport]);
     if (passport) {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("reward_clear_with_passport"),
+            target: demandFn("reward_clear_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
                 tx.object.mutRegistrar(),
             ],
         });
     }
     else {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("reward_clear"),
+            target: demandFn("reward_clear"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
                 tx.object.mutRegistrar(),
             ],
         });
     }
 }
-function feedback(tx, demand, permission, who, acceptance_score, feedback, passport) {
-    (0, util_js_2.validObjects)([demand, permission, who, passport]);
-    if (typeof feedback === "string" && !(0, common_js_1.isValidDescription)(feedback)) {
-        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.IsValidDescription, `Feedback exceeds maximum length ${common_js_1.MAX_DESCRIPTION_LENGTH}`);
+export function feedback(tx, demand, permission, who, acceptance_score, feedback, passport) {
+    validObjects([demand, permission, who, passport]);
+    if (typeof feedback === "string" && !isValidDescription(feedback)) {
+        W_ERROR(WErrors.IsValidDescription, `Feedback exceeds maximum length ${MAX_DESCRIPTION_LENGTH}`);
     }
-    if (typeof acceptance_score === "number" && !(0, common_js_1.isValidU8)(acceptance_score)) {
-        (0, exception_js_1.W_ERROR)(exception_js_1.WErrors.IsValidU8, `Acceptance score ${acceptance_score} is invalid`);
+    if (typeof acceptance_score === "number" && !isValidU8(acceptance_score)) {
+        W_ERROR(WErrors.IsValidU8, `Acceptance score ${acceptance_score} is invalid`);
     }
     if (passport) {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("feedback_with_passport"),
+            target: demandFn("feedback_with_passport"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
-                (0, common_js_1.toTxObject)(tx, passport),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
+                toTxObject(tx, passport),
                 tx.pure.address(who),
                 tx.pure.option("u8", acceptance_score ?? null),
                 tx.pure.string(feedback ?? ""),
@@ -650,10 +633,10 @@ function feedback(tx, demand, permission, who, acceptance_score, feedback, passp
     }
     else {
         tx.moveCall({
-            target: (0, common_js_1.demandFn)("feedback"),
+            target: demandFn("feedback"),
             arguments: [
-                (0, common_js_1.toTxObject)(tx, demand),
-                (0, common_js_1.toTxObject)(tx, permission),
+                toTxObject(tx, demand),
+                toTxObject(tx, permission),
                 tx.pure.address(who),
                 tx.pure.option("u8", acceptance_score ?? null),
                 tx.pure.string(feedback ?? ""),
@@ -662,17 +645,17 @@ function feedback(tx, demand, permission, who, acceptance_score, feedback, passp
         });
     }
 }
-function um_set(tx, demand, permission, um, passport) {
-    (0, util_js_2.validObjects)([demand, permission]);
+export function um_set(tx, demand, permission, um, passport) {
+    validObjects([demand, permission]);
     if (um) {
         if (passport) {
             tx.moveCall({
-                target: (0, common_js_1.demandFn)(`um_set_with_passport`),
+                target: demandFn(`um_set_with_passport`),
                 arguments: [
-                    (0, common_js_1.toTxObject)(tx, demand),
-                    (0, common_js_1.toTxObject)(tx, permission),
+                    toTxObject(tx, demand),
+                    toTxObject(tx, permission),
                     passport,
-                    (0, common_js_1.toTxObject)(tx, um),
+                    toTxObject(tx, um),
                     tx.object.mutRegistrar(),
                     tx.object.clock(),
                 ],
@@ -680,11 +663,11 @@ function um_set(tx, demand, permission, um, passport) {
         }
         else {
             tx.moveCall({
-                target: (0, common_js_1.demandFn)(`um_set`),
+                target: demandFn(`um_set`),
                 arguments: [
-                    (0, common_js_1.toTxObject)(tx, demand),
-                    (0, common_js_1.toTxObject)(tx, permission),
-                    (0, common_js_1.toTxObject)(tx, um),
+                    toTxObject(tx, demand),
+                    toTxObject(tx, permission),
+                    toTxObject(tx, um),
                     tx.object.mutRegistrar(),
                     tx.object.clock(),
                 ],
@@ -694,10 +677,10 @@ function um_set(tx, demand, permission, um, passport) {
     else {
         if (passport) {
             tx.moveCall({
-                target: (0, common_js_1.demandFn)(`um_none_with_passport`),
+                target: demandFn(`um_none_with_passport`),
                 arguments: [
-                    (0, common_js_1.toTxObject)(tx, demand),
-                    (0, common_js_1.toTxObject)(tx, permission),
+                    toTxObject(tx, demand),
+                    toTxObject(tx, permission),
                     passport,
                     tx.object.mutRegistrar(),
                 ],
@@ -705,10 +688,10 @@ function um_set(tx, demand, permission, um, passport) {
         }
         else {
             tx.moveCall({
-                target: (0, common_js_1.demandFn)(`um_none`),
+                target: demandFn(`um_none`),
                 arguments: [
-                    (0, common_js_1.toTxObject)(tx, demand),
-                    (0, common_js_1.toTxObject)(tx, permission),
+                    toTxObject(tx, demand),
+                    toTxObject(tx, permission),
                     tx.object.mutRegistrar(),
                 ],
             });