openbroker 1.0.80 → 1.0.82

package/scripts/core/config.ts

@@ -42,6 +42,20 @@ function loadEnvFile(): string | null {
   const verbose = process.env.VERBOSE === '1' || process.env.VERBOSE === 'true';
   process.env.DOTENV_CONFIG_QUIET = 'true';
 
+  // Explicit config path via -c / --config (highest priority — overrides shell env vars)
+  const explicitPath = process.env.OPENBROKER_CONFIG;
+  if (explicitPath) {
+    if (existsSync(explicitPath)) {
+      loadDotenv({ path: explicitPath, override: true });
+      if (verbose) {
+        console.log(`[DEBUG] Loaded config from -c flag: ${explicitPath}`);
+      }
+      return explicitPath;
+    }
+    console.error(`Config file not found: ${explicitPath}`);
+    process.exit(1);
+  }
+
   // Check locations in order of priority
   const locations = [
     { path: LOCAL_ENV_PATH, name: 'local (.env)' },
@@ -124,6 +138,10 @@ export function loadConfig(): OpenBrokerConfig {
   // Determine if this is an API wallet setup
   const isApiWallet = accountAddress !== undefined && accountAddress !== walletAddress;
 
+  // Vault address — only for vault trading (ERC4626 contracts / native vaults via CoreWriter).
+  // Standard API wallets (approved via approveAgent) do NOT need this.
+  const vaultAddress = process.env.HYPERLIQUID_VAULT_ADDRESS?.toLowerCase();
+
   return {
     baseUrl,
     privateKey: privateKey as `0x${string}`,
@@ -134,6 +152,7 @@ export function loadConfig(): OpenBrokerConfig {
     builderAddress,
     builderFee,
     slippageBps,
+    vaultAddress,
   };
 }
 

package/scripts/core/types.ts

@@ -12,6 +12,7 @@ export interface OpenBrokerConfig {
   builderAddress: string;
   builderFee: number;         // tenths of bps (10 = 1 bps)
   slippageBps: number;
+  vaultAddress?: string;      // Explicit vault address for vault trading (ERC4626 / native vaults via CoreWriter)
 }
 
 // ============ Builder ============

package/scripts/core/utils.ts

@@ -155,8 +155,11 @@ export function generateCloid(): string {
  * Returns true if approved, false if not
  */
 export async function checkBuilderFeeApproval(
-  client: { getMaxBuilderFee: () => Promise<string | null>; builderAddress: string }
+  client: { getMaxBuilderFee: () => Promise<string | null>; builderAddress: string; isTestnet: boolean }
 ): Promise<boolean> {
+  // Skip builder fee check on testnet — builder may not have balance
+  if (client.isTestnet) return true;
+
   const approval = await client.getMaxBuilderFee();
   if (!approval) {
     console.log('⚠️  Builder fee not approved!');

package/scripts/info/account.ts

@@ -123,15 +123,19 @@ async function main() {
     console.log(`Account Mode:     ${modeLabel[accountMode] ?? accountMode}`);
 
     if (!isOtherAccount) {
-      // Check builder fee approval
-      const builderApproval = await client.getMaxBuilderFee();
-      console.log(`Builder Address:  ${client.builderAddress}`);
-      console.log(`Builder Fee:      ${client.builderFeeBps} bps`);
-      if (builderApproval) {
-        console.log(`Builder Approved: ✅ Yes (max: ${builderApproval})`);
+      // Check builder fee approval (skip on testnet)
+      if (client.isTestnet) {
+        console.log(`Builder Fee:      skipped (testnet)`);
       } else {
-        console.log(`Builder Approved: ❌ No`);
-        console.log(`\n⚠️  Run: npx tsx scripts/setup/approve-builder.ts`);
+        const builderApproval = await client.getMaxBuilderFee();
+        console.log(`Builder Address:  ${client.builderAddress}`);
+        console.log(`Builder Fee:      ${client.builderFeeBps} bps`);
+        if (builderApproval) {
+          console.log(`Builder Approved: ✅ Yes (max: ${builderApproval})`);
+        } else {
+          console.log(`Builder Approved: ❌ No`);
+          console.log(`\n⚠️  Run: npx tsx scripts/setup/approve-builder.ts`);
+        }
       }
 
       // Warn if API wallet setup looks misconfigured

package/scripts/info/all-markets.ts

@@ -108,6 +108,9 @@ async function main() {
 
   // Fetch HIP-3 perps
   if (args.type === 'all' || args.type === 'hip3') {
+    if (client.isTestnet) {
+      console.log('Note: Testnet — HIP-3 dexes not auto-loaded. Use "dexName:COIN" syntax to load a specific dex.\n');
+    }
     try {
       const allPerpMetas = await client.getAllPerpMetas();
       // Skip index 0 (main dex), process HIP-3 dexs

package/scripts/info/candles.ts

@@ -67,6 +67,9 @@ async function main() {
   try {
     // Load metadata (needed for HIP-3 coin resolution)
     await client.getMetaAndAssetCtxs();
+    if (client.isTestnet && coin.includes(':')) {
+      await client.loadSingleHip3Dex(coin.split(':')[0]);
+    }
 
     const now = Date.now();
     const startTime = now - (bars * (INTERVAL_MS[interval] || 3_600_000));

package/scripts/info/funding-history.ts

@@ -43,6 +43,9 @@ async function main() {
   try {
     // Load metadata (needed for HIP-3 coin resolution)
     await client.getMetaAndAssetCtxs();
+    if (client.isTestnet && coin.includes(':')) {
+      await client.loadSingleHip3Dex(coin.split(':')[0]);
+    }
 
     const now = Date.now();
     const startTime = now - (hours * 3_600_000);

package/scripts/info/funding-scan.ts

@@ -184,6 +184,10 @@ async function main() {
   console.log('==================================\n');
   console.log(`Threshold: ${threshold}% annualized | Scope: ${mainOnly ? 'main only' : hip3Only ? 'HIP-3 only' : 'all dexes'}\n`);
 
+  if (client.isTestnet && !mainOnly) {
+    console.log('Note: Testnet — HIP-3 dexes not auto-loaded. Only main perps will be scanned.\n');
+  }
+
   const options = { threshold, mainOnly, hip3Only, topN };
 
   const runScan = async () => {

package/scripts/info/funding.ts

@@ -56,7 +56,14 @@ async function main() {
     }
 
     // Include HIP-3 dex assets
+    if (client.isTestnet && (includeHip3 || showAll) && !(filterCoin?.includes(':'))) {
+      console.log('Note: Testnet — HIP-3 dexes not auto-loaded. Use --coin dexName:COIN to view a specific HIP-3 asset.\n');
+    }
     if (includeHip3 || showAll || (filterCoin && filterCoin.includes(':'))) {
+      // On testnet, load the specific dex on demand if user specified dex:COIN
+      if (client.isTestnet && filterCoin?.includes(':')) {
+        await client.loadSingleHip3Dex(filterCoin.split(':')[0]);
+      }
       const allPerps = await client.getAllPerpMetas();
       for (const dexData of allPerps) {
         if (!dexData.dexName) continue; // Skip main dex (already loaded)

package/scripts/info/markets.ts

@@ -59,7 +59,14 @@ async function main() {
     }
 
     // Include HIP-3 markets
+    if (client.isTestnet && includeHip3 && !(filterCoin?.includes(':'))) {
+      console.log('Note: Testnet — HIP-3 dexes not auto-loaded. Use --coin dexName:COIN to view a specific HIP-3 asset.\n');
+    }
     if (includeHip3 || (filterCoin && filterCoin.includes(':'))) {
+      // On testnet, load the specific dex on demand if user specified dex:COIN
+      if (client.isTestnet && filterCoin?.includes(':')) {
+        await client.loadSingleHip3Dex(filterCoin.split(':')[0]);
+      }
       const allPerps = await client.getAllPerpMetas();
       for (const dexData of allPerps) {
         if (!dexData.dexName) continue;

package/scripts/info/orders.ts

@@ -45,6 +45,11 @@ async function main() {
   const lookupAddress = targetAddress?.toLowerCase();
 
   try {
+    // On testnet, load specific HIP-3 dex on demand if filtering by dex:COIN
+    if (client.isTestnet && filterCoin?.includes(':')) {
+      await client.loadSingleHip3Dex(filterCoin.split(':')[0]);
+    }
+
     if (openOnly) {
       // Use the dedicated open orders endpoint
       let openOrders = await client.getOpenOrders(lookupAddress);

package/scripts/info/search-markets.ts

@@ -122,6 +122,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 {
+        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

package/scripts/info/trades.ts

@@ -43,6 +43,9 @@ async function main() {
   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));
 

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