naracli 1.0.11 → 1.0.13

package/README.md

@@ -106,11 +106,11 @@ See [examples/](examples/) for complete SDK usage examples.
 
 ```bash
 # Create a new wallet
-nara-cli wallet create
+npx naracli wallet create
 
 # Or import from mnemonic / private key
-nara-cli wallet import -m "your twelve word mnemonic phrase ..."
-nara-cli wallet import -k "your-private-key"
+npx naracli wallet import -m "your twelve word mnemonic phrase ..."
+npx naracli wallet import -k "your-private-key"
 ```
 
 Wallet is saved to `~/.config/nara/id.json` by default.
@@ -126,7 +126,7 @@ migrate   Check migration eligibility and launch to DAMM V2
 quest     On-chain quiz with ZK proof verification
 ```
 
-Run `nara-cli <command> --help` for details on each command.
+Run `npx naracli <command> --help` for details on each command.
 
 ### Global Options
 
@@ -140,14 +140,14 @@ Run `nara-cli <command> --help` for details on each command.
 
 ```bash
 # Check balance
-nara-cli wallet balance
+npx naracli wallet balance
 
 # Buy tokens
-nara-cli swap buy <TOKEN_ADDRESS> 0.1
+npx naracli swap buy <TOKEN_ADDRESS> 0.1
 
 # Answer a quest
-nara-cli quest get
-nara-cli quest answer "your answer"
+npx naracli quest get
+npx naracli quest answer "your answer"
 ```
 
 ## License

package/bin/nara-cli.ts

@@ -4,13 +4,14 @@
 
 import { Command } from "commander";
 import { registerCommands } from "../src/cli/index";
+import { loadWallet } from "../src/cli/utils/wallet";
 
 // Create program
 const program = new Command();
 
 // Set program metadata
 program
-  .name("nara-cli")
+  .name("naracli")
   .description("CLI for the Nara chain (Solana-compatible)")
   .version("0.1.0");
 
@@ -20,6 +21,25 @@ program
   .option("-w, --wallet <path>", "Path to wallet keypair JSON file")
   .option("-j, --json", "Output in JSON format");
 
+// Top-level address shortcut
+program
+  .command("address")
+  .description("Show wallet address")
+  .action(async () => {
+    const opts = program.opts();
+    try {
+      const wallet = await loadWallet(opts.wallet);
+      if (opts.json) {
+        console.log(JSON.stringify({ address: wallet.publicKey.toBase58() }, null, 2));
+      } else {
+        console.log(wallet.publicKey.toBase58());
+      }
+    } catch (error: any) {
+      console.error(`Error: ${error.message}`);
+      process.exit(1);
+    }
+  });
+
 // Register all command modules
 registerCommands(program);
 

package/dist/nara-cli.mjs

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+try{process.loadEnvFile()}catch{}
 
 // bin/nara-cli.ts
 import { Command as Command8 } from "commander";
@@ -208,6 +209,7 @@ var DEFAULT_RPC_URL = process.env.RPC_URL || "https://mainnet-api.nara.build/";
 var DEFAULT_DBC_CONFIG_ADDRESS = process.env.DBC_CONFIG_ADDRESS || "";
 var DEFAULT_WALLET_PATH = process.env.WALLET_PATH || "~/.config/nara/id.json";
 var DEFAULT_QUEST_RELAY_URL = process.env.QUEST_RELAY_URL || "https://quest-api.nara.build/";
+var DEFAULT_QUEST_PROGRAM_ID = process.env.QUEST_PROGRAM_ID || "Quest11111111111111111111111111111111111111";
 
 // src/cli/utils/wallet.ts
 var DEFAULT_WALLET_PATH2 = DEFAULT_WALLET_PATH.startsWith("~") ? join(homedir(), DEFAULT_WALLET_PATH.slice(1)) : DEFAULT_WALLET_PATH;
@@ -229,7 +231,10 @@ async function loadWallet(walletPath) {
   } catch (error) {
     if (!walletPath) {
       throw new Error(
-        `Wallet not found. Please create a wallet at ${DEFAULT_WALLET_PATH2} or use --wallet flag to specify a different path.`
+        `No wallet found. Create one first:
+
+  npx naracli wallet create
+`
       );
     } else {
       throw new Error(`Failed to load wallet from ${path}: ${error.message}`);
@@ -1711,7 +1716,7 @@ import * as bip39 from "bip39";
 import { derivePath } from "ed25519-hd-key";
 import { join as join2 } from "node:path";
 import { homedir as homedir2 } from "node:os";
-import { mkdir } from "node:fs/promises";
+import { mkdir, writeFile, access } from "node:fs/promises";
 import bs58 from "bs58";
 var DEFAULT_WALLET_PATH3 = DEFAULT_WALLET_PATH.startsWith("~") ? join2(homedir2(), DEFAULT_WALLET_PATH.slice(1)) : DEFAULT_WALLET_PATH;
 function registerWalletCommands(program2) {
@@ -2061,10 +2066,13 @@ Token Transfer Details:`);
 }
 async function handleWalletCreate(options) {
   const outputPath = options.output || DEFAULT_WALLET_PATH3;
-  if (await Bun.file(outputPath).exists()) {
+  try {
+    await access(outputPath);
     throw new Error(
       `Wallet file already exists at ${outputPath}. Please use a different path or remove the existing file first.`
     );
+  } catch (e) {
+    if (e.code !== "ENOENT") throw e;
   }
   const mnemonic = bip39.generateMnemonic(128);
   const seed = await bip39.mnemonicToSeed(mnemonic);
@@ -2073,7 +2081,7 @@ async function handleWalletCreate(options) {
   const dir = outputPath.substring(0, outputPath.lastIndexOf("/"));
   await mkdir(dir, { recursive: true });
   const walletData = Array.from(keypair.secretKey);
-  await Bun.write(outputPath, JSON.stringify(walletData, null, 2));
+  await writeFile(outputPath, JSON.stringify(walletData, null, 2));
   console.log("\n\u2705 Wallet created successfully!");
   console.log(`
 \u{1F4C1} Wallet saved to: ${outputPath}`);
@@ -2089,10 +2097,13 @@ ${mnemonic}
 }
 async function handleWalletImport(options) {
   const outputPath = options.output || DEFAULT_WALLET_PATH3;
-  if (await Bun.file(outputPath).exists()) {
+  try {
+    await access(outputPath);
     throw new Error(
       `Wallet file already exists at ${outputPath}. Please use a different path or remove the existing file first.`
     );
+  } catch (e) {
+    if (e.code !== "ENOENT") throw e;
   }
   let keypair;
   if (options.mnemonic) {
@@ -2123,7 +2134,7 @@ async function handleWalletImport(options) {
   const dir = outputPath.substring(0, outputPath.lastIndexOf("/"));
   await mkdir(dir, { recursive: true });
   const walletData = Array.from(keypair.secretKey);
-  await Bun.write(outputPath, JSON.stringify(walletData, null, 2));
+  await writeFile(outputPath, JSON.stringify(walletData, null, 2));
   console.log("\n\u2705 Wallet imported successfully!");
   console.log(`
 \u{1F4C1} Wallet saved to: ${outputPath}`);
@@ -2133,14 +2144,9 @@ async function handleWalletImport(options) {
 async function handleWalletAddress(options) {
   const wallet = await loadWallet(options.wallet);
   if (options.json) {
-    const output = {
-      address: wallet.publicKey.toBase58()
-    };
-    console.log(JSON.stringify(output, null, 2));
+    console.log(JSON.stringify({ address: wallet.publicKey.toBase58() }, null, 2));
   } else {
-    console.log(`
-\u{1F511} Wallet Address: ${wallet.publicKey.toBase58()}
-`);
+    console.log(wallet.publicKey.toBase58());
   }
 }
 
@@ -2236,16 +2242,18 @@ async function silentProve(snarkjs, input, wasmPath, zkeyPath) {
     console.error = savedError;
   }
 }
-function createProgram(connection, wallet) {
+function createProgram(connection, wallet, programId) {
   const idlPath = existsSync(join3(__dirname, "cli/quest/nara_quest.json")) ? "./cli/quest/nara_quest.json" : "./quest/nara_quest.json";
   const idl = _require(idlPath);
+  const pid = programId ?? DEFAULT_QUEST_PROGRAM_ID;
+  const idlWithPid = { ...idl, address: pid };
   const provider = new AnchorProvider(
     connection,
     new Wallet(wallet),
     { commitment: "confirmed" }
   );
   anchor.setProvider(provider);
-  return new Program(idl, provider);
+  return new Program(idlWithPid, provider);
 }
 function getPoolPda(programId) {
   const [pda] = PublicKey8.findProgramAddressSync(
@@ -2261,9 +2269,9 @@ function getWinnerRecordPda(programId, user) {
   );
   return pda;
 }
-async function getQuestInfo(connection, wallet) {
+async function getQuestInfo(connection, wallet, options) {
   const kp = wallet ?? Keypair7.generate();
-  const program2 = createProgram(connection, kp);
+  const program2 = createProgram(connection, kp, options?.programId);
   const poolPda = getPoolPda(program2.programId);
   const pool = await program2.account.pool.fetch(poolPda);
   const now = Math.floor(Date.now() / 1e3);
@@ -2285,9 +2293,9 @@ async function getQuestInfo(connection, wallet) {
     expired: secsLeft <= 0
   };
 }
-async function hasAnswered(connection, wallet) {
-  const program2 = createProgram(connection, wallet);
-  const quest = await getQuestInfo(connection, wallet);
+async function hasAnswered(connection, wallet, options) {
+  const program2 = createProgram(connection, wallet, options?.programId);
+  const quest = await getQuestInfo(connection, wallet, options);
   const winnerPda = getWinnerRecordPda(program2.programId, wallet.publicKey);
   try {
     const wr = await program2.account.winnerRecord.fetch(winnerPda);
@@ -2318,8 +2326,8 @@ async function generateProof(answer, answerHash, userPubkey, options) {
     hex: proofToHex(result.proof)
   };
 }
-async function submitAnswer(connection, wallet, proof) {
-  const program2 = createProgram(connection, wallet);
+async function submitAnswer(connection, wallet, proof, options) {
+  const program2 = createProgram(connection, wallet, options?.programId);
   const signature = await program2.methods.submitAnswer(proof.proofA, proof.proofB, proof.proofC).accounts({ user: wallet.publicKey, payer: wallet.publicKey }).signers([wallet]).rpc({ skipPreflight: true });
   return { signature };
 }
@@ -2622,8 +2630,22 @@ function registerCommands(program2) {
 
 // bin/nara-cli.ts
 var program = new Command8();
-program.name("nara-cli").description("CLI for the Nara chain (Solana-compatible)").version("0.1.0");
+program.name("naracli").description("CLI for the Nara chain (Solana-compatible)").version("0.1.0");
 program.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");
+program.command("address").description("Show wallet address").action(async () => {
+  const opts = program.opts();
+  try {
+    const wallet = await loadWallet(opts.wallet);
+    if (opts.json) {
+      console.log(JSON.stringify({ address: wallet.publicKey.toBase58() }, null, 2));
+    } else {
+      console.log(wallet.publicKey.toBase58());
+    }
+  } catch (error) {
+    console.error(`Error: ${error.message}`);
+    process.exit(1);
+  }
+});
 registerCommands(program);
 program.parse(process.argv);
 if (!process.argv.slice(2).length) {

package/index.ts

@@ -10,7 +10,7 @@
 export { NaraSDK, type NaraSDKConfig } from "./src/client";
 
 // Export constants
-export { DEFAULT_RPC_URL } from "./src/constants";
+export { DEFAULT_RPC_URL, DEFAULT_QUEST_PROGRAM_ID } from "./src/constants";
 
 // Export config functions and types
 export {
@@ -68,7 +68,7 @@ export {
   type ZkProofHex,
   type SubmitAnswerResult,
   type SubmitRelayResult,
-  type QuestProveOptions,
+  type QuestOptions,
 } from "./src/quest";
 
 // Re-export commonly used types from dependencies

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "naracli",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "CLI for the Nara chain (Solana-compatible)",
   "module": "index.ts",
   "main": "index.ts",
   "type": "module",
   "private": false,
   "bin": {
-    "nara-cli": "./dist/nara-cli.mjs"
+    "naracli": "./dist/nara-cli.mjs"
   },
   "scripts": {
-    "cli": "npx tsx bin/nara-cli.ts",
-    "build": "npx esbuild bin/nara-cli.ts --bundle --platform=node --format=esm --outfile=dist/nara-cli.mjs --packages=external --banner:js='#!/usr/bin/env node' && mkdir -p dist/zk dist/quest && cp src/cli/zk/answer_proof.wasm src/cli/zk/answer_proof_final.zkey dist/zk/ && cp src/cli/quest/nara_quest.json dist/quest/",
+    "cli": "node --env-file=.env --import tsx bin/nara-cli.ts",
+    "build": "npx esbuild bin/nara-cli.ts --bundle --platform=node --format=esm --outfile=dist/nara-cli.mjs --packages=external --banner:js='#!/usr/bin/env node\ntry{process.loadEnvFile()}catch{}' && mkdir -p dist/zk dist/quest && cp src/cli/zk/answer_proof.wasm src/cli/zk/answer_proof_final.zkey dist/zk/ && cp src/cli/quest/nara_quest.json dist/quest/",
     "prepublishOnly": "npm run build"
   },
   "files": [

package/src/cli/commands/wallet.ts

@@ -19,7 +19,7 @@ import * as bip39 from "bip39";
 import { derivePath } from "ed25519-hd-key";
 import { join } from "node:path";
 import { homedir } from "node:os";
-import { mkdir } from "node:fs/promises";
+import { mkdir, writeFile, access } from "node:fs/promises";
 import bs58 from "bs58";
 import { NaraSDK } from "../../client";
 import { DEFAULT_WALLET_PATH as _DEFAULT_WALLET_PATH } from "../../constants";
@@ -593,10 +593,13 @@ async function handleWalletCreate(options: { output?: string }): Promise<void> {
   const outputPath = options.output || DEFAULT_WALLET_PATH;
 
   // Check if wallet file already exists
-  if (await Bun.file(outputPath).exists()) {
+  try {
+    await access(outputPath);
     throw new Error(
       `Wallet file already exists at ${outputPath}. Please use a different path or remove the existing file first.`
     );
+  } catch (e: any) {
+    if (e.code !== "ENOENT") throw e;
   }
 
   // Generate mnemonic (12 words by default, can be changed to 24)
@@ -613,7 +616,7 @@ async function handleWalletCreate(options: { output?: string }): Promise<void> {
 
   // Save wallet to file
   const walletData = Array.from(keypair.secretKey);
-  await Bun.write(outputPath, JSON.stringify(walletData, null, 2));
+  await writeFile(outputPath, JSON.stringify(walletData, null, 2));
 
   // Display results
   console.log("\n✅ Wallet created successfully!");
@@ -641,10 +644,13 @@ async function handleWalletImport(options: {
   const outputPath = options.output || DEFAULT_WALLET_PATH;
 
   // Check if wallet file already exists
-  if (await Bun.file(outputPath).exists()) {
+  try {
+    await access(outputPath);
     throw new Error(
       `Wallet file already exists at ${outputPath}. Please use a different path or remove the existing file first.`
     );
+  } catch (e: any) {
+    if (e.code !== "ENOENT") throw e;
   }
 
   let keypair: Keypair;
@@ -691,7 +697,7 @@ async function handleWalletImport(options: {
 
   // Save wallet to file
   const walletData = Array.from(keypair.secretKey);
-  await Bun.write(outputPath, JSON.stringify(walletData, null, 2));
+  await writeFile(outputPath, JSON.stringify(walletData, null, 2));
 
   // Display results
   console.log("\n✅ Wallet imported successfully!");
@@ -704,16 +710,11 @@ async function handleWalletImport(options: {
  * @param options Command options
  */
 async function handleWalletAddress(options: GlobalOptions): Promise<void> {
-  // Load wallet
   const wallet = await loadWallet(options.wallet);
 
-  // Output result
   if (options.json) {
-    const output = {
-      address: wallet.publicKey.toBase58(),
-    };
-    console.log(JSON.stringify(output, null, 2));
+    console.log(JSON.stringify({ address: wallet.publicKey.toBase58() }, null, 2));
   } else {
-    console.log(`\n🔑 Wallet Address: ${wallet.publicKey.toBase58()}\n`);
+    console.log(wallet.publicKey.toBase58());
   }
 }

package/src/cli/utils/wallet.ts

@@ -47,9 +47,8 @@ export async function loadWallet(walletPath?: string): Promise<Keypair> {
     }
   } catch (error: any) {
     if (!walletPath) {
-      // If using default path and it doesn't exist, provide helpful error message
       throw new Error(
-        `Wallet not found. Please create a wallet at ${DEFAULT_WALLET_PATH} or use --wallet flag to specify a different path.`
+        `No wallet found. Create one first:\n\n  npx naracli wallet create\n`
       );
     } else {
       throw new Error(`Failed to load wallet from ${path}: ${error.message}`);

package/src/constants.ts

@@ -27,3 +27,9 @@ export const DEFAULT_WALLET_PATH =
  */
 export const DEFAULT_QUEST_RELAY_URL =
   process.env.QUEST_RELAY_URL || "https://quest-api.nara.build/";
+
+/**
+ * Quest program ID
+ */
+export const DEFAULT_QUEST_PROGRAM_ID =
+  process.env.QUEST_PROGRAM_ID || "Quest11111111111111111111111111111111111111";

package/src/quest.ts

@@ -11,6 +11,7 @@ import {
 import * as anchor from "@coral-xyz/anchor";
 import { Program, AnchorProvider, Wallet } from "@coral-xyz/anchor";
 import type { NaraQuest } from "./cli/quest/nara_quest_types";
+import { DEFAULT_QUEST_PROGRAM_ID } from "./constants";
 
 import { createRequire } from "module";
 const _require = createRequire(import.meta.url);
@@ -76,7 +77,8 @@ export interface SubmitRelayResult {
   txHash: string;
 }
 
-export interface QuestProveOptions {
+export interface QuestOptions {
+  programId?: string;
   circuitWasmPath?: string;
   zkeyPath?: string;
 }
@@ -162,19 +164,22 @@ async function silentProve(snarkjs: any, input: Record<string, string>, wasmPath
 
 function createProgram(
   connection: Connection,
-  wallet: Keypair
+  wallet: Keypair,
+  programId?: string
 ): Program<NaraQuest> {
   const idlPath = existsSync(join(__dirname, "cli/quest/nara_quest.json"))
     ? "./cli/quest/nara_quest.json"
     : "./quest/nara_quest.json";
   const idl = _require(idlPath);
+  const pid = programId ?? DEFAULT_QUEST_PROGRAM_ID;
+  const idlWithPid = { ...idl, address: pid };
   const provider = new AnchorProvider(
     connection,
     new Wallet(wallet),
     { commitment: "confirmed" }
   );
   anchor.setProvider(provider);
-  return new Program<NaraQuest>(idl as any, provider);
+  return new Program<NaraQuest>(idlWithPid as any, provider);
 }
 
 function getPoolPda(programId: PublicKey): PublicKey {
@@ -203,10 +208,11 @@ function getWinnerRecordPda(
  */
 export async function getQuestInfo(
   connection: Connection,
-  wallet?: Keypair
+  wallet?: Keypair,
+  options?: QuestOptions
 ): Promise<QuestInfo> {
   const kp = wallet ?? Keypair.generate();
-  const program = createProgram(connection, kp);
+  const program = createProgram(connection, kp, options?.programId);
   const poolPda = getPoolPda(program.programId);
   const pool = await program.account.pool.fetch(poolPda);
 
@@ -236,10 +242,11 @@ export async function getQuestInfo(
  */
 export async function hasAnswered(
   connection: Connection,
-  wallet: Keypair
+  wallet: Keypair,
+  options?: QuestOptions
 ): Promise<boolean> {
-  const program = createProgram(connection, wallet);
-  const quest = await getQuestInfo(connection, wallet);
+  const program = createProgram(connection, wallet, options?.programId);
+  const quest = await getQuestInfo(connection, wallet, options);
   const winnerPda = getWinnerRecordPda(program.programId, wallet.publicKey);
   try {
     const wr = await program.account.winnerRecord.fetch(winnerPda);
@@ -257,7 +264,7 @@ export async function generateProof(
   answer: string,
   answerHash: number[],
   userPubkey: PublicKey,
-  options?: QuestProveOptions
+  options?: QuestOptions
 ): Promise<{ solana: ZkProof; hex: ZkProofHex }> {
   const wasmPath = options?.circuitWasmPath ?? process.env.QUEST_CIRCUIT_WASM ?? DEFAULT_CIRCUIT_WASM;
   const zkeyPath = options?.zkeyPath ?? process.env.QUEST_ZKEY ?? DEFAULT_ZKEY;
@@ -290,9 +297,10 @@ export async function generateProof(
 export async function submitAnswer(
   connection: Connection,
   wallet: Keypair,
-  proof: ZkProof
+  proof: ZkProof,
+  options?: QuestOptions
 ): Promise<SubmitAnswerResult> {
-  const program = createProgram(connection, wallet);
+  const program = createProgram(connection, wallet, options?.programId);
   const signature = await program.methods
     .submitAnswer(proof.proofA as any, proof.proofB as any, proof.proofC as any)
     .accounts({ user: wallet.publicKey, payer: wallet.publicKey })