nansen-cli 1.26.0 → 1.27.0

package/src/wallet.js

@@ -9,6 +9,7 @@ import path from 'path';
 import * as readline from 'readline';
 import { base58 } from '@scure/base';
 import { storePassword, retrievePassword, deletePassword, deleteCredentialsFile } from './keychain.js';
+import { CommandError } from './api.js';
 
 // ============= Constants =============
 
@@ -246,6 +247,14 @@ function getWalletFile(name) {
   return path.join(getWalletsDir(), `${name}.json`);
 }
 
+function requireWalletFile(name) {
+  const walletFile = getWalletFile(name);
+  if (!fs.existsSync(walletFile)) {
+    throw new Error(`Wallet "${name}" not found`);
+  }
+  return walletFile;
+}
+
 /**
  * Verify the global password against stored hash.
  */
@@ -335,8 +344,8 @@ function resolveWalletPassword() {
  *
  * @param {object} config - wallet config (needs config.passwordHash)
  * @param {object} flags - CLI flags
- * @param {object} deps - { promptFn, log, exit }
- * @returns {{ password: string|null, error: string|null }}
+ * @param {object} deps - { promptFn, log }
+ * @returns {{ password: string|null, error: object|null }}
  */
 async function resolvePasswordForCommand(config, flags, deps) {
   if (!config.passwordHash) {
@@ -353,14 +362,14 @@ async function resolvePasswordForCommand(config, flags, deps) {
 
   return {
     password: null,
-    error: JSON.stringify({
+    error: {
       error: 'PASSWORD_REQUIRED',
       message: 'Wallet is encrypted and no password was found.',
       resolution: [
         'Set NANSEN_WALLET_PASSWORD environment variable',
         'Or re-run wallet create with the password (it will be persisted for future use)',
       ],
-    }),
+    },
   };
 }
 
@@ -465,10 +474,7 @@ export function createWallet(name, password) {
  * Show wallet details (addresses only, no keys).
  */
 export function showWallet(name) {
-  const walletFile = getWalletFile(name);
-  if (!fs.existsSync(walletFile)) {
-    throw new Error(`Wallet "${name}" not found`);
-  }
+  const walletFile = requireWalletFile(name);
 
   const data = JSON.parse(fs.readFileSync(walletFile, 'utf8'));
   const config = getWalletConfig();
@@ -494,10 +500,7 @@ export function showWallet(name) {
  * Export private keys for a wallet (requires password).
  */
 export function exportWallet(name, password) {
-  const walletFile = getWalletFile(name);
-  if (!fs.existsSync(walletFile)) {
-    throw new Error(`Wallet "${name}" not found`);
-  }
+  const walletFile = requireWalletFile(name);
 
   const data = JSON.parse(fs.readFileSync(walletFile, 'utf8'));
   if (data.provider && data.provider !== 'local') {
@@ -526,10 +529,7 @@ export function exportWallet(name, password) {
  * Set the default wallet.
  */
 export function setDefaultWallet(name) {
-  const walletFile = getWalletFile(name);
-  if (!fs.existsSync(walletFile)) {
-    throw new Error(`Wallet "${name}" not found`);
-  }
+  requireWalletFile(name);
 
   const config = getWalletConfig();
   config.defaultWallet = name;
@@ -542,10 +542,7 @@ export function setDefaultWallet(name) {
  * Delete a wallet.
  */
 export async function deleteWallet(name, password) {
-  const walletFile = getWalletFile(name);
-  if (!fs.existsSync(walletFile)) {
-    throw new Error(`Wallet "${name}" not found`);
-  }
+  const walletFile = requireWalletFile(name);
 
   const data = JSON.parse(fs.readFileSync(walletFile, 'utf8'));
   const config = getWalletConfig();
@@ -580,7 +577,7 @@ export async function deleteWallet(name, password) {
  * Build wallet command handlers for integration into CLI.
  */
 export function buildWalletCommands(deps = {}) {
-  const { log = console.log, promptFn: _promptFn, exit = process.exit } = deps;
+  const { log = console.log } = deps;
 
   return {
     'wallet': async (args, apiInstance, flags, options) => {
@@ -599,9 +596,7 @@ export function buildWalletCommands(deps = {}) {
             log('');
             return;
           } catch (err) {
-            log(`❌ ${err.message}`);
-            exit(1);
-            return;
+            throw new CommandError(`❌ ${err.message}`, 'PRIVY_ERROR');
           }
         }
         // All other subcommands fall through to unified handlers below
@@ -612,8 +607,8 @@ export function buildWalletCommands(deps = {}) {
       const handlers = {
         'create': async () => {
           // Privy wallets are handled above — if we reach here with provider=privy,
-          // the privy path already failed and called exit(). Guard against environments
-          // where exit() does not terminate (agent frameworks, test harnesses).
+          // the privy path already threw CommandError. Guard against environments
+          // where throw does not propagate (agent frameworks, test harnesses).
           if (isPrivy) return;
 
           const name = options.name || args[1] || 'default';
@@ -628,28 +623,22 @@ export function buildWalletCommands(deps = {}) {
 
             // Step 2: If --human flag, allow interactive prompt (requires TTY)
             if (!password && flags.human && !process.stdin.isTTY && !deps.promptFn) {
-              log(JSON.stringify({
+              throw new CommandError('--human requires an interactive terminal. Set NANSEN_WALLET_PASSWORD env var instead.', 'NOT_A_TTY', {
                 error: 'NOT_A_TTY',
                 message: '--human requires an interactive terminal. Set NANSEN_WALLET_PASSWORD env var instead.',
-              }));
-              exit(1);
-              return;
+              });
             }
             if (!password && flags.human && (process.stdin.isTTY || deps.promptFn)) {
               password = await promptPassword('Enter wallet password: ', deps);
               if (password && password.length < 12) {
-                log('❌ Password must be at least 12 characters');
-                exit(1);
-                return;
+                throw new CommandError('❌ Password must be at least 12 characters', 'INVALID_INPUT');
               }
               if (password) {
                 const config = getWalletConfig();
                 if (!config.passwordHash) {
                   const confirm = await promptPassword('Confirm password: ', deps);
                   if (password !== confirm) {
-                    log('❌ Passwords do not match');
-                    exit(1);
-                    return;
+                    throw new CommandError('❌ Passwords do not match', 'INVALID_INPUT');
                   }
                 }
               }
@@ -657,20 +646,16 @@ export function buildWalletCommands(deps = {}) {
 
             // Step 3: No password available — return structured error for agents
             if (!password) {
-              log(JSON.stringify({
+              throw new CommandError('A wallet password is required. Ask the user to provide one.', 'PASSWORD_REQUIRED', {
                 error: 'PASSWORD_REQUIRED',
                 message: 'A wallet password is required. Ask the user to provide one.',
                 instructions: 'Re-run with: NANSEN_WALLET_PASSWORD=<password> nansen wallet create',
                 note: 'Password must be at least 12 characters. After creation, the password is saved to the OS keychain automatically — future operations will not require it.',
-              }));
-              exit(1);
-              return;
+              });
             }
 
             if (password.length < 12) {
-              log('❌ Password must be at least 12 characters');
-              exit(1);
-              return;
+              throw new CommandError('❌ Password must be at least 12 characters', 'INVALID_INPUT');
             }
           }
 
@@ -678,9 +663,7 @@ export function buildWalletCommands(deps = {}) {
           if (password !== null) {
             const config = getWalletConfig();
             if (config.passwordHash && !verifyPassword(password, config)) {
-              log('❌ Incorrect password — does not match existing wallets.');
-              exit(1);
-              return;
+              throw new CommandError('❌ Incorrect password — does not match existing wallets.', 'INCORRECT_PASSWORD');
             }
           }
 
@@ -725,8 +708,7 @@ export function buildWalletCommands(deps = {}) {
             log('');
             return;
           } catch (err) {
-            log(`❌ ${err.message}`);
-            exit(1);
+            throw new CommandError(`❌ ${err.message}`, 'CREATE_FAILED');
           }
         },
 
@@ -750,9 +732,7 @@ export function buildWalletCommands(deps = {}) {
         'show': async () => {
           const name = options.name || args[1];
           if (!name) {
-            log('Usage: nansen wallet show <name>');
-            exit(1);
-            return;
+            throw new CommandError('Usage: nansen wallet show <name>', 'MISSING_ARGS');
           }
           try {
             const result = showWallet(name);
@@ -764,25 +744,20 @@ export function buildWalletCommands(deps = {}) {
             log(`    Created: ${result.createdAt}\n`);
             return;
           } catch (err) {
-            log(`❌ ${err.message}`);
-            exit(1);
+            throw new CommandError(`❌ ${err.message}`, 'SHOW_FAILED');
           }
         },
 
         'export': async () => {
           const name = options.name || args[1];
           if (!name) {
-            log('Usage: nansen wallet export <name>');
-            exit(1);
-            return;
+            throw new CommandError('Usage: nansen wallet export <name>', 'MISSING_ARGS');
           }
 
           const config = getWalletConfig();
           const { password, error } = await resolvePasswordForCommand(config, flags, deps);
           if (error) {
-            log(error);
-            exit(1);
-            return;
+            throw new CommandError(error.message, 'PASSWORD_REQUIRED', error);
           }
           try {
             const result = exportWallet(name, password);
@@ -796,34 +771,28 @@ export function buildWalletCommands(deps = {}) {
             log('');
             return;
           } catch (err) {
-            log(`❌ ${err.message}`);
-            exit(1);
+            throw new CommandError(`❌ ${err.message}`, 'EXPORT_FAILED');
           }
         },
 
         'default': async () => {
           const name = options.name || args[1];
           if (!name) {
-            log('Usage: nansen wallet default <name>');
-            exit(1);
-            return;
+            throw new CommandError('Usage: nansen wallet default <name>', 'MISSING_ARGS');
           }
           try {
             const result = setDefaultWallet(name);
             log(`✓ Default wallet set to "${result.defaultWallet}"`);
             return;
           } catch (err) {
-            log(`❌ ${err.message}`);
-            exit(1);
+            throw new CommandError(`❌ ${err.message}`, 'DEFAULT_FAILED');
           }
         },
 
         'delete': async () => {
           const name = options.name || args[1];
           if (!name) {
-            log('Usage: nansen wallet delete <name>');
-            exit(1);
-            return;
+            throw new CommandError('Usage: nansen wallet delete <name>', 'MISSING_ARGS');
           }
 
           // Check if this is a Privy wallet (no password needed)
@@ -839,9 +808,7 @@ export function buildWalletCommands(deps = {}) {
             const config = getWalletConfig();
             const resolved = await resolvePasswordForCommand(config, flags, deps);
             if (resolved.error) {
-              log(resolved.error);
-              exit(1);
-              return;
+              throw new CommandError(resolved.error.message, 'PASSWORD_REQUIRED', resolved.error);
             }
             password = resolved.password;
           }
@@ -857,8 +824,7 @@ export function buildWalletCommands(deps = {}) {
             }
             return;
           } catch (err) {
-            log(`❌ ${err.message}`);
-            exit(1);
+            throw new CommandError(`❌ ${err.message}`, 'DELETE_FAILED');
           }
         },
 
@@ -866,28 +832,20 @@ export function buildWalletCommands(deps = {}) {
           const { sendTokens } = await import('./transfer.js');
 
           if (!options.to) {
-            log('❌ --to <address> is required');
-            exit(1);
-            return;
+            throw new CommandError('--to <address> is required', 'MISSING_ARGS');
           }
 
           const isMax = flags.max || options.amount === 'max';
           if (!options.amount && !isMax) {
-            log('❌ --amount <number> or --max is required');
-            exit(1);
-            return;
+            throw new CommandError('--amount <number> or --max is required', 'MISSING_ARGS');
           }
 
           if (!options.chain) {
-            log('❌ --chain <evm|solana> is required');
-            exit(1);
-            return;
+            throw new CommandError('--chain <evm|solana> is required', 'MISSING_ARGS');
           }
 
           if (!['evm', 'solana', 'ethereum', 'base'].includes(options.chain)) {
-            log('❌ --chain must be one of: evm, solana, ethereum, base');
-            exit(1);
-            return;
+            throw new CommandError('--chain must be one of: evm, solana, ethereum, base', 'INVALID_INPUT');
           }
 
           const isWalletConnect = options.wallet === 'walletconnect' || options.wallet === 'wc';
@@ -912,9 +870,7 @@ export function buildWalletCommands(deps = {}) {
             const sendConfig = getWalletConfig();
             const resolved = await resolvePasswordForCommand(sendConfig, flags, deps);
             if (resolved.error) {
-              log(resolved.error);
-              exit(1);
-              return;
+              throw new CommandError(resolved.error.message, 'PASSWORD_REQUIRED', resolved.error);
             }
             password = resolved.password;
           }
@@ -960,8 +916,7 @@ export function buildWalletCommands(deps = {}) {
             log('');
             return;
           } catch (err) {
-            log(`Error: ${err.message}`);
-            exit(1);
+            throw new CommandError(err.message, 'SEND_FAILED');
           }
         },
 
@@ -979,16 +934,14 @@ export function buildWalletCommands(deps = {}) {
         'secure': async () => {
           const { password, source } = retrievePassword();
           if (!password) {
-            log(JSON.stringify({
+            throw new CommandError('No wallet password found in any store.', 'NO_PASSWORD_FOUND', {
               error: 'NO_PASSWORD_FOUND',
               message: 'No wallet password found in any store.',
               resolution: [
                 'Set NANSEN_WALLET_PASSWORD and run: nansen wallet secure',
                 'This will store it in the OS keychain.',
               ],
-            }));
-            exit(1);
-            return;
+            });
           }
 
           if (source === 'keychain') {
@@ -999,20 +952,19 @@ export function buildWalletCommands(deps = {}) {
           // Verify password actually decrypts wallets before overwriting keychain
           const walletConfig = getWalletConfig();
           if (walletConfig.passwordHash && !verifyPassword(password, walletConfig)) {
-            log(JSON.stringify({
+            const resolution = source === 'file'
+              ? [
+                  'The password in ~/.nansen/wallets/.credentials is incorrect.',
+                  'Run: nansen wallet forget-password  then re-run with the correct password: NANSEN_WALLET_PASSWORD=<pw> nansen wallet secure',
+                ]
+              : [
+                  'Unset NANSEN_WALLET_PASSWORD if it is stale, then re-run: nansen wallet secure',
+                ];
+            throw new CommandError(`Password from '${source}' does not match the wallet's stored hash.`, 'INCORRECT_PASSWORD', {
               error: 'INCORRECT_PASSWORD',
               message: `Password from '${source}' does not match the wallet's stored hash.`,
-              resolution: source === 'file'
-                ? [
-                    'The password in ~/.nansen/wallets/.credentials is incorrect.',
-                    'Run: nansen wallet forget-password  then re-run with the correct password: NANSEN_WALLET_PASSWORD=<pw> nansen wallet secure',
-                  ]
-                : [
-                    'Unset NANSEN_WALLET_PASSWORD if it is stale, then re-run: nansen wallet secure',
-                  ],
-            }));
-            exit(1);
-            return;
+              resolution,
+            });
           }
 
           // Try to migrate to keychain
@@ -1027,18 +979,17 @@ export function buildWalletCommands(deps = {}) {
               log('  Removed ~/.nansen/wallets/.credentials.');
             }
           } else {
-            log(JSON.stringify({
+            const msg = source === 'file'
+              ? 'OS keychain is not available. Password remains in ~/.nansen/wallets/.credentials (insecure).'
+              : 'OS keychain is not available. Password is only in the NANSEN_WALLET_PASSWORD env var (not persisted).';
+            throw new CommandError(msg, 'KEYCHAIN_UNAVAILABLE', {
               error: 'KEYCHAIN_UNAVAILABLE',
-              message: source === 'file'
-                ? 'OS keychain is not available. Password remains in ~/.nansen/wallets/.credentials (insecure).'
-                : 'OS keychain is not available. Password is only in the NANSEN_WALLET_PASSWORD env var (not persisted).',
+              message: msg,
               resolution: [
                 'Set NANSEN_WALLET_PASSWORD in a secrets manager or system keyring',
                 'Use a containerized secrets agent (e.g. Vault, 1Password CLI)',
               ],
-            }));
-            exit(1);
-            return;
+            });
           }
         },
 
@@ -1104,9 +1055,7 @@ EXAMPLES:
       };
 
       if (!handlers[subcommand]) {
-        log(`Unknown subcommand: ${subcommand}. Available: ${Object.keys(handlers).join(', ')}`);
-        exit(1);
-        return;
+        throw new CommandError(`Unknown subcommand: ${subcommand}. Available: ${Object.keys(handlers).join(', ')}`, 'UNKNOWN_COMMAND');
       }
 
       // --help on any wallet subcommand shows wallet help instead of executing

package/src/x402-svm.js

@@ -5,7 +5,7 @@
 
 import crypto from 'crypto';
 import { base58Encode, base58DecodePubkey } from './wallet.js';
-import { encodeCompactU16, isOnEd25519Curve } from './transfer.js';
+import { encodeCompactU16, deriveATA as _deriveATA } from './transfer.js';
 
 // ============= Constants =============
 
@@ -13,7 +13,6 @@ const TOKEN_PROGRAM = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
 const _TOKEN_2022_PROGRAM = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
 const COMPUTE_BUDGET_PROGRAM = 'ComputeBudget111111111111111111111111111111';
 const MEMO_PROGRAM = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
-const ATA_PROGRAM = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
 const _SYSTEM_PROGRAM = '11111111111111111111111111111111';
 
 const DEFAULT_COMPUTE_UNIT_LIMIT = 20000;
@@ -23,29 +22,10 @@ const DEFAULT_COMPUTE_UNIT_PRICE_MICROLAMPORTS = 1;
 
 /**
  * Derive Associated Token Account (ATA) address.
- * PDA seeds: [owner, tokenProgram, mint] with ATA program.
+ * Returns base58-encoded PDA. Delegates algorithm to transfer.js.
  */
 export function deriveATA(ownerBase58, mintBase58, tokenProgramBase58 = TOKEN_PROGRAM) {
-  const owner = base58DecodePubkey(ownerBase58);
-  const tokenProgram = base58DecodePubkey(tokenProgramBase58);
-  const mint = base58DecodePubkey(mintBase58);
-  const ataProgramKey = base58DecodePubkey(ATA_PROGRAM);
-
-  // find_program_address: try nonce 255 down to 0
-  // PDA = SHA256(seeds... || programId || "ProgramDerivedAddress")
-  // A valid PDA must NOT be on the ed25519 curve.
-  // Checking on-curve in pure JS without a full ed25519 implementation is hard.
-  // We use the mathematical approach: decode y-coordinate, compute x², check QR.
-  for (let nonce = 255; nonce >= 0; nonce--) {
-    const hash = crypto.createHash('sha256')
-      .update(Buffer.concat([owner, tokenProgram, mint, Buffer.from([nonce]), ataProgramKey, Buffer.from('ProgramDerivedAddress')]))
-      .digest();
-
-    if (!isOnEd25519Curve(hash)) {
-      return base58Encode(hash);
-    }
-  }
-  throw new Error('Could not derive ATA: no valid PDA found');
+  return base58Encode(_deriveATA(ownerBase58, mintBase58, tokenProgramBase58));
 }
 
 // ============= MessageV0 Builder =============