naracli 1.0.46 → 1.0.47

package/dist/nara-cli-bundle.cjs

@@ -32114,7 +32114,7 @@ Message: ${transactionMessage}.
        * @internal
        */
       static checkProgramId(programId) {
-        if (!programId.equals(ComputeBudgetProgram.programId)) {
+        if (!programId.equals(ComputeBudgetProgram2.programId)) {
           throw new Error("invalid instruction; programId is not ComputeBudgetProgram");
         }
       }
@@ -32137,7 +32137,7 @@ Message: ${transactionMessage}.
         layout: BufferLayout__namespace.struct([BufferLayout__namespace.u8("instruction"), u642("microLamports")])
       }
     });
-    var ComputeBudgetProgram = class {
+    var ComputeBudgetProgram2 = class {
       /**
        * @internal
        */
@@ -32188,7 +32188,7 @@ Message: ${transactionMessage}.
         });
       }
     };
-    ComputeBudgetProgram.programId = new PublicKey30("ComputeBudget111111111111111111111111111111");
+    ComputeBudgetProgram2.programId = new PublicKey30("ComputeBudget111111111111111111111111111111");
     var PRIVATE_KEY_BYTES$1 = 64;
     var PUBLIC_KEY_BYTES$1 = 32;
     var SIGNATURE_BYTES = 64;
@@ -33688,7 +33688,7 @@ Message: ${transactionMessage}.
     exports2.BpfLoader = BpfLoader;
     exports2.COMPUTE_BUDGET_INSTRUCTION_LAYOUTS = COMPUTE_BUDGET_INSTRUCTION_LAYOUTS;
     exports2.ComputeBudgetInstruction = ComputeBudgetInstruction;
-    exports2.ComputeBudgetProgram = ComputeBudgetProgram;
+    exports2.ComputeBudgetProgram = ComputeBudgetProgram2;
     exports2.Connection = Connection13;
     exports2.Ed25519Program = Ed25519Program;
     exports2.Enum = Enum;
@@ -60397,7 +60397,35 @@ async function loadAlt(connection) {
   _cachedAltAddress = addr;
   return _cachedAlt;
 }
+async function getRecentPriorityFee(connection) {
+  const fees = await connection.getRecentPrioritizationFees();
+  if (!fees.length) return 0;
+  const nonZero = fees.filter((f) => f.prioritizationFee > 0);
+  if (!nonZero.length) return 0;
+  const avg = nonZero.reduce((s, f) => s + f.prioritizationFee, 0) / nonZero.length;
+  return Math.ceil(avg);
+}
 async function sendTx(connection, payer, instructions, signers, opts) {
+  const budgetIxs = [];
+  if (opts?.computeUnitLimit) {
+    budgetIxs.push(
+      import_web388.ComputeBudgetProgram.setComputeUnitLimit({ units: opts.computeUnitLimit })
+    );
+  }
+  if (opts?.computeUnitPrice !== void 0) {
+    let price;
+    if (opts.computeUnitPrice === "auto") {
+      price = await getRecentPriorityFee(connection);
+    } else {
+      price = opts.computeUnitPrice;
+    }
+    if (price > 0) {
+      budgetIxs.push(
+        import_web388.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: price })
+      );
+    }
+  }
+  const allInstructions = [...budgetIxs, ...instructions];
   const alt = await loadAlt(connection);
   const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash("confirmed");
   let signature;
@@ -60405,7 +60433,7 @@ async function sendTx(connection, payer, instructions, signers, opts) {
     const message = new import_web388.TransactionMessage({
       payerKey: payer.publicKey,
       recentBlockhash: blockhash,
-      instructions
+      instructions: allInstructions
     }).compileToV0Message([alt]);
     const tx = new import_web388.VersionedTransaction(message);
     const allSigners = [payer, ...signers ?? []];
@@ -60425,7 +60453,7 @@ async function sendTx(connection, payer, instructions, signers, opts) {
     tx.recentBlockhash = blockhash;
     tx.lastValidBlockHeight = lastValidBlockHeight;
     tx.feePayer = payer.publicKey;
-    for (const ix of instructions) tx.add(ix);
+    for (const ix of allInstructions) tx.add(ix);
     const allSigners = [payer, ...signers ?? []];
     const seen = /* @__PURE__ */ new Set();
     const uniqueSigners = allSigners.filter((s) => {
@@ -60439,16 +60467,31 @@ async function sendTx(connection, payer, instructions, signers, opts) {
       skipPreflight: opts?.skipPreflight ?? false
     });
   }
-  const confirmation = await connection.confirmTransaction(
-    { signature, blockhash, lastValidBlockHeight },
-    "confirmed"
-  );
-  if (confirmation.value.err) {
-    throw new Error(
-      `Transaction ${signature} failed: ${JSON.stringify(confirmation.value.err)}`
-    );
+  const startTime = Date.now();
+  const TIMEOUT_MS = 2e4;
+  const POLL_INTERVAL_MS = 1e3;
+  while (Date.now() - startTime < TIMEOUT_MS) {
+    const currentBlockHeight = await connection.getBlockHeight("confirmed");
+    if (currentBlockHeight > lastValidBlockHeight) {
+      throw new Error(
+        `Transaction ${signature} expired: block height exceeded`
+      );
+    }
+    const statusResult = await connection.getSignatureStatuses([signature]);
+    const status = statusResult?.value?.[0];
+    if (status) {
+      if (status.err) {
+        throw new Error(
+          `Transaction ${signature} failed: ${JSON.stringify(status.err)}`
+        );
+      }
+      if (status.confirmationStatus === "confirmed" || status.confirmationStatus === "finalized") {
+        return signature;
+      }
+    }
+    await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
   }
-  return signature;
+  throw new Error(`Transaction ${signature} confirmation timeout`);
 }
 var import_web388, _cachedAlt, _cachedAltAddress, _overrideAltAddress;
 var init_tx = __esm({
@@ -124721,16 +124764,16 @@ var nara_quest_default = {
       args: []
     },
     {
-      name: "set_max_reward_count",
+      name: "set_reward_config",
       discriminator: [
-        247,
-        62,
-        67,
-        243,
-        249,
-        243,
-        102,
-        62
+        163,
+        34,
+        211,
+        14,
+        25,
+        118,
+        181,
+        233
       ],
       accounts: [
         {
@@ -124764,6 +124807,10 @@ var nara_quest_default = {
         }
       ],
       args: [
+        {
+          name: "min_reward_count",
+          type: "u32"
+        },
         {
           name: "max_reward_count",
           type: "u32"
@@ -124771,16 +124818,16 @@ var nara_quest_default = {
       ]
     },
     {
-      name: "set_min_reward_count",
+      name: "set_stake_config",
       discriminator: [
-        108,
-        213,
-        24,
-        47,
-        93,
-        149,
-        58,
-        4
+        84,
+        37,
+        76,
+        39,
+        236,
+        111,
+        214,
+        191
       ],
       accounts: [
         {
@@ -124815,8 +124862,16 @@ var nara_quest_default = {
       ],
       args: [
         {
-          name: "min_reward_count",
-          type: "u32"
+          name: "bps_high",
+          type: "u64"
+        },
+        {
+          name: "bps_low",
+          type: "u64"
+        },
+        {
+          name: "decay_ms",
+          type: "i64"
         }
       ]
     },
@@ -125015,6 +125070,30 @@ var nara_quest_default = {
         48
       ],
       accounts: [
+        {
+          name: "game_config",
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  113,
+                  117,
+                  101,
+                  115,
+                  116,
+                  95,
+                  99,
+                  111,
+                  110,
+                  102,
+                  105,
+                  103
+                ]
+              }
+            ]
+          }
+        },
         {
           name: "pool",
           writable: true,
@@ -125709,12 +125788,12 @@ var nara_quest_default = {
     {
       code: 6008,
       name: "InvalidMinRewardCount",
-      msg: "min_reward_count must be > 0 and <= max_reward_count"
+      msg: "Invalid reward config: need 0 < min <= max"
     },
     {
       code: 6009,
-      name: "InvalidMaxRewardCount",
-      msg: "max_reward_count must be >= min_reward_count"
+      name: "InvalidStakeConfig",
+      msg: "Stake config values must be > 0"
     },
     {
       code: 6010,
@@ -125725,6 +125804,11 @@ var nara_quest_default = {
       code: 6011,
       name: "InsufficientStakeBalance",
       msg: "Unstake amount exceeds staked balance"
+    },
+    {
+      code: 6012,
+      name: "InsufficientStake",
+      msg: "Stake does not meet dynamic requirement"
     }
   ],
   types: [
@@ -125777,6 +125861,18 @@ var nara_quest_default = {
             name: "max_reward_count",
             type: "u32"
           },
+          {
+            name: "stake_bps_high",
+            type: "u64"
+          },
+          {
+            name: "stake_bps_low",
+            type: "u64"
+          },
+          {
+            name: "decay_ms",
+            type: "i64"
+          },
           {
             name: "_padding",
             type: {
@@ -125836,11 +125932,19 @@ var nara_quest_default = {
             type: "u32"
           },
           {
-            name: "stake_requirement",
+            name: "created_at",
+            type: "i64"
+          },
+          {
+            name: "stake_high",
             type: "u64"
           },
           {
-            name: "min_winner_stake",
+            name: "stake_low",
+            type: "u64"
+          },
+          {
+            name: "avg_participant_stake",
             type: "u64"
           },
           {
@@ -125906,14 +126010,7 @@ var BN254_FIELD = 21888242871839275222246405745257275088696311157297823662689037
 async function resolveDefaultZkPaths() {
   const { fileURLToPath } = await import("url");
   const { dirname: dirname2, join: join6 } = await import("path");
-  let dir;
-  if (import_meta.url) {
-    dir = dirname2(fileURLToPath(import_meta.url));
-  } else {
-    const { createRequire } = await import("module");
-    const req = createRequire(process.cwd() + "/");
-    dir = dirname2(req.resolve("nara-sdk/package.json")) + "/src";
-  }
+  const dir = dirname2(fileURLToPath(import_meta.url));
   return {
     wasm: join6(dir, "zk", "answer_proof.wasm"),
     zkey: join6(dir, "zk", "answer_proof_final.zkey")
@@ -126031,6 +126128,14 @@ var WSOL_MINT = new import_web390.PublicKey("So111111111111111111111111111111111
 function getStakeTokenAccount(stakeRecordPda) {
   return getAssociatedTokenAddressSync(WSOL_MINT, stakeRecordPda, true);
 }
+function computeEffectiveStake(stakeHigh, stakeLow, createdAt, decayMs, nowMs) {
+  if (decayMs <= 0) return stakeLow;
+  const elapsedMs = nowMs - createdAt;
+  if (elapsedMs >= decayMs) return stakeLow;
+  const range = stakeHigh - stakeLow;
+  const ratio = elapsedMs / decayMs;
+  return stakeHigh - range * ratio * ratio;
+}
 async function getQuestInfo(connection, wallet, options) {
   const kp = wallet ?? import_web390.Keypair.generate();
   const program3 = createProgram2(connection, kp, options?.programId);
@@ -126040,6 +126145,25 @@ async function getQuestInfo(connection, wallet, options) {
   const deadline = pool.deadline.toNumber();
   const secsLeft = deadline - now;
   const active = pool.question.length > 0 && secsLeft > 0;
+  const stakeHigh = Number(pool.stakeHigh.toString()) / import_web390.LAMPORTS_PER_SOL;
+  const stakeLow = Number(pool.stakeLow.toString()) / import_web390.LAMPORTS_PER_SOL;
+  const createdAt = pool.createdAt.toNumber();
+  const programId = new import_web390.PublicKey(options?.programId ?? DEFAULT_QUEST_PROGRAM_ID);
+  const [configPda] = import_web390.PublicKey.findProgramAddressSync(
+    [new TextEncoder().encode("quest_config")],
+    programId
+  );
+  const config = await program3.account.gameConfig.fetch(configPda);
+  const decayMs = Number(config.decayMs.toString());
+  const nowMs = Date.now();
+  const createdAtMs = createdAt * 1e3;
+  const effectiveStakeRequirement = computeEffectiveStake(
+    stakeHigh,
+    stakeLow,
+    createdAtMs,
+    decayMs,
+    nowMs
+  );
   return {
     active,
     round: pool.round.toString(),
@@ -126054,8 +126178,11 @@ async function getQuestInfo(connection, wallet, options) {
     deadline,
     timeRemaining: secsLeft,
     expired: secsLeft <= 0,
-    stakeRequirement: Number(pool.stakeRequirement.toString()) / import_web390.LAMPORTS_PER_SOL,
-    minWinnerStake: Number(pool.minWinnerStake.toString()) / import_web390.LAMPORTS_PER_SOL
+    stakeHigh,
+    stakeLow,
+    avgParticipantStake: Number(pool.avgParticipantStake.toString()) / import_web390.LAMPORTS_PER_SOL,
+    createdAt,
+    effectiveStakeRequirement
   };
 }
 async function hasAnswered(connection, wallet, options) {
@@ -126105,7 +126232,7 @@ async function submitAnswer(connection, wallet, proof, agent = "", model = "", o
     if (options.stake === "auto") {
       const quest = await getQuestInfo(connection, wallet, options);
       const stakeInfo = await getStakeInfo(connection, wallet.publicKey, options);
-      const required = quest.stakeRequirement;
+      const required = quest.effectiveStakeRequirement;
       const current = stakeInfo?.amount ?? 0;
       const deficit = required - current;
       if (deficit > 0) {
@@ -130103,8 +130230,10 @@ async function handleQuestGet(options) {
     deadline: new Date(quest.deadline * 1e3).toLocaleString(),
     timeRemaining: formatTimeRemaining(quest.timeRemaining),
     expired: quest.expired,
-    stakeRequirement: `${quest.stakeRequirement} NARA`,
-    minWinnerStake: `${quest.minWinnerStake} NARA`
+    stakeRequirement: `${quest.effectiveStakeRequirement.toFixed(4)} NARA`,
+    stakeHigh: `${quest.stakeHigh} NARA`,
+    stakeLow: `${quest.stakeLow} NARA`,
+    avgParticipantStake: `${quest.avgParticipantStake} NARA`
   };
   if (options.json) {
     formatOutput(data, true);
@@ -130118,9 +130247,8 @@ async function handleQuestGet(options) {
     console.log(
       `  Reward slots: ${quest.winnerCount}/${quest.rewardCount} (${quest.remainingSlots} remaining)`
     );
-    if (quest.stakeRequirement > 0) {
-      console.log(`  Stake requirement: ${quest.stakeRequirement} NARA`);
-      console.log(`  Min winner stake: ${quest.minWinnerStake} NARA`);
+    if (quest.effectiveStakeRequirement > 0) {
+      console.log(`  Stake requirement: ${quest.effectiveStakeRequirement.toFixed(4)} NARA (decays ${quest.stakeHigh} \u2192 ${quest.stakeLow})`);
     }
     console.log(`  Deadline: ${new Date(quest.deadline * 1e3).toLocaleString()}`);
     if (quest.timeRemaining > 0) {
@@ -133245,7 +133373,7 @@ function registerCommands(program3) {
 }
 
 // bin/nara-cli.ts
-var version2 = true ? "1.0.46" : "dev";
+var version2 = true ? "1.0.47" : "dev";
 var program2 = new Command();
 program2.name("naracli").description("CLI for the Nara chain (Solana-compatible)").version(version2);
 program2.option("-r, --rpc-url <url>", "RPC endpoint URL").option("-w, --wallet <path>", "Path to wallet keypair JSON file").option("-j, --json", "Output in JSON format");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naracli",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "description": "CLI for the Nara chain (Solana-compatible)",
   "module": "index.ts",
   "main": "index.ts",
@@ -20,6 +20,7 @@
     "test:skills": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/skills.test.ts",
     "test:zkid": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/zkid.test.ts",
     "test:agent": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/agent-registry.test.ts",
+    "test:quest-relay": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/quest-relay.test.ts",
     "test:quest-referral": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/quest-referral.test.ts",
     "prepublishOnly": "npm run build"
   },
@@ -56,7 +57,7 @@
     "bs58": "^6.0.0",
     "commander": "^12.1.0",
     "ed25519-hd-key": "^1.3.0",
-    "nara-sdk": "^1.0.44",
+    "nara-sdk": "^1.0.48",
     "picocolors": "^1.1.1"
   },
   "packageManager": "pnpm@10.27.0+sha512.72d699da16b1179c14ba9e64dc71c9a40988cbdc65c264cb0e489db7de917f20dcf4d64d8723625f2969ba52d4b7e2a1170682d9ac2a5dcaeaab732b7e16f04a"

package/src/cli/commands/quest.ts

@@ -117,8 +117,10 @@ async function handleQuestGet(options: GlobalOptions) {
     deadline: new Date(quest.deadline * 1000).toLocaleString(),
     timeRemaining: formatTimeRemaining(quest.timeRemaining),
     expired: quest.expired,
-    stakeRequirement: `${quest.stakeRequirement} NARA`,
-    minWinnerStake: `${quest.minWinnerStake} NARA`,
+    stakeRequirement: `${quest.effectiveStakeRequirement.toFixed(4)} NARA`,
+    stakeHigh: `${quest.stakeHigh} NARA`,
+    stakeLow: `${quest.stakeLow} NARA`,
+    avgParticipantStake: `${quest.avgParticipantStake} NARA`,
   };
 
   if (options.json) {
@@ -133,9 +135,8 @@ async function handleQuestGet(options: GlobalOptions) {
     console.log(
       `  Reward slots: ${quest.winnerCount}/${quest.rewardCount} (${quest.remainingSlots} remaining)`
     );
-    if (quest.stakeRequirement > 0) {
-      console.log(`  Stake requirement: ${quest.stakeRequirement} NARA`);
-      console.log(`  Min winner stake: ${quest.minWinnerStake} NARA`);
+    if (quest.effectiveStakeRequirement > 0) {
+      console.log(`  Stake requirement: ${quest.effectiveStakeRequirement.toFixed(4)} NARA (decays ${quest.stakeHigh} → ${quest.stakeLow})`);
     }
     console.log(`  Deadline: ${new Date(quest.deadline * 1000).toLocaleString()}`);
     if (quest.timeRemaining > 0) {

package/src/tests/quest-relay.test.ts

@@ -0,0 +1,91 @@
+/**
+ * Tests for quest relay (gasless) submission
+ *
+ * Requires PRIVATE_KEY in .env and an active quest.
+ *
+ * Run: npm run test:quest-relay
+ */
+
+import { describe, it } from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { Connection } from "@solana/web3.js";
+import { runCli, hasWallet } from "./helpers.js";
+import { getQuestInfo } from "nara-sdk";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+interface TestQuestion {
+  text: string;
+  answer: string;
+}
+
+function loadTestQuestions(): TestQuestion[] {
+  const filePath = join(__dirname, "../../.assets/test-questions.json");
+  return JSON.parse(readFileSync(filePath, "utf-8"));
+}
+
+// ─── Relay quest answer ──────────────────────────────────────────
+
+describe("quest answer (relay)", { skip: !hasWallet ? "no wallet" : undefined }, () => {
+  it("submits answer via relay and outputs tx", async () => {
+    const rpcUrl = process.env.RPC_URL || "https://mainnet-api.nara.build/";
+    const relayUrl = process.env.QUEST_RELAY_URL || "https://quest-api.nara.build/";
+    console.log(`  Relay: ${relayUrl}`);
+    const connection = new Connection(rpcUrl, "confirmed");
+
+    const quest = await getQuestInfo(connection);
+    if (!quest.active || quest.expired) {
+      console.log("  (skipped: no active quest)");
+      return;
+    }
+
+    const questions = loadTestQuestions();
+    const match = questions.find((q) => q.text === quest.question);
+    if (!match) {
+      console.log(`  (skipped: question not found in test-questions.json)`);
+      console.log(`  Question: ${quest.question}`);
+      return;
+    }
+
+    console.log(`  Question: ${quest.question}`);
+    console.log(`  Answer: ${match.answer}`);
+
+    const { stdout, stderr, exitCode } = await runCli([
+      "quest", "answer", match.answer,
+      "--relay",
+      "--agent", "test",
+      "--model", "test",
+    ]);
+
+    const output = stdout + stderr;
+
+    if (output.includes("already answered") || output.includes("Already answered")) {
+      console.log("  Already answered this round");
+      return;
+    }
+    if (output.includes("expired")) {
+      console.log("  Quest expired during test");
+      return;
+    }
+
+    assert.equal(exitCode, 0, `CLI failed: ${stderr}`);
+    assert.ok(output.includes("Transaction:") || output.includes("submitted"), "should confirm submission");
+
+    // Extract and print tx signature
+    const txMatch = output.match(/Transaction:\s+(\S+)/);
+    if (txMatch) {
+      console.log(`  TX: ${txMatch[1]}`);
+    }
+
+    // Print reward info
+    if (output.includes("Reward received")) {
+      const rewardMatch = output.match(/Reward received:\s+(.+)/);
+      console.log(`  Reward: ${rewardMatch ? rewardMatch[1] : "yes"}`);
+    } else if (output.includes("no reward") || output.includes("all reward slots")) {
+      console.log("  Reward: none (all slots claimed)");
+    }
+  });
+});

package/src/tests/quest.test.ts

@@ -168,4 +168,4 @@ describe("quest answer (on-chain)", { skip: !hasWallet ? "no wallet" : undefined
       console.log(`  Output: ${stdout.trim()}`);
     }
   });
-});
+});