ccxt 4.2.57 → 4.2.59

package/dist/cjs/ccxt.js

@@ -176,7 +176,7 @@ var woo$1 = require('./src/pro/woo.js');
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.2.57';
+const version = '4.2.59';
 Exchange["default"].ccxtVersion = version;
 const exchanges = {
     'ace': ace,

package/dist/cjs/src/alpaca.js

@@ -440,7 +440,7 @@ class alpaca extends alpaca$1 {
             'loc': loc,
         };
         params = this.omit(params, ['loc', 'method']);
-        let response = undefined;
+        let symbolTrades = undefined;
         if (method === 'marketPublicGetV1beta3CryptoLocTrades') {
             if (since !== undefined) {
                 request['start'] = this.iso8601(since);
@@ -448,47 +448,48 @@ class alpaca extends alpaca$1 {
             if (limit !== undefined) {
                 request['limit'] = limit;
             }
-            response = await this.marketPublicGetV1beta3CryptoLocTrades(this.extend(request, params));
+            const response = await this.marketPublicGetV1beta3CryptoLocTrades(this.extend(request, params));
+            //
+            //    {
+            //        "next_page_token": null,
+            //        "trades": {
+            //            "BTC/USD": [
+            //                {
+            //                    "i": 36440704,
+            //                    "p": 22625,
+            //                    "s": 0.0001,
+            //                    "t": "2022-07-21T11:47:31.073391Z",
+            //                    "tks": "B"
+            //                }
+            //            ]
+            //        }
+            //    }
+            //
+            const trades = this.safeDict(response, 'trades', {});
+            symbolTrades = this.safeList(trades, marketId, []);
         }
         else if (method === 'marketPublicGetV1beta3CryptoLocLatestTrades') {
-            response = await this.marketPublicGetV1beta3CryptoLocLatestTrades(this.extend(request, params));
+            const response = await this.marketPublicGetV1beta3CryptoLocLatestTrades(this.extend(request, params));
+            //
+            //    {
+            //       "trades": {
+            //            "BTC/USD": {
+            //                "i": 36440704,
+            //                "p": 22625,
+            //                "s": 0.0001,
+            //                "t": "2022-07-21T11:47:31.073391Z",
+            //                "tks": "B"
+            //            }
+            //        }
+            //    }
+            //
+            const trades = this.safeDict(response, 'trades', {});
+            symbolTrades = this.safeDict(trades, marketId, {});
+            symbolTrades = [symbolTrades];
         }
         else {
             throw new errors.NotSupported(this.id + ' fetchTrades() does not support ' + method + ', marketPublicGetV1beta3CryptoLocTrades and marketPublicGetV1beta3CryptoLocLatestTrades are supported');
         }
-        //
-        // {
-        //     "next_page_token":null,
-        //     "trades":{
-        //        "BTC/USD":[
-        //           {
-        //              "i":36440704,
-        //              "p":22625,
-        //              "s":0.0001,
-        //              "t":"2022-07-21T11:47:31.073391Z",
-        //              "tks":"B"
-        //           }
-        //        ]
-        //     }
-        // }
-        //
-        // {
-        //     "trades":{
-        //        "BTC/USD":{
-        //           "i":36440704,
-        //           "p":22625,
-        //           "s":0.0001,
-        //           "t":"2022-07-21T11:47:31.073391Z",
-        //           "tks":"B"
-        //        }
-        //     }
-        // }
-        //
-        const trades = this.safeValue(response, 'trades', {});
-        let symbolTrades = this.safeValue(trades, marketId, {});
-        if (!Array.isArray(symbolTrades)) {
-            symbolTrades = [symbolTrades];
-        }
         return this.parseTrades(symbolTrades, market, since, limit);
     }
     async fetchOrderBook(symbol, limit = undefined, params = {}) {
@@ -580,7 +581,7 @@ class alpaca extends alpaca$1 {
             'loc': loc,
         };
         params = this.omit(params, ['loc', 'method']);
-        let response = undefined;
+        let ohlcvs = undefined;
         if (method === 'marketPublicGetV1beta3CryptoLocBars') {
             if (limit !== undefined) {
                 request['limit'] = limit;
@@ -589,63 +590,64 @@ class alpaca extends alpaca$1 {
                 request['start'] = this.yyyymmdd(since);
             }
             request['timeframe'] = this.safeString(this.timeframes, timeframe, timeframe);
-            response = await this.marketPublicGetV1beta3CryptoLocBars(this.extend(request, params));
+            const response = await this.marketPublicGetV1beta3CryptoLocBars(this.extend(request, params));
+            //
+            //    {
+            //        "bars": {
+            //           "BTC/USD": [
+            //              {
+            //                 "c": 22887,
+            //                 "h": 22888,
+            //                 "l": 22873,
+            //                 "n": 11,
+            //                 "o": 22883,
+            //                 "t": "2022-07-21T05:00:00Z",
+            //                 "v": 1.1138,
+            //                 "vw": 22883.0155324116
+            //              },
+            //              {
+            //                 "c": 22895,
+            //                 "h": 22895,
+            //                 "l": 22884,
+            //                 "n": 6,
+            //                 "o": 22884,
+            //                 "t": "2022-07-21T05:01:00Z",
+            //                 "v": 0.001,
+            //                 "vw": 22889.5
+            //              }
+            //           ]
+            //        },
+            //        "next_page_token": "QlRDL1VTRHxNfDIwMjItMDctMjFUMDU6MDE6MDAuMDAwMDAwMDAwWg=="
+            //     }
+            //
+            const bars = this.safeDict(response, 'bars', {});
+            ohlcvs = this.safeList(bars, marketId, []);
         }
         else if (method === 'marketPublicGetV1beta3CryptoLocLatestBars') {
-            response = await this.marketPublicGetV1beta3CryptoLocLatestBars(this.extend(request, params));
+            const response = await this.marketPublicGetV1beta3CryptoLocLatestBars(this.extend(request, params));
+            //
+            //    {
+            //        "bars": {
+            //           "BTC/USD": {
+            //              "c": 22887,
+            //              "h": 22888,
+            //              "l": 22873,
+            //              "n": 11,
+            //              "o": 22883,
+            //              "t": "2022-07-21T05:00:00Z",
+            //              "v": 1.1138,
+            //              "vw": 22883.0155324116
+            //           }
+            //        }
+            //     }
+            //
+            const bars = this.safeDict(response, 'bars', {});
+            ohlcvs = this.safeDict(bars, marketId, {});
+            ohlcvs = [ohlcvs];
         }
         else {
             throw new errors.NotSupported(this.id + ' fetchOHLCV() does not support ' + method + ', marketPublicGetV1beta3CryptoLocBars and marketPublicGetV1beta3CryptoLocLatestBars are supported');
         }
-        //
-        //    {
-        //        "bars":{
-        //           "BTC/USD":[
-        //              {
-        //                 "c":22887,
-        //                 "h":22888,
-        //                 "l":22873,
-        //                 "n":11,
-        //                 "o":22883,
-        //                 "t":"2022-07-21T05:00:00Z",
-        //                 "v":1.1138,
-        //                 "vw":22883.0155324116
-        //              },
-        //              {
-        //                 "c":22895,
-        //                 "h":22895,
-        //                 "l":22884,
-        //                 "n":6,
-        //                 "o":22884,
-        //                 "t":"2022-07-21T05:01:00Z",
-        //                 "v":0.001,
-        //                 "vw":22889.5
-        //              }
-        //           ]
-        //        },
-        //        "next_page_token":"QlRDL1VTRHxNfDIwMjItMDctMjFUMDU6MDE6MDAuMDAwMDAwMDAwWg=="
-        //     }
-        //
-        //    {
-        //        "bars":{
-        //           "BTC/USD":{
-        //              "c":22887,
-        //              "h":22888,
-        //              "l":22873,
-        //              "n":11,
-        //              "o":22883,
-        //              "t":"2022-07-21T05:00:00Z",
-        //              "v":1.1138,
-        //              "vw":22883.0155324116
-        //           }
-        //        }
-        //     }
-        //
-        const bars = this.safeValue(response, 'bars', {});
-        let ohlcvs = this.safeValue(bars, marketId, {});
-        if (!Array.isArray(ohlcvs)) {
-            ohlcvs = [ohlcvs];
-        }
         return this.parseOHLCVs(ohlcvs, market, timeframe, since, limit);
     }
     parseOHLCV(ohlcv, market = undefined) {

package/dist/cjs/src/base/Exchange.js

@@ -1988,7 +1988,13 @@ class Exchange {
         throw new errors.NotSupported(this.id + ' setLeverage() is not supported yet');
     }
     async fetchLeverage(symbol, params = {}) {
-        throw new errors.NotSupported(this.id + ' fetchLeverage() is not supported yet');
+        if (this.has['fetchLeverages']) {
+            const leverages = await this.fetchLeverages([symbol], params);
+            return this.safeDict(leverages, symbol);
+        }
+        else {
+            throw new errors.NotSupported(this.id + ' fetchLeverage() is not supported yet');
+        }
     }
     async fetchLeverages(symbols = undefined, params = {}) {
         throw new errors.NotSupported(this.id + ' fetchLeverages() is not supported yet');
@@ -3889,6 +3895,8 @@ class Exchange {
             params = this.omit(params, [optionName, defaultOptionName]);
         }
         else {
+            // handle routed methods like "watchTrades > watchTradesForSymbols" (or "watchTicker > watchTickers")
+            [methodName, params] = this.handleParamString(params, 'callerMethodName', methodName);
             // check if exchange has properties for this method
             const exchangeWideMethodOptions = this.safeValue(this.options, methodName);
             if (exchangeWideMethodOptions !== undefined) {
@@ -5587,6 +5595,21 @@ class Exchange {
     parseMarginMode(marginMode, market = undefined) {
         throw new errors.NotSupported(this.id + ' parseMarginMode () is not supported yet');
     }
+    parseLeverages(response, symbols = undefined, symbolKey = undefined, marketType = undefined) {
+        const leverageStructures = {};
+        for (let i = 0; i < response.length; i++) {
+            const info = response[i];
+            const marketId = this.safeString(info, symbolKey);
+            const market = this.safeMarket(marketId, undefined, undefined, marketType);
+            if ((symbols === undefined) || this.inArray(market['symbol'], symbols)) {
+                leverageStructures[market['symbol']] = this.parseLeverage(info, market);
+            }
+        }
+        return leverageStructures;
+    }
+    parseLeverage(leverage, market = undefined) {
+        throw new errors.NotSupported(this.id + ' parseLeverage() is not supported yet');
+    }
 }
 
 exports.Exchange = Exchange;

package/dist/cjs/src/binance.js

@@ -94,7 +94,8 @@ class binance extends binance$1 {
                 'fetchLastPrices': true,
                 'fetchLedger': true,
                 'fetchLedgerEntry': true,
-                'fetchLeverage': true,
+                'fetchLeverage': 'emulated',
+                'fetchLeverages': true,
                 'fetchLeverageTiers': true,
                 'fetchLiquidations': false,
                 'fetchMarginMode': 'emulated',
@@ -4809,7 +4810,7 @@ class binance extends binance$1 {
         let stopPriceIsRequired = false;
         let quantityIsRequired = false;
         if (uppercaseType === 'MARKET') {
-            const quoteOrderQty = this.safeValue(this.options, 'quoteOrderQty', true);
+            const quoteOrderQty = this.safeBool(this.options, 'quoteOrderQty', true);
             if (quoteOrderQty) {
                 const quoteOrderQtyNew = this.safeValue2(params, 'quoteOrderQty', 'cost');
                 const precision = market['precision']['price'];
@@ -10317,7 +10318,7 @@ class binance extends binance$1 {
             // POST https://fapi.binance.com/fapi/v1/marginType 400 Bad Request
             // binanceusdm
             if (e instanceof errors.MarginModeAlreadySet) {
-                const throwMarginModeAlreadySet = this.safeValue(this.options, 'throwMarginModeAlreadySet', false);
+                const throwMarginModeAlreadySet = this.safeBool(this.options, 'throwMarginModeAlreadySet', false);
                 if (throwMarginModeAlreadySet) {
                     throw e;
                 }
@@ -10388,31 +10389,27 @@ class binance extends binance$1 {
         //
         return response;
     }
-    async fetchLeverage(symbol, params = {}) {
+    async fetchLeverages(symbols = undefined, params = {}) {
         /**
          * @method
-         * @name binance#fetchLeverage
-         * @description fetch the set leverage for a market
+         * @name binance#fetchLeverages
+         * @description fetch the set leverage for all markets
          * @see https://binance-docs.github.io/apidocs/futures/en/#account-information-v2-user_data
          * @see https://binance-docs.github.io/apidocs/delivery/en/#account-information-user_data
          * @see https://binance-docs.github.io/apidocs/pm/en/#get-um-account-detail-user_data
          * @see https://binance-docs.github.io/apidocs/pm/en/#get-cm-account-detail-user_data
-         * @param {string} symbol unified market symbol
+         * @param {string[]} [symbols] a list of unified market symbols
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @returns {object} a [leverage structure]{@link https://docs.ccxt.com/#/?id=leverage-structure}
+         * @returns {object} a list of [leverage structures]{@link https://docs.ccxt.com/#/?id=leverage-structure}
          */
         await this.loadMarkets();
         await this.loadLeverageBrackets(false, params);
-        const market = this.market(symbol);
-        if (!market['contract']) {
-            throw new errors.NotSupported(this.id + ' fetchLeverage() supports linear and inverse contracts only');
-        }
         let type = undefined;
-        [type, params] = this.handleMarketTypeAndParams('fetchLeverage', market, params);
+        [type, params] = this.handleMarketTypeAndParams('fetchLeverages', undefined, params);
         let subType = undefined;
-        [subType, params] = this.handleSubTypeAndParams('fetchLeverage', market, params, 'linear');
+        [subType, params] = this.handleSubTypeAndParams('fetchLeverages', undefined, params, 'linear');
         let isPortfolioMargin = undefined;
-        [isPortfolioMargin, params] = this.handleOptionAndParams2(params, 'fetchLeverage', 'papi', 'portfolioMargin', false);
+        [isPortfolioMargin, params] = this.handleOptionAndParams2(params, 'fetchLeverages', 'papi', 'portfolioMargin', false);
         let response = undefined;
         if (this.isLinear(type, subType)) {
             if (isPortfolioMargin) {
@@ -10431,23 +10428,39 @@ class binance extends binance$1 {
             }
         }
         else {
-            throw new errors.NotSupported(this.id + ' fetchPositions() supports linear and inverse contracts only');
+            throw new errors.NotSupported(this.id + ' fetchLeverages() supports linear and inverse contracts only');
         }
-        const positions = this.safeList(response, 'positions', []);
-        for (let i = 0; i < positions.length; i++) {
-            const position = positions[i];
-            const innerSymbol = this.safeString(position, 'symbol');
-            if (innerSymbol === market['id']) {
-                const isolated = this.safeBool(position, 'isolated');
-                const marginMode = isolated ? 'isolated' : 'cross';
-                return {
-                    'info': position,
-                    'marginMode': marginMode,
-                    'leverage': this.safeInteger(position, 'leverage'),
-                };
-            }
+        const leverages = this.safeList(response, 'positions', []);
+        return this.parseLeverages(leverages, symbols, 'symbol');
+    }
+    parseLeverage(leverage, market = undefined) {
+        const marketId = this.safeString(leverage, 'symbol');
+        const marginModeRaw = this.safeBool(leverage, 'isolated');
+        let marginMode = undefined;
+        if (marginModeRaw !== undefined) {
+            marginMode = marginModeRaw ? 'isolated' : 'cross';
         }
-        return response;
+        const side = this.safeStringLower(leverage, 'positionSide');
+        let longLeverage = undefined;
+        let shortLeverage = undefined;
+        const leverageValue = this.safeInteger(leverage, 'leverage');
+        if (side === 'both') {
+            longLeverage = leverageValue;
+            shortLeverage = leverageValue;
+        }
+        else if (side === 'long') {
+            longLeverage = leverageValue;
+        }
+        else if (side === 'short') {
+            shortLeverage = leverageValue;
+        }
+        return {
+            'info': leverage,
+            'symbol': this.safeSymbol(marketId, market),
+            'marginMode': marginMode,
+            'longLeverage': longLeverage,
+            'shortLeverage': shortLeverage,
+        };
     }
     async fetchSettlementHistory(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**

package/dist/cjs/src/bingx.js

@@ -449,7 +449,7 @@ class bingx extends bingx$1 {
         if (!this.checkRequiredCredentials(false)) {
             return undefined;
         }
-        const isSandbox = this.safeValue(this.options, 'sandboxMode', false);
+        const isSandbox = this.safeBool(this.options, 'sandboxMode', false);
         if (isSandbox) {
             return undefined;
         }
@@ -693,7 +693,7 @@ class bingx extends bingx$1 {
          * @returns {object[]} an array of objects representing market data
          */
         const requests = [this.fetchSwapMarkets(params)];
-        const isSandbox = this.safeValue(this.options, 'sandboxMode', false);
+        const isSandbox = this.safeBool(this.options, 'sandboxMode', false);
         if (!isSandbox) {
             requests.push(this.fetchSpotMarkets(params)); // sandbox is swap only
         }
@@ -3496,7 +3496,18 @@ class bingx extends bingx$1 {
         //        }
         //    }
         //
-        return response;
+        const data = this.safeDict(response, 'data', {});
+        return this.parseLeverage(data, market);
+    }
+    parseLeverage(leverage, market = undefined) {
+        const marketId = this.safeString(leverage, 'symbol');
+        return {
+            'info': leverage,
+            'symbol': this.safeSymbol(marketId, market),
+            'marginMode': undefined,
+            'longLeverage': this.safeInteger(leverage, 'longLeverage'),
+            'shortLeverage': this.safeInteger(leverage, 'shortLeverage'),
+        };
     }
     async setLeverage(leverage, symbol = undefined, params = {}) {
         /**
@@ -4159,7 +4170,7 @@ class bingx extends bingx$1 {
         const type = section[0];
         const version = section[1];
         const access = section[2];
-        const isSandbox = this.safeValue(this.options, 'sandboxMode', false);
+        const isSandbox = this.safeBool(this.options, 'sandboxMode', false);
         if (isSandbox && (type !== 'swap')) {
             throw new errors.NotSupported(this.id + ' does not have a testnet/sandbox URL for ' + type + ' endpoints');
         }