@waterx/sdk 4.0.1 → 4.3.0

package/dist/cjs/src/perp/liq-view.d.ts

@@ -0,0 +1,64 @@
+/**
+ * View→raw adapter for the canonical liquidation-price estimate.
+ *
+ * `calcEstLiqPriceRaw` (`utils/math.ts`) takes the twelve RAW on-chain values
+ * the Move view takes, so every consumer that already holds a fetched
+ * `PositionDataView` row had to hand-map nine of them 1:1 off the row (the
+ * other three are the probe prices + maintenance margin, which the row does not
+ * carry) — and hand-carry the price invariant below in prose. That mapping is
+ * the SDK's job, so it lives here.
+ *
+ * ## Why perp-side and not in `utils/math.ts`
+ *
+ * `PositionDataView` is a perp read type (`perp/fetch/positions.ts`, decoded
+ * from the `waterx_perp_view` BCS struct). `utils/` is the shared base that
+ * `perp/` imports FROM — pulling a perp view type down into `utils/math.ts`
+ * would invert that direction and couple the line-agnostic math to the perp
+ * read layer. So the pure math stays in `utils/`, and the adapter that knows
+ * the perp row shape sits here, one layer up. Kept out of
+ * `perp/fetch/positions.ts` too: that module is transport (build PTB →
+ * simulate → decode), this is a pure field mapping with no client.
+ */
+import type { PositionDataView } from "./fetch/positions.ts";
+/**
+ * Probe prices the position row was READ AT — see the invariant on
+ * {@link calcEstLiqPriceRawFromView}. Whole-dollar u64, exactly as passed to
+ * the `perp/fetch` read (`WholeDollarUsdPrice`), plus the market's maintenance
+ * margin, which lives on `MarketData`, not on the position row.
+ */
+export type EstLiqPriceViewOpts = {
+    /** `MarketData.maintenance_margin` — raw 1e9-scaled Float value. */
+    maintenanceMarginRaw: bigint;
+    /** The SAME `basePriceUsd` passed to the read that produced `position`. */
+    basePriceUsd: bigint;
+    /** The SAME `collateralPriceUsd` passed to the read that produced `position`. */
+    collateralPriceUsd: bigint;
+};
+/**
+ * Estimated liquidation price from a fetched `PositionDataView` row —
+ * bit-identical to that row's `est_liq_price`.
+ *
+ * Maps the row's nine raw fields onto {@link calcEstLiqPriceRaw} (the op-for-op
+ * mirror of `view.move::calculate_est_liq_price`) and takes the remaining
+ * three — the two probe prices plus the market's maintenance margin — from
+ * `opts`. Returns the raw 1e9-scaled u128 price; `0n` = already liquidatable /
+ * zero size.
+ *
+ * ## INVARIANT — the prices must be the ones the row was READ AT
+ *
+ * `opts.basePriceUsd` / `opts.collateralPriceUsd` MUST be the same whole-dollar
+ * values you passed to the `perp/fetch` read that produced `position`
+ * (`getPosition`, `getMarketPositions`, `getAccountPositions`, …).
+ *
+ * `PositionDataView` does NOT carry the probe prices it was computed at, so
+ * NOTHING — not this adapter, not the type system — can check this for you.
+ * Feed different prices and the row's fee / notional-derived fields were
+ * computed against one price while the estimate is computed against another:
+ * the result is a plausible-looking number that silently disagrees with
+ * `position.est_liq_price`. Thread the prices through from the read call site;
+ * never re-fetch or re-guess them here.
+ *
+ * @throws RangeError via `calcEstLiqPriceRaw` when any raw value is negative or
+ *   `collateral_decimal` is outside `[0, 19]`.
+ */
+export declare function calcEstLiqPriceRawFromView(position: PositionDataView, opts: EstLiqPriceViewOpts): bigint;

package/dist/cjs/src/perp/liq-view.js

@@ -0,0 +1,74 @@
+"use strict";
+/**
+ * View→raw adapter for the canonical liquidation-price estimate.
+ *
+ * `calcEstLiqPriceRaw` (`utils/math.ts`) takes the twelve RAW on-chain values
+ * the Move view takes, so every consumer that already holds a fetched
+ * `PositionDataView` row had to hand-map nine of them 1:1 off the row (the
+ * other three are the probe prices + maintenance margin, which the row does not
+ * carry) — and hand-carry the price invariant below in prose. That mapping is
+ * the SDK's job, so it lives here.
+ *
+ * ## Why perp-side and not in `utils/math.ts`
+ *
+ * `PositionDataView` is a perp read type (`perp/fetch/positions.ts`, decoded
+ * from the `waterx_perp_view` BCS struct). `utils/` is the shared base that
+ * `perp/` imports FROM — pulling a perp view type down into `utils/math.ts`
+ * would invert that direction and couple the line-agnostic math to the perp
+ * read layer. So the pure math stays in `utils/`, and the adapter that knows
+ * the perp row shape sits here, one layer up. Kept out of
+ * `perp/fetch/positions.ts` too: that module is transport (build PTB →
+ * simulate → decode), this is a pure field mapping with no client.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calcEstLiqPriceRawFromView = calcEstLiqPriceRawFromView;
+const math_ts_1 = require("../utils/math.js");
+/**
+ * Estimated liquidation price from a fetched `PositionDataView` row —
+ * bit-identical to that row's `est_liq_price`.
+ *
+ * Maps the row's nine raw fields onto {@link calcEstLiqPriceRaw} (the op-for-op
+ * mirror of `view.move::calculate_est_liq_price`) and takes the remaining
+ * three — the two probe prices plus the market's maintenance margin — from
+ * `opts`. Returns the raw 1e9-scaled u128 price; `0n` = already liquidatable /
+ * zero size.
+ *
+ * ## INVARIANT — the prices must be the ones the row was READ AT
+ *
+ * `opts.basePriceUsd` / `opts.collateralPriceUsd` MUST be the same whole-dollar
+ * values you passed to the `perp/fetch` read that produced `position`
+ * (`getPosition`, `getMarketPositions`, `getAccountPositions`, …).
+ *
+ * `PositionDataView` does NOT carry the probe prices it was computed at, so
+ * NOTHING — not this adapter, not the type system — can check this for you.
+ * Feed different prices and the row's fee / notional-derived fields were
+ * computed against one price while the estimate is computed against another:
+ * the result is a plausible-looking number that silently disagrees with
+ * `position.est_liq_price`. Thread the prices through from the read call site;
+ * never re-fetch or re-guess them here.
+ *
+ * @throws RangeError via `calcEstLiqPriceRaw` when any raw value is negative or
+ *   `collateral_decimal` is outside `[0, 19]`.
+ */
+function calcEstLiqPriceRawFromView(position, opts) {
+    return (0, math_ts_1.calcEstLiqPriceRaw)({
+        isLong: position.is_long,
+        sizeRaw: BigInt(position.size),
+        avgPriceRaw: BigInt(position.average_price),
+        collateralAmountRaw: BigInt(position.collateral_amount),
+        collateralDecimal: position.collateral_decimal,
+        basePriceUsd: opts.basePriceUsd,
+        collateralPriceUsd: opts.collateralPriceUsd,
+        maintenanceMarginRaw: opts.maintenanceMarginRaw,
+        // The view pre-combines accrued + unrealized into `borrow_fee` / `funding_fee`
+        // — take those, NOT the `unrealized_*` pair, which would UNDER-count:
+        // `view.move` sets `borrow_fee = calculate_borrow_fee(cumul) +
+        // unrealized_borrow_fee`, and `position.move::calculate_funding_fee` returns
+        // the unrealized leg combined with the current period's, so the row's
+        // `unrealized_*` fields are strict SUBSETS of the combined pair.
+        borrowFeeRaw: BigInt(position.borrow_fee),
+        fundingSign: position.funding_fee_positive,
+        fundingFeeRaw: BigInt(position.funding_fee),
+        tradingFeeRaw: BigInt(position.unrealized_trading_fee),
+    });
+}

package/dist/cjs/src/perp/user/order.d.ts

@@ -7,6 +7,19 @@
  *
  * Use `triggerPrice === undefined` (market form) to park an order at
  * tick 0 in the limit book; a keeper picks it up via `match_orders`.
+ *
+ * ## Trigger prices are exact order-book KEYS
+ *
+ * Every `triggerPrice` / `currentTriggerPrice` / `newTriggerPrice` below is the
+ * raw 1e9-scaled value the book is keyed by — off by a single 1e-9 unit and the
+ * lookup silently finds nothing. Build them with `rawPrice` in its EXACT mode
+ * (`rawPrice("95000.5")`, an `ExactDecimalUsd` string); the `number` mode
+ * round-trips through f64 and is exact only below ≈ $9,007,199.
+ *
+ * The params stay `bigint | number` (the RAW scaled value, not USD): both are
+ * legitimate raw inputs, `toU128` already rejects a non-safe-integer `number`
+ * before it can serialize wrong, and dropping `number` would break published
+ * call shapes. The mode choice belongs one level up, at `rawPrice`.
  */
 import type { Transaction, TransactionArgument } from "@mysten/sui/transactions";
 import type { PerpClient } from "../client.ts";

package/dist/cjs/src/perp/user/order.js

@@ -8,6 +8,19 @@
  *
  * Use `triggerPrice === undefined` (market form) to park an order at
  * tick 0 in the limit book; a keeper picks it up via `match_orders`.
+ *
+ * ## Trigger prices are exact order-book KEYS
+ *
+ * Every `triggerPrice` / `currentTriggerPrice` / `newTriggerPrice` below is the
+ * raw 1e9-scaled value the book is keyed by — off by a single 1e-9 unit and the
+ * lookup silently finds nothing. Build them with `rawPrice` in its EXACT mode
+ * (`rawPrice("95000.5")`, an `ExactDecimalUsd` string); the `number` mode
+ * round-trips through f64 and is exact only below ≈ $9,007,199.
+ *
+ * The params stay `bigint | number` (the RAW scaled value, not USD): both are
+ * legitimate raw inputs, `toU128` already rejects a non-safe-integer `number`
+ * before it can serialize wrong, and dropping `number` would break published
+ * call shapes. The mode choice belongs one level up, at `rawPrice`.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -52,6 +65,7 @@ exports.addPreOrderRequest = addPreOrderRequest;
 const account_request_ts_1 = require("../../account/account-request.js");
 const request_ts_1 = require("../../generated/waterx_perp/request.js");
 const trading = __importStar(require("../../generated/waterx_perp/trading.js"));
+const validate_ts_1 = require("../../utils/validate.js");
 const constants_ts_1 = require("../constants.js");
 /** Build a `request::PlaceOrderArgument` Move struct in the PTB. */
 function buildPlaceOrderArgument(client, tx, p) {
@@ -61,11 +75,11 @@ function buildPlaceOrderArgument(client, tx, p) {
             isLong: p.isLong,
             isStopOrder: p.isStopOrder,
             reduceOnly: p.reduceOnly,
-            size: p.size,
-            triggerPrice: p.triggerPrice ?? null,
-            linkedPositionId: p.linkedPositionId ?? null,
-            acceptablePrice: p.acceptablePrice ?? null,
-            collateralAmount: p.collateralAmount,
+            size: (0, validate_ts_1.toU128)(p.size, "size"),
+            triggerPrice: (0, validate_ts_1.toU128OrNull)(p.triggerPrice, "triggerPrice"),
+            linkedPositionId: (0, validate_ts_1.toU64OrNull)(p.linkedPositionId, "linkedPositionId"),
+            acceptablePrice: (0, validate_ts_1.toU64OrNull)(p.acceptablePrice, "acceptablePrice"),
+            collateralAmount: (0, validate_ts_1.toU64)(p.collateralAmount, "collateralAmount"),
         },
     })(tx);
     return arg;
@@ -107,9 +121,9 @@ function cancelOrderRequest(client, tx, params) {
             ticker: params.ticker,
             senderRequest: req,
             accountId: params.accountId,
-            orderId: params.orderId,
-            triggerPrice: params.triggerPrice ?? 0n,
-            orderTypeTag: params.orderTypeTag ?? constants_ts_1.ORDER_TAG_WILDCARD,
+            orderId: (0, validate_ts_1.toU64)(params.orderId, "orderId"),
+            triggerPrice: (0, validate_ts_1.toU128)(params.triggerPrice ?? 0n, "triggerPrice"),
+            orderTypeTag: (0, validate_ts_1.toU8)(params.orderTypeTag ?? constants_ts_1.ORDER_TAG_WILDCARD, "orderTypeTag"),
         },
         typeArguments: [params.collateralType, params.lpType ?? client.wlpType()],
     })(tx);
@@ -126,11 +140,11 @@ function updateOrderRequest(client, tx, params) {
             ticker: params.ticker,
             senderRequest: req,
             accountId: params.accountId,
-            orderId: params.orderId,
-            currentTriggerPrice: params.currentTriggerPrice,
-            orderTypeTag: params.orderTypeTag,
-            newSize: params.newSize,
-            newTriggerPrice: params.newTriggerPrice,
+            orderId: (0, validate_ts_1.toU64)(params.orderId, "orderId"),
+            currentTriggerPrice: (0, validate_ts_1.toU128)(params.currentTriggerPrice, "currentTriggerPrice"),
+            orderTypeTag: (0, validate_ts_1.toU8)(params.orderTypeTag, "orderTypeTag"),
+            newSize: (0, validate_ts_1.toU128)(params.newSize, "newSize"),
+            newTriggerPrice: (0, validate_ts_1.toU128)(params.newTriggerPrice, "newTriggerPrice"),
         },
         typeArguments: [params.collateralType, params.lpType ?? client.wlpType()],
     })(tx);
@@ -147,8 +161,8 @@ function cancelPreOrderRequest(client, tx, params) {
             ticker: params.ticker,
             senderRequest: req,
             accountId: params.accountId,
-            mainOrderId: params.mainOrderId,
-            preOrderId: params.preOrderId,
+            mainOrderId: (0, validate_ts_1.toU64)(params.mainOrderId, "mainOrderId"),
+            preOrderId: (0, validate_ts_1.toU64)(params.preOrderId, "preOrderId"),
         },
         typeArguments: [params.collateralType, params.lpType ?? client.wlpType()],
     })(tx);
@@ -166,7 +180,7 @@ function addPreOrderRequest(client, tx, params) {
             ticker: params.ticker,
             senderRequest: req,
             accountId: params.accountId,
-            mainOrderId: params.mainOrderId,
+            mainOrderId: (0, validate_ts_1.toU64)(params.mainOrderId, "mainOrderId"),
             preOrder: preArg,
         },
         typeArguments: [params.collateralType, params.lpType ?? client.wlpType()],

package/dist/cjs/src/perp/user/staking.js

@@ -55,6 +55,7 @@ exports.unstake = unstake;
 exports.claimReward = claimReward;
 const account_request_ts_1 = require("../../account/account-request.js");
 const staking = __importStar(require("../../generated/waterx_staking/waterx_staking.js"));
+const validate_ts_1 = require("../../utils/validate.js");
 function pool(client, stakeAlias) {
     const id = client.config.packages.waterx_staking?.pools?.[stakeAlias];
     if (!id) {
@@ -79,7 +80,7 @@ function stake(client, tx, params) {
             wxaRegistry: tx.object(client.config.packages.waterx_account.account_registry),
             accountId: params.accountId,
             accReq: req,
-            stakeAmount: params.stakeAmount,
+            stakeAmount: (0, validate_ts_1.toU64Arg)(params.stakeAmount, "stakeAmount"),
         },
         typeArguments: [params.stakeType],
     })(tx);
@@ -110,7 +111,7 @@ function unstake(client, tx, params) {
             wxaRegistry: tx.object(client.config.packages.waterx_account.account_registry),
             accountId: params.accountId,
             accReq: req,
-            withdrawalAmount: params.withdrawalAmount,
+            withdrawalAmount: (0, validate_ts_1.toU64Arg)(params.withdrawalAmount, "withdrawalAmount"),
         },
         typeArguments: [params.stakeType],
     })(tx);

package/dist/cjs/src/perp/user/trading.js

@@ -60,6 +60,7 @@ exports.openPositionByKeeper = openPositionByKeeper;
 exports.closePositionByKeeper = closePositionByKeeper;
 const account_request_ts_1 = require("../../account/account-request.js");
 const trading = __importStar(require("../../generated/waterx_perp/trading.js"));
+const validate_ts_1 = require("../../utils/validate.js");
 const constants_ts_1 = require("../constants.js");
 function typeArgs(client, t) {
     return [t.collateralType, t.lpType ?? client.wlpType()];
@@ -87,8 +88,8 @@ function closePositionRequest(client, tx, params) {
             ticker: params.ticker,
             senderRequest: req,
             accountId: params.accountId,
-            positionId: params.positionId,
-            acceptablePrice: params.acceptablePrice,
+            positionId: (0, validate_ts_1.toU64)(params.positionId, "positionId"),
+            acceptablePrice: (0, validate_ts_1.toU64)(params.acceptablePrice, "acceptablePrice"),
         },
         typeArguments: typeArgs(client, params),
     })(tx);
@@ -106,11 +107,11 @@ function increasePositionRequest(client, tx, params) {
             ticker: params.ticker,
             senderRequest: req,
             accountId: params.accountId,
-            orderId: params.orderId ?? null,
-            positionId: params.positionId,
-            collateralAmount: params.collateralAmount,
-            size: params.size,
-            acceptablePrice: params.acceptablePrice,
+            orderId: (0, validate_ts_1.toU64OrNull)(params.orderId, "orderId"),
+            positionId: (0, validate_ts_1.toU64)(params.positionId, "positionId"),
+            collateralAmount: (0, validate_ts_1.toU64)(params.collateralAmount, "collateralAmount"),
+            size: (0, validate_ts_1.toU128)(params.size, "size"),
+            acceptablePrice: (0, validate_ts_1.toU64)(params.acceptablePrice, "acceptablePrice"),
         },
         typeArguments: typeArgs(client, params),
     })(tx);
@@ -128,9 +129,9 @@ function decreasePositionRequest(client, tx, params) {
             ticker: params.ticker,
             senderRequest: req,
             accountId: params.accountId,
-            positionId: params.positionId,
-            size: params.size,
-            acceptablePrice: params.acceptablePrice,
+            positionId: (0, validate_ts_1.toU64)(params.positionId, "positionId"),
+            size: (0, validate_ts_1.toU128)(params.size, "size"),
+            acceptablePrice: (0, validate_ts_1.toU64)(params.acceptablePrice, "acceptablePrice"),
         },
         typeArguments: typeArgs(client, params),
     })(tx);
@@ -148,8 +149,8 @@ function depositCollateralRequest(client, tx, params) {
             ticker: params.ticker,
             senderRequest: req,
             accountId: params.accountId,
-            positionId: params.positionId,
-            collateralAmount: params.collateralAmount,
+            positionId: (0, validate_ts_1.toU64)(params.positionId, "positionId"),
+            collateralAmount: (0, validate_ts_1.toU64)(params.collateralAmount, "collateralAmount"),
         },
         typeArguments: typeArgs(client, params),
     })(tx);
@@ -167,8 +168,8 @@ function withdrawCollateralRequest(client, tx, params) {
             ticker: params.ticker,
             senderRequest: req,
             accountId: params.accountId,
-            positionId: params.positionId,
-            amount: params.amount,
+            positionId: (0, validate_ts_1.toU64)(params.positionId, "positionId"),
+            amount: (0, validate_ts_1.toU64)(params.amount, "amount"),
         },
         typeArguments: typeArgs(client, params),
     })(tx);
@@ -202,7 +203,7 @@ function liquidate(client, tx, params) {
             ticker: params.ticker,
             pool: tx.object(obj.wlpPool),
             senderRequest: req,
-            positionId: params.positionId,
+            positionId: (0, validate_ts_1.toU64)(params.positionId, "positionId"),
             oracle: tx.object(obj.oracle),
         },
         typeArguments: typeArgs(client, params),
@@ -221,8 +222,8 @@ function batchLiquidate(client, tx, params) {
             pool: tx.object(obj.wlpPool),
             senderRequest: req,
             oracle: tx.object(obj.oracle),
-            pageSize: params.pageSize,
-            pageIndex: params.pageIndex,
+            pageSize: (0, validate_ts_1.toU64)(params.pageSize, "pageSize"),
+            pageIndex: (0, validate_ts_1.toU64)(params.pageIndex, "pageIndex"),
         },
         typeArguments: typeArgs(client, params),
     })(tx);
@@ -240,9 +241,9 @@ function matchOrders(client, tx, params) {
             pool: tx.object(obj.wlpPool),
             senderRequest: req,
             oracle: tx.object(obj.oracle),
-            orderTypeTag: params.orderTypeTag,
-            triggerPrice: params.triggerPrice,
-            maxFills: params.maxFills,
+            orderTypeTag: (0, validate_ts_1.toU8)(params.orderTypeTag, "orderTypeTag"),
+            triggerPrice: (0, validate_ts_1.toU128)(params.triggerPrice, "triggerPrice"),
+            maxFills: (0, validate_ts_1.toU64)(params.maxFills, "maxFills"),
         },
         typeArguments: typeArgs(client, params),
     })(tx);
@@ -278,8 +279,8 @@ function openPositionByKeeper(client, tx, params) {
             accountObjectAddress: params.accountObjectAddress,
             collateralCoin: params.collateralCoin,
             isLong: params.isLong,
-            size: params.size,
-            acceptablePrice: params.acceptablePrice,
+            size: (0, validate_ts_1.toU128)(params.size, "size"),
+            acceptablePrice: (0, validate_ts_1.toU64)(params.acceptablePrice, "acceptablePrice"),
             oracle: tx.object(obj.oracle),
         },
         typeArguments: typeArgs(client, params),
@@ -297,8 +298,8 @@ function closePositionByKeeper(client, tx, params) {
             ticker: params.ticker,
             pool: tx.object(obj.wlpPool),
             keeperRequest: req,
-            positionId: params.positionId,
-            acceptablePrice: params.acceptablePrice,
+            positionId: (0, validate_ts_1.toU64)(params.positionId, "positionId"),
+            acceptablePrice: (0, validate_ts_1.toU64)(params.acceptablePrice, "acceptablePrice"),
             oracle: tx.object(obj.oracle),
         },
         typeArguments: typeArgs(client, params),

package/dist/cjs/src/perp/user/wlp.js

@@ -51,6 +51,7 @@ exports.settleRedeemWlp = settleRedeemWlp;
 exports.updateTokenValue = updateTokenValue;
 const account_request_ts_1 = require("../../account/account-request.js");
 const lp = __importStar(require("../../generated/waterx_perp/lp_pool.js"));
+const validate_ts_1 = require("../../utils/validate.js");
 /** Returns the minted `lp_amount` so it can be chained into e.g. `stake`. */
 function mintWlp(client, tx, params) {
     const req = (0, account_request_ts_1.makeSenderRequest)(client, tx, params.bucketAccount);
@@ -63,8 +64,8 @@ function mintWlp(client, tx, params) {
             aum: tx.object(requireWlpAum(client)),
             senderRequest: req,
             accountId: params.accountId,
-            depositAmount: params.depositAmount,
-            minLpAmount: params.minLpAmount,
+            depositAmount: (0, validate_ts_1.toU64)(params.depositAmount, "depositAmount"),
+            minLpAmount: (0, validate_ts_1.toU64)(params.minLpAmount, "minLpAmount"),
             oracle: tx.object(client.config.packages.waterx_oracle.oracle),
         },
         typeArguments: [params.lpType ?? client.wlpType(), params.depositTokenType],
@@ -88,7 +89,7 @@ function requestRedeemWlp(client, tx, params) {
             wxaRegistry: tx.object(client.config.packages.waterx_account.account_registry),
             senderRequest: req,
             accountId: params.accountId,
-            lpAmount: params.lpAmount,
+            lpAmount: (0, validate_ts_1.toU64)(params.lpAmount, "lpAmount"),
         },
         typeArguments: [params.lpType ?? client.wlpType(), params.redeemTokenType],
     })(tx);
@@ -102,7 +103,7 @@ function cancelRedeemWlp(client, tx, params) {
             globalConfig: tx.object(client.config.packages.waterx_perp.global_config),
             wxaRegistry: tx.object(client.config.packages.waterx_account.account_registry),
             senderRequest: req,
-            requestId: params.requestId,
+            requestId: (0, validate_ts_1.toU64)(params.requestId, "requestId"),
         },
         typeArguments: [params.lpType ?? client.wlpType()],
     })(tx);
@@ -117,7 +118,7 @@ function settleRedeemWlp(client, tx, params) {
             wxaRegistry: tx.object(client.config.packages.waterx_account.account_registry),
             operatorRequest: req,
             aum: tx.object(requireWlpAum(client)),
-            requestId: params.requestId,
+            requestId: (0, validate_ts_1.toU64)(params.requestId, "requestId"),
             oracle: tx.object(client.config.packages.waterx_oracle.oracle),
         },
         typeArguments: [params.lpType ?? client.wlpType(), params.redeemTokenType],

package/dist/cjs/src/prediction/utils.d.ts

@@ -10,8 +10,17 @@ export declare function resolveSettlementCoinType(client: PredictClient, coinTyp
 export declare function resolveMarketRegistry(client: PredictClient, marketRegistry?: string): string;
 export declare function resolveAccountRegistry(client: PredictClient, accountRegistry?: string): string;
 export declare function resolveGlobalConfig(client: PredictClient, globalConfig?: string): string;
-/** Ensures `value` is a valid unsigned 64-bit integer. */
-export declare function assertU64(value: bigint, name?: string): bigint;
+/**
+ * Ensures `value` is a valid unsigned 64-bit integer.
+ *
+ * Thin alias for the shared `utils/validate.toU64` — the u64 domain rule
+ * (bigint range check; a `number` must be a NON-NEGATIVE SAFE integer, since
+ * `2^53 + 2` passes `isInteger` yet has already lost f64 precision and would
+ * BCS-encode a silently-wrong value) is authored ONCE there for both product
+ * lines. Throws `RangeError` (a subclass of `Error`) naming the parameter.
+ */
+export declare function assertU64(value: bigint | number, name?: string): bigint;
+/** Normalize a u64-ish input (bigint / number / decimal string) to a checked `bigint`. */
 export declare function toBigInt(value: bigint | number | string): bigint;
 export declare function objectArg(tx: Transaction, value: ObjectArgument): TransactionArgument;
 export declare function idArg(tx: Transaction, value: IdArgument): TransactionArgument;

package/dist/cjs/src/prediction/utils.js

@@ -21,10 +21,11 @@ exports.marketIdArg = marketIdArg;
 exports.bytesToHex = bytesToHex;
 exports.optionU64 = optionU64;
 exports.receivingCoinArg = receivingCoinArg;
+const validate_ts_1 = require("../utils/validate.js");
 const constants_ts_1 = require("./constants.js");
 const SELECTIONS = ["YES", "NO"];
 const OUTCOMES = ["YES", "NO", "INVALID"];
-const U64_MAX = (1n << 64n) - 1n;
+const DECIMAL_INT_RE = /^\d+$/;
 function assertSelection(value) {
     if (SELECTIONS.includes(value))
         return value;
@@ -68,32 +69,31 @@ function resolveAccountRegistry(client, accountRegistry) {
 function resolveGlobalConfig(client, globalConfig) {
     return globalConfig === undefined || globalConfig === "" ? client.globalConfigId() : globalConfig;
 }
-/** Ensures `value` is a valid unsigned 64-bit integer. */
+/**
+ * Ensures `value` is a valid unsigned 64-bit integer.
+ *
+ * Thin alias for the shared `utils/validate.toU64` — the u64 domain rule
+ * (bigint range check; a `number` must be a NON-NEGATIVE SAFE integer, since
+ * `2^53 + 2` passes `isInteger` yet has already lost f64 precision and would
+ * BCS-encode a silently-wrong value) is authored ONCE there for both product
+ * lines. Throws `RangeError` (a subclass of `Error`) naming the parameter.
+ */
 function assertU64(value, name = "value") {
-    if (value < 0n) {
-        throw new Error(`${name} must be non-negative, got ${value}`);
-    }
-    if (value > U64_MAX) {
-        throw new Error(`${name} exceeds u64 max (${U64_MAX}), got ${value}`);
-    }
-    return value;
+    return (0, validate_ts_1.toU64)(value, name);
 }
+/** Normalize a u64-ish input (bigint / number / decimal string) to a checked `bigint`. */
 function toBigInt(value) {
-    if (typeof value === "bigint") {
+    if (typeof value !== "string")
         return assertU64(value);
-    }
-    if (typeof value === "number") {
-        if (!Number.isInteger(value)) {
-            throw new Error(`Invalid integer: ${value}`);
-        }
-        return assertU64(BigInt(value));
-    }
+    // String is the one form the shared guard does not cover: digits parse exactly
+    // past the 2^53 f64 cliff, so the shape check lives here and the numeric
+    // domain still funnels through assertU64.
     const trimmed = value.trim();
     if (trimmed === "") {
-        throw new Error("Invalid integer: empty string");
+        throw new RangeError("Invalid integer: empty string");
     }
-    if (!/^\d+$/.test(trimmed)) {
-        throw new Error(`Invalid integer: ${JSON.stringify(value)}`);
+    if (!DECIMAL_INT_RE.test(trimmed)) {
+        throw new RangeError(`Invalid integer: ${JSON.stringify(value)}`);
     }
     return assertU64(BigInt(trimmed));
 }
@@ -184,8 +184,8 @@ function optionU64(value) {
 function formatObjectVersion(version) {
     if (typeof version === "string") {
         const trimmed = version.trim();
-        if (trimmed === "" || !/^\d+$/.test(trimmed)) {
-            throw new Error(`Invalid object version: ${JSON.stringify(version)}`);
+        if (trimmed === "" || !DECIMAL_INT_RE.test(trimmed)) {
+            throw new RangeError(`Invalid object version: ${JSON.stringify(version)}`);
         }
         return trimmed;
     }