ccxt 4.1.47 → 4.1.48

package/dist/cjs/ccxt.js

@@ -76,6 +76,7 @@ var gemini = require('./src/gemini.js');
 var hitbtc = require('./src/hitbtc.js');
 var hitbtc3 = require('./src/hitbtc3.js');
 var hollaex = require('./src/hollaex.js');
+var htx = require('./src/htx.js');
 var huobi = require('./src/huobi.js');
 var huobijp = require('./src/huobijp.js');
 var huobipro = require('./src/huobipro.js');
@@ -154,6 +155,7 @@ var gateio$1 = require('./src/pro/gateio.js');
 var gemini$1 = require('./src/pro/gemini.js');
 var hitbtc$1 = require('./src/pro/hitbtc.js');
 var hollaex$1 = require('./src/pro/hollaex.js');
+var htx$1 = require('./src/pro/htx.js');
 var huobi$1 = require('./src/pro/huobi.js');
 var huobijp$1 = require('./src/pro/huobijp.js');
 var huobipro$1 = require('./src/pro/huobipro.js');
@@ -181,7 +183,7 @@ var woo$1 = require('./src/pro/woo.js');
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.1.47';
+const version = '4.1.48';
 Exchange["default"].ccxtVersion = version;
 const exchanges = {
     'ace': ace,
@@ -248,6 +250,7 @@ const exchanges = {
     'hitbtc': hitbtc,
     'hitbtc3': hitbtc3,
     'hollaex': hollaex,
+    'htx': htx,
     'huobi': huobi,
     'huobijp': huobijp,
     'huobipro': huobipro,
@@ -328,6 +331,7 @@ const pro = {
     'gemini': gemini$1,
     'hitbtc': hitbtc$1,
     'hollaex': hollaex$1,
+    'htx': htx$1,
     'huobi': huobi$1,
     'huobijp': huobijp$1,
     'huobipro': huobipro$1,
@@ -458,6 +462,7 @@ exports.gemini = gemini;
 exports.hitbtc = hitbtc;
 exports.hitbtc3 = hitbtc3;
 exports.hollaex = hollaex;
+exports.htx = htx;
 exports.huobi = huobi;
 exports.huobijp = huobijp;
 exports.huobipro = huobipro;

package/dist/cjs/src/abstract/htx.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var Exchange$1 = require('../base/Exchange.js');
+
+// -------------------------------------------------------------------------------
+class Exchange extends Exchange$1["default"] {
+}
+
+module.exports = Exchange;

package/dist/cjs/src/binance.js

@@ -985,9 +985,11 @@ class binance extends binance$1 {
                         'um/order': 1,
                         'um/conditional/order': 1,
                         'um/allOpenOrders': 1,
+                        'um/conditional/allOpenOrders': 1,
                         'cm/order': 1,
                         'cm/conditional/order': 1,
                         'cm/allOpenOrders': 1,
+                        'cm/conditional/allOpenOrders': 1,
                         'margin/order': 1,
                         'margin/allOpenOrders': 5,
                         'margin/orderList': 2,

package/dist/cjs/src/bitmart.js

@@ -575,6 +575,7 @@ class bitmart extends bitmart$1 {
                     'swap': 'swap',
                 },
                 'createMarketBuyOrderRequiresPrice': true,
+                'brokerId': 'CCXTxBitmart000',
             },
         });
     }
@@ -1981,6 +1982,12 @@ class bitmart extends bitmart$1 {
         //         "order_id": 2707217580
         //     }
         //
+        // swap
+        //   "data": {
+        //       "order_id": 231116359426639,
+        //       "price": "market price"
+        //    },
+        //
         // cancelOrder
         //
         //     "2707217580" // order id
@@ -2063,6 +2070,10 @@ class bitmart extends bitmart$1 {
             type = 'limit';
             timeInForce = 'IOC';
         }
+        let priceString = this.safeString(order, 'price');
+        if (priceString === 'market price') {
+            priceString = undefined;
+        }
         return this.safeOrder({
             'id': id,
             'clientOrderId': this.safeString(order, 'client_order_id'),
@@ -2075,7 +2086,7 @@ class bitmart extends bitmart$1 {
             'timeInForce': timeInForce,
             'postOnly': postOnly,
             'side': this.parseOrderSide(this.safeString(order, 'side')),
-            'price': this.omitZero(this.safeString(order, 'price')),
+            'price': this.omitZero(priceString),
             'stopPrice': undefined,
             'triggerPrice': undefined,
             'amount': this.omitZero(this.safeString(order, 'size')),
@@ -2129,6 +2140,7 @@ class bitmart extends bitmart$1 {
          * @description create a trade order
          * @see https://developer-pro.bitmart.com/en/spot/#place-spot-order
          * @see https://developer-pro.bitmart.com/en/spot/#place-margin-order
+         * @see https://developer-pro.bitmart.com/en/futures/#submit-order-signed
          * @param {string} symbol unified symbol of the market to create an order in
          * @param {string} type 'market' or 'limit'
          * @param {string} side 'buy' or 'sell'
@@ -2136,11 +2148,153 @@ class bitmart extends bitmart$1 {
          * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
          * @param {object} [params] extra parameters specific to the bitmart api endpoint
          * @param {string} [params.marginMode] 'cross' or 'isolated'
+         * @param {string} [params.leverage] *swap only* leverage level
+         * @param {string} [params.clientOrderId] client order id of the order
+         * @param {boolean} [params.reduceOnly] *swap only* reduce only
+         * @param {boolean} [params.postOnly] make sure the order is posted to the order book and not matched immediately
          * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        const request = {};
+        const result = this.handleMarginModeAndParams('createOrder', params);
+        const marginMode = this.safeString(result, 0);
+        let response = undefined;
+        if (market['spot']) {
+            const spotRequest = this.createSpotOrderRequest(symbol, type, side, amount, price, params);
+            if (marginMode === 'isolated') {
+                response = await this.privatePostSpotV1MarginSubmitOrder(spotRequest);
+            }
+            else {
+                response = await this.privatePostSpotV2SubmitOrder(spotRequest);
+            }
+        }
+        else {
+            const swapRequest = this.createSwapOrderRequest(symbol, type, side, amount, price, params);
+            response = await this.privatePostContractPrivateSubmitOrder(swapRequest);
+        }
+        //
+        // spot and margin
+        //
+        //     {
+        //         "code": 1000,
+        //         "trace":"886fb6ae-456b-4654-b4e0-d681ac05cea1",
+        //         "message": "OK",
+        //         "data": {
+        //             "order_id": 2707217580
+        //         }
+        //     }
+        //
+        // swap
+        // {"code":1000,"message":"Ok","data":{"order_id":231116359426639,"price":"market price"},"trace":"7f9c94e10f9d4513bc08a7bfc2a5559a.62.16996369620521911"}
+        //
+        const data = this.safeValue(response, 'data', {});
+        const order = this.parseOrder(data, market);
+        order['type'] = type;
+        order['side'] = side;
+        order['amount'] = amount;
+        order['price'] = price;
+        return order;
+    }
+    createSwapOrderRequest(symbol, type, side, amount, price = undefined, params = {}) {
+        /**
+         * @method
+         * @name bitmart#createSwapOrderRequest
+         * @description create a trade order
+         * @see https://developer-pro.bitmart.com/en/futures/#submit-order-signed
+         * @param {string} symbol unified symbol of the market to create an order in
+         * @param {string} type 'market' or 'limit'
+         * @param {string} side 'buy' or 'sell'
+         * @param {float} amount how much of currency you want to trade in units of base currency
+         * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
+         * @param {object} [params] extra parameters specific to the bitmart api endpoint
+         * @param {int} [params.leverage] leverage level
+         * @param {boolean} [params.reduceOnly] *swap only* reduce only
+         * @param {string} [params.marginMode] 'cross' or 'isolated', default is 'cross'
+         *  @param {string} [params.clientOrderId] client order id of the order
+         * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+         */
+        const market = this.market(symbol);
+        const request = {
+            'symbol': market['id'],
+            'type': type,
+            'size': parseInt(this.amountToPrecision(symbol, amount)),
+        };
+        const timeInForce = this.safeString(params, 'timeInForce');
+        const mode = this.safeInteger(params, 'mode'); // only for swap
+        const isMarketOrder = type === 'market';
+        let postOnly = undefined;
+        const reduceOnly = this.safeValue(params, 'reduceOnly');
+        const isExchangeSpecificPo = (mode === 4);
+        [postOnly, params] = this.handlePostOnly(isMarketOrder, isExchangeSpecificPo, params);
+        params = this.omit(params, ['timeInForce', 'postOnly', 'reduceOnly']);
+        const ioc = ((timeInForce === 'IOC') || (mode === 3));
+        const isLimitOrder = (type === 'limit') || postOnly || ioc;
+        if (timeInForce === 'GTC') {
+            request['mode'] = 1;
+        }
+        else if (timeInForce === 'FOK') {
+            request['mode'] = 2;
+        }
+        else if (timeInForce === 'IOC') {
+            request['mode'] = 3;
+        }
+        if (postOnly) {
+            request['mode'] = 4;
+        }
+        if (isLimitOrder) {
+            request['price'] = this.priceToPrecision(symbol, price);
+        }
+        if (side === 'buy') {
+            if (reduceOnly) {
+                request['side'] = 2; // sell close long
+            }
+            else {
+                request['side'] = 1; // buy open long
+            }
+        }
+        else if (side === 'sell') {
+            if (reduceOnly) {
+                request['side'] = 3; // sell close long
+            }
+            else {
+                request['side'] = 4; // sell open short
+            }
+        }
+        let marginMode = undefined;
+        [marginMode, params] = this.handleMarginModeAndParams('createOrder', params, 'cross');
+        request['open_type'] = marginMode;
+        const clientOrderId = this.safeString(params, 'clientOrderId');
+        if (clientOrderId !== undefined) {
+            params = this.omit(params, 'clientOrderId');
+            request['client_order_id'] = clientOrderId;
+        }
+        const leverage = this.safeInteger(params, 'leverage', 1);
+        params = this.omit(params, 'leverage');
+        request['leverage'] = this.numberToString(leverage);
+        return this.extend(request, params);
+    }
+    createSpotOrderRequest(symbol, type, side, amount, price = undefined, params = {}) {
+        /**
+         * @method
+         * @name bitmart#createSpotOrderRequest
+         * @description create a spot order request
+         * @see https://developer-pro.bitmart.com/en/spot/#place-spot-order
+         * @see https://developer-pro.bitmart.com/en/spot/#place-margin-order
+         * @param {string} symbol unified symbol of the market to create an order in
+         * @param {string} type 'market' or 'limit'
+         * @param {string} side 'buy' or 'sell'
+         * @param {float} amount how much of currency you want to trade in units of base currency
+         * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
+         * @param {object} [params] extra parameters specific to the bitmart api endpoint
+         * @param {string} [params.marginMode] 'cross' or 'isolated'
+         * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+         */
+        const market = this.market(symbol);
+        const request = {
+            'symbol': market['id'],
+            'side': side,
+            'type': type,
+        };
         const timeInForce = this.safeString(params, 'timeInForce');
         if (timeInForce === 'FOK') {
             throw new errors.InvalidOrder(this.id + ' createOrder() only accepts timeInForce parameter values of IOC or PO');
@@ -2153,45 +2307,36 @@ class bitmart extends bitmart$1 {
         params = this.omit(params, ['timeInForce', 'postOnly']);
         const ioc = ((timeInForce === 'IOC') || (type === 'ioc'));
         const isLimitOrder = (type === 'limit') || postOnly || ioc;
-        let method = undefined;
-        if (market['spot']) {
-            request['symbol'] = market['id'];
-            request['side'] = side;
-            request['type'] = type;
-            method = 'privatePostSpotV2SubmitOrder';
-            if (isLimitOrder) {
-                request['size'] = this.amountToPrecision(symbol, amount);
-                request['price'] = this.priceToPrecision(symbol, price);
-            }
-            else if (isMarketOrder) {
-                // for market buy it requires the amount of quote currency to spend
-                if (side === 'buy') {
-                    let notional = this.safeNumber(params, 'notional');
-                    const createMarketBuyOrderRequiresPrice = this.safeValue(this.options, 'createMarketBuyOrderRequiresPrice', true);
-                    if (createMarketBuyOrderRequiresPrice) {
-                        if (price !== undefined) {
-                            if (notional === undefined) {
-                                const amountString = this.numberToString(amount);
-                                const priceString = this.numberToString(price);
-                                notional = this.parseNumber(Precise["default"].stringMul(amountString, priceString));
-                            }
-                        }
-                        else if (notional === undefined) {
-                            throw new errors.InvalidOrder(this.id + " createOrder () requires the price argument with market buy orders to calculate total order cost (amount to spend), where cost = amount * price. Supply a price argument to createOrder() call if you want the cost to be calculated for you from price and amount, or, alternatively, add .options['createMarketBuyOrderRequiresPrice'] = false and supply the total cost value in the 'amount' argument or in the 'notional' extra parameter (the exchange-specific behaviour)");
+        // method = 'privatePostSpotV2SubmitOrder';
+        if (isLimitOrder) {
+            request['size'] = this.amountToPrecision(symbol, amount);
+            request['price'] = this.priceToPrecision(symbol, price);
+        }
+        else if (isMarketOrder) {
+            // for market buy it requires the amount of quote currency to spend
+            if (side === 'buy') {
+                let notional = this.safeNumber(params, 'notional');
+                const createMarketBuyOrderRequiresPrice = this.safeValue(this.options, 'createMarketBuyOrderRequiresPrice', true);
+                if (createMarketBuyOrderRequiresPrice) {
+                    if (price !== undefined) {
+                        if (notional === undefined) {
+                            const amountString = this.numberToString(amount);
+                            const priceString = this.numberToString(price);
+                            notional = this.parseNumber(Precise["default"].stringMul(amountString, priceString));
                         }
                     }
-                    else {
-                        notional = (notional === undefined) ? amount : notional;
+                    else if (notional === undefined) {
+                        throw new errors.InvalidOrder(this.id + " createOrder () requires the price argument with market buy orders to calculate total order cost (amount to spend), where cost = amount * price. Supply a price argument to createOrder() call if you want the cost to be calculated for you from price and amount, or, alternatively, add .options['createMarketBuyOrderRequiresPrice'] = false and supply the total cost value in the 'amount' argument or in the 'notional' extra parameter (the exchange-specific behaviour)");
                     }
-                    request['notional'] = this.decimalToPrecision(notional, number.TRUNCATE, market['precision']['price'], this.precisionMode);
                 }
-                else if (side === 'sell') {
-                    request['size'] = this.amountToPrecision(symbol, amount);
+                else {
+                    notional = (notional === undefined) ? amount : notional;
                 }
+                request['notional'] = this.decimalToPrecision(notional, number.TRUNCATE, market['precision']['price'], this.precisionMode);
+            }
+            else if (side === 'sell') {
+                request['size'] = this.amountToPrecision(symbol, amount);
             }
-        }
-        else if (market['swap']) {
-            throw new errors.NotSupported(this.id + ' createOrder() does not accept swap orders, only spot orders are allowed');
         }
         if (postOnly) {
             request['type'] = 'limit_maker';
@@ -2199,33 +2344,7 @@ class bitmart extends bitmart$1 {
         if (ioc) {
             request['type'] = 'ioc';
         }
-        const [marginMode, query] = this.handleMarginModeAndParams('createOrder', params);
-        if (marginMode !== undefined) {
-            if (marginMode !== 'isolated') {
-                throw new errors.NotSupported(this.id + ' only isolated margin is supported');
-            }
-            method = 'privatePostSpotV1MarginSubmitOrder';
-        }
-        const response = await this[method](this.extend(request, query));
-        //
-        // spot and margin
-        //
-        //     {
-        //         "code": 1000,
-        //         "trace":"886fb6ae-456b-4654-b4e0-d681ac05cea1",
-        //         "message": "OK",
-        //         "data": {
-        //             "order_id": 2707217580
-        //         }
-        //     }
-        //
-        const data = this.safeValue(response, 'data', {});
-        const order = this.parseOrder(data, market);
-        order['type'] = type;
-        order['side'] = side;
-        order['amount'] = amount;
-        order['price'] = price;
-        return order;
+        return this.extend(request, params);
     }
     async cancelOrder(id, symbol = undefined, params = {}) {
         /**
@@ -4061,9 +4180,11 @@ class bitmart extends bitmart$1 {
         if (api === 'private') {
             this.checkRequiredCredentials();
             const timestamp = this.milliseconds().toString();
+            const brokerId = this.safeString(this.options, 'brokerId', 'CCXTxBitmart000');
             headers = {
                 'X-BM-KEY': this.apiKey,
                 'X-BM-TIMESTAMP': timestamp,
+                'X-BM-BROKER-ID': brokerId,
                 'Content-Type': 'application/json',
             };
             if (!getOrDelete) {