nansen-cli 1.24.0 → 1.25.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 1.25.1
+
+### Patch Changes
+
+- [#367](https://github.com/nansen-ai/nansen-cli/pull/367) [`9fea10a`](https://github.com/nansen-ai/nansen-cli/commit/9fea10a844acbaccf37a348dfd4efd5c32f76a4a) Thanks [@kome12](https://github.com/kome12)! - add --premium-labels flag to tgm/holders, tgm/pnl-leaderboard, tgm/perp-pnl-leaderboard, and perp-leaderboard endpoints
+
+## 1.25.0
+
+### Minor Changes
+
+- [#363](https://github.com/nansen-ai/nansen-cli/pull/363) [`6ae402e`](https://github.com/nansen-ai/nansen-cli/commit/6ae402ef1e5bdeacf83fe04bcf6e8e0c9f9c91b7) Thanks [@TimNooren](https://github.com/TimNooren)! - Add `--amount-unit usd` to trade commands — specify swap amounts in USD
+
+### Patch Changes
+
+- [#374](https://github.com/nansen-ai/nansen-cli/pull/374) [`0f14803`](https://github.com/nansen-ai/nansen-cli/commit/0f148031ef7590f3405c1dba9f31ad83768a7141) Thanks [@TimNooren](https://github.com/TimNooren)! - Fix cross-chain quote display: show adaptive precision for sub-cent bridge fees, "< 1 min" for fast bridges, and echo --to-wallet address in output
+
+- [#366](https://github.com/nansen-ai/nansen-cli/pull/366) [`f358fff`](https://github.com/nansen-ai/nansen-cli/commit/f358fffcc80136c4e609f2e056f2c5ffb052d626) Thanks [@kome12](https://github.com/kome12)! - fix(token): replace dead `--days` param with working `--timeframe` for `token flow-intelligence`
+
+  The `--days` option was accepted but never sent to the API, resulting in always fetching `1d` data. This replaces it with `--timeframe` (enum: `1h | 6h | 12h | 1d | 7d`, default `1d`) which maps correctly to the API parameter.
+
 ## 1.24.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nansen-cli",
-  "version": "1.24.0",
+  "version": "1.25.1",
   "description": "Command-line interface for Nansen API - designed for AI agents",
   "main": "src/index.js",
   "type": "module",

package/skills/nansen-trading/SKILL.md

@@ -85,13 +85,15 @@ nansen trade execute --quote "$quote_id"
 
 ## Amounts
 
-By default, `--amount` accepts **integer base units** (lamports, wei, etc). Use `--amount-unit token` to specify human-readable token amounts instead — the CLI resolves decimals locally and sends base units to the API.
+By default, `--amount` accepts **integer base units** (lamports, wei, etc). Use `--amount-unit token` for human-readable token amounts, or `--amount-unit usd` to specify a USD value — the CLI resolves price and decimals automatically.
 
 ```bash
 # Base units (default)
 nansen trade quote --chain solana --from SOL --to USDC --amount 1000000000
 # Token units (0.5 SOL = 500000000 lamports, resolved automatically)
 nansen trade quote --chain solana --from SOL --to USDC --amount 0.5 --amount-unit token
+# USD amount ($50 worth of SOL, price resolved via Nansen search API)
+nansen trade quote --chain solana --from SOL --to USDC --amount 50 --amount-unit usd
 ```
 
 | Token | Decimals | 1 token = |
@@ -100,25 +102,43 @@ nansen trade quote --chain solana --from SOL --to USDC --amount 0.5 --amount-uni
 | ETH | 18 | `1000000000000000000` |
 | USDC | 6 | `1000000` |
 
-If the user says "$20 worth of X", you must convert USD → token amount, then either pass base units or use `--amount-unit token`. For example, to buy $20 of SOL at $150/SOL: $20 ÷ $150 = 0.1333 SOL → `--amount 0.1333 --amount-unit token`. Use a price lookup (e.g. `nansen research token info`) to get the current price first.
+If the user says "$20 worth of X", use `--amount-unit usd` directly — no manual conversion needed. The CLI fetches the current price and converts for you.
 
 ## Flags
 
+### `trade quote` flags
+
 | Flag | Purpose |
 |------|---------|
 | `--chain` | Source chain: `solana` or `base` |
 | `--to-chain` | Destination chain for cross-chain swap (omit for same-chain) |
 | `--from` | Source token (symbol or address) |
 | `--to` | Destination token (symbol or address, resolved against destination chain) |
-| `--amount` | Amount in base units (integer), or token units with `--amount-unit token` |
-| `--amount-unit` | Set to `token` to specify amount in token units (e.g. 0.5 SOL) |
+| `--amount` | Amount in base units (integer), or token/USD units with `--amount-unit` |
+| `--amount-unit` | `token` for token units (e.g. 0.5 SOL), `usd` for USD (e.g. 50), `base` = default |
 | `--wallet` | Wallet name (default: default wallet) |
 | `--to-wallet` | Destination wallet address (auto-derived for cross-chain if omitted) |
 | `--slippage` | Slippage tolerance as decimal (e.g. 0.03) |
-| `--quote` | Quote ID for execute |
+| `--auto-slippage` | Enable auto slippage calculation |
+| `--max-auto-slippage` | Max auto slippage when `--auto-slippage` is enabled |
+| `--swap-mode` | `exactIn` (default) or `exactOut` |
+
+### `trade execute` flags
+
+| Flag | Purpose |
+|------|---------|
+| `--quote` | Quote ID from `trade quote` |
+| `--wallet` | Wallet name (default: default wallet) |
+| `--quote-index` | Pin a specific quote by index (0-based) when multiple quotes were returned |
 | `--no-simulate` | Skip pre-broadcast simulation |
-| `--tx-hash` | Source tx hash (for bridge-status) |
+
+### `trade bridge-status` flags
+
+| Flag | Purpose |
+|------|---------|
+| `--tx-hash` | Source tx hash |
 | `--from-chain` | Source chain (for bridge-status) |
+| `--to-chain` | Destination chain (for bridge-status) |
 
 ## Environment Variables
 

package/src/api.js

@@ -971,19 +971,21 @@ export class NansenAPI {
   }
 
   async tokenHolders(params = {}) {
-    const { tokenAddress, chain = 'solana', labelType = 'all_holders', filters = {}, orderBy, pagination } = params;
+    const { tokenAddress, chain = 'solana', labelType = 'all_holders', filters = {}, orderBy, pagination, withLabels } = params;
     if (tokenAddress) {
       const validation = validateTokenAddress(tokenAddress, chain);
       if (!validation.valid) throw new NansenError(validation.error, validation.code);
     }
-    return this.request('/api/v1/tgm/holders', {
+    const body = {
       token_address: tokenAddress,
       chain,
       label_type: labelType,
       filters,
       order_by: orderBy,
       pagination
-    });
+    };
+    if (withLabels !== undefined) body.premium_labels = withLabels;
+    return this.request('/api/v1/tgm/holders', body);
   }
 
   async tokenFlows(params = {}) {
@@ -1027,19 +1029,21 @@ export class NansenAPI {
   }
 
   async tokenPnlLeaderboard(params = {}) {
-    const { tokenAddress, chain = 'solana', filters = {}, orderBy, pagination, days = 30 } = params;
+    const { tokenAddress, chain = 'solana', filters = {}, orderBy, pagination, days = 30, withLabels } = params;
     if (tokenAddress) {
       const validation = validateTokenAddress(tokenAddress, chain);
       if (!validation.valid) throw new NansenError(validation.error, validation.code);
     }
-    return this.request('/api/v1/tgm/pnl-leaderboard', {
+    const body = {
       token_address: tokenAddress,
       chain,
       date: buildDateRange(days),
       filters,
       order_by: orderBy,
       pagination
-    });
+    };
+    if (withLabels !== undefined) body.premium_labels = withLabels;
+    return this.request('/api/v1/tgm/pnl-leaderboard', body);
   }
 
   async tokenWhoBoughtSold(params = {}) {
@@ -1061,14 +1065,15 @@ export class NansenAPI {
   }
 
   async tokenFlowIntelligence(params = {}) {
-    const { tokenAddress, chain = 'solana' } = params;
+    const { tokenAddress, chain = 'solana', timeframe = '1d' } = params;
     if (tokenAddress) {
       const validation = validateTokenAddress(tokenAddress, chain);
       if (!validation.valid) throw new NansenError(validation.error, validation.code);
     }
     return this.request('/api/v1/tgm/flow-intelligence', {
       token_address: tokenAddress,
-      chain
+      chain,
+      timeframe
     });
   }
 
@@ -1125,14 +1130,16 @@ export class NansenAPI {
   }
 
   async tokenPerpPnlLeaderboard(params = {}) {
-    const { tokenSymbol, filters = {}, orderBy, pagination, days = 30 } = params;
-    return this.request('/api/v1/tgm/perp-pnl-leaderboard', {
+    const { tokenSymbol, filters = {}, orderBy, pagination, days = 30, withLabels } = params;
+    const body = {
       token_symbol: tokenSymbol,
       date: buildDateRange(days),
       filters,
       order_by: orderBy,
       pagination
-    });
+    };
+    if (withLabels !== undefined) body.premium_labels = withLabels;
+    return this.request('/api/v1/tgm/perp-pnl-leaderboard', body);
   }
 
   async tokenIndicators(params = {}) {
@@ -1186,13 +1193,15 @@ export class NansenAPI {
   }
 
   async perpLeaderboard(params = {}) {
-    const { filters = {}, orderBy, pagination, days = 30 } = params;
-    return this.request('/api/v1/perp-leaderboard', {
+    const { filters = {}, orderBy, pagination, days = 30, withLabels } = params;
+    const body = {
       date: buildDateRange(days),
       filters,
       order_by: orderBy,
       pagination
-    });
+    };
+    if (withLabels !== undefined) body.premium_labels = withLabels;
+    return this.request('/api/v1/perp-leaderboard', body);
   }
 
   // ============= Prediction Market Endpoints =============

package/src/cli.js

@@ -30,6 +30,23 @@ export const SCHEMA = { version: VERSION, ...schemaDefinition };
 
 // ============= Pagination =============
 
+/**
+ * Resolve a boolean CLI option that can be passed as either:
+ *   --flag          (flag=true, options key absent)
+ *   --flag true     (options key = 'true')
+ *   --flag false    (options key = 'false')
+ * Returns true/false/undefined (undefined = not supplied).
+ */
+export function resolveBooleanOption(options, flags, key) {
+  if (options[key] !== undefined) {
+    const val = String(options[key]).toLowerCase();
+    if (val === 'true' || val === '1') return true;
+    if (val === 'false' || val === '0') return false;
+  }
+  if (flags[key] !== undefined) return Boolean(flags[key]);
+  return undefined;
+}
+
 export function buildPagination(options) {
   if (!options.limit && !options.page) return undefined;
   return {
@@ -1237,20 +1254,23 @@ export function buildCommands(deps = {}) {
           }
           return result;
         },
-        'holders': () => apiInstance.tokenHolders({ tokenAddress, chain, labelType: onlySmartMoney ? 'smart_money' : 'all_holders', filters, orderBy, pagination }),
+        'holders': () => apiInstance.tokenHolders({ tokenAddress, chain, labelType: onlySmartMoney ? 'smart_money' : 'all_holders', filters, orderBy, pagination, withLabels: resolveBooleanOption(options, flags, 'premium-labels') }),
         'flows': () => {
           const date = parseDateOption(options.date, days);
           const label = options.label;
           return apiInstance.tokenFlows({ tokenAddress, chain, label, filters, orderBy, pagination, days, date });
         },
         'dex-trades': () => apiInstance.tokenDexTrades({ tokenAddress, chain, onlySmartMoney, filters, orderBy, pagination, days }),
-        'pnl': () => apiInstance.tokenPnlLeaderboard({ tokenAddress, chain, filters, orderBy, pagination, days }),
+        'pnl': () => {
+          const withLabels = resolveBooleanOption(options, flags, 'premium-labels');
+          return apiInstance.tokenPnlLeaderboard({ tokenAddress, chain, filters, orderBy, pagination, days, withLabels });
+        },
         'who-bought-sold': () => {
           const date = parseDateOption(options.date, days);
           const buyOrSell = (options['buy-or-sell'] || 'BUY').toUpperCase();
           return apiInstance.tokenWhoBoughtSold({ tokenAddress, chain, buyOrSell, filters, orderBy, pagination, days, date });
         },
-        'flow-intelligence': () => apiInstance.tokenFlowIntelligence({ tokenAddress, chain, days }),
+        'flow-intelligence': () => apiInstance.tokenFlowIntelligence({ tokenAddress, chain, timeframe: options.timeframe || '1d' }),
         'transfers': () => {
           // Inject --from/--to into filters
           if (options.from) filters.from_address = options.from;
@@ -1260,7 +1280,10 @@ export function buildCommands(deps = {}) {
         'jup-dca': () => apiInstance.tokenJupDca({ tokenAddress, filters, orderBy, pagination }),
         'perp-trades': () => apiInstance.tokenPerpTrades({ tokenSymbol, filters, orderBy, pagination, days }),
         'perp-positions': () => apiInstance.tokenPerpPositions({ tokenSymbol, filters, orderBy, pagination }),
-        'perp-pnl-leaderboard': () => apiInstance.tokenPerpPnlLeaderboard({ tokenSymbol, filters, orderBy, pagination, days }),
+        'perp-pnl-leaderboard': () => {
+          const withLabels = resolveBooleanOption(options, flags, 'premium-labels');
+          return apiInstance.tokenPerpPnlLeaderboard({ tokenSymbol, filters, orderBy, pagination, days, withLabels });
+        },
         'help': () => ({
           commands: ['info', 'ohlcv', 'screener', 'holders', 'flows', 'dex-trades', 'pnl', 'who-bought-sold', 'flow-intelligence', 'transfers', 'jup-dca', 'perp-trades', 'perp-positions', 'perp-pnl-leaderboard'],
           description: 'Token God Mode endpoints',
@@ -1334,7 +1357,10 @@ export function buildCommands(deps = {}) {
 
       const handlers = {
         'screener': () => apiInstance.perpScreener({ filters, orderBy, pagination, days }),
-        'leaderboard': () => apiInstance.perpLeaderboard({ filters, orderBy, pagination, days }),
+        'leaderboard': () => {
+          const withLabels = resolveBooleanOption(options, flags, 'premium-labels');
+          return apiInstance.perpLeaderboard({ filters, orderBy, pagination, days, withLabels });
+        },
         'help': () => ({
           commands: ['screener', 'leaderboard'],
           description: 'Perpetual futures analytics endpoints',

package/src/schema.json

@@ -283,7 +283,13 @@
                 },
                 "label": {
                   "description": "Holder segment to filter flows by",
-                  "enum": ["top_100_holders", "smart_money", "public_figure", "whale", "exchange"],
+                  "enum": [
+                    "top_100_holders",
+                    "smart_money",
+                    "public_figure",
+                    "whale",
+                    "exchange"
+                  ],
                   "default": "top_100_holders"
                 }
               }
@@ -303,7 +309,10 @@
                 },
                 "buy-or-sell": {
                   "description": "Filter by buy or sell side",
-                  "enum": ["BUY", "SELL"],
+                  "enum": [
+                    "BUY",
+                    "SELL"
+                  ],
                   "default": "BUY"
                 }
               }
@@ -347,6 +356,10 @@
                 },
                 "token": {
                   "required": true
+                },
+                "premium-labels": {
+                  "description": "Include premium Nansen labels in the response (true=premium, false=free-tier). When omitted, uses API default.",
+                  "type": "boolean"
                 }
               }
             },
@@ -362,6 +375,10 @@
                 },
                 "days": {
                   "default": 30
+                },
+                "premium-labels": {
+                  "description": "Include premium Nansen labels in the response (true=premium, false=free-tier). When omitted, uses API default.",
+                  "type": "boolean"
                 }
               }
             },
@@ -374,6 +391,10 @@
                 },
                 "days": {
                   "default": 30
+                },
+                "premium-labels": {
+                  "description": "Include premium Nansen labels in the response (true=premium, false=free-tier). When omitted, uses API default.",
+                  "type": "boolean"
                 }
               }
             },
@@ -408,8 +429,8 @@
                 "token": {
                   "required": true
                 },
-                "days": {
-                  "default": 30
+                "timeframe": {
+                  "default": "1d"
                 }
               }
             },
@@ -515,6 +536,10 @@
               "options": {
                 "days": {
                   "default": 30
+                },
+                "premium-labels": {
+                  "description": "Include premium Nansen labels in the response (true=premium, false=free-tier). When omitted, uses API default.",
+                  "type": "boolean"
                 }
               }
             }
@@ -796,11 +821,11 @@
             "amount": {
               "type": "string",
               "required": true,
-              "description": "Amount to swap (base units by default, or token units with --amount-unit token)"
+              "description": "Amount to swap (base units by default, or token units with --amount-unit token, or USD with --amount-unit usd)"
             },
             "amount-unit": {
               "type": "string",
-              "description": "\"token\" to specify amount in token units (e.g. 0.5 SOL), or \"base\" for base units (default). Decimals are resolved locally and the API always receives base units."
+              "description": "\"token\" to specify amount in token units (e.g. 0.5 SOL), \"usd\" to specify amount in USD (e.g. 50), or \"base\" for base units (default). The CLI resolves the current token price and decimals locally; the API always receives base units."
             },
             "wallet": {
               "type": "string",

package/src/trading.js

@@ -853,6 +853,27 @@ export function convertToBaseUnits(amount, decimals) {
   return raw;
 }
 
+/**
+ * Fetch the current USD price for a token via the Nansen search API.
+ * Used by --amount-unit usd to convert dollar amounts to token amounts.
+ */
+export async function resolveUsdPrice(apiInstance, tokenAddress, chain) {
+  const result = await apiInstance.generalSearch({
+    query: tokenAddress,
+    resultType: 'token',
+    chain,
+    limit: 1,
+  });
+  const isEvm = tokenAddress.startsWith('0x');
+  const token = result.tokens?.find(t =>
+    isEvm ? t.address?.toLowerCase() === tokenAddress.toLowerCase() : t.address === tokenAddress
+  );
+  if (!token?.price) {
+    throw new Error(`Could not resolve USD price for ${tokenAddress} on ${chain}. The token may not have pricing data.`);
+  }
+  return token.price;
+}
+
 /**
  * Check if amount contains a decimal point (i.e. not in base units).
  * Returns an error string if invalid, or null if OK. Pure function.
@@ -892,10 +913,16 @@ export function formatQuote(quote, index) {
   const meta = quote.metadata || {};
   if (meta.isCrossChain) {
     if (meta.bridgeTool) lines.push(`    Bridge:       ${meta.bridgeTool}`);
-    if (meta.executionDuration) lines.push(`    Est. Time:    ~${Math.round(meta.executionDuration / 60)} min`);
+    if (meta.executionDuration) {
+      const mins = Math.round(meta.executionDuration / 60);
+      lines.push(`    Est. Time:    ${mins < 1 ? '< 1 min' : `~${mins} min`}`);
+    }
     if (meta.feeCosts?.length) {
       const totalFees = meta.feeCosts.reduce((sum, f) => sum + parseFloat(f.amountUSD || 0), 0);
-      if (totalFees > 0) lines.push(`    Bridge Fees:  $${totalFees.toFixed(2)}`);
+      if (totalFees > 0) {
+        const feeStr = totalFees < 0.01 ? totalFees.toPrecision(1) : totalFees.toFixed(2);
+        lines.push(`    Bridge Fees:  $${feeStr}`);
+      }
     }
   }
   if (quote.priceImpactPct) {
@@ -948,7 +975,7 @@ OPTIONS:
   --from <symbol|address>   Input token (symbol like SOL, USDC or address)
   --to <symbol|address>     Output token (symbol like USDC, ETH or address)
   --amount <units>          Amount in BASE UNITS (e.g. lamports, wei)
-  --amount-unit <unit>      "token" to specify amount in token units (e.g. 0.5 SOL)
+  --amount-unit <unit>      "token" for token units (e.g. 0.5 SOL), "usd" for USD (e.g. 50)
   --wallet <name>           Wallet name (default: default wallet). Use "walletconnect" or "wc" for WalletConnect.
   --to-wallet <address>     Destination wallet address (auto-derived for cross-chain if omitted)
   --slippage <pct>          Slippage as decimal (e.g. 0.03 for 3%). Default: 0.03
@@ -959,6 +986,7 @@ OPTIONS:
 EXAMPLES:
   nansen trade quote --chain solana --from SOL --to USDC --amount 1000000000
   nansen trade quote --chain solana --from SOL --to USDC --amount 0.5 --amount-unit token
+  nansen trade quote --chain solana --from SOL --to USDC --amount 50 --amount-unit usd
   nansen trade quote --chain base --from ETH --to USDC --amount 1000000000000000000
   nansen trade quote --chain base --to-chain solana --from USDC --to USDC --amount 1000000
   nansen trade quote --chain solana --to-chain base --from SOL --to ETH --amount 1000000000
@@ -968,8 +996,8 @@ EXAMPLES:
       }
 
       // Validate --amount-unit if provided
-      if (amountUnit && amountUnit !== 'token' && amountUnit !== 'base') {
-        log(`Error: Unknown --amount-unit "${amountUnit}". Supported values: token, base`);
+      if (amountUnit && amountUnit !== 'token' && amountUnit !== 'base' && amountUnit !== 'usd') {
+        log(`Error: Unknown --amount-unit "${amountUnit}". Supported values: token, base, usd`);
         exit(1);
         return;
       }
@@ -988,7 +1016,23 @@ EXAMPLES:
       // Otherwise, validate that the amount is already in base units (integer).
       let resolvedAmount = amount;
       let resolvedDecimals;
-      if (amountUnit === 'token') {
+      let usdTokenAmount; // token-unit amount after USD conversion (for balance pre-check)
+      if (amountUnit === 'usd') {
+        try {
+          const tokenForPrice = swapMode === 'exactOut' ? to : from;
+          const price = await resolveUsdPrice(apiInstance, tokenForPrice, chain);
+          resolvedDecimals = await resolveTokenDecimals(tokenForPrice, chain);
+          // Convert USD to token amount, then to base units via string math.
+          // Use toFixed() instead of String() to avoid scientific notation for small values.
+          const tokenAmount = parseFloat(amount) / price;
+          usdTokenAmount = tokenAmount.toFixed(resolvedDecimals);
+          resolvedAmount = convertToBaseUnits(usdTokenAmount, resolvedDecimals);
+        } catch (err) {
+          log(`Error converting USD amount: ${err.message}`);
+          exit(1);
+          return;
+        }
+      } else if (amountUnit === 'token') {
         try {
           const tokenForDecimals = swapMode === 'exactOut' ? to : from;
           resolvedDecimals = await resolveTokenDecimals(tokenForDecimals, chain);
@@ -1053,21 +1097,24 @@ EXAMPLES:
         }
 
         // Balance pre-check — catches zero balances and insufficient funds
-        // before wasting a quote API call. Only runs for --amount-unit token
-        // in exactIn mode (in exactOut, the amount is the buy amount so
-        // comparing it against the sell token balance is meaningless).
-        if (amountUnit === 'token' && swapMode !== 'exactOut') {
+        // before wasting a quote API call. Runs for --amount-unit token and
+        // usd (after USD→token conversion) in exactIn mode. In exactOut the
+        // amount is the buy amount so comparing against sell balance is meaningless.
+        if ((amountUnit === 'token' || amountUnit === 'usd') && swapMode !== 'exactOut') {
           try {
+            // For USD, pass the converted token-unit amount so validateBalance
+            // can compare against the wallet balance in token units.
+            const tokenUnitAmount = amountUnit === 'usd' ? usdTokenAmount : amount;
             const { adjustedAmount: balanceAdjusted } = await validateBalance({
               chain,
               from,
-              amount,
-              amountUnit,
+              amount: tokenUnitAmount,
+              amountUnit: 'token',
               walletAddress,
               decimals: resolvedDecimals,
               symbol: fromRaw,
             });
-            if (balanceAdjusted !== amount) {
+            if (balanceAdjusted !== tokenUnitAmount) {
               resolvedAmount = convertToBaseUnits(balanceAdjusted, resolvedDecimals);
             }
           } catch (balanceErr) {
@@ -1101,6 +1148,7 @@ EXAMPLES:
           params.toChainIndex = toChainConfig.index;
           if (toWallet) {
             params.toWalletAddress = toWallet;
+            log(`  Destination wallet: ${toWallet}`);
           } else if (chainConfig.type !== toChainConfig.type) {
             // Solana↔Base: auto-derive the destination address from the same wallet
             const effectiveWalletName = walletName || getWalletConfig()?.defaultWallet;

package/src/x402-svm.js

@@ -5,6 +5,7 @@
 
 import crypto from 'crypto';
 import { base58Encode, base58DecodePubkey } from './wallet.js';
+import { encodeCompactU16 } from './transfer.js';
 
 // ============= Constants =============
 
@@ -18,22 +19,6 @@ const _SYSTEM_PROGRAM = '11111111111111111111111111111111';
 const DEFAULT_COMPUTE_UNIT_LIMIT = 20000;
 const DEFAULT_COMPUTE_UNIT_PRICE_MICROLAMPORTS = 1;
 
-// ============= Compact-u16 Encoding =============
-// (Solana's variable-length integer format, from trading.js pattern)
-
-export function encodeCompactU16(value) {
-  if (value < 0x80) return Buffer.from([value]);
-  if (value < 0x4000) return Buffer.from([
-    (value & 0x7f) | 0x80,
-    (value >> 7) & 0x7f,
-  ]);
-  return Buffer.from([
-    (value & 0x7f) | 0x80,
-    ((value >> 7) & 0x7f) | 0x80,
-    (value >> 14) & 0x03,
-  ]);
-}
-
 // ============= PDA Derivation =============
 
 /**