ccxt 4.1.8 → 4.1.10

package/dist/cjs/ccxt.js

@@ -124,6 +124,7 @@ var binance$1 = require('./src/pro/binance.js');
 var binancecoinm$1 = require('./src/pro/binancecoinm.js');
 var binanceus$1 = require('./src/pro/binanceus.js');
 var binanceusdm$1 = require('./src/pro/binanceusdm.js');
+var bingx$1 = require('./src/pro/bingx.js');
 var bitcoincom$1 = require('./src/pro/bitcoincom.js');
 var bitfinex$1 = require('./src/pro/bitfinex.js');
 var bitfinex2$1 = require('./src/pro/bitfinex2.js');
@@ -179,7 +180,7 @@ var woo$1 = require('./src/pro/woo.js');
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.1.8';
+const version = '4.1.10';
 Exchange["default"].ccxtVersion = version;
 const exchanges = {
     'ace': ace,
@@ -296,6 +297,7 @@ const pro = {
     'binancecoinm': binancecoinm$1,
     'binanceus': binanceus$1,
     'binanceusdm': binanceusdm$1,
+    'bingx': bingx$1,
     'bitcoincom': bitcoincom$1,
     'bitfinex': bitfinex$1,
     'bitfinex2': bitfinex2$1,

package/dist/cjs/src/base/Exchange.js

@@ -2101,7 +2101,7 @@ class Exchange {
         //     string = true
         //
         //     [
-        //         { 'currency': 'BTC', 'cost': '0.3'  },
+        //         { 'currency': 'BTC', 'cost': '0.4'  },
         //         { 'currency': 'BTC', 'cost': '0.6', 'rate': '0.00123' },
         //         { 'currency': 'BTC', 'cost': '0.5', 'rate': '0.00456' },
         //         { 'currency': 'USDT', 'cost': '12.3456' },
@@ -3291,6 +3291,9 @@ class Exchange {
     async fetchOpenInterest(symbol, params = {}) {
         throw new errors.NotSupported(this.id + ' fetchOpenInterest() is not supported yet');
     }
+    async fetchFundingRateHistory(symbol = undefined, since = undefined, limit = undefined, params = {}) {
+        throw new errors.NotSupported(this.id + ' fetchFundingRateHistory() is not supported yet');
+    }
     parseLastPrice(price, market = undefined) {
         throw new errors.NotSupported(this.id + ' parseLastPrice() is not supported yet');
     }
@@ -4181,7 +4184,9 @@ class Exchange {
                 }
             }
         }
-        return this.removeRepeatedElementsFromArray(result);
+        const uniqueResults = this.removeRepeatedElementsFromArray(result);
+        const key = (method === 'fetchOHLCV') ? 0 : 'timestamp';
+        return this.filterBySinceLimit(uniqueResults, since, limit, key);
     }
     async safeDeterministicCall(method, symbol = undefined, since = undefined, limit = undefined, timeframe = undefined, params = {}) {
         let maxRetries = undefined;
@@ -4236,7 +4241,9 @@ class Exchange {
         for (let i = 0; i < results.length; i++) {
             result = this.arrayConcat(result, results[i]);
         }
-        return this.removeRepeatedElementsFromArray(result);
+        const uniqueResults = this.removeRepeatedElementsFromArray(result);
+        const key = (method === 'fetchOHLCV') ? 0 : 'timestamp';
+        return this.filterBySinceLimit(uniqueResults, since, limit, key);
     }
     async fetchPaginatedCallCursor(method, symbol = undefined, since = undefined, limit = undefined, params = {}, cursorReceived = undefined, cursorSent = undefined, cursorIncrement = undefined, maxEntriesPerRequest = undefined) {
         let maxCalls = undefined;
@@ -4280,6 +4287,55 @@ class Exchange {
             }
             i += 1;
         }
+        const sorted = this.sortCursorPaginatedResult(result);
+        const key = (method === 'fetchOHLCV') ? 0 : 'timestamp';
+        return this.filterBySinceLimit(sorted, since, limit, key);
+    }
+    async fetchPaginatedCallIncremental(method, symbol = undefined, since = undefined, limit = undefined, params = {}, pageKey = undefined, maxEntriesPerRequest = undefined) {
+        let maxCalls = undefined;
+        [maxCalls, params] = this.handleOptionAndParams(params, method, 'paginationCalls', 10);
+        let maxRetries = undefined;
+        [maxRetries, params] = this.handleOptionAndParams(params, method, 'maxRetries', 3);
+        [maxEntriesPerRequest, params] = this.handleMaxEntriesPerRequestAndParams(method, maxEntriesPerRequest, params);
+        let i = 0;
+        let errors = 0;
+        let result = [];
+        while (i < maxCalls) {
+            try {
+                params[pageKey] = i + 1;
+                const response = await this[method](symbol, since, maxEntriesPerRequest, params);
+                errors = 0;
+                const responseLength = response.length;
+                if (this.verbose) {
+                    this.log('Incremental pagination call', i + 1, 'method', method, 'response length', responseLength);
+                }
+                if (responseLength === 0) {
+                    break;
+                }
+                result = this.arrayConcat(result, response);
+            }
+            catch (e) {
+                errors += 1;
+                if (errors > maxRetries) {
+                    throw e;
+                }
+            }
+            i += 1;
+        }
+        const sorted = this.sortCursorPaginatedResult(result);
+        const key = (method === 'fetchOHLCV') ? 0 : 'timestamp';
+        return this.filterBySinceLimit(sorted, since, limit, key);
+    }
+    sortCursorPaginatedResult(result) {
+        const first = this.safeValue(result, 0);
+        if (first !== undefined) {
+            if ('timestamp' in first) {
+                return this.sortBy(result, 'timestamp');
+            }
+            if ('id' in first) {
+                return this.sortBy(result, 'id');
+            }
+        }
         return result;
     }
     removeRepeatedElementsFromArray(input) {

package/dist/cjs/src/bingx.js

@@ -66,6 +66,7 @@ class bingx extends bingx$1 {
                     'swap': 'https://open-api.{hostname}/openApi',
                     'contract': 'https://open-api.{hostname}/openApi',
                     'wallets': 'https://open-api.{hostname}/openApi',
+                    'user': 'https://open-api.{hostname}/openApi',
                     'subAccount': 'https://open-api.{hostname}/openApi',
                     'account': 'https://open-api.{hostname}/openApi',
                 },
@@ -234,6 +235,15 @@ class bingx extends bingx$1 {
                         },
                     },
                 },
+                'user': {
+                    'auth': {
+                        'private': {
+                            'post': {
+                                'userDataStream': 1,
+                            },
+                        },
+                    },
+                },
                 'copyTrading': {
                     'v1': {
                         'private': {
@@ -311,6 +321,7 @@ class bingx extends bingx$1 {
             },
             'commonCurrencies': {},
             'options': {
+                'defaultType': 'spot',
                 'accountsByType': {
                     'spot': 'FUND',
                     'swap': 'PFUTURES',
@@ -830,37 +841,63 @@ class bingx extends bingx$1 {
         //        filledTime: '2023-07-04T20:56:01.000+0800'
         //    }
         //
-        let time = this.safeInteger2(trade, 'time', 'filledTm');
+        //
+        // ws
+        //
+        // spot
+        //
+        //    {
+        //        E: 1690214529432,
+        //        T: 1690214529386,
+        //        e: 'trade',
+        //        m: true,
+        //        p: '29110.19',
+        //        q: '0.1868',
+        //        s: 'BTC-USDT',
+        //        t: '57903921'
+        //    }
+        //
+        // swap
+        //
+        //    {
+        //        q: '0.0421',
+        //        p: '29023.5',
+        //        T: 1690221401344,
+        //        m: false,
+        //        s: 'BTC-USDT'
+        //    }
+        //
+        let time = this.safeIntegerN(trade, ['time', 'filledTm', 'T']);
         const datetimeId = this.safeString(trade, 'filledTm');
         if (datetimeId !== undefined) {
             time = this.parse8601(datetimeId);
         }
-        const isBuyerMaker = this.safeValue2(trade, 'buyerMaker', 'isBuyerMaker');
-        let takeOrMaker = undefined;
-        let side = undefined;
-        if (isBuyerMaker !== undefined) {
-            side = isBuyerMaker ? 'sell' : 'buy';
-            takeOrMaker = 'taker';
+        if (time === 0) {
+            time = undefined;
         }
+        const isBuyerMaker = this.safeValue2(trade, 'buyerMaker', 'isBuyerMaker');
+        const side = this.safeStringLower2(trade, 'side', 'S');
         const cost = this.safeString(trade, 'quoteQty');
         const type = (cost === undefined) ? 'spot' : 'swap';
-        const currencyId = this.safeString(trade, 'currency');
+        const currencyId = this.safeString2(trade, 'currency', 'N');
         const currencyCode = this.safeCurrencyCode(currencyId);
+        const m = this.safeValue(trade, 'm', false);
+        const marketId = this.safeString(trade, 's');
         return this.safeTrade({
-            'id': this.safeString2(trade, 'id', 'orderId'),
+            'id': this.safeStringN(trade, ['id', 't']),
             'info': trade,
             'timestamp': time,
             'datetime': this.iso8601(time),
-            'symbol': this.safeSymbol(undefined, market, '-', type),
-            'order': undefined,
-            'type': undefined,
-            'side': side,
-            'takerOrMaker': takeOrMaker,
-            'price': this.safeString(trade, 'price'),
-            'amount': this.safeString2(trade, 'qty', 'amount'),
+            'symbol': this.safeSymbol(marketId, market, '-', type),
+            'order': this.safeString2(trade, 'orderId', 'i'),
+            'type': this.safeStringLower(trade, 'o'),
+            'side': this.parseOrderSide(side),
+            'takerOrMaker': (isBuyerMaker || m) ? 'maker' : 'taker',
+            'price': this.safeString2(trade, 'price', 'p'),
+            'amount': this.safeStringN(trade, ['qty', 'amount', 'q']),
             'cost': cost,
             'fee': {
-                'cost': this.parseNumber(Precise["default"].stringAbs(this.safeString(trade, 'commission'))),
+                'cost': this.parseNumber(Precise["default"].stringAbs(this.safeString2(trade, 'commission', 'n'))),
                 'currency': currencyCode,
                 'rate': undefined,
             },
@@ -1514,8 +1551,9 @@ class bingx extends bingx$1 {
             'liquidationPrice': undefined,
             'entryPrice': this.safeNumber2(position, 'avgPrice', 'entryPrice'),
             'unrealizedPnl': this.safeNumber(position, 'unrealizedProfit'),
+            'realizedPnl': this.safeNumber(position, 'realisedProfit'),
             'percentage': undefined,
-            'contracts': undefined,
+            'contracts': this.safeNumber(position, 'positionAmt'),
             'contractSize': undefined,
             'markPrice': undefined,
             'lastPrice': undefined,
@@ -1526,7 +1564,7 @@ class bingx extends bingx$1 {
             'lastUpdateTimestamp': undefined,
             'maintenanceMargin': undefined,
             'maintenanceMarginPercentage': undefined,
-            'collateral': this.safeString(position, 'positionAmt'),
+            'collateral': this.safeNumber(position, 'positionAmt'),
             'initialMargin': this.safeNumber(position, 'initialMargin'),
             'initialMarginPercentage': undefined,
             'leverage': this.safeNumber(position, 'leverage'),
@@ -1580,15 +1618,20 @@ class bingx extends bingx$1 {
                 request['timeInForce'] = 'POC';
             }
             const createMarketBuyOrderRequiresPrice = this.safeValue(this.options, 'createMarketBuyOrderRequiresPrice', true);
-            if (createMarketBuyOrderRequiresPrice && isMarketOrder && (side === 'buy')) {
-                if (price === undefined) {
-                    throw new errors.InvalidOrder(this.id + ' createOrder() requires price argument for market buy orders on spot markets to calculate the total amount to spend (amount * price), alternatively set the createMarketBuyOrderRequiresPrice option to false and pass in the cost to spend into the amount parameter');
+            if (isMarketOrder && (side === 'buy')) {
+                if (createMarketBuyOrderRequiresPrice) {
+                    if (price === undefined) {
+                        throw new errors.InvalidOrder(this.id + ' createOrder() requires price argument for market buy orders on spot markets to calculate the total amount to spend (amount * price), alternatively set the createMarketBuyOrderRequiresPrice option to false and pass in the cost to spend into the amount parameter');
+                    }
+                    else {
+                        const amountString = this.numberToString(amount);
+                        const priceString = this.numberToString(price);
+                        const cost = this.parseNumber(Precise["default"].stringMul(amountString, priceString));
+                        request['quoteOrderQty'] = this.priceToPrecision(symbol, cost);
+                    }
                 }
                 else {
-                    const amountString = this.numberToString(amount);
-                    const priceString = this.numberToString(price);
-                    const cost = this.parseNumber(Precise["default"].stringMul(amountString, priceString));
-                    request['quoteOrderQty'] = this.priceToPrecision(symbol, cost);
+                    request['quoteOrderQty'] = this.priceToPrecision(symbol, amount);
                 }
             }
             else {
@@ -1704,6 +1747,15 @@ class bingx extends bingx$1 {
         const order = this.safeValue(data, 'order', data);
         return this.parseOrder(order, market);
     }
+    parseOrderSide(side) {
+        const sides = {
+            'BUY': 'buy',
+            'SELL': 'sell',
+            'SHORT': 'sell',
+            'LONG': 'buy',
+        };
+        return this.safeString(sides, side, side);
+    }
     parseOrder(order, market = undefined) {
         //
         // spot
@@ -1801,39 +1853,49 @@ class bingx extends bingx$1 {
         //         "workingType": "MARK_PRICE"
         //     }
         //
-        const positionSide = this.safeString(order, 'positionSide');
+        const positionSide = this.safeString2(order, 'positionSide', 'ps');
         const marketType = (positionSide === undefined) ? 'spot' : 'swap';
-        const marketId = this.safeString(order, 'symbol');
+        const marketId = this.safeString2(order, 'symbol', 's');
         const symbol = this.safeSymbol(marketId, market, '-', marketType);
-        const timestamp = this.safeInteger2(order, 'time', 'transactTime');
+        const orderId = this.safeString2(order, 'orderId', 'i');
+        const side = this.safeStringLower2(order, 'side', 'S');
+        const type = this.safeStringLower2(order, 'type', 'o');
+        const timestamp = this.safeIntegerN(order, ['time', 'transactTime', 'E']);
+        const lastTradeTimestamp = this.safeInteger2(order, 'updateTime', 'T');
+        const price = this.safeString2(order, 'price', 'p');
+        const average = this.safeString2(order, 'avgPrice', 'ap');
+        const amount = this.safeString2(order, 'origQty', 'q');
+        const filled = this.safeString2(order, 'executedQty', 'z');
+        const statusId = this.safeString2(order, 'status', 'X');
         const fee = {
-            'currency': this.safeString(order, 'feeAsset'),
-            'rate': this.safeString2(order, 'fee', 'commission'),
+            'currency': this.safeString2(order, 'feeAsset', 'N'),
+            'rate': this.safeStringN(order, ['fee', 'commission', 'n']),
         };
+        const clientOrderId = this.safeString2(order, 'clientOrderId', 'c');
         return this.safeOrder({
             'info': order,
-            'id': this.safeString(order, 'orderId'),
-            'clientOrderId': this.safeString(order, 'clientOrderId'),
+            'id': orderId,
+            'clientOrderId': clientOrderId,
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
-            'lastTradeTimestamp': this.safeInteger(order, 'updateTime'),
+            'lastTradeTimestamp': lastTradeTimestamp,
             'lastUpdateTimestamp': this.safeInteger(order, 'updateTime'),
             'symbol': symbol,
-            'type': this.safeStringLower(order, 'type'),
+            'type': type,
             'timeInForce': undefined,
             'postOnly': undefined,
-            'side': this.safeStringLower(order, 'side'),
-            'price': this.safeString(order, 'price'),
+            'side': this.parseOrderSide(side),
+            'price': price,
             'stopPrice': this.safeNumber(order, 'stopPrice'),
             'triggerPrice': this.safeNumber(order, 'stopPrice'),
             'stopLossPrice': this.safeNumber(order, 'stopLoss'),
             'takeProfitPrice': this.safeNumber(order, 'takeProfit'),
-            'average': this.safeString(order, 'avgPrice'),
+            'average': average,
             'cost': undefined,
-            'amount': this.safeString(order, 'origQty'),
-            'filled': this.safeString(order, 'executedQty'),
+            'amount': amount,
+            'filled': filled,
             'remaining': undefined,
-            'status': this.parseOrderStatus(this.safeString(order, 'status')),
+            'status': this.parseOrderStatus(statusId),
             'fee': fee,
             'trades': undefined,
         }, market);