perp-cli 0.4.2 → 0.4.9

package/dist/exchanges/lighter.js

@@ -1,3 +1,4 @@
+import { LocalEvmSigner } from "../signer/evm-local.js";
 export class LighterAdapter {
     name = "lighter";
     _signer;
@@ -13,6 +14,7 @@ export class LighterAdapter {
     _chainId;
     _testnet;
     _readOnly;
+    _evmSigner;
     // In-memory cache removed — using file-based cache (src/cache.ts) for cross-process dedup
     /**
      * @param evmKey    EVM private key (0x-prefixed, 32 bytes) — for deposits & key registration
@@ -23,7 +25,7 @@ export class LighterAdapter {
         this._evmKey = evmKey;
         this._apiKey = opts?.apiKey || process.env.LIGHTER_API_KEY || "";
         this._accountIndexInit = opts?.accountIndex ?? parseInt(process.env.LIGHTER_ACCOUNT_INDEX || "-1");
-        this._apiKeyIndex = parseInt(process.env.LIGHTER_API_KEY_INDEX || "2");
+        this._apiKeyIndex = parseInt(process.env.LIGHTER_API_KEY_INDEX || "4");
         this._address = "";
         this._testnet = testnet;
         this._readOnly = !this._apiKey;
@@ -56,24 +58,49 @@ export class LighterAdapter {
     get isReadOnly() {
         return this._readOnly;
     }
+    /** Inject an external EVM signer. Call before init() to skip LocalEvmSigner creation. */
+    setSigner(signer) {
+        this._evmSigner = signer;
+    }
     async init() {
-        // Resolve address and account index from EVM key via REST
-        const { ethers } = await import("ethers");
-        const wallet = new ethers.Wallet(this._evmKey);
-        this._address = wallet.address;
-        // Fetch account index from REST API
-        const res = await fetch(`${this._baseUrl}/api/v1/account?by=l1_address&value=${this._address}`);
-        const json = await res.json();
-        if (json.accounts && json.accounts.length > 0) {
-            this._accountIndex = this._accountIndexInit >= 0
-                ? this._accountIndexInit
-                : json.accounts[0].account_index;
+        // Initialize EVM signer if not externally injected (skip if no key — read-only mode)
+        if (!this._evmSigner && this._evmKey) {
+            this._evmSigner = await LocalEvmSigner.create(this._evmKey);
+            this._address = this._evmSigner.getAddress();
+        }
+        // Fetch account index from REST API (skip if no address — read-only mode)
+        if (!this._address) {
+            await this._refreshMarketMap();
+            return;
+        }
+        // Retry account lookup on 429 (rate limit) — critical for _accountIndex
+        for (let attempt = 0; attempt < 3; attempt++) {
+            try {
+                const res = await fetch(`${this._baseUrl}/api/v1/account?by=l1_address&value=${this._address}`);
+                if (res.status === 429 && attempt < 2) {
+                    await new Promise(r => setTimeout(r, 1000 * (attempt + 1)));
+                    continue;
+                }
+                const json = await res.json();
+                if (json.accounts && json.accounts.length > 0) {
+                    this._accountIndex = this._accountIndexInit >= 0
+                        ? this._accountIndexInit
+                        : json.accounts[0].account_index;
+                }
+                break;
+            }
+            catch {
+                if (attempt < 2) {
+                    await new Promise(r => setTimeout(r, 1000));
+                    continue;
+                }
+            }
         }
         // Auto-generate API key if we have PK but no API key and account exists
         let signerReady = false;
         if (!this._apiKey && this._accountIndex >= 0) {
             try {
-                const autoKeyIndex = 2; // default for auto-setup
+                const autoKeyIndex = 4; // default for auto-setup (0-3 reserved by Lighter frontend)
                 const { privateKey: apiKey } = await this.setupApiKey(autoKeyIndex);
                 this._apiKey = apiKey;
                 this._apiKeyIndex = autoKeyIndex;
@@ -108,6 +135,11 @@ export class LighterAdapter {
             else if (cleanKey.length === 0) {
                 this._apiKey = "";
             }
+            else if (this._accountIndex < 0) {
+                // Account lookup failed or returned no accounts — cannot initialize WASM signer
+                console.error(`[lighter] Account index not available (got ${this._accountIndex}). Trading will be read-only. Ensure the wallet has a Lighter account or set LIGHTER_ACCOUNT_INDEX.`);
+                this._apiKey = "";
+            }
             else {
                 this._apiKey = cleanKey;
                 const client = await LighterAdapter.getWasmClient();
@@ -121,22 +153,59 @@ export class LighterAdapter {
                 this._signer = client;
             }
         }
-        if (this._apiKey) {
-            this._readOnly = false;
-        }
+        this._readOnly = !this._apiKey;
         // Build symbol → marketIndex map + decimals from orderBookDetails
-        try {
-            const res = await this.restGet("/orderBookDetails", {});
-            for (const d of res.order_book_details ?? []) {
-                this._marketMap.set(d.symbol.toUpperCase(), d.market_id);
-                this._marketDecimals.set(d.symbol.toUpperCase(), {
-                    size: d.size_decimals ?? 0,
-                    price: d.price_decimals ?? 0,
-                });
+        await this._refreshMarketMap();
+    }
+    /** Populate marketMap + decimals from /orderBooks API (safe to call multiple times) */
+    async _refreshMarketMap() {
+        // Retry up to 2 times with 1s delay on failure
+        for (let attempt = 0; attempt < 2; attempt++) {
+            try {
+                // Prefer /orderBooks which has supported_size_decimals / supported_price_decimals
+                const res = await this.restGet("/orderBooks", {});
+                const books = res.order_books ?? [];
+                if (books.length === 0 && attempt === 0) {
+                    // Empty response (possible rate limit) — retry after delay
+                    await new Promise(r => setTimeout(r, 1000));
+                    continue;
+                }
+                for (const d of books) {
+                    const sym = d.symbol.toUpperCase();
+                    // Skip spot markets (id ≥ 2048) — those are handled by lighter-spot.ts
+                    if (d.market_id >= 2048)
+                        continue;
+                    this._marketMap.set(sym, d.market_id);
+                    this._marketDecimals.set(sym, {
+                        size: d.supported_size_decimals,
+                        price: d.supported_price_decimals,
+                    });
+                }
+                if (this._marketMap.size > 0)
+                    return; // success
             }
-        }
-        catch {
-            // Market map will be empty, use fallback
+            catch {
+                // /orderBooks failed — try fallback below
+            }
+            // Fallback to /orderBookDetails
+            try {
+                const res = await this.restGet("/orderBookDetails", {});
+                for (const d of res.order_book_details ?? []) {
+                    this._marketMap.set(d.symbol.toUpperCase(), d.market_id);
+                    this._marketDecimals.set(d.symbol.toUpperCase(), {
+                        size: d.size_decimals ?? 0,
+                        price: d.price_decimals ?? 0,
+                    });
+                }
+                if (this._marketMap.size > 0)
+                    return; // success
+            }
+            catch {
+                // Both APIs failed this attempt
+            }
+            // Delay before retry
+            if (attempt === 0)
+                await new Promise(r => setTimeout(r, 1000));
         }
     }
     getMarketIndex(symbol) {
@@ -145,18 +214,32 @@ export class LighterAdapter {
             throw new Error(`Unknown Lighter market: ${symbol}`);
         return idx;
     }
+    /** Ensure market map is populated; lazy-refresh if empty */
+    async ensureMarketMap() {
+        if (this._marketMap.size === 0) {
+            await this._refreshMarketMap();
+        }
+    }
     async getMarkPrice(symbol) {
         try {
             const res = await this.restGet("/orderBookDetails", {});
             const m = res.order_book_details?.find(d => d.symbol.toUpperCase() === symbol.toUpperCase());
-            return m?.last_trade_price ?? 0;
+            const price = m?.last_trade_price ?? 0;
+            if (price <= 0)
+                throw new Error(`Cannot determine mark price for ${symbol}`);
+            return price;
         }
-        catch {
-            return 0;
+        catch (e) {
+            if (e instanceof Error && e.message.startsWith("Cannot determine"))
+                throw e;
+            throw new Error(`Cannot determine mark price for ${symbol}`);
         }
     }
     toTicks(symbol, size, price) {
-        const dec = this._marketDecimals.get(symbol.toUpperCase()) ?? { size: 0, price: 0 };
+        const dec = this._marketDecimals.get(symbol.toUpperCase());
+        if (!dec) {
+            throw new Error(`No market decimals loaded for ${symbol}. Market data may not be initialized.`);
+        }
         return {
             baseAmount: Math.round(size * Math.pow(10, dec.size)),
             priceTicks: Math.round(price * Math.pow(10, dec.price)),
@@ -203,6 +286,7 @@ export class LighterAdapter {
     }
     async getOrderbook(symbol) {
         try {
+            await this.ensureMarketMap();
             const marketId = this.getMarketIndex(symbol);
             const res = await this.restGet("/orderBookOrders", {
                 market_id: String(marketId),
@@ -218,6 +302,8 @@ export class LighterAdapter {
         }
     }
     async getBalance() {
+        if (!this._address)
+            throw new Error("No private key configured — account data unavailable. Run: perp init");
         const acct = await this.fetchAccount();
         if (!acct)
             return { equity: "0", available: "0", marginUsed: "0", unrealizedPnl: "0" };
@@ -233,6 +319,8 @@ export class LighterAdapter {
         };
     }
     async getPositions() {
+        if (!this._address)
+            throw new Error("No private key configured — account data unavailable. Run: perp init");
         const acct = await this.fetchAccount();
         if (!acct)
             return [];
@@ -246,12 +334,12 @@ export class LighterAdapter {
                 size: String(Math.abs(posSize)),
                 entryPrice: String(p.avg_entry_price || "0"),
                 markPrice: String(posSize !== 0
-                    ? (Number(p.position_value || 0) / Math.abs(posSize)).toFixed(4)
+                    ? (Number(p.position_value || 0) / Math.abs(posSize)).toFixed(this._marketDecimals.get(String(p.symbol || "").toUpperCase())?.price ?? 4)
                     : "0"),
                 liquidationPrice: String(p.liquidation_price || "N/A"),
                 unrealizedPnl: String(p.unrealized_pnl || "0"),
                 leverage: Number(p.initial_margin_fraction || 0) > 0
-                    ? Math.round(100 / Number(p.initial_margin_fraction))
+                    ? Math.round(10000 / Number(p.initial_margin_fraction))
                     : 1,
             };
         });
@@ -268,6 +356,8 @@ export class LighterAdapter {
         return this.restGet(path, params);
     }
     async getOpenOrders() {
+        if (!this._address)
+            throw new Error("No private key configured — account data unavailable. Run: perp init");
         if (this._accountIndex < 0 || this._readOnly)
             return [];
         try {
@@ -276,13 +366,26 @@ export class LighterAdapter {
             const totalOrders = Number(acct?.total_order_count ?? 0);
             if (totalOrders === 0)
                 return [];
-            // Query each market in parallel (accountActiveOrders requires auth + market_id)
+            // Only query markets that have open orders (avoids 156-market fan-out)
+            const activeMarketIds = new Set();
+            for (const p of acct?.positions ?? []) {
+                if (Number(p.open_order_count ?? 0) > 0 || Number(p.pending_order_count ?? 0) > 0) {
+                    activeMarketIds.add(Number(p.market_id));
+                }
+            }
+            if (activeMarketIds.size === 0)
+                return [];
+            const reverseMap = new Map();
+            for (const [sym, id] of this._marketMap)
+                reverseMap.set(id, sym);
             const allOrders = [];
-            const entries = Array.from(this._marketMap.entries());
-            const results = await Promise.allSettled(entries.map(([sym, marketId]) => this.restGetAuth("/accountActiveOrders", {
-                account_index: String(this._accountIndex),
-                market_id: String(marketId),
-            }).then(res => ({ sym, orders: (res.orders ?? []) }))));
+            const results = await Promise.allSettled(Array.from(activeMarketIds).map((marketId) => {
+                const sym = reverseMap.get(marketId) ?? `Market-${marketId}`;
+                return this.restGetAuth("/accountActiveOrders", {
+                    account_index: String(this._accountIndex),
+                    market_id: String(marketId),
+                }).then(res => ({ sym, orders: (res.orders ?? []) }));
+            }));
             for (const r of results) {
                 if (r.status !== "fulfilled" || !r.value.orders.length)
                     continue;
@@ -307,6 +410,7 @@ export class LighterAdapter {
     }
     async marketOrder(symbol, side, size) {
         this.ensureSigner();
+        await this.ensureMarketMap();
         const nonce = await this.getNextNonce();
         const marketIndex = this.getMarketIndex(symbol);
         const { baseAmount } = this.toTicks(symbol, parseFloat(size), 0);
@@ -331,6 +435,7 @@ export class LighterAdapter {
     }
     async limitOrder(symbol, side, price, size, opts) {
         this.ensureSigner();
+        await this.ensureMarketMap();
         const nonce = await this.getNextNonce();
         const marketIndex = this.getMarketIndex(symbol);
         const { baseAmount, priceTicks } = this.toTicks(symbol, parseFloat(size), parseFloat(price));
@@ -353,6 +458,7 @@ export class LighterAdapter {
     }
     async cancelOrder(symbol, orderId) {
         this.ensureSigner();
+        await this.ensureMarketMap();
         const nonce = await this.getNextNonce();
         const marketIndex = this.getMarketIndex(symbol);
         const signed = await this._signer.signCancelOrder({
@@ -361,8 +467,18 @@ export class LighterAdapter {
         });
         return this.sendTx(signed);
     }
-    async cancelAllOrders(_symbol) {
+    async cancelAllOrders(symbol) {
         this.ensureSigner();
+        if (symbol) {
+            // Cancel only orders for this symbol: fetch open orders, filter, cancel individually
+            const orders = await this.getOpenOrders();
+            const filtered = orders.filter(o => o.symbol.toUpperCase() === symbol.toUpperCase());
+            const results = [];
+            for (const o of filtered) {
+                results.push(await this.cancelOrder(o.symbol, o.orderId));
+            }
+            return results;
+        }
         const nonce = await this.getNextNonce();
         const signed = await this._signer.signCancelAllOrders({
             timeInForce: 0, time: Math.floor(Date.now() / 1000) + 86400, nonce,
@@ -372,6 +488,7 @@ export class LighterAdapter {
     }
     async modifyOrder(symbol, orderId, price, size) {
         this.ensureSigner();
+        await this.ensureMarketMap();
         const nonce = await this.getNextNonce();
         const marketIndex = this.getMarketIndex(symbol);
         const { baseAmount, priceTicks } = this.toTicks(symbol, parseFloat(size), parseFloat(price));
@@ -392,6 +509,7 @@ export class LighterAdapter {
     }
     async stopOrder(symbol, side, size, triggerPrice, opts) {
         this.ensureSigner();
+        await this.ensureMarketMap();
         const nonce = await this.getNextNonce();
         const marketIndex = this.getMarketIndex(symbol);
         const { baseAmount } = this.toTicks(symbol, parseFloat(size), 0);
@@ -424,6 +542,7 @@ export class LighterAdapter {
     }
     async updateLeverage(symbol, leverage, marginMode = "cross") {
         this.ensureSigner();
+        await this.ensureMarketMap();
         const nonce = await this.getNextNonce();
         const marketIndex = this.getMarketIndex(symbol);
         // fraction = initial margin fraction in basis points: 10000/leverage
@@ -455,13 +574,15 @@ export class LighterAdapter {
         return this.updateLeverage(symbol, leverage, marginMode);
     }
     async getRecentTrades(symbol, limit = 20) {
+        await this.ensureMarketMap();
         const marketId = this.getMarketIndex(symbol);
         const res = await this.restGet("/recentTrades", { market_id: String(marketId), limit: String(limit) });
         const trades = (res.trades ?? []);
         return trades.map((t) => ({
             time: Number(t.timestamp ?? 0) * 1000,
             symbol,
-            side: t.is_ask ? "sell" : "buy",
+            // /recentTrades returns is_maker_ask: maker was asking → taker bought
+            side: t.is_maker_ask ? "buy" : "sell",
             price: String(t.price ?? "0"),
             size: String(t.base_amount ?? t.amount ?? ""),
             fee: String(t.fee ?? "0"),
@@ -489,6 +610,8 @@ export class LighterAdapter {
         }));
     }
     async getOrderHistory(limit = 30) {
+        if (!this._address)
+            throw new Error("No private key configured — account data unavailable. Run: perp init");
         const raw = await this._getOrderHistoryRaw();
         const orders = (raw.orders ?? []);
         return orders.slice(0, limit).map((o) => ({
@@ -503,6 +626,8 @@ export class LighterAdapter {
         }));
     }
     async getTradeHistory(limit = 30) {
+        if (!this._address)
+            throw new Error("No private key configured — account data unavailable. Run: perp init");
         const raw = await this._getTradeHistoryRaw(limit);
         const trades = (raw.trades ?? []);
         return trades.slice(0, limit).map((t) => ({
@@ -515,6 +640,8 @@ export class LighterAdapter {
         }));
     }
     async getFundingPayments(limit = 30) {
+        if (!this._address)
+            throw new Error("No private key configured — account data unavailable. Run: perp init");
         const raw = await this._getPositionFundingRaw();
         const items = (raw.funding ?? []);
         return items.slice(0, limit).map((f) => ({
@@ -552,6 +679,7 @@ export class LighterAdapter {
      * Get candle data for a market.
      */
     async getCandles(symbol, resolution, startTime, endTime, countBack = 100) {
+        await this.ensureMarketMap();
         const marketId = this.getMarketIndex(symbol);
         return this.restGet("/candles", {
             market_id: String(marketId),
@@ -588,6 +716,9 @@ export class LighterAdapter {
     async _getTradeHistoryRaw(limit = 100) {
         if (this._accountIndex < 0)
             return { trades: [] };
+        // Ensure market map is populated (init may have been rate-limited)
+        if (this._marketMap.size === 0)
+            await this._refreshMarketMap();
         const allTrades = [];
         const entries = Array.from(this._marketMap.entries());
         const results = await Promise.allSettled(entries.map(([sym, marketId]) => this.restGetAuth("/trades", {
@@ -612,15 +743,37 @@ export class LighterAdapter {
     async _getPositionFundingRaw() {
         if (this._accountIndex < 0)
             return { funding: [] };
+        if (this._marketMap.size === 0)
+            await this._refreshMarketMap();
+        // Only query markets where the account has/had positions (avoids 156-market fan-out)
+        const acct = await this.fetchAccount();
+        const activeMarketIds = new Set();
+        if (acct) {
+            for (const p of acct.positions ?? []) {
+                const pos = Number(p.position || 0);
+                const rpnl = Number(p.realized_pnl || 0);
+                if (pos !== 0 || rpnl !== 0) {
+                    activeMarketIds.add(Number(p.market_id));
+                }
+            }
+        }
+        if (activeMarketIds.size === 0)
+            return { funding: [] };
+        // Resolve market_id → symbol from marketMap
+        const reverseMap = new Map();
+        for (const [sym, id] of this._marketMap)
+            reverseMap.set(id, sym);
         const allFunding = [];
-        const entries = Array.from(this._marketMap.entries());
-        const results = await Promise.allSettled(entries.map(([sym, marketId]) => this.restGetAuth("/positionFunding", {
-            account_index: String(this._accountIndex),
-            market_id: String(marketId),
-        }).then((res) => {
-            const items = (res.funding ?? res.data ?? []);
-            return items.map((f) => ({ ...f, symbol: f.symbol ?? sym }));
-        })));
+        const results = await Promise.allSettled(Array.from(activeMarketIds).map((marketId) => {
+            const sym = reverseMap.get(marketId) ?? `Market-${marketId}`;
+            return this.restGetAuth("/positionFunding", {
+                account_index: String(this._accountIndex),
+                market_id: String(marketId),
+            }).then((res) => {
+                const items = (res.funding ?? res.data ?? []);
+                return items.map((f) => ({ ...f, symbol: f.symbol ?? sym }));
+            });
+        }));
         for (const r of results) {
             if (r.status === "fulfilled")
                 allFunding.push(...r.value);
@@ -780,7 +933,7 @@ export class LighterAdapter {
         return res.json();
     }
     ensureSigner() {
-        if (this._readOnly) {
+        if (this._readOnly || this._accountIndex < 0 || !this._signer) {
             throw new Error("This command requires a Lighter API key. Run `perp -e lighter manage setup-api-key` first, " +
                 "then set LIGHTER_API_KEY in your .env");
         }
@@ -828,8 +981,10 @@ export class LighterAdapter {
      * Uses WASM signer to sign + ETH key for L1 signature.
      * Returns the generated key pair.
      */
-    async setupApiKey(apiKeyIndex = 2) {
-        const { ethers } = await import("ethers");
+    async setupApiKey(apiKeyIndex = 4) {
+        if (!this._evmSigner) {
+            throw new Error("No EVM private key configured. Run: perp init");
+        }
         // 1. Generate key pair
         const { privateKey, publicKey } = await LighterAdapter.generateApiKey();
         // 2. Get nonce from API
@@ -859,9 +1014,8 @@ export class LighterAdapter {
         if (!signed.txInfo || !signed.messageToSign) {
             throw new Error("SignChangePubKey returned incomplete response");
         }
-        // 4. Sign messageToSign with ETH key (EIP-191 personal_sign)
-        const wallet = new ethers.Wallet(this._evmKey);
-        const l1Sig = await wallet.signMessage(signed.messageToSign);
+        // 4. Sign messageToSign with EVM signer (EIP-191 personal_sign)
+        const l1Sig = await this._evmSigner.signMessage(signed.messageToSign);
         // 5. Add L1Sig to txInfo
         const txInfo = JSON.parse(signed.txInfo);
         txInfo.L1Sig = l1Sig;
@@ -900,7 +1054,7 @@ export class LighterAdapter {
                         continue;
                     }
                     const retryTxInfo = JSON.parse(retrySigned.txInfo);
-                    retryTxInfo.L1Sig = await wallet.signMessage(retrySigned.messageToSign);
+                    retryTxInfo.L1Sig = await this._evmSigner.signMessage(retrySigned.messageToSign);
                     const retryRes = await fetch(`${this._baseUrl}/api/v1/sendTx`, {
                         method: "POST",
                         headers: { "Content-Type": "application/x-www-form-urlencoded" },

package/dist/exchanges/pacifica.d.ts

@@ -1,13 +1,20 @@
 import { Keypair } from "@solana/web3.js";
 import { PacificaClient, type Network } from "../pacifica/index.js";
 import type { ExchangeAdapter, ExchangeMarketInfo, ExchangePosition, ExchangeOrder, ExchangeBalance, ExchangeTrade, ExchangeFundingPayment, ExchangeKline } from "./interface.js";
+import type { SolanaSigner } from "../signer/interface.js";
 export declare class PacificaAdapter implements ExchangeAdapter {
     readonly name = "pacifica";
     private client;
-    readonly keypair: Keypair;
+    private _solanaSigner;
+    private _hasRealKey;
     private account;
     private signMessage;
-    constructor(keypair: Keypair, network?: Network, builderCode?: string);
+    constructor(keypair: Keypair, network?: Network, builderCode?: string, hasRealKey?: boolean);
+    private ensureSigner;
+    /** Inject an external Solana signer. */
+    setSigner(signer: SolanaSigner): void;
+    /** Access the underlying Keypair (only available with LocalSolanaSigner). */
+    get keypair(): Keypair;
     private _getPrices;
     private _getPositions;
     get publicKey(): string;
@@ -27,7 +34,7 @@ export declare class PacificaAdapter implements ExchangeAdapter {
         tif?: string;
     }): Promise<unknown>;
     cancelOrder(symbol: string, orderId: string): Promise<unknown>;
-    cancelAllOrders(_symbol?: string): Promise<unknown>;
+    cancelAllOrders(symbol?: string): Promise<unknown>;
     editOrder(symbol: string, orderId: string, price: string, size: string): Promise<unknown>;
     setLeverage(symbol: string, leverage: number, marginMode?: "cross" | "isolated"): Promise<{
         symbol: string;
@@ -42,7 +49,7 @@ export declare class PacificaAdapter implements ExchangeAdapter {
     getFundingHistory(symbol: string, limit?: number): Promise<{
         time: number;
         rate: string;
-        price: string;
+        price: string | null;
     }[]>;
     getKlines(symbol: string, interval: string, startTime: number, endTime: number): Promise<ExchangeKline[]>;
     getOrderHistory(limit?: number): Promise<ExchangeOrder[]>;