naracli 1.0.32 → 1.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naracli",
-  "version": "1.0.32",
+  "version": "1.0.40",
   "description": "CLI for the Nara chain (Solana-compatible)",
   "module": "index.ts",
   "main": "index.ts",
@@ -12,7 +12,10 @@
   "scripts": {
     "cli": "node --require ./bin/env-loader.cjs --import tsx bin/nara-cli.ts",
     "build": "node scripts/build.cjs",
-    "test": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/quest.test.ts src/tests/skills.test.ts src/tests/zkid.test.ts src/tests/agent-registry.test.ts",
+    "test": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/validation.test.ts src/tests/config.test.ts src/tests/agent.test.ts src/tests/quest.test.ts src/tests/skills.test.ts src/tests/zkid.test.ts src/tests/agent-registry.test.ts",
+    "test:validation": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/validation.test.ts",
+    "test:config": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/config.test.ts",
+    "test:agent-cli": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/agent.test.ts",
     "test:quest": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/quest.test.ts",
     "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",
@@ -53,7 +56,8 @@
     "bs58": "^6.0.0",
     "commander": "^12.1.0",
     "ed25519-hd-key": "^1.3.0",
-    "nara-sdk": "^1.0.32",
+    "nara-sdk": "^1.0.43",
     "picocolors": "^1.1.1"
-  }
+  },
+  "packageManager": "pnpm@10.27.0+sha512.72d699da16b1179c14ba9e64dc71c9a40988cbdc65c264cb0e489db7de917f20dcf4d64d8723625f2969ba52d4b7e2a1170682d9ac2a5dcaeaab732b7e16f04a"
 }

package/src/cli/commands/agent.ts

@@ -15,7 +15,7 @@ import {
 import type { GlobalOptions } from "../types";
 import {
   registerAgent,
-  getAgentRecord,
+  registerAgentWithReferral,
   getAgentInfo,
   getAgentMemory,
   setBio,
@@ -25,6 +25,8 @@ import {
   transferAgentAuthority,
   deleteAgent,
   logActivity,
+  logActivityWithReferral,
+  setReferral as setReferralOnChain,
 } from "nara-sdk";
 import { readFileSync } from "node:fs";
 import { addAgentId } from "../utils/agent-config";
@@ -32,22 +34,25 @@ import { validateName } from "../utils/validation";
 
 // ─── Command handlers ────────────────────────────────────────────
 
-async function handleAgentRegister(agentId: string, options: GlobalOptions) {
+async function handleAgentRegister(agentId: string, options: GlobalOptions & { referral?: string }) {
   validateName(agentId, "Agent ID");
   const rpcUrl = getRpcUrl(options.rpcUrl);
   const connection = new Connection(rpcUrl, "confirmed");
   const wallet = await loadWallet(options.wallet);
 
   if (!options.json) printInfo(`Registering agent "${agentId}"...`);
-  const result = await registerAgent(connection, wallet, agentId);
+  const result = options.referral
+    ? await registerAgentWithReferral(connection, wallet, agentId, options.referral)
+    : await registerAgent(connection, wallet, agentId);
   if (!options.json) printSuccess(`Agent "${agentId}" registered!`);
-  addAgentId(agentId);
+  addAgentId(agentId, rpcUrl);
 
   if (options.json) {
-    formatOutput({ agentId, signature: result.signature, agentPubkey: result.agentPubkey.toBase58() }, true);
+    formatOutput({ agentId, referral: options.referral ?? null, signature: result.signature, agentPubkey: result.agentPubkey.toBase58() }, true);
   } else {
     console.log(`  Transaction: ${result.signature}`);
     console.log(`  Agent PDA: ${result.agentPubkey.toBase58()}`);
+    if (options.referral) console.log(`  Referral: ${options.referral}`);
   }
 }
 
@@ -225,6 +230,22 @@ async function handleAgentDelete(agentId: string, options: GlobalOptions) {
   }
 }
 
+async function handleAgentSetReferral(agentId: string, referralAgentId: string, options: GlobalOptions) {
+  const rpcUrl = getRpcUrl(options.rpcUrl);
+  const connection = new Connection(rpcUrl, "confirmed");
+  const wallet = await loadWallet(options.wallet);
+
+  if (!options.json) printInfo(`Setting referral for "${agentId}" to "${referralAgentId}"...`);
+  const signature = await setReferralOnChain(connection, wallet, agentId, referralAgentId);
+  if (!options.json) printSuccess(`Referral set on-chain!`);
+
+  if (options.json) {
+    formatOutput({ agentId, referral: referralAgentId, signature }, true);
+  } else {
+    console.log(`  Transaction: ${signature}`);
+  }
+}
+
 async function handleAgentLog(
   agentId: string,
   activity: string,
@@ -238,7 +259,9 @@ async function handleAgentLog(
   const referral = options.referral;
 
   if (!options.json) printInfo(`Logging activity for "${agentId}"...`);
-  const signature = await logActivity(connection, wallet, agentId, model, activity, log, undefined, referral);
+  const signature = referral
+    ? await logActivityWithReferral(connection, wallet, agentId, model, activity, log, referral)
+    : await logActivity(connection, wallet, agentId, model, activity, log);
   if (!options.json) printSuccess("Activity logged!");
 
   if (options.json) {
@@ -259,10 +282,11 @@ export function registerAgentCommands(program: Command): void {
   agent
     .command("register <agent-id>")
     .description("Register a new agent on-chain")
-    .action(async (agentId: string, _opts: any, cmd: Command) => {
+    .option("--referral <agent-id>", "Referral agent ID")
+    .action(async (agentId: string, opts: { referral?: string }, cmd: Command) => {
       try {
         const globalOpts = cmd.optsWithGlobals() as GlobalOptions;
-        await handleAgentRegister(agentId, globalOpts);
+        await handleAgentRegister(agentId, { ...globalOpts, ...opts });
       } catch (error: any) {
         printError(error.message);
         process.exit(1);
@@ -381,6 +405,20 @@ export function registerAgentCommands(program: Command): void {
       }
     });
 
+  // agent set-referral
+  agent
+    .command("set-referral <agent-id> <referral-agent-id>")
+    .description("Set referral agent on-chain")
+    .action(async (agentId: string, referralAgentId: string, _opts: any, cmd: Command) => {
+      try {
+        const globalOpts = cmd.optsWithGlobals() as GlobalOptions;
+        await handleAgentSetReferral(agentId, referralAgentId, globalOpts);
+      } catch (error: any) {
+        printError(error.message);
+        process.exit(1);
+      }
+    });
+
   // agent log
   agent
     .command("log <agent-id> <activity> <log>")

package/src/cli/commands/config.ts

@@ -3,32 +3,50 @@
  */
 
 import { Command } from "commander";
-import { loadAgentConfig, saveAgentConfig } from "../utils/agent-config";
+import {
+  loadGlobalConfig,
+  saveGlobalConfig,
+  loadNetworkConfig,
+  rpcUrlToNetworkName,
+} from "../utils/agent-config";
+import { getRpcUrl } from "../utils/wallet";
 import { printError, printSuccess, formatOutput } from "../utils/output";
 import { DEFAULT_RPC_URL } from "nara-sdk";
 import type { GlobalOptions } from "../types";
 
 function handleConfigGet(options: GlobalOptions) {
-  const config = loadAgentConfig();
+  const globalConfig = loadGlobalConfig();
+  const rpcUrl = getRpcUrl(options.rpcUrl);
+  const networkConfig = loadNetworkConfig(rpcUrl);
+  const networkName = rpcUrlToNetworkName(rpcUrl);
+
   const data = {
-    rpc_url: config.rpc_url ?? DEFAULT_RPC_URL,
-    wallet: config.wallet ?? "~/.config/nara/id.json",
-    rpc_url_custom: !!config.rpc_url,
-    wallet_custom: !!config.wallet,
+    rpc_url: globalConfig.rpc_url ?? DEFAULT_RPC_URL,
+    wallet: globalConfig.wallet ?? "~/.config/nara/id.json",
+    rpc_url_custom: !!globalConfig.rpc_url,
+    wallet_custom: !!globalConfig.wallet,
+    network: networkName,
+    agent_ids: networkConfig.agent_ids,
+    zk_ids: networkConfig.zk_ids,
   };
 
   if (options.json) {
     formatOutput(data, true);
   } else {
     console.log("");
-    console.log(`  RPC URL: ${data.rpc_url}${data.rpc_url_custom ? "" : " (default)"}`);
-    console.log(`  Wallet:  ${data.wallet}${data.wallet_custom ? "" : " (default)"}`);
+    console.log(`  RPC URL:  ${data.rpc_url}${data.rpc_url_custom ? "" : " (default)"}`);
+    console.log(`  Wallet:   ${data.wallet}${data.wallet_custom ? "" : " (default)"}`);
+    console.log(`  Network:  ${networkName}`);
+    if (networkConfig.agent_ids.length > 0)
+      console.log(`  Agents:   ${networkConfig.agent_ids.join(", ")}`);
+    if (networkConfig.zk_ids.length > 0)
+      console.log(`  ZK IDs:   ${networkConfig.zk_ids.join(", ")}`);
     console.log("");
   }
 }
 
 function handleConfigSet(key: string, value: string, options: GlobalOptions) {
-  const config = loadAgentConfig();
+  const config = loadGlobalConfig();
 
   switch (key) {
     case "rpc-url":
@@ -41,18 +59,18 @@ function handleConfigSet(key: string, value: string, options: GlobalOptions) {
       throw new Error(`Unknown config key: "${key}". Valid keys: rpc-url, wallet`);
   }
 
-  saveAgentConfig(config);
+  saveGlobalConfig(config);
   if (!options.json) printSuccess(`Config "${key}" set to "${value}"`);
   if (options.json) formatOutput({ key, value }, true);
 }
 
 function handleConfigReset(key: string | undefined, options: GlobalOptions) {
-  const config = loadAgentConfig();
+  const config = loadGlobalConfig();
 
   if (!key) {
     delete config.rpc_url;
     delete config.wallet;
-    saveAgentConfig(config);
+    saveGlobalConfig(config);
     if (!options.json) printSuccess("All config reset to defaults");
   } else {
     switch (key) {
@@ -65,7 +83,7 @@ function handleConfigReset(key: string | undefined, options: GlobalOptions) {
       default:
         throw new Error(`Unknown config key: "${key}". Valid keys: rpc-url, wallet`);
     }
-    saveAgentConfig(config);
+    saveGlobalConfig(config);
     if (!options.json) printSuccess(`Config "${key}" reset to default`);
   }
 

package/src/cli/commands/quest.ts

@@ -20,9 +20,13 @@ import {
   submitAnswer,
   submitAnswerViaRelay,
   parseQuestReward,
+  stake as questStake,
+  unstake as questUnstake,
+  getStakeInfo,
   type ActivityLog,
+  type StakeInfo,
 } from "nara-sdk";
-import { loadAgentConfig } from "../utils/agent-config";
+import { loadNetworkConfig } from "../utils/agent-config";
 
 const DEFAULT_QUEST_RELAY_URL = process.env.QUEST_RELAY_URL || "https://quest-api.nara.build/";
 
@@ -34,9 +38,12 @@ const QUEST_ERRORS: Record<number, string> = {
   6003: "invalidProof",
   6004: "invalidDeadline",
   6005: "insufficientReward",
-  6006: "insufficientPoolBalance",
-  6007: "questionTooLong",
-  6008: "alreadyAnswered",
+  6006: "questionTooLong",
+  6007: "alreadyAnswered",
+  6008: "invalidMinRewardCount",
+  6009: "invalidMaxRewardCount",
+  6010: "unstakeNotReady",
+  6011: "insufficientStakeBalance",
 };
 
 function anchorErrorCode(err: any): string {
@@ -59,7 +66,7 @@ function formatTimeRemaining(seconds: number): string {
 
 // ─── Command: quest get ──────────────────────────────────────────
 async function handleQuestGet(options: GlobalOptions) {
-  const rpcUrl = await getRpcUrl(options.rpcUrl);
+  const rpcUrl = getRpcUrl(options.rpcUrl);
   const connection = new Connection(rpcUrl, "confirmed");
 
   let wallet: Keypair;
@@ -85,9 +92,8 @@ async function handleQuestGet(options: GlobalOptions) {
     return;
   }
 
-  const data = {
+  const data: Record<string, any> = {
     round: quest.round,
-    questionId: quest.questionId,
     question: quest.question,
     difficulty: quest.difficulty,
     rewardPerWinner: `${quest.rewardPerWinner} NARA`,
@@ -97,6 +103,8 @@ 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`,
   };
 
   if (options.json) {
@@ -111,6 +119,10 @@ 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`);
+    }
     console.log(`  Deadline: ${new Date(quest.deadline * 1000).toLocaleString()}`);
     if (quest.timeRemaining > 0) {
       console.log(`  Time remaining: ${formatTimeRemaining(quest.timeRemaining)}`);
@@ -124,15 +136,16 @@ async function handleQuestGet(options: GlobalOptions) {
 // ─── Command: quest answer ───────────────────────────────────────
 async function handleQuestAnswer(
   answer: string,
-  options: GlobalOptions & { relay?: string; agent?: string; model?: string; referral?: string }
+  options: GlobalOptions & { relay?: string; agent?: string; model?: string; referral?: string; stake?: string }
 ) {
-  const rpcUrl = await getRpcUrl(options.rpcUrl);
+  const rpcUrl = getRpcUrl(options.rpcUrl);
   const connection = new Connection(rpcUrl, "confirmed");
   const wallet = await loadWallet(options.wallet);
-  const agentConfig = loadAgentConfig();
-  const configAgentId = agentConfig.agent_ids[0];
+  const networkConfig = loadNetworkConfig(rpcUrl);
+  const configAgentId = networkConfig.agent_ids[0];
   const agent = options.agent ?? "naracli";
   const model = options.model ?? "";
+  const referral = options.referral;
 
   // 1. Fetch quest info
   let quest;
@@ -165,7 +178,7 @@ async function handleQuestAnswer(
 
   let proof;
   try {
-    proof = await generateProof(answer, quest.answerHash, wallet.publicKey);
+    proof = await generateProof(answer, quest.answerHash, wallet.publicKey, quest.round);
   } catch (err: any) {
     if (err.message?.includes("Assert Failed")) {
       printError("Wrong answer");
@@ -207,9 +220,10 @@ async function handleQuestAnswer(
     try {
       let activityLog: ActivityLog | undefined;
       if (configAgentId) {
-        activityLog = { agentId: configAgentId, activity: "PoMI", model, log: "", referralAgentId: options.referral };
+        activityLog = { agentId: configAgentId, activity: "PoMI", model, log: "", referralAgentId: referral };
       }
-      const result = await submitAnswer(connection, wallet, proof.solana, agent, model, undefined, activityLog);
+      const stakeOpt = options.stake === "auto" ? "auto" : options.stake ? parseFloat(options.stake) : undefined;
+      const result = await submitAnswer(connection, wallet, proof.solana, agent, model, stakeOpt !== undefined ? { stake: stakeOpt } : undefined, activityLog);
       printSuccess("Answer submitted!");
       console.log(`  Transaction: ${result.signature}`);
       await handleReward(connection, result.signature, options);
@@ -219,6 +233,78 @@ async function handleQuestAnswer(
   }
 }
 
+// ─── Command: quest stake ────────────────────────────────────────
+async function handleQuestStake(amount: string, options: GlobalOptions) {
+  const rpcUrl = getRpcUrl(options.rpcUrl);
+  const connection = new Connection(rpcUrl, "confirmed");
+  const wallet = await loadWallet(options.wallet);
+
+  const n = parseFloat(amount);
+  if (isNaN(n) || n <= 0) {
+    printError("Amount must be a positive number");
+    process.exit(1);
+  }
+
+  if (!options.json) printInfo(`Staking ${n} NARA...`);
+  const signature = await questStake(connection, wallet, n);
+  if (!options.json) printSuccess(`Staked ${n} NARA!`);
+
+  if (options.json) {
+    formatOutput({ amount: n, signature }, true);
+  } else {
+    console.log(`  Transaction: ${signature}`);
+  }
+}
+
+// ─── Command: quest unstake ─────────────────────────────────────
+async function handleQuestUnstake(amount: string, options: GlobalOptions) {
+  const rpcUrl = getRpcUrl(options.rpcUrl);
+  const connection = new Connection(rpcUrl, "confirmed");
+  const wallet = await loadWallet(options.wallet);
+
+  const n = parseFloat(amount);
+  if (isNaN(n) || n <= 0) {
+    printError("Amount must be a positive number");
+    process.exit(1);
+  }
+
+  if (!options.json) printInfo(`Unstaking ${n} NARA...`);
+  const signature = await questUnstake(connection, wallet, n);
+  if (!options.json) printSuccess(`Unstaked ${n} NARA!`);
+
+  if (options.json) {
+    formatOutput({ amount: n, signature }, true);
+  } else {
+    console.log(`  Transaction: ${signature}`);
+  }
+}
+
+// ─── Command: quest stake-info ──────────────────────────────────
+async function handleQuestStakeInfo(options: GlobalOptions) {
+  const rpcUrl = getRpcUrl(options.rpcUrl);
+  const connection = new Connection(rpcUrl, "confirmed");
+  const wallet = await loadWallet(options.wallet);
+
+  const stakeInfo = await getStakeInfo(connection, wallet.publicKey);
+  if (!stakeInfo) {
+    if (options.json) {
+      formatOutput({ staked: false, amount: 0 }, true);
+    } else {
+      printInfo("No stake record found");
+    }
+    return;
+  }
+
+  if (options.json) {
+    formatOutput({ staked: true, amount: stakeInfo.amount, stakeRound: stakeInfo.stakeRound }, true);
+  } else {
+    console.log("");
+    console.log(`  Staked: ${stakeInfo.amount} NARA`);
+    console.log(`  Stake round: ${stakeInfo.stakeRound}`);
+    console.log("");
+  }
+}
+
 // ─── Parse reward from transaction ───────────────────────────────
 async function handleReward(
   connection: Connection,
@@ -279,6 +365,12 @@ function handleSubmitError(err: any) {
     case "poolNotActive":
       printError("No active quest at the moment");
       break;
+    case "unstakeNotReady":
+      printError("Cannot unstake until round advances or deadline passes");
+      break;
+    case "insufficientStakeBalance":
+      printError("Unstake amount exceeds staked balance");
+      break;
     default:
       printError(`Failed to submit answer: ${err.message ?? String(err)}`);
       if (err.logs) {
@@ -317,11 +409,55 @@ export function registerQuestCommands(program: Command): void {
     .option("--agent <name>", "Agent identifier (default: naracli)")
     .option("--model <name>", "Model identifier")
     .option("--referral <agent-id>", "Referral agent ID")
+    .option("--stake [amount]", 'Stake NARA before answering ("auto" to top-up to requirement, or a number)')
     .action(async (answer: string, opts: any, cmd: Command) => {
       try {
         const globalOpts = cmd.optsWithGlobals() as GlobalOptions;
         const relayUrl = opts.relay === true ? DEFAULT_QUEST_RELAY_URL : opts.relay;
-        await handleQuestAnswer(answer, { ...globalOpts, relay: relayUrl, agent: opts.agent, model: opts.model, referral: opts.referral });
+        const stakeVal = opts.stake === true ? "auto" : opts.stake;
+        await handleQuestAnswer(answer, { ...globalOpts, relay: relayUrl, agent: opts.agent, model: opts.model, referral: opts.referral, stake: stakeVal });
+      } catch (error: any) {
+        printError(error.message);
+        process.exit(1);
+      }
+    });
+
+  // quest stake
+  quest
+    .command("stake <amount>")
+    .description("Stake NARA to participate in quests")
+    .action(async (amount: string, _opts: any, cmd: Command) => {
+      try {
+        const globalOpts = cmd.optsWithGlobals() as GlobalOptions;
+        await handleQuestStake(amount, globalOpts);
+      } catch (error: any) {
+        printError(error.message);
+        process.exit(1);
+      }
+    });
+
+  // quest unstake
+  quest
+    .command("unstake <amount>")
+    .description("Unstake NARA (available after round advances or deadline passes)")
+    .action(async (amount: string, _opts: any, cmd: Command) => {
+      try {
+        const globalOpts = cmd.optsWithGlobals() as GlobalOptions;
+        await handleQuestUnstake(amount, globalOpts);
+      } catch (error: any) {
+        printError(error.message);
+        process.exit(1);
+      }
+    });
+
+  // quest stake-info
+  quest
+    .command("stake-info")
+    .description("Get your current quest stake info")
+    .action(async (_opts: any, cmd: Command) => {
+      try {
+        const globalOpts = cmd.optsWithGlobals() as GlobalOptions;
+        await handleQuestStakeInfo(globalOpts);
       } catch (error: any) {
         printError(error.message);
         process.exit(1);

package/src/cli/commands/zkid.ts

@@ -27,7 +27,7 @@ import {
   ZKID_DENOMINATIONS,
 } from "nara-sdk";
 import BN from "bn.js";
-import { addZkId, loadAgentConfig } from "../utils/agent-config";
+import { addZkId, loadNetworkConfig } from "../utils/agent-config";
 
 // ─── Denomination helpers ────────────────────────────────────────
 
@@ -73,7 +73,7 @@ async function handleZkIdCreate(name: string, options: GlobalOptions) {
   if (!options.json) printInfo(`Registering ZK ID "${name}"...`);
   const signature = await createZkId(connection, wallet, name, idSecret);
   if (!options.json) printSuccess(`ZK ID "${name}" registered!`);
-  addZkId(name);
+  addZkId(name, rpcUrl);
 
   if (options.json) {
     formatOutput({ name, signature }, true);
@@ -149,12 +149,12 @@ async function handleZkIdScan(
   if (name) {
     names = [name];
   } else {
-    const config = loadAgentConfig();
-    if (config.zk_ids.length === 0) {
+    const networkConfig = loadNetworkConfig(rpcUrl);
+    if (networkConfig.zk_ids.length === 0) {
       printError("No ZK IDs in config. Provide a name or create a ZK ID first.");
       process.exit(1);
     }
-    names = config.zk_ids;
+    names = networkConfig.zk_ids;
   }
 
   const allResults: Array<{ name: string; deposits: any[] }> = [];