ccxt 4.2.57 → 4.2.59

package/js/src/pro/deribit.js

@@ -6,7 +6,7 @@
 
 //  ---------------------------------------------------------------------------
 import deribitRest from '../deribit.js';
-import { NotSupported, ExchangeError } from '../base/errors.js';
+import { NotSupported, ExchangeError, ArgumentsRequired } from '../base/errors.js';
 import { ArrayCache, ArrayCacheBySymbolById, ArrayCacheByTimestamp } from '../base/ws/Cache.js';
 import { sha256 } from '../static_dependencies/noble-hashes/sha256.js';
 //  ---------------------------------------------------------------------------
@@ -19,10 +19,13 @@ export default class deribit extends deribitRest {
                 'watchTicker': true,
                 'watchTickers': false,
                 'watchTrades': true,
+                'watchTradesForSymbols': true,
                 'watchMyTrades': true,
                 'watchOrders': true,
                 'watchOrderBook': true,
+                'watchOrderBookForSymbols': true,
                 'watchOHLCV': true,
+                'watchOHLCVForSymbols': true,
             },
             'urls': {
                 'test': {
@@ -33,18 +36,31 @@ export default class deribit extends deribitRest {
                 },
             },
             'options': {
-                'timeframes': {
-                    '1m': 1,
-                    '3m': 3,
-                    '5m': 5,
-                    '15m': 15,
-                    '30m': 30,
-                    '1h': 60,
-                    '2h': 120,
-                    '4h': 180,
-                    '6h': 360,
-                    '12h': 720,
-                    '1d': '1D',
+                'ws': {
+                    'timeframes': {
+                        '1m': '1',
+                        '3m': '3',
+                        '5m': '5',
+                        '15m': '15',
+                        '30m': '30',
+                        '1h': '60',
+                        '2h': '120',
+                        '4h': '180',
+                        '6h': '360',
+                        '12h': '720',
+                        '1d': '1D',
+                    },
+                    // watchTrades replacement
+                    'watchTradesForSymbols': {
+                        'interval': '100ms', // 100ms, agg2, raw
+                    },
+                    // watchOrderBook replacement
+                    'watchOrderBookForSymbols': {
+                        'interval': '100ms',
+                        'useDepthEndpoint': false,
+                        'depth': '20',
+                        'group': 'none', // none, 1, 2, 5, 10, 25, 100, 250
+                    },
                 },
                 'currencies': ['BTC', 'ETH', 'SOL', 'USDC'],
             },
@@ -224,27 +240,31 @@ export default class deribit extends deribitRest {
          * @param {str} [params.interval] specify aggregation and frequency of notifications. Possible values: 100ms, raw
          * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
          */
-        await this.loadMarkets();
-        const market = this.market(symbol);
-        const url = this.urls['api']['ws'];
-        const interval = this.safeString(params, 'interval', '100ms');
-        params = this.omit(params, 'interval');
-        const channel = 'trades.' + market['id'] + '.' + interval;
+        params['callerMethodName'] = 'watchTrades';
+        return await this.watchTradesForSymbols([symbol], since, limit, params);
+    }
+    async watchTradesForSymbols(symbols, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name deribit#watchTradesForSymbols
+         * @description get the list of most recent trades for a list of symbols
+         * @see https://docs.deribit.com/#trades-instrument_name-interval
+         * @param {string[]} symbols unified symbol of the market to fetch trades for
+         * @param {int} [since] timestamp in ms of the earliest trade to fetch
+         * @param {int} [limit] the maximum amount of trades to fetch
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
+         */
+        let interval = undefined;
+        [interval, params] = this.handleOptionAndParams(params, 'watchTradesForSymbols', 'interval', '100ms');
         if (interval === 'raw') {
             await this.authenticate();
         }
-        const message = {
-            'jsonrpc': '2.0',
-            'method': 'public/subscribe',
-            'params': {
-                'channels': [channel],
-            },
-            'id': this.requestId(),
-        };
-        const request = this.deepExtend(message, params);
-        const trades = await this.watch(url, channel, request, channel, request);
+        const trades = await this.watchMultipleWrapper('trades', interval, symbols, params);
         if (this.newUpdates) {
-            limit = trades.getLimit(symbol, limit);
+            const first = this.safeDict(trades, 0);
+            const tradeSymbol = this.safeString(first, 'symbol');
+            limit = trades.getLimit(tradeSymbol, limit);
         }
         return this.filterBySinceLimit(trades, since, limit, 'timestamp', true);
     }
@@ -270,26 +290,27 @@ export default class deribit extends deribitRest {
         //         }
         //     }
         //
-        const params = this.safeValue(message, 'params', {});
+        const params = this.safeDict(message, 'params', {});
         const channel = this.safeString(params, 'channel', '');
         const parts = channel.split('.');
         const marketId = this.safeString(parts, 1);
+        const interval = this.safeString(parts, 2);
         const symbol = this.safeSymbol(marketId);
         const market = this.safeMarket(marketId);
-        const trades = this.safeValue(params, 'data', []);
-        let stored = this.safeValue(this.trades, symbol);
-        if (stored === undefined) {
+        const trades = this.safeList(params, 'data', []);
+        if (this.safeValue(this.trades, symbol) === undefined) {
             const limit = this.safeInteger(this.options, 'tradesLimit', 1000);
-            stored = new ArrayCache(limit);
-            this.trades[symbol] = stored;
+            this.trades[symbol] = new ArrayCache(limit);
         }
+        const stored = this.trades[symbol];
         for (let i = 0; i < trades.length; i++) {
             const trade = trades[i];
             const parsed = this.parseTrade(trade, market);
             stored.append(parsed);
         }
         this.trades[symbol] = stored;
-        client.resolve(this.trades[symbol], channel);
+        const messageHash = 'trades|' + symbol + '|' + interval;
+        client.resolve(this.trades[symbol], messageHash);
     }
     async watchMyTrades(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**
@@ -380,7 +401,7 @@ export default class deribit extends deribitRest {
         /**
          * @method
          * @name deribit#watchOrderBook
-         * @see https://docs.deribit.com/#public-get_book_summary_by_instrument
+         * @see https://docs.deribit.com/#book-instrument_name-group-depth-interval
          * @description watches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
          * @param {string} symbol unified symbol of the market to fetch the order book for
          * @param {int} [limit] the maximum amount of order book entries to return
@@ -388,25 +409,39 @@ export default class deribit extends deribitRest {
          * @param {string} [params.interval] Frequency of notifications. Events will be aggregated over this interval. Possible values: 100ms, raw
          * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
          */
-        await this.loadMarkets();
-        const market = this.market(symbol);
-        const url = this.urls['api']['ws'];
-        const interval = this.safeString(params, 'interval', '100ms');
-        params = this.omit(params, 'interval');
+        params['callerMethodName'] = 'watchOrderBook';
+        return await this.watchOrderBookForSymbols([symbol], limit, params);
+    }
+    async watchOrderBookForSymbols(symbols, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name deribit#watchOrderBookForSymbols
+         * @description watches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+         * @see https://docs.deribit.com/#book-instrument_name-group-depth-interval
+         * @param {string[]} symbols unified array of symbols
+         * @param {int} [limit] the maximum amount of order book entries to return
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
+         */
+        let interval = undefined;
+        [interval, params] = this.handleOptionAndParams(params, 'watchOrderBookForSymbols', 'interval', '100ms');
         if (interval === 'raw') {
             await this.authenticate();
         }
-        const channel = 'book.' + market['id'] + '.' + interval;
-        const subscribe = {
-            'jsonrpc': '2.0',
-            'method': 'public/subscribe',
-            'params': {
-                'channels': [channel],
-            },
-            'id': this.requestId(),
-        };
-        const request = this.deepExtend(subscribe, params);
-        const orderbook = await this.watch(url, channel, request, channel);
+        let descriptor = '';
+        let useDepthEndpoint = undefined; // for more info, see comment in .options
+        [useDepthEndpoint, params] = this.handleOptionAndParams(params, 'watchOrderBookForSymbols', 'useDepthEndpoint', false);
+        if (useDepthEndpoint) {
+            let depth = undefined;
+            [depth, params] = this.handleOptionAndParams(params, 'watchOrderBookForSymbols', 'depth', '20');
+            let group = undefined;
+            [group, params] = this.handleOptionAndParams(params, 'watchOrderBookForSymbols', 'group', 'none');
+            descriptor = group + '.' + depth + '.' + interval;
+        }
+        else {
+            descriptor = interval;
+        }
+        const orderbook = await this.watchMultipleWrapper('book', descriptor, symbols, params);
         return orderbook.limit();
     }
     handleOrderBook(client, message) {
@@ -458,6 +493,20 @@ export default class deribit extends deribitRest {
         const params = this.safeValue(message, 'params', {});
         const data = this.safeValue(params, 'data', {});
         const channel = this.safeString(params, 'channel');
+        const parts = channel.split('.');
+        let descriptor = '';
+        const partsLength = parts.length;
+        const isDetailed = partsLength === 5;
+        if (isDetailed) {
+            const group = this.safeString(parts, 2);
+            const depth = this.safeString(parts, 3);
+            const interval = this.safeString(parts, 4);
+            descriptor = group + '.' + depth + '.' + interval;
+        }
+        else {
+            const interval = this.safeString(parts, 2);
+            descriptor = interval;
+        }
         const marketId = this.safeString(data, 'instrument_name');
         const symbol = this.safeSymbol(marketId);
         const timestamp = this.safeInteger(data, 'timestamp');
@@ -474,7 +523,8 @@ export default class deribit extends deribitRest {
         storedOrderBook['datetime'] = this.iso8601(timestamp);
         storedOrderBook['symbol'] = symbol;
         this.orderbooks[symbol] = storedOrderBook;
-        client.resolve(storedOrderBook, channel);
+        const messageHash = 'book|' + symbol + '|' + descriptor;
+        client.resolve(storedOrderBook, messageHash);
     }
     cleanOrderBook(data) {
         const bids = this.safeValue(data, 'bids', []);
@@ -614,28 +664,32 @@ export default class deribit extends deribitRest {
          * @returns {int[][]} A list of candles ordered as timestamp, open, high, low, close, volume
          */
         await this.loadMarkets();
-        const market = this.market(symbol);
-        const url = this.urls['api']['ws'];
-        const timeframes = this.safeValue(this.options, 'timeframes', {});
-        const interval = this.safeString(timeframes, timeframe);
-        if (interval === undefined) {
-            throw new NotSupported(this.id + ' this interval is not supported, please provide one of the supported timeframes');
+        symbol = this.symbol(symbol);
+        const ohlcvs = await this.watchOHLCVForSymbols([[symbol, timeframe]], since, limit, params);
+        return ohlcvs[symbol][timeframe];
+    }
+    async watchOHLCVForSymbols(symbolsAndTimeframes, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name deribit#watchOHLCVForSymbols
+         * @description watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://docs.deribit.com/#chart-trades-instrument_name-resolution
+         * @param {string[][]} symbolsAndTimeframes array of arrays containing unified symbols and timeframes to fetch OHLCV data for, example [['BTC/USDT', '1m'], ['LTC/USDT', '5m']]
+         * @param {int} [since] timestamp in ms of the earliest candle to fetch
+         * @param {int} [limit] the maximum amount of candles to fetch
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {int[][]} A list of candles ordered as timestamp, open, high, low, close, volume
+         */
+        const symbolsLength = symbolsAndTimeframes.length;
+        if (symbolsLength === 0 || !Array.isArray(symbolsAndTimeframes[0])) {
+            throw new ArgumentsRequired(this.id + " watchOHLCVForSymbols() requires a an array of symbols and timeframes, like  [['BTC/USDT', '1m'], ['LTC/USDT', '5m']]");
         }
-        const channel = 'chart.trades.' + market['id'] + '.' + interval;
-        const message = {
-            'jsonrpc': '2.0',
-            'method': 'public/subscribe',
-            'params': {
-                'channels': [channel],
-            },
-            'id': this.requestId(),
-        };
-        const request = this.deepExtend(message, params);
-        const ohlcv = await this.watch(url, channel, request, channel, request);
+        const [symbol, timeframe, candles] = await this.watchMultipleWrapper('chart.trades', undefined, symbolsAndTimeframes, params);
         if (this.newUpdates) {
-            limit = ohlcv.getLimit(market['symbol'], limit);
+            limit = candles.getLimit(symbol, limit);
         }
-        return this.filterBySinceLimit(ohlcv, since, limit, 0, true);
+        const filtered = this.filterBySinceLimit(candles, since, limit, 0, true);
+        return this.createOHLCVObject(symbol, timeframe, filtered);
     }
     handleOHLCV(client, message) {
         //
@@ -656,13 +710,44 @@ export default class deribit extends deribitRest {
         //         }
         //     }
         //
-        const params = this.safeValue(message, 'params', {});
+        const params = this.safeDict(message, 'params', {});
         const channel = this.safeString(params, 'channel', '');
         const parts = channel.split('.');
         const marketId = this.safeString(parts, 2);
-        const symbol = this.safeSymbol(marketId);
-        const ohlcv = this.safeValue(params, 'data', {});
-        const parsed = [
+        const rawTimeframe = this.safeString(parts, 3);
+        const market = this.safeMarket(marketId);
+        const symbol = market['symbol'];
+        const wsOptions = this.safeDict(this.options, 'ws', {});
+        const timeframes = this.safeDict(wsOptions, 'timeframes', {});
+        const unifiedTimeframe = this.findTimeframe(rawTimeframe, timeframes);
+        this.ohlcvs[symbol] = this.safeDict(this.ohlcvs, symbol, {});
+        if (this.safeValue(this.ohlcvs[symbol], unifiedTimeframe) === undefined) {
+            const limit = this.safeInteger(this.options, 'OHLCVLimit', 1000);
+            this.ohlcvs[symbol][unifiedTimeframe] = new ArrayCacheByTimestamp(limit);
+        }
+        const stored = this.ohlcvs[symbol][unifiedTimeframe];
+        const ohlcv = this.safeDict(params, 'data', {});
+        // data contains a single OHLCV candle
+        const parsed = this.parseWsOHLCV(ohlcv, market);
+        stored.append(parsed);
+        this.ohlcvs[symbol][unifiedTimeframe] = stored;
+        const resolveData = [symbol, unifiedTimeframe, stored];
+        const messageHash = 'chart.trades|' + symbol + '|' + rawTimeframe;
+        client.resolve(resolveData, messageHash);
+    }
+    parseWsOHLCV(ohlcv, market = undefined) {
+        //
+        //    {
+        //        "c": "28909.0",
+        //        "o": "28915.4",
+        //        "h": "28915.4",
+        //        "l": "28896.1",
+        //        "v": "27.6919",
+        //        "T": 1696687499999,
+        //        "t": 1696687440000
+        //    }
+        //
+        return [
             this.safeInteger(ohlcv, 'tick'),
             this.safeNumber(ohlcv, 'open'),
             this.safeNumber(ohlcv, 'high'),
@@ -670,14 +755,46 @@ export default class deribit extends deribitRest {
             this.safeNumber(ohlcv, 'close'),
             this.safeNumber(ohlcv, 'volume'),
         ];
-        let stored = this.safeValue(this.ohlcvs, symbol);
-        if (stored === undefined) {
-            const limit = this.safeInteger(this.options, 'OHLCVLimit', 1000);
-            stored = new ArrayCacheByTimestamp(limit);
+    }
+    async watchMultipleWrapper(channelName, channelDescriptor, symbolsArray = undefined, params = {}) {
+        await this.loadMarkets();
+        const url = this.urls['api']['ws'];
+        const rawSubscriptions = [];
+        const messageHashes = [];
+        const isOHLCV = (channelName === 'chart.trades');
+        const symbols = isOHLCV ? this.getListFromObjectValues(symbolsArray, 0) : symbolsArray;
+        this.marketSymbols(symbols, undefined, false);
+        for (let i = 0; i < symbolsArray.length; i++) {
+            const current = symbolsArray[i];
+            let market = undefined;
+            if (isOHLCV) {
+                market = this.market(current[0]);
+                const unifiedTf = current[1];
+                const rawTf = this.safeString(this.timeframes, unifiedTf, unifiedTf);
+                channelDescriptor = rawTf;
+            }
+            else {
+                market = this.market(current);
+            }
+            const message = channelName + '.' + market['id'] + '.' + channelDescriptor;
+            rawSubscriptions.push(message);
+            messageHashes.push(channelName + '|' + market['symbol'] + '|' + channelDescriptor);
         }
-        stored.append(parsed);
-        this.ohlcvs[symbol] = stored;
-        client.resolve(stored, channel);
+        const request = {
+            'jsonrpc': '2.0',
+            'method': 'public/subscribe',
+            'params': {
+                'channels': rawSubscriptions,
+            },
+            'id': this.requestId(),
+        };
+        const extendedRequest = this.deepExtend(request, params);
+        const maxMessageByteLimit = 32768 - 1; // 'Message Too Big: limit 32768B'
+        const jsonedText = this.json(extendedRequest);
+        if (jsonedText.length >= maxMessageByteLimit) {
+            throw new ExchangeError(this.id + ' requested subscription length over limit, try to reduce symbols amount');
+        }
+        return await this.watchMultiple(url, messageHashes, extendedRequest, rawSubscriptions);
     }
     handleMessage(client, message) {
         //

package/js/src/pro/gate.js

@@ -825,7 +825,7 @@ export default class gate extends gateRest {
         const client = this.client(url);
         this.setPositionsCache(client, type, symbols);
         const fetchPositionsSnapshot = this.handleOption('watchPositions', 'fetchPositionsSnapshot', true);
-        const awaitPositionsSnapshot = this.safeValue('watchPositions', 'awaitPositionsSnapshot', true);
+        const awaitPositionsSnapshot = this.safeBool('watchPositions', 'awaitPositionsSnapshot', true);
         const cache = this.safeValue(this.positions, type);
         if (fetchPositionsSnapshot && awaitPositionsSnapshot && cache === undefined) {
             return await client.future(type + ':fetchPositionsSnapshot');

package/js/src/pro/independentreserve.js

@@ -199,7 +199,7 @@ export default class independentreserve extends independentreserveRest {
             orderbook['timestamp'] = timestamp;
             orderbook['datetime'] = this.iso8601(timestamp);
         }
-        const checksum = this.safeValue(this.options, 'checksum', true);
+        const checksum = this.safeBool(this.options, 'checksum', true);
         if (checksum && receivedSnapshot) {
             const storedAsks = orderbook['asks'];
             const storedBids = orderbook['bids'];

package/js/src/pro/kraken.js

@@ -700,7 +700,7 @@ export default class kraken extends krakenRest {
             }
             // don't remove this line or I will poop on your face
             orderbook.limit();
-            const checksum = this.safeValue(this.options, 'checksum', true);
+            const checksum = this.safeBool(this.options, 'checksum', true);
             if (checksum) {
                 const priceString = this.safeString(example, 0);
                 const amountString = this.safeString(example, 1);

package/js/src/pro/kucoinfutures.js

@@ -241,7 +241,7 @@ export default class kucoinfutures extends kucoinfuturesRest {
         const client = this.client(url);
         this.setPositionCache(client, symbol);
         const fetchPositionSnapshot = this.handleOption('watchPosition', 'fetchPositionSnapshot', true);
-        const awaitPositionSnapshot = this.safeValue('watchPosition', 'awaitPositionSnapshot', true);
+        const awaitPositionSnapshot = this.safeBool('watchPosition', 'awaitPositionSnapshot', true);
         const currentPosition = this.getCurrentPosition(symbol);
         if (fetchPositionSnapshot && awaitPositionSnapshot && currentPosition === undefined) {
             const snapshot = await client.future('fetchPositionSnapshot:' + symbol);

package/js/src/pro/mexc.js

@@ -6,7 +6,7 @@
 
 //  ---------------------------------------------------------------------------
 import mexcRest from '../mexc.js';
-import { ExchangeError, AuthenticationError } from '../base/errors.js';
+import { AuthenticationError } from '../base/errors.js';
 import { ArrayCache, ArrayCacheBySymbolById, ArrayCacheByTimestamp } from '../base/ws/Cache.js';
 import { sha256 } from '../static_dependencies/noble-hashes/sha256.js';
 //  ---------------------------------------------------------------------------
@@ -503,10 +503,12 @@ export default class mexc extends mexcRest {
         }
     }
     handleDelta(orderbook, delta) {
-        const nonce = this.safeInteger(orderbook, 'nonce');
+        const existingNonce = this.safeInteger(orderbook, 'nonce');
         const deltaNonce = this.safeInteger2(delta, 'r', 'version');
-        if (deltaNonce !== nonce && deltaNonce !== nonce + 1) {
-            throw new ExchangeError(this.id + ' handleOrderBook received an out-of-order nonce');
+        if (deltaNonce < existingNonce) {
+            // even when doing < comparison, this happens: https://app.travis-ci.com/github/ccxt/ccxt/builds/269234741#L1809
+            // so, we just skip old updates
+            return;
         }
         orderbook['nonce'] = deltaNonce;
         const asks = this.safeValue(delta, 'asks', []);

package/js/src/pro/okx.js

@@ -562,7 +562,7 @@ export default class okx extends okxRest {
         const storedBids = orderbook['bids'];
         this.handleDeltas(storedAsks, asks);
         this.handleDeltas(storedBids, bids);
-        const checksum = this.safeValue(this.options, 'checksum', true);
+        const checksum = this.safeBool(this.options, 'checksum', true);
         if (checksum) {
             const asksLength = storedAsks.length;
             const bidsLength = storedBids.length;

package/js/src/pro/whitebit.js

@@ -871,12 +871,10 @@ export default class whitebit extends whitebitRest {
         if (!this.handleErrorMessage(client, message)) {
             return;
         }
-        const result = this.safeValue(message, 'result', {});
-        if (result !== undefined) {
-            if (result === 'pong') {
-                this.handlePong(client, message);
-                return;
-            }
+        const result = this.safeString(message, 'result');
+        if (result === 'pong') {
+            this.handlePong(client, message);
+            return;
         }
         const id = this.safeInteger(message, 'id');
         if (id !== undefined) {

package/js/src/pro/woo.js

@@ -632,7 +632,7 @@ export default class woo extends wooRest {
         const client = this.client(url);
         this.setPositionsCache(client, symbols);
         const fetchPositionsSnapshot = this.handleOption('watchPositions', 'fetchPositionsSnapshot', true);
-        const awaitPositionsSnapshot = this.safeValue('watchPositions', 'awaitPositionsSnapshot', true);
+        const awaitPositionsSnapshot = this.safeBool('watchPositions', 'awaitPositionsSnapshot', true);
         if (fetchPositionsSnapshot && awaitPositionsSnapshot && this.positions === undefined) {
             const snapshot = await client.future('fetchPositionsSnapshot');
             return this.filterBySymbolsSinceLimit(snapshot, symbols, since, limit, true);

package/js/src/probit.js

@@ -1556,7 +1556,7 @@ export default class probit extends Exchange {
         //         ]
         //     }
         //
-        const data = this.safeValue(response, 'data', {});
+        const data = this.safeList(response, 'data', []);
         return this.parseTransactions(data, currency, since, limit);
     }
     parseTransaction(transaction, currency = undefined) {

package/js/src/wavesexchange.js

@@ -1381,7 +1381,7 @@ export default class wavesexchange extends Exchange {
             'amountAsset': amountAsset,
             'priceAsset': priceAsset,
         };
-        const sandboxMode = this.safeValue(this.options, 'sandboxMode', false);
+        const sandboxMode = this.safeBool(this.options, 'sandboxMode', false);
         const chainId = (sandboxMode) ? 84 : 87;
         const body = {
             'senderPublicKey': this.apiKey,

package/js/src/woo.d.ts

@@ -1,5 +1,5 @@
 import Exchange from './abstract/woo.js';
-import type { TransferEntry, Balances, Currency, FundingRateHistory, Int, Market, OHLCV, Order, OrderBook, OrderSide, OrderType, Str, Strings, Trade, Transaction } from './base/types.js';
+import type { TransferEntry, Balances, Currency, FundingRateHistory, Int, Market, OHLCV, Order, OrderBook, OrderSide, OrderType, Str, Strings, Trade, Transaction, Leverage } from './base/types.js';
 /**
  * @class woo
  * @augments Exchange
@@ -158,10 +158,8 @@ export default class woo extends Exchange {
     fetchFundingRates(symbols?: Strings, params?: {}): Promise<any>;
     fetchFundingRateHistory(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<FundingRateHistory[]>;
     setPositionMode(hedged: boolean, symbol?: Str, params?: {}): Promise<any>;
-    fetchLeverage(symbol: string, params?: {}): Promise<{
-        info: any;
-        leverage: number;
-    }>;
+    fetchLeverage(symbol: string, params?: {}): Promise<Leverage>;
+    parseLeverage(leverage: any, market?: any): Leverage;
     setLeverage(leverage: Int, symbol?: Str, params?: {}): Promise<any>;
     fetchPosition(symbol?: Str, params?: {}): Promise<import("./base/types.js").Position>;
     fetchPositions(symbols?: Strings, params?: {}): Promise<import("./base/types.js").Position[]>;

package/js/src/woo.js

@@ -493,7 +493,7 @@ export default class woo extends Exchange {
         //      ]
         // }
         //
-        const resultResponse = this.safeValue(response, 'rows', {});
+        const resultResponse = this.safeList(response, 'rows', []);
         return this.parseTrades(resultResponse, market, since, limit);
     }
     parseTrade(trade, market = undefined) {
@@ -2337,7 +2337,7 @@ export default class woo extends Exchange {
         else {
             this.checkRequiredCredentials();
             if (method === 'POST' && (path === 'algo/order' || path === 'order')) {
-                const isSandboxMode = this.safeValue(this.options, 'sandboxMode', false);
+                const isSandboxMode = this.safeBool(this.options, 'sandboxMode', false);
                 if (!isSandboxMode) {
                     const applicationId = 'bc830de7-50f3-460b-9ee0-f430f83f9dad';
                     const brokerId = this.safeString(this.options, 'brokerId', applicationId);
@@ -2656,7 +2656,17 @@ export default class woo extends Exchange {
         return response;
     }
     async fetchLeverage(symbol, params = {}) {
+        /**
+         * @method
+         * @name woo#fetchLeverage
+         * @description fetch the set leverage for a market
+         * @see https://docs.woo.org/#get-account-information-new
+         * @param {string} symbol unified market symbol
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a [leverage structure]{@link https://docs.ccxt.com/#/?id=leverage-structure}
+         */
         await this.loadMarkets();
+        const market = this.market(symbol);
         const response = await this.v3PrivateGetAccountinfo(params);
         //
         //     {
@@ -2686,11 +2696,17 @@ export default class woo extends Exchange {
         //         "timestamp": 1673323685109
         //     }
         //
-        const result = this.safeValue(response, 'data');
-        const leverage = this.safeNumber(result, 'leverage');
+        const data = this.safeDict(response, 'data', {});
+        return this.parseLeverage(data, market);
+    }
+    parseLeverage(leverage, market = undefined) {
+        const leverageValue = this.safeInteger(leverage, 'leverage');
         return {
-            'info': response,
-            'leverage': leverage,
+            'info': leverage,
+            'symbol': market['symbol'],
+            'marginMode': undefined,
+            'longLeverage': leverageValue,
+            'shortLeverage': leverageValue,
         };
     }
     async setLeverage(leverage, symbol = undefined, params = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "4.2.57",
+  "version": "4.2.59",
   "description": "A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 100+ exchanges",
   "unpkg": "dist/ccxt.browser.js",
   "type": "module",