ccxt 4.5.48 → 4.5.50

package/js/src/pro/lighter.js

@@ -23,14 +23,14 @@ export default class lighter extends lighterRest {
                 'watchTrades': true,
                 'watchTradesForSymbols': false,
                 'watchOrderBookForSymbols': false,
-                'watchBalance': false,
+                'watchBalance': true,
                 'watchLiquidations': true,
                 'watchLiquidationsForSymbols': false,
                 'watchMyLiquidations': false,
                 'watchMyLiquidationsForSymbols': false,
                 'watchOHLCV': false,
                 'watchOHLCVForSymbols': false,
-                'watchOrders': false,
+                'watchOrders': true,
                 'watchMyTrades': true,
                 'watchPositions': false,
                 'watchFundingRate': false,
@@ -42,6 +42,7 @@ export default class lighter extends lighterRest {
                 'unWatchMyTrades': true,
                 'unWatchMarkPrice': true,
                 'unWatchMarkPrices': true,
+                'unWatchOrders': true,
             },
             'urls': {
                 'api': {
@@ -89,7 +90,7 @@ export default class lighter extends lighterRest {
         };
         return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes, subscription);
     }
-    async unsubscribePublic(messageHash, params = {}) {
+    async unsubscribe(messageHash, params = {}) {
         const url = this.urls['api']['ws'];
         const request = {
             'type': 'unsubscribe',
@@ -100,6 +101,11 @@ export default class lighter extends lighterRest {
         };
         return await this.watch(url, messageHash, this.extend(request, params), messageHash, subscription);
     }
+    async subscribePrivate(messageHash, params = {}) {
+        await this.preLoadLighterLibrary();
+        params['auth'] = this.createAuth(params);
+        return await this.subscribePublic(messageHash, params);
+    }
     handleDelta(bookside, delta) {
         const price = this.safeFloat(delta, 'price');
         const amount = this.safeFloat(delta, 'size');
@@ -205,7 +211,7 @@ export default class lighter extends lighterRest {
             'channel': 'order_book/' + market['id'],
         };
         const messageHash = this.getMessageHash('unsubscribe', symbol);
-        return await this.unsubscribePublic(messageHash, this.extend(request, params));
+        return await this.unsubscribe(messageHash, this.extend(request, params));
     }
     handleTicker(client, message) {
         //
@@ -316,7 +322,7 @@ export default class lighter extends lighterRest {
             'channel': 'market_stats/' + market['id'],
         };
         const messageHash = this.getMessageHash('unsubscribe', symbol);
-        return await this.unsubscribePublic(messageHash, this.extend(request, params));
+        return await this.unsubscribe(messageHash, this.extend(request, params));
     }
     /**
      * @method
@@ -371,7 +377,7 @@ export default class lighter extends lighterRest {
             'channel': 'market_stats/all',
         };
         const messageHash = this.getMessageHash('unsubscribe');
-        return await this.unsubscribePublic(messageHash, this.extend(request, params));
+        return await this.unsubscribe(messageHash, this.extend(request, params));
     }
     /**
      * @method
@@ -455,10 +461,7 @@ export default class lighter extends lighterRest {
         const priceString = this.safeString(trade, 'price');
         const amountString = this.safeString(trade, 'size');
         const isMakerAsk = this.safeBool(trade, 'is_maker_ask');
-        const side = (isMakerAsk === true) ? 'sell' : 'buy';
-        const makerFeeRate = this.safeString(market, 'maker_fee');
-        const maker = Precise.stringDiv(makerFeeRate, '100');
-        const feeAmount = Precise.stringMul(maker, makerFeeRate);
+        const side = isMakerAsk ? 'buy' : 'sell';
         return this.safeTrade({
             'info': trade,
             'id': tradeId,
@@ -468,14 +471,11 @@ export default class lighter extends lighterRest {
             'symbol': this.safeSymbol(undefined, market),
             'type': undefined,
             'side': side,
-            'takerOrMaker': 'maker',
+            'takerOrMaker': 'taker',
             'price': priceString,
             'amount': amountString,
             'cost': this.safeString(trade, 'usd_amount'),
-            'fee': {
-                'cost': feeAmount,
-                'currency': 'USDC',
-            },
+            'fee': undefined,
         }, market);
     }
     handleTrades(client, message) {
@@ -578,7 +578,83 @@ export default class lighter extends lighterRest {
             'channel': 'trade/' + market['id'],
         };
         const messageHash = this.getMessageHash('unsubscribe', symbol);
-        return await this.unsubscribePublic(messageHash, this.extend(request, params));
+        return await this.unsubscribe(messageHash, this.extend(request, params));
+    }
+    parseWsOrderTrade(trade, market = undefined) {
+        //
+        //     {
+        //         "trade_id": 526801155,
+        //         "tx_hash": "1998d9df580acb7540aa141cc369d6ef926d003b3062196d2007bca15f978ab208e0caae4ac5872b",
+        //         "type": "trade",
+        //         "market_id": 0,
+        //         "size": "0.0346",
+        //         "price": "3028.85",
+        //         "usd_amount": "104.798210",
+        //         "ask_id": 281475673670566,
+        //         "bid_id": 562949291740362,
+        //         "ask_client_id": 76303170,
+        //         "bid_client_id": 27601,
+        //         "ask_account_id": 99349,
+        //         "bid_account_id": 243008,
+        //         "is_maker_ask": false,
+        //         "block_height": 102322769,
+        //         "timestamp": 1763623734215,
+        //         "taker_position_size_before": "0.0346",
+        //         "taker_entry_quote_before": "104.359926",
+        //         "taker_initial_margin_fraction_before": 500,
+        //         "taker_position_sign_changed": true,
+        //         "maker_fee": 20,
+        //         "maker_position_size_before": "2.1277",
+        //         "maker_entry_quote_before": "6444.179555",
+        //         "maker_initial_margin_fraction_before": 200
+        //     }
+        //
+        const timestamp = this.safeInteger(trade, 'timestamp');
+        const tradeId = this.safeString(trade, 'trade_id');
+        const priceString = this.safeString(trade, 'price');
+        const amountString = this.safeString(trade, 'size');
+        const costString = this.safeString(trade, 'usd_amount');
+        const isMakerAsk = this.safeBool(trade, 'is_maker_ask');
+        const side = isMakerAsk ? 'buy' : 'sell';
+        const accountIndex = this.safeInteger(trade, 'accountIndex');
+        let order = undefined;
+        let takerOrMaker = undefined;
+        if (accountIndex !== undefined) {
+            if (this.safeInteger(trade, 'bid_account_id') === accountIndex) {
+                order = this.safeString(trade, 'bid_id');
+                takerOrMaker = isMakerAsk ? 'taker' : 'maker';
+            }
+            else if (this.safeInteger(trade, 'ask_account_id') === accountIndex) {
+                order = this.safeString(trade, 'ask_id');
+                takerOrMaker = isMakerAsk ? 'maker' : 'taker';
+            }
+        }
+        let fee = undefined;
+        if (takerOrMaker !== undefined) {
+            const feeRateRaw = (takerOrMaker === 'maker') ? this.safeString(trade, 'maker_fee') : this.safeString(trade, 'taker_fee');
+            const feeRate = (feeRateRaw !== undefined) ? Precise.stringDiv(feeRateRaw, '1000000') : '0';
+            const feeAmount = Precise.stringMul(costString, feeRate);
+            fee = {
+                'cost': feeAmount,
+                'currency': 'USDC',
+                'rate': feeRate,
+            };
+        }
+        return this.safeTrade({
+            'info': trade,
+            'id': tradeId,
+            'order': order,
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'symbol': this.safeSymbol(undefined, market),
+            'type': undefined,
+            'side': side,
+            'takerOrMaker': takerOrMaker,
+            'price': priceString,
+            'amount': amountString,
+            'cost': costString,
+            'fee': fee,
+        }, market);
     }
     handleMyTrades(client, message) {
         //
@@ -615,6 +691,9 @@ export default class lighter extends lighterRest {
         //         "type": "update/account_all_trades"
         //     }
         //
+        const channel = this.safeString(message, 'channel', '');
+        const parts = channel.split(':');
+        const accountIndex = parts[1];
         const data = this.safeDict(message, 'trades', {});
         const marketIds = Object.keys(data);
         const idsLength = marketIds.length;
@@ -634,7 +713,9 @@ export default class lighter extends lighterRest {
             const tradesLength = trades.length;
             for (let j = 0; j < tradesLength; j++) {
                 const jReversed = tradesLength - 1 - j;
-                const trade = this.parseWsTrade(trades[jReversed], market);
+                const tradeRaw = trades[jReversed];
+                tradeRaw['accountIndex'] = accountIndex;
+                const trade = this.parseWsOrderTrade(tradeRaw, market);
                 stored.append(trade);
                 const symbol = trade['symbol'];
                 if (symbol !== undefined) {
@@ -698,7 +779,7 @@ export default class lighter extends lighterRest {
         const request = {
             'channel': 'account_all_trades/' + accountIndex,
         };
-        return await this.unsubscribePublic(messageHash, this.extend(request, params));
+        return await this.unsubscribe(messageHash, this.extend(request, params));
     }
     parseWsLiquidation(liquidation, market = undefined) {
         //
@@ -828,6 +909,230 @@ export default class lighter extends lighterRest {
         const messageHash = this.getMessageHash('liquidations', symbol);
         return await this.subscribePublic(messageHash, this.extend(request, params));
     }
+    /**
+     * @method
+     * @name lighter#watchBalance
+     * @description watch balance and get the amount of funds available for trading or funds locked in orders
+     * @see https://apidocs.lighter.xyz/docs/websocket-reference#account-all-assets
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @param {string} [params.type] 'spot' or 'swap', default is 'swap'
+     * @returns {object} a [balance structure]{@link https://docs.ccxt.com/?id=balance-structure}
+     */
+    async watchBalance(params = {}) {
+        await this.loadMarkets();
+        const defaultType = this.safeString2(this.options, 'watchBalance', 'defaultType', 'spot');
+        let type = undefined;
+        [type, params] = this.handleParamString(params, 'type', defaultType);
+        let accountIndex = undefined;
+        [accountIndex, params] = await this.handleAccountIndex(params, 'watchBalance', 'accountIndex', 'account_index');
+        const messageHash = this.getMessageHash('balances', undefined, type);
+        const request = {};
+        if (type === 'spot') {
+            request['channel'] = 'account_all_assets/' + this.numberToString(accountIndex);
+            return await this.subscribePrivate(messageHash, this.extend(request, params));
+        }
+        else {
+            request['channel'] = 'user_stats/' + this.numberToString(accountIndex);
+            return await this.subscribePublic(messageHash, this.extend(request, params));
+        }
+    }
+    handleBalance(client, message) {
+        //
+        //    spot balance
+        //    {
+        //        "assets": {
+        //              "1": {
+        //                    "symbol": "ETH",
+        //                    "asset_id": 1,
+        //                    "balance": "7.1072",
+        //                    "locked_balance": "0.0000"
+        //              },
+        //              "3": {
+        //                    "symbol": "USDC",
+        //                    "asset_id": 3,
+        //                    "balance": "6343.581906",
+        //                    "locked_balance": "297.000000"
+        //              }
+        //        },
+        //        "channel": "account_all_assets:1234",
+        //        "timestamp": 1773158679717,
+        //        "type": "update/account_all_assets"
+        //    }
+        //
+        //    swap balance
+        //    {
+        //        "channel": "user_stats:10",
+        //        "stats": {
+        //            "collateral": "5000.00",
+        //            "portfolio_value": "15000.00",
+        //            "leverage": "3.0",
+        //            "available_balance": "2000.00",
+        //            "margin_usage": "0.80",
+        //            "buying_power": "4000.00",
+        //            "account_trading_mode": 1,
+        //            "cross_stats":{
+        //               "collateral":"0.000000",
+        //               "portfolio_value":"0.000000",
+        //               "leverage":"0.00",
+        //               "available_balance":"0.000000",
+        //               "margin_usage":"0.00",
+        //               "buying_power":"0"
+        //            },
+        //            "total_stats":{
+        //               "collateral":"0.000000",
+        //               "portfolio_value":"0.000000",
+        //               "leverage":"0.00",
+        //               "available_balance":"0.000000",
+        //               "margin_usage":"0.00",
+        //               "buying_power":"0"
+        //            }
+        //        },
+        //        "timestamp": 1773158679717,
+        //        "type": "update/user_stats"
+        //    }
+        //
+        const channel = this.safeString(message, 'channel', '');
+        let type = 'spot';
+        if (channel.indexOf('user_stats:') >= 0) {
+            type = 'swap';
+        }
+        const balance = this.safeDict(this.balance, type, {});
+        if (type === 'spot') {
+            const assets = this.safeDict(message, 'assets', {});
+            const assetIds = Object.keys(assets);
+            for (let i = 0; i < assetIds.length; i++) {
+                const assetId = assetIds[i];
+                const asset = assets[assetId];
+                const codeId = this.safeString(asset, 'symbol');
+                const code = this.safeCurrencyCode(codeId);
+                const account = this.account();
+                account['used'] = this.safeString(asset, 'locked_balance');
+                account['total'] = this.safeString(asset, 'balance');
+                balance[code] = account;
+            }
+        }
+        else {
+            const stats = this.safeDict(message, 'stats', {});
+            const account = this.account();
+            account['free'] = this.safeString(stats, 'available_balance');
+            account['total'] = this.safeString(stats, 'collateral');
+            account['info'] = stats;
+            balance['USDC'] = account;
+        }
+        const timestamp = this.safeInteger(message, 'timestamp');
+        balance['timestamp'] = timestamp;
+        balance['datetime'] = this.iso8601(timestamp);
+        this.balance[type] = this.safeBalance(balance);
+        const messageHash = this.getMessageHash('balances', undefined, type);
+        client.resolve(this.balance[type], messageHash);
+        return true;
+    }
+    /**
+     * @name lighter#watchOrders
+     * @description watches information on multiple orders made by the user
+     * @see https://apidocs.lighter.xyz/docs/websocket-reference#account-all-orders
+     * @param {string} symbol unified market symbol of the market orders were made in
+     * @param {int} [since] the earliest time in ms to fetch orders for
+     * @param {int} [limit] the maximum number of order structures to retrieve
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/?id=order-structure}
+     */
+    async watchOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
+        await this.loadMarkets();
+        let accountIndex = undefined;
+        [accountIndex, params] = await this.handleAccountIndex(params, 'watchOrders', 'accountIndex', 'account_index');
+        let messageHash = undefined;
+        const request = {};
+        if (symbol !== undefined) {
+            const market = this.market(symbol);
+            messageHash = this.getMessageHash('orders', market['symbol']);
+            request['channel'] = 'account_orders/' + market['id'] + '/' + this.numberToString(accountIndex);
+        }
+        else {
+            messageHash = this.getMessageHash('orders');
+            request['channel'] = 'account_all_orders/' + this.numberToString(accountIndex);
+        }
+        const orders = await this.subscribePrivate(messageHash, this.extend(request, params));
+        if (this.newUpdates) {
+            limit = orders.getLimit(symbol, limit);
+        }
+        return this.filterBySymbolSinceLimit(orders, symbol, since, limit, true);
+    }
+    /**
+     * @method
+     * @name lighter#unWatchOrders
+     * @description unWatches information on multiple orders made by the user
+     * @see https://apidocs.lighter.xyz/docs/websocket-reference#account-all-orders
+     * @param {string} symbol unified market symbol of the market orders were made in
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/?id=order-structure}
+     */
+    async unWatchOrders(symbol = undefined, params = {}) {
+        await this.loadMarkets();
+        let accountIndex = undefined;
+        [accountIndex, params] = await this.handleAccountIndex(params, 'watchOrders', 'accountIndex', 'account_index');
+        let messageHash = undefined;
+        const request = {};
+        if (symbol !== undefined) {
+            const market = this.market(symbol);
+            messageHash = this.getMessageHash('orders', market['symbol']);
+            request['channel'] = 'account_orders/' + market['id'] + '/' + this.numberToString(accountIndex);
+        }
+        else {
+            messageHash = this.getMessageHash('orders');
+            request['channel'] = 'account_all_orders/' + this.numberToString(accountIndex);
+        }
+        return await this.unsubscribe(messageHash, this.extend(request, params));
+    }
+    handleOrders(client, message) {
+        //
+        //    {
+        //        "account": {ACCOUNT_INDEX},
+        //        "channel": "account_orders:{MARKET_INDEX}",
+        //        "nonce": INTEGER,
+        //        "orders": {
+        //            "{MARKET_INDEX}": [Order] // the only present market index will be the one provided
+        //        },
+        //        "type": "update/account_orders"
+        //    }
+        //
+        //    {
+        //        "channel": "account_all_orders:{ACCOUNT_ID}",
+        //        "orders": {
+        //            "{MARKET_INDEX}": [Order]
+        //        },
+        //        "type": "update/account_all_orders"
+        //    }
+        //
+        const data = this.safeDict(message, 'orders', {});
+        const marketIds = Object.keys(data);
+        const idsLength = marketIds.length;
+        if (idsLength === 0) {
+            return false; // nothing to process
+        }
+        if (this.orders === undefined) {
+            const limit = this.safeInteger(this.options, 'ordersLimit', 1000);
+            this.orders = new ArrayCache(limit);
+        }
+        const stored = this.orders;
+        const messageHash = this.getMessageHash('orders');
+        for (let i = 0; i < marketIds.length; i++) {
+            const marketId = marketIds[i];
+            const market = this.safeMarket(marketId);
+            const orders = this.safeList(data, marketId, []);
+            for (let j = 0; j < orders.length; j++) {
+                const order = this.parseOrder(orders[j], market);
+                stored.append(order);
+                const symbol = order['symbol'];
+                if (symbol !== undefined) {
+                    const symbolSpecificMessageHash = this.getMessageHash('orders', symbol);
+                    client.resolve(stored, symbolSpecificMessageHash);
+                }
+            }
+        }
+        client.resolve(stored, messageHash);
+        return true;
+    }
     handleErrorMessage(client, message) {
         //
         //     {
@@ -878,6 +1183,22 @@ export default class lighter extends lighterRest {
             this.handleMyTrades(client, message);
             return;
         }
+        if (channel.indexOf('account_all_assets:') >= 0) {
+            this.handleBalance(client, message);
+            return;
+        }
+        if (channel.indexOf('user_stats:') >= 0) {
+            this.handleBalance(client, message);
+            return;
+        }
+        if (channel.indexOf('account_orders:') >= 0) {
+            this.handleOrders(client, message);
+            return;
+        }
+        if (channel.indexOf('account_all_orders:') >= 0) {
+            this.handleOrders(client, message);
+            return;
+        }
         if (channel === '') {
             this.handleSubscriptionStatus(client, message);
         }