ccxt 4.0.91 → 4.0.94

package/dist/ccxt.browser.js

@@ -13861,6 +13861,7 @@ class bigone extends _abstract_bigone_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             'options': {
                 'accountsByType': {
                     'spot': 'SPOT',
+                    'fund': 'FUND',
                     'funding': 'FUND',
                     'future': 'CONTRACT',
                     'swap': 'CONTRACT',
@@ -15320,7 +15321,7 @@ class bigone extends _abstract_bigone_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         const txid = this.safeString(transaction, 'txid');
         const address = this.safeString(transaction, 'target_address');
         const tag = this.safeString(transaction, 'memo');
-        const type = ('customer_id' in transaction) ? 'deposit' : 'withdrawal';
+        const type = ('customer_id' in transaction) ? 'withdrawal' : 'deposit';
         return {
             'info': transaction,
             'id': id,
@@ -15449,10 +15450,11 @@ class bigone extends _abstract_bigone_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bigone#transfer
          * @description transfer currency internally between wallets on the same account
+         * @see https://open.big.one/docs/spot_transfer.html#transfer-of-user
          * @param {string} code unified currency code
          * @param {float} amount amount to transfer
-         * @param {string} fromAccount account to transfer from
-         * @param {string} toAccount account to transfer to
+         * @param {string} fromAccount 'SPOT', 'FUND', or 'CONTRACT'
+         * @param {string} toAccount 'SPOT', 'FUND', or 'CONTRACT'
          * @param {object} [params] extra parameters specific to the bigone api endpoint
          * @returns {object} a [transfer structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#transfer-structure}
          */
@@ -23359,7 +23361,7 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
          * @param {int} [since] timestamp in ms
          * @param {int} [limit] number of records, default 100, max 100
          * @param {object} [params] exchange specific params
-         * @returns {object[]} a list of [settlement history objects]
+         * @returns {object[]} a list of [settlement history objects]{@link https://github.com/ccxt/ccxt/wiki/Manual#settlement-history-structure}
          */
         await this.loadMarkets();
         const market = (symbol === undefined) ? undefined : this.market(symbol);
@@ -49394,42 +49396,42 @@ class bitopro extends _abstract_bitopro_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
             },
             'api': {
                 'public': {
-                    'get': [
-                        'order-book/{pair}',
-                        'tickers',
-                        'tickers/{pair}',
-                        'trades/{pair}',
-                        'provisioning/currencies',
-                        'provisioning/trading-pairs',
-                        'provisioning/limitations-and-fees',
-                        'trading-history/{pair}',
-                    ],
+                    'get': {
+                        'order-book/{pair}': 1,
+                        'tickers': 1,
+                        'tickers/{pair}': 1,
+                        'trades/{pair}': 1,
+                        'provisioning/currencies': 1,
+                        'provisioning/trading-pairs': 1,
+                        'provisioning/limitations-and-fees': 1,
+                        'trading-history/{pair}': 1,
+                    },
                 },
                 'private': {
-                    'get': [
-                        'accounts/balance',
-                        'orders/history',
-                        'orders/all/{pair}',
-                        'orders/trades/{pair}',
-                        'orders/{pair}/{orderId}',
-                        'wallet/withdraw/{currency}/{serial}',
-                        'wallet/withdraw/{currency}/id/{id}',
-                        'wallet/depositHistory/{currency}',
-                        'wallet/withdrawHistory/{currency}',
-                    ],
-                    'post': [
-                        'orders/{pair}',
-                        'orders/batch',
-                        'wallet/withdraw/{currency}',
-                    ],
-                    'put': [
-                        'orders',
-                    ],
-                    'delete': [
-                        'orders/{pair}/{id}',
-                        'orders/all',
-                        'orders/{pair}',
-                    ],
+                    'get': {
+                        'accounts/balance': 1,
+                        'orders/history': 1,
+                        'orders/all/{pair}': 1,
+                        'orders/trades/{pair}': 1,
+                        'orders/{pair}/{orderId}': 1,
+                        'wallet/withdraw/{currency}/{serial}': 1,
+                        'wallet/withdraw/{currency}/id/{id}': 1,
+                        'wallet/depositHistory/{currency}': 1,
+                        'wallet/withdrawHistory/{currency}': 1,
+                    },
+                    'post': {
+                        'orders/{pair}': 1 / 2,
+                        'orders/batch': 20 / 3,
+                        'wallet/withdraw/{currency}': 10, // 60/m => 1/s => 10/1 = 10
+                    },
+                    'put': {
+                        'orders': 5, // 2/s => 10/2 = 5
+                    },
+                    'delete': {
+                        'orders/{pair}/{id}': 2 / 3,
+                        'orders/all': 5,
+                        'orders/{pair}': 5, // 2/s => 10/2 = 5
+                    },
                 },
             },
             'fees': {
@@ -80379,7 +80381,7 @@ class bybit extends _abstract_bybit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
          * @param {int} [since] timestamp in ms
          * @param {int} [limit] number of records
          * @param {object} [params] exchange specific params
-         * @returns {object[]} a list of [settlement history objects]
+         * @returns {object[]} a list of [settlement history objects]{@link https://github.com/ccxt/ccxt/wiki/Manual#settlement-history-structure}
          */
         await this.loadMarkets();
         const request = {};
@@ -100938,7 +100940,7 @@ class cryptocom extends _abstract_cryptocom_js__WEBPACK_IMPORTED_MODULE_0__/* ["
          * @param {int} [limit] number of records
          * @param {object} [params] exchange specific params
          * @param {int} [params.type] 'future', 'option'
-         * @returns {object[]} a list of [settlement history objects]
+         * @returns {object[]} a list of [settlement history objects]{@link https://github.com/ccxt/ccxt/wiki/Manual#settlement-history-structure}
          */
         await this.loadMarkets();
         let market = undefined;
@@ -106188,7 +106190,7 @@ class delta extends _abstract_delta_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
          * @param {int} [since] timestamp in ms
          * @param {int} [limit] number of records
          * @param {object} [params] exchange specific params
-         * @returns {object[]} a list of [settlement history objects]
+         * @returns {object[]} a list of [settlement history objects]{@link https://github.com/ccxt/ccxt/wiki/Manual#settlement-history-structure}
          */
         await this.loadMarkets();
         let market = undefined;
@@ -115898,6 +115900,7 @@ class gate extends _abstract_gate_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
                             'spot/orders/{order_id}': 1.5,
                         },
                         'post': {
+                            'account_mode': 1.5,
                             'loans': 1.5,
                             'spot/orders': 1.5,
                         },
@@ -121408,7 +121411,7 @@ class gate extends _abstract_gate_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
          * @param {int} [since] timestamp in ms
          * @param {int} [limit] number of records
          * @param {object} [params] exchange specific params
-         * @returns {object[]} a list of [settlement history objects]
+         * @returns {object[]} a list of [settlement history objects]{@link https://github.com/ccxt/ccxt/wiki/Manual#settlement-history-structure}
          */
         this.checkRequiredSymbol('fetchSettlementHistory', symbol);
         await this.loadMarkets();
@@ -126897,6 +126900,7 @@ class hollaex extends _abstract_hollaex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
                 'createMarketBuyOrder': true,
                 'createMarketSellOrder': true,
                 'createOrder': true,
+                'createPostOnlyOrder': true,
                 'createReduceOnlyOrder': false,
                 'createStopLimitOrder': true,
                 'createStopMarketOrder': true,
@@ -127985,6 +127989,8 @@ class hollaex extends _abstract_hollaex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
          * @param {float} amount how much of currency you want to trade in units of base currency
          * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
          * @param {object} [params] extra parameters specific to the hollaex api endpoint
+         * @param {float} [params.triggerPrice] the price at which a trigger order is triggered at
+         * @param {bool} [params.postOnly] if true, the order will only be posted to the order book and not executed immediately
          * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
          */
         await this.loadMarkets();
@@ -133550,10 +133556,10 @@ class huobi extends _abstract_huobi_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
             }
         }
         else {
-            const clientOrderId = this.safeString2(params, 'client_order_id', 'clientOrderId');
+            const clientOrderId = this.safeInteger2(params, 'client_order_id', 'clientOrderId');
             if (clientOrderId !== undefined) {
                 request['client_order_id'] = clientOrderId;
-                params = this.omit(params, ['client_order_id', 'clientOrderId']);
+                params = this.omit(params, ['clientOrderId']);
             }
             if (type === 'limit' || type === 'ioc' || type === 'fok' || type === 'post_only') {
                 request['price'] = this.priceToPrecision(symbol, price);
@@ -136601,7 +136607,7 @@ class huobi extends _abstract_huobi_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
          * @param {int} [params.until] timestamp in ms, value range = start_time -> current time，default = current time
          * @param {int} [params.page_index] page index, default page 1 if not filled
          * @param {int} [params.code] unified currency code, can be used when symbol is undefined
-         * @returns A list of settlement history objects
+         * @returns {object[]} a list of [settlement history objects]{@link https://github.com/ccxt/ccxt/wiki/Manual#settlement-history-structure}
          */
         const code = this.safeString(params, 'code');
         const until = this.safeInteger2(params, 'until', 'till');
@@ -180076,7 +180082,7 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                 else {
                     request['slOrdPx'] = '-1'; // market sl order
                 }
-                const stopLossTriggerPriceType = this.safeString2(stopLoss, 'triggerPriceType', 'slTriggerPxType');
+                const stopLossTriggerPriceType = this.safeString2(stopLoss, 'triggerPriceType', 'slTriggerPxType', 'last');
                 if (stopLossTriggerPriceType !== undefined) {
                     if ((stopLossTriggerPriceType !== 'last') && (stopLossTriggerPriceType !== 'index') && (stopLossTriggerPriceType !== 'mark')) {
                         throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder(this.id + ' createOrder() stop loss trigger price type must be one of "last", "index" or "mark"');
@@ -180116,7 +180122,7 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                 else {
                     request['tpOrdPx'] = '-1'; // market tp order
                 }
-                const takeProfitTriggerPriceType = this.safeString2(stopLoss, 'triggerPriceType', 'tpTriggerPxType');
+                const takeProfitTriggerPriceType = this.safeString2(takeProfit, 'triggerPriceType', 'tpTriggerPxType', 'last');
                 if (takeProfitTriggerPriceType !== undefined) {
                     if ((takeProfitTriggerPriceType !== 'last') && (takeProfitTriggerPriceType !== 'index') && (takeProfitTriggerPriceType !== 'mark')) {
                         throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder(this.id + ' createOrder() take profit trigger price type must be one of "last", "index" or "mark"');
@@ -184111,7 +184117,7 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @param {int} [since] timestamp in ms
          * @param {int} [limit] number of records
          * @param {object} [params] exchange specific params
-         * @returns {object[]} a list of [settlement history objects]
+         * @returns {object[]} a list of [settlement history objects]{@link https://github.com/ccxt/ccxt/wiki/Manual#settlement-history-structure}
          */
         this.checkRequiredSymbol('fetchSettlementHistory', symbol);
         await this.loadMarkets();
@@ -195371,8 +195377,8 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         for (let i = 0; i < symbols.length; i++) {
             const symbol = symbols[i];
             const market = this.market(symbol);
-            const messageHash = market['lowercaseId'] + '@' + name + '@' + watchOrderBookRate + 'ms';
-            subParams.push(messageHash);
+            const symbolHash = market['lowercaseId'] + '@' + name + '@' + watchOrderBookRate + 'ms';
+            subParams.push(symbolHash);
         }
         const request = {
             'method': 'SUBSCRIBE',
@@ -195586,7 +195592,7 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                 delete this.orderbooks[symbol];
             }
             this.orderbooks[symbol] = this.orderBook({}, limit);
-            subscription['symbol'] = symbol;
+            subscription = this.extend(subscription, { 'symbol': symbol });
             // fetch the snapshot in a separate async call
             this.spawn(this.fetchOrderBookSnapshot, client, message, subscription);
         }
@@ -218678,10 +218684,14 @@ class gemini extends _gemini_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
 /* harmony export */   "Z": () => (/* binding */ hitbtc)
 /* harmony export */ });
 /* harmony import */ var _hitbtc_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4714);
-/* harmony import */ var _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3020);
+/* harmony import */ var _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3020);
+/* harmony import */ var _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1372);
+/* harmony import */ var _base_errors_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6689);
 //  ---------------------------------------------------------------------------
 
 
+
+
 //  ---------------------------------------------------------------------------
 class hitbtc extends _hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -218689,145 +218699,245 @@ class hitbtc extends _hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
             'has': {
                 'ws': true,
                 'watchTicker': true,
-                'watchTickers': false,
+                'watchTickers': true,
                 'watchTrades': true,
                 'watchOrderBook': true,
-                'watchBalance': false,
+                'watchBalance': true,
+                'watchOrders': true,
                 'watchOHLCV': true,
+                'watchMyTrades': false,
             },
             'urls': {
                 'api': {
-                    'ws': 'wss://api.hitbtc.com/api/2/ws',
+                    'ws': {
+                        'public': 'wss://api.hitbtc.com/api/3/ws/public',
+                        'private': 'wss://api.hitbtc.com/api/3/ws/trading',
+                    },
                 },
             },
             'options': {
                 'tradesLimit': 1000,
-                'methods': {
-                    'orderbook': 'subscribeOrderbook',
-                    'ticker': 'subscribeTicker',
-                    'trades': 'subscribeTrades',
-                    'ohlcv': 'subscribeCandles',
+                'watchTicker': {
+                    'method': 'ticker/{speed}', // 'ticker/{speed}' or 'ticker/price/{speed}'
+                },
+                'watchTickers': {
+                    'method': 'ticker/{speed}', // 'ticker/{speed}','ticker/price/{speed}', 'ticker/{speed}/batch', or 'ticker/{speed}/price/batch''
                 },
+                'watchOrderBook': {
+                    'method': 'orderbook/full', // 'orderbook/full', 'orderbook/{depth}/{speed}', 'orderbook/{depth}/{speed}/batch', 'orderbook/top/{speed}', or 'orderbook/top/{speed}/batch'
+                },
+            },
+            'timeframes': {
+                '1m': 'M1',
+                '3m': 'M3',
+                '5m': 'M5',
+                '15m': 'M15',
+                '30m': 'M30',
+                '1h': 'H1',
+                '4h': 'H4',
+                '1d': 'D1',
+                '1w': 'D7',
+                '1M': '1M',
+            },
+            'streaming': {
+                'keepAlive': 4000,
             },
         });
     }
-    async watchPublic(symbol, channel, timeframe = undefined, params = {}) {
+    async authenticate() {
+        /**
+         * @ignore
+         * @method
+         * @description authenticates the user to access private web socket channels
+         * @see https://api.hitbtc.com/#socket-authentication
+         * @returns {object} response from exchange
+         */
+        this.checkRequiredCredentials();
+        const url = this.urls['api']['ws']['private'];
+        const messageHash = 'authenticated';
+        const client = this.client(url);
+        const future = client.future(messageHash);
+        const authenticated = this.safeValue(client.subscriptions, messageHash);
+        if (authenticated === undefined) {
+            const timestamp = this.milliseconds();
+            const signature = this.hmac(this.encode(this.numberToString(timestamp)), this.encode(this.secret), _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_1__/* .sha256 */ .J, 'hex');
+            const request = {
+                'method': 'login',
+                'params': {
+                    'type': 'HS256',
+                    'api_key': this.apiKey,
+                    'timestamp': timestamp,
+                    'signature': signature,
+                },
+            };
+            this.watch(url, messageHash, request, messageHash);
+            //
+            //    {
+            //        jsonrpc: '2.0',
+            //        result: true
+            //    }
+            //
+            //    # Failure to return results
+            //
+            //    {
+            //        jsonrpc: '2.0',
+            //        error: {
+            //            code: 1002,
+            //            message: 'Authorization is required or has been failed',
+            //            description: 'invalid signature format'
+            //        }
+            //    }
+            //
+        }
+        return future;
+    }
+    async subscribePublic(name, symbols = undefined, params = {}) {
+        /**
+         * @ignore
+         * @method
+         * @param {string} name websocket endpoint name
+         * @param {[string]} [symbols] unified CCXT symbol(s)
+         * @param {object} [params] extra parameters specific to the hitbtc api
+         * @returns
+         */
         await this.loadMarkets();
-        const marketId = this.marketId(symbol);
-        const url = this.urls['api']['ws'];
-        let messageHash = channel + ':' + marketId;
-        if (timeframe !== undefined) {
-            messageHash += ':' + timeframe;
+        const url = this.urls['api']['ws']['public'];
+        let messageHash = name;
+        if (symbols !== undefined) {
+            messageHash = messageHash + '::' + symbols.join(',');
         }
-        const methods = this.safeValue(this.options, 'methods', {});
-        const method = this.safeString(methods, channel, channel);
-        const requestId = this.nonce();
         const subscribe = {
-            'method': method,
-            'params': {
-                'symbol': marketId,
-            },
-            'id': requestId,
+            'method': 'subscribe',
+            'id': this.nonce(),
+            'ch': name,
         };
-        const request = this.deepExtend(subscribe, params);
+        const request = this.extend(subscribe, params);
         return await this.watch(url, messageHash, request, messageHash);
     }
+    async subscribePrivate(name, symbol = undefined, params = {}) {
+        /**
+         * @ignore
+         * @method
+         * @param {string} name websocket endpoint name
+         * @param {string} [symbol] unified CCXT symbol
+         * @param {object} [params] extra parameters specific to the hitbtc api
+         * @returns
+         */
+        await this.loadMarkets();
+        await this.authenticate();
+        const url = this.urls['api']['ws']['private'];
+        const splitName = name.split('_subscribe');
+        let messageHash = this.safeString(splitName, 0);
+        if (symbol !== undefined) {
+            messageHash = messageHash + '::' + symbol;
+        }
+        const subscribe = {
+            'method': name,
+            'params': params,
+            'id': this.nonce(),
+        };
+        return await this.watch(url, messageHash, subscribe, messageHash);
+    }
     async watchOrderBook(symbol, limit = undefined, params = {}) {
         /**
          * @method
          * @name hitbtc#watchOrderBook
          * @description watches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+         * @see https://api.hitbtc.com/#subscribe-to-full-order-book
+         * @see https://api.hitbtc.com/#subscribe-to-partial-order-book
+         * @see https://api.hitbtc.com/#subscribe-to-partial-order-book-in-batches
+         * @see https://api.hitbtc.com/#subscribe-to-top-of-book
+         * @see https://api.hitbtc.com/#subscribe-to-top-of-book-in-batches
          * @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
          * @param {object} [params] extra parameters specific to the hitbtc api endpoint
-         * @returns {object} A dictionary of [order book structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-book-structure} indexed by market symbols
+         * @param {string} [params.method] 'orderbook/full', 'orderbook/{depth}/{speed}', 'orderbook/{depth}/{speed}/batch', 'orderbook/top/{speed}', or 'orderbook/top/{speed}/batch'
+         * @param {int} [params.depth] 5 , 10, or 20 (default)
+         * @param {int} [params.speed] 100 (default), 500, or 1000
+         * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
          */
-        const orderbook = await this.watchPublic(symbol, 'orderbook', undefined, params);
-        return orderbook.limit();
-    }
-    handleOrderBookSnapshot(client, message) {
-        //
-        //     {
-        //         jsonrpc: "2.0",
-        //         method: "snapshotOrderbook",
-        //         params: {
-        //             ask: [
-        //                 { price: "6927.75", size: "0.11991" },
-        //                 { price: "6927.76", size: "0.06200" },
-        //                 { price: "6927.85", size: "0.01000" },
-        //             ],
-        //             bid: [
-        //                 { price: "6926.18", size: "0.16898" },
-        //                 { price: "6926.17", size: "0.06200" },
-        //                 { price: "6925.97", size: "0.00125" },
-        //             ],
-        //             symbol: "BTCUSD",
-        //             sequence: 494854,
-        //             timestamp: "2020-04-03T08:58:53.460Z"
-        //         }
-        //     }
-        //
-        const params = this.safeValue(message, 'params', {});
-        const marketId = this.safeString(params, 'symbol');
-        const market = this.safeMarket(marketId);
-        const symbol = market['symbol'];
-        const timestamp = this.parse8601(this.safeString(params, 'timestamp'));
-        const nonce = this.safeInteger(params, 'sequence');
-        if (symbol in this.orderbooks) {
-            delete this.orderbooks[symbol];
+        const options = this.safeValue(this.options, 'watchOrderBook');
+        const defaultMethod = this.safeString(options, 'method', 'orderbook/full');
+        let name = this.safeString2(params, 'method', 'defaultMethod', defaultMethod);
+        const depth = this.safeString(params, 'depth', '20');
+        const speed = this.safeString(params, 'depth', '100');
+        if (name === 'orderbook/{depth}/{speed}') {
+            name = 'orderbook/D' + depth + '/' + speed + 'ms';
         }
-        const snapshot = this.parseOrderBook(params, symbol, timestamp, 'bid', 'ask', 'price', 'size');
-        const orderbook = this.orderBook(snapshot);
-        orderbook['nonce'] = nonce;
-        this.orderbooks[symbol] = orderbook;
-        const messageHash = 'orderbook:' + marketId;
-        client.resolve(orderbook, messageHash);
+        else if (name === 'orderbook/{depth}/{speed}/batch') {
+            name = 'orderbook/D' + depth + '/' + speed + 'ms/batch';
+        }
+        else if (name === 'orderbook/top/{speed}') {
+            name = 'orderbook/top/' + speed + 'ms';
+        }
+        else if (name === 'orderbook/top/{speed}/batch') {
+            name = 'orderbook/top/' + speed + 'ms/batch';
+        }
+        const market = this.market(symbol);
+        const request = {
+            'params': {
+                'symbols': [market['id']],
+            },
+        };
+        const orderbook = await this.subscribePublic(name, [symbol], this.deepExtend(request, params));
+        return orderbook.limit();
     }
-    handleOrderBookUpdate(client, message) {
+    handleOrderBook(client, message) {
         //
-        //     {
-        //         jsonrpc: "2.0",
-        //         method: "updateOrderbook",
-        //         params: {
-        //             ask: [
-        //                 { price: "6940.65", size: "0.00000" },
-        //                 { price: "6940.66", size: "6.00000" },
-        //                 { price: "6943.52", size: "0.04707" },
-        //             ],
-        //             bid: [
-        //                 { price: "6938.40", size: "0.11991" },
-        //                 { price: "6938.39", size: "0.00073" },
-        //                 { price: "6936.65", size: "0.00000" },
-        //             ],
-        //             symbol: "BTCUSD",
-        //             sequence: 497872,
-        //             timestamp: "2020-04-03T09:03:56.685Z"
-        //         }
-        //     }
+        //    {
+        //        "ch": "orderbook/full",                 // Channel
+        //        "snapshot": {
+        //            "ETHBTC": {
+        //                "t": 1626866578796,             // Timestamp in milliseconds
+        //                "s": 27617207,                  // Sequence number
+        //                "a": [                          // Asks
+        //                    ["0.060506", "0"],
+        //                    ["0.060549", "12.6431"],
+        //                    ["0.060570", "0"],
+        //                    ["0.060612", "0"]
+        //                ],
+        //                "b": [                          // Bids
+        //                    ["0.060439", "4.4095"],
+        //                    ["0.060414", "0"],
+        //                    ["0.060407", "7.3349"],
+        //                    ["0.060390", "0"]
+        //                ]
+        //            }
+        //        }
+        //    }
         //
-        const params = this.safeValue(message, 'params', {});
-        const marketId = this.safeString(params, 'symbol');
-        const market = this.safeMarket(marketId);
-        const symbol = market['symbol'];
-        if (symbol in this.orderbooks) {
-            const timestamp = this.parse8601(this.safeString(params, 'timestamp'));
-            const nonce = this.safeInteger(params, 'sequence');
+        const data = this.safeValue2(message, 'snapshot', 'update', {});
+        const marketIds = Object.keys(data);
+        const channel = this.safeString(message, 'ch');
+        for (let i = 0; i < marketIds.length; i++) {
+            const marketId = marketIds[i];
+            const market = this.safeMarket(marketId);
+            const symbol = market['symbol'];
+            const item = data[marketId];
+            const messageHash = channel + '::' + symbol;
+            if (!(symbol in this.orderbooks)) {
+                const subscription = this.safeValue(client.subscriptions, messageHash, {});
+                const limit = this.safeInteger(subscription, 'limit');
+                this.orderbooks[symbol] = this.orderBook({}, limit);
+            }
+            const timestamp = this.safeInteger(item, 't');
+            const nonce = this.safeInteger(item, 's');
             const orderbook = this.orderbooks[symbol];
-            const asks = this.safeValue(params, 'ask', []);
-            const bids = this.safeValue(params, 'bid', []);
+            const asks = this.safeValue(item, 'a', []);
+            const bids = this.safeValue(item, 'b', []);
             this.handleDeltas(orderbook['asks'], asks);
             this.handleDeltas(orderbook['bids'], bids);
             orderbook['timestamp'] = timestamp;
             orderbook['datetime'] = this.iso8601(timestamp);
             orderbook['nonce'] = nonce;
+            orderbook['symbol'] = symbol;
             this.orderbooks[symbol] = orderbook;
-            const messageHash = 'orderbook:' + marketId;
             client.resolve(orderbook, messageHash);
         }
     }
     handleDelta(bookside, delta) {
-        const price = this.safeFloat(delta, 'price');
-        const amount = this.safeFloat(delta, 'size');
+        const price = this.safeNumber(delta, 0);
+        const amount = this.safeNumber(delta, 1);
         bookside.store(price, amount);
     }
     handleDeltas(bookside, deltas) {
@@ -218840,192 +218950,714 @@ class hitbtc extends _hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
          * @method
          * @name hitbtc#watchTicker
          * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @see https://api.hitbtc.com/#subscribe-to-ticker
+         * @see https://api.hitbtc.com/#subscribe-to-ticker-in-batches
+         * @see https://api.hitbtc.com/#subscribe-to-mini-ticker
+         * @see https://api.hitbtc.com/#subscribe-to-mini-ticker-in-batches
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the hitbtc api endpoint
-         * @returns {object} a [ticker structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#ticker-structure}
+         * @param {string} [params.method] 'ticker/{speed}' (default), or 'ticker/price/{speed}'
+         * @param {string} [params.speed] '1s' (default), or '3s'
+         * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
+         */
+        const options = this.safeValue(this.options, 'watchTicker');
+        const defaultMethod = this.safeString(options, 'method', 'ticker/{speed}');
+        const method = this.safeString2(params, 'method', 'defaultMethod', defaultMethod);
+        const speed = this.safeString(params, 'speed', '1s');
+        const name = this.implodeParams(method, { 'speed': speed });
+        params = this.omit(params, ['method', 'speed']);
+        const market = this.market(symbol);
+        const request = {
+            'params': {
+                'symbols': [market['id']],
+            },
+        };
+        return await this.subscribePublic(name, [symbol], this.deepExtend(request, params));
+    }
+    async watchTickers(symbols = undefined, params = {}) {
+        /**
+         * @method
+         * @name hitbtc#watchTicker
+         * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @param {string} symbol unified symbol of the market to fetch the ticker for
+         * @param {object} params extra parameters specific to the hitbtc api endpoint
+         * @param {string} params.method 'ticker/{speed}' (default),'ticker/price/{speed}', 'ticker/{speed}/batch', or 'ticker/{speed}/price/batch''
+         * @param {string} params.speed '1s' (default), or '3s'
+         * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/en/latest/manual.html#ticker-structure}
          */
-        return await this.watchPublic(symbol, 'ticker', undefined, params);
+        await this.loadMarkets();
+        const options = this.safeValue(this.options, 'watchTicker');
+        const defaultMethod = this.safeString(options, 'method', 'ticker/{speed}');
+        const method = this.safeString2(params, 'method', 'defaultMethod', defaultMethod);
+        const speed = this.safeString(params, 'speed', '1s');
+        const name = this.implodeParams(method, { 'speed': speed });
+        params = this.omit(params, ['method', 'speed']);
+        const marketIds = [];
+        if (symbols === undefined) {
+            marketIds.push('*');
+        }
+        else {
+            for (let i = 0; i < symbols.length; i++) {
+                const marketId = this.marketId(symbols[i]);
+                marketIds.push(marketId);
+            }
+        }
+        const request = {
+            'params': {
+                'symbols': marketIds,
+            },
+        };
+        const tickers = await this.subscribePublic(name, symbols, this.deepExtend(request, params));
+        if (this.newUpdates) {
+            return tickers;
+        }
+        return this.filterByArray(this.tickers, 'symbol', symbols);
     }
     handleTicker(client, message) {
         //
-        //     {
-        //         jsonrpc: '2.0',
-        //         method: 'ticker',
-        //         params: {
-        //             ask: '6983.22',
-        //             bid: '6980.77',
-        //             last: '6980.77',
-        //             open: '6650.05',
-        //             low: '6606.45',
-        //             high: '7223.11',
-        //             volume: '79264.33941',
-        //             volumeQuote: '540183372.5134832',
-        //             timestamp: '2020-04-03T10:02:18.943Z',
-        //             symbol: 'BTCUSD'
-        //         }
-        //     }
+        //    {
+        //        "ch": "ticker/1s",
+        //        "data": {
+        //            "ETHBTC": {
+        //                "t": 1614815872000,             // Timestamp in milliseconds
+        //                "a": "0.031175",                // Best ask
+        //                "A": "0.03329",                 // Best ask quantity
+        //                "b": "0.031148",                // Best bid
+        //                "B": "0.10565",                 // Best bid quantity
+        //                "c": "0.031210",                // Last price
+        //                "o": "0.030781",                // Open price
+        //                "h": "0.031788",                // High price
+        //                "l": "0.030733",                // Low price
+        //                "v": "62.587",                  // Base asset volume
+        //                "q": "1.951420577",             // Quote asset volume
+        //                "p": "0.000429",                // Price change
+        //                "P": "1.39",                    // Price change percent
+        //                "L": 1182694927                 // Last trade identifier
+        //            }
+        //        }
+        //    }
         //
-        const params = this.safeValue(message, 'params');
-        const marketId = this.safeValue(params, 'symbol');
-        const market = this.safeMarket(marketId);
-        const symbol = market['symbol'];
-        const result = this.parseTicker(params, market);
-        this.tickers[symbol] = result;
-        const method = this.safeValue(message, 'method');
-        const messageHash = method + ':' + marketId;
-        client.resolve(result, messageHash);
+        //    {
+        //        "ch": "ticker/price/1s",
+        //        "data": {
+        //            "BTCUSDT": {
+        //                "t": 1614815872030,
+        //                "o": "32636.79",
+        //                "c": "32085.51",
+        //                "h": "33379.92",
+        //                "l": "30683.28",
+        //                "v": "11.90667",
+        //                "q": "384081.1955629"
+        //            }
+        //        }
+        //    }
+        //
+        const data = this.safeValue(message, 'data', {});
+        const marketIds = Object.keys(data);
+        const channel = this.safeString(message, 'ch');
+        const newTickers = [];
+        for (let i = 0; i < marketIds.length; i++) {
+            const marketId = marketIds[i];
+            const market = this.safeMarket(marketId);
+            const symbol = market['symbol'];
+            const ticker = this.parseWsTicker(data[marketId], market);
+            this.tickers[symbol] = ticker;
+            newTickers.push(ticker);
+            const messageHash = channel + '::' + symbol;
+            client.resolve(this.tickers[symbol], messageHash);
+        }
+        const messageHashes = this.findMessageHashes(client, channel + '::');
+        for (let i = 0; i < messageHashes.length; i++) {
+            const messageHash = messageHashes[i];
+            const parts = messageHash.split('::');
+            const symbolsString = parts[1];
+            const symbols = symbolsString.split(',');
+            const tickers = this.filterByArray(newTickers, 'symbol', symbols);
+            const tickersSymbols = Object.keys(tickers);
+            const numTickers = tickersSymbols.length;
+            if (numTickers > 0) {
+                client.resolve(tickers, messageHash);
+            }
+        }
+        client.resolve(this.tickers, channel);
+        return message;
+    }
+    parseWsTicker(ticker, market = undefined) {
+        //
+        //    {
+        //        "t": 1614815872000,             // Timestamp in milliseconds
+        //        "a": "0.031175",                // Best ask
+        //        "A": "0.03329",                 // Best ask quantity
+        //        "b": "0.031148",                // Best bid
+        //        "B": "0.10565",                 // Best bid quantity
+        //        "c": "0.031210",                // Last price
+        //        "o": "0.030781",                // Open price
+        //        "h": "0.031788",                // High price
+        //        "l": "0.030733",                // Low price
+        //        "v": "62.587",                  // Base asset volume
+        //        "q": "1.951420577",             // Quote asset volume
+        //        "p": "0.000429",                // Price change
+        //        "P": "1.39",                    // Price change percent
+        //        "L": 1182694927                 // Last trade identifier
+        //    }
+        //
+        //    {
+        //        "t": 1614815872030,
+        //        "o": "32636.79",
+        //        "c": "32085.51",
+        //        "h": "33379.92",
+        //        "l": "30683.28",
+        //        "v": "11.90667",
+        //        "q": "384081.1955629"
+        //    }
+        //
+        const timestamp = this.safeInteger(ticker, 't');
+        const symbol = this.safeSymbol(undefined, market);
+        const last = this.safeString(ticker, 'c');
+        return this.safeTicker({
+            'symbol': symbol,
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'high': this.safeString(ticker, 'h'),
+            'low': this.safeString(ticker, 'l'),
+            'bid': this.safeString(ticker, 'b'),
+            'bidVolume': this.safeString(ticker, 'B'),
+            'ask': this.safeString(ticker, 'a'),
+            'askVolume': this.safeString(ticker, 'A'),
+            'vwap': undefined,
+            'open': this.safeString(ticker, 'o'),
+            'close': last,
+            'last': last,
+            'previousClose': undefined,
+            'change': undefined,
+            'percentage': undefined,
+            'average': undefined,
+            'baseVolume': this.safeString(ticker, 'v'),
+            'quoteVolume': this.safeString(ticker, 'q'),
+            'info': ticker,
+        }, market);
     }
     async watchTrades(symbol, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name hitbtc#watchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://api.hitbtc.com/#subscribe-to-trades
          * @param {string} symbol 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 hitbtc api endpoint
          * @returns {object[]} a list of [trade structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#public-trades}
          */
-        const trades = await this.watchPublic(symbol, 'trades', undefined, params);
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        const request = {
+            'params': {
+                'symbols': [market['id']],
+            },
+        };
+        if (limit !== undefined) {
+            request['limit'] = limit;
+        }
+        const trades = await this.subscribePublic('trades', [symbol], this.deepExtend(request, params));
         if (this.newUpdates) {
             limit = trades.getLimit(symbol, limit);
         }
-        return this.filterBySinceLimit(trades, since, limit, 'timestamp', true);
+        return this.filterBySinceLimit(trades, since, limit, 'timestamp');
     }
     handleTrades(client, message) {
         //
-        //     {
-        //         jsonrpc: '2.0',
-        //         method: 'snapshotTrades', // updateTrades
-        //         params: {
-        //             data: [
-        //                 {
-        //                     id: 814145791,
-        //                     price: '6957.20',
-        //                     quantity: '0.02779',
-        //                     side: 'buy',
-        //                     timestamp: '2020-04-03T10:28:20.032Z'
-        //                 },
-        //                 {
-        //                     id: 814145792,
-        //                     price: '6957.20',
-        //                     quantity: '0.12918',
-        //                     side: 'buy',
-        //                     timestamp: '2020-04-03T10:28:20.039Z'
-        //                 },
-        //             ],
-        //             symbol: 'BTCUSD'
-        //         }
-        //     }
+        //    {
+        //        "result": {
+        //            "ch": "trades",                           // Channel
+        //            "subscriptions": ["ETHBTC", "BTCUSDT"]
+        //        },
+        //        "id": 123
+        //    }
         //
-        const params = this.safeValue(message, 'params', {});
-        const data = this.safeValue(params, 'data', []);
-        const marketId = this.safeString(params, 'symbol');
-        const market = this.safeMarket(marketId);
-        const symbol = market['symbol'];
-        const messageHash = 'trades:' + marketId;
-        const tradesLimit = this.safeInteger(this.options, 'tradesLimit', 1000);
-        let stored = this.safeValue(this.trades, symbol);
-        if (stored === undefined) {
-            stored = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_1__/* .ArrayCache */ .ZL(tradesLimit);
-            this.trades[symbol] = stored;
-        }
-        if (Array.isArray(data)) {
-            const trades = this.parseTrades(data, market);
+        // Notification snapshot
+        //
+        //    {
+        //        "ch": "trades",                               // Channel
+        //        "snapshot": {
+        //            "BTCUSDT": [{
+        //                "t": 1626861109494,                   // Timestamp in milliseconds
+        //                "i": 1555634969,                      // Trade identifier
+        //                "p": "30881.96",                      // Price
+        //                "q": "12.66828",                      // Quantity
+        //                "s": "buy"                            // Side
+        //            }]
+        //        }
+        //    }
+        //
+        // Notification update
+        //
+        //    {
+        //        "ch": "trades",
+        //        "update": {
+        //            "BTCUSDT": [{
+        //                "t": 1626861123552,
+        //                "i": 1555634969,
+        //                "p": "30877.68",
+        //                "q": "0.00006",
+        //                "s": "sell"
+        //            }]
+        //        }
+        //    }
+        //
+        const data = this.safeValue2(message, 'snapshot', 'update', {});
+        const marketIds = Object.keys(data);
+        for (let i = 0; i < marketIds.length; i++) {
+            const marketId = marketIds[i];
+            const market = this.safeMarket(marketId);
+            const tradesLimit = this.safeInteger(this.options, 'tradesLimit', 1000);
+            const symbol = market['symbol'];
+            let stored = this.safeValue(this.trades, symbol);
+            if (stored === undefined) {
+                stored = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__/* .ArrayCache */ .ZL(tradesLimit);
+                this.trades[symbol] = stored;
+            }
+            const trades = this.parseWsTrades(data[marketId], market);
             for (let i = 0; i < trades.length; i++) {
                 stored.append(trades[i]);
             }
+            const messageHash = 'trades::' + symbol;
+            client.resolve(stored, messageHash);
         }
-        else {
-            const trade = this.parseTrade(message, market);
-            stored.append(trade);
-        }
-        client.resolve(stored, messageHash);
         return message;
     }
+    parseWsTrades(trades, market = undefined, since = undefined, limit = undefined, params = {}) {
+        trades = this.toArray(trades);
+        let result = [];
+        for (let i = 0; i < trades.length; i++) {
+            const trade = this.extend(this.parseWsTrade(trades[i], market), params);
+            result.push(trade);
+        }
+        result = this.sortBy2(result, 'timestamp', 'id');
+        const symbol = this.safeString(market, 'symbol');
+        return this.filterBySymbolSinceLimit(result, symbol, since, limit);
+    }
+    parseWsTrade(trade, market = undefined) {
+        //
+        //    {
+        //        "t": 1626861123552,       // Timestamp in milliseconds
+        //        "i": 1555634969,          // Trade identifier
+        //        "p": "30877.68",          // Price
+        //        "q": "0.00006",           // Quantity
+        //        "s": "sell"               // Side
+        //    }
+        //
+        const timestamp = this.safeInteger(trade, 't');
+        return this.safeTrade({
+            'info': trade,
+            'id': this.safeString(trade, 'i'),
+            'order': undefined,
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'symbol': this.safeString(market, 'symbol'),
+            'type': undefined,
+            'side': this.safeString(trade, 's'),
+            'takerOrMaker': undefined,
+            'price': this.safeString(trade, 'p'),
+            'amount': this.safeString(trade, 'q'),
+            'cost': undefined,
+            'fee': undefined,
+        }, market);
+    }
     async watchOHLCV(symbol, timeframe = '1m', since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name hitbtc#watchOHLCV
          * @description watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://api.hitbtc.com/#subscribe-to-candles
          * @param {string} symbol unified symbol of the market to fetch OHLCV data for
-         * @param {string} timeframe the length of time each candle represents
-         * @param {int} [since] timestamp in ms of the earliest candle to fetch
-         * @param {int} [limit] the maximum amount of candles to fetch
+         * @param {string} [timeframe] the length of time each candle represents
+         * @param {int} [since] not used by hitbtc watchOHLCV
+         * @param {int} [limit] 0 – 1000, default value = 0 (no history returned)
          * @param {object} [params] extra parameters specific to the hitbtc api endpoint
-         * @returns {int[][]} A list of candles ordered as timestamp, open, high, low, close, volume
+         * @returns {[[int]]} A list of candles ordered as timestamp, open, high, low, close, volume
          */
-        // if (limit === undefined) {
-        //     limit = 100;
-        // }
         const period = this.safeString(this.timeframes, timeframe, timeframe);
+        const name = 'candles/' + period;
+        const market = this.market(symbol);
         const request = {
             'params': {
-                'period': period,
-                // 'limit': limit,
+                'symbols': [market['id']],
             },
         };
-        const requestParams = this.deepExtend(request, params);
-        const ohlcv = await this.watchPublic(symbol, 'ohlcv', period, requestParams);
+        if (limit !== undefined) {
+            request['params']['limit'] = limit;
+        }
+        const ohlcv = await this.subscribePublic(name, [symbol], this.deepExtend(request, params));
         if (this.newUpdates) {
             limit = ohlcv.getLimit(symbol, limit);
         }
-        return this.filterBySinceLimit(ohlcv, since, limit, 0, true);
+        return this.filterBySinceLimit(ohlcv, since, limit, 0);
     }
     handleOHLCV(client, message) {
         //
-        //     {
-        //         jsonrpc: '2.0',
-        //         method: 'snapshotCandles', // updateCandles
-        //         params: {
-        //             data: [
-        //                 {
-        //                     timestamp: '2020-04-05T00:06:00.000Z',
-        //                     open: '6869.40',
-        //                     close: '6867.16',
-        //                     min: '6863.17',
-        //                     max: '6869.4',
-        //                     volume: '0.08947',
-        //                     volumeQuote: '614.4195442'
-        //                 },
-        //                 {
-        //                     timestamp: '2020-04-05T00:07:00.000Z',
-        //                     open: '6867.54',
-        //                     close: '6859.26',
-        //                     min: '6858.85',
-        //                     max: '6867.54',
-        //                     volume: '1.7766',
-        //                     volumeQuote: '12191.5880395'
-        //                 },
-        //             ],
-        //             symbol: 'BTCUSD',
-        //             period: 'M1'
-        //         }
-        //     }
+        //    {
+        //        "ch": "candles/M1",                     // Channel
+        //        "snapshot": {
+        //            "BTCUSDT": [{
+        //                "t": 1626860340000,             // Message timestamp
+        //                "o": "30881.95",                // Open price
+        //                "c": "30890.96",                // Last price
+        //                "h": "30900.8",                 // High price
+        //                "l": "30861.27",                // Low price
+        //                "v": "1.27852",                 // Base asset volume
+        //                "q": "39493.9021811"            // Quote asset volume
+        //            }
+        //            ...
+        //            ]
+        //        }
+        //    }
         //
-        const params = this.safeValue(message, 'params', {});
-        const data = this.safeValue(params, 'data', []);
-        const marketId = this.safeString(params, 'symbol');
-        const market = this.safeMarket(marketId);
-        const symbol = market['symbol'];
-        const period = this.safeString(params, 'period');
+        //    {
+        //        "ch": "candles/M1",
+        //        "update": {
+        //            "ETHBTC": [{
+        //                "t": 1626860880000,
+        //                "o": "0.060711",
+        //                "c": "0.060749",
+        //                "h": "0.060749",
+        //                "l": "0.060711",
+        //                "v": "12.2800",
+        //                "q": "0.7455339675"
+        //          }]
+        //        }
+        //    }
+        //
+        const data = this.safeValue2(message, 'snapshot', 'update', {});
+        const marketIds = Object.keys(data);
+        const channel = this.safeString(message, 'ch');
+        const splitChannel = channel.split('/');
+        const period = this.safeString(splitChannel, 1);
         const timeframe = this.findTimeframe(period);
-        const messageHash = 'ohlcv:' + marketId + ':' + period;
-        for (let i = 0; i < data.length; i++) {
-            const candle = data[i];
-            const parsed = this.parseOHLCV(candle, market);
+        for (let i = 0; i < marketIds.length; i++) {
+            const marketId = marketIds[i];
+            const market = this.safeMarket(marketId);
+            const symbol = market['symbol'];
             this.ohlcvs[symbol] = this.safeValue(this.ohlcvs, symbol, {});
             let stored = this.safeValue(this.ohlcvs[symbol], timeframe);
             if (stored === undefined) {
                 const limit = this.safeInteger(this.options, 'OHLCVLimit', 1000);
-                stored = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_1__/* .ArrayCacheByTimestamp */ .Py(limit);
+                stored = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__/* .ArrayCacheByTimestamp */ .Py(limit);
                 this.ohlcvs[symbol][timeframe] = stored;
             }
-            stored.append(parsed);
+            const ohlcvs = this.parseWsOHLCVs(data[marketId], market);
+            for (let i = 0; i < ohlcvs.length; i++) {
+                stored.append(ohlcvs[i]);
+            }
+            const messageHash = channel + '::' + symbol;
             client.resolve(stored, messageHash);
         }
         return message;
     }
+    parseWsOHLCV(ohlcv, market = undefined) {
+        //
+        //    {
+        //        "t": 1626860340000,             // Message timestamp
+        //        "o": "30881.95",                // Open price
+        //        "c": "30890.96",                // Last price
+        //        "h": "30900.8",                 // High price
+        //        "l": "30861.27",                // Low price
+        //        "v": "1.27852",                 // Base asset volume
+        //        "q": "39493.9021811"            // Quote asset volume
+        //    }
+        //
+        return [
+            this.safeInteger(ohlcv, 't'),
+            this.safeNumber(ohlcv, 'o'),
+            this.safeNumber(ohlcv, 'h'),
+            this.safeNumber(ohlcv, 'l'),
+            this.safeNumber(ohlcv, 'c'),
+            this.safeNumber(ohlcv, 'v'),
+        ];
+    }
+    async watchOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name hitbtc#watchOrders
+         * @description watches information on multiple orders made by the user
+         * @see https://api.hitbtc.com/#subscribe-to-reports
+         * @see https://api.hitbtc.com/#subscribe-to-reports-2
+         * @see https://api.hitbtc.com/#subscribe-to-reports-3
+         * @param {string} [symbol] unified CCXT market symbol
+         * @param {int} [since] timestamp in ms of the earliest order to fetch
+         * @param {int} [limit] the maximum amount of orders to fetch
+         * @param {object} [params] extra parameters specific to the hitbtc api endpoint
+         * @returns {[object]} a list of [order structures]{@link https://docs.ccxt.com/en/latest/manual.html#order-structure}
+         */
+        await this.loadMarkets();
+        let marketType = undefined;
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+        }
+        [marketType, params] = this.handleMarketTypeAndParams('watchOrders', market, params);
+        const name = this.getSupportedMapping(marketType, {
+            'spot': 'spot_subscribe',
+            'margin': 'margin_subscribe',
+            'swap': 'futures_subscribe',
+            'future': 'futures_subscribe',
+        });
+        const orders = await this.subscribePrivate(name, symbol, params);
+        if (this.newUpdates) {
+            limit = orders.getLimit(symbol, limit);
+        }
+        return this.filterBySinceLimit(orders, since, limit, 'timestamp');
+    }
+    handleOrder(client, message) {
+        //
+        //    {
+        //        "jsonrpc": "2.0",
+        //        "method": "spot_order",                            // "margin_order", "future_order"
+        //        "params": {
+        //            "id": 584244931496,
+        //            "client_order_id": "b5acd79c0a854b01b558665bcf379456",
+        //            "symbol": "BTCUSDT",
+        //            "side": "buy",
+        //            "status": "new",
+        //            "type": "limit",
+        //            "time_in_force": "GTC",
+        //            "quantity": "0.01000",
+        //            "quantity_cumulative": "0",
+        //            "price": "0.01",                              // only updates and snapshots
+        //            "post_only": false,
+        //            "reduce_only": false,                         // only margin and contract
+        //            "display_quantity": "0",                      // only updates and snapshot
+        //            "created_at": "2021-07-02T22:52:32.864Z",
+        //            "updated_at": "2021-07-02T22:52:32.864Z",
+        //            "trade_id": 1361977606,                       // only trades
+        //            "trade_quantity": "0.00001",                  // only trades
+        //            "trade_price": "49595.04",                    // only trades
+        //            "trade_fee": "0.001239876000",                // only trades
+        //            "trade_taker": true,                          // only trades, only spot
+        //            "trade_position_id": 485308,                  // only trades, only margin
+        //            "report_type": "new"                          // "trade", "status" (snapshot)
+        //        }
+        //    }
+        //
+        //    {
+        //       "jsonrpc": "2.0",
+        //       "method": "spot_orders",                            // "margin_orders", "future_orders"
+        //       "params": [
+        //            {
+        //                "id": 584244931496,
+        //                "client_order_id": "b5acd79c0a854b01b558665bcf379456",
+        //                "symbol": "BTCUSDT",
+        //                "side": "buy",
+        //                "status": "new",
+        //                "type": "limit",
+        //                "time_in_force": "GTC",
+        //                "quantity": "0.01000",
+        //                "quantity_cumulative": "0",
+        //                "price": "0.01",                              // only updates and snapshots
+        //                "post_only": false,
+        //                "reduce_only": false,                         // only margin and contract
+        //                "display_quantity": "0",                      // only updates and snapshot
+        //                "created_at": "2021-07-02T22:52:32.864Z",
+        //                "updated_at": "2021-07-02T22:52:32.864Z",
+        //                "trade_id": 1361977606,                       // only trades
+        //                "trade_quantity": "0.00001",                  // only trades
+        //                "trade_price": "49595.04",                    // only trades
+        //                "trade_fee": "0.001239876000",                // only trades
+        //                "trade_taker": true,                          // only trades, only spot
+        //                "trade_position_id": 485308,                  // only trades, only margin
+        //                "report_type": "new"                          // "trade", "status" (snapshot)
+        //            }
+        //        ]
+        //    }
+        //
+        if (this.orders === undefined) {
+            const limit = this.safeInteger(this.options, 'ordersLimit');
+            this.orders = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__/* .ArrayCacheBySymbolById */ .hl(limit);
+        }
+        const data = this.safeValue(message, 'params', []);
+        if (Array.isArray(data)) {
+            for (let i = 0; i < data.length; i++) {
+                const order = data[i];
+                this.handleOrderHelper(client, message, order);
+            }
+        }
+        else {
+            this.handleOrderHelper(client, message, data);
+        }
+        return message;
+    }
+    handleOrderHelper(client, message, order) {
+        const orders = this.orders;
+        const marketId = this.safeStringLower2(order, 'instrument', 'symbol');
+        const method = this.safeString(message, 'method');
+        const splitMethod = method.split('_order');
+        const messageHash = this.safeString(splitMethod, 0);
+        const symbol = this.safeSymbol(marketId);
+        const parsed = this.parseOrder(order);
+        orders.append(parsed);
+        client.resolve(orders, messageHash);
+        client.resolve(orders, messageHash + '::' + symbol);
+    }
+    parseWsOrderTrade(trade, market = undefined) {
+        //
+        //    {
+        //        "id": 584244931496,
+        //        "client_order_id": "b5acd79c0a854b01b558665bcf379456",
+        //        "symbol": "BTCUSDT",
+        //        "side": "buy",
+        //        "status": "new",
+        //        "type": "limit",
+        //        "time_in_force": "GTC",
+        //        "quantity": "0.01000",
+        //        "quantity_cumulative": "0",
+        //        "price": "0.01",                              // only updates and snapshots
+        //        "post_only": false,
+        //        "reduce_only": false,                         // only margin and contract
+        //        "display_quantity": "0",                      // only updates and snapshot
+        //        "created_at": "2021-07-02T22:52:32.864Z",
+        //        "updated_at": "2021-07-02T22:52:32.864Z",
+        //        "trade_id": 1361977606,                       // only trades
+        //        "trade_quantity": "0.00001",                  // only trades
+        //        "trade_price": "49595.04",                    // only trades
+        //        "trade_fee": "0.001239876000",                // only trades
+        //        "trade_taker": true,                          // only trades, only spot
+        //        "trade_position_id": 485308,                  // only trades, only margin
+        //        "report_type": "new"                          // "trade", "status" (snapshot)
+        //    }
+        //
+        const timestamp = this.safeInteger(trade, 'created_at');
+        const marketId = this.safeString(trade, 'symbol');
+        return this.safeTrade({
+            'info': trade,
+            'id': this.safeString(trade, 'trade_id'),
+            'order': this.safeString(trade, 'id'),
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'symbol': this.safeMarket(marketId, market),
+            'type': undefined,
+            'side': this.safeString(trade, 'side'),
+            'takerOrMaker': this.safeString(trade, 'trade_taker'),
+            'price': this.safeString(trade, 'trade_price'),
+            'amount': this.safeString(trade, 'trade_quantity'),
+            'cost': undefined,
+            'fee': {
+                'cost': this.safeString(trade, 'trade_fee'),
+                'currency': undefined,
+                'rate': undefined,
+            },
+        }, market);
+    }
+    parseWsOrder(order, market = undefined) {
+        //
+        //    {
+        //        "id": 584244931496,
+        //        "client_order_id": "b5acd79c0a854b01b558665bcf379456",
+        //        "symbol": "BTCUSDT",
+        //        "side": "buy",
+        //        "status": "new",
+        //        "type": "limit",
+        //        "time_in_force": "GTC",
+        //        "quantity": "0.01000",
+        //        "quantity_cumulative": "0",
+        //        "price": "0.01",                              // only updates and snapshots
+        //        "post_only": false,
+        //        "reduce_only": false,                         // only margin and contract
+        //        "display_quantity": "0",                      // only updates and snapshot
+        //        "created_at": "2021-07-02T22:52:32.864Z",
+        //        "updated_at": "2021-07-02T22:52:32.864Z",
+        //        "trade_id": 1361977606,                       // only trades
+        //        "trade_quantity": "0.00001",                  // only trades
+        //        "trade_price": "49595.04",                    // only trades
+        //        "trade_fee": "0.001239876000",                // only trades
+        //        "trade_taker": true,                          // only trades, only spot
+        //        "trade_position_id": 485308,                  // only trades, only margin
+        //        "report_type": "new"                          // "trade", "status" (snapshot)
+        //    }
+        //
+        const timestamp = this.safeString(order, 'created_at');
+        const marketId = this.safeSymbol(order, 'symbol');
+        market = this.safeMarket(marketId, market);
+        const tradeId = this.safeString(order, 'trade_id');
+        let trades = undefined;
+        if (tradeId !== undefined) {
+            const trade = this.parseWsOrderTrade(order, market);
+            trades = [trade];
+        }
+        return this.safeOrder({
+            'info': order,
+            'id': this.safeString(order, 'id'),
+            'clientOrderId': this.safeString(order, 'client_order_id'),
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'lastTradeTimestamp': undefined,
+            'symbol': market['symbol'],
+            'price': this.safeString(order, 'price'),
+            'amount': this.safeString(order, 'quantity'),
+            'type': this.safeString(order, 'type'),
+            'side': this.safeStringUpper(order, 'side'),
+            'timeInForce': this.safeString(order, 'time_in_force'),
+            'postOnly': this.safeString(order, 'post_only'),
+            'reduceOnly': this.safeValue(order, 'reduce_only'),
+            'filled': undefined,
+            'remaining': undefined,
+            'cost': undefined,
+            'status': this.parseOrderStatus(this.safeString(order, 'status')),
+            'average': undefined,
+            'trades': trades,
+            'fee': undefined,
+        }, market);
+    }
+    async watchBalance(params = {}) {
+        /**
+         * @method
+         * @name hitbtc#watchBalance
+         * @description watches balance updates, cannot subscribe to margin account balances
+         * @see https://api.hitbtc.com/#subscribe-to-spot-balances
+         * @see https://api.hitbtc.com/#subscribe-to-futures-balances
+         * @param {object} [params] extra parameters specific to the hitbtc api endpoint
+         * @param {string} [params.type] 'spot', 'swap', or 'future'
+         *
+         * EXCHANGE SPECIFIC PARAMETERS
+         * @param {string} [params.mode] 'updates' or 'batches' (default), 'updates' = messages arrive after balance updates, 'batches' = messages arrive at equal intervals if there were any updates
+         * @returns {[object]} a list of [balance structures]{@link https://docs.ccxt.com/#/?id=balance-structure}
+         */
+        await this.loadMarkets();
+        let type = undefined;
+        [type, params] = this.handleMarketTypeAndParams('watchBalance', undefined, params);
+        const name = this.getSupportedMapping(type, {
+            'spot': 'spot_balance_subscribe',
+            'swap': 'futures_balance_subscribe',
+            'future': 'futures_balance_subscribe',
+        });
+        const mode = this.safeString(params, 'mode', 'batches');
+        params = this.omit(params, 'mode');
+        const request = {
+            'mode': mode,
+        };
+        return await this.subscribePrivate(name, undefined, this.extend(request, params));
+    }
+    handleBalance(client, message) {
+        //
+        //    {
+        //        "jsonrpc": "2.0",
+        //        "method": "futures_balance",
+        //        "params": [
+        //            {
+        //                "currency": "BCN",
+        //                "available": "100.000000000000",
+        //                "reserved": "0",
+        //                "reserved_margin": "0"
+        //            },
+        //            ...
+        //        ]
+        //    }
+        //
+        const messageHash = this.safeString(message, 'method');
+        const params = this.safeValue(message, 'params');
+        const balance = this.parseBalance(params);
+        this.balance = this.deepExtend(this.balance, balance);
+        client.resolve(this.balance, messageHash);
+    }
     handleNotification(client, message) {
         //
         //     { jsonrpc: '2.0', result: true, id: null }
@@ -219033,23 +219665,57 @@ class hitbtc extends _hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
         return message;
     }
     handleMessage(client, message) {
-        const methods = {
-            'snapshotOrderbook': this.handleOrderBookSnapshot,
-            'updateOrderbook': this.handleOrderBookUpdate,
-            'ticker': this.handleTicker,
-            'snapshotTrades': this.handleTrades,
-            'updateTrades': this.handleTrades,
-            'snapshotCandles': this.handleOHLCV,
-            'updateCandles': this.handleOHLCV,
-        };
-        const event = this.safeString(message, 'method');
-        const method = this.safeValue(methods, event);
-        if (method === undefined) {
-            this.handleNotification(client, message);
+        let channel = this.safeString2(message, 'ch', 'method');
+        if (channel !== undefined) {
+            const splitChannel = channel.split('/');
+            channel = this.safeString(splitChannel, 0);
+            const methods = {
+                'candles': this.handleOHLCV,
+                'ticker': this.handleTicker,
+                'trades': this.handleTrades,
+                'orderbook': this.handleOrderBook,
+                'spot_order': this.handleOrder,
+                'spot_orders': this.handleOrder,
+                'margin_order': this.handleOrder,
+                'margin_orders': this.handleOrder,
+                'futures_order': this.handleOrder,
+                'futures_orders': this.handleOrder,
+                'spot_balance': this.handleBalance,
+                'futures_balance': this.handleBalance,
+            };
+            const method = this.safeValue(methods, channel);
+            if (method !== undefined) {
+                method.call(this, client, message);
+            }
         }
         else {
-            method.call(this, client, message);
+            const success = this.safeValue(message, 'result');
+            if ((success === true) && !('id' in message)) {
+                this.handleAuthenticate(client, message);
+            }
+        }
+    }
+    handleAuthenticate(client, message) {
+        //
+        //    {
+        //        jsonrpc: '2.0',
+        //        result: true
+        //    }
+        //
+        const success = this.safeValue(message, 'result');
+        const messageHash = 'authenticated';
+        if (success) {
+            const future = this.safeValue(client.futures, messageHash);
+            future.resolve(true);
+        }
+        else {
+            const error = new _base_errors_js__WEBPACK_IMPORTED_MODULE_3__.AuthenticationError(this.id + ' ' + this.json(message));
+            client.reject(error, messageHash);
+            if (messageHash in client.subscriptions) {
+                delete client.subscriptions[messageHash];
+            }
         }
+        return message;
     }
 }
 
@@ -274870,7 +275536,7 @@ SOFTWARE.
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.0.91';
+const version = '4.0.94';
 _src_base_Exchange_js__WEBPACK_IMPORTED_MODULE_0__/* .Exchange.ccxtVersion */ .e.ccxtVersion = version;
 //-----------------------------------------------------------------------------