nara-sdk 1.0.77 → 1.0.79

package/README.md

@@ -127,12 +127,17 @@ registerBridgeToken('USDT', {
 ### Fee configuration
 
 Default fee: **0.5%** (50 bps), deducted from the bridged amount on the source chain.
+Fee recipients are chain-specific (one per source chain).
 
 ```ts
-import { setBridgeFeeRecipient } from 'nara-sdk';
+import { setBridgeFeeRecipient, getBridgeFeeRecipient } from 'nara-sdk';
 
-// Override fee recipient at runtime
-setBridgeFeeRecipient('YourFeeRecipientPubkey...');
+// Override fee recipient at runtime (per chain)
+setBridgeFeeRecipient('solana', 'SolanaFeeRecipientPubkey...');
+setBridgeFeeRecipient('nara',   'NaraFeeRecipientPubkey...');
+
+// Read current recipient
+const recipient = getBridgeFeeRecipient('solana');  // PublicKey
 
 // Or per-call
 await bridgeTransfer(conn, wallet, {

package/index.ts

@@ -16,7 +16,8 @@ export {
   DEFAULT_AGENT_REGISTRY_PROGRAM_ID,
   DEFAULT_ALT_ADDRESS,
   DEFAULT_BRIDGE_FEE_BPS,
-  DEFAULT_BRIDGE_FEE_RECIPIENT,
+  DEFAULT_BRIDGE_FEE_RECIPIENT_SOLANA,
+  DEFAULT_BRIDGE_FEE_RECIPIENT_NARA,
   BRIDGE_FEE_BPS_DENOMINATOR,
 } from "./src/constants";
 
@@ -222,6 +223,7 @@ export {
 // Export transaction parser
 export {
   parseTxFromHash,
+  parseTxsFromHashes,
   parseTxResponse,
   formatParsedTx,
   type ParsedInstruction,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nara-sdk",
-  "version": "1.0.77",
+  "version": "1.0.79",
   "description": "SDK for the Nara chain (Solana-compatible)",
   "module": "index.ts",
   "main": "index.ts",
@@ -18,7 +18,8 @@
     "sdk"
   ],
   "scripts": {
-    "test": "tsx test/read_api.test.ts"
+    "test": "tsx test/read_api.test.ts",
+    "test:parser": "tsx test/tx_parser.test.ts"
   },
   "author": "",
   "license": "MIT",

package/src/bridge.ts

@@ -27,7 +27,8 @@ import {
 import {
   BRIDGE_FEE_BPS_DENOMINATOR,
   DEFAULT_BRIDGE_FEE_BPS,
-  DEFAULT_BRIDGE_FEE_RECIPIENT,
+  DEFAULT_BRIDGE_FEE_RECIPIENT_SOLANA,
+  DEFAULT_BRIDGE_FEE_RECIPIENT_NARA,
 } from "./constants";
 import { sendTx } from "./tx";
 
@@ -185,23 +186,38 @@ function getToken(symbol: string): BridgeTokenConfig {
   return t;
 }
 
-// ─── Fee recipient (runtime override) ─────────────────────────────
+// ─── Fee recipient (runtime override, per chain) ──────────────────
 
-let _feeRecipientOverride: PublicKey | null = null;
+const _feeRecipientOverrides: Record<BridgeChain, PublicKey | null> = {
+  solana: null,
+  nara: null,
+};
 
-/** Override the bridge fee recipient at runtime */
-export function setBridgeFeeRecipient(recipient: PublicKey | string | null): void {
+/**
+ * Override the bridge fee recipient for a specific source chain at runtime.
+ * Pass `null` as recipient to clear the override and fall back to the default.
+ */
+export function setBridgeFeeRecipient(
+  chain: BridgeChain,
+  recipient: PublicKey | string | null
+): void {
   if (recipient === null) {
-    _feeRecipientOverride = null;
+    _feeRecipientOverrides[chain] = null;
     return;
   }
-  _feeRecipientOverride =
+  _feeRecipientOverrides[chain] =
     typeof recipient === "string" ? new PublicKey(recipient) : recipient;
 }
 
-export function getBridgeFeeRecipient(): PublicKey {
-  if (_feeRecipientOverride) return _feeRecipientOverride;
-  return new PublicKey(DEFAULT_BRIDGE_FEE_RECIPIENT);
+/** Get the current fee recipient for a source chain (override or default). */
+export function getBridgeFeeRecipient(chain: BridgeChain): PublicKey {
+  const override = _feeRecipientOverrides[chain];
+  if (override) return override;
+  const defaultAddr =
+    chain === "solana"
+      ? DEFAULT_BRIDGE_FEE_RECIPIENT_SOLANA
+      : DEFAULT_BRIDGE_FEE_RECIPIENT_NARA;
+  return new PublicKey(defaultAddr);
 }
 
 // ─── PDA derivation ───────────────────────────────────────────────
@@ -515,7 +531,7 @@ export function makeBridgeIxs(params: BridgeTransferParams): BridgeIxsResult {
     throw new Error("bridge amount after fee is zero — increase amount or lower feeBps");
   }
 
-  const recipientForFee = feeRecipient ?? getBridgeFeeRecipient();
+  const recipientForFee = feeRecipient ?? getBridgeFeeRecipient(fromChain);
   const feeIxs = makeBridgeFeeIxs({
     token,
     fromChain,

package/src/constants.ts

@@ -48,8 +48,8 @@ export const DEFAULT_ALT_ADDRESS = process.env.ALT_ADDRESS || "3uw7RatGTB4hdHnuV
 
 /**
  * Bridge fee in basis points (1 bps = 0.01%). 50 = 0.5%.
- * Deducted from the bridged amount and transferred to DEFAULT_BRIDGE_FEE_RECIPIENT
- * in the same transaction.
+ * Deducted from the bridged amount and transferred to the chain-specific
+ * fee recipient in the same transaction.
  */
 export const DEFAULT_BRIDGE_FEE_BPS = 50;
 
@@ -57,11 +57,15 @@ export const DEFAULT_BRIDGE_FEE_BPS = 50;
 export const BRIDGE_FEE_BPS_DENOMINATOR = 10000;
 
 /**
- * Default fee recipient pubkey for cross-chain bridge transactions.
- * Same Ed25519 keypair works on both Solana and Nara chains.
- * Override at runtime via setBridgeFeeRecipient() in src/bridge.ts.
- *
- * NOTE: replace with actual fee recipient before mainnet usage.
+ * Default fee recipient pubkey on Solana (when bridging FROM Solana).
+ * Override at runtime via setBridgeFeeRecipient("solana", ...).
  */
-export const DEFAULT_BRIDGE_FEE_RECIPIENT =
+export const DEFAULT_BRIDGE_FEE_RECIPIENT_SOLANA =
+  "HaPQTvGJBunoWA3AyyWRL9etVEbQWsXVoj3fHpBprLy5";
+
+/**
+ * Default fee recipient pubkey on Nara (when bridging FROM Nara).
+ * Override at runtime via setBridgeFeeRecipient("nara", ...).
+ */
+export const DEFAULT_BRIDGE_FEE_RECIPIENT_NARA =
   "FERLFwBpCyoEuvFP68eP6Fv4FCVocnNyyFUCYwpfmjqn";

package/src/tx_parser.ts

@@ -43,7 +43,10 @@ import { BRIDGE_TOKENS } from "./bridge";
 // ─── Types ────────────────────────────────────────────────────────
 
 export interface ParsedInstruction {
-  /** Instruction index in the transaction */
+  /**
+   * Instruction index. For top-level ixs this is the 0-based position in the tx.
+   * For inner ixs this is the 0-based position within the parent's CPI list.
+   */
   index: number;
   /** Human-readable program name */
   programName: string;
@@ -57,6 +60,11 @@ export interface ParsedInstruction {
   accounts: string[];
   /** Raw instruction data (base64) */
   rawData: string;
+  /**
+   * Inner instructions (CPI calls) made by this instruction.
+   * Only populated on top-level ixs; empty/undefined for ixs that made no CPI calls.
+   */
+  innerInstructions?: ParsedInstruction[];
 }
 
 export interface ParsedTransaction {
@@ -72,7 +80,7 @@ export interface ParsedTransaction {
   error: string | null;
   /** Fee paid in lamports */
   fee: number;
-  /** Parsed instructions */
+  /** Top-level instructions. Inner (CPI) ixs are nested under each one via `innerInstructions`. */
   instructions: ParsedInstruction[];
   /** Log messages */
   logs: string[];
@@ -635,6 +643,39 @@ export async function parseTxFromHash(
   return parseTxResponse(tx);
 }
 
+/**
+ * Fetch and parse multiple transactions in a single batch RPC request.
+ *
+ * Uses `connection.getTransactions(sigs)` which sends one JSON-RPC batch
+ * under the hood (via `_rpcBatchRequest`), so N signatures → 1 HTTP call.
+ *
+ * Returns a result array aligned with the input: each entry is either a
+ * `ParsedTransaction` or `null` if the RPC could not find that signature.
+ * This preserves index mapping so the caller can pair results with inputs.
+ *
+ * @example
+ * ```ts
+ * const results = await parseTxsFromHashes(connection, [sig1, sig2, sig3]);
+ * results.forEach((r, i) => {
+ *   if (!r) console.log(`${sigs[i]} not found`);
+ *   else console.log(formatParsedTx(r));
+ * });
+ * ```
+ */
+export async function parseTxsFromHashes(
+  connection: Connection,
+  signatures: string[]
+): Promise<(ParsedTransaction | null)[]> {
+  if (signatures.length === 0) return [];
+
+  const txs = await connection.getTransactions(signatures, {
+    maxSupportedTransactionVersion: 0,
+    commitment: "confirmed",
+  });
+
+  return txs.map((tx) => (tx ? parseTxResponse(tx) : null));
+}
+
 /**
  * Parse a VersionedTransactionResponse (from getTransaction) synchronously.
  *
@@ -663,25 +704,25 @@ export function parseTxResponse(tx: VersionedTransactionResponse): ParsedTransac
     decodeInstruction(ix, i, accountKeys)
   );
 
-  // Also parse inner instructions (CPI)
+  // Attach inner instructions (CPI calls) under their parent ix.
+  // RPC response: meta.innerInstructions is [{ index, instructions: [...] }, ...]
+  // where `index` points to the top-level ix that made the CPI calls.
   if (tx.meta?.innerInstructions) {
     for (const inner of tx.meta.innerInstructions) {
-      for (const innerIx of inner.instructions) {
-        let dataBuf: Buffer;
-        if (typeof innerIx.data === "string") {
-          dataBuf = Buffer.from(decodeBase58(innerIx.data));
-        } else {
-          dataBuf = Buffer.from(innerIx.data);
-        }
+      const parent = instructions[inner.index];
+      if (!parent) continue;
+      parent.innerInstructions = inner.instructions.map((innerIx, j) => {
+        const dataBuf: Buffer =
+          typeof innerIx.data === "string"
+            ? Buffer.from(decodeBase58(innerIx.data))
+            : Buffer.from(innerIx.data);
         const innerCompiled: MessageCompiledInstruction = {
           programIdIndex: innerIx.programIdIndex,
           accountKeyIndexes: innerIx.accounts,
           data: dataBuf,
         };
-        instructions.push(
-          decodeInstruction(innerCompiled, instructions.length, accountKeys)
-        );
-      }
+        return decodeInstruction(innerCompiled, j, accountKeys);
+      });
     }
   }
 
@@ -739,12 +780,23 @@ export function formatParsedTx(parsed: ParsedTransaction): string {
   lines.push("");
 
   for (const ix of parsed.instructions) {
-    const infoStr = Object.entries(ix.info)
-      .map(([k, v]) => `${k}=${v}`)
-      .join(", ");
-    lines.push(`  #${ix.index} [${ix.programName}] ${ix.type}`);
-    if (infoStr) lines.push(`      ${infoStr}`);
+    formatIxLines(ix, 0, lines);
   }
 
   return lines.join("\n");
 }
+
+function formatIxLines(ix: ParsedInstruction, depth: number, lines: string[]): void {
+  const indent = "  ".repeat(depth + 1);
+  const prefix = depth === 0 ? `#${ix.index}` : `↳ ${ix.index}`;
+  const infoStr = Object.entries(ix.info)
+    .map(([k, v]) => `${k}=${v}`)
+    .join(", ");
+  lines.push(`${indent}${prefix} [${ix.programName}] ${ix.type}`);
+  if (infoStr) lines.push(`${indent}    ${infoStr}`);
+  if (ix.innerInstructions && ix.innerInstructions.length > 0) {
+    for (const inner of ix.innerInstructions) {
+      formatIxLines(inner, depth + 1, lines);
+    }
+  }
+}