@waterx/sdk 3.0.3 → 3.1.0

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

@@ -40,6 +40,17 @@ export declare class PredictClient extends BaseLineClient<WaterxPredictionConfig
     waterxAccountAdminCap(): string;
     waterxPredictionGiftPackageId(): string;
     claimableLinkConfigId(): string;
+    /**
+     * Original (first-published) id of the gift package. Used ONLY for the
+     * `GiftKey` type tag in derived-object address computation
+     * (`deriveGiftAddress`). Sui pins a struct's type identity to its
+     * defining package's *original* id — it never advances across upgrades,
+     * unlike `published_at`. So the off-chain `gift_id` derivation must key
+     * on this, or it diverges from the on-chain `derive_gift_address` after
+     * the first upgrade. Falls back to `published_at` when `original_id` is
+     * absent (fresh deployments where the two are equal).
+     */
+    waterxPredictionGiftTypeOriginId(): string;
     waterxReferralPackageId(): string;
     referralTableId(): string;
 }

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

@@ -71,6 +71,22 @@ class PredictClient extends base_client_ts_1.BaseLineClient {
     claimableLinkConfigId() {
         return requireConfigValue(this.config.packages.waterx_prediction_gift, "claimable_link_config", "packages.waterx_prediction_gift.claimable_link_config");
     }
+    /**
+     * Original (first-published) id of the gift package. Used ONLY for the
+     * `GiftKey` type tag in derived-object address computation
+     * (`deriveGiftAddress`). Sui pins a struct's type identity to its
+     * defining package's *original* id — it never advances across upgrades,
+     * unlike `published_at`. So the off-chain `gift_id` derivation must key
+     * on this, or it diverges from the on-chain `derive_gift_address` after
+     * the first upgrade. Falls back to `published_at` when `original_id` is
+     * absent (fresh deployments where the two are equal).
+     */
+    waterxPredictionGiftTypeOriginId() {
+        const origin = this.config.packages.waterx_prediction_gift?.original_id;
+        return typeof origin === "string" && origin.length > 0
+            ? origin
+            : this.waterxPredictionGiftPackageId();
+    }
     waterxReferralPackageId() {
         return requireConfigValue(this.config.packages.waterx_referral, "published_at", "packages.waterx_referral.published_at");
     }

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

@@ -25,6 +25,16 @@ import type { AccountIdentityParams, IdArgument, Selection } from "./types.ts";
 export interface GiftBaseParams {
     /** `waterx_prediction_gift` package id. Defaults to `client.waterxPredictionGiftPackageId()`. */
     giftPackageId?: string;
+    /**
+     * `waterx_prediction_gift` *original* (first-published) package id, used
+     * ONLY for the `GiftKey` type tag in {@link deriveGiftAddress}. Defaults to
+     * `client.waterxPredictionGiftTypeOriginId()` (config `original_id`, falling
+     * back to `giftPackageId`/`published_at`). Distinct from `giftPackageId`,
+     * which selects the *runtime* package for moveCall targets — after a package
+     * upgrade the two diverge, and only the original id reproduces the on-chain
+     * `gift_id`. Override only for offline derivation against a custom deploy.
+     */
+    giftTypeOriginId?: string;
     /** `ClaimableLinkConfig` object id. Defaults to `client.claimableLinkConfigId()`. */
     claimableLinkConfig?: string;
     /** Collateral / settlement coin type for the position's `Gift<T>`. Defaults to `client.settlementCoinType()`. */
@@ -72,6 +82,15 @@ export declare function signGiftClaim(giftKeypair: Ed25519Keypair, giftId: strin
 /**
  * Compute the `gift_id` that `create_gift` will produce for the given
  * pubkey, offline. No RPC. Mirrors `claimable_link::derive_gift_address`.
+ *
+ * The `GiftKey` type tag is keyed on the gift package's *original* id
+ * (via {@link resolveGiftTypeOriginId}), NOT `published_at`. On Sui a
+ * struct's type identity stays pinned to its defining package's original
+ * id and never advances across upgrades, so `derive_gift_address`
+ * hashes `GiftKey` under that original id. Using `published_at` here would
+ * silently diverge from the chain after the first package upgrade, yielding
+ * the wrong `gift_id` for every gift. The moveCall targets elsewhere in
+ * this module correctly stay on `published_at` (latest code).
  */
 export declare function deriveGiftAddress(client: PredictClient, pubkey: Uint8Array, params?: GiftBaseParams): string;
 export interface CreateGiftParams extends GiftBaseParams, GiftReferralParams, AccountIdentityParams {

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

@@ -54,6 +54,22 @@ function resolveGiftPackageId(client, override) {
         ? client.waterxPredictionGiftPackageId()
         : override;
 }
+/**
+ * Resolve the package id for the `GiftKey` type tag in
+ * {@link deriveGiftAddress}. Precedence: explicit `giftTypeOriginId`, then
+ * the runtime `giftPackageId` override (a self-contained deploy where
+ * original == published), then the client's config `original_id` (falling
+ * back to `published_at`). This must key on the *original* id so the
+ * off-chain derivation matches the on-chain type identity, which never
+ * advances across package upgrades.
+ */
+function resolveGiftTypeOriginId(client, originOverride, pkgOverride) {
+    if (originOverride !== undefined && originOverride !== "")
+        return originOverride;
+    if (pkgOverride !== undefined && pkgOverride !== "")
+        return pkgOverride;
+    return client.waterxPredictionGiftTypeOriginId();
+}
 function resolveClaimableLinkConfig(client, override) {
     return override === undefined || override === "" ? client.claimableLinkConfigId() : override;
 }
@@ -167,12 +183,21 @@ const GiftKeyBcs = bcs_1.bcs.struct("GiftKey", {
 /**
  * Compute the `gift_id` that `create_gift` will produce for the given
  * pubkey, offline. No RPC. Mirrors `claimable_link::derive_gift_address`.
+ *
+ * The `GiftKey` type tag is keyed on the gift package's *original* id
+ * (via {@link resolveGiftTypeOriginId}), NOT `published_at`. On Sui a
+ * struct's type identity stays pinned to its defining package's original
+ * id and never advances across upgrades, so `derive_gift_address`
+ * hashes `GiftKey` under that original id. Using `published_at` here would
+ * silently diverge from the chain after the first package upgrade, yielding
+ * the wrong `gift_id` for every gift. The moveCall targets elsewhere in
+ * this module correctly stay on `published_at` (latest code).
  */
 function deriveGiftAddress(client, pubkey, params = {}) {
     if (pubkey.length !== constants_ts_1.GIFT_PUBKEY_LEN) {
         throw new Error(`Gift pubkey must be ${constants_ts_1.GIFT_PUBKEY_LEN} bytes, got ${pubkey.length}`);
     }
-    const giftPkg = resolveGiftPackageId(client, params.giftPackageId);
+    const giftPkg = resolveGiftTypeOriginId(client, params.giftTypeOriginId, params.giftPackageId);
     const configId = resolveClaimableLinkConfig(client, params.claimableLinkConfig);
     const keyBytes = GiftKeyBcs.serialize({ pubkey: Array.from(pubkey) }).toBytes();
     return (0, utils_1.deriveObjectID)(configId, `${giftPkg}::claimable_link::GiftKey`, keyBytes);

package/dist/src/prediction/client.d.ts

@@ -40,6 +40,17 @@ export declare class PredictClient extends BaseLineClient<WaterxPredictionConfig
     waterxAccountAdminCap(): string;
     waterxPredictionGiftPackageId(): string;
     claimableLinkConfigId(): string;
+    /**
+     * Original (first-published) id of the gift package. Used ONLY for the
+     * `GiftKey` type tag in derived-object address computation
+     * (`deriveGiftAddress`). Sui pins a struct's type identity to its
+     * defining package's *original* id — it never advances across upgrades,
+     * unlike `published_at`. So the off-chain `gift_id` derivation must key
+     * on this, or it diverges from the on-chain `derive_gift_address` after
+     * the first upgrade. Falls back to `published_at` when `original_id` is
+     * absent (fresh deployments where the two are equal).
+     */
+    waterxPredictionGiftTypeOriginId(): string;
     waterxReferralPackageId(): string;
     referralTableId(): string;
 }

package/dist/src/prediction/client.js

@@ -68,6 +68,22 @@ export class PredictClient extends BaseLineClient {
     claimableLinkConfigId() {
         return requireConfigValue(this.config.packages.waterx_prediction_gift, "claimable_link_config", "packages.waterx_prediction_gift.claimable_link_config");
     }
+    /**
+     * Original (first-published) id of the gift package. Used ONLY for the
+     * `GiftKey` type tag in derived-object address computation
+     * (`deriveGiftAddress`). Sui pins a struct's type identity to its
+     * defining package's *original* id — it never advances across upgrades,
+     * unlike `published_at`. So the off-chain `gift_id` derivation must key
+     * on this, or it diverges from the on-chain `derive_gift_address` after
+     * the first upgrade. Falls back to `published_at` when `original_id` is
+     * absent (fresh deployments where the two are equal).
+     */
+    waterxPredictionGiftTypeOriginId() {
+        const origin = this.config.packages.waterx_prediction_gift?.original_id;
+        return typeof origin === "string" && origin.length > 0
+            ? origin
+            : this.waterxPredictionGiftPackageId();
+    }
     waterxReferralPackageId() {
         return requireConfigValue(this.config.packages.waterx_referral, "published_at", "packages.waterx_referral.published_at");
     }

package/dist/src/prediction/gift.d.ts

@@ -25,6 +25,16 @@ import type { AccountIdentityParams, IdArgument, Selection } from "./types.ts";
 export interface GiftBaseParams {
     /** `waterx_prediction_gift` package id. Defaults to `client.waterxPredictionGiftPackageId()`. */
     giftPackageId?: string;
+    /**
+     * `waterx_prediction_gift` *original* (first-published) package id, used
+     * ONLY for the `GiftKey` type tag in {@link deriveGiftAddress}. Defaults to
+     * `client.waterxPredictionGiftTypeOriginId()` (config `original_id`, falling
+     * back to `giftPackageId`/`published_at`). Distinct from `giftPackageId`,
+     * which selects the *runtime* package for moveCall targets — after a package
+     * upgrade the two diverge, and only the original id reproduces the on-chain
+     * `gift_id`. Override only for offline derivation against a custom deploy.
+     */
+    giftTypeOriginId?: string;
     /** `ClaimableLinkConfig` object id. Defaults to `client.claimableLinkConfigId()`. */
     claimableLinkConfig?: string;
     /** Collateral / settlement coin type for the position's `Gift<T>`. Defaults to `client.settlementCoinType()`. */
@@ -72,6 +82,15 @@ export declare function signGiftClaim(giftKeypair: Ed25519Keypair, giftId: strin
 /**
  * Compute the `gift_id` that `create_gift` will produce for the given
  * pubkey, offline. No RPC. Mirrors `claimable_link::derive_gift_address`.
+ *
+ * The `GiftKey` type tag is keyed on the gift package's *original* id
+ * (via {@link resolveGiftTypeOriginId}), NOT `published_at`. On Sui a
+ * struct's type identity stays pinned to its defining package's original
+ * id and never advances across upgrades, so `derive_gift_address`
+ * hashes `GiftKey` under that original id. Using `published_at` here would
+ * silently diverge from the chain after the first package upgrade, yielding
+ * the wrong `gift_id` for every gift. The moveCall targets elsewhere in
+ * this module correctly stay on `published_at` (latest code).
  */
 export declare function deriveGiftAddress(client: PredictClient, pubkey: Uint8Array, params?: GiftBaseParams): string;
 export interface CreateGiftParams extends GiftBaseParams, GiftReferralParams, AccountIdentityParams {

package/dist/src/prediction/gift.js

@@ -32,6 +32,22 @@ function resolveGiftPackageId(client, override) {
         ? client.waterxPredictionGiftPackageId()
         : override;
 }
+/**
+ * Resolve the package id for the `GiftKey` type tag in
+ * {@link deriveGiftAddress}. Precedence: explicit `giftTypeOriginId`, then
+ * the runtime `giftPackageId` override (a self-contained deploy where
+ * original == published), then the client's config `original_id` (falling
+ * back to `published_at`). This must key on the *original* id so the
+ * off-chain derivation matches the on-chain type identity, which never
+ * advances across package upgrades.
+ */
+function resolveGiftTypeOriginId(client, originOverride, pkgOverride) {
+    if (originOverride !== undefined && originOverride !== "")
+        return originOverride;
+    if (pkgOverride !== undefined && pkgOverride !== "")
+        return pkgOverride;
+    return client.waterxPredictionGiftTypeOriginId();
+}
 function resolveClaimableLinkConfig(client, override) {
     return override === undefined || override === "" ? client.claimableLinkConfigId() : override;
 }
@@ -145,12 +161,21 @@ const GiftKeyBcs = bcs.struct("GiftKey", {
 /**
  * Compute the `gift_id` that `create_gift` will produce for the given
  * pubkey, offline. No RPC. Mirrors `claimable_link::derive_gift_address`.
+ *
+ * The `GiftKey` type tag is keyed on the gift package's *original* id
+ * (via {@link resolveGiftTypeOriginId}), NOT `published_at`. On Sui a
+ * struct's type identity stays pinned to its defining package's original
+ * id and never advances across upgrades, so `derive_gift_address`
+ * hashes `GiftKey` under that original id. Using `published_at` here would
+ * silently diverge from the chain after the first package upgrade, yielding
+ * the wrong `gift_id` for every gift. The moveCall targets elsewhere in
+ * this module correctly stay on `published_at` (latest code).
  */
 export function deriveGiftAddress(client, pubkey, params = {}) {
     if (pubkey.length !== GIFT_PUBKEY_LEN) {
         throw new Error(`Gift pubkey must be ${GIFT_PUBKEY_LEN} bytes, got ${pubkey.length}`);
     }
-    const giftPkg = resolveGiftPackageId(client, params.giftPackageId);
+    const giftPkg = resolveGiftTypeOriginId(client, params.giftTypeOriginId, params.giftPackageId);
     const configId = resolveClaimableLinkConfig(client, params.claimableLinkConfig);
     const keyBytes = GiftKeyBcs.serialize({ pubkey: Array.from(pubkey) }).toBytes();
     return deriveObjectID(configId, `${giftPkg}::claimable_link::GiftKey`, keyBytes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waterx/sdk",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "WaterX SDK — perpetuals and prediction markets on Sui",
   "license": "MIT",
   "author": "WaterX",