ccxt 4.3.94 → 4.3.96

package/dist/cjs/src/mexc.js

@@ -448,164 +448,82 @@ class mexc extends mexc$1 {
                     'LTC': 'LTC',
                 },
                 'networks': {
-                    'ABBC': 'ABBC',
+                    'TRC20': 'TRX',
+                    'TON': 'TONCOIN',
+                    'AVAXC': 'AVAX_CCHAIN',
+                    'ERC20': 'ETH',
                     'ACA': 'ACALA',
-                    'ADA': 'Cardano(ADA)',
-                    'AE': 'AE',
-                    'ALGO': 'Algorand(ALGO)',
-                    'ALPH': 'Alephium(ALPH)',
-                    'AME': 'AME',
-                    'AOK': 'AOK',
-                    'APT': 'APTOS(APT)',
-                    'AR': 'AR',
-                    'ARB': 'Arbitrum One(ARB)',
-                    'ARBNOVA': 'ARBNOVA',
-                    'ARBONE': 'ArbitrumOne(ARB)',
-                    'ARK': 'ARK',
+                    // 'ADA': 'Cardano(ADA)',
+                    // 'AE': 'AE',
+                    // 'ALGO': 'Algorand(ALGO)',
+                    // 'ALPH': 'Alephium(ALPH)',
+                    // 'ARB': 'Arbitrum One(ARB)',
+                    // 'ARBONE': 'ArbitrumOne(ARB)',
                     'ASTR': 'ASTAR',
-                    'ATOM': 'Cosmos(ATOM)',
-                    'AVAXC': 'Avalanche C Chain(AVAX CCHAIN)',
-                    'AVAXX': 'Avalanche X Chain(AVAX XCHAIN)',
-                    'AZERO': 'Aleph Zero(AZERO)',
-                    'BCH': 'Bitcoin Cash(BCH)',
-                    'BDX': 'BDX',
-                    'BEAM': 'BEAM',
-                    'BEP2': 'BNB Beacon Chain(BEP2)',
-                    'BEP20': 'BNB Smart Chain(BEP20)',
-                    'BITCI': 'BITCI',
-                    'BNC': 'BNC',
-                    'BNCDOT': 'BNCPOLKA',
-                    'BOBA': 'BOBA',
-                    'BSC': 'BEP20(BSC)',
-                    'BSV': 'Bitcoin SV(BSV)',
-                    'BTC': 'Bitcoin(BTC)',
+                    // 'ATOM': 'Cosmos(ATOM)',
+                    // 'AVAXC': 'Avalanche C Chain(AVAX CCHAIN)',
+                    // 'AVAXX': 'Avalanche X Chain(AVAX XCHAIN)',
+                    // 'AZERO': 'Aleph Zero(AZERO)',
+                    // 'BCH': 'Bitcoin Cash(BCH)',
+                    // 'BNCDOT': 'BNCPOLKA',
+                    // 'BSV': 'Bitcoin SV(BSV)',
+                    // 'BTC': 'Bitcoin(BTC)',
                     'BTM': 'BTM2',
-                    'CELO': 'CELO',
-                    'CFX': 'CFX',
-                    'CHZ': 'Chiliz Legacy Chain(CHZ)',
-                    'CHZ2': 'Chiliz Chain(CHZ2)',
-                    'CKB': 'CKB',
-                    'CLORE': 'Clore.ai(CLORE)',
+                    // 'CHZ': 'Chiliz Legacy Chain(CHZ)',
+                    // 'CHZ2': 'Chiliz Chain(CHZ2)',
+                    // 'CLORE': 'Clore.ai(CLORE)',
                     'CRC20': 'CRONOS',
-                    'CSPR': 'CSPR',
-                    'DASH': 'DASH',
-                    'DC': 'Dogechain(DC)',
-                    'DCR': 'DCR',
-                    'DNX': 'Dynex(DNX)',
-                    'DOGE': 'Dogecoin(DOGE)',
-                    'DOT': 'Polkadot(DOT)',
-                    'DYM': 'Dymension(DYM)',
-                    'EDG': 'EDG',
-                    'EGLD': 'EGLD',
-                    'EOS': 'EOS',
-                    'ERC20': 'Ethereum(ERC20)',
-                    'ETC': 'Ethereum Classic(ETC)',
+                    // 'DC': 'Dogechain(DC)',
+                    // 'DNX': 'Dynex(DNX)',
+                    // 'DOGE': 'Dogecoin(DOGE)',
+                    // 'DOT': 'Polkadot(DOT)',
+                    // 'DYM': 'Dymension(DYM)',
                     'ETHF': 'ETF',
-                    'ETHW': 'ETHW',
-                    'EVER': 'EVER',
-                    'FET': 'FET',
-                    'FIL': 'FIL',
-                    'FIO': 'FIO',
-                    'FLOW': 'FLOW',
-                    'FSN': 'FSN',
-                    'FTM': 'Fantom(FTM)',
-                    'FUSE': 'FUSE',
-                    'GLMR': 'GLMR',
-                    'GRIN': 'GRIN',
-                    'HBAR': 'Hedera(HBAR)',
-                    'HIVE': 'HIVE',
                     'HRC20': 'HECO',
-                    'HYDRA': 'HYDRA',
-                    'ICP': 'Internet Computer(ICP)',
-                    'INDEX': 'Index Chain',
-                    'IOST': 'IOST',
-                    'IOTA': 'IOTA',
-                    'IOTX': 'IOTX',
-                    'IRIS': 'IRIS',
-                    'KAR': 'KAR',
-                    'KAS': 'Kaspa(KAS)',
-                    'KAVA': 'KAVA',
-                    'KDA': 'KDA',
-                    'KILT': 'KILT',
-                    'KLAY': 'Klaytn(KLAY)',
-                    'KMA': 'KMA',
-                    'KSM': 'KSM',
-                    'LAT': 'LAT',
-                    'LAVA': 'Elysium(LAVA)',
-                    'LTC': 'Litecoin(LTC)',
-                    'LUNA': 'Terra(LUNA)',
-                    'MASS': 'MASS',
-                    'MATIC': 'Polygon(MATIC)',
-                    'MCOIN': 'Mcoin Network',
-                    'METIS': 'METIS',
-                    'MINA': 'MINA',
-                    'MNT': 'Mantle(MNT)',
-                    'MOVR': 'MOVR',
-                    'MTRG': 'Meter(MTRG)',
-                    'NAS': 'NAS',
-                    'NEAR': 'NEAR Protocol(NEAR)',
-                    'NEBL': 'NEBL',
-                    'NEM': 'NEM',
-                    'NEO': 'NEO',
-                    'NEO3': 'NEO3',
-                    'NEOXA': 'Neoxa Network',
-                    'NULS': 'NULS',
+                    // 'KLAY': 'Klaytn(KLAY)',
                     'OASIS': 'ROSE',
-                    'OASYS': 'OASYS',
                     'OKC': 'OKT',
-                    'OMN': 'Omega Network(OMN)',
-                    'OMNI': 'OMNI',
-                    'ONE': 'ONE',
-                    'ONT': 'ONT',
-                    'OPTIMISM': 'Optimism(OP)',
-                    'OSMO': 'OSMO',
-                    'PLCU': 'PLCU',
-                    'POKT': 'POKT',
-                    'QKC': 'QKC',
-                    'QTUM': 'QTUM',
-                    'RAP20': 'RAP20' + ' ' + '(Rangers Mainnet)',
-                    'REI': 'REI',
                     'RSK': 'RBTC',
-                    'RVN': 'Ravencoin(RVN)',
-                    'SATOX': 'Satoxcoin(SATOX)',
-                    'SC': 'SC',
-                    'SCRT': 'SCRT',
-                    'SDN': 'SDN',
-                    'SGB': 'SGB',
-                    'SOL': 'Solana(SOL)',
-                    'STAR': 'STAR',
-                    'STARK': 'Starknet(STARK)',
-                    'STEEM': 'STEEM',
-                    'SYS': 'SYS',
-                    'TAO': 'Bittensor(TAO)',
-                    'TIA': 'Celestia(TIA)',
-                    'TOMO': 'TOMO',
-                    'TON': 'Toncoin(TON)',
-                    'TRC10': 'TRC10',
-                    'TRC20': 'Tron(TRC20)',
-                    'UGAS': 'UGAS(Ultrain)',
-                    'VET': 'VeChain(VET)',
-                    'VEX': 'Vexanium(VEX)',
-                    'VSYS': 'VSYS',
-                    'WAVES': 'WAVES',
-                    'WAX': 'WAX',
-                    'WEMIX': 'WEMIX',
-                    'XCH': 'Chia(XCH)',
-                    'XDC': 'XDC',
-                    'XEC': 'XEC',
-                    'XLM': 'Stellar(XLM)',
-                    'XMR': 'Monero(XMR)',
-                    'XNA': 'Neurai(XNA)',
-                    'XPR': 'XPR Network',
-                    'XRD': 'XRD',
-                    'XRP': 'Ripple(XRP)',
-                    'XTZ': 'XTZ',
-                    'XVG': 'XVG',
-                    'XYM': 'XYM',
-                    'ZEC': 'ZEC',
-                    'ZEN': 'ZEN',
-                    'ZIL': 'Zilliqa(ZIL)',
-                    'ZTG': 'ZTG',
+                    // 'RVN': 'Ravencoin(RVN)',
+                    // 'SATOX': 'Satoxcoin(SATOX)',
+                    // 'SC': 'SC',
+                    // 'SCRT': 'SCRT',
+                    // 'SDN': 'SDN',
+                    // 'SGB': 'SGB',
+                    // 'SOL': 'Solana(SOL)',
+                    // 'STAR': 'STAR',
+                    // 'STARK': 'Starknet(STARK)',
+                    // 'STEEM': 'STEEM',
+                    // 'SYS': 'SYS',
+                    // 'TAO': 'Bittensor(TAO)',
+                    // 'TIA': 'Celestia(TIA)',
+                    // 'TOMO': 'TOMO',
+                    // 'TON': 'Toncoin(TON)',
+                    // 'TRC10': 'TRC10',
+                    // 'TRC20': 'Tron(TRC20)',
+                    // 'UGAS': 'UGAS(Ultrain)',
+                    // 'VET': 'VeChain(VET)',
+                    // 'VEX': 'Vexanium(VEX)',
+                    // 'VSYS': 'VSYS',
+                    // 'WAVES': 'WAVES',
+                    // 'WAX': 'WAX',
+                    // 'WEMIX': 'WEMIX',
+                    // 'XCH': 'Chia(XCH)',
+                    // 'XDC': 'XDC',
+                    // 'XEC': 'XEC',
+                    // 'XLM': 'Stellar(XLM)',
+                    // 'XMR': 'Monero(XMR)',
+                    // 'XNA': 'Neurai(XNA)',
+                    // 'XPR': 'XPR Network',
+                    // 'XRD': 'XRD',
+                    // 'XRP': 'Ripple(XRP)',
+                    // 'XTZ': 'XTZ',
+                    // 'XVG': 'XVG',
+                    // 'XYM': 'XYM',
+                    // 'ZEC': 'ZEC',
+                    // 'ZEN': 'ZEN',
+                    // 'ZIL': 'Zilliqa(ZIL)',
+                    // 'ZTG': 'ZTG',
                     // todo: uncomment below after concensus
                     // 'ALAYA': 'ATP',
                     // 'ANDUSCHAIN': 'DEB',
@@ -879,6 +797,8 @@ class mexc extends mexc$1 {
          * @method
          * @name mexc#fetchStatus
          * @description the latest known information on the availability of the exchange API
+         * @see https://mexcdevelop.github.io/apidocs/spot_v3_en/#test-connectivity
+         * @see https://mexcdevelop.github.io/apidocs/contract_v1_en/#get-the-server-time
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [status structure]{@link https://docs.ccxt.com/#/?id=exchange-status-structure}
          */
@@ -916,6 +836,8 @@ class mexc extends mexc$1 {
          * @method
          * @name mexc#fetchTime
          * @description fetches the current integer timestamp in milliseconds from the exchange server
+         * @see https://mexcdevelop.github.io/apidocs/spot_v3_en/#check-server-time
+         * @see https://mexcdevelop.github.io/apidocs/contract_v1_en/#get-the-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
          */
@@ -1008,7 +930,7 @@ class mexc extends mexc$1 {
             const chains = this.safeValue(currency, 'networkList', []);
             for (let j = 0; j < chains.length; j++) {
                 const chain = chains[j];
-                const networkId = this.safeString2(chain, 'network', 'netWork');
+                const networkId = this.safeString2(chain, 'netWork', 'network');
                 const network = this.networkIdToCode(networkId);
                 const isDepositEnabled = this.safeBool(chain, 'depositEnable', false);
                 const isWithdrawEnabled = this.safeBool(chain, 'withdrawEnable', false);
@@ -1087,6 +1009,8 @@ class mexc extends mexc$1 {
          * @method
          * @name mexc#fetchMarkets
          * @description retrieves data on all markets for mexc
+         * @see https://mexcdevelop.github.io/apidocs/spot_v3_en/#exchange-information
+         * @see https://mexcdevelop.github.io/apidocs/contract_v1_en/#get-the-contract-information
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object[]} an array of objects representing market data
          */
@@ -4390,7 +4314,7 @@ class mexc extends mexc$1 {
         //
         const address = this.safeString(depositAddress, 'address');
         const currencyId = this.safeString(depositAddress, 'coin');
-        const networkId = this.safeString(depositAddress, 'network');
+        const networkId = this.safeString(depositAddress, 'netWork');
         this.checkAddress(address);
         return {
             'currency': this.safeCurrencyCode(currencyId, currency),
@@ -5171,14 +5095,14 @@ class mexc extends mexc$1 {
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [transaction structure]{@link https://docs.ccxt.com/#/?id=transaction-structure}
          */
+        await this.loadMarkets();
+        const currency = this.currency(code);
         [tag, params] = this.handleWithdrawTagAndParams(tag, params);
         const networks = this.safeDict(this.options, 'networks', {});
         let network = this.safeString2(params, 'network', 'netWork'); // this line allows the user to specify either ERC20 or ETH
         network = this.safeString(networks, network, network); // handle ETH > ERC-20 alias
-        network = this.networkIdToCode(network);
+        network = this.networkCodeToId(network, currency['code']);
         this.checkAddress(address);
-        await this.loadMarkets();
-        const currency = this.currency(code);
         const request = {
             'coin': currency['id'],
             'address': address,

package/dist/cjs/src/okx.js

@@ -109,7 +109,6 @@ class okx extends okx$1 {
                 'fetchOrderBooks': false,
                 'fetchOrders': false,
                 'fetchOrderTrades': true,
-                'fetchPermissions': undefined,
                 'fetchPosition': true,
                 'fetchPositionHistory': 'emulated',
                 'fetchPositions': true,
@@ -324,6 +323,7 @@ class okx extends okx$1 {
                         'account/account-position-risk': 2,
                         'account/bills': 5 / 3,
                         'account/bills-archive': 5 / 3,
+                        'account/bills-history-archive': 2,
                         'account/config': 4,
                         'account/max-size': 1,
                         'account/max-avail-size': 1,
@@ -478,6 +478,7 @@ class okx extends okx$1 {
                         'account/fixed-loan/amend-borrowing-order': 5,
                         'account/fixed-loan/manual-reborrow': 5,
                         'account/fixed-loan/repay-borrowing-order': 5,
+                        'account/bills-history-archive': 72000,
                         // subaccount
                         'users/subaccount/modify-apikey': 10,
                         'asset/subaccount/transfer': 10,

package/dist/cjs/src/p2b.js

@@ -77,7 +77,6 @@ class p2b extends p2b$1 {
                 'fetchOrderBooks': false,
                 'fetchOrders': true,
                 'fetchOrderTrades': true,
-                'fetchPermissions': false,
                 'fetchPosition': false,
                 'fetchPositionHistory': false,
                 'fetchPositionMode': false,

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

@@ -1032,14 +1032,25 @@ class binance extends binance$1 {
             const error = new errors.UnsubscribeError(this.id + ' ' + subHash);
             client.reject(error, subHash);
             client.resolve(true, unsubHash);
-            this.cleanCache(subscription);
         }
+        this.cleanCache(subscription);
     }
     cleanCache(subscription) {
         const topic = this.safeString(subscription, 'topic');
         const symbols = this.safeList(subscription, 'symbols', []);
         const symbolsLength = symbols.length;
-        if (symbolsLength > 0) {
+        if (topic === 'ohlcv') {
+            const symbolsAndTimeFrames = this.safeList(subscription, 'symbolsAndTimeframes', []);
+            for (let i = 0; i < symbolsAndTimeFrames.length; i++) {
+                const symbolAndTimeFrame = symbolsAndTimeFrames[i];
+                const symbol = this.safeString(symbolAndTimeFrame, 0);
+                const timeframe = this.safeString(symbolAndTimeFrame, 1);
+                if (timeframe in this.ohlcvs[symbol]) {
+                    delete this.ohlcvs[symbol][timeframe];
+                }
+            }
+        }
+        else if (symbolsLength > 0) {
             for (let i = 0; i < symbols.length; i++) {
                 const symbol = symbols[i];
                 if (topic === 'trade') {
@@ -1507,6 +1518,93 @@ class binance extends binance$1 {
         const filtered = this.filterBySinceLimit(candles, since, limit, 0, true);
         return this.createOHLCVObject(symbol, timeframe, filtered);
     }
+    async unWatchOHLCVForSymbols(symbolsAndTimeframes, params = {}) {
+        /**
+         * @method
+         * @name binance#unWatchOHLCVForSymbols
+         * @description unWatches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://binance-docs.github.io/apidocs/spot/en/#kline-candlestick-data
+         * @see https://binance-docs.github.io/apidocs/futures/en/#kline-candlestick-data
+         * @see https://binance-docs.github.io/apidocs/delivery/en/#kline-candlestick-data
+         * @param {string[][]} symbolsAndTimeframes array of arrays containing unified symbols and timeframes to fetch OHLCV data for, example [['BTC/USDT', '1m'], ['LTC/USDT', '5m']]
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {object} [params.timezone] if provided, kline intervals are interpreted in that timezone instead of UTC, example '+08:00'
+         * @returns {int[][]} A list of candles ordered as timestamp, open, high, low, close, volume
+         */
+        await this.loadMarkets();
+        let klineType = undefined;
+        [klineType, params] = this.handleParamString2(params, 'channel', 'name', 'kline');
+        const symbols = this.getListFromObjectValues(symbolsAndTimeframes, 0);
+        const marketSymbols = this.marketSymbols(symbols, undefined, false, false, true);
+        const firstMarket = this.market(marketSymbols[0]);
+        let type = firstMarket['type'];
+        if (firstMarket['contract']) {
+            type = firstMarket['linear'] ? 'future' : 'delivery';
+        }
+        const isSpot = (type === 'spot');
+        let timezone = undefined;
+        [timezone, params] = this.handleParamString(params, 'timezone', undefined);
+        const isUtc8 = (timezone !== undefined) && ((timezone === '+08:00') || Precise["default"].stringEq(timezone, '8'));
+        const rawHashes = [];
+        const subMessageHashes = [];
+        const messageHashes = [];
+        for (let i = 0; i < symbolsAndTimeframes.length; i++) {
+            const symAndTf = symbolsAndTimeframes[i];
+            const symbolString = symAndTf[0];
+            const timeframeString = symAndTf[1];
+            const interval = this.safeString(this.timeframes, timeframeString, timeframeString);
+            const market = this.market(symbolString);
+            let marketId = market['lowercaseId'];
+            if (klineType === 'indexPriceKline') {
+                // weird behavior for index price kline we can't use the perp suffix
+                marketId = marketId.replace('_perp', '');
+            }
+            const shouldUseUTC8 = (isUtc8 && isSpot);
+            const suffix = '@+08:00';
+            const utcSuffix = shouldUseUTC8 ? suffix : '';
+            rawHashes.push(marketId + '@' + klineType + '_' + interval + utcSuffix);
+            subMessageHashes.push('ohlcv::' + market['symbol'] + '::' + timeframeString);
+            messageHashes.push('unsubscribe::ohlcv::' + market['symbol'] + '::' + timeframeString);
+        }
+        const url = this.urls['api']['ws'][type] + '/' + this.stream(type, 'multipleOHLCV');
+        const requestId = this.requestId(url);
+        const request = {
+            'method': 'UNSUBSCRIBE',
+            'params': rawHashes,
+            'id': requestId,
+        };
+        const subscribe = {
+            'unsubscribe': true,
+            'id': requestId.toString(),
+            'symbols': symbols,
+            'symbolsAndTimeframes': symbolsAndTimeframes,
+            'subMessageHashes': subMessageHashes,
+            'messageHashes': messageHashes,
+            'topic': 'ohlcv',
+        };
+        params = this.omit(params, 'callerMethodName');
+        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes, subscribe);
+    }
+    async unWatchOHLCV(symbol, timeframe = '1m', params = {}) {
+        /**
+         * @method
+         * @name binance#unWatchOHLCV
+         * @description unWatches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://binance-docs.github.io/apidocs/spot/en/#kline-candlestick-data
+         * @see https://binance-docs.github.io/apidocs/futures/en/#kline-candlestick-data
+         * @see https://binance-docs.github.io/apidocs/delivery/en/#kline-candlestick-data
+         * @param {string} symbol unified symbol of the market to fetch OHLCV data for
+         * @param {string} timeframe the length of time each candle represents
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {object} [params.timezone] if provided, kline intervals are interpreted in that timezone instead of UTC, example '+08:00'
+         * @returns {int[][]} A list of candles ordered as timestamp, open, high, low, close, volume
+         */
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        symbol = market['symbol'];
+        params['callerMethodName'] = 'watchOHLCV';
+        return await this.unWatchOHLCVForSymbols([[symbol, timeframe]], params);
+    }
     handleOHLCV(client, message) {
         //
         //     {

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

@@ -633,6 +633,58 @@ class bybit extends bybit$1 {
         const filtered = this.filterBySinceLimit(stored, since, limit, 0, true);
         return this.createOHLCVObject(symbol, timeframe, filtered);
     }
+    async unWatchOHLCVForSymbols(symbolsAndTimeframes, params = {}) {
+        /**
+         * @method
+         * @name bybit#unWatchOHLCVForSymbols
+         * @description unWatches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://bybit-exchange.github.io/docs/v5/websocket/public/kline
+         * @see https://bybit-exchange.github.io/docs/v5/websocket/public/etp-kline
+         * @param {string[][]} symbolsAndTimeframes array of arrays containing unified symbols and timeframes to fetch OHLCV data for, example [['BTC/USDT', '1m'], ['LTC/USDT', '5m']]
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} A list of candles ordered as timestamp, open, high, low, close, volume
+         */
+        await this.loadMarkets();
+        const symbols = this.getListFromObjectValues(symbolsAndTimeframes, 0);
+        const marketSymbols = this.marketSymbols(symbols, undefined, false, true, true);
+        const firstSymbol = marketSymbols[0];
+        const url = await this.getUrlByMarketType(firstSymbol, false, 'watchOHLCVForSymbols', params);
+        const rawHashes = [];
+        const subMessageHashes = [];
+        const messageHashes = [];
+        for (let i = 0; i < symbolsAndTimeframes.length; i++) {
+            const data = symbolsAndTimeframes[i];
+            let symbolString = this.safeString(data, 0);
+            const market = this.market(symbolString);
+            symbolString = market['symbol'];
+            const unfiedTimeframe = this.safeString(data, 1);
+            const timeframeId = this.safeString(this.timeframes, unfiedTimeframe, unfiedTimeframe);
+            rawHashes.push('kline.' + timeframeId + '.' + market['id']);
+            subMessageHashes.push('ohlcv::' + symbolString + '::' + unfiedTimeframe);
+            messageHashes.push('unsubscribe::ohlcv::' + symbolString + '::' + unfiedTimeframe);
+        }
+        const subExtension = {
+            'symbolsAndTimeframes': symbolsAndTimeframes,
+        };
+        return await this.unWatchTopics(url, 'ohlcv', symbols, messageHashes, subMessageHashes, rawHashes, params, subExtension);
+    }
+    async unWatchOHLCV(symbol, timeframe = '1m', params = {}) {
+        /**
+         * @method
+         * @name bybit#unWatchOHLCV
+         * @description unWatches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://bybit-exchange.github.io/docs/v5/websocket/public/kline
+         * @see https://bybit-exchange.github.io/docs/v5/websocket/public/etp-kline
+         * @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
+         * @returns {int[][]} A list of candles ordered as timestamp, open, high, low, close, volume
+         */
+        params['callerMethodName'] = 'watchOHLCV';
+        return await this.unWatchOHLCVForSymbols([[symbol, timeframe]], params);
+    }
     handleOHLCV(client, message) {
         //
         //     {
@@ -2142,7 +2194,7 @@ class bybit extends bybit$1 {
         const message = this.extend(request, params);
         return await this.watchMultiple(url, messageHashes, message, messageHashes);
     }
-    async unWatchTopics(url, topic, symbols, messageHashes, subMessageHashes, topics, params = {}) {
+    async unWatchTopics(url, topic, symbols, messageHashes, subMessageHashes, topics, params = {}, subExtension = {}) {
         const reqId = this.requestId();
         const request = {
             'op': 'unsubscribe',
@@ -2157,7 +2209,7 @@ class bybit extends bybit$1 {
             'symbols': symbols,
         };
         const message = this.extend(request, params);
-        return await this.watchMultiple(url, messageHashes, message, messageHashes, subscription);
+        return await this.watchMultiple(url, messageHashes, message, messageHashes, this.extend(subscription, subExtension));
     }
     async authenticate(url, params = {}) {
         this.checkRequiredCredentials();
@@ -2440,8 +2492,8 @@ class bybit extends bybit$1 {
                     const error = new errors.UnsubscribeError(this.id + ' ' + messageHash);
                     client.reject(error, subHash);
                     client.resolve(true, unsubHash);
-                    this.cleanCache(subscription);
                 }
+                this.cleanCache(subscription);
             }
         }
         return message;
@@ -2450,7 +2502,16 @@ class bybit extends bybit$1 {
         const topic = this.safeString(subscription, 'topic');
         const symbols = this.safeList(subscription, 'symbols', []);
         const symbolsLength = symbols.length;
-        if (symbolsLength > 0) {
+        if (topic === 'ohlcv') {
+            const symbolsAndTimeFrames = this.safeList(subscription, 'symbolsAndTimeframes', []);
+            for (let i = 0; i < symbolsAndTimeFrames.length; i++) {
+                const symbolAndTimeFrame = symbolsAndTimeFrames[i];
+                const symbol = this.safeString(symbolAndTimeFrame, 0);
+                const timeframe = this.safeString(symbolAndTimeFrame, 1);
+                delete this.ohlcvs[symbol][timeframe];
+            }
+        }
+        else if (symbolsLength > 0) {
             for (let i = 0; i < symbols.length; i++) {
                 const symbol = symbols[i];
                 if (topic === 'trade') {