perp-cli 0.9.7 → 0.9.8

package/dist/bot/strategies/funding-arb-utils.js

@@ -262,8 +262,16 @@ export async function fetchRates(adapter, exchangeName) {
                 m.fundingHours = await aster.getFundingHours(m.symbol);
             }
         }
+        // For non-aster exchanges, set fundingHours from static map if not already set
+        if (exchangeName !== "aster") {
+            const defaultFH = getFundingHours(exchangeName);
+            for (const m of withRates) {
+                if (m.fundingHours == null)
+                    m.fundingHours = defaultFH;
+            }
+        }
         return withRates
-            .filter(m => m.fundingHours != null) // skip symbols with unknown funding period (aster not yet bootstrapped)
+            .filter(m => m.fundingHours != null) // skip aster symbols with unknown funding period
             .map(m => ({
             symbol: m.symbol,
             rate: parseFloat(m.fundingRate),

package/dist/bot/strategies/funding-arb-v2-strategy.js

@@ -529,7 +529,18 @@ export class FundingArbV2Strategy {
                 const pBal = exchangeBalances.get(opp.shortExchange);
                 if (!sBal || !pBal)
                     return false;
-                const maxNtl = Math.min(sBal.available, pBal.available * leverage) * 0.8;
+                let spotAvail = sBal.available;
+                const spotExAdapter = adapters.get(spotExName);
+                if (spotExAdapter && !spotExAdapter.isUnifiedAccount) {
+                    try {
+                        const sb = await spotAdapter.getSpotBalances();
+                        const su = sb.find(b => b.token.toUpperCase().startsWith("USDC"));
+                        if (su)
+                            spotAvail += parseFloat(su.available);
+                    }
+                    catch { /* non-critical */ }
+                }
+                const maxNtl = Math.min(spotAvail, pBal.available * leverage) * 0.8;
                 if (maxNtl < targetSizeUsd) {
                     if (maxNtl < 10)
                         return false;
@@ -629,17 +640,15 @@ export class FundingArbV2Strategy {
                 this._failCooldown.set(`${pos.symbol}:close`, Date.now() + 5 * 60 * 1000);
                 return false;
             }
-            // Transfer USDC back (same-exchange)
-            if (spotExName === pos.shortExchange) {
-                try {
-                    const perpSym = getPerpSymbol(pos.symbol, pos.shortExchange);
-                    const price = await getPriceEstimate(perpAdapter, perpSym, pos.symbol);
-                    const proceeds = price * parseFloat(pos.size) * 0.95;
-                    if (proceeds > 1)
-                        await transferUsdcToPerp(spotAdapter, spotExName, Math.floor(proceeds));
-                }
-                catch { /* non-fatal */ }
+            // Transfer USDC back to perp (always — not just same-exchange)
+            try {
+                const spotBals = await spotAdapter.getSpotBalances();
+                const usdcBal = spotBals.find(b => b.token.toUpperCase().startsWith("USDC"));
+                const usdcAmt = usdcBal ? parseFloat(usdcBal.total) : 0;
+                if (usdcAmt > 1)
+                    await transferUsdcToPerp(spotAdapter, spotExName, Math.floor(usdcAmt));
             }
+            catch { /* non-fatal */ }
             // Close perp short
             const perpSym = getPerpSymbol(pos.symbol, pos.shortExchange);
             try {

package/dist/bot/strategies/spot-perp-arb-strategy.d.ts

@@ -35,7 +35,8 @@ export declare class SpotPerpArbStrategy implements Strategy {
     onTick(ctx: StrategyContext, _snapshot: EnrichedSnapshot): Promise<StrategyAction[]>;
     onStop(ctx: StrategyContext): Promise<StrategyAction[]>;
     private scoreFundingLocal;
-    private findBestPerp;
+    /** Find all perp exchanges for a symbol, sorted by annualized rate (highest first). */
+    private findPerpCandidates;
     private calcAnnualized;
     private shouldClose;
     private tryOpenPosition;

package/dist/bot/strategies/spot-perp-arb-strategy.js

@@ -125,7 +125,8 @@ export class SpotPerpArbStrategy {
                     availableAdapters.set(name, a);
             }
             catch (err) {
-                ctx.log(`  [SPA] getBalance failed for ${name}: ${err instanceof Error ? err.message : String(err)}`);
+                const msg = (err instanceof Error ? err.message : String(err)).slice(0, 120);
+                ctx.log(`  [SPA] getBalance failed for ${name}: ${msg}`);
             }
         }
         const ratesByExchange = new Map();
@@ -221,7 +222,8 @@ export class SpotPerpArbStrategy {
             const rcd = this._failCooldown.get(`${pos.id}:rotate`) ?? 0;
             if (Date.now() < rcd)
                 continue;
-            const best = await this.findBestPerp(pos.symbol, adapters, ratesByExchange);
+            const candidates = await this.findPerpCandidates(pos.symbol, adapters, ratesByExchange);
+            const best = candidates[0];
             if (!best || best.exchange === pos.perpExchange)
                 continue;
             const currentInfo = findRate(ratesByExchange, pos.perpExchange, getPerpSymbol(pos.symbol, pos.perpExchange))
@@ -277,10 +279,12 @@ export class SpotPerpArbStrategy {
                         continue;
                     if (Date.now() < (this._failCooldown.get(`${base}:entry`) ?? 0))
                         continue;
-                    const best = await this.findBestPerp(base, adapters, ratesByExchange);
-                    if (!best || best.score.annualized < p.min_rate || best.score.consistency < p.min_consistency)
-                        continue;
-                    scoredOpps.push({ symbol: base, spotExchange: spotExName, perpExchange: best.exchange, annualized: best.score.annualized, score: best.score });
+                    const candidates = await this.findPerpCandidates(base, adapters, ratesByExchange);
+                    for (const cand of candidates) {
+                        if (cand.score.annualized < p.min_rate || cand.score.consistency < p.min_consistency)
+                            continue;
+                        scoredOpps.push({ symbol: base, spotExchange: spotExName, perpExchange: cand.exchange, annualized: cand.score.annualized, score: cand.score });
+                    }
                 }
             }
             catch { /* no spot */ }
@@ -350,8 +354,9 @@ export class SpotPerpArbStrategy {
     scoreFundingLocal(adapter, symbol, exchangeName) {
         return scoreFunding(adapter, symbol, exchangeName, this.params.history_periods, this._fundingScoreCache);
     }
-    async findBestPerp(symbol, adapters, ratesByExchange) {
-        let best = null;
+    /** Find all perp exchanges for a symbol, sorted by annualized rate (highest first). */
+    async findPerpCandidates(symbol, adapters, ratesByExchange) {
+        const candidates = [];
         for (const [exName, adapter] of adapters) {
             const perpSym = getPerpSymbol(symbol, exName);
             const ri = findRate(ratesByExchange, exName, perpSym) ?? findRate(ratesByExchange, exName, symbol);
@@ -361,10 +366,10 @@ export class SpotPerpArbStrategy {
                 ?? await this.scoreFundingLocal(adapter, symbol, exName);
             if (!score)
                 continue;
-            if (!best || score.annualized > best.score.annualized)
-                best = { exchange: exName, rate: ri.rate, score };
+            candidates.push({ exchange: exName, rate: ri.rate, score });
         }
-        return best;
+        candidates.sort((a, b) => b.score.annualized - a.score.annualized);
+        return candidates;
     }
     calcAnnualized(pos, ratesByExchange) {
         const ri = findRate(ratesByExchange, pos.perpExchange, getPerpSymbol(pos.symbol, pos.perpExchange))
@@ -466,15 +471,18 @@ export class SpotPerpArbStrategy {
                 const pBal = exchangeBalances.get(perpExchange);
                 if (!sBal || !pBal)
                     return false;
-                // Check spot USDC balance too (already in spot account, no transfer needed)
+                // Check spot USDC balance (only add if separate from perp — skip for unified accounts like HL)
                 let spotAvailable = sBal.available;
-                try {
-                    const spotBals = await spotAdapter.getSpotBalances();
-                    const spotUsdc = spotBals.find(b => b.token.toUpperCase().startsWith("USDC"));
-                    if (spotUsdc)
-                        spotAvailable += parseFloat(spotUsdc.available);
+                const isUnified = spotExAdapter?.isUnifiedAccount ?? false;
+                if (!isUnified) {
+                    try {
+                        const spotBals = await spotAdapter.getSpotBalances();
+                        const spotUsdc = spotBals.find(b => b.token.toUpperCase().startsWith("USDC"));
+                        if (spotUsdc)
+                            spotAvailable += parseFloat(spotUsdc.available);
+                    }
+                    catch { /* non-critical */ }
                 }
-                catch { /* non-critical */ }
                 const maxNtl = Math.min(spotAvailable, pBal.available * leverage) * 0.8;
                 if (maxNtl < targetSizeUsd) {
                     if (maxNtl < 10) {

package/dist/bot/strategies/spot-perp-executor.js

@@ -121,8 +121,8 @@ export class SpotPerpExecutor {
                 const postBals = await spotAdapter.getSpotBalances();
                 const bought = postBals.find(b => b.token.toUpperCase().replace(/-SPOT$/, "") === symbol.toUpperCase());
                 const boughtAmt = bought ? parseFloat(bought.total) : 0;
-                if (boughtAmt < parseFloat(matched.size) * 0.5) {
-                    log(`  [SPA] Spot buy returned OK but ${symbol} balance too low (${boughtAmt.toFixed(4)}) — aborting`);
+                if (boughtAmt < parseFloat(matched.size) * 0.8) {
+                    log(`  [SPA] Spot buy returned OK but ${symbol} balance too low (${boughtAmt.toFixed(4)} < ${matched.size} × 80%) — aborting`);
                     if (actualTransferred > 0) {
                         try {
                             await transferUsdcToPerp(spotAdapter, spotExchange, actualTransferred);
@@ -223,8 +223,8 @@ export class SpotPerpExecutor {
                 const postBals = await spotAdapter.getSpotBalances();
                 const remaining = postBals.find(b => b.token.toUpperCase().replace(/-SPOT$/, "") === symbol.toUpperCase());
                 const remainingAmt = remaining ? parseFloat(remaining.total) : 0;
-                if (remainingAmt >= parseFloat(size) * 0.5) {
-                    log(`  [SPA] CRITICAL: Spot sell returned OK but ${symbol} balance unchanged (${remainingAmt.toFixed(4)}) — re-hedging perp`);
+                if (remainingAmt >= parseFloat(size) * 0.8) {
+                    log(`  [SPA] CRITICAL: Spot sell returned OK but ${symbol} balance unchanged (${remainingAmt.toFixed(4)} >= ${size} × 80%) — re-hedging perp`);
                     try {
                         await perpAdapter.marketOrder(perpSym, "sell", size);
                     }

package/dist/exchanges/aster.js

@@ -457,7 +457,8 @@ export class AsterAdapter {
         }
         if (!res.ok) {
             const text = await res.text();
-            throw new Error(`${method} ${path} failed (${res.status}): ${text.slice(0, 200)}`);
+            const clean = text.replace(/<[^>]*>/g, " ").replace(/\s+/g, " ").trim().slice(0, 120);
+            throw new Error(`${method} ${path} failed (${res.status}): ${clean}`);
         }
         return res.json();
     }

package/dist/exchanges/hyperliquid.d.ts

@@ -5,6 +5,7 @@ export declare class HyperliquidAdapter implements ExchangeAdapter {
     readonly name = "hyperliquid";
     readonly chain = "evm";
     readonly aliases: readonly ["hl"];
+    readonly isUnifiedAccount = true;
     private sdk;
     private _address;
     private _privateKey;

package/dist/exchanges/hyperliquid.js

@@ -4,6 +4,7 @@ export class HyperliquidAdapter {
     name = "hyperliquid";
     chain = "evm";
     aliases = ["hl"];
+    isUnifiedAccount = true;
     sdk;
     _address;
     _privateKey;

package/dist/exchanges/interface.d.ts

@@ -66,6 +66,8 @@ export interface ExchangeAdapter {
     readonly name: string;
     readonly chain?: string;
     readonly aliases?: readonly string[];
+    /** True if perp and spot share the same balance (e.g., Hyperliquid). False if separate accounts (e.g., Lighter). */
+    readonly isUnifiedAccount?: boolean;
     init?(): Promise<void>;
     getMarkets(): Promise<ExchangeMarketInfo[]>;
     getOrderbook(symbol: string): Promise<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perp-cli",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "Multi-DEX Perpetual Futures CLI - Pacifica, Hyperliquid, Lighter, Aster",
   "bin": {
     "perp": "dist/index.js",