@soltracer/nft-staking 0.3.1 → 0.5.0

package/dist/traitProof.js

@@ -1,21 +1,36 @@
 /**
  * Trait-bonus proof builder for NFT-staking `claim_rewards`.
  *
- * The on-chain Ed25519 message embeds `staker.total_claimed` (a strictly
- * monotonic nonce). Callers MUST read the live `StakerAccount.totalClaimed`
- * immediately before signing.
+ * Design summary
+ * --------------
+ * The on-chain `claim_rewards` instruction accepts a SINGLE u64
+ * `traitBonusRate` per claim. When `pool.reward_config.trait_bonus_enabled`
+ * is `true`, that rate is added directly to the staker's effective rate for
+ * the accrual window. The chain has zero per-NFT or per-trait awareness —
+ * ALL bonus math (trait lookups, per-NFT multipliers, caps, etc.) happens
+ * off-chain in the project's trait-authority server, which signs the final
+ * aggregated rate.
  *
- * Message layout — 80 bytes, little-endian where applicable:
+ * Why per-NFT (not per-staker) multipliers
+ * ----------------------------------------
+ * An older design exposed a `BaseMultiplier` mode on-chain that multiplied
+ * the staker's ENTIRE effective rate (all NFTs combined). That meant a
+ * single "Mythic 2x" NFT doubled rewards for every plain NFT in the same
+ * claim — cross-contamination across NFTs. The new model evaluates each
+ * NFT's bonuses independently, applies its own optional multiplier to its
+ * own bonus sum, then sums those isolated per-NFT bonuses into the single
+ * signed `u64`. One NFT's multiplier never touches another NFT's reward.
+ *
+ * Ed25519 message layout — 80 bytes (LE where applicable):
  *
  *   [0..32]   pool                 (PublicKey bytes)
  *   [32..64]  staker wallet        (PublicKey bytes)
- *   [64..72]  trait_bonus_rate u64 (LE)
- *   [72..80]  total_claimed   u64  (LE)
+ *   [64..72]  traitBonusRate u64   (LE)
+ *   [72..80]  totalClaimed   u64   (LE — strictly monotonic replay nonce)
  *
- * Sign this byte payload with the pool's trait-authority Ed25519 keypair
- * (or the global trait authority) and prepend an Ed25519 instruction with
- * the signature, expected pubkey, and message to the same transaction that
- * invokes `claimRewards(..., traitBonusRate)`.
+ * Sign with the pool's trait-authority Ed25519 keypair (or the global
+ * `stakeConfig.authority` when the pool has no override) and prepend the
+ * Ed25519 precompile instruction in the same transaction as `claimRewards`.
  */
 import { toPk } from "@soltracer/core";
 /** Fixed message length consumed by the on-chain Ed25519 verifier. */
@@ -33,8 +48,8 @@ function u64LE(value) {
 /**
  * Build the 80-byte trait-proof message exactly as the on-chain handler
  * reconstructs it. `totalClaimed` must be the LIVE value of
- * `StakerAccount.totalClaimed` (i.e. fetched within the same client tx
- * preparation window — otherwise the signature will be rejected).
+ * `StakerAccount.totalClaimed` (fetched within the same tx prep window —
+ * otherwise the signature is rejected once the nonce advances).
  */
 export function buildTraitProofMessage(params) {
     const msg = Buffer.alloc(TRAIT_PROOF_MSG_LEN);
@@ -44,196 +59,115 @@ export function buildTraitProofMessage(params) {
     u64LE(params.totalClaimed).copy(msg, 72);
     return msg;
 }
-function normalizeKey(s) {
-    return s.trim().toLowerCase();
-}
-function bonusFromCatalogEntry(entry, traitBonusMode) {
-    const bps = BigInt(entry.bonusBps ?? 0);
-    const extra = BigInt(entry.fixedExtra ?? 0);
-    if (bps !== 0n && extra !== 0n) {
-        throw new Error(`computeTraitBonusRate: catalog entry "${entry.traitType}=${entry.value}" sets both bonusBps and fixedExtra; pick one.`);
+/**
+ * In-memory catalog suitable for tests and small static configurations.
+ * Keys are collection mints (base58).
+ */
+export class InMemoryTraitBonusStore {
+    entriesByCollection;
+    constructor(entriesByCollection) {
+        this.entriesByCollection = entriesByCollection;
     }
-    if (traitBonusMode === 1) {
-        if (bps !== 0n) {
-            throw new Error(`computeTraitBonusRate: traitBonusMode = FixedExtra but catalog entry "${entry.traitType}=${entry.value}" uses bonusBps. Use fixedExtra (raw reward per interval).`);
-        }
-        return extra;
+    static from(entries) {
+        const map = new Map();
+        for (const [k, v] of Object.entries(entries))
+            map.set(k, v);
+        return new InMemoryTraitBonusStore(map);
     }
-    if (extra !== 0n) {
-        throw new Error(`computeTraitBonusRate: traitBonusMode = BaseMultiplier but catalog entry "${entry.traitType}=${entry.value}" uses fixedExtra. Use bonusBps (10_000 = +100%).`);
+    async listForCollection(collectionMint) {
+        return this.entriesByCollection.get(collectionMint) ?? [];
     }
-    return bps;
 }
+/**
+ * Aggregate trait bonuses into a single absolute `u64` rate.
+ *
+ * Algorithm (per NFT, independently):
+ *   1. For every `(traitType, value)` on the NFT, look it up in `catalog`.
+ *   2. Sum every matched `bonus`. Unmatched traits contribute 0.
+ *   3. If `multiplierBps` is set, multiply the NFT's bonus sum by it / 10_000.
+ *      (Floor division — bonuses are integer raw units.)
+ *
+ * Final result = sum of per-NFT bonuses. A multiplier on one NFT cannot
+ * touch another NFT's contribution, eliminating the cross-contamination bug
+ * present in the old on-chain `BaseMultiplier` mode.
+ */
 export function computeTraitBonusRate(params) {
-    if (params.traitBonusMode === 0) {
-        return { traitBonusRate: 0n, perNft: [] };
-    }
-    const mode = params.traitBonusMode;
-    // Build a lookup keyed by normalized "type::value".
-    // Validates every catalog entry up-front so misconfigured entries are
-    // surfaced even if no NFT references them.
+    // Build an O(1) lookup map.
     const lookup = new Map();
-    for (const entry of params.catalog) {
-        const key = `${normalizeKey(entry.traitType)}::${normalizeKey(entry.value)}`;
-        if (lookup.has(key)) {
-            throw new Error(`computeTraitBonusRate: duplicate catalog entry for "${entry.traitType}=${entry.value}".`);
-        }
-        lookup.set(key, bonusFromCatalogEntry(entry, mode));
+    for (const e of params.catalog) {
+        lookup.set(`${e.traitType}\u0000${e.value}`, e.bonus);
     }
-    let total = 0n;
     const perNft = [];
+    let total = 0n;
     for (const nft of params.nfts) {
         let nftBonus = 0n;
-        let matched = 0;
-        for (const trait of nft.traits) {
-            const hit = lookup.get(`${normalizeKey(trait.traitType)}::${normalizeKey(trait.value)}`);
-            if (hit === undefined || hit === 0n)
-                continue;
-            nftBonus += hit;
-            matched += 1;
+        for (const t of nft.traits) {
+            const hit = lookup.get(`${t.traitType}\u0000${t.value}`);
+            if (hit !== undefined)
+                nftBonus += hit;
         }
-        total += nftBonus;
-        perNft.push({
-            mint: typeof nft.mint === "string" ? nft.mint : toPk(nft.mint).toBase58(),
-            bonus: nftBonus,
-            matchedTraits: matched,
-        });
-    }
-    return { traitBonusRate: total, perNft };
-}
-/**
- * @deprecated Use `computeTraitBonusRate` instead — it accepts the real per-NFT
- * trait input and a bonus catalog, mirroring the backend flow. Retained for
- * call sites that already pre-resolved a flat bonus array.
- */
-export function aggregateTraitBonusRate(traits, traitBonusMode) {
-    if (traitBonusMode === 0) {
-        if (traits.some((t) => (t.bonusBps ?? 0) !== 0 || (t.fixedExtra ?? 0) !== 0)) {
-            throw new Error("aggregateTraitBonusRate: pool.traitBonusMode === None — non-zero trait bonuses are rejected on-chain.");
-        }
-        return 0n;
-    }
-    let sum = 0n;
-    for (const t of traits) {
-        const bps = BigInt(t.bonusBps ?? 0);
-        const extra = BigInt(t.fixedExtra ?? 0);
-        if (bps !== 0n && extra !== 0n) {
-            throw new Error("aggregateTraitBonusRate: a single trait must set bonusBps OR fixedExtra, not both.");
-        }
-        if (traitBonusMode === 1) {
-            if (bps !== 0n) {
-                throw new Error("aggregateTraitBonusRate: traitBonusMode = FixedExtra expects fixedExtra (per-interval reward), not bonusBps.");
-            }
-            sum += extra;
-        }
-        else {
-            if (extra !== 0n) {
-                throw new Error("aggregateTraitBonusRate: traitBonusMode = BaseMultiplier expects bonusBps (10_000 = +100%), not fixedExtra.");
+        if (nft.multiplierBps !== undefined && nft.multiplierBps !== 10_000) {
+            if (nft.multiplierBps < 0) {
+                throw new Error(`multiplierBps must be >= 0 for mint ${nft.mint}`);
             }
-            sum += bps;
+            nftBonus = (nftBonus * BigInt(nft.multiplierBps)) / 10000n;
         }
+        perNft.push({ mint: nft.mint, bonus: nftBonus });
+        total += nftBonus;
+    }
+    // Guard the u64 upper bound — the on-chain field is `u64` and Anchor will
+    // reject anything that does not fit.
+    const U64_MAX = 18446744073709551615n;
+    if (total > U64_MAX) {
+        throw new Error(`aggregated trait bonus rate ${total} exceeds u64::MAX — cap your catalog or multipliers`);
     }
-    return sum;
+    return { traitBonusRate: total, perNft };
 }
 /**
- * End-to-end backend orchestrator for the trait-proof flow.
- *
- * Combines the four user-supplied dependencies — ownership validation, trait
- * resolution, the bonus-catalog store, and the on-chain staker nonce — into
- * the single signable payload the on-chain claim instruction expects.
+ * Full backend orchestration: ownership-verify each mint, resolve traits,
+ * aggregate via `computeTraitBonusRate`, and build the signed message.
  *
- * @example
- * ```ts
- * import {
- *   prepareTraitProof,
- *   type TraitBonusStore,
- * } from "@soltracer/nft-staking"
- *
- * // 1) Implement the store against your DB once (any DB works).
- * const traitBonusStore: TraitBonusStore = {
- *   async list({ poolId, projectId }) {
- *     const rows = await prisma.traitBonusConfig.findMany({
- *       where: { poolId, ...(projectId ? { projectId: String(projectId) } : {}) },
- *     })
- *     return rows.map((r) => ({
- *       traitType: r.traitType,
- *       value: r.traitValue,
- *       // pool is BaseMultiplier? use bonusBps. FixedExtra? use fixedExtra.
- *       bonusBps: r.bonusAmount,
- *     }))
- *   },
- * }
- *
- * // 2) Prepare the proof on each claim request.
- * const prepared = await prepareTraitProof({
- *   client,                       // NftStakingClient
- *   pool,                         // already-fetched StakePool (has rewardConfig + address)
- *   wallet: req.wallet,
- *   requestedMints: req.mints,
- *   store: traitBonusStore,
- *   resolveTraits: (mint) => catalog.getTraits(mint),
- * })
- *
- * // 3) Sign and respond.
- * const signature = nacl.sign.detached(prepared.message, traitAuthority.secretKey)
- * return {
- *   traitBonusRate: prepared.traitBonusRate.toString(),
- *   signature: Buffer.from(signature).toString("base64"),
- *   perNft: prepared.perNft,
- *   rejectedMints: prepared.rejectedMints,
- * }
- * ```
+ * The server is expected to sign `result.message` with the trait-authority
+ * Ed25519 keypair, return both the signature and `traitBonusRate` to the
+ * client, and the client forwards both into the `claimRewards` tx.
  */
-export async function prepareTraitProof(params) {
-    const wallet = toPk(params.wallet);
-    const poolPk = toPk(params.pool.address);
-    const mode = params.pool.rewardConfig.traitBonusMode;
-    // 1. Ownership / stake validation — drop anything the user does not actually have staked.
-    const validated = await params.validateOwnership({
-        wallet: wallet.toBase58(),
-        poolId: params.poolId ?? 0,
-        requestedMints: params.requestedMints,
-    });
-    const validatedSet = new Set(validated);
-    const validatedMints = params.requestedMints.filter((m) => validatedSet.has(m));
-    const rejectedMints = params.requestedMints.filter((m) => !validatedSet.has(m));
-    // 2 + 3. Resolve traits for each validated mint and load the bonus catalog.
-    const [nftTraits, catalog] = await Promise.all([
-        Promise.all(validatedMints.map(async (mint) => ({
-            mint,
-            traits: await params.resolveTraits(mint),
-        }))),
-        params.store.list({
-            poolId: params.poolId ?? 0,
-            projectId: params.projectId,
-        }),
-    ]);
-    // 4. Mode-aware aggregation.
+export async function prepareTraitProof(input) {
+    const walletStr = toPk(input.wallet).toBase58();
+    const ownershipChecks = await Promise.all(input.mints.map(async (mint) => ({
+        mint,
+        owned: await input.isStakedBy({ wallet: walletStr, poolId: input.poolId, mint }),
+    })));
+    const ownedMints = ownershipChecks.filter((c) => c.owned).map((c) => c.mint);
+    const rejectedMints = ownershipChecks.filter((c) => !c.owned).map((c) => c.mint);
+    const traitsByMint = await Promise.all(ownedMints.map(async (mint) => {
+        const r = await input.resolveTraits(mint);
+        return { mint, traits: r.traits, multiplierBps: r.multiplierBps };
+    }));
+    const catalog = await input.store.listForCollection(input.collectionMint);
     const { traitBonusRate, perNft } = computeTraitBonusRate({
-        traitBonusMode: mode,
         catalog,
-        nfts: nftTraits,
+        nfts: traitsByMint,
     });
-    // 5. Build the signable 80-byte message.
     const message = buildTraitProofMessage({
-        pool: poolPk,
-        wallet,
+        pool: input.pool,
+        wallet: input.wallet,
         traitBonusRate,
-        totalClaimed: params.totalClaimed,
+        totalClaimed: input.totalClaimed,
     });
-    return { traitBonusRate, validatedMints, rejectedMints, perNft, message };
+    return { message, traitBonusRate, perNft, rejectedMints };
 }
 /**
- * Convenience `StakedOwnershipResolver` that uses an `NftStakingClient` to
- * walk the wallet's stake entries and only allow mints currently staked in
- * `poolId`. Wire this into `prepareTraitProof({ validateOwnership })` if you
- * don't already have your own stake index.
+ * Adapter — turn an `NftStakingClient.fetchStakeEntriesByOwner` style call
+ * into a `StakedOwnershipResolver`. Pass in your already-constructed client.
+ *
+ * ```ts
+ * const isStakedBy = ownershipFromClient(client)
+ * ```
  */
 export function ownershipFromClient(client) {
-    return async ({ wallet, poolId, requestedMints }) => {
-        const entries = await client.fetchStakeEntriesByOwner(poolId, wallet);
-        const staked = new Set(entries.map((e) => e.nftMint.toBase58()));
-        return requestedMints.filter((m) => staked.has(m));
+    return async ({ wallet, poolId, mint }) => {
+        const entries = await client.fetchStakeEntriesByOwner(wallet, Number(poolId));
+        return entries.some((e) => Number(e.poolId) === Number(poolId) && e.nftMint.toBase58() === mint);
     };
 }
 //# sourceMappingURL=traitProof.js.map

package/dist/traitProof.js.map

@@ -1 +1 @@
-{"version":3,"file":"traitProof.js","sourceRoot":"","sources":["../src/traitProof.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"traitProof.js","sourceRoot":"","sources":["../src/traitProof.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soltracer/nft-staking",
-  "version": "0.3.1",
+  "version": "0.5.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,10 +10,15 @@
       "import": "./dist/index.js"
     }
   },
+  "scripts": {
+    "build": "tsc -p tsconfig.build.json",
+    "clean": "rm -rf dist",
+    "type-check": "tsc --noEmit"
+  },
   "dependencies": {
     "@noble/hashes": "^1.8.0",
-    "@soltracer/core": "0.3.1",
-    "@soltracer/cpi-accounts": "0.1.0"
+    "@soltracer/core": "workspace:*",
+    "@soltracer/cpi-accounts": "workspace:*"
   },
   "devDependencies": {
     "typescript": "^5.7.0"
@@ -26,10 +31,5 @@
     "@coral-xyz/anchor": "^0.32.1",
     "@solana/web3.js": "^1.98.4"
   },
-  "license": "MIT",
-  "scripts": {
-    "build": "tsc -p tsconfig.build.json",
-    "clean": "rm -rf dist",
-    "type-check": "tsc --noEmit"
-  }
-}
+  "license": "MIT"
+}