nara-sdk 1.0.21 → 1.0.25

package/index.ts

@@ -56,7 +56,9 @@ export {
   scanClaimableDeposits,
   withdraw,
   transferZkId,
+  transferZkIdByCommitment,
   deriveIdSecret,
+  computeIdCommitment,
   isValidRecipient,
   generateValidRecipient,
   ZKID_DENOMINATIONS,

package/package.json

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

package/src/quest.ts

@@ -13,8 +13,7 @@ import { Program, AnchorProvider, Wallet } from "@coral-xyz/anchor";
 import type { NaraQuest } from "./idls/nara_quest_types";
 import { DEFAULT_QUEST_PROGRAM_ID } from "./constants";
 
-import { createRequire } from "module";
-const _require = createRequire(import.meta.url);
+import naraQuestIdl from "./idls/nara_quest.json";
 
 // ─── ZK constants ────────────────────────────────────────────────
 const BN254_FIELD =
@@ -23,7 +22,9 @@ const BN254_FIELD =
 import { fileURLToPath } from "url";
 import { dirname, join, resolve } from "path";
 import { existsSync } from "fs";
-const __dirname = dirname(fileURLToPath(import.meta.url));
+const __dirname: string = import.meta.url
+  ? dirname(fileURLToPath(import.meta.url))
+  : eval("__dirname") as string;
 
 function findZkFile(name: string): string {
   const srcPath = join(__dirname, "zk", name);
@@ -162,7 +163,7 @@ function createProgram(
   wallet: Keypair,
   programId?: string
 ): Program<NaraQuest> {
-  const idl = _require("./idls/nara_quest.json");
+  const idl = naraQuestIdl;
   const pid = programId ?? DEFAULT_QUEST_PROGRAM_ID;
   const idlWithPid = { ...idl, address: pid };
   const provider = new AnchorProvider(

package/src/skills.ts

@@ -13,8 +13,7 @@ import { Program, AnchorProvider, Wallet } from "@coral-xyz/anchor";
 import type { NaraSkillsHub } from "./idls/nara_skills_hub";
 import { DEFAULT_SKILLS_PROGRAM_ID } from "./constants";
 
-import { createRequire } from "module";
-const _require = createRequire(import.meta.url);
+import naraSkillsIdl from "./idls/nara_skills_hub.json";
 
 // ─── Constants ───────────────────────────────────────────────────
 
@@ -27,6 +26,42 @@ const BUFFER_HEADER_SIZE = 80;
 /** SkillContent account header size: 8 discriminator + 32 skill */
 const CONTENT_HEADER_SIZE = 40;
 
+// ─── Helpers ─────────────────────────────────────────────────────
+
+/** Send a transaction and poll until confirmed, without using WebSocket. */
+async function sendAndConfirmTx(
+  connection: Connection,
+  tx: anchor.web3.Transaction,
+  signers: anchor.web3.Signer[]
+): Promise<string> {
+  const { blockhash, lastValidBlockHeight } =
+    await connection.getLatestBlockhash("confirmed");
+  tx.recentBlockhash = blockhash;
+  tx.feePayer = signers[0]!.publicKey;
+  tx.sign(...signers);
+
+  const rawTx = tx.serialize();
+  const sig = await connection.sendRawTransaction(rawTx, {
+    skipPreflight: false,
+  });
+
+  while (true) {
+    const { value } = await connection.getSignatureStatuses([sig]);
+    const status = value[0];
+    if (status) {
+      if (status.err) throw new Error(`Transaction failed: ${JSON.stringify(status.err)}`);
+      if (status.confirmationStatus === "confirmed" || status.confirmationStatus === "finalized") {
+        return sig;
+      }
+    }
+    const currentHeight = await connection.getBlockHeight("confirmed");
+    if (currentHeight > lastValidBlockHeight) {
+      throw new Error(`Transaction expired (blockhash no longer valid): ${sig}`);
+    }
+    await new Promise((r) => setTimeout(r, 1000));
+  }
+}
+
 // ─── Types ───────────────────────────────────────────────────────
 
 export interface SkillRecord {
@@ -68,7 +103,7 @@ function createProgram(
   wallet: Keypair,
   programId?: string
 ): Program<NaraSkillsHub> {
-  const idl = _require("./idls/nara_skills_hub.json");
+  const idl = naraSkillsIdl;
   const pid = programId ?? DEFAULT_SKILLS_PROGRAM_ID;
   const idlWithPid = { ...idl, address: pid };
   const provider = new AnchorProvider(connection, new Wallet(wallet), {
@@ -378,10 +413,7 @@ export async function uploadSkillContent(
       programId: program.programId,
     })
   );
-  await anchor.web3.sendAndConfirmTransaction(connection, createBufferTx, [
-    wallet,
-    bufferKeypair,
-  ]);
+  await sendAndConfirmTx(connection, createBufferTx, [wallet, bufferKeypair]);
 
   // ── Step 2: init_buffer ───────────────────────────────────────
   await program.methods
@@ -426,10 +458,7 @@ export async function uploadSkillContent(
       programId: program.programId,
     })
   );
-  await anchor.web3.sendAndConfirmTransaction(connection, createContentTx, [
-    wallet,
-    contentKeypair,
-  ]);
+  await sendAndConfirmTx(connection, createContentTx, [wallet, contentKeypair]);
 
   // ── Step 5: finalize ──────────────────────────────────────────
   if (isUpdate) {

package/src/zkid.ts

@@ -18,10 +18,17 @@ import nacl from "tweetnacl";
 import BN from "bn.js";
 import type { NaraZk } from "./idls/nara_zk";
 import { DEFAULT_ZKID_PROGRAM_ID } from "./constants";
+import naraZkIdl from "./idls/nara_zk.json";
 import { createRequire } from "module";
 
-const _require = createRequire(import.meta.url);
-const __dirname = dirname(fileURLToPath(import.meta.url));
+// _require is used only for snarkjs (external, loaded at runtime).
+// Supports both ESM (tsx dev) and esbuild CJS bundle (import.meta.url is "" — falsy)
+const _require: NodeRequire = import.meta.url
+  ? createRequire(import.meta.url)
+  : eval("require") as NodeRequire;
+const __dirname: string = import.meta.url
+  ? dirname(fileURLToPath(import.meta.url))
+  : eval("__dirname") as string;
 
 // ─── Constants ────────────────────────────────────────────────────────────────
 
@@ -174,7 +181,7 @@ function createProgram(
   wallet: Keypair,
   programId?: string
 ): Program<NaraZk> {
-  const idl = _require("./idls/nara_zk.json");
+  const idl = naraZkIdl;
   const pid = programId ?? DEFAULT_ZKID_PROGRAM_ID;
   const idlWithPid = { ...idl, address: pid };
   const provider = new AnchorProvider(connection, new Wallet(wallet), {
@@ -188,7 +195,7 @@ function createReadProgram(
   connection: Connection,
   programId?: string
 ): Program<NaraZk> {
-  const idl = _require("./idls/nara_zk.json");
+  const idl = naraZkIdl;
   const pid = programId ?? DEFAULT_ZKID_PROGRAM_ID;
   const idlWithPid = { ...idl, address: pid };
   const provider = new AnchorProvider(
@@ -549,3 +556,61 @@ export async function transferZkId(
     .accounts({ payer: payer.publicKey } as any)
     .rpc();
 }
+
+/**
+ * Derive the idCommitment (public) from a Keypair + name.
+ *
+ * The new owner can share this hex string without revealing their idSecret.
+ * Returns a 64-char hex string (32 bytes, big-endian).
+ */
+export async function computeIdCommitment(keypair: Keypair, name: string): Promise<string> {
+  const idSecret = await deriveIdSecret(keypair, name);
+  const commitment = await poseidonHash([idSecret]);
+  return bigIntToBytes32BE(commitment).toString("hex");
+}
+
+/**
+ * Transfer ZK ID ownership using the new owner's idCommitment directly.
+ *
+ * Unlike transferZkId (which takes newIdSecret), this function accepts the
+ * commitment hex produced by computeIdCommitment(), so the new owner never
+ * needs to share their secret.
+ *
+ * @param currentIdSecret  - Current owner's idSecret (from deriveIdSecret)
+ * @param newIdCommitment  - New owner's commitment as bigint (parse from hex)
+ */
+export async function transferZkIdByCommitment(
+  connection: Connection,
+  payer: Keypair,
+  name: string,
+  currentIdSecret: bigint,
+  newIdCommitment: bigint,
+  options?: ZkIdOptions
+): Promise<string> {
+  const program = createProgram(connection, payer, options?.programId);
+  const nameHashBuf = computeNameHash(name);
+
+  const [zkIdPda] = findZkIdPda(nameHashBuf, new PublicKey(options?.programId ?? DEFAULT_ZKID_PROGRAM_ID));
+  const zkId = await program.account.zkIdAccount.fetch(zkIdPda);
+  const currentCommitmentField = bytes32ToBigInt(
+    Buffer.from(zkId.idCommitment as number[])
+  );
+
+  const newCommitmentBuf = bigIntToBytes32BE(newIdCommitment);
+
+  const input = {
+    idSecret: currentIdSecret.toString(),
+    idCommitment: currentCommitmentField.toString(),
+  };
+  const { proof } = await silentProve(input, OWNERSHIP_WASM, OWNERSHIP_ZKEY);
+  const packedProof = packProof(proof);
+
+  return await program.methods
+    .transferZkId(
+      toBytes32(nameHashBuf),
+      toBytes32(newCommitmentBuf),
+      packedProof
+    )
+    .accounts({ payer: payer.publicKey } as any)
+    .rpc();
+}