openbroker 1.0.69 → 1.0.70

package/SKILL.md

@@ -4,7 +4,7 @@ description: Hyperliquid trading plugin with background position monitoring and
 license: MIT
 compatibility: Requires Node.js 22+, network access to api.hyperliquid.xyz
 homepage: https://www.npmjs.com/package/openbroker
-metadata: {"author": "monemetrics", "version": "1.0.69", "openclaw": {"requires": {"bins": ["openbroker"], "env": ["HYPERLIQUID_PRIVATE_KEY"]}, "primaryEnv": "HYPERLIQUID_PRIVATE_KEY", "install": [{"id": "node", "kind": "node", "package": "openbroker", "bins": ["openbroker"], "label": "Install openbroker (npm)"}]}}
+metadata: {"author": "monemetrics", "version": "1.0.70", "openclaw": {"requires": {"bins": ["openbroker"], "env": ["HYPERLIQUID_PRIVATE_KEY"]}, "primaryEnv": "HYPERLIQUID_PRIVATE_KEY", "install": [{"id": "node", "kind": "node", "package": "openbroker", "bins": ["openbroker"], "label": "Install openbroker (npm)"}]}}
 allowed-tools: ob_account ob_positions ob_funding ob_markets ob_search ob_spot ob_fills ob_orders ob_order_status ob_fees ob_candles ob_funding_history ob_trades ob_rate_limit ob_funding_scan ob_buy ob_sell ob_limit ob_trigger ob_tpsl ob_cancel ob_twap ob_bracket ob_chase ob_watcher_status ob_auto_run ob_auto_stop ob_auto_list Bash(openbroker:*)
 ---
 

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "openbroker",
   "name": "OpenBroker — Hyperliquid Trading",
-  "version": "1.0.69",
+  "version": "1.0.70",
   "description": "Trade on Hyperliquid DEX with background position monitoring",
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openbroker",
-  "version": "1.0.69",
+  "version": "1.0.70",
   "description": "Hyperliquid trading CLI - execute orders, manage positions, and run trading strategies",
   "type": "module",
   "bin": {

package/scripts/core/client.ts

@@ -1126,7 +1126,18 @@ export class HyperliquidClient {
     const params: { user: string; dex?: string } = { user: user ?? this.address };
     if (dex !== undefined) params.dex = dex;
     const response = await this.info.clearinghouseState(params as any);
-    return response as ClearinghouseState;
+
+    // The SDK response has `withdrawable` as a top-level field, not inside
+    // marginSummary/crossMarginSummary. Copy it into our MarginSummary shape.
+    const state = response as unknown as ClearinghouseState;
+    const withdrawable = (response as any).withdrawable ?? '0';
+    if (state.marginSummary) {
+      state.marginSummary.withdrawable = withdrawable;
+    }
+    if (state.crossMarginSummary) {
+      state.crossMarginSummary.withdrawable = withdrawable;
+    }
+    return state;
   }
 
   /**
@@ -1142,6 +1153,7 @@ export class HyperliquidClient {
     const dexs = await this.getPerpDexs();
 
     // Collect positions from all HIP-3 dexes
+    let hip3Errors = 0;
     for (let i = 1; i < dexs.length; i++) {
       const dex = dexs[i];
       if (!dex) continue;
@@ -1156,22 +1168,32 @@ export class HyperliquidClient {
         if (!unified) {
           const dexMargin = dexState.marginSummary;
           if (dexMargin) {
+            const safeAdd = (a: string | undefined, b: string | undefined): string => {
+              const va = parseFloat(a ?? '0') || 0;
+              const vb = parseFloat(b ?? '0') || 0;
+              return String(va + vb);
+            };
             const addToSummary = (summary: { accountValue: string; totalNtlPos: string; totalRawUsd: string; totalMarginUsed: string; withdrawable: string }) => {
-              summary.accountValue = String(parseFloat(summary.accountValue) + parseFloat(dexMargin.accountValue));
-              summary.totalNtlPos = String(parseFloat(summary.totalNtlPos) + parseFloat(dexMargin.totalNtlPos));
-              summary.totalRawUsd = String(parseFloat(summary.totalRawUsd) + parseFloat(dexMargin.totalRawUsd));
-              summary.totalMarginUsed = String(parseFloat(summary.totalMarginUsed) + parseFloat(dexMargin.totalMarginUsed));
-              summary.withdrawable = String(parseFloat(summary.withdrawable) + parseFloat(dexMargin.withdrawable));
+              summary.accountValue = safeAdd(summary.accountValue, dexMargin.accountValue);
+              summary.totalNtlPos = safeAdd(summary.totalNtlPos, dexMargin.totalNtlPos);
+              summary.totalRawUsd = safeAdd(summary.totalRawUsd, dexMargin.totalRawUsd);
+              summary.totalMarginUsed = safeAdd(summary.totalMarginUsed, dexMargin.totalMarginUsed);
+              summary.withdrawable = safeAdd(summary.withdrawable, dexMargin.withdrawable);
             };
             addToSummary(mainState.marginSummary);
             addToSummary(mainState.crossMarginSummary);
           }
         }
       } catch (err) {
+        hip3Errors++;
         this.log(`Failed to fetch state for dex ${dex.name}:`, err instanceof Error ? err.message : String(err));
       }
     }
 
+    if (hip3Errors > 0) {
+      this.log(`Warning: ${hip3Errors} HIP-3 dex queries failed — some positions may be missing. Use --verbose for details.`);
+    }
+
     // For unified accounts: equity is the USDC balance from spot clearinghouse
     if (unified) {
       try {

package/scripts/info/account.ts

@@ -109,6 +109,13 @@ async function main() {
       console.log(`Builder Approved: ❌ No`);
       console.log(`\n⚠️  Run: npx tsx scripts/setup/approve-builder.ts`);
     }
+
+    // Warn if API wallet setup looks misconfigured
+    if (!client.isApiWallet && accountValue === 0 && positions.length === 0) {
+      console.log('\n⚠️  No positions and $0 equity.');
+      console.log('   If this account is traded via an API wallet, set HYPERLIQUID_ACCOUNT_ADDRESS');
+      console.log('   in ~/.openbroker/.env to the master account address (the wallet that holds funds).');
+    }
     console.log('');
 
     console.log('Margin Summary');

package/scripts/info/positions.ts

@@ -71,6 +71,10 @@ async function main() {
 
     if (positions.length === 0) {
       console.log(filterCoin ? `No position in ${filterCoin}` : 'No open positions');
+      if (!filterCoin && !client.isApiWallet) {
+        console.log('\n⚠️  If this account is traded via an API wallet, set HYPERLIQUID_ACCOUNT_ADDRESS');
+        console.log('   in ~/.openbroker/.env to the master account address.');
+      }
       return;
     }
 

package/scripts/plugin/tools.ts

@@ -89,6 +89,11 @@ export function createTools(watcherOrCtx: PositionWatcher | null | ToolsContext)
           }));
         }
 
+        // Warn if likely misconfigured API wallet (querying the API wallet address instead of master)
+        if (!client.isApiWallet && accountValue === 0 && state.assetPositions.filter(ap => parseFloat(ap.position.szi) !== 0).length === 0) {
+          result.warning = 'No positions and $0 equity. If using an API wallet, ensure HYPERLIQUID_ACCOUNT_ADDRESS is set to the master account address in ~/.openbroker/.env or plugin config.';
+        }
+
         return json(result);
       },
     },

package/scripts/setup/onboard.ts

@@ -231,34 +231,85 @@ async function main(): Promise<OnboardResult> {
 
   // Check if config already exists
   if (fs.existsSync(CONFIG_PATH)) {
-    console.log('⚠️  Config already exists!');
-    console.log(`   Location: ${CONFIG_PATH}\n`);
-
-    // Read existing config and show wallet address
     const envContent = fs.readFileSync(CONFIG_PATH, 'utf-8');
     const keyMatch = envContent.match(/HYPERLIQUID_PRIVATE_KEY=0x([a-fA-F0-9]{64})/);
 
-    if (keyMatch) {
-      const existingKey = `0x${keyMatch[1]}` as `0x${string}`;
-      const account = privateKeyToAccount(existingKey);
-      console.log('Current Configuration');
-      console.log('---------------------');
-      console.log(`Wallet Address: ${account.address}`);
-      console.log(`Config File:    ${CONFIG_PATH}`);
-      console.log(`\nTo reconfigure, delete the config file first:`);
-      console.log(`  rm ${CONFIG_PATH}`);
-      console.log(`\nTo fund this wallet, send USDC on Arbitrum, then deposit at:`);
-      console.log(`  https://app.hyperliquid.xyz/`);
-
+    if (!keyMatch) {
       return {
-        success: true,
-        walletAddress: account.address,
+        success: false,
+        error: 'Invalid config file - missing or malformed private key',
       };
     }
 
+    const existingKey = `0x${keyMatch[1]}` as `0x${string}`;
+    const account = privateKeyToAccount(existingKey);
+
+    // Check if this is an incomplete API wallet setup (HYPERLIQUID_ACCOUNT_ADDRESS missing or commented out)
+    const hasAccountAddress = /^HYPERLIQUID_ACCOUNT_ADDRESS=0x[a-fA-F0-9]{40}/m.test(envContent);
+    const isIncompleteApiWallet = envContent.includes('INCOMPLETE') || envContent.includes('# HYPERLIQUID_ACCOUNT_ADDRESS');
+
+    if (!hasAccountAddress && isIncompleteApiWallet) {
+      console.log('⚠️  Incomplete API wallet setup detected!');
+      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}`;
+      console.log(`   If not yet approved, visit: ${approveUrl}\n`);
+
+      const masterAddress = await pollForApproval(account.address);
+
+      if (masterAddress) {
+        console.log(`\n✅ Master wallet detected: ${masterAddress}`);
+
+        // Verify builder fee on-chain
+        console.log('   Verifying builder fee approval...');
+        const feeApproved = await verifyBuilderFee(masterAddress);
+        if (feeApproved) {
+          console.log('   ✅ Builder fee: approved on-chain');
+        } else {
+          console.log('   ⚠️  Builder fee not yet confirmed on-chain (may take a moment)');
+        }
+
+        // Save complete config
+        const completeEnv = buildApiWalletEnvContent(existingKey, masterAddress);
+        fs.writeFileSync(CONFIG_PATH, completeEnv, { mode: 0o600 });
+
+        console.log(`\n✅ Config updated: ${CONFIG_PATH}`);
+        console.log(`   API Wallet:     ${account.address}`);
+        console.log(`   Master Account: ${masterAddress}`);
+        console.log('\n   Start trading: openbroker account');
+
+        return { success: true, walletAddress: account.address };
+      }
+
+      console.log('\n⚠️  Approval still not completed.');
+      console.log(`   Visit: ${approveUrl}`);
+      console.log('   Then re-run: openbroker setup\n');
+      return { success: false, error: 'Approval not completed' };
+    }
+
+    // Config exists and is complete
+    console.log('⚠️  Config already exists!');
+    console.log(`   Location: ${CONFIG_PATH}\n`);
+    console.log('Current Configuration');
+    console.log('---------------------');
+    console.log(`Wallet Address: ${account.address}`);
+    if (hasAccountAddress) {
+      const addrMatch = envContent.match(/HYPERLIQUID_ACCOUNT_ADDRESS=(0x[a-fA-F0-9]+)/);
+      if (addrMatch) {
+        console.log(`Master Account: ${addrMatch[1]}`);
+        console.log(`Wallet Type:    API Wallet`);
+      }
+    }
+    console.log(`Config File:    ${CONFIG_PATH}`);
+    console.log(`\nTo reconfigure, delete the config file first:`);
+    console.log(`  rm ${CONFIG_PATH}`);
+    console.log(`\nTo fund this wallet, send USDC on Arbitrum, then deposit at:`);
+    console.log(`  https://app.hyperliquid.xyz/`);
+
     return {
-      success: false,
-      error: 'Invalid config file - missing or malformed private key',
+      success: true,
+      walletAddress: account.address,
     };
   }