ccxt 4.2.55 → 4.2.57

package/js/src/mexc.js

@@ -74,6 +74,8 @@ export default class mexc extends Exchange {
                 'fetchL2OrderBook': true,
                 'fetchLedger': undefined,
                 'fetchLedgerEntry': undefined,
+                'fetchLeverage': true,
+                'fetchLeverages': false,
                 'fetchLeverageTiers': true,
                 'fetchMarginMode': false,
                 'fetchMarketLeverageTiers': undefined,
@@ -5377,6 +5379,79 @@ export default class mexc extends Exchange {
         }
         return this.assignDefaultDepositWithdrawFees(result);
     }
+    async fetchLeverage(symbol, params = {}) {
+        /**
+         * @method
+         * @name mexc#fetchLeverage
+         * @description fetch the set leverage for a market
+         * @see https://mexcdevelop.github.io/apidocs/contract_v1_en/#get-leverage
+         * @param {string} symbol unified market symbol
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a [leverage structure]{@link https://docs.ccxt.com/#/?id=leverage-structure}
+         */
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        const request = {
+            'symbol': market['id'],
+        };
+        const response = await this.contractPrivateGetPositionLeverage(this.extend(request, params));
+        //
+        //     {
+        //         "success": true,
+        //         "code": 0,
+        //         "data": [
+        //             {
+        //                 "level": 1,
+        //                 "maxVol": 463300,
+        //                 "mmr": 0.004,
+        //                 "imr": 0.005,
+        //                 "positionType": 1,
+        //                 "openType": 1,
+        //                 "leverage": 20,
+        //                 "limitBySys": false,
+        //                 "currentMmr": 0.004
+        //             },
+        //             {
+        //                 "level": 1,
+        //                 "maxVol": 463300,
+        //                 "mmr": 0.004,
+        //                 "imr": 0.005,
+        //                 "positionType": 2,
+        //                 "openType": 1,
+        //                 "leverage": 20,
+        //                 "limitBySys": false,
+        //                 "currentMmr": 0.004
+        //             }
+        //         ]
+        //     }
+        //
+        const data = this.safeList(response, 'data', []);
+        const longLeverage = this.safeDict(data, 0);
+        return this.parseLeverage(longLeverage, market);
+    }
+    parseLeverage(leverage, market = undefined) {
+        //
+        //     {
+        //         "level": 1,
+        //         "maxVol": 463300,
+        //         "mmr": 0.004,
+        //         "imr": 0.005,
+        //         "positionType": 1,
+        //         "openType": 1,
+        //         "leverage": 20,
+        //         "limitBySys": false,
+        //         "currentMmr": 0.004
+        //     }
+        //
+        const marketId = this.safeString(leverage, 'symbol');
+        market = this.safeMarket(marketId, market, undefined, 'contract');
+        return {
+            'info': leverage,
+            'symbol': market['symbol'],
+            'leverage': this.safeInteger(leverage, 'leverage'),
+            'marginMode': undefined,
+        };
+    }
     handleMarginModeAndParams(methodName, params = {}, defaultValue = undefined) {
         /**
          * @ignore

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

@@ -34,7 +34,6 @@ export default class bitget extends bitgetRest {
     parseWsOrderStatus(status: any): string;
     watchMyTrades(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<Trade[]>;
     handleMyTrades(client: Client, message: any): void;
-    parseWsMyTrade(trade: any, market?: any): Trade;
     watchBalance(params?: {}): Promise<Balances>;
     handleBalance(client: Client, message: any): void;
     watchPublic(messageHash: any, args: any, params?: {}): Promise<any>;

package/js/src/pro/bitget.js

@@ -92,7 +92,10 @@ export default class bitget extends bitgetRest {
     }
     getInstType(market, params = {}) {
         let instType = undefined;
-        if ((market['swap']) || (market['future'])) {
+        if (market === undefined) {
+            [instType, params] = this.handleProductTypeAndParams(undefined, params);
+        }
+        else if ((market['swap']) || (market['future'])) {
             [instType, params] = this.handleProductTypeAndParams(market, params);
         }
         else {
@@ -669,9 +672,12 @@ export default class bitget extends bitgetRest {
             stored = new ArrayCache(limit);
             this.trades[symbol] = stored;
         }
-        const data = this.safeValue(message, 'data', []);
-        for (let j = 0; j < data.length; j++) {
-            const rawTrade = data[j];
+        const data = this.safeList(message, 'data', []);
+        const length = data.length;
+        const maxLength = Math.max(length - 1, 0);
+        // fix chronological order by reversing
+        for (let i = maxLength; i >= 0; i--) {
+            const rawTrade = data[i];
             const parsed = this.parseWsTrade(rawTrade, market);
             stored.append(parsed);
         }
@@ -688,22 +694,71 @@ export default class bitget extends bitgetRest {
         //         "tradeId": "1116461060594286593"
         //     }
         //
-        market = this.safeMarket(undefined, market);
-        const timestamp = this.safeInteger(trade, 'ts');
+        // order with trade in it
+        //     {
+        //         accBaseVolume: '0.1',
+        //         baseVolume: '0.1',
+        //         cTime: '1709221342922',
+        //         clientOid: '1147122943507734528',
+        //         enterPointSource: 'API',
+        //         feeDetail: [Array],
+        //         fillFee: '-0.0049578',
+        //         fillFeeCoin: 'USDT',
+        //         fillNotionalUsd: '8.263',
+        //         fillPrice: '82.63',
+        //         fillTime: '1709221342986',
+        //         force: 'gtc',
+        //         instId: 'LTCUSDT',
+        //         leverage: '10',
+        //         marginCoin: 'USDT',
+        //         marginMode: 'crossed',
+        //         notionalUsd: '8.268',
+        //         orderId: '1147122943499345921',
+        //         orderType: 'market',
+        //         pnl: '0',
+        //         posMode: 'hedge_mode',
+        //         posSide: 'short',
+        //         price: '0',
+        //         priceAvg: '82.63',
+        //         reduceOnly: 'no',
+        //         side: 'sell',
+        //         size: '0.1',
+        //         status: 'filled',
+        //         tradeId: '1147122943772479563',
+        //         tradeScope: 'T',
+        //         tradeSide: 'open',
+        //         uTime: '1709221342986'
+        //     }
+        //
+        const instId = this.safeString(trade, 'instId');
+        if (market === undefined) {
+            market = this.safeMarket(instId, undefined, undefined, 'contract');
+        }
+        const timestamp = this.safeIntegerN(trade, ['uTime', 'cTime', 'ts']);
+        const feeCost = this.safeString(trade, 'fillFee');
+        let fee = undefined;
+        if (feeCost !== undefined) {
+            const feeCurrencyId = this.safeString(trade, 'fillFeeCoin');
+            const feeCurrencyCode = this.safeCurrencyCode(feeCurrencyId);
+            fee = {
+                'cost': Precise.stringAbs(feeCost),
+                'currency': feeCurrencyCode,
+            };
+        }
         return this.safeTrade({
             'info': trade,
             'id': this.safeString(trade, 'tradeId'),
-            'order': undefined,
+            'order': this.safeString(trade, 'orderId'),
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
             'symbol': market['symbol'],
             'type': undefined,
             'side': this.safeString(trade, 'side'),
             'takerOrMaker': undefined,
-            'price': this.safeString(trade, 'price'),
+            'price': this.safeString2(trade, 'priceAvg', 'price'),
             'amount': this.safeString(trade, 'size'),
-            'cost': undefined,
-            'fee': undefined,
+            'cost': this.safeString(trade, 'fillNotionalUsd'),
+            'fee': fee,
         }, market);
     }
     async watchPositions(symbols = undefined, since = undefined, limit = undefined, params = {}) {
@@ -1108,6 +1163,9 @@ export default class bitget extends bitgetRest {
         const marketSymbols = {};
         for (let i = 0; i < data.length; i++) {
             const order = data[i];
+            if ('tradeId' in order) {
+                this.handleMyTrades(client, order);
+            }
             const marketId = this.safeString(order, 'instId');
             const market = this.safeMarket(marketId, undefined, undefined, marketType);
             const parsed = this.parseWsOrder(order, market);
@@ -1373,7 +1431,7 @@ export default class bitget extends bitgetRest {
             this.myTrades = new ArrayCache(limit);
         }
         const stored = this.myTrades;
-        const parsed = this.parseWsMyTrade(message);
+        const parsed = this.parseWsTrade(message);
         stored.append(parsed);
         const symbol = parsed['symbol'];
         const messageHash = 'myTrades';
@@ -1381,68 +1439,6 @@ export default class bitget extends bitgetRest {
         const symbolSpecificMessageHash = 'myTrades:' + symbol;
         client.resolve(stored, symbolSpecificMessageHash);
     }
-    parseWsMyTrade(trade, market = undefined) {
-        //
-        // order and trade mixin (contract)
-        //
-        //     {
-        //         "accBaseVolume": "0",
-        //         "cTime": "1701920553759",
-        //         "clientOid": "1116501214318198793",
-        //         "enterPointSource": "WEB",
-        //         "feeDetail": [{
-        //             "feeCoin": "USDT",
-        //             "fee": "-0.162003"
-        //         }],
-        //         "force": "gtc",
-        //         "instId": "BTCUSDT",
-        //         "leverage": "20",
-        //         "marginCoin": "USDT",
-        //         "marginMode": "isolated",
-        //         "notionalUsd": "105",
-        //         "orderId": "1116501214293032964",
-        //         "orderType": "limit",
-        //         "posMode": "hedge_mode",
-        //         "posSide": "long",
-        //         "price": "35000",
-        //         "reduceOnly": "no",
-        //         "side": "buy",
-        //         "size": "0.003",
-        //         "status": "canceled",
-        //         "tradeSide": "open",
-        //         "uTime": "1701920595866"
-        //     }
-        //
-        const marketId = this.safeString(trade, 'instId');
-        market = this.safeMarket(marketId, market, undefined, 'contract');
-        const timestamp = this.safeInteger2(trade, 'uTime', 'cTime');
-        const orderFee = this.safeValue(trade, 'feeDetail', []);
-        const fee = this.safeValue(orderFee, 0);
-        const feeAmount = this.safeString(fee, 'fee');
-        let feeObject = undefined;
-        if (feeAmount !== undefined) {
-            const feeCurrency = this.safeString(fee, 'feeCoin');
-            feeObject = {
-                'cost': Precise.stringAbs(feeAmount),
-                'currency': this.safeCurrencyCode(feeCurrency),
-            };
-        }
-        return this.safeTrade({
-            'info': trade,
-            'id': undefined,
-            'order': this.safeString(trade, 'orderId'),
-            'timestamp': timestamp,
-            'datetime': this.iso8601(timestamp),
-            'symbol': market['symbol'],
-            'type': this.safeString(trade, 'orderType'),
-            'side': this.safeString(trade, 'side'),
-            'takerOrMaker': undefined,
-            'price': this.safeString(trade, 'price'),
-            'amount': this.safeString(trade, 'size'),
-            'cost': this.safeString(trade, 'notionalUsd'),
-            'fee': feeObject,
-        }, market);
-    }
     async watchBalance(params = {}) {
         /**
          * @method

package/js/src/pro/bitmex.js

@@ -63,17 +63,9 @@ export default class bitmex extends bitmexRest {
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
         await this.loadMarkets();
-        const market = this.market(symbol);
-        const name = 'instrument';
-        const messageHash = name + ':' + market['id'];
-        const url = this.urls['api']['ws'];
-        const request = {
-            'op': 'subscribe',
-            'args': [
-                messageHash,
-            ],
-        };
-        return await this.watch(url, messageHash, this.extend(request, params), messageHash);
+        symbol = this.symbol(symbol);
+        const tickers = await this.watchTickers([symbol], params);
+        return tickers[symbol];
     }
     async watchTickers(symbols = undefined, params = {}) {
         /**
@@ -89,26 +81,27 @@ export default class bitmex extends bitmexRest {
         const name = 'instrument';
         const url = this.urls['api']['ws'];
         const messageHashes = [];
+        const rawSubscriptions = [];
         if (symbols !== undefined) {
             for (let i = 0; i < symbols.length; i++) {
                 const symbol = symbols[i];
                 const market = this.market(symbol);
-                const hash = name + ':' + market['id'];
-                messageHashes.push(hash);
+                const subscription = name + ':' + market['id'];
+                rawSubscriptions.push(subscription);
+                const messageHash = 'ticker:' + symbol;
+                messageHashes.push(messageHash);
             }
         }
         else {
-            messageHashes.push(name);
+            rawSubscriptions.push(name);
+            messageHashes.push('alltickers');
         }
         const request = {
             'op': 'subscribe',
-            'args': messageHashes,
+            'args': rawSubscriptions,
         };
-        const ticker = await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
+        const ticker = await this.watchMultiple(url, messageHashes, this.extend(request, params), rawSubscriptions);
         if (this.newUpdates) {
-            if (symbols === undefined) {
-                return ticker;
-            }
             const result = {};
             result[ticker['symbol']] = ticker;
             return result;
@@ -342,23 +335,23 @@ export default class bitmex extends bitmexRest {
         //         ]
         //     }
         //
-        const table = this.safeString(message, 'table');
         const data = this.safeList(message, 'data', []);
         const tickers = {};
         for (let i = 0; i < data.length; i++) {
             const update = data[i];
             const marketId = this.safeString(update, 'symbol');
-            const market = this.safeMarket(marketId);
-            const symbol = market['symbol'];
-            const messageHash = table + ':' + marketId;
-            const ticker = this.safeDict(this.tickers, symbol, {});
-            const info = this.safeDict(ticker, 'info', {});
-            const parsedTicker = this.parseTicker(this.extend(info, update), market);
-            tickers[symbol] = parsedTicker;
-            this.tickers[symbol] = parsedTicker;
-            client.resolve(ticker, messageHash);
+            const symbol = this.safeSymbol(marketId);
+            if (!(symbol in this.tickers)) {
+                this.tickers[symbol] = this.parseTicker({});
+            }
+            const updatedTicker = this.parseTicker(update);
+            const fullParsedTicker = this.deepExtend(this.tickers[symbol], updatedTicker);
+            tickers[symbol] = fullParsedTicker;
+            this.tickers[symbol] = fullParsedTicker;
+            const messageHash = 'ticker:' + symbol;
+            client.resolve(fullParsedTicker, messageHash);
+            client.resolve(fullParsedTicker, 'alltickers');
         }
-        client.resolve(tickers, 'instrument');
         return message;
     }
     async watchBalance(params = {}) {
@@ -1338,7 +1331,7 @@ export default class bitmex extends bitmexRest {
             const messageHash = table + ':' + market['id'];
             const result = [
                 this.parse8601(this.safeString(candle, 'timestamp')) - duration * 1000,
-                this.safeFloat(candle, 'open'),
+                undefined,
                 this.safeFloat(candle, 'high'),
                 this.safeFloat(candle, 'low'),
                 this.safeFloat(candle, 'close'),

package/js/src/pro/bybit.js

@@ -331,15 +331,29 @@ export default class bybit extends bybitRest {
         //             "price24hPcnt": "-0.0388"
         //         }
         //     }
+        // swap delta
+        //     {
+        //         "topic":"tickers.AAVEUSDT",
+        //         "type":"delta",
+        //         "data":{
+        //            "symbol":"AAVEUSDT",
+        //            "bid1Price":"112.89",
+        //            "bid1Size":"2.12",
+        //            "ask1Price":"112.90",
+        //            "ask1Size":"5.02"
+        //         },
+        //         "cs":78039939929,
+        //         "ts":1709210212704
+        //     }
         //
         const topic = this.safeString(message, 'topic', '');
         const updateType = this.safeString(message, 'type', '');
-        const data = this.safeValue(message, 'data', {});
-        const isSpot = this.safeString(data, 'fundingRate') === undefined;
+        const data = this.safeDict(message, 'data', {});
+        const isSpot = this.safeString(data, 'usdIndexPrice') !== undefined;
         const type = isSpot ? 'spot' : 'contract';
         let symbol = undefined;
         let parsed = undefined;
-        if ((updateType === 'snapshot') || isSpot) {
+        if ((updateType === 'snapshot')) {
             parsed = this.parseTicker(data);
             symbol = parsed['symbol'];
         }
@@ -350,8 +364,8 @@ export default class bybit extends bybitRest {
             const market = this.safeMarket(marketId, undefined, undefined, type);
             symbol = market['symbol'];
             // update the info in place
-            const ticker = this.safeValue(this.tickers, symbol, {});
-            const rawTicker = this.safeValue(ticker, 'info', {});
+            const ticker = this.safeDict(this.tickers, symbol, {});
+            const rawTicker = this.safeDict(ticker, 'info', {});
             const merged = this.extend(rawTicker, data);
             parsed = this.parseTicker(merged);
         }

package/js/src/pro/cex.js

@@ -1091,7 +1091,10 @@ export default class cex extends cexRest {
         for (let i = 0; i < sorted.length; i++) {
             stored.append(this.parseOHLCV(sorted[i], market));
         }
-        this.ohlcvs[symbol] = stored;
+        if (!(symbol in this.ohlcvs)) {
+            this.ohlcvs[symbol] = {};
+        }
+        this.ohlcvs[symbol]['unknown'] = stored;
         client.resolve(stored, messageHash);
     }
     handleOHLCV24(client, message) {
@@ -1150,7 +1153,8 @@ export default class cex extends cexRest {
         const pair = this.safeString(message, 'pair');
         const symbol = this.pairToSymbol(pair);
         const messageHash = 'ohlcv:' + symbol;
-        const stored = this.safeValue(this.ohlcvs, symbol);
+        // const stored = this.safeValue (this.ohlcvs, symbol);
+        const stored = this.ohlcvs[symbol]['unknown'];
         for (let i = 0; i < data.length; i++) {
             const ohlcv = [
                 this.safeTimestamp(data[i], 0),

package/js/src/pro/coinex.js

@@ -390,14 +390,17 @@ export default class coinex extends coinexRest {
         const keys = Object.keys(this.ohlcvs);
         const keysLength = keys.length;
         if (keysLength === 0) {
+            this.ohlcvs['unknown'] = {};
             const limit = this.safeInteger(this.options, 'OHLCVLimit', 1000);
-            this.ohlcvs = new ArrayCacheByTimestamp(limit);
+            const stored = new ArrayCacheByTimestamp(limit);
+            this.ohlcvs['unknown']['unknown'] = stored;
         }
+        const ohlcv = this.ohlcvs['unknown']['unknown'];
         for (let i = 0; i < ohlcvs.length; i++) {
             const candle = ohlcvs[i];
-            this.ohlcvs.append(candle);
+            ohlcv.append(candle);
         }
-        client.resolve(this.ohlcvs, messageHash);
+        client.resolve(ohlcv, messageHash);
     }
     async watchTicker(symbol, params = {}) {
         /**

package/js/src/pro/currencycom.js

@@ -93,7 +93,7 @@ export default class currencycom extends currencycomRest {
         //                     "accountId": 5470310874305732,
         //                     "collateralCurrency": true,
         //                     "asset": "USD",
-        //                     "free": 47.82576735,
+        //                     "free": 47.82576736,
         //                     "locked": 1.187925,
         //                     "default": true
         //                 },
@@ -463,6 +463,7 @@ export default class currencycom extends currencycomRest {
             orderbook = this.orderBook();
         }
         orderbook.reset({
+            'symbol': symbol,
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
         });

package/js/src/pro/kraken.js

@@ -358,7 +358,7 @@ export default class kraken extends krakenRest {
         //     [
         //         0, // channelID
         //         [ //     price        volume         time             side type misc
-        //             [ "5541.20000", "0.15850568", "1534614057.321597", "s", "l", "" ],
+        //             [ "5541.20000", "0.15850568", "1534614057.321596", "s", "l", "" ],
         //             [ "6060.00000", "0.02455000", "1534614057.324998", "b", "l", "" ],
         //         ],
         //         "trade",

package/js/src/pro/mexc.js

@@ -247,7 +247,7 @@ export default class mexc extends mexcRest {
         //        "d": {
         //            "e": "spot@public.kline.v3.api",
         //            "k": {
-        //                "t": 1678642260,
+        //                "t": 1678642261,
         //                "o": 20626.94,
         //                "c": 20599.69,
         //                "h": 20626.94,
@@ -460,7 +460,7 @@ export default class mexc extends mexcRest {
             client.subscriptions[messageHash] = 1;
             this.orderbooks[symbol] = this.countedOrderBook({});
         }
-        const storedOrderBook = this.safeValue(this.orderbooks, symbol);
+        const storedOrderBook = this.orderbooks[symbol];
         const nonce = this.safeInteger(storedOrderBook, 'nonce');
         if (nonce === undefined) {
             const cacheLength = storedOrderBook.cache.length;

package/js/src/pro/whitebit.js

@@ -117,15 +117,19 @@ export default class whitebit extends whitebitRest {
             const symbol = market['symbol'];
             const messageHash = 'candles' + ':' + symbol;
             const parsed = this.parseOHLCV(data, market);
-            this.ohlcvs[symbol] = this.safeValue(this.ohlcvs, symbol);
-            let stored = this.ohlcvs[symbol];
-            if (stored === undefined) {
+            // this.ohlcvs[symbol] = this.safeValue (this.ohlcvs, symbol);
+            if (!(symbol in this.ohlcvs)) {
+                this.ohlcvs[symbol] = {};
+            }
+            // let stored = this.ohlcvs[symbol]['unknown']; // we don't know the timeframe but we need to respect the type
+            if (!('unknown' in this.ohlcvs[symbol])) {
                 const limit = this.safeInteger(this.options, 'OHLCVLimit', 1000);
-                stored = new ArrayCacheByTimestamp(limit);
-                this.ohlcvs[symbol] = stored;
+                const stored = new ArrayCacheByTimestamp(limit);
+                this.ohlcvs[symbol]['unknown'] = stored;
             }
-            stored.append(parsed);
-            client.resolve(stored, messageHash);
+            const ohlcv = this.ohlcvs[symbol]['unknown'];
+            ohlcv.append(parsed);
+            client.resolve(ohlcv, messageHash);
         }
         return message;
     }

package/js/src/static_dependencies/jsencrypt/lib/jsbn/jsbn.d.ts

@@ -15,7 +15,7 @@ export declare class BigInteger {
     protected intValue(): number;
     protected byteValue(): number;
     protected shortValue(): number;
-    protected signum(): 0 | 1 | -1;
+    protected signum(): 1 | 0 | -1;
     toByteArray(): number[];
     protected equals(a: BigInteger): boolean;
     protected min(a: BigInteger): BigInteger;

package/js/src/upbit.js

@@ -619,7 +619,7 @@ export default class upbit extends Exchange {
         //                    "trade_time": "104543",
         //                "trade_date_kst": "20181122",
         //                "trade_time_kst": "194543",
-        //               "trade_timestamp":  1542883543097,
+        //               "trade_timestamp":  1542883543096,
         //                 "opening_price":  0.02976455,
         //                    "high_price":  0.02992577,
         //                     "low_price":  0.02934283,

package/js/src/woo.d.ts

@@ -157,6 +157,7 @@ export default class woo extends Exchange {
     }>;
     fetchFundingRates(symbols?: Strings, params?: {}): Promise<any>;
     fetchFundingRateHistory(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<FundingRateHistory[]>;
+    setPositionMode(hedged: boolean, symbol?: Str, params?: {}): Promise<any>;
     fetchLeverage(symbol: string, params?: {}): Promise<{
         info: any;
         leverage: number;