ccxt 4.0.66 → 4.0.68

package/dist/cjs/ccxt.js

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

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

@@ -1300,7 +1300,7 @@ class Exchange {
         throw new errors.NotSupported(this.id + ' fetchOrderBook() is not supported yet');
     }
     async fetchRestOrderBookSafe(symbol, limit = undefined, params = {}) {
-        const fetchSnapshotMaxRetries = this.handleOption('watchOrderBook', 'snapshotMaxRetries', 3);
+        const fetchSnapshotMaxRetries = this.handleOption('watchOrderBook', 'maxRetries', 3);
         for (let i = 0; i < fetchSnapshotMaxRetries; i++) {
             try {
                 const orderBook = await this.fetchOrderBook(symbol, limit, params);

package/dist/cjs/src/binance.js

@@ -1501,6 +1501,7 @@ class binance extends binance$1 {
                     '-4045': errors.ExchangeError,
                     '-4046': errors.AuthenticationError,
                     '-4047': errors.BadRequest,
+                    '-4054': errors.BadRequest,
                     '-5001': errors.BadRequest,
                     '-5002': errors.InsufficientFunds,
                     '-5003': errors.InsufficientFunds,

package/dist/cjs/src/bitget.js

@@ -2451,8 +2451,9 @@ class bitget extends bitget$1 {
             'symbol': market['id'],
         };
         const until = this.safeInteger2(params, 'until', 'till');
+        const limitIsUndefined = (limit === undefined);
         if (limit === undefined) {
-            limit = 1000;
+            limit = 200;
         }
         request['limit'] = limit;
         const marketType = market['spot'] ? 'spot' : 'swap';
@@ -2498,6 +2499,9 @@ class bitget extends bitget$1 {
             const method = this.safeString(params, 'method', defaultSpotMethod);
             params = this.omit(params, 'method');
             if (method === 'publicSpotGetMarketCandles') {
+                if (limitIsUndefined) {
+                    request['limit'] = 1000;
+                }
                 response = await this.publicSpotGetMarketCandles(this.extend(request, params));
             }
             else if (method === 'publicSpotGetMarketHistoryCandles') {
@@ -2517,6 +2521,9 @@ class bitget extends bitget$1 {
                 response = await this.publicMixGetMarketHistoryIndexCandles(this.extend(request, params));
             }
             else if (swapMethod === 'publicMixGetMarketCandles') {
+                if (limitIsUndefined) {
+                    request['limit'] = 1000;
+                }
                 response = await this.publicMixGetMarketCandles(this.extend(request, params));
             }
             else if (swapMethod === 'publicMixGetMarketHistoryCandles') {

package/dist/cjs/src/bybit.js

@@ -1385,6 +1385,16 @@ class bybit extends bybit$1 {
             }
             else if (symbol in this.markets_by_id) {
                 const markets = this.markets_by_id[symbol];
+                let defaultType = this.safeString2(this.options, 'defaultType', 'defaultSubType', 'spot');
+                if (defaultType === 'future') {
+                    defaultType = 'contract';
+                }
+                for (let i = 0; i < markets.length; i++) {
+                    const market = markets[i];
+                    if (market[defaultType]) {
+                        return market;
+                    }
+                }
                 return markets[0];
             }
             else if ((symbol.indexOf('-C') > -1) || (symbol.indexOf('-P') > -1)) {
@@ -2081,10 +2091,10 @@ class bybit extends bybit$1 {
         //         "change24h": "86"
         //     }
         //
+        const isSpot = this.safeString(ticker, 'openInterestValue') === undefined;
         const timestamp = this.safeInteger(ticker, 'time');
         const marketId = this.safeString(ticker, 'symbol');
-        const defaultType = this.safeString(this.options, 'defaultType', 'spot');
-        const type = this.safeString(market, 'type', defaultType);
+        const type = isSpot ? 'spot' : 'contract';
         market = this.safeMarket(marketId, market, undefined, type);
         const symbol = this.safeSymbol(marketId, market, undefined, type);
         const last = this.safeString(ticker, 'lastPrice');

package/dist/cjs/src/lykke.js

@@ -54,7 +54,7 @@ class lykke extends lykke$1 {
                 'fetchMarkets': true,
                 'fetchMarkOHLCV': false,
                 'fetchMyTrades': true,
-                'fetchOHLCV': 'emulated',
+                'fetchOHLCV': undefined,
                 'fetchOpenInterestHistory': false,
                 'fetchOpenOrders': true,
                 'fetchOrder': true,

package/dist/cjs/src/phemex.js

@@ -3548,6 +3548,7 @@ class phemex extends phemex$1 {
         }
         const unrealizedPnl = Precise["default"].stringMul(Precise["default"].stringMul(priceDiff, contracts), contractSizeString);
         const marginRatio = Precise["default"].stringDiv(maintenanceMarginString, collateral);
+        const isCross = this.safeValue(position, 'crossMargin');
         return this.safePosition({
             'info': position,
             'id': undefined,
@@ -3570,7 +3571,7 @@ class phemex extends phemex$1 {
             'maintenanceMarginPercentage': this.parseNumber(maintenanceMarginPercentageString),
             'marginRatio': this.parseNumber(marginRatio),
             'datetime': undefined,
-            'marginMode': undefined,
+            'marginMode': isCross ? 'cross' : 'isolated',
             'side': side,
             'hedged': false,
             'percentage': undefined,

package/dist/cjs/src/pro/binance.js

@@ -85,7 +85,7 @@ class binance extends binance$1 {
                     'name': 'kline', // or indexPriceKline or markPriceKline (coin-m futures)
                 },
                 'watchOrderBook': {
-                    'snapshotMaxRetries': 3,
+                    'maxRetries': 3,
                 },
                 'watchBalance': {
                     'fetchBalanceSnapshot': false,

package/dist/cjs/src/pro/bitfinex2.js

@@ -831,12 +831,13 @@ class bitfinex2 extends bitfinex2$1 {
         client.subscriptions[channelId] = message;
         return message;
     }
-    authenticate(params = {}) {
+    async authenticate(params = {}) {
         const url = this.urls['api']['ws']['private'];
         const client = this.client(url);
         const messageHash = 'authenticated';
-        let future = this.safeValue(client.subscriptions, messageHash);
-        if (future === undefined) {
+        const future = client.future(messageHash);
+        const authenticated = this.safeValue(client.subscriptions, messageHash);
+        if (authenticated === undefined) {
             const nonce = this.milliseconds();
             const payload = 'AUTH' + nonce.toString();
             const signature = this.hmac(this.encode(payload), this.encode(this.secret), sha512.sha384, 'hex');
@@ -849,8 +850,7 @@ class bitfinex2 extends bitfinex2$1 {
                 'event': event,
             };
             const message = this.extend(request, params);
-            future = this.watch(url, messageHash, message);
-            client.subscriptions[messageHash] = future;
+            this.watch(url, messageHash, message, messageHash);
         }
         return future;
     }
@@ -859,7 +859,8 @@ class bitfinex2 extends bitfinex2$1 {
         const status = this.safeString(message, 'status');
         if (status === 'OK') {
             // we resolve the future here permanently so authentication only happens once
-            client.resolve(message, messageHash);
+            const future = this.safeValue(client.futures, messageHash);
+            future.resolve(true);
         }
         else {
             const error = new errors.AuthenticationError(this.json(message));

package/dist/cjs/src/pro/bitget.js

@@ -51,7 +51,9 @@ class bitget extends bitget$1 {
                 'ws': {
                     'exact': {
                         '30001': errors.BadRequest,
-                        '30015': errors.AuthenticationError, // { event: 'error', code: 30015, msg: 'Invalid sign' }
+                        '30015': errors.AuthenticationError,
+                        '30016': errors.BadRequest,
+                        '30011': errors.AuthenticationError, // { event: 'error', code: 30011, msg: 'Invalid ACCESS_KEY' }
                     },
                 },
             },
@@ -1085,13 +1087,14 @@ class bitget extends bitget$1 {
         const message = this.extend(request, params);
         return await this.watch(url, messageHash, message, messageHash);
     }
-    authenticate(params = {}) {
+    async authenticate(params = {}) {
         this.checkRequiredCredentials();
         const url = this.urls['api']['ws'];
         const client = this.client(url);
         const messageHash = 'authenticated';
-        let future = this.safeValue(client.subscriptions, messageHash);
-        if (future === undefined) {
+        const future = client.future(messageHash);
+        const authenticated = this.safeValue(client.subscriptions, messageHash);
+        if (authenticated === undefined) {
             const timestamp = this.seconds().toString();
             const auth = timestamp + 'GET' + '/user/verify';
             const signature = this.hmac(this.encode(auth), this.encode(this.secret), sha256.sha256, 'base64');
@@ -1108,8 +1111,7 @@ class bitget extends bitget$1 {
                 ],
             };
             const message = this.extend(request, params);
-            future = this.watch(url, messageHash, message);
-            client.subscriptions[messageHash] = future;
+            this.watch(url, messageHash, message, messageHash);
         }
         return future;
     }
@@ -1128,7 +1130,8 @@ class bitget extends bitget$1 {
         //  { event: 'login', code: 0 }
         //
         const messageHash = 'authenticated';
-        client.resolve(message, messageHash);
+        const future = this.safeValue(client.futures, messageHash);
+        future.resolve(true);
     }
     handleErrorMessage(client, message) {
         //

package/dist/cjs/src/pro/bitmart.js

@@ -482,13 +482,14 @@ class bitmart extends bitmart$1 {
         }
         return message;
     }
-    authenticate(params = {}) {
+    async authenticate(params = {}) {
         this.checkRequiredCredentials();
         const url = this.implodeHostname(this.urls['api']['ws']['private']);
         const messageHash = 'authenticated';
         const client = this.client(url);
-        let future = this.safeValue(client.subscriptions, messageHash);
-        if (future === undefined) {
+        const future = client.future(messageHash);
+        const authenticated = this.safeValue(client.subscriptions, messageHash);
+        if (authenticated === undefined) {
             const timestamp = this.milliseconds().toString();
             const memo = this.uid;
             const path = 'bitmart.WebSocket';
@@ -504,8 +505,7 @@ class bitmart extends bitmart$1 {
                 ],
             };
             const message = this.extend(request, params);
-            future = this.watch(url, messageHash, message);
-            client.subscriptions[messageHash] = future;
+            this.watch(url, messageHash, message, messageHash);
         }
         return future;
     }
@@ -520,7 +520,8 @@ class bitmart extends bitmart$1 {
         //     { event: 'login' }
         //
         const messageHash = 'authenticated';
-        client.resolve(message, messageHash);
+        const future = this.safeValue(client.futures, messageHash);
+        future.resolve(true);
     }
     handleErrorMessage(client, message) {
         //

package/dist/cjs/src/pro/bittrex.js

@@ -43,7 +43,7 @@ class bittrex extends bittrex$1 {
                 'hub': 'c3',
                 'I': this.milliseconds(),
                 'watchOrderBook': {
-                    'snapshotMaxRetries': 3,
+                    'maxRetries': 3,
                 },
             },
         });
@@ -629,8 +629,7 @@ class bittrex extends bittrex$1 {
             // then we cannot align it with the cached deltas and we need to
             // retry synchronizing in maxAttempts
             if ((sequence !== undefined) && (nonce < sequence)) {
-                const options = this.safeValue(this.options, 'fetchOrderBookSnapshot', {});
-                const maxAttempts = this.safeInteger(options, 'maxAttempts', 3);
+                const maxAttempts = this.handleOption('watchOrderBook', 'maxRetries', 3);
                 let numAttempts = this.safeInteger(subscription, 'numAttempts', 0);
                 // retry to syncrhonize if we haven't reached maxAttempts yet
                 if (numAttempts < maxAttempts) {

package/dist/cjs/src/pro/bybit.js

@@ -283,7 +283,8 @@ class bybit extends bybit$1 {
         const topic = this.safeString(message, 'topic', '');
         const updateType = this.safeString(message, 'type', '');
         const data = this.safeValue(message, 'data', {});
-        const isSpot = this.safeString(data, 's') !== undefined;
+        const isSpot = this.safeString(data, 'openInterestValue') === undefined;
+        const type = isSpot ? 'spot' : 'contract';
         let symbol = undefined;
         let parsed = undefined;
         if ((updateType === 'snapshot') || isSpot) {
@@ -294,7 +295,7 @@ class bybit extends bybit$1 {
             const topicParts = topic.split('.');
             const topicLength = topicParts.length;
             const marketId = this.safeString(topicParts, topicLength - 1);
-            const market = this.market(marketId);
+            const market = this.safeMarket(marketId, undefined, undefined, type);
             symbol = market['symbol'];
             // update the info in place
             const ticker = this.safeValue(this.tickers, symbol, {});

package/dist/cjs/src/pro/coinbasepro.js

@@ -15,7 +15,7 @@ class coinbasepro extends coinbasepro$1 {
                 'watchOHLCV': false,
                 'watchOrderBook': true,
                 'watchTicker': true,
-                'watchTickers': false,
+                'watchTickers': true,
                 'watchTrades': true,
                 'watchBalance': false,
                 'watchStatus': false,
@@ -50,10 +50,16 @@ class coinbasepro extends coinbasepro$1 {
             'passphrase': this.password,
         };
     }
-    async subscribe(name, symbol, messageHashStart, params = {}) {
+    async subscribe(name, symbol = undefined, messageHashStart = undefined, params = {}) {
         await this.loadMarkets();
-        const market = this.market(symbol);
-        const messageHash = messageHashStart + ':' + market['id'];
+        let market = undefined;
+        let messageHash = messageHashStart;
+        const productIds = [];
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+            messageHash += ':' + market['id'];
+            productIds.push(market['id']);
+        }
         let url = this.urls['api']['ws'];
         if ('signature' in params) {
             // need to distinguish between public trades and user trades
@@ -61,9 +67,33 @@ class coinbasepro extends coinbasepro$1 {
         }
         const subscribe = {
             'type': 'subscribe',
-            'product_ids': [
-                market['id'],
+            'product_ids': productIds,
+            'channels': [
+                name,
             ],
+        };
+        const request = this.extend(subscribe, params);
+        return await this.watch(url, messageHash, request, messageHash);
+    }
+    async subscribeMultiple(name, symbols = [], messageHashStart = undefined, params = {}) {
+        await this.loadMarkets();
+        let market = undefined;
+        symbols = this.marketSymbols(symbols);
+        const messageHash = messageHashStart + symbols.join(',');
+        const productIds = [];
+        for (let i = 0; i < symbols.length; i++) {
+            const symbol = symbols[i];
+            market = this.market(symbol);
+            productIds.push(market['id']);
+        }
+        let url = this.urls['api']['ws'];
+        if ('signature' in params) {
+            // need to distinguish between public trades and user trades
+            url = url + '?';
+        }
+        const subscribe = {
+            'type': 'subscribe',
+            'product_ids': productIds,
             'channels': [
                 name,
             ],
@@ -83,6 +113,30 @@ class coinbasepro extends coinbasepro$1 {
         const name = 'ticker';
         return await this.subscribe(name, symbol, name, params);
     }
+    async watchTickers(symbols = undefined, params = {}) {
+        /**
+         * @method
+         * @name okx#watchTickers
+         * @see https://www.okx.com/docs-v5/en/#order-book-trading-market-data-ws-tickers-channel
+         * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for all markets of a specific list
+         * @param {string[]} [symbols] unified symbol of the market to fetch the ticker for
+         * @param {object} [params] extra parameters specific to the okx api endpoint
+         * @param {string} [params.channel] the channel to subscribe to, tickers by default. Can be tickers, sprd-tickers, index-tickers, block-tickers
+         * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
+         */
+        await this.loadMarkets();
+        const symbolsLength = symbols.length;
+        if (symbolsLength === 0) {
+            throw new errors.BadSymbol(this.id + ' watchTickers requires a non-empty symbols array');
+        }
+        const channel = 'ticker';
+        const messageHash = 'tickers::';
+        const newTickers = await this.subscribeMultiple(channel, symbols, messageHash, params);
+        if (this.newUpdates) {
+            return newTickers;
+        }
+        return this.filterByArray(this.tickers, 'symbol', symbols);
+    }
     async watchTrades(symbol, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
@@ -114,9 +168,7 @@ class coinbasepro extends coinbasepro$1 {
          * @param {object} [params] extra parameters specific to the coinbasepro api endpoint
          * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=trade-structure
          */
-        if (symbol === undefined) {
-            throw new errors.BadSymbol(this.id + ' watchMyTrades requires a symbol');
-        }
+        this.checkRequiredSymbol('watchMyTrades', symbol);
         await this.loadMarkets();
         symbol = this.symbol(symbol);
         const name = 'user';
@@ -572,6 +624,16 @@ class coinbasepro extends coinbasepro$1 {
             const type = this.safeString(message, 'type');
             const messageHash = type + ':' + marketId;
             client.resolve(ticker, messageHash);
+            const messageHashes = this.findMessageHashes(client, 'tickers::');
+            for (let i = 0; i < messageHashes.length; i++) {
+                const messageHash = messageHashes[i];
+                const parts = messageHash.split('::');
+                const symbolsString = parts[1];
+                const symbols = symbolsString.split(',');
+                if (this.inArray(symbol, symbols)) {
+                    client.resolve(ticker, messageHash);
+                }
+            }
         }
         return message;
     }

package/dist/cjs/src/pro/huobi.js

@@ -84,7 +84,9 @@ class huobi extends huobi$1 {
                 'tradesLimit': 1000,
                 'OHLCVLimit': 1000,
                 'api': 'api',
-                'maxOrderBookSyncAttempts': 3,
+                'watchOrderBook': {
+                    'maxRetries': 3,
+                },
                 'ws': {
                     'gunzip': true,
                 },
@@ -382,7 +384,7 @@ class huobi extends huobi$1 {
             const snapshotOrderBook = this.orderBook(snapshot, snapshotLimit);
             client.resolve(snapshotOrderBook, id);
             if ((sequence !== undefined) && (nonce < sequence)) {
-                const maxAttempts = this.safeInteger(this.options, 'maxOrderBookSyncAttempts', 3);
+                const maxAttempts = this.handleOption('watchOrderBook', 'maxRetries', 3);
                 let numAttempts = this.safeInteger(subscription, 'numAttempts', 0);
                 // retry to synchronize if we have not reached maxAttempts yet
                 if (numAttempts < maxAttempts) {

package/dist/cjs/src/pro/idex.js

@@ -34,7 +34,7 @@ class idex extends idex$1 {
                 'orderBookSubscriptions': {},
                 'token': undefined,
                 'watchOrderBook': {
-                    'snapshotMaxRetries': 3,
+                    'maxRetries': 3,
                 },
                 'fetchOrderBookSnapshotMaxAttempts': 10,
                 'fetchOrderBookSnapshotMaxDelay': 10000, // throw if there are no orders in 10 seconds

package/dist/cjs/src/wavesexchange.js

@@ -614,19 +614,32 @@ class wavesexchange extends wavesexchange$1 {
     }
     parseOrderBookSide(bookSide, market = undefined, limit = undefined) {
         const precision = market['precision'];
-        const wavesPrecision = this.safeInteger(this.options, 'wavesPrecision', 8);
-        const amountPrecision = Math.pow(10, precision['amount']);
-        const difference = precision['amount'] - precision['price'];
-        const pricePrecision = Math.pow(10, wavesPrecision - difference);
+        const wavesPrecision = this.safeString(this.options, 'wavesPrecision', '8');
+        const amountPrecision = '1e' + this.numberToString(precision['amount']);
+        const amountPrecisionString = this.numberToString(precision['amount']);
+        const pricePrecisionString = this.numberToString(precision['price']);
+        const difference = Precise["default"].stringSub(amountPrecisionString, pricePrecisionString);
+        const pricePrecision = '1e' + Precise["default"].stringSub(wavesPrecision, difference);
         const result = [];
         for (let i = 0; i < bookSide.length; i++) {
             const entry = bookSide[i];
-            const price = this.safeInteger(entry, 'price', 0) / pricePrecision;
-            const amount = this.safeInteger(entry, 'amount', 0) / amountPrecision;
+            const entryPrice = this.safeString(entry, 'price', '0');
+            const entryAmount = this.safeString(entry, 'amount', '0');
+            let price = undefined;
+            let amount = undefined;
+            if ((pricePrecision !== undefined) && (entryPrice !== undefined)) {
+                price = Precise["default"].stringDiv(entryPrice, pricePrecision);
+            }
+            if ((amountPrecision !== undefined) && (entryAmount !== undefined)) {
+                amount = Precise["default"].stringDiv(entryAmount, amountPrecision);
+            }
             if ((limit !== undefined) && (i > limit)) {
                 break;
             }
-            result.push([price, amount]);
+            result.push([
+                this.parseNumber(price),
+                this.parseNumber(amount),
+            ]);
         }
         return result;
     }
@@ -1206,15 +1219,21 @@ class wavesexchange extends wavesexchange$1 {
     }
     customPriceToPrecision(symbol, price) {
         const market = this.markets[symbol];
-        const wavesPrecision = this.safeInteger(this.options, 'wavesPrecision', 8);
-        const difference = market['precision']['amount'] - market['precision']['price'];
-        return this.parseToInt(parseFloat(this.toPrecision(price, wavesPrecision - difference)));
+        const wavesPrecision = this.safeString(this.options, 'wavesPrecision', '8');
+        const amount = this.numberToString(market['precision']['amount']);
+        const precisionPrice = this.numberToString(market['precision']['price']);
+        const difference = Precise["default"].stringSub(amount, precisionPrice);
+        const precision = Precise["default"].stringSub(wavesPrecision, difference);
+        const pricePrecision = this.toPrecision(price, precision).toString();
+        return this.parseToInt(parseFloat(pricePrecision));
     }
     customAmountToPrecision(symbol, amount) {
-        return this.parseToInt(parseFloat(this.toPrecision(amount, this.markets[symbol]['precision']['amount'])));
+        const amountPrecision = this.numberToString(this.toPrecision(amount, this.numberToString(this.markets[symbol]['precision']['amount'])));
+        return this.parseToInt(parseFloat(amountPrecision));
     }
     currencyToPrecision(code, amount, networkCode = undefined) {
-        return this.parseToInt(parseFloat(this.toPrecision(amount, this.currencies[code]['precision'])));
+        const amountPrecision = this.numberToString(this.toPrecision(amount, this.currencies[code]['precision']));
+        return this.parseToInt(parseFloat(amountPrecision));
     }
     fromPrecision(amount, scale) {
         if (amount === undefined) {
@@ -1226,11 +1245,11 @@ class wavesexchange extends wavesexchange$1 {
         return precise.toString();
     }
     toPrecision(amount, scale) {
-        const amountString = amount.toString();
+        const amountString = this.numberToString(amount);
         const precise = new Precise["default"](amountString);
-        precise.decimals = precise.decimals - scale;
+        precise.decimals = Precise["default"].stringSub(precise.decimals, scale);
         precise.reduce();
-        return precise.toString();
+        return precise;
     }
     currencyFromPrecision(currency, amount) {
         const scale = this.currencies[currency]['precision'];

package/js/ccxt.d.ts

@@ -4,7 +4,7 @@ import * as functions from './src/base/functions.js';
 import * as errors from './src/base/errors.js';
 import { Market, Trade, Fee, Ticker, OrderBook, Order, Transaction, Tickers, Currency, Balance, DepositAddress, WithdrawalResponse, DepositAddressResponse, OHLCV, Balances, PartialBalances, Dictionary, MinMax } from './src/base/types.js';
 import { BaseError, ExchangeError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, NotSupported, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, AuthenticationError, AddressPending } from './src/base/errors.js';
-declare const version = "4.0.65";
+declare const version = "4.0.67";
 import ace from './src/ace.js';
 import alpaca from './src/alpaca.js';
 import ascendex from './src/ascendex.js';

package/js/ccxt.js

@@ -38,7 +38,7 @@ import * as errors from './src/base/errors.js';
 import { BaseError, ExchangeError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, NotSupported, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, AuthenticationError, AddressPending } from './src/base/errors.js';
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.0.66';
+const version = '4.0.68';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

package/js/src/base/Exchange.js

@@ -1295,7 +1295,7 @@ export default class Exchange {
         throw new NotSupported(this.id + ' fetchOrderBook() is not supported yet');
     }
     async fetchRestOrderBookSafe(symbol, limit = undefined, params = {}) {
-        const fetchSnapshotMaxRetries = this.handleOption('watchOrderBook', 'snapshotMaxRetries', 3);
+        const fetchSnapshotMaxRetries = this.handleOption('watchOrderBook', 'maxRetries', 3);
         for (let i = 0; i < fetchSnapshotMaxRetries; i++) {
             try {
                 const orderBook = await this.fetchOrderBook(symbol, limit, params);

package/js/src/binance.js

@@ -1504,6 +1504,7 @@ export default class binance extends Exchange {
                     '-4045': ExchangeError,
                     '-4046': AuthenticationError,
                     '-4047': BadRequest,
+                    '-4054': BadRequest,
                     '-5001': BadRequest,
                     '-5002': InsufficientFunds,
                     '-5003': InsufficientFunds,

package/js/src/bitget.js

@@ -2454,8 +2454,9 @@ export default class bitget extends Exchange {
             'symbol': market['id'],
         };
         const until = this.safeInteger2(params, 'until', 'till');
+        const limitIsUndefined = (limit === undefined);
         if (limit === undefined) {
-            limit = 1000;
+            limit = 200;
         }
         request['limit'] = limit;
         const marketType = market['spot'] ? 'spot' : 'swap';
@@ -2501,6 +2502,9 @@ export default class bitget extends Exchange {
             const method = this.safeString(params, 'method', defaultSpotMethod);
             params = this.omit(params, 'method');
             if (method === 'publicSpotGetMarketCandles') {
+                if (limitIsUndefined) {
+                    request['limit'] = 1000;
+                }
                 response = await this.publicSpotGetMarketCandles(this.extend(request, params));
             }
             else if (method === 'publicSpotGetMarketHistoryCandles') {
@@ -2520,6 +2524,9 @@ export default class bitget extends Exchange {
                 response = await this.publicMixGetMarketHistoryIndexCandles(this.extend(request, params));
             }
             else if (swapMethod === 'publicMixGetMarketCandles') {
+                if (limitIsUndefined) {
+                    request['limit'] = 1000;
+                }
                 response = await this.publicMixGetMarketCandles(this.extend(request, params));
             }
             else if (swapMethod === 'publicMixGetMarketHistoryCandles') {

package/js/src/bybit.js

@@ -1388,6 +1388,16 @@ export default class bybit extends Exchange {
             }
             else if (symbol in this.markets_by_id) {
                 const markets = this.markets_by_id[symbol];
+                let defaultType = this.safeString2(this.options, 'defaultType', 'defaultSubType', 'spot');
+                if (defaultType === 'future') {
+                    defaultType = 'contract';
+                }
+                for (let i = 0; i < markets.length; i++) {
+                    const market = markets[i];
+                    if (market[defaultType]) {
+                        return market;
+                    }
+                }
                 return markets[0];
             }
             else if ((symbol.indexOf('-C') > -1) || (symbol.indexOf('-P') > -1)) {
@@ -2084,10 +2094,10 @@ export default class bybit extends Exchange {
         //         "change24h": "86"
         //     }
         //
+        const isSpot = this.safeString(ticker, 'openInterestValue') === undefined;
         const timestamp = this.safeInteger(ticker, 'time');
         const marketId = this.safeString(ticker, 'symbol');
-        const defaultType = this.safeString(this.options, 'defaultType', 'spot');
-        const type = this.safeString(market, 'type', defaultType);
+        const type = isSpot ? 'spot' : 'contract';
         market = this.safeMarket(marketId, market, undefined, type);
         const symbol = this.safeSymbol(marketId, market, undefined, type);
         const last = this.safeString(ticker, 'lastPrice');