nansen-cli 1.16.1 → 1.17.0

package/src/trading.js

@@ -13,6 +13,7 @@ import { base58Decode } from './transfer.js';
 import { keccak256, signSecp256k1, rlpEncode } from './crypto.js';
 import { getWalletConnectAddress, sendTransactionViaWalletConnect, sendSolanaTransactionViaWalletConnect, sendApprovalViaWalletConnect } from './walletconnect-trading.js';
 import { retrievePassword } from './keychain.js';
+import { CHAIN_RPCS } from './rpc-urls.js';
 
 // ============= Constants =============
 
@@ -63,21 +64,17 @@ export function resolveTokenAddress(symbolOrAddress, chainName) {
   return resolved || symbolOrAddress;
 }
 
-// Default public RPC endpoints (used for nonce fetching)
-const EVM_RPC_URLS = {
-  base:     process.env.NANSEN_RPC_BASE     || 'https://mainnet.base.org',
-};
-
 /**
  * Make a JSON-RPC call to an EVM RPC endpoint.
- * @param {string} chain - Chain name (key into EVM_RPC_URLS)
+ * RPC URLs come from the shared CHAIN_RPCS registry in rpc-urls.js.
+ * @param {string} chain - Chain name (key into CHAIN_RPCS)
  * @param {string} method - JSON-RPC method name
  * @param {Array} params - Method parameters
  * @returns {Promise<*>} Parsed result value
  * @throws {Error} If chain has no configured RPC or the RPC returns an error
  */
 async function evmRpcCall(chain, method, params = []) {
-  const rpcUrl = EVM_RPC_URLS[chain];
+  const rpcUrl = CHAIN_RPCS[chain];
   if (!rpcUrl) throw new Error(`No RPC URL configured for chain: ${chain}`);
   const res = await fetch(rpcUrl, {
     method: 'POST',
@@ -406,7 +403,7 @@ export async function waitForReceipt(chain, txHash, timeoutMs = 30000, pollMs =
  * Returns { success: true } or { success: false, reason: string }.
  */
 export async function simulateEvmCall(chain, { from, to, data, value, gas }) {
-  if (!EVM_RPC_URLS[chain]) return { success: true }; // Can't simulate, skip
+  if (!CHAIN_RPCS[chain]) return { success: true }; // Can't simulate, skip
 
   try {
     const callObj = { from, to, data, value: value || '0x0' };
@@ -417,7 +414,24 @@ export async function simulateEvmCall(chain, { from, to, data, value, gas }) {
     const msg = e.message || 'unknown';
     // Only block on actual contract-level revert errors from the RPC
     if (msg.startsWith('RPC error (eth_call):')) {
-      return { success: false, reason: msg.replace(/^RPC error \(eth_call\): /, '') };
+      const rawReason = msg.replace(/^RPC error \(eth_call\): /, '');
+      // Convert raw "insufficient funds" RPC errors (amounts in wei) into a human-readable message.
+      // EVM nodes emit: "insufficient funds for gas * price + value: address 0x... have X want Y (supplied gas Z)"
+      // TODO: full fix would be a pre-flight eth_getBalance check at quote-fetch time so the error
+      //       surfaces before simulation with an estimated ETH requirement — see PR for this fix.
+      const m = rawReason.match(/insufficient funds[\s\S]*?\bhave (\d+)\s+want (\d+)/i);
+      if (m) {
+        const haveWei = BigInt(m[1]);
+        const wantWei = BigInt(m[2]);
+        const haveEth = (Number(haveWei) / 1e18).toFixed(6);
+        const wantEth = (Number(wantWei) / 1e18).toFixed(6);
+        const fundHint = from ? ` Send ETH to ${from} before trading.` : '';
+        return {
+          success: false,
+          reason: `Insufficient ETH: wallet has ${haveEth} ETH but this trade needs ~${wantEth} ETH (amount + gas).${fundHint}`,
+        };
+      }
+      return { success: false, reason: rawReason };
     }
     // Network/infrastructure errors (fetch failure, rate limit, non-JSON response) → non-blocking
     return { success: true };
@@ -429,7 +443,7 @@ export async function simulateEvmCall(chain, { from, to, data, value, gas }) {
  * Used to fix under-gassed quotes from aggregators.
  */
 export async function estimateEvmGas(chain, { from, to, data, value }) {
-  if (!EVM_RPC_URLS[chain]) return null;
+  if (!CHAIN_RPCS[chain]) return null;
 
   try {
     const result = await evmRpcCall(chain, 'eth_estimateGas', [{ from, to, data, value: value || '0x0' }]);
@@ -444,7 +458,7 @@ export async function estimateEvmGas(chain, { from, to, data, value }) {
  * Returns the allowance as a BigInt, or 0n on failure.
  */
 export async function checkErc20Allowance(chain, tokenAddress, ownerAddress, spenderAddress) {
-  if (!EVM_RPC_URLS[chain]) return 0n;
+  if (!CHAIN_RPCS[chain]) return 0n;
 
   try {
     // allowance(address,address) selector = 0xdd62ed3e
@@ -1123,7 +1137,7 @@ EXAMPLES:
               let finalGas = apiGas > 0 ? apiGas : txGas;
               if (finalGas === 0) {
                 try {
-                  const rpcUrl = EVM_RPC_URLS[chain];
+                  const rpcUrl = CHAIN_RPCS[chain];
                   const estRes = await fetch(rpcUrl, {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },

package/src/transfer.js

@@ -9,26 +9,16 @@ import { base58Encode, exportWallet, getWalletConfig, verifyPassword, showWallet
 import { keccak256, signSecp256k1, rlpEncode } from './crypto.js';
 import { getWalletConnectAddress, sendTransactionViaWalletConnect } from './walletconnect-trading.js';
 import { EVM_CHAIN_IDS } from './chain-ids.js';
+import { CHAIN_RPCS } from './rpc-urls.js';
 
 // ============= Constants =============
 
-const DEFAULT_EVM_RPC = 'https://eth.public-rpc.com';
-const DEFAULT_SOLANA_RPC = 'https://api.mainnet-beta.solana.com';
-
 const PRIORITY_FEE_DEFAULTS = { base: 100000000n, ethereum: 1500000000n, evm: 1500000000n };
 
 const ERC20_TRANSFER_SELECTOR = 'a9059cbb'; // transfer(address,uint256)
 const SYSTEM_PROGRAM = '11111111111111111111111111111111'; // 32 zero bytes in base58
 const ATA_PROGRAM = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
 
-// Chain-specific RPC endpoints
-const CHAIN_RPCS = {
-  'ethereum': process.env.NANSEN_EVM_RPC || DEFAULT_EVM_RPC,
-  'evm': process.env.NANSEN_EVM_RPC || DEFAULT_EVM_RPC,
-  'base': process.env.NANSEN_BASE_RPC || 'https://mainnet.base.org',
-  'solana': process.env.NANSEN_SOLANA_RPC || DEFAULT_SOLANA_RPC,
-};
-
 // Alias: buildEvmTransaction uses 'evm' as a generic fallback
 const CHAIN_IDS = { ...EVM_CHAIN_IDS, evm: 1 };
 

package/src/wallet.js

@@ -1067,7 +1067,8 @@ ENVIRONMENT:
   PRIVY_APP_ID               Privy application ID (required for --provider privy)
   PRIVY_APP_SECRET           Privy application secret (required for --provider privy)
   NANSEN_WALLET_PROVIDER     Default provider for wallet create ("local" or "privy")
-  NANSEN_EVM_RPC            Custom EVM RPC endpoint
+  NANSEN_EVM_RPC            Custom Ethereum RPC endpoint (also generic EVM fallback)
+  NANSEN_BASE_RPC           Custom Base RPC endpoint
   NANSEN_SOLANA_RPC         Custom Solana RPC endpoint
 
 EXAMPLES:

package/src/x402.js

@@ -12,6 +12,7 @@ import {
   getSolanaRpcUrl,
 } from './x402-svm.js';
 import { resolvePassword } from './keychain.js';
+import { CHAIN_RPCS } from './rpc-urls.js';
 
 /**
  * Parse PaymentRequirements from a 402 response.
@@ -187,10 +188,10 @@ export async function checkX402Balance(network) {
     }
 
     if (network.startsWith('eip155:')) {
-      // Base USDC balance check
+      // Base USDC balance check — RPC URL from shared registry so NANSEN_BASE_RPC override applies
       const USDC_BASE = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913';
       const addr = walletInfo.evm.replace('0x', '').toLowerCase().padStart(64, '0');
-      const resp = await fetch('https://mainnet.base.org', {
+      const resp = await fetch(CHAIN_RPCS.base, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({