ccxt 4.5.39 → 4.5.41

package/js/src/pro/bitget.js

@@ -69,12 +69,10 @@ export default class bitget extends bitgetRest {
                     '1d': '1D',
                     '1w': '1W',
                 },
-                'watchOrderBook': {
-                    'checksum': true,
-                },
                 'watchTrades': {
                     'ignoreDuplicates': true,
                 },
+                'uta': false,
             },
             'streaming': {
                 'ping': this.ping,
@@ -101,10 +99,7 @@ export default class bitget extends bitgetRest {
             },
         });
     }
-    getInstType(market, uta = false, params = {}) {
-        if ((uta === undefined) || !uta) {
-            [uta, params] = this.handleOptionAndParams(params, 'getInstType', 'uta', false);
-        }
+    getInstType(methodName, market, uta = false, params = {}) {
         let instType = undefined;
         if (market === undefined) {
             [instType, params] = this.handleProductTypeAndParams(undefined, params);
@@ -116,7 +111,7 @@ export default class bitget extends bitgetRest {
             instType = 'SPOT';
         }
         let instypeAux = undefined;
-        [instypeAux, params] = this.handleOptionAndParams(params, 'getInstType', 'instType', instType);
+        [instypeAux, params] = this.handleOptionAndParams(params, methodName, 'instType', instType);
         instType = instypeAux;
         if (uta) {
             instType = instType.toLowerCase();
@@ -143,7 +138,7 @@ export default class bitget extends bitgetRest {
         let instType = undefined;
         let uta = undefined;
         [uta, params] = this.handleOptionAndParams(params, 'watchTicker', 'uta', false);
-        [instType, params] = this.getInstType(market, uta, params);
+        [instType, params] = this.getInstType('watchTicker', market, uta, params);
         const args = {
             'instType': instType,
         };
@@ -151,7 +146,7 @@ export default class bitget extends bitgetRest {
         const symbolOrInstId = uta ? 'symbol' : 'instId';
         args[topicOrChannel] = 'ticker';
         args[symbolOrInstId] = market['id'];
-        return await this.watchPublic(messageHash, args, params);
+        return await this.watchPublic(uta, messageHash, args, params);
     }
     /**
      * @method
@@ -165,7 +160,7 @@ export default class bitget extends bitgetRest {
      */
     async unWatchTicker(symbol, params = {}) {
         await this.loadMarkets();
-        return await this.unWatchChannel(symbol, 'ticker', 'ticker', params);
+        return await this.unWatchChannel(symbol, 'ticker', 'ticker', 'watchTicker', params);
     }
     /**
      * @method
@@ -186,7 +181,7 @@ export default class bitget extends bitgetRest {
         let instType = undefined;
         let uta = undefined;
         [uta, params] = this.handleOptionAndParams(params, 'watchTickers', 'uta', false);
-        [instType, params] = this.getInstType(market, uta, params);
+        [instType, params] = this.getInstType('watchTickers', market, uta, params);
         const topics = [];
         const messageHashes = [];
         for (let i = 0; i < symbols.length; i++) {
@@ -202,7 +197,7 @@ export default class bitget extends bitgetRest {
             topics.push(args);
             messageHashes.push('ticker:' + symbol);
         }
-        const tickers = await this.watchPublicMultiple(messageHashes, topics, params);
+        const tickers = await this.watchPublicMultiple(uta, messageHashes, topics, params);
         if (this.newUpdates) {
             const result = {};
             result[tickers['symbol']] = tickers;
@@ -378,8 +373,8 @@ export default class bitget extends bitgetRest {
         const marketId = this.safeString(ticker, 'instId', utaMarketId);
         market = this.safeMarket(marketId, market, undefined, marketType);
         const close = this.safeString2(ticker, 'lastPr', 'lastPrice');
-        const changeDecimal = this.safeString(ticker, 'change24h', '');
-        const change = this.safeString(ticker, 'price24hPcnt', Precise.stringMul(changeDecimal, '100'));
+        const changeCoefficient = this.safeString2(ticker, 'price24hPcnt', 'change24h');
+        const changePercentage = Precise.stringMul(changeCoefficient, '100');
         return this.safeTicker({
             'symbol': market['symbol'],
             'timestamp': timestamp,
@@ -396,7 +391,7 @@ export default class bitget extends bitgetRest {
             'last': close,
             'previousClose': undefined,
             'change': undefined,
-            'percentage': change,
+            'percentage': changePercentage,
             'average': undefined,
             'baseVolume': this.safeString2(ticker, 'baseVolume', 'volume24h'),
             'quoteVolume': this.safeString2(ticker, 'quoteVolume', 'turnover24h'),
@@ -421,8 +416,8 @@ export default class bitget extends bitgetRest {
         const market = this.market(symbols[0]);
         let instType = undefined;
         let uta = undefined;
-        [uta, params] = this.handleOptionAndParams(params, 'watchBidsAsks', 'uta', false);
-        [instType, params] = this.getInstType(market, uta, params);
+        [uta, params] = this.handleOptionAndParams(params, 'watchTickers', 'uta', false);
+        [instType, params] = this.getInstType('watchBidsAsks', market, uta, params);
         const topics = [];
         const messageHashes = [];
         for (let i = 0; i < symbols.length; i++) {
@@ -438,7 +433,7 @@ export default class bitget extends bitgetRest {
             topics.push(args);
             messageHashes.push('bidask:' + symbol);
         }
-        const tickers = await this.watchPublicMultiple(messageHashes, topics, params);
+        const tickers = await this.watchPublicMultiple(uta, messageHashes, topics, params);
         if (this.newUpdates) {
             const result = {};
             result[tickers['symbol']] = tickers;
@@ -500,7 +495,7 @@ export default class bitget extends bitgetRest {
         let instType = undefined;
         let uta = undefined;
         [uta, params] = this.handleOptionAndParams(params, 'watchOHLCV', 'uta', false);
-        [instType, params] = this.getInstType(market, uta, params);
+        [instType, params] = this.getInstType('watchOHLCV', market, uta, params);
         const args = {
             'instType': instType,
         };
@@ -516,7 +511,7 @@ export default class bitget extends bitgetRest {
             args['instId'] = market['id'];
             messageHash = 'candles:' + timeframe + ':' + symbol;
         }
-        const ohlcv = await this.watchPublic(messageHash, args, params);
+        const ohlcv = await this.watchPublic(uta, messageHash, args, params);
         if (this.newUpdates) {
             limit = ohlcv.getLimit(symbol, limit);
         }
@@ -546,9 +541,9 @@ export default class bitget extends bitgetRest {
         }
         let instType = undefined;
         let messageHash = undefined;
-        let uta = undefined;
-        [uta, params] = this.handleOptionAndParams(params, 'unWatchOHLCV', 'uta', false);
-        [instType, params] = this.getInstType(market, uta, params);
+        const values = this.handleOptionAndParams(params, 'watchOHLCV', 'uta', false);
+        const uta = values[0];
+        [instType, params] = this.getInstType('watchOHLCV', market, uta, params);
         const args = {
             'instType': instType,
         };
@@ -567,7 +562,7 @@ export default class bitget extends bitgetRest {
             args['instId'] = market['id'];
             messageHash = 'candles:' + interval;
         }
-        return await this.unWatchChannel(symbol, channel, messageHash, params);
+        return await this.unWatchChannel(symbol, channel, messageHash, 'watchOHLCV', params);
     }
     handleOHLCV(client, message) {
         //
@@ -738,16 +733,16 @@ export default class bitget extends bitgetRest {
             params = this.omit(params, 'limit');
             channel += limit.toString();
         }
-        return await this.unWatchChannel(symbol, channel, 'orderbook', params);
+        return await this.unWatchChannel(symbol, channel, 'orderbook', 'watchOrderBook', params);
     }
-    async unWatchChannel(symbol, channel, messageHashTopic, params = {}) {
+    async unWatchChannel(symbol, channel, messageHashTopic, methodName, params = {}) {
         await this.loadMarkets();
         const market = this.market(symbol);
         const messageHash = 'unsubscribe:' + messageHashTopic + ':' + market['symbol'];
         let instType = undefined;
         let uta = undefined;
-        [uta, params] = this.handleOptionAndParams(params, 'unWatchChannel', 'uta', false);
-        [instType, params] = this.getInstType(market, uta, params);
+        [uta, params] = this.handleOptionAndParams(params, methodName, 'uta', false);
+        [instType, params] = this.getInstType(methodName, market, uta, params);
         const args = {
             'instType': instType,
         };
@@ -762,7 +757,7 @@ export default class bitget extends bitgetRest {
             args['channel'] = channel;
             args['instId'] = market['id'];
         }
-        return await this.unWatchPublic(messageHash, args, params);
+        return await this.unWatchPublic(uta, messageHash, args, params);
     }
     /**
      * @method
@@ -794,7 +789,7 @@ export default class bitget extends bitgetRest {
             const symbol = symbols[i];
             const market = this.market(symbol);
             let instType = undefined;
-            [instType, params] = this.getInstType(market, uta, params);
+            [instType, params] = this.getInstType('watchOrderBookForSymbols', market, uta, params);
             const args = {
                 'instType': instType,
             };
@@ -808,7 +803,7 @@ export default class bitget extends bitgetRest {
         if (uta) {
             params['uta'] = true;
         }
-        const orderbook = await this.watchPublicMultiple(messageHashes, topics, params);
+        const orderbook = await this.watchPublicMultiple(uta, messageHashes, topics, params);
         if (incrementalFeed) {
             return orderbook.limit();
         }
@@ -1005,7 +1000,7 @@ export default class bitget extends bitgetRest {
             const symbol = symbols[i];
             const market = this.market(symbol);
             let instType = undefined;
-            [instType, params] = this.getInstType(market, uta, params);
+            [instType, params] = this.getInstType('watchTradesForSymbols', market, uta, params);
             const args = {
                 'instType': instType,
             };
@@ -1019,7 +1014,7 @@ export default class bitget extends bitgetRest {
         if (uta) {
             params = this.extend(params, { 'uta': true });
         }
-        const trades = await this.watchPublicMultiple(messageHashes, topics, params);
+        const trades = await this.watchPublicMultiple(uta, messageHashes, topics, params);
         if (this.newUpdates) {
             const first = this.safeValue(trades, 0);
             const tradeSymbol = this.safeString(first, 'symbol');
@@ -1046,10 +1041,10 @@ export default class bitget extends bitgetRest {
      * @returns {any} status of the unwatch request
      */
     async unWatchTrades(symbol, params = {}) {
-        let uta = undefined;
-        [uta, params] = this.handleOptionAndParams(params, 'unWatchTrades', 'uta', false);
+        const values = this.handleOptionAndParams(params, 'watchTrades', 'uta', false);
+        const uta = values[0];
         const channelTopic = uta ? 'publicTrade' : 'trade';
-        return await this.unWatchChannel(symbol, channelTopic, 'trade', params);
+        return await this.unWatchChannel(symbol, channelTopic, 'trade', 'watchTrades', params);
     }
     handleTrades(client, message) {
         //
@@ -1271,7 +1266,7 @@ export default class bitget extends bitgetRest {
         symbols = this.marketSymbols(symbols);
         if (!this.isEmpty(symbols)) {
             market = this.getMarketFromSymbols(symbols);
-            [instType, params] = this.getInstType(market, uta, params);
+            [instType, params] = this.getInstType('watchPositions', market, uta, params);
         }
         if (uta) {
             instType = 'UTA';
@@ -1289,7 +1284,7 @@ export default class bitget extends bitgetRest {
         else {
             params = this.extend(params, { 'uta': true });
         }
-        const newPositions = await this.watchPrivate(messageHash, subscriptionHash, args, params);
+        const newPositions = await this.watchPrivate(uta, messageHash, subscriptionHash, args, params);
         if (this.newUpdates) {
             return newPositions;
         }
@@ -1564,7 +1559,7 @@ export default class bitget extends bitgetRest {
             instType = 'SPOT';
         }
         else {
-            [instType, params] = this.getInstType(market, uta, params);
+            [instType, params] = this.getInstType('watchOrders', market, uta, params);
         }
         if (type === 'spot' && (symbol !== undefined)) {
             subscriptionHash = subscriptionHash + ':' + symbol;
@@ -1602,7 +1597,7 @@ export default class bitget extends bitgetRest {
         else {
             params = this.extend(params, { 'uta': true });
         }
-        const orders = await this.watchPrivate(messageHash, subscriptionHash, args, params);
+        const orders = await this.watchPrivate(uta, messageHash, subscriptionHash, args, params);
         if (this.newUpdates) {
             limit = orders.getLimit(symbol, limit);
         }
@@ -2016,6 +2011,7 @@ export default class bitget extends bitgetRest {
     }
     parseWsOrderStatus(status) {
         const statuses = {
+            'new': 'open',
             'live': 'open',
             'partially_filled': 'open',
             'filled': 'closed',
@@ -2055,7 +2051,7 @@ export default class bitget extends bitgetRest {
             instType = 'SPOT';
         }
         else {
-            [instType, params] = this.getInstType(market, uta, params);
+            [instType, params] = this.getInstType('watchMyTrades', market, uta, params);
         }
         if (uta) {
             instType = 'UTA';
@@ -2072,7 +2068,7 @@ export default class bitget extends bitgetRest {
         else {
             params = this.extend(params, { 'uta': true });
         }
-        const trades = await this.watchPrivate(messageHash, subscriptionHash, args, params);
+        const trades = await this.watchPrivate(uta, messageHash, subscriptionHash, args, params);
         if (this.newUpdates) {
             limit = trades.getLimit(symbol, limit);
         }
@@ -2264,7 +2260,7 @@ export default class bitget extends bitgetRest {
             params = this.extend(params, { 'uta': true });
         }
         const messageHash = 'balance:' + instType.toLowerCase();
-        return await this.watchPrivate(messageHash, messageHash, args, params);
+        return await this.watchPrivate(uta, messageHash, messageHash, args, params);
     }
     handleBalance(client, message) {
         //
@@ -2398,16 +2394,8 @@ export default class bitget extends bitgetRest {
         const messageHash = 'balance:' + instType;
         client.resolve(this.balance, messageHash);
     }
-    async watchPublic(messageHash, args, params = {}) {
-        let uta = undefined;
-        let url = undefined;
-        [uta, params] = this.handleOptionAndParams(params, 'watchPublic', 'uta', false);
-        if (uta) {
-            url = this.urls['api']['ws']['utaPublic'];
-        }
-        else {
-            url = this.urls['api']['ws']['public'];
-        }
+    async watchPublic(uta, messageHash, args, params = {}) {
+        let url = uta ? this.urls['api']['ws']['utaPublic'] : this.urls['api']['ws']['public'];
         const sandboxMode = this.safeBool2(this.options, 'sandboxMode', 'sandbox', false);
         if (sandboxMode) {
             const instType = this.safeString(args, 'instType');
@@ -2427,16 +2415,8 @@ export default class bitget extends bitgetRest {
         const message = this.extend(request, params);
         return await this.watch(url, messageHash, message, messageHash);
     }
-    async unWatchPublic(messageHash, args, params = {}) {
-        let uta = undefined;
-        let url = undefined;
-        [uta, params] = this.handleOptionAndParams(params, 'unWatchPublic', 'uta', false);
-        if (uta) {
-            url = this.urls['api']['ws']['utaPublic'];
-        }
-        else {
-            url = this.urls['api']['ws']['public'];
-        }
+    async unWatchPublic(uta, messageHash, args, params = {}) {
+        let url = uta ? this.urls['api']['ws']['utaPublic'] : this.urls['api']['ws']['public'];
         const sandboxMode = this.safeBool2(this.options, 'sandboxMode', 'sandbox', false);
         if (sandboxMode) {
             const instType = this.safeString(args, 'instType');
@@ -2456,27 +2436,14 @@ export default class bitget extends bitgetRest {
         const message = this.extend(request, params);
         return await this.watch(url, messageHash, message, messageHash);
     }
-    async watchPublicMultiple(messageHashes, argsArray, params = {}) {
-        let uta = undefined;
-        let url = undefined;
-        [uta, params] = this.handleOptionAndParams(params, 'watchPublicMultiple', 'uta', false);
-        if (uta) {
-            url = this.urls['api']['ws']['utaPublic'];
-        }
-        else {
-            url = this.urls['api']['ws']['public'];
-        }
+    async watchPublicMultiple(uta, messageHashes, argsArray, params = {}) {
+        let url = uta ? this.urls['api']['ws']['utaPublic'] : this.urls['api']['ws']['public'];
         const sandboxMode = this.safeBool2(this.options, 'sandboxMode', 'sandbox', false);
         if (sandboxMode) {
             const argsArrayFirst = this.safeDict(argsArray, 0, {});
             const instType = this.safeString(argsArrayFirst, 'instType');
             if ((instType !== 'SCOIN-FUTURES') && (instType !== 'SUSDT-FUTURES') && (instType !== 'SUSDC-FUTURES')) {
-                if (uta) {
-                    url = this.urls['api']['demo']['utaPublic'];
-                }
-                else {
-                    url = this.urls['api']['demo']['public'];
-                }
+                url = uta ? this.urls['api']['demo']['utaPublic'] : this.urls['api']['demo']['public'];
             }
         }
         const request = {
@@ -2514,16 +2481,8 @@ export default class bitget extends bitgetRest {
         }
         return await future;
     }
-    async watchPrivate(messageHash, subscriptionHash, args, params = {}) {
-        let uta = undefined;
-        let url = undefined;
-        [uta, params] = this.handleOptionAndParams(params, 'watchPrivate', 'uta', false);
-        if (uta) {
-            url = this.urls['api']['ws']['utaPrivate'];
-        }
-        else {
-            url = this.urls['api']['ws']['private'];
-        }
+    async watchPrivate(uta, messageHash, subscriptionHash, args, params = {}) {
+        let url = uta ? this.urls['api']['ws']['utaPrivate'] : this.urls['api']['ws']['private'];
         const sandboxMode = this.safeBool2(this.options, 'sandboxMode', 'sandbox', false);
         if (sandboxMode) {
             const instType = this.safeString(args, 'instType');

package/js/src/pro/bitmart.d.ts

@@ -1,5 +1,5 @@
 import bitmartRest from '../bitmart.js';
-import type { Int, Market, Str, Strings, OrderBook, Order, Trade, Ticker, Tickers, OHLCV, Position, Balances, Dict, Bool } from '../base/types.js';
+import type { Int, Market, Str, Strings, OrderBook, Order, Trade, Ticker, Tickers, OHLCV, Position, Balances, Dict, Bool, FundingRate, FundingRates } from '../base/types.js';
 import Client from '../base/ws/Client.js';
 export default class bitmart extends bitmartRest {
     describe(): any;
@@ -261,6 +261,27 @@ export default class bitmart extends bitmartRest {
      * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
      */
     unWatchOrderBookForSymbols(symbols: string[], params?: {}): Promise<any>;
+    /**
+     * @method
+     * @name bitmart#watchFundingRate
+     * @description watch the current funding rate
+     * @see https://developer-pro.bitmart.com/en/futuresv2/#public-funding-rate-channel
+     * @param {string} symbol unified market symbol
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @returns {object} a [funding rate structure]{@link https://docs.ccxt.com/?id=funding-rate-structure}
+     */
+    watchFundingRate(symbol: string, params?: {}): Promise<FundingRate>;
+    /**
+     * @method
+     * @name bitmart#watchFundingRates
+     * @description watch the funding rate for multiple markets
+     * @see https://developer-pro.bitmart.com/en/futuresv2/#public-funding-rate-channel
+     * @param {string[]} symbols a list of unified market symbols
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @returns {object} a dictionary of [funding rate structures]{@link https://docs.ccxt.com/?id=funding-rate-structure}, indexed by market symbols
+     */
+    watchFundingRates(symbols?: Strings, params?: {}): Promise<FundingRates>;
+    handleFundingRate(client: Client, message: any): void;
     authenticate(type: any, params?: {}): Promise<any>;
     handleSubscriptionStatus(client: Client, message: any): any;
     handleAuthenticate(client: Client, message: any): void;

package/js/src/pro/bitmart.js

@@ -1,6 +1,6 @@
 //  ---------------------------------------------------------------------------
 import bitmartRest from '../bitmart.js';
-import { AuthenticationError, ExchangeError, NotSupported } from '../base/errors.js';
+import { AuthenticationError, ExchangeError, NotSupported, ArgumentsRequired } from '../base/errors.js';
 import { ArrayCache, ArrayCacheByTimestamp, ArrayCacheBySymbolById, ArrayCacheBySymbolBySide } from '../base/ws/Cache.js';
 import { sha256 } from '../static_dependencies/noble-hashes/sha256.js';
 import { Asks, Bids } from '../base/ws/OrderBookSide.js';
@@ -18,6 +18,8 @@ export default class bitmart extends bitmartRest {
                 'cancelAllOrdersWs': false,
                 'ws': true,
                 'watchBalance': true,
+                'watchFundingRate': true,
+                'watchFundingRates': true,
                 'watchTicker': true,
                 'watchTickers': true,
                 'watchBidsAsks': true,
@@ -1737,6 +1739,69 @@ export default class bitmart extends bitmartRest {
         params = this.extend(params, { 'unsubscribe': true });
         return await this.subscribeMultiple(channel, type, symbols, params);
     }
+    /**
+     * @method
+     * @name bitmart#watchFundingRate
+     * @description watch the current funding rate
+     * @see https://developer-pro.bitmart.com/en/futuresv2/#public-funding-rate-channel
+     * @param {string} symbol unified market symbol
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @returns {object} a [funding rate structure]{@link https://docs.ccxt.com/?id=funding-rate-structure}
+     */
+    async watchFundingRate(symbol, params = {}) {
+        await this.loadMarkets();
+        symbol = this.symbol(symbol);
+        const fundingRate = await this.watchFundingRates([symbol], params);
+        return fundingRate[symbol];
+    }
+    /**
+     * @method
+     * @name bitmart#watchFundingRates
+     * @description watch the funding rate for multiple markets
+     * @see https://developer-pro.bitmart.com/en/futuresv2/#public-funding-rate-channel
+     * @param {string[]} symbols a list of unified market symbols
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @returns {object} a dictionary of [funding rate structures]{@link https://docs.ccxt.com/?id=funding-rate-structure}, indexed by market symbols
+     */
+    async watchFundingRates(symbols = undefined, params = {}) {
+        if (symbols === undefined) {
+            throw new ArgumentsRequired(this.id + ' watchFundingRates() requires an array of symbols');
+        }
+        await this.loadMarkets();
+        const market = this.getMarketFromSymbols(symbols);
+        let marketType = undefined;
+        [marketType, params] = this.handleMarketTypeAndParams('watchFundingRates', market, params);
+        const fundingRate = await this.subscribeMultiple('fundingRate', marketType, symbols, params);
+        if (this.newUpdates) {
+            const fundingRates = {};
+            fundingRates[fundingRate['symbol']] = fundingRate;
+            return fundingRates;
+        }
+        return this.filterByArray(this.fundingRates, 'symbol', symbols);
+    }
+    handleFundingRate(client, message) {
+        //
+        //     {
+        //         "data": {
+        //             "symbol": "BTCUSDT",
+        //             "fundingRate": "0.0000561",
+        //             "fundingTime": 1770978448000,
+        //             "nextFundingRate": "-0.0000195",
+        //             "nextFundingTime": 1770998400000,
+        //             "funding_upper_limit": "0.0375",
+        //             "funding_lower_limit": "-0.0375",
+        //             "ts": 1770978448970
+        //         },
+        //         "group": "futures/fundingRate:BTCUSDT"
+        //     }
+        //
+        const data = this.safeDict(message, 'data', {});
+        const fundingRate = this.parseFundingRate(data);
+        const symbol = fundingRate['symbol'];
+        this.fundingRates[symbol] = fundingRate;
+        const messageHash = 'fundingRate:' + symbol;
+        client.resolve(fundingRate, messageHash);
+    }
     async authenticate(type, params = {}) {
         this.checkRequiredCredentials();
         const url = this.implodeHostname(this.urls['api']['ws'][type]['private']);
@@ -2026,6 +2091,9 @@ export default class bitmart extends bitmartRest {
                 'balance': this.handleBalance,
                 'asset': this.handleBalance,
             };
+            if (channel.indexOf('fundingRate') >= 0) {
+                this.handleFundingRate(client, message);
+            }
             const keys = Object.keys(methods);
             for (let i = 0; i < keys.length; i++) {
                 const key = keys[i];

package/js/src/pro/blofin.d.ts

@@ -1,5 +1,5 @@
 import blofinRest from '../blofin.js';
-import type { Int, Market, Trade, OrderBook, Strings, Ticker, Tickers, OHLCV, Balances, Str, Order, Position } from '../base/types.js';
+import type { Int, Market, Trade, OrderBook, Strings, Ticker, Tickers, OHLCV, Balances, Str, Order, Position, FundingRate } from '../base/types.js';
 import Client from '../base/ws/Client.js';
 export default class blofin extends blofinRest {
     describe(): any;
@@ -169,6 +169,17 @@ export default class blofin extends blofinRest {
     watchPositions(symbols?: Strings, since?: Int, limit?: Int, params?: {}): Promise<Position[]>;
     handlePositions(client: Client, message: any): void;
     parseWsPosition(position: any, market?: Market): Position;
+    /**
+     * @method
+     * @name blofin#watchFundingRate
+     * @description watch the current funding rate
+     * @see https://docs.blofin.com/index.html#ws-funding-rate-channel
+     * @param {string} symbol unified market symbol
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @returns {object} a [funding rate structure]{@link https://docs.ccxt.com/?id=funding-rate-structure}
+     */
+    watchFundingRate(symbol: string, params?: {}): Promise<FundingRate>;
+    handleFundingRate(client: Client, message: any): void;
     watchMultipleWrapper(isPublic: boolean, channelName: string, callerMethodName: string, symbolsArray?: any[], params?: {}): Promise<any>;
     getSubscriptionRequest(args: any): {
         op: string;

package/js/src/pro/blofin.js

@@ -9,6 +9,8 @@ export default class blofin extends blofinRest {
         return this.deepExtend(super.describe(), {
             'has': {
                 'ws': true,
+                'watchFundingRate': true,
+                'watchFundingRates': false,
                 'watchTrades': true,
                 'watchTradesForSymbols': true,
                 'watchOrderBook': true,
@@ -102,7 +104,8 @@ export default class blofin extends blofinRest {
             const firstSymbol = this.safeString(firstMarket, 'symbol');
             limit = trades.getLimit(firstSymbol, limit);
         }
-        return this.filterBySinceLimit(trades, since, limit, 'timestamp', true);
+        const result = this.filterBySinceLimit(trades, since, limit, 'timestamp', true);
+        return this.sortBy(result, 'timestamp'); // needed bcz of https://github.com/ccxt/ccxt/actions/runs/20755599430/job/59597237029?pr=27624#step:11:611
     }
     handleTrades(client, message) {
         //
@@ -598,6 +601,53 @@ export default class blofin extends blofinRest {
     parseWsPosition(position, market = undefined) {
         return this.parsePosition(position, market);
     }
+    /**
+     * @method
+     * @name blofin#watchFundingRate
+     * @description watch the current funding rate
+     * @see https://docs.blofin.com/index.html#ws-funding-rate-channel
+     * @param {string} symbol unified market symbol
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @returns {object} a [funding rate structure]{@link https://docs.ccxt.com/?id=funding-rate-structure}
+     */
+    async watchFundingRate(symbol, params = {}) {
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        let marketType = undefined;
+        [marketType, params] = this.handleMarketTypeAndParams('watchFundingRate', market, params);
+        const messageHash = 'fundingRate:' + market['symbol'];
+        const requestParams = {
+            'channel': 'funding-rate',
+            'instId': market['id'],
+        };
+        const request = this.getSubscriptionRequest([requestParams]);
+        const url = this.implodeHostname(this.urls['api']['ws'][marketType]['public']);
+        return await this.watch(url, messageHash, this.deepExtend(request, params), messageHash);
+    }
+    handleFundingRate(client, message) {
+        //
+        //     {
+        //         "arg": {
+        //             "channel": "funding-rate",
+        //             "instId": "BTC-USDT"
+        //         },
+        //         "data": [
+        //             {
+        //                 "instId": "BTC-USDT",
+        //                 "fundingRate": "0.00007873240488719234",
+        //                 "fundingTime": "1771430400000"
+        //             }
+        //         ]
+        //     }
+        //
+        const data = this.safeList(message, 'data', []);
+        const first = this.safeDict(data, 0, {});
+        const fundingRate = this.parseFundingRate(first);
+        const symbol = fundingRate['symbol'];
+        this.fundingRates[symbol] = fundingRate;
+        const messageHash = 'fundingRate:' + symbol;
+        client.resolve(fundingRate, messageHash);
+    }
     async watchMultipleWrapper(isPublic, channelName, callerMethodName, symbolsArray = undefined, params = {}) {
         // underlier method for all watch-multiple symbols
         await this.loadMarkets();
@@ -690,6 +740,7 @@ export default class blofin extends blofinRest {
             'orders': this.handleOrders,
             'orders-algo': this.handleOrders,
             'positions': this.handlePositions,
+            'funding-rate': this.handleFundingRate,
         };
         let method = undefined;
         if (message === 'pong') {

package/js/src/pro/coinbaseinternational.d.ts

@@ -40,11 +40,11 @@ export default class coinbaseinternational extends coinbaseinternationalRest {
      * @name coinbaseinternational#watchFundingRates
      * @description watch the funding rate for multiple markets
      * @see https://docs.cloud.coinbase.com/intx/docs/websocket-channels#funding-channel
-     * @param {string[]|undefined} symbols list of unified market symbols
+     * @param {string[]} symbols a list of unified market symbols
      * @param {object} [params] extra parameters specific to the exchange API endpoint
      * @returns {object} a dictionary of [funding rates structures]{@link https://docs.ccxt.com/?id=funding-rates-structure}, indexe by market symbols
      */
-    watchFundingRates(symbols: string[], params?: {}): Promise<FundingRates>;
+    watchFundingRates(symbols?: Strings, params?: {}): Promise<FundingRates>;
     /**
      * @method
      * @name coinbaseinternational#watchTicker