wowok 2.1.38 → 2.1.40

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

@@ -1,5 +1,3 @@
-// Copyright (c) Wowok.
-// SPDX-License-Identifier: Apache-2.0
 import { toTxObject, toTxString, isValidDescription, MAX_DESCRIPTION_LENGTH, isValidName, PackageAddress, IsValidArgType, isValidU8, repositoryFn, parseValueType, } from "../common.js";
 import { W_ERROR, WErrors } from "../exception.js";
 import { owner_receive, validObjects, valueToBcsBytes, uint2address, } from "../util.js";
@@ -12,16 +10,12 @@ import { IdFrom, ObjectType, parseIdFrom } from "../query/object.js";
 import { create as permissionCreate } from "./permission.js";
 import { queryObjectsWithType } from "../query/util.js";
 import { query_received } from "../query/received.js";
-// ================================================
-// 常量定义
 export const MAX_POLICY_DESCRIPTION_LEN = 500;
 export const MAX_POLICY_COUNT = 50;
 export const MAX_POLICY_GUARD_COUNT = 10;
-export const MAX_DATA_SIZE = 40960; // 10KB
+export const MAX_DATA_SIZE = 40960;
 export const MAX_ID_COUNT_ONCE = 100;
 export const MAX_REWARD_COUNT = 20;
-// ================================================
-// 数据操作类 TODO: submission无需提供id或data的情况，支持的不好，现在仍要填充并检查数据有效性
 export class CallRepository extends CallBase {
     data;
     object_address = undefined;
@@ -53,7 +47,7 @@ export class CallRepository extends CallBase {
         }
     }
     async call(env) {
-        await this.prepare(env); // prepare first.
+        await this.prepare(env);
         const perms = [];
         const guards = [];
         const add_guard = (guard) => {
@@ -77,7 +71,6 @@ export class CallRepository extends CallBase {
         if (this.permission_address && this.data?.policies != null) {
             add_perm(BuiltinPermissionIndex.REPOSITORY_POLICY);
         }
-        // 对id和guard做地址转换和检查
         if (this.data?.data_add != null) {
             if (!this.content) {
                 W_ERROR(WErrors.InvalidParam, "CallRepository_Data.data.data_add fail because the Repository content not ready");
@@ -86,13 +79,9 @@ export class CallRepository extends CallBase {
             if (!p) {
                 W_ERROR(WErrors.InvalidParam, `Invalid policy name: ${this.data.data_add.name}`);
             }
-            // 处理 data_add 中的数据
             if ("items" in this.data.data_add) {
-                // 遍历 items 数组
                 for (const item of this.data.data_add.items) {
-                    // 遍历 data 数组，处理 id 字段
                     for (const keyData of item.data) {
-                        // 将 id 转换为地址
                         let idAddress;
                         if (typeof keyData.id === "number" ||
                             typeof keyData.id === "bigint" ||
@@ -108,9 +97,7 @@ export class CallRepository extends CallBase {
                         }
                         keyData.id = idAddress;
                     }
-                    // 处理 write_guard 字段
                     if (item.write_guard) {
-                        // 将 write_guard 转换为地址
                         const guardAddress = await LocalMark.Instance().get_address(item.write_guard);
                         if (guardAddress) {
                             if (!p.write_guard.find((g) => g.guard === guardAddress)) {
@@ -126,7 +113,6 @@ export class CallRepository extends CallBase {
                 }
             }
             else if (this.data.data_add.write_guard) {
-                // 处理 SignerOrClock 类型的 write_guard
                 const guardAddress = await LocalMark.Instance().get_address(this.data.data_add.write_guard);
                 if (guardAddress) {
                     if (!p.write_guard.find((g) => g.guard === guardAddress)) {
@@ -145,11 +131,8 @@ export class CallRepository extends CallBase {
             if (!p) {
                 W_ERROR(WErrors.InvalidParam, `Invalid policy name: ${this.data.data_remove.name}`);
             }
-            // 处理 data_remove 中的数据
             if ("items" in this.data.data_remove) {
-                // 遍历 items 数组
                 for (const item of this.data.data_remove.items) {
-                    // 处理 id 数组，转换每个 id 为地址
                     const idAddresses = [];
                     for (const id of item.id) {
                         let idAddress;
@@ -168,9 +151,7 @@ export class CallRepository extends CallBase {
                         idAddresses.push(idAddress);
                     }
                     item.id = idAddresses;
-                    // 处理 write_guard 字段
                     if (item.write_guard) {
-                        // 将 write_guard 转换为地址
                         const guardAddress = await LocalMark.Instance().get_address(item.write_guard);
                         if (guardAddress) {
                             if (!p.write_guard.find((g) => g.guard === guardAddress)) {
@@ -187,7 +168,6 @@ export class CallRepository extends CallBase {
             }
             else {
                 if (this.data.data_remove.write_guard) {
-                    // 处理 SignerOrClockBase 类型的 write_guard
                     const guardAddress = await LocalMark.Instance().get_address(this.data.data_remove.write_guard);
                     if (guardAddress) {
                         if (!p.write_guard.find((g) => g.guard === guardAddress)) {
@@ -219,7 +199,6 @@ export class CallRepository extends CallBase {
     async operate(env, tx, passport, submission) {
         let permission = this.permission_address;
         let object = this.object_address;
-        //console.dir(this.data, { depth: null });
         if (!this.object_address) {
             if (!permission) {
                 permission = newPermission(tx, this.new_permission_description ?? "");
@@ -237,9 +216,7 @@ export class CallRepository extends CallBase {
         if (this.data?.policies != null) {
             if (this.data.policies.op === "set" ||
                 this.data.policies.op === "add") {
-                // 使用map和Promise.all并行处理，提高效率
                 await Promise.all(this.data.policies.policy.map(async (p) => {
-                    // 处理 write_guard 数组
                     await Promise.all(p.write_guard.map(async (g) => {
                         const r = await LocalMark.Instance().get_address(g.guard);
                         if (r) {
@@ -249,7 +226,6 @@ export class CallRepository extends CallBase {
                             W_ERROR(WErrors.InvalidParam, `Invalid write_guard address: ${g.guard}`);
                         }
                     }));
-                    // 处理 quote_guard 字段
                     if (p.quote_guard &&
                         typeof p.quote_guard === "string") {
                         const r = await LocalMark.Instance().get_address(p.quote_guard);
@@ -282,7 +258,6 @@ export class CallRepository extends CallBase {
             }
         }
         if (this.data?.data_add != null && this.content) {
-            // 查找 policy 中的 write_guard
             const policy = this.content.policies.find((p) => p.name === this.data.data_add.name);
             if (!policy) {
                 W_ERROR(WErrors.InvalidParam, `policy ${this.data.data_add.name} not found in policies ${this.content.policies.map((p) => p.name)}`);
@@ -295,7 +270,6 @@ export class CallRepository extends CallBase {
             }
         }
         if (this.data?.data_remove != null) {
-            // 查找 policy 中的 write_guard
             const policy = this.content.policies.find((p) => p.name === this.data.data_remove.name);
             if (!policy) {
                 W_ERROR(WErrors.InvalidParam, `policy ${this.data.data_remove.name} not found in policies ${this.content.policies.map((p) => p.name)}`);
@@ -317,7 +291,6 @@ export class CallRepository extends CallBase {
                     if (this.data.rewards.op === "set") {
                         reward_clear(tx, object, permission, passport);
                     }
-                    // 无需localmark查询
                     const rewards = await queryObjectsWithType(env, this.data.rewards.objects, ObjectType.Reward, "reward::Reward", true);
                     rewards.forEach((reward) => {
                         reward_add(tx, object, permission, reward.object, reward.type, passport);
@@ -347,7 +320,6 @@ export class CallRepository extends CallBase {
             }
             await owner_receive(tx, object, permission, this.data.owner_receive, undefined, (name) => `${PackageAddress}::repository::${name}`, passport);
         }
-        // 处理 um
         if (this.data.um !== undefined) {
             let um_address = null;
             if (this.data.um) {
@@ -418,14 +390,12 @@ export function policy(tx, param) {
         ],
     });
     if (param.quote_guard) {
-        // some
         tx.moveCall({
             target: repositoryFn("policy_quote_guard_set"),
             arguments: [obj, toTxObject(tx, param.quote_guard)],
         });
     }
     else if (param.quote_guard === null) {
-        //@ null
         tx.moveCall({
             target: repositoryFn("policy_quote_guard_none"),
             arguments: [obj],
@@ -446,7 +416,6 @@ export function policy(tx, param) {
     return obj;
 }
 export async function data_id_from(tx, repository, policy, data, passport) {
-    // RepIdData类型
     const idFrom = parseIdFrom(policy.id_from);
     if (idFrom === IdFrom.None) {
         W_ERROR(WErrors.InvalidParam, `id_from must be set when id_from is IdFrom.None`);
@@ -549,15 +518,12 @@ export async function data(tx, repository, policy, data, passport) {
     if (policy.id_from !== IdFrom.None) {
         W_ERROR(WErrors.InvalidParam, `id_from must be IdFrom.None when items is provided`);
     }
-    // 优化分组逻辑
     const noGuardItems = [];
     const regularGuards = [];
     const mixedItems = [];
-    // 分类处理每个item
     for (const item of data) {
         if (!item.write_guard) {
             if (policy.write_guard.length === 0) {
-                // 1. 无guard组
                 noGuardItems.push(item);
             }
             else {
@@ -566,22 +532,16 @@ export async function data(tx, repository, policy, data, passport) {
         }
         else {
             const guard = item.write_guard;
-            // 查找policy中对应的guard设置
             const policyGuard = policy.write_guard.find((g) => g.guard === guard);
             if (!policyGuard) {
                 W_ERROR(WErrors.InvalidParam, `Guard ${guard} not found in policy ${policy.write_guard.map((guard) => guard.guard)}`);
             }
-            // 检查guard是否有设置id_from_submission
             const hasSubmissionSettings = policyGuard.id_from_submission !== undefined;
             if (hasSubmissionSettings) {
-                // 3. 有submission设置的guard - 取最后一个元素的id和data
                 if (item.data.length > 0) {
                     const lastItem = item.data[item.data.length - 1];
-                    // 检查guard是否已存在，如果存在则覆盖
                     const existingIndex = mixedItems.findIndex((item) => item.guard === guard);
                     if (existingIndex >= 0) {
-                        // 覆盖已存在的条目
-                        //@ notice: 前面已将地址转换为了string
                         mixedItems[existingIndex] = {
                             guard,
                             id: lastItem.id,
@@ -589,22 +549,15 @@ export async function data(tx, repository, policy, data, passport) {
                         };
                     }
                     else {
-                        // 添加新条目
                         mixedItems.push({
                             guard,
                             id: lastItem.id,
                             data: lastItem.data,
                         });
                     }
-                } /* else {
-                    W_ERROR(
-                        WErrors.InvalidParam,
-                        `Guard ${guard} has submission settings but no data provided`,
-                    );
-                } 忽略空数据项*/
+                }
             }
             else {
-                // 2. 无submission设置的guard - 按guard单独分组
                 const existingGuard = regularGuards.find((g) => g.guard === guard);
                 if (existingGuard) {
                     existingGuard.items.push(item);
@@ -615,7 +568,6 @@ export async function data(tx, repository, policy, data, passport) {
             }
         }
     }
-    // 处理无guard组
     if (noGuardItems.length > 0) {
         const policyValueType3 = parseValueType(policy.value_type);
         const ids = noGuardItems.flatMap((item) => item.data.map((keyData) => keyData.id));
@@ -625,7 +577,6 @@ export async function data(tx, repository, policy, data, passport) {
         if (ids.length !== dataBytes.length) {
             W_ERROR(WErrors.InvalidParam, `Id and data arrays must have the same length`);
         }
-        //@ notice: 前面已将地址转换为了string
         tx.moveCall({
             target: repositoryFn("id_data"),
             arguments: [
@@ -639,12 +590,10 @@ export async function data(tx, repository, policy, data, passport) {
             ],
         });
     }
-    // 处理有submission设置的guard组（合并成一个调用）
     if (mixedItems.length > 0) {
         if (!passport) {
             W_ERROR(WErrors.InvalidParam, "Guard specified but no passport provided");
         }
-        // 提取所有ids、data和guards
         const policyValueType4 = parseValueType(policy.value_type);
         const ids = mixedItems.map((item) => item.id);
         const dataBytes = await Promise.all(mixedItems.map(async (item) => await valueToBcsBytes(policyValueType4, item.data)));
@@ -652,7 +601,6 @@ export async function data(tx, repository, policy, data, passport) {
         if (ids.length !== dataBytes.length || ids.length !== guards.length) {
             W_ERROR(WErrors.InvalidParam, `Id, data, and guard arrays must have the same length`);
         }
-        // 调用id_data_mixed_with_passport
         tx.moveCall({
             target: repositoryFn("id_data_mixed_with_passport"),
             arguments: [
@@ -668,7 +616,6 @@ export async function data(tx, repository, policy, data, passport) {
             ],
         });
     }
-    // 处理无submission设置的guard组（每个guard单独调用）
     for (const { guard, items } of regularGuards) {
         if (!passport) {
             W_ERROR(WErrors.InvalidParam, "Guard specified but no passport provided");
@@ -680,7 +627,6 @@ export async function data(tx, repository, policy, data, passport) {
         if (ids.length !== dataBytes.length) {
             W_ERROR(WErrors.InvalidParam, `Id and data arrays must have the same length for guard ${guard}`);
         }
-        // 调用id_data_with_passport
         tx.moveCall({
             target: repositoryFn("id_data_with_passport"),
             arguments: [
@@ -697,8 +643,6 @@ export async function data(tx, repository, policy, data, passport) {
         });
     }
 }
-// ================================================
-// 构造函数和设置函数
 export function newRepository(tx, permission, description, passport) {
     validObjects([permission, passport]);
     if (typeof description === "string" && !isValidDescription(description)) {
@@ -956,19 +900,15 @@ export function reward_clear(tx, repository, permission, passport) {
 }
 export async function data_remove(tx, repository, policy, param, passport) {
     validObjects([repository]);
-    // 检查参数类型
     if ("items" in param) {
         if (policy.id_from !== IdFrom.None) {
             W_ERROR(WErrors.InvalidParam, `id_from must be IdFrom.None when items is provided`);
         }
-        // 优化分组逻辑
         const noGuardItems = [];
         const regularGuards = [];
         const mixedItems = [];
-        // 分类处理每个item
         for (const item of param.items) {
             if (!item.write_guard) {
-                // 1. 无guard组
                 if (policy.write_guard.length === 0) {
                     noGuardItems.push(...item.id);
                 }
@@ -978,19 +918,15 @@ export async function data_remove(tx, repository, policy, param, passport) {
             }
             else {
                 const guard = item.write_guard;
-                // 查找policy中对应的guard设置
                 const policyGuard = policy.write_guard.find((g) => g.guard === guard);
                 if (!policyGuard) {
                     W_ERROR(WErrors.InvalidParam, `Guard ${guard} not found in policy ${policy.write_guard.map((guard) => guard.guard)}`);
                 }
-                // 检查guard是否有设置id_from_submission
                 const hasSubmissionSettings = policyGuard.id_from_submission !== undefined;
                 if (hasSubmissionSettings) {
-                    // 3. 有submission设置的guard - 取最后一个id和data
                     mixedItems.push(guard);
                 }
                 else {
-                    // 2. 无submission设置的guard - 按guard单独分组
                     const existingGuard = regularGuards.find((g) => g.guard === guard);
                     if (existingGuard) {
                         existingGuard.id.push(...item.id);
@@ -1004,14 +940,11 @@ export async function data_remove(tx, repository, policy, param, passport) {
                 }
             }
         }
-        // 处理无guard组
         if (noGuardItems.length > 0) {
             if (policy.write_guard.length !== 0) {
                 W_ERROR(WErrors.InvalidParam, `specify write guard in policy ${policy.write_guard.map((guard) => guard.guard)}`);
             }
-            // 去重处理
             const uniqueIds = [...new Set(noGuardItems)];
-            // 调用id_data_remove
             tx.moveCall({
                 target: repositoryFn("id_data_remove"),
                 arguments: [
@@ -1021,13 +954,11 @@ export async function data_remove(tx, repository, policy, param, passport) {
                 ],
             });
         }
-        // 处理有submission设置的guard组（合并成一个调用）
         if (mixedItems.length > 0) {
             if (!passport) {
                 W_ERROR(WErrors.InvalidParam, "Guard specified but no passport provided");
             }
             const uniqueIds = [...new Set(mixedItems)];
-            // 调用id_data_mixed_with_passport
             tx.moveCall({
                 target: repositoryFn("id_data_mixed_remove_with_passport"),
                 arguments: [
@@ -1038,10 +969,8 @@ export async function data_remove(tx, repository, policy, param, passport) {
                 ],
             });
         }
-        // 处理无submission设置的guard组（每个guard单独调用）
         for (const { guard, id } of regularGuards) {
             const uniqueIds = [...new Set(id)];
-            // 调用id_data_with_passport
             tx.moveCall({
                 target: repositoryFn("id_data_remove_with_passport"),
                 arguments: [
@@ -1056,7 +985,6 @@ export async function data_remove(tx, repository, policy, param, passport) {
     }
     else {
         const guard = param.write_guard;
-        // RepIdData类型
         if (policy.id_from === IdFrom.None) {
             W_ERROR(WErrors.InvalidParam, `id_from must be set when id_from is IdFrom.None`);
         }
@@ -1094,4 +1022,3 @@ export async function data_remove(tx, repository, policy, param, passport) {
         }
     }
 }
-//# sourceMappingURL=repository.js.map

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

@@ -1,5 +1,3 @@
-// Copyright (c) Wowok.
-// SPDX-License-Identifier: Apache-2.0
 import { toTxObject, toTxAddress, MAX_NAME_LENGTH, isValidName, PackageAddress, } from "../common.js";
 import { W_ERROR, WErrors } from "../exception.js";
 export var TagName;
@@ -18,12 +16,11 @@ export const toWTagData = (tags, innerTag = true) => {
             const f = data.find((k) => k.tag === i);
             if (f) {
                 if (!f.address.find((k) => k === v.address)) {
-                    // add address
                     f.address.push(v.address);
                 }
             }
             else {
-                data.push({ tag: i, address: [v.address] }); // add tag
+                data.push({ tag: i, address: [v.address] });
             }
         });
     });
@@ -51,13 +48,10 @@ export const toWTags = (data) => {
     });
     return tags;
 };
-// =====================================================
 export function resourceFn(name) {
     return `${PackageAddress}::resource::${name}`;
 }
-// max number of tags in a resource
 export const MAX_TAGS_COUNT = 100;
-// =====================================================
 export function addObjectTags(tx, resource, tag) {
     if (tag.tags.length > MAX_TAGS_COUNT) {
         W_ERROR(WErrors.ResourceTagCountExceeded, `Tags count exceeds maximum limit ${MAX_TAGS_COUNT}`);
@@ -67,14 +61,12 @@ export function addObjectTags(tx, resource, tag) {
             W_ERROR(WErrors.IsValidName, `Tag name exceeds maximum length ${MAX_NAME_LENGTH}`);
         }
     });
-    // 处理nick参数
     if (tag.nick != null && typeof tag.nick === "string") {
         if (!isValidName(tag.nick)) {
             W_ERROR(WErrors.IsValidName, `Nick name exceeds maximum length ${MAX_NAME_LENGTH}`);
         }
     }
     const nickArg = tx.pure.option("string", tag.nick ?? null);
-    // 处理tags参数
     const tagsArg = tx.pure.vector("string", tag.tags);
     tx.moveCall({
         target: resourceFn("add_object_tags"),
@@ -87,12 +79,10 @@ export function addObjectTags(tx, resource, tag) {
     });
 }
 export function removeObjectTags(tx, resource, tag) {
-    // 处理nick参数
     if (typeof tag.nick === "string" && !isValidName(tag.nick)) {
         W_ERROR(WErrors.IsValidName, `Nick name exceeds maximum length ${MAX_NAME_LENGTH}`);
     }
     const nickArg = tx.pure.option("string", tag.nick ?? null);
-    // 处理tags参数
     const tagsArg = tx.pure.vector("string", tag.tags);
     tx.moveCall({
         target: resourceFn("remove_object_tags"),
@@ -116,4 +106,3 @@ export function create(tx, resource) {
         arguments: [toTxObject(tx, resource)],
     });
 }
-//# sourceMappingURL=resource.js.map

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

@@ -1,5 +1,3 @@
-// Copyright (c) Wowok.
-// SPDX-License-Identifier: Apache-2.0
 import { toTxObject, toTxString, isValidDescription, MAX_DESCRIPTION_LENGTH, isValidU8, PackageAddress, isValidU64, IsValidArgType, rewardFn, } from "../common.js";
 import { W_ERROR, WErrors } from "../exception.js";
 import { parseObjectType, validObjects } from "../util.js";
@@ -12,8 +10,6 @@ import { AmountType, ObjectType } from "../query/object.js";
 import { GetAccountOrMark_Address } from "../local/index.js";
 import { create as permissionCreate } from "./permission.js";
 import { query_received } from "../query/received.js";
-// ================================================
-// 数据操作类
 export class CallReward extends CallBase {
     data;
     object_address = undefined;
@@ -54,7 +50,7 @@ export class CallReward extends CallBase {
         }
     }
     async call(env) {
-        await this.prepare(env); // prepare first.
+        await this.prepare(env);
         const guards = [];
         const perms = [];
         const content = this.content;
@@ -97,7 +93,6 @@ export class CallReward extends CallBase {
         if (this.permission_address && this.data?.receive != null) {
             add_perm(BuiltinPermissionIndex.REWARD_RECEIVE);
         }
-        //@ notice guard_expiration_time 为 null 时，取消设置过期时间
         if (this.permission_address &&
             this.data?.guard_expiration_time !== undefined) {
             add_perm(BuiltinPermissionIndex.REWARD_GUARD_EXPIRATION_TIME_ADD);
@@ -105,7 +100,6 @@ export class CallReward extends CallBase {
         if (this.permission_address && this.data?.guard_add != null) {
             add_perm(BuiltinPermissionIndex.REWARD_GUARD);
         }
-        //@ notice guard_remove_expired 为 true 时，移除过期守卫
         if (this.permission_address && this.data?.guard_remove_expired) {
             add_perm(BuiltinPermissionIndex.DEMAND_GUARD);
         }
@@ -151,12 +145,10 @@ export class CallReward extends CallBase {
                     network: env.network,
                     no_cache: env.no_cache,
                 });
-                // 检查received的类型，如果是ReceivedNormal[]，需要转换为ReceivedBalance
                 if (Array.isArray(received)) {
                     W_ERROR(WErrors.InvalidParam, "CallAllocation_Data.data.received_coins: received is ReceivedNormal[]");
                 }
                 else {
-                    // 如果是ReceivedBalance类型，直接赋值
                     this.data.receive = received;
                 }
             }
@@ -196,7 +188,6 @@ export class CallReward extends CallBase {
         if (this.data.guard_remove_expired) {
             guard_remove_expired(tx, object, this.reward_type, permission, passport);
         }
-        //@ notice guard_expiration_time 为 null 时，取消设置过期时间
         if (this.data?.guard_expiration_time !== undefined) {
             guard_expiration_time_add(tx, object, this.reward_type, permission, this.data.guard_expiration_time, passport);
         }
@@ -211,7 +202,6 @@ export class CallReward extends CallBase {
             }
             await owner_receive(tx, object, permission, this.data.owner_receive, this.reward_type, (name) => `${PackageAddress}::reward::${name}`, passport);
         }
-        // 处理 um
         if (this.data.um !== undefined) {
             let um_address = null;
             if (this.data.um) {
@@ -233,8 +223,6 @@ export class CallReward extends CallBase {
         }
     }
 }
-// ================================================
-// 常量定义
 export const MAX_GUARD_COUNT = 200;
 export const MAX_RECORD_COUNT = 5200;
 export function create(tx, reward, reward_type) {
@@ -257,7 +245,6 @@ async function reward_guard(tx, param) {
         W_ERROR(WErrors.InvalidParam, `Guard ${param.guard} is not valid`);
     }
     validObjects([param.guard]);
-    // 根据不同的参数类型调用不同的底层函数
     if ("GuardIdentifier" in param.recipient) {
         const guardId = param.recipient.GuardIdentifier;
         if (typeof guardId !== "number") {
@@ -280,6 +267,7 @@ async function reward_guard(tx, param) {
                     tx.pure.u8(guardId),
                     tx.pure.u8(param.amount.value),
                     tx.pure.option("u64", param.expiration_time ?? null),
+                    tx.pure.option("u8", param.store_from_id ?? null),
                 ],
             });
         }
@@ -297,6 +285,7 @@ async function reward_guard(tx, param) {
                     tx.pure.u8(guardId),
                     tx.pure.u64(param.amount.value),
                     tx.pure.option("u64", param.expiration_time ?? null),
+                    tx.pure.option("u8", param.store_from_id ?? null),
                 ],
             });
         }
@@ -321,6 +310,7 @@ async function reward_guard(tx, param) {
                     tx.pure.address(r),
                     tx.pure.u8(param.amount.value),
                     tx.pure.option("u64", param.expiration_time ?? null),
+                    tx.pure.option("u8", param.store_from_id ?? null),
                 ],
             });
         }
@@ -338,6 +328,7 @@ async function reward_guard(tx, param) {
                     tx.pure.address(r),
                     tx.pure.u64(param.amount.value),
                     tx.pure.option("u64", param.expiration_time ?? null),
+                    tx.pure.option("u8", param.store_from_id ?? null),
                 ],
             });
         }
@@ -356,6 +347,7 @@ async function reward_guard(tx, param) {
                     toTxObject(tx, param.guard),
                     tx.pure.u8(param.amount.value),
                     tx.pure.option("u64", param.expiration_time ?? null),
+                    tx.pure.option("u8", param.store_from_id ?? null),
                 ],
             });
         }
@@ -372,11 +364,11 @@ async function reward_guard(tx, param) {
                     toTxObject(tx, param.guard),
                     tx.pure.u64(param.amount.value),
                     tx.pure.option("u64", param.expiration_time ?? null),
+                    tx.pure.option("u8", param.store_from_id ?? null),
                 ],
             });
         }
     }
-    // 如果没有匹配的情况，抛出错误
     W_ERROR(WErrors.InvalidParam, `Invalid recipient or amount type combination`);
     return undefined;
 }
@@ -399,8 +391,6 @@ export function claim(tx, reward, reward_type, guard, passport) {
         typeArguments: [reward_type],
     });
 }
-// ================================================
-// 构造函数和设置函数
 export function newReward(tx, reward_type, permission, description, passport) {
     validObjects([permission, passport]);
     if (!IsValidArgType(reward_type)) {
@@ -472,7 +462,6 @@ export async function guard_add(tx, reward, reward_type, permission, param, pass
     if (!IsValidArgType(reward_type)) {
         W_ERROR(WErrors.InvalidParam, `Invalid reward type ${reward_type}`);
     }
-    // 构建 RewardGuard 对象
     const rewardGuardArg = await reward_guard(tx, param);
     if (!rewardGuardArg) {
         W_ERROR(WErrors.InvalidParam, `CallReward_Data.data.guard_add ${param} failed`);
@@ -542,7 +531,6 @@ export async function coin_add(env, tx, reward, reward_type, permission, coin, p
         W_ERROR(WErrors.InvalidParam, `Invalid reward type ${reward_type}`);
     }
     const c = await getCoinParam(env, tx, coin, reward_type);
-    //console.dir(c, { depth: null });
     if (passport) {
         tx.moveCall({
             target: rewardFn("coin_add_with_passport"),
@@ -685,4 +673,3 @@ export function um_set(tx, reward, reward_type, permission, um, passport) {
         }
     }
 }
-//# sourceMappingURL=reward.js.map