ccxt 4.4.27 → 4.4.28

package/js/src/binance.js

@@ -953,6 +953,9 @@ export default class binance extends Exchange {
                         'mmp': 1,
                         'countdownCancelAll': 1,
                         'order': 1,
+                        'block/order/orders': 5,
+                        'block/order/execute': 5,
+                        'block/user-trades': 5,
                     },
                     'post': {
                         'order': 1,
@@ -962,9 +965,12 @@ export default class binance extends Exchange {
                         'mmpReset': 1,
                         'countdownCancelAll': 1,
                         'countdownCancelAllHeartBeat': 10,
+                        'block/order/create': 5,
+                        'block/order/execute': 5,
                     },
                     'put': {
                         'listenKey': 1,
+                        'block/order/create': 5,
                     },
                     'delete': {
                         'order': 1,
@@ -972,6 +978,7 @@ export default class binance extends Exchange {
                         'allOpenOrders': 1,
                         'allOpenOrdersByUnderlying': 1,
                         'listenKey': 1,
+                        'block/order/create': 5,
                     },
                 },
                 'public': {

package/js/src/kraken.js

@@ -1492,7 +1492,7 @@ export default class kraken extends Exchange {
         //     {
         //         "error": [],
         //         "result": {
-        //             "descr": { order: 'buy 0.02100000 ETHUSDT @ limit 330.00' },
+        //             "descr": { order: 'buy 0.02100000 ETHUSDT @ limit 330.00' }, // see more examples in "parseOrder"
         //             "txid": [ 'OEKVV2-IH52O-TPL6GZ' ]
         //         }
         //     }
@@ -1558,9 +1558,10 @@ export default class kraken extends Exchange {
     }
     parseOrderType(status) {
         const statuses = {
+            // we dont add "space" delimited orders here (eg. stop loss) because they need separate parsing
             'take-profit': 'market',
-            'stop-loss-limit': 'limit',
             'stop-loss': 'market',
+            'stop-loss-limit': 'limit',
             'take-profit-limit': 'limit',
             'trailing-stop-limit': 'limit',
         };
@@ -1568,30 +1569,19 @@ export default class kraken extends Exchange {
     }
     parseOrder(order, market = undefined) {
         //
-        // createOrder for regular orders
+        // createOrder
         //
         //     {
-        //         "descr": { order: 'buy 0.02100000 ETHUSDT @ limit 330.00' },
+        //         "descr": {
+        //            "order": "buy 0.02100000 ETHUSDT @ limit 330.00" // limit orders
+        //                     "buy 0.12345678 ETHUSDT @ market" // market order
+        //                     "sell 0.28002676 ETHUSDT @ stop loss 0.0123 -> limit 0.0.1222" // stop order
+        //                     "sell 0.00100000 ETHUSDT @ stop loss 2677.00 -> limit 2577.00 with 5:1 leverage"
+        //                     "buy 0.10000000 LTCUSDT @ take profit 75.00000 -> limit 74.00000"
+        //                     "sell 10.00000000 XRPEUR @ trailing stop +50.0000%" // trailing stop
+        //         },
         //         "txid": [ 'OEKVV2-IH52O-TPL6GZ' ]
         //     }
-        //     {
-        //         "txid": [ "TX_ID_HERE" ],
-        //         "descr": { "order":"buy 0.12345678 ETHEUR @ market" },
-        //     }
-        //
-        //
-        // createOrder for stop orders
-        //
-        //     {
-        //         "txid":["OSILNC-VQI5Q-775ZDQ"],
-        //         "descr":{"order":"sell 167.28002676 ADAXBT @ stop loss 0.00003280 -> limit 0.00003212"}
-        //     }
-        //
-        //
-        //     {
-        //         "txid":["OVHMJV-BZW2V-6NZFWF"],
-        //         "descr":{"order":"sell 0.00100000 ETHUSD @ stop loss 2677.00 -> limit 2577.00 with 5:1 leverage"}
-        //     }
         //
         // editOrder
         //
@@ -1671,27 +1661,34 @@ export default class kraken extends Exchange {
             orderDescription = this.safeString(order, 'descr');
         }
         let side = undefined;
-        let type = undefined;
+        let rawType = undefined;
         let marketId = undefined;
         let price = undefined;
         let amount = undefined;
-        let stopPrice = undefined;
+        let triggerPrice = undefined;
         if (orderDescription !== undefined) {
             const parts = orderDescription.split(' ');
             side = this.safeString(parts, 0);
             amount = this.safeString(parts, 1);
             marketId = this.safeString(parts, 2);
-            type = this.safeString(parts, 4);
-            if (type === 'stop') {
-                stopPrice = this.safeString(parts, 6);
+            const part4 = this.safeString(parts, 4);
+            const part5 = this.safeString(parts, 5);
+            if (part4 === 'limit' || part4 === 'market') {
+                rawType = part4; // eg, limit, market
+            }
+            else {
+                rawType = part4 + ' ' + part5; // eg. stop loss, take profit, trailing stop
+            }
+            if (rawType === 'stop loss' || rawType === 'take profit') {
+                triggerPrice = this.safeString(parts, 6);
                 price = this.safeString(parts, 9);
             }
-            else if (type === 'limit') {
+            else if (rawType === 'limit') {
                 price = this.safeString(parts, 5);
             }
         }
         side = this.safeString(description, 'type', side);
-        type = this.safeString(description, 'ordertype', type);
+        rawType = this.safeString(description, 'ordertype', rawType); // orderType has dash, e.g. trailing-stop
         marketId = this.safeString(description, 'pair', marketId);
         const foundMarket = this.findMarketByAltnameOrId(marketId);
         let symbol = undefined;
@@ -1756,17 +1753,33 @@ export default class kraken extends Exchange {
                 trades.push(rawTrade);
             }
         }
-        stopPrice = this.omitZero(this.safeString(order, 'stopprice', stopPrice));
+        // as mentioned in #24192 PR, this field is not something consistent/actual
+        // triggerPrice = this.omitZero (this.safeString (order, 'stopprice', triggerPrice));
         let stopLossPrice = undefined;
         let takeProfitPrice = undefined;
-        if (type.startsWith('take-profit')) {
+        // the dashed strings are not provided from fields (eg. fetch order)
+        // while spaced strings from "order" sentence (when other fields not available)
+        if (rawType.startsWith('take-profit')) {
             takeProfitPrice = this.safeString(description, 'price');
             price = this.omitZero(this.safeString(description, 'price2'));
         }
-        else if (type.startsWith('stop-loss')) {
+        else if (rawType.startsWith('stop-loss')) {
             stopLossPrice = this.safeString(description, 'price');
             price = this.omitZero(this.safeString(description, 'price2'));
         }
+        else if (rawType === 'take profit') {
+            takeProfitPrice = triggerPrice;
+        }
+        else if (rawType === 'stop loss') {
+            stopLossPrice = triggerPrice;
+        }
+        let finalType = this.parseOrderType(rawType);
+        // unlike from endpoints which provide eg: "take-profit-limit"
+        // for "space-delimited" orders we dont have market/limit suffixes, their format is
+        // eg: `stop loss > limit 123`, so we need to parse them manually
+        if (this.inArray(finalType, ['stop loss', 'take profit'])) {
+            finalType = (price === undefined) ? 'market' : 'limit';
+        }
         return this.safeOrder({
             'id': id,
             'clientOrderId': clientOrderId,
@@ -1776,13 +1789,13 @@ export default class kraken extends Exchange {
             'lastTradeTimestamp': undefined,
             'status': status,
             'symbol': symbol,
-            'type': this.parseOrderType(type),
+            'type': finalType,
             'timeInForce': undefined,
             'postOnly': isPostOnly,
             'side': side,
             'price': price,
-            'stopPrice': stopPrice,
-            'triggerPrice': stopPrice,
+            'stopPrice': triggerPrice,
+            'triggerPrice': triggerPrice,
             'takeProfitPrice': takeProfitPrice,
             'stopLossPrice': stopLossPrice,
             'cost': undefined,

package/js/src/pro/binance.js

@@ -3720,12 +3720,6 @@ export default class binance extends binanceRest {
             market = this.getMarketFromSymbols(symbols);
             messageHash = '::' + symbols.join(',');
         }
-        const marketTypeObject = {};
-        if (market !== undefined) {
-            marketTypeObject['type'] = market['type'];
-            marketTypeObject['subType'] = market['subType'];
-        }
-        await this.authenticate(this.extend(marketTypeObject, params));
         let type = undefined;
         [type, params] = this.handleMarketTypeAndParams('watchPositions', market, params);
         if (type === 'spot' || type === 'margin') {
@@ -3739,6 +3733,10 @@ export default class binance extends binanceRest {
         else if (this.isInverse(type, subType)) {
             type = 'delivery';
         }
+        const marketTypeObject = {};
+        marketTypeObject['type'] = type;
+        marketTypeObject['subType'] = subType;
+        await this.authenticate(this.extend(marketTypeObject, params));
         messageHash = type + ':positions' + messageHash;
         let isPortfolioMargin = undefined;
         [isPortfolioMargin, params] = this.handleOptionAndParams2(params, 'watchPositions', 'papi', 'portfolioMargin', false);

package/js/src/wavesexchange.js

@@ -1525,6 +1525,7 @@ export default class wavesexchange extends Exchange {
          * @method
          * @name wavesexchange#fetchOrder
          * @description fetches information on an order made by the user
+         * @see https://matcher.waves.exchange/api-docs/index.html#/status/getOrderStatusByPKAndIdWithSig
          * @param {string} symbol unified symbol of the market the order was made in
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} An [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "4.4.27",
+  "version": "4.4.28",
   "description": "A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 100+ exchanges",
   "unpkg": "dist/ccxt.browser.min.js",
   "type": "module",