ccxt 4.2.46 → 4.2.48

package/dist/cjs/src/indodax.js

@@ -46,6 +46,9 @@ class indodax extends indodax$1 {
                 'fetchCrossBorrowRate': false,
                 'fetchCrossBorrowRates': false,
                 'fetchDeposit': false,
+                'fetchDepositAddress': 'emulated',
+                'fetchDepositAddresses': true,
+                'fetchDepositAddressesByNetwork': false,
                 'fetchDeposits': false,
                 'fetchDepositsWithdrawals': true,
                 'fetchFundingHistory': false,
@@ -94,7 +97,7 @@ class indodax extends indodax$1 {
             'urls': {
                 'logo': 'https://user-images.githubusercontent.com/51840849/87070508-9358c880-c221-11ea-8dc5-5391afbbb422.jpg',
                 'api': {
-                    'public': 'https://indodax.com/api',
+                    'public': 'https://indodax.com',
                     'private': 'https://indodax.com/tapi',
                 },
                 'www': 'https://www.indodax.com',
@@ -104,14 +107,15 @@ class indodax extends indodax$1 {
             'api': {
                 'public': {
                     'get': {
-                        'server_time': 5,
-                        'pairs': 5,
-                        'price_increments': 5,
-                        'summaries': 5,
-                        'ticker_all': 5,
-                        '{pair}/ticker': 5,
-                        '{pair}/trades': 5,
-                        '{pair}/depth': 5,
+                        'api/server_time': 5,
+                        'api/pairs': 5,
+                        'api/price_increments': 5,
+                        'api/summaries': 5,
+                        'api/ticker/{pair}': 5,
+                        'api/ticker_all': 5,
+                        'api/trades/{pair}': 5,
+                        'api/depth/{pair}': 5,
+                        'tradingview/history_v2': 5,
                     },
                 },
                 'private': {
@@ -157,7 +161,35 @@ class indodax extends indodax$1 {
             'options': {
                 'recvWindow': 5 * 1000,
                 'timeDifference': 0,
-                'adjustForTimeDifference': false, // controls the adjustment logic upon instantiation
+                'adjustForTimeDifference': false,
+                'networks': {
+                    'XLM': 'Stellar Token',
+                    'BSC': 'bep20',
+                    'TRC20': 'trc20',
+                    'MATIC': 'polygon',
+                    // 'BEP2': 'bep2',
+                    // 'ARB': 'arb',
+                    // 'ERC20': 'erc20',
+                    // 'KIP7': 'kip7',
+                    // 'MAINNET': 'mainnet',  // TODO: does mainnet just mean the default?
+                    // 'OEP4': 'oep4',
+                    // 'OP': 'op',
+                    // 'SPL': 'spl',
+                    // 'TRC10': 'trc10',
+                    // 'ZRC2': 'zrc2'
+                    // 'ETH': 'eth'
+                    // 'BASE': 'base'
+                },
+                'timeframes': {
+                    '1m': '1',
+                    '15m': '15',
+                    '30m': '30',
+                    '1h': '60',
+                    '4h': '240',
+                    '1d': '1D',
+                    '3d': '3D',
+                    '1w': '1W',
+                },
             },
             'commonCurrencies': {
                 'STR': 'XLM',
@@ -177,10 +209,11 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchTime
          * @description fetches the current integer timestamp in milliseconds from the exchange server
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Public-RestAPI.md#server-time
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {int} the current integer timestamp in milliseconds from the exchange server
          */
-        const response = await this.publicGetServerTime(params);
+        const response = await this.publicGetApiServerTime(params);
         //
         //     {
         //         "timezone": "UTC",
@@ -194,10 +227,11 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchMarkets
          * @description retrieves data on all markets for indodax
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Public-RestAPI.md#pairs
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object[]} an array of objects representing market data
          */
-        const response = await this.publicGetPairs(params);
+        const response = await this.publicGetApiPairs(params);
         //
         //     [
         //         {
@@ -314,6 +348,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchBalance
          * @description query for balance and get the amount of funds available for trading or funds locked in orders
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#get-info-endpoint
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
          */
@@ -356,6 +391,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchOrderBook
          * @description fetches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Public-RestAPI.md#depth
          * @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 exchange API endpoint
@@ -364,9 +400,9 @@ class indodax extends indodax$1 {
         await this.loadMarkets();
         const market = this.market(symbol);
         const request = {
-            'pair': market['id'],
+            'pair': market['base'] + market['quote'],
         };
-        const orderbook = await this.publicGetPairDepth(this.extend(request, params));
+        const orderbook = await this.publicGetApiDepthPair(this.extend(request, params));
         return this.parseOrderBook(orderbook, market['symbol'], undefined, 'buy', 'sell');
     }
     parseTicker(ticker, market = undefined) {
@@ -415,6 +451,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchTicker
          * @description fetches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Public-RestAPI.md#ticker
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
@@ -422,9 +459,9 @@ class indodax extends indodax$1 {
         await this.loadMarkets();
         const market = this.market(symbol);
         const request = {
-            'pair': market['id'],
+            'pair': market['base'] + market['quote'],
         };
-        const response = await this.publicGetPairTicker(this.extend(request, params));
+        const response = await this.publicGetApiTickerPair(this.extend(request, params));
         //
         //     {
         //         "ticker": {
@@ -469,7 +506,7 @@ class indodax extends indodax$1 {
         //     }
         // }
         //
-        const response = await this.publicGetTickerAll(params);
+        const response = await this.publicGetApiTickerAll(params);
         const tickers = this.safeValue(response, 'tickers');
         return this.parseTickers(tickers, symbols);
     }
@@ -496,6 +533,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Public-RestAPI.md#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
@@ -505,11 +543,81 @@ class indodax extends indodax$1 {
         await this.loadMarkets();
         const market = this.market(symbol);
         const request = {
-            'pair': market['id'],
+            'pair': market['base'] + market['quote'],
         };
-        const response = await this.publicGetPairTrades(this.extend(request, params));
+        const response = await this.publicGetApiTradesPair(this.extend(request, params));
         return this.parseTrades(response, market, since, limit);
     }
+    parseOHLCV(ohlcv, market = undefined) {
+        //
+        //     {
+        //         "Time": 1708416900,
+        //         "Open": 51707.52,
+        //         "High": 51707.52,
+        //         "Low": 51707.52,
+        //         "Close": 51707.52,
+        //         "Volume": "0"
+        //     }
+        //
+        return [
+            this.safeTimestamp(ohlcv, 'Time'),
+            this.safeNumber(ohlcv, 'Open'),
+            this.safeNumber(ohlcv, 'High'),
+            this.safeNumber(ohlcv, 'Low'),
+            this.safeNumber(ohlcv, 'Close'),
+            this.safeNumber(ohlcv, 'Volume'),
+        ];
+    }
+    async fetchOHLCV(symbol, timeframe = '1m', since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name indodax#fetchOHLCV
+         * @description fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @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 {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {int} [params.until] timestamp in ms of the latest candle to fetch
+         * @returns {int[][]} A list of candles ordered as timestamp, open, high, low, close, volume
+         */
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        const timeframes = this.options['timeframes'];
+        const selectedTimeframe = this.safeString(timeframes, timeframe, timeframe);
+        const now = this.seconds();
+        const until = this.safeInteger2(params, 'until', 'till', now);
+        params = this.omit(params, ['until', 'till']);
+        const request = {
+            'to': until,
+            'tf': selectedTimeframe,
+            'symbol': market['base'] + market['quote'],
+        };
+        if (limit === undefined) {
+            limit = 1000;
+        }
+        if (since !== undefined) {
+            request['from'] = Math.floor(since / 1000);
+        }
+        else {
+            const duration = this.parseTimeframe(timeframe);
+            request['from'] = now - limit * duration - 1;
+        }
+        const response = await this.publicGetTradingviewHistoryV2(this.extend(request, params));
+        //
+        //     [
+        //         {
+        //             "Time": 1708416900,
+        //             "Open": 51707.52,
+        //             "High": 51707.52,
+        //             "Low": 51707.52,
+        //             "Close": 51707.52,
+        //             "Volume": "0"
+        //         }
+        //     ]
+        //
+        return this.parseOHLCVs(response, market, timeframe, since, limit);
+    }
     parseOrderStatus(status) {
         const statuses = {
             'open': 'open',
@@ -601,6 +709,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchOrder
          * @description fetches information on an order made by the user
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#get-order-endpoints
          * @param {string} symbol unified symbol of the market the order was made in
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} An [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
@@ -625,6 +734,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchOpenOrders
          * @description fetch all unfilled currently open orders
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#open-orders-endpoints
          * @param {string} symbol unified market symbol
          * @param {int} [since] the earliest time in ms to fetch open orders for
          * @param {int} [limit] the maximum number of  open orders structures to retrieve
@@ -665,6 +775,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchClosedOrders
          * @description fetches information on multiple closed orders made by the user
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#order-history
          * @param {string} symbol unified market symbol of the market orders were made in
          * @param {int} [since] the earliest time in ms to fetch orders for
          * @param {int} [limit] the maximum number of order structures to retrieve
@@ -689,6 +800,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#createOrder
          * @description create a trade order
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#trade-endpoints
          * @param {string} symbol unified symbol of the market to create an order in
          * @param {string} type 'market' or 'limit'
          * @param {string} side 'buy' or 'sell'
@@ -728,6 +840,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#cancelOrder
          * @description cancels an open order
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#cancel-order-endpoints
          * @param {string} id order id
          * @param {string} symbol unified symbol of the market the order was made in
          * @param {object} [params] extra parameters specific to the exchange API endpoint
@@ -754,6 +867,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchTransactionFee
          * @description fetch the fee for a transaction
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#withdraw-fee-endpoints
          * @param {string} code unified currency code
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [fee structure]{@link https://docs.ccxt.com/#/?id=fee-structure}
@@ -787,6 +901,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#fetchDepositsWithdrawals
          * @description fetch history of deposits and withdrawals
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#transaction-history-endpoints
          * @param {string} [code] unified currency code for the currency of the deposit/withdrawals, default is undefined
          * @param {int} [since] timestamp in ms of the earliest deposit/withdrawal, default is undefined
          * @param {int} [limit] max number of deposit/withdrawals to return, default is undefined
@@ -888,6 +1003,7 @@ class indodax extends indodax$1 {
          * @method
          * @name indodax#withdraw
          * @description make a withdrawal
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#withdraw-coin-endpoints
          * @param {string} code unified currency code
          * @param {float} amount the amount to withdraw
          * @param {string} address the address to withdraw to
@@ -1016,10 +1132,100 @@ class indodax extends indodax$1 {
         };
         return this.safeString(statuses, status, status);
     }
+    async fetchDepositAddresses(codes = undefined, params = {}) {
+        /**
+         * @method
+         * @name indodax#fetchDepositAddresses
+         * @description fetch deposit addresses for multiple currencies and chain types
+         * @see https://github.com/btcid/indodax-official-api-docs/blob/master/Private-RestAPI.md#general-information-on-endpoints
+         * @param {string[]} [codes] list of unified currency codes, default is undefined
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a list of [address structures]{@link https://docs.ccxt.com/#/?id=address-structure}
+         */
+        await this.loadMarkets();
+        const response = await this.privatePostGetInfo(params);
+        //
+        //    {
+        //        success: '1',
+        //        return: {
+        //            server_time: '1708031570',
+        //            balance: {
+        //                idr: '29952',
+        //                ...
+        //            },
+        //            balance_hold: {
+        //                idr: '0',
+        //                ...
+        //            },
+        //            address: {
+        //                btc: '1KMntgzvU7iTSgMBWc11nVuJjAyfW3qJyk',
+        //                ...
+        //            },
+        //            memo_is_required: {
+        //                btc: { mainnet: false },
+        //                ...
+        //            },
+        //            network: {
+        //                btc: 'mainnet',
+        //                ...
+        //            },
+        //            user_id: '276011',
+        //            name: '',
+        //            email: 'testbitcoincoid@mailforspam.com',
+        //            profile_picture: null,
+        //            verification_status: 'unverified',
+        //            gauth_enable: true,
+        //            withdraw_status: '0'
+        //        }
+        //    }
+        //
+        const data = this.safeDict(response, 'return');
+        const addresses = this.safeDict(data, 'address', {});
+        const networks = this.safeDict(data, 'network', {});
+        const addressKeys = Object.keys(addresses);
+        const result = {
+            'info': data,
+        };
+        for (let i = 0; i < addressKeys.length; i++) {
+            const marketId = addressKeys[i];
+            const code = this.safeCurrencyCode(marketId);
+            const address = this.safeString(addresses, marketId);
+            if ((address !== undefined) && ((codes === undefined) || (this.inArray(code, codes)))) {
+                this.checkAddress(address);
+                let network = undefined;
+                if (marketId in networks) {
+                    const networkId = this.safeString(networks, marketId);
+                    if (networkId.indexOf(',') >= 0) {
+                        network = [];
+                        const networkIds = networkId.split(',');
+                        for (let j = 0; j < networkIds.length; j++) {
+                            network.push(this.networkIdToCode(networkIds[j]).toUpperCase());
+                        }
+                    }
+                    else {
+                        network = this.networkIdToCode(networkId).toUpperCase();
+                    }
+                }
+                result[code] = {
+                    'info': {},
+                    'currency': code,
+                    'address': address,
+                    'network': network,
+                    'tag': undefined,
+                };
+            }
+        }
+        return result;
+    }
     sign(path, api = 'public', method = 'GET', params = {}, headers = undefined, body = undefined) {
         let url = this.urls['api'][api];
         if (api === 'public') {
-            url += '/' + this.implodeParams(path, params);
+            const query = this.omit(params, this.extractParams(path));
+            const requestPath = '/' + this.implodeParams(path, params);
+            url = url + requestPath;
+            if (Object.keys(query).length) {
+                url += '?' + this.urlencodeWithArrayRepeat(query);
+            }
         }
         else {
             this.checkRequiredCredentials();

package/dist/cjs/src/okx.js

@@ -5228,6 +5228,7 @@ class okx extends okx$1 {
          * @method
          * @name okx#fetchPositions
          * @see https://www.okx.com/docs-v5/en/#rest-api-account-get-positions
+         * @see https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-positions-history history
          * @description fetch all open positions
          * @param {string[]|undefined} symbols list of unified market symbols
          * @param {object} [params] extra parameters specific to the exchange API endpoint
@@ -5368,13 +5369,38 @@ class okx extends okx$1 {
         //        "vegaBS": "",
         //        "vegaPA": ""
         //    }
+        // history
+        //    {
+        //        "cTime":"1708351230102",
+        //        "ccy":"USDT",
+        //        "closeAvgPx":"1.2567",
+        //        "closeTotalPos":"40",
+        //        "direction":"short",
+        //        "fee":"-0.0351036",
+        //        "fundingFee":"0",
+        //        "instId":"SUSHI-USDT-SWAP",
+        //        "instType":"SWAP",
+        //        "lever":"10.0",
+        //        "liqPenalty":"0",
+        //        "mgnMode":"isolated",
+        //        "openAvgPx":"1.2462",
+        //        "openMaxPos":"40",
+        //        "pnl":"-0.42",
+        //        "pnlRatio":"-0.0912982667308618",
+        //        "posId":"666159086676836352",
+        //        "realizedPnl":"-0.4551036",
+        //        "triggerPx":"",
+        //        "type":"2",
+        //        "uTime":"1708354805699",
+        //        "uly":"SUSHI-USDT"
+        //    }
         //
         const marketId = this.safeString(position, 'instId');
         market = this.safeMarket(marketId, market);
         const symbol = market['symbol'];
         const pos = this.safeString(position, 'pos'); // 'pos' field: One way mode: 0 if position is not open, 1 if open | Two way (hedge) mode: -1 if short, 1 if long, 0 if position is not open
         const contractsAbs = Precise["default"].stringAbs(pos);
-        let side = this.safeString(position, 'posSide');
+        let side = this.safeString2(position, 'posSide', 'direction');
         const hedged = side !== 'net';
         const contracts = this.parseNumber(contractsAbs);
         if (market['margin']) {
@@ -5415,7 +5441,7 @@ class okx extends okx$1 {
         const notional = this.parseNumber(notionalString);
         const marginMode = this.safeString(position, 'mgnMode');
         let initialMarginString = undefined;
-        const entryPriceString = this.safeString(position, 'avgPx');
+        const entryPriceString = this.safeString2(position, 'avgPx', 'openAvgPx');
         const unrealizedPnlString = this.safeString(position, 'upl');
         const leverageString = this.safeString(position, 'lever');
         let initialMarginPercentage = undefined;
@@ -5446,23 +5472,24 @@ class okx extends okx$1 {
         const marginRatio = this.parseNumber(Precise["default"].stringDiv(maintenanceMarginString, collateralString, 4));
         return this.safePosition({
             'info': position,
-            'id': undefined,
+            'id': this.safeString(position, 'posId'),
             'symbol': symbol,
             'notional': notional,
             'marginMode': marginMode,
             'liquidationPrice': liquidationPrice,
             'entryPrice': this.parseNumber(entryPriceString),
             'unrealizedPnl': this.parseNumber(unrealizedPnlString),
+            'realizedPnl': this.safeNumber(position, 'realizedPnl'),
             'percentage': percentage,
             'contracts': contracts,
             'contractSize': contractSize,
             'markPrice': this.parseNumber(markPriceString),
-            'lastPrice': undefined,
+            'lastPrice': this.safeNumber(position, 'closeAvgPx'),
             'side': side,
             'hedged': hedged,
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
-            'lastUpdateTimestamp': undefined,
+            'lastUpdateTimestamp': this.safeInteger(position, 'uTime'),
             'maintenanceMargin': maintenanceMargin,
             'maintenanceMarginPercentage': maintenanceMarginPercentage,
             'collateral': this.parseNumber(collateralString),

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

@@ -220,7 +220,7 @@ class hitbtc extends hitbtc$1 {
                 'symbols': [market['id']],
             },
         };
-        const orderbook = await this.subscribePublic(name, name, [symbol], this.deepExtend(request, params));
+        const orderbook = await this.subscribePublic(name, 'orderbooks', [symbol], this.deepExtend(request, params));
         return orderbook.limit();
     }
     handleOrderBook(client, message) {
@@ -249,13 +249,12 @@ class hitbtc extends hitbtc$1 {
         //
         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;
+            const messageHash = 'orderbooks::' + symbol;
             if (!(symbol in this.orderbooks)) {
                 const subscription = this.safeValue(client.subscriptions, messageHash, {});
                 const limit = this.safeInteger(subscription, 'limit');
@@ -313,7 +312,7 @@ class hitbtc extends hitbtc$1 {
                 'symbols': [market['id']],
             },
         };
-        const result = await this.subscribePublic(name, 'ticker', [symbol], this.deepExtend(request, params));
+        const result = await this.subscribePublic(name, 'tickers', [symbol], this.deepExtend(request, params));
         return this.safeValue(result, symbol);
     }
     async watchTickers(symbols = undefined, params = {}) {
@@ -396,7 +395,6 @@ class hitbtc extends hitbtc$1 {
         //
         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];
@@ -405,8 +403,6 @@ class hitbtc extends hitbtc$1 {
             const ticker = this.parseWsTicker(data[marketId], market);
             this.tickers[symbol] = ticker;
             newTickers[symbol] = ticker;
-            const messageHash = channel + '::' + symbol;
-            client.resolve(newTickers, messageHash);
         }
         client.resolve(newTickers, 'tickers');
         const messageHashes = this.findMessageHashes(client, 'tickers::');
@@ -422,7 +418,6 @@ class hitbtc extends hitbtc$1 {
                 client.resolve(tickers, messageHash);
             }
         }
-        client.resolve(this.tickers, channel);
         return message;
     }
     parseWsTicker(ticker, market = undefined) {
@@ -503,7 +498,7 @@ class hitbtc extends hitbtc$1 {
             request['limit'] = limit;
         }
         const name = 'trades';
-        const trades = await this.subscribePublic(name, name, [symbol], this.deepExtend(request, params));
+        const trades = await this.subscribePublic(name, 'trades', [symbol], this.deepExtend(request, params));
         if (this.newUpdates) {
             limit = trades.getLimit(symbol, limit);
         }
@@ -632,7 +627,7 @@ class hitbtc extends hitbtc$1 {
         if (limit !== undefined) {
             request['params']['limit'] = limit;
         }
-        const ohlcv = await this.subscribePublic(name, name, [symbol], this.deepExtend(request, params));
+        const ohlcv = await this.subscribePublic(name, 'candles', [symbol], this.deepExtend(request, params));
         if (this.newUpdates) {
             limit = ohlcv.getLimit(symbol, limit);
         }
@@ -693,7 +688,7 @@ class hitbtc extends hitbtc$1 {
             for (let j = 0; j < ohlcvs.length; j++) {
                 stored.append(ohlcvs[j]);
             }
-            const messageHash = channel + '::' + symbol;
+            const messageHash = 'candles::' + symbol;
             client.resolve(stored, messageHash);
         }
         return message;