nara-sdk 1.0.82 → 1.0.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nara-sdk",
-  "version": "1.0.82",
+  "version": "1.0.84",
   "description": "SDK for the Nara chain (Solana-compatible)",
   "module": "index.ts",
   "main": "index.ts",

package/src/bridge.ts

@@ -51,6 +51,8 @@ export interface BridgeTokenConfig {
   decimals: number;
   /** Minimum per-transfer amount in raw units (rejected if below) */
   minAmount: bigint;
+  /** Minimum fee floor in raw units (fee = max(amount * bps, minFee)) */
+  minFee: bigint;
   solana: BridgeTokenSide;
   nara: BridgeTokenSide;
 }
@@ -130,7 +132,8 @@ export const BRIDGE_TOKENS: Record<string, BridgeTokenConfig> = {
   USDC: {
     symbol: "USDC",
     decimals: 6,
-    minAmount: 100_000n, // 0.1 USDC
+    minAmount: 5_000_000n, // 5 USDC
+    minFee:    500_000n,   // 0.5 USDC (fee floor)
     solana: {
       warpProgram: new PublicKey("4GcZJTa8s9vxtTz97Vj1RrwKMqPkT3DiiJkvUQDwsuZP"),
       mode: "collateral",
@@ -147,7 +150,8 @@ export const BRIDGE_TOKENS: Record<string, BridgeTokenConfig> = {
   USDT: {
     symbol: "USDT",
     decimals: 6,
-    minAmount: 100_000n, // 0.1 USDT
+    minAmount: 5_000_000n, // 5 USDT
+    minFee:    500_000n,   // 0.5 USDT (fee floor)
     solana: {
       warpProgram: new PublicKey("DCTt9H3pwwU89qC3Z4voYNThZypV68AwhYNzMNBxWXoy"),
       mode: "collateral",
@@ -164,7 +168,8 @@ export const BRIDGE_TOKENS: Record<string, BridgeTokenConfig> = {
   SOL: {
     symbol: "SOL",
     decimals: 9,
-    minAmount: 1_000_000n, // 0.001 SOL
+    minAmount: 100_000_000n, // 0.1 SOL
+    minFee:    10_000_000n,  // 0.01 SOL (fee floor)
     solana: {
       warpProgram: new PublicKey("46MmAWwKRAt9uvn7m44NXbVq2DCWBQE2r1TDw25nyXrt"),
       mode: "native",
@@ -326,19 +331,32 @@ export function encodeTransferRemote(
 // ─── Fee calculation ──────────────────────────────────────────────
 
 export interface FeeSplit {
+  /** Total fee (max of percentage and minFee) in raw units */
   feeAmount: bigint;
+  /** Net amount bridged after fee */
   bridgeAmount: bigint;
+  /** Percentage part (bps) used */
   feeBps: number;
+  /** Fee floor in raw units */
+  minFee: bigint;
 }
 
-export function calculateBridgeFee(amount: bigint, feeBps?: number): FeeSplit {
+/**
+ * Calculate the bridge fee: max(amount * bps / 10000, minFee)
+ */
+export function calculateBridgeFee(
+  amount: bigint,
+  feeBps?: number,
+  minFee: bigint = 0n
+): FeeSplit {
   const bps = feeBps ?? DEFAULT_BRIDGE_FEE_BPS;
   if (bps < 0 || bps > BRIDGE_FEE_BPS_DENOMINATOR) {
     throw new Error(`Invalid feeBps: ${bps}`);
   }
-  const feeAmount = (amount * BigInt(bps)) / BigInt(BRIDGE_FEE_BPS_DENOMINATOR);
+  const pctFee = (amount * BigInt(bps)) / BigInt(BRIDGE_FEE_BPS_DENOMINATOR);
+  const feeAmount = pctFee > minFee ? pctFee : minFee;
   const bridgeAmount = amount - feeAmount;
-  return { feeAmount, bridgeAmount, feeBps: bps };
+  return { feeAmount, bridgeAmount, feeBps: bps, minFee };
 }
 
 // ─── Fee instruction builder ──────────────────────────────────────
@@ -538,11 +556,11 @@ export function makeBridgeIxs(params: BridgeTransferParams): BridgeIxsResult {
   }
 
   const split = skipFee
-    ? { feeAmount: 0n, bridgeAmount: amount, feeBps: 0 }
-    : calculateBridgeFee(amount, feeBps);
+    ? { feeAmount: 0n, bridgeAmount: amount, feeBps: 0, minFee: 0n }
+    : calculateBridgeFee(amount, feeBps, tokenCfg.minFee);
 
   if (split.bridgeAmount <= 0n) {
-    throw new Error("bridge amount after fee is zero — increase amount or lower feeBps");
+    throw new Error("bridge amount after fee is zero — increase amount or lower fee");
   }
 
   const recipientForFee = feeRecipient ?? getBridgeFeeRecipient(fromChain);

package/src/idls/nara_quest.json

@@ -761,6 +761,10 @@
         {
           "name": "max_reward_count",
           "type": "u32"
+        },
+        {
+          "name": "free_stake_multiplier",
+          "type": "u32"
         }
       ]
     },
@@ -1910,6 +1914,11 @@
       "code": 6022,
       "name": "InsufficientAirdrop",
       "msg": "Airdrop fund has insufficient balance"
+    },
+    {
+      "code": 6023,
+      "name": "InvalidMultiplier",
+      "msg": "Multiplier must be >= 1"
     }
   ],
   "types": [
@@ -2006,12 +2015,16 @@
             "name": "max_airdrop_count",
             "type": "u32"
           },
+          {
+            "name": "free_stake_multiplier",
+            "type": "u32"
+          },
           {
             "name": "_padding",
             "type": {
               "array": [
                 "u8",
-                20
+                16
               ]
             }
           }
@@ -2049,15 +2062,15 @@
             "type": "u64"
           },
           {
-            "name": "reward_count",
+            "name": "stake_reward_count",
             "type": "u32"
           },
           {
-            "name": "reward_per_winner",
+            "name": "stake_reward_per_winner",
             "type": "u64"
           },
           {
-            "name": "winner_count",
+            "name": "stake_winner_count",
             "type": "u32"
           },
           {
@@ -2080,12 +2093,24 @@
             "name": "avg_participant_stake",
             "type": "u64"
           },
+          {
+            "name": "free_reward_count",
+            "type": "u32"
+          },
+          {
+            "name": "free_reward_per_winner",
+            "type": "u64"
+          },
+          {
+            "name": "free_winner_count",
+            "type": "u32"
+          },
           {
             "name": "_padding",
             "type": {
               "array": [
                 "u8",
-                64
+                48
               ]
             }
           }

package/src/idls/nara_quest.ts

@@ -767,6 +767,10 @@ export type NaraQuest = {
         {
           "name": "maxRewardCount",
           "type": "u32"
+        },
+        {
+          "name": "freeStakeMultiplier",
+          "type": "u32"
         }
       ]
     },
@@ -1916,6 +1920,11 @@ export type NaraQuest = {
       "code": 6022,
       "name": "insufficientAirdrop",
       "msg": "Airdrop fund has insufficient balance"
+    },
+    {
+      "code": 6023,
+      "name": "invalidMultiplier",
+      "msg": "Multiplier must be >= 1"
     }
   ],
   "types": [
@@ -2012,12 +2021,16 @@ export type NaraQuest = {
             "name": "maxAirdropCount",
             "type": "u32"
           },
+          {
+            "name": "freeStakeMultiplier",
+            "type": "u32"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                20
+                16
               ]
             }
           }
@@ -2055,15 +2068,15 @@ export type NaraQuest = {
             "type": "u64"
           },
           {
-            "name": "rewardCount",
+            "name": "stakeRewardCount",
             "type": "u32"
           },
           {
-            "name": "rewardPerWinner",
+            "name": "stakeRewardPerWinner",
             "type": "u64"
           },
           {
-            "name": "winnerCount",
+            "name": "stakeWinnerCount",
             "type": "u32"
           },
           {
@@ -2086,12 +2099,24 @@ export type NaraQuest = {
             "name": "avgParticipantStake",
             "type": "u64"
           },
+          {
+            "name": "freeRewardCount",
+            "type": "u32"
+          },
+          {
+            "name": "freeRewardPerWinner",
+            "type": "u64"
+          },
+          {
+            "name": "freeWinnerCount",
+            "type": "u32"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                64
+                48
               ]
             }
           }

package/src/quest.ts

@@ -45,11 +45,18 @@ export interface QuestInfo {
   round: string;
   question: string;
   answerHash: number[];
-  rewardPerWinner: number;
+  /** Total reward pool for the round (stake + free), in NARA */
   totalReward: number;
-  rewardCount: number;
-  winnerCount: number;
-  remainingSlots: number;
+  /** Stake-gated reward bucket */
+  stakeRewardCount: number;
+  stakeWinnerCount: number;
+  stakeRewardPerWinner: number;
+  stakeRemainingSlots: number;
+  /** Credit (free-stake) reward bucket — consumed by stakeInfo.freeCredits */
+  creditRewardCount: number;
+  creditWinnerCount: number;
+  creditRewardPerWinner: number;
+  creditRemainingSlots: number;
   difficulty: number;
   deadline: number;
   timeRemaining: number;
@@ -323,16 +330,25 @@ export async function getQuestInfo(
     stakeHigh, stakeLow, createdAtMs, decayMs, nowMs
   );
 
+  const stakeRewardCount = pool.stakeRewardCount;
+  const stakeWinnerCount = pool.stakeWinnerCount;
+  const creditRewardCount = pool.freeRewardCount;
+  const creditWinnerCount = pool.freeWinnerCount;
+
   return {
     active,
     round: pool.round.toString(),
     question: pool.question,
     answerHash: Array.from(pool.answerHash),
-    rewardPerWinner: pool.rewardPerWinner.toNumber() / LAMPORTS_PER_SOL,
     totalReward: pool.rewardAmount.toNumber() / LAMPORTS_PER_SOL,
-    rewardCount: pool.rewardCount,
-    winnerCount: pool.winnerCount,
-    remainingSlots: Math.max(0, pool.rewardCount - pool.winnerCount),
+    stakeRewardCount,
+    stakeWinnerCount,
+    stakeRewardPerWinner: pool.stakeRewardPerWinner.toNumber() / LAMPORTS_PER_SOL,
+    stakeRemainingSlots: Math.max(0, stakeRewardCount - stakeWinnerCount),
+    creditRewardCount,
+    creditWinnerCount,
+    creditRewardPerWinner: pool.freeRewardPerWinner.toNumber() / LAMPORTS_PER_SOL,
+    creditRemainingSlots: Math.max(0, creditRewardCount - creditWinnerCount),
     difficulty: pool.difficulty,
     deadline,
     timeRemaining: secsLeft,
@@ -758,17 +774,21 @@ export async function initializeQuest(
 
 /**
  * Set the reward config (authority only).
+ *
+ * @param freeStakeMultiplier - Multiplier for users answering with free credits
+ *                              vs stake-based winners (must be >= 1).
  */
 export async function setRewardConfig(
   connection: Connection,
   wallet: Keypair,
   minRewardCount: number,
   maxRewardCount: number,
+  freeStakeMultiplier: number,
   options?: QuestOptions
 ): Promise<string> {
   const program = createProgram(connection, wallet, options?.programId);
   const ix = await program.methods
-    .setRewardConfig(minRewardCount, maxRewardCount)
+    .setRewardConfig(minRewardCount, maxRewardCount, freeStakeMultiplier)
     .accounts({ authority: wallet.publicKey } as any)
     .instruction();
   return sendTx(connection, wallet, [ix]);
@@ -888,6 +908,7 @@ export async function getQuestConfig(
   stakeAuthority: PublicKey;
   airdropAmount: number;
   maxAirdropCount: number;
+  freeStakeMultiplier: number;
 }> {
   const kp = Keypair.generate();
   const program = createProgram(connection, kp, options?.programId);
@@ -912,6 +933,7 @@ export async function getQuestConfig(
     stakeAuthority: config.stakeAuthority,
     airdropAmount: Number(config.airdropAmount.toString()),
     maxAirdropCount: config.maxAirdropCount,
+    freeStakeMultiplier: config.freeStakeMultiplier,
   };
 }