openbroker 1.0.80 → 1.0.85

package/scripts/info/search-markets.ts

@@ -7,6 +7,7 @@ interface Args {
   query: string;
   type?: 'perp' | 'spot' | 'hip3' | 'all';
   verbose?: boolean;
+  json?: boolean;
 }
 
 function parseArgs(): Args {
@@ -23,6 +24,8 @@ function parseArgs(): Args {
       }
     } else if (arg === '--verbose') {
       args.verbose = true;
+    } else if (arg === '--json') {
+      args.json = true;
     } else if (arg === '--help' || arg === '-h') {
       console.log(`
 Search Markets - Find assets across all Hyperliquid markets
@@ -32,6 +35,7 @@ Usage: npx tsx scripts/info/search-markets.ts --query <search> [options]
 Options:
   --query <search>  Search term (required) - matches coin name
   --type <type>     Filter by market type: perp, spot, hip3, or all (default: all)
+  --json            Output as JSON (machine-readable)
   --verbose         Show detailed output
   --help            Show this help
 
@@ -40,6 +44,7 @@ Examples:
   npx tsx scripts/info/search-markets.ts --query BTC        # Find all BTC markets
   npx tsx scripts/info/search-markets.ts --query ETH --type perp  # ETH perps only
   npx tsx scripts/info/search-markets.ts --query PURR --type spot # PURR spot only
+  npx tsx scripts/info/search-markets.ts --query HYPE --json      # JSON output
 `);
       process.exit(0);
     } else if (!args.query && !arg.startsWith('-')) {
@@ -85,18 +90,23 @@ async function main() {
   client.verbose = args.verbose ?? false;
 
   const query = args.query.toUpperCase();
-  console.log(`Searching for "${query}" across all markets...\n`);
+  if (!args.json) {
+    console.log(`Searching for "${query}" across all markets...\n`);
+  }
 
-  const results: Array<{
+  interface Result {
     type: 'perp' | 'spot' | 'hip3';
     provider: string;
     coin: string;
+    assetId: number;
     price: string;
     volume24h: number;
     funding?: string;
     maxLeverage?: number;
     openInterest?: string;
-  }> = [];
+  }
+
+  const results: Result[] = [];
 
   // Search main perps
   if (args.type === 'all' || args.type === 'perp') {
@@ -110,6 +120,7 @@ async function main() {
           type: 'perp',
           provider: 'Hyperliquid',
           coin: asset.name,
+          assetId: i,
           price: ctx.markPx,
           volume24h: parseFloat(ctx.dayNtlVlm),
           funding: ctx.funding,
@@ -122,6 +133,14 @@ async function main() {
 
   // Search HIP-3 perps
   if (args.type === 'all' || args.type === 'hip3') {
+    if (client.isTestnet) {
+      // On testnet, load specific dex if query is "dex:COIN" format
+      if (args.query.includes(':')) {
+        await client.loadSingleHip3Dex(args.query.split(':')[0]);
+      } else if (!args.json) {
+        console.log('  (Testnet: HIP-3 dexes not auto-loaded. Use "dexName:COIN" to search a specific dex.)\n');
+      }
+    }
     try {
       const allPerpMetas = await client.getAllPerpMetas();
       // Skip index 0 (main dex), process HIP-3 dexs
@@ -135,10 +154,13 @@ async function main() {
           if (!asset || !ctx) continue;
 
           if (asset.name.toUpperCase().includes(query)) {
+            let assetId = -1;
+            try { assetId = client.getAssetIndex(asset.name); } catch { /* not registered */ }
             results.push({
               type: 'hip3',
               provider: dexData.dexName || `HIP-3 DEX ${dexIdx}`,
               coin: asset.name,
+              assetId,
               price: ctx.markPx,
               volume24h: parseFloat(ctx.dayNtlVlm || '0'),
               funding: ctx.funding,
@@ -191,6 +213,7 @@ async function main() {
             type: 'spot',
             provider: 'Spot',
             coin: displayName,
+            assetId: 10000 + pair.index,
             price: ctx.markPx,
             volume24h: parseFloat(ctx.dayNtlVlm || '0'),
           });
@@ -204,20 +227,25 @@ async function main() {
   // Sort by volume
   results.sort((a, b) => b.volume24h - a.volume24h);
 
+  if (args.json) {
+    console.log(JSON.stringify(results, null, 2));
+    return;
+  }
+
   if (results.length === 0) {
     console.log(`No markets found matching "${query}"`);
     return;
   }
 
   console.log(`Found ${results.length} market(s) matching "${query}":\n`);
-  console.log('Type     Provider         Coin           Price            24h Volume    Funding (Ann.)  OI');
-  console.log('-'.repeat(100));
+  console.log('Type     Provider         Coin           AssetID    Price            24h Volume    Funding (Ann.)  OI');
+  console.log('-'.repeat(112));
 
   for (const m of results) {
     const typeStr = m.type === 'hip3' ? 'HIP-3' : m.type.charAt(0).toUpperCase() + m.type.slice(1);
     const oi = m.openInterest ? formatVolume(parseFloat(m.openInterest)) : '-';
     console.log(
-      `${typeStr.padEnd(8)} ${m.provider.padEnd(16)} ${m.coin.padEnd(14)} ${formatPrice(m.price).padStart(16)} ${formatVolume(m.volume24h).padStart(13)} ${(m.funding ? formatFunding(m.funding) : '-').padStart(14)} ${oi.padStart(10)}`
+      `${typeStr.padEnd(8)} ${m.provider.padEnd(16)} ${m.coin.padEnd(14)} ${String(m.assetId).padStart(7)}    ${formatPrice(m.price).padStart(16)} ${formatVolume(m.volume24h).padStart(13)} ${(m.funding ? formatFunding(m.funding) : '-').padStart(14)} ${oi.padStart(10)}`
     );
   }
 
@@ -237,11 +265,11 @@ async function main() {
     const perpsWithFunding = markets.filter((m) => m.funding && m.type !== 'spot');
     if (perpsWithFunding.length > 1) {
       console.log(`\n=== ${coin} Funding Comparison ===\n`);
-      console.log('Provider         Coin           Funding (Ann.)    Price');
-      console.log('-'.repeat(65));
+      console.log('Provider         Coin           AssetID    Funding (Ann.)    Price');
+      console.log('-'.repeat(78));
       for (const m of perpsWithFunding.sort((a, b) => parseFloat(b.funding!) - parseFloat(a.funding!))) {
         console.log(
-          `${m.provider.padEnd(16)} ${m.coin.padEnd(14)} ${formatFunding(m.funding!).padStart(14)}    ${formatPrice(m.price)}`
+          `${m.provider.padEnd(16)} ${m.coin.padEnd(14)} ${String(m.assetId).padStart(7)}    ${formatFunding(m.funding!).padStart(14)}    ${formatPrice(m.price)}`
         );
       }
     }

package/scripts/info/spot.ts

@@ -9,6 +9,7 @@ interface Args {
   top?: number;
   verbose?: boolean;
   address?: string;
+  json?: boolean;
 }
 
 function parseArgs(): Args {
@@ -26,6 +27,8 @@ function parseArgs(): Args {
       args.address = process.argv[++i].toLowerCase();
     } else if (arg === '--verbose') {
       args.verbose = true;
+    } else if (arg === '--json') {
+      args.json = true;
     } else if (arg === '--help' || arg === '-h') {
       console.log(`
 Spot Markets - View Hyperliquid spot markets and balances
@@ -37,6 +40,7 @@ Options:
   --balances           Show your spot token balances
   --address <0x...>    Look up another account's spot balances (with --balances)
   --top <n>            Show only top N markets by volume
+  --json               Output as JSON (machine-readable)
   --verbose            Show detailed output
   --help               Show this help
 
@@ -85,10 +89,15 @@ async function main() {
   // Show balances
   if (args.balances) {
     const lookupAddress = args.address ?? client.address;
-    console.log(`Fetching spot balances for ${lookupAddress}...\n`);
+    if (!args.json) console.log(`Fetching spot balances for ${lookupAddress}...\n`);
 
     const balances = await client.getSpotBalances(args.address);
 
+    if (args.json) {
+      console.log(JSON.stringify(balances.balances ?? [], null, 2));
+      return;
+    }
+
     if (!balances.balances || balances.balances.length === 0) {
       console.log('No spot token balances found.');
       return;
@@ -112,17 +121,20 @@ async function main() {
   }
 
   // Show markets
-  console.log('Fetching spot market data...\n');
+  if (!args.json) console.log('Fetching spot market data...\n');
 
   const spotData = await client.getSpotMetaAndAssetCtxs();
 
   interface SpotMarket {
     name: string;
     index: number;
+    assetId: number;
     price: string;
     volume24h: number;
     change24h: string;
     tokens: [number, number];
+    base?: string;
+    quote?: string;
   }
 
   const markets: SpotMarket[] = [];
@@ -155,10 +167,13 @@ async function main() {
     markets.push({
       name: pair.name,
       index: pair.index,
+      assetId: 10000 + pair.index,
       price: ctx.markPx,
       volume24h: parseFloat(ctx.dayNtlVlm || '0'),
       change24h: formatChange(ctx.markPx, ctx.prevDayPx),
       tokens: pair.tokens,
+      base: tokenNameMap.get(pair.tokens[0]),
+      quote: tokenNameMap.get(pair.tokens[1]),
     });
   }
 
@@ -168,6 +183,11 @@ async function main() {
   // Apply top filter
   const displayMarkets = args.top ? markets.slice(0, args.top) : markets;
 
+  if (args.json) {
+    console.log(JSON.stringify(displayMarkets, null, 2));
+    return;
+  }
+
   if (displayMarkets.length === 0) {
     console.log(args.coin ? `No spot markets found for "${args.coin}"` : 'No spot markets found');
     return;
@@ -180,8 +200,8 @@ async function main() {
   }
 
   console.log(`=== Spot Markets (${displayMarkets.length} total) ===\n`);
-  console.log('Pair           Price            24h Volume    24h Change   Base/Quote');
-  console.log('-'.repeat(80));
+  console.log('Pair           AssetID    Price            24h Volume    24h Change   Base/Quote');
+  console.log('-'.repeat(92));
 
   for (const m of displayMarkets) {
     const baseToken = tokenMap.get(m.tokens[0]);
@@ -189,7 +209,7 @@ async function main() {
     const pairStr = `${baseToken?.name || '?'}/${quoteToken?.name || '?'}`;
 
     console.log(
-      `${m.name.padEnd(14)} ${formatPrice(m.price).padStart(16)} ${formatVolume(m.volume24h).padStart(13)} ${m.change24h.padStart(11)}   ${pairStr}`
+      `${m.name.padEnd(14)} ${String(m.assetId).padStart(7)}    ${formatPrice(m.price).padStart(16)} ${formatVolume(m.volume24h).padStart(13)} ${m.change24h.padStart(11)}   ${pairStr}`
     );
   }
 

package/scripts/info/trades.ts

@@ -11,6 +11,7 @@ Usage: openbroker trades --coin <symbol> [options]
 Options:
   --coin <symbol>   Asset symbol (required, e.g. ETH, BTC)
   --top <n>         Show last N trades (default: 30)
+  --json            Output as JSON (machine-readable)
   --help, -h        Show this help
 
 Examples:
@@ -35,14 +36,20 @@ async function main() {
   }
 
   const top = parseInt(args.top as string) || 30;
+  const jsonOutput = args.json as boolean;
   const client = getClient();
 
-  console.log(`Open Broker - ${normalizeCoin(coin)} Recent Trades`);
-  console.log('='.repeat(40) + '\n');
+  if (!jsonOutput) {
+    console.log(`Open Broker - ${normalizeCoin(coin)} Recent Trades`);
+    console.log('='.repeat(40) + '\n');
+  }
 
   try {
     // Load metadata (needed for HIP-3 coin resolution)
     await client.getMetaAndAssetCtxs();
+    if (client.isTestnet && coin.includes(':')) {
+      await client.loadSingleHip3Dex(coin.split(':')[0]);
+    }
 
     let trades = await client.getRecentTrades(normalizeCoin(coin));
 
@@ -50,6 +57,13 @@ async function main() {
     trades.sort((a, b) => b.time - a.time);
     trades = trades.slice(0, top);
 
+    if (jsonOutput) {
+      let assetId = -1;
+      try { assetId = client.getAssetIndex(normalizeCoin(coin)); } catch { /* noop */ }
+      console.log(JSON.stringify({ coin: normalizeCoin(coin), assetId, trades }, null, 2));
+      return;
+    }
+
     if (trades.length === 0) {
       console.log('No recent trades found');
       return;

package/scripts/setup/onboard.ts

@@ -12,8 +12,19 @@ const OPEN_BROKER_BUILDER_ADDRESS = '0xbb67021fA3e62ab4DA985bb5a55c5c1884381068'
 const OPENBROKER_URL = process.env.OPENBROKER_URL || 'https://openbroker.dev';
 
 // Global config directory: ~/.openbroker/
-const CONFIG_DIR = path.join(homedir(), '.openbroker');
-const CONFIG_PATH = path.join(CONFIG_DIR, '.env');
+const GLOBAL_CONFIG_DIR = path.join(homedir(), '.openbroker');
+const GLOBAL_CONFIG_PATH = path.join(GLOBAL_CONFIG_DIR, '.env');
+
+// Parse CLI flags
+const cliArgs = process.argv.slice(2);
+const useTestnet = cliArgs.includes('--testnet') || process.env.HYPERLIQUID_NETWORK === 'testnet';
+const accountAddressIdx = cliArgs.indexOf('--account-address');
+const cliAccountAddress = accountAddressIdx !== -1 ? cliArgs[accountAddressIdx + 1] : undefined;
+const configPathIdx = cliArgs.indexOf('-c') !== -1 ? cliArgs.indexOf('-c') : cliArgs.indexOf('--config');
+const cliConfigPath = configPathIdx !== -1 ? cliArgs[configPathIdx + 1] : process.env.OPENBROKER_CONFIG;
+
+const CONFIG_PATH = cliConfigPath ? path.resolve(cliConfigPath) : GLOBAL_CONFIG_PATH;
+const CONFIG_DIR = path.dirname(CONFIG_PATH);
 
 interface OnboardResult {
   success: boolean;
@@ -54,7 +65,7 @@ const POLL_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
 
 async function pollForApproval(agentAddress: string): Promise<string | null> {
   const startTime = Date.now();
-  const statusUrl = `${OPENBROKER_URL}/api/approve-status?agent=${agentAddress}`;
+  const statusUrl = `${OPENBROKER_URL}/api/approve-status?agent=${agentAddress}${useTestnet ? '&network=testnet' : ''}`;
 
   let dotCount = 0;
 
@@ -86,8 +97,9 @@ async function pollForApproval(agentAddress: string): Promise<string | null> {
 }
 
 async function verifyBuilderFee(masterAddress: string): Promise<boolean> {
+  const apiUrl = useTestnet ? 'https://api.hyperliquid-testnet.xyz/info' : 'https://api.hyperliquid.xyz/info';
   try {
-    const response = await fetch('https://api.hyperliquid.xyz/info', {
+    const response = await fetch(apiUrl, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
@@ -104,8 +116,9 @@ async function verifyBuilderFee(masterAddress: string): Promise<boolean> {
 }
 
 function buildApiWalletEnvContent(privateKey: string, masterAddress: string): string {
+  const network = useTestnet ? 'testnet' : 'mainnet';
   return `# OpenBroker Configuration (API Wallet)
-# Location: ~/.openbroker/.env
+# Location: ${CONFIG_PATH}
 # WARNING: Keep this file secret! Never share it!
 
 # API wallet private key (can trade, cannot withdraw)
@@ -115,7 +128,7 @@ HYPERLIQUID_PRIVATE_KEY=${privateKey}
 HYPERLIQUID_ACCOUNT_ADDRESS=${masterAddress}
 
 # Network: mainnet or testnet
-HYPERLIQUID_NETWORK=mainnet
+HYPERLIQUID_NETWORK=${network}
 `;
 }
 
@@ -132,7 +145,7 @@ async function setupApiWallet(): Promise<OnboardResult> {
   ensureConfigDir();
 
   // Build the approval URL
-  const approveUrl = `${OPENBROKER_URL}/approve?agent=${apiAccount.address}`;
+  const approveUrl = `${OPENBROKER_URL}/approve?agent=${apiAccount.address}${useTestnet ? '&network=testnet' : ''}`;
 
   console.log(`✅ Config directory ready: ${CONFIG_DIR}\n`);
 
@@ -141,9 +154,15 @@ async function setupApiWallet(): Promise<OnboardResult> {
   console.log('Your API wallet needs to be authorized by a master wallet.');
   console.log('Open this URL in your browser and connect your master wallet:\n');
   console.log(`  ${approveUrl}\n`);
-  console.log('The master wallet will sign two transactions:');
-  console.log('  1. ApproveAgent  — authorizes this API wallet to trade');
-  console.log('  2. ApproveBuilderFee — approves the 1 bps builder fee\n');
+  if (useTestnet) {
+    console.log('The master wallet will sign one transaction:');
+    console.log('  1. ApproveAgent  — authorizes this API wallet to trade');
+    console.log('  (Builder fee approval is skipped on testnet)\n');
+  } else {
+    console.log('The master wallet will sign two transactions:');
+    console.log('  1. ApproveAgent  — authorizes this API wallet to trade');
+    console.log('  2. ApproveBuilderFee — approves the 1 bps builder fee\n');
+  }
 
   // Poll for approval
   const masterAddress = await pollForApproval(apiAccount.address);
@@ -175,14 +194,18 @@ HYPERLIQUID_NETWORK=mainnet
 
   console.log(`\n✅ Master wallet detected: ${masterAddress}`);
 
-  // Verify on-chain
-  console.log('   Verifying builder fee approval...');
-  const feeApproved = await verifyBuilderFee(masterAddress);
+  // Verify builder fee on-chain (skip on testnet)
+  if (!useTestnet) {
+    console.log('   Verifying builder fee approval...');
+    const feeApproved = await verifyBuilderFee(masterAddress);
 
-  if (feeApproved) {
-    console.log('   ✅ Builder fee: approved on-chain');
+    if (feeApproved) {
+      console.log('   ✅ Builder fee: approved on-chain');
+    } else {
+      console.log('   ⚠️  Builder fee not yet confirmed on-chain (may take a moment)');
+    }
   } else {
-    console.log('   ⚠️  Builder fee not yet confirmed on-chain (may take a moment)');
+    console.log('   (Builder fee verification skipped on testnet)');
   }
 
   // Save complete config
@@ -225,8 +248,30 @@ HYPERLIQUID_NETWORK=mainnet
 // ── Main ──
 
 async function main(): Promise<OnboardResult> {
+  if (cliArgs.includes('--help') || cliArgs.includes('-h')) {
+    console.log(`
+OpenBroker Setup
+
+Usage: openbroker setup [options]
+
+Options:
+  -c, --config <path>       Save config to a custom path (default: ~/.openbroker/.env)
+  --testnet                 Configure for testnet
+  --account-address <addr>  Set HYPERLIQUID_ACCOUNT_ADDRESS (for API wallet / vault trading)
+  --help                    Show this help
+
+Examples:
+  openbroker setup                                                    # Interactive → ~/.openbroker/.env
+  openbroker setup -c .env --testnet                                  # Write to ./.env for testnet
+  openbroker setup -c ./testnet.env --testnet --account-address 0x... # API wallet config
+`);
+    process.exit(0);
+  }
+
   console.log('OpenBroker - One-Command Setup');
   console.log('==============================\n');
+  if (cliConfigPath) console.log(`Config will be saved to: ${CONFIG_PATH}\n`);
+  if (useTestnet) console.log('Network: testnet\n');
   console.log('This will: 1) Create wallet  2) Save config  3) Approve builder fee\n');
 
   // Check if config already exists
@@ -253,7 +298,7 @@ async function main(): Promise<OnboardResult> {
       console.log(`   API Wallet: ${account.address}`);
       console.log(`   Master account address is missing — re-polling for approval...\n`);
 
-      const approveUrl = `${OPENBROKER_URL}/approve?agent=${account.address}`;
+      const approveUrl = `${OPENBROKER_URL}/approve?agent=${account.address}${useTestnet ? '&network=testnet' : ''}`;
       console.log(`   If not yet approved, visit: ${approveUrl}\n`);
 
       const masterAddress = await pollForApproval(account.address);
@@ -380,51 +425,57 @@ async function main(): Promise<OnboardResult> {
   console.log('Step 2/3: Creating config...');
   ensureConfigDir();
 
+  const network = useTestnet ? 'testnet' : 'mainnet';
+  const accountLine = cliAccountAddress ? `\n# Master/vault account address\nHYPERLIQUID_ACCOUNT_ADDRESS=${cliAccountAddress}\n` : '';
   const envContent = `# OpenBroker Configuration
-# Location: ~/.openbroker/.env
+# Location: ${CONFIG_PATH}
 # WARNING: Keep this file secret! Never share it!
 
 # Your wallet private key
 HYPERLIQUID_PRIVATE_KEY=${privateKey}
-
+${accountLine}
 # Network: mainnet or testnet
-HYPERLIQUID_NETWORK=mainnet
+HYPERLIQUID_NETWORK=${network}
 `;
 
   fs.writeFileSync(CONFIG_PATH, envContent, { mode: 0o600 });
   console.log(`✅ Config saved to: ${CONFIG_PATH}\n`);
 
-  // Approve builder fee (automatic - no user action needed)
-  console.log('Step 3/3: Approving builder fee...');
-  console.log('(This is automatic, and required for trading)\n');
-
-  try {
-    // Import and run approve-builder inline
-    const { getClient } = await import('../core/client.js');
-    const client = getClient();
+  // Approve builder fee (automatic - no user action needed; skip on testnet)
+  if (useTestnet) {
+    console.log('Step 3/3: Skipping builder fee approval (testnet)\n');
+  } else {
+    console.log('Step 3/3: Approving builder fee...');
+    console.log('(This is automatic, and required for trading)\n');
 
-    console.log(`   Account: ${client.address}`);
-    console.log(`   Builder: ${OPEN_BROKER_BUILDER_ADDRESS}`);
+    try {
+      // Import and run approve-builder inline
+      const { getClient } = await import('../core/client.js');
+      const client = getClient();
 
-    // Check if already approved
-    const currentApproval = await client.getMaxBuilderFee(client.address, OPEN_BROKER_BUILDER_ADDRESS);
+      console.log(`   Account: ${client.address}`);
+      console.log(`   Builder: ${OPEN_BROKER_BUILDER_ADDRESS}`);
 
-    if (currentApproval) {
-      console.log(`\n✅ Builder fee already approved (${currentApproval})`);
-    } else {
-      console.log('\n   Sending approval transaction...');
-      const result = await client.approveBuilderFee('0.1%', OPEN_BROKER_BUILDER_ADDRESS);
+      // Check if already approved
+      const currentApproval = await client.getMaxBuilderFee(client.address, OPEN_BROKER_BUILDER_ADDRESS);
 
-      if (result.status === 'ok') {
-        console.log('✅ Builder fee approved successfully!');
+      if (currentApproval) {
+        console.log(`\n✅ Builder fee already approved (${currentApproval})`);
       } else {
-        console.log(`⚠️  Approval may have failed: ${result.response}`);
-        console.log('   You can retry later: openbroker approve-builder');
+        console.log('\n   Sending approval transaction...');
+        const result = await client.approveBuilderFee('0.1%', OPEN_BROKER_BUILDER_ADDRESS);
+
+        if (result.status === 'ok') {
+          console.log('✅ Builder fee approved successfully!');
+        } else {
+          console.log(`⚠️  Approval may have failed: ${result.response}`);
+          console.log('   You can retry later: openbroker approve-builder');
+        }
       }
+    } catch (error) {
+      console.log(`⚠️  Could not approve builder fee: ${error}`);
+      console.log('   You can retry later: openbroker approve-builder');
     }
-  } catch (error) {
-    console.log(`⚠️  Could not approve builder fee: ${error}`);
-    console.log('   You can retry later: openbroker approve-builder');
   }
 
   // Final summary