naracli 1.0.32 → 1.0.40

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

@@ -22,7 +22,7 @@ import { fileURLToPath } from "node:url";
 import { Connection, Keypair, LAMPORTS_PER_SOL, SystemProgram, Transaction } from "@solana/web3.js";
 import bs58 from "bs58";
 import { DEFAULT_AGENT_REGISTRY_PROGRAM_ID, getQuestInfo, getAgentRecord } from "nara-sdk";
-import { runCli, hasWallet } from "./helpers.js";
+import { runCli, hasWallet, pollConfirmation } from "./helpers.js";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -80,7 +80,7 @@ describe("quest referral (on-chain)", { skip: !hasWallet ? "no PRIVATE_KEY" : un
     transferTx.recentBlockhash = (await connection.getLatestBlockhash("confirmed")).blockhash;
     transferTx.sign(mainWallet);
     const sig = await connection.sendRawTransaction(transferTx.serialize());
-    await connection.confirmTransaction(sig, "confirmed");
+    await pollConfirmation(connection, sig);
     console.log(`  Transfer tx: ${sig}`);
   });
 
@@ -106,9 +106,11 @@ describe("quest referral (on-chain)", { skip: !hasWallet ? "no PRIVATE_KEY" : un
     console.log("  Referral agent registered");
   });
 
-  it("registers main agent", async () => {
-    console.log(`  Registering main agent "${mainAgentId}"...`);
-    const { stdout, stderr, exitCode } = await runCli(["agent", "register", mainAgentId]);
+  it("registers main agent with referral", async () => {
+    console.log(`  Registering main agent "${mainAgentId}" with referral "${referralAgentId}"...`);
+    const { stdout, stderr, exitCode } = await runCli([
+      "agent", "register", mainAgentId, "--referral", referralAgentId,
+    ]);
     const output = stdout + stderr;
     if (output.includes("already") || output.includes("in use")) {
       console.log("  Agent already exists, continuing");
@@ -116,7 +118,7 @@ describe("quest referral (on-chain)", { skip: !hasWallet ? "no PRIVATE_KEY" : un
     }
     assert.equal(exitCode, 0, `Failed: ${stderr}`);
     assert.ok(output.includes("registered") || output.includes("Transaction"), "should confirm registration");
-    console.log("  Main agent registered");
+    console.log("  Main agent registered with referral");
   });
 
   it("answers quest with --referral", async () => {
@@ -162,7 +164,7 @@ describe("quest referral (on-chain)", { skip: !hasWallet ? "no PRIVATE_KEY" : un
     // Extract transaction signature
     const txMatch = output.match(/Transaction:\s+(\S+)/);
     assert.ok(txMatch, "should show transaction signature");
-    const txSig = txMatch![1];
+    const txSig = txMatch![1]!;
     console.log(`  Transaction: ${txSig}`);
 
     // Verify transaction succeeded on-chain
@@ -204,25 +206,16 @@ describe("quest referral (on-chain)", { skip: !hasWallet ? "no PRIVATE_KEY" : un
     console.log("  Answer submitted with referral successfully");
   });
 
-  it("verifies on-chain agent points", async () => {
+  it("verifies on-chain agent records", async () => {
     try {
       const mainRecord = await getAgentRecord(connection, mainAgentId);
-      console.log(`  Main agent points: ${mainRecord.points}`);
+      console.log(`  Main agent: ${mainRecord.agentId}, referral: ${mainRecord.referralId ?? "(none)"}`);
 
       const referralRecord = await getAgentRecord(connection, referralAgentId);
-      console.log(`  Referral agent points: ${referralRecord.points}`);
-
-      if (mainRecord.points > 0) {
-        console.log("  OK: Main agent earned points");
-      } else {
-        console.log("  WARN: Main agent has 0 points (quest may not have been answered in this run)");
-      }
-
-      if (referralRecord.points > 0) {
-        console.log("  OK: Referral agent earned referral points");
-      } else {
-        console.log("  WARN: Referral agent has 0 points");
-      }
+      console.log(`  Referral agent: ${referralRecord.agentId}`);
+
+      // Points are now minted as SPL tokens (Token-2022), not stored on AgentRecord
+      console.log("  OK: Both agent records exist on-chain");
     } catch (err: any) {
       console.log(`  (skipped: ${err.message})`);
     }

package/src/tests/quest.test.ts

@@ -94,7 +94,7 @@ describe("quest proof generation", () => {
 
     // Generate proof with a random pubkey (we're just testing proof generation)
     const testKeypair = Keypair.generate();
-    const proof = await generateProof(match.answer, quest.answerHash, testKeypair.publicKey);
+    const proof = await generateProof(match.answer, quest.answerHash, testKeypair.publicKey, quest.round);
 
     assert.ok(proof.solana.proofA.length > 0, "proofA should not be empty");
     assert.ok(proof.solana.proofB.length > 0, "proofB should not be empty");

package/src/tests/validation.test.ts

@@ -0,0 +1,80 @@
+/**
+ * Tests for validation utilities
+ *
+ * Run: npm run test:validation
+ */
+
+import { describe, it } from "node:test";
+import assert from "node:assert/strict";
+import { validateName } from "../cli/utils/validation.js";
+
+describe("validateName", () => {
+  // Valid names
+  it("accepts simple lowercase name", () => {
+    assert.equal(validateName("myagent", "Agent ID"), "myagent");
+  });
+
+  it("accepts name with hyphens", () => {
+    assert.equal(validateName("my-agent", "Agent ID"), "my-agent");
+  });
+
+  it("accepts name with numbers", () => {
+    assert.equal(validateName("agent1", "Agent ID"), "agent1");
+  });
+
+  it("accepts name with hyphens and numbers", () => {
+    assert.equal(validateName("my-agent-123", "Agent ID"), "my-agent-123");
+  });
+
+  it("accepts single letter", () => {
+    assert.equal(validateName("a", "Agent ID"), "a");
+  });
+
+  it("accepts long valid name", () => {
+    assert.equal(validateName("a-very-long-agent-name-with-numbers-123", "Agent ID"), "a-very-long-agent-name-with-numbers-123");
+  });
+
+  // Invalid names
+  it("rejects name starting with number", () => {
+    assert.throws(() => validateName("1agent", "Agent ID"), /lowercase/);
+  });
+
+  it("rejects name starting with hyphen", () => {
+    assert.throws(() => validateName("-agent", "Agent ID"), /lowercase/);
+  });
+
+  it("rejects uppercase letters", () => {
+    assert.throws(() => validateName("MyAgent", "Agent ID"), /lowercase/);
+  });
+
+  it("rejects mixed case", () => {
+    assert.throws(() => validateName("myAgent", "Agent ID"), /lowercase/);
+  });
+
+  it("rejects underscores", () => {
+    assert.throws(() => validateName("my_agent", "Agent ID"), /lowercase/);
+  });
+
+  it("rejects dots", () => {
+    assert.throws(() => validateName("my.agent", "Agent ID"), /lowercase/);
+  });
+
+  it("rejects spaces", () => {
+    assert.throws(() => validateName("my agent", "Agent ID"), /lowercase/);
+  });
+
+  it("rejects empty string", () => {
+    assert.throws(() => validateName("", "Agent ID"), /lowercase/);
+  });
+
+  it("rejects special characters", () => {
+    assert.throws(() => validateName("agent@home", "Agent ID"), /lowercase/);
+  });
+
+  it("includes label in error message", () => {
+    assert.throws(
+      () => validateName("BAD", "Skill name"),
+      (err: any) => err.message.includes("Skill name")
+    );
+  });
+});

package/src/tests/zkid.test.ts

@@ -17,7 +17,7 @@ describe("zkid --help", () => {
   it("shows all subcommands", async () => {
     const { stdout, exitCode } = await runCli(["zkid", "--help"]);
     assert.equal(exitCode, 0);
-    for (const cmd of ["create", "info", "deposit", "scan", "withdraw", "id-commitment", "transfer"]) {
+    for (const cmd of ["create", "info", "deposit", "scan", "withdraw", "id-commitment", "transfer-owner"]) {
       assert.ok(stdout.includes(cmd), `missing subcommand: ${cmd}`);
     }
   });
@@ -36,8 +36,8 @@ describe("zkid --help", () => {
     assert.ok(stdout.includes("--recipient"));
   });
 
-  it("zkid transfer --help shows <new-id-commitment>", async () => {
-    const { stdout, exitCode } = await runCli(["zkid", "transfer", "--help"]);
+  it("zkid transfer-owner --help shows <new-id-commitment>", async () => {
+    const { stdout, exitCode } = await runCli(["zkid", "transfer-owner", "--help"]);
     assert.equal(exitCode, 0);
     assert.ok(stdout.includes("<new-id-commitment>"));
   });
@@ -68,21 +68,21 @@ describe("zkid deposit denomination validation", () => {
 describe("zkid transfer commitment validation", () => {
   it("rejects commitment shorter than 64 chars", async () => {
     if (!hasWallet) return;
-    const { stderr, exitCode } = await runCli(["zkid", "transfer", "alice", "deadbeef"]);
+    const { stderr, exitCode } = await runCli(["zkid", "transfer-owner", "alice", "deadbeef"]);
     assert.equal(exitCode, 1);
     assert.ok(stderr.includes("Invalid id-commitment"), `stderr: ${stderr}`);
   });
 
   it("rejects commitment with non-hex characters", async () => {
     if (!hasWallet) return;
-    const { stderr, exitCode } = await runCli(["zkid", "transfer", "alice", "z".repeat(64)]);
+    const { stderr, exitCode } = await runCli(["zkid", "transfer-owner", "alice", "z".repeat(64)]);
     assert.equal(exitCode, 1);
     assert.ok(stderr.includes("Invalid id-commitment"), `stderr: ${stderr}`);
   });
 
   it("rejects commitment that is 63 chars (one short)", async () => {
     if (!hasWallet) return;
-    const { stderr, exitCode } = await runCli(["zkid", "transfer", "alice", "a".repeat(63)]);
+    const { stderr, exitCode } = await runCli(["zkid", "transfer-owner", "alice", "a".repeat(63)]);
     assert.equal(exitCode, 1);
     assert.ok(stderr.includes("Invalid id-commitment"), `stderr: ${stderr}`);
   });