ccxt 4.3.41 → 4.3.43

package/js/src/pro/bitget.js

@@ -1021,6 +1021,7 @@ export default class bitget extends bitgetRest {
         [marginMode, params] = this.handleMarginModeAndParams('watchOrders', params);
         if (marginMode !== undefined) {
             instType = 'MARGIN';
+            messageHash = messageHash + ':' + marginMode;
             if (marginMode === 'isolated') {
                 channel = 'orders-isolated';
             }
@@ -1114,7 +1115,13 @@ export default class bitget extends bitgetRest {
         const keys = Object.keys(marketSymbols);
         for (let i = 0; i < keys.length; i++) {
             const symbol = keys[i];
-            const innerMessageHash = messageHash + ':' + symbol;
+            let innerMessageHash = messageHash + ':' + symbol;
+            if (channel === 'orders-crossed') {
+                innerMessageHash = innerMessageHash + ':cross';
+            }
+            else if (channel === 'orders-isolated') {
+                innerMessageHash = innerMessageHash + ':isolated';
+            }
             client.resolve(stored, innerMessageHash);
         }
         client.resolve(stored, messageHash);
@@ -1221,23 +1228,30 @@ export default class bitget extends bitgetRest {
         // isolated and cross margin
         //
         //     {
-        //         "enterPointSource": "web",
-        //         "force": "gtc",
-        //         "feeDetail": [],
-        //         "orderType": "limit",
-        //         "price": "35000.000000000",
-        //         "quoteSize": "10.500000000",
-        //         "side": "buy",
-        //         "status": "live",
-        //         "baseSize": "0.000300000",
-        //         "cTime": "1701923982427",
-        //         "clientOid": "4902047879864dc980c4840e9906db4e",
-        //         "fillPrice": "0.000000000",
-        //         "baseVolume": "0.000000000",
-        //         "fillTotalAmount": "0.000000000",
-        //         "loanType": "auto-loan-and-repay",
-        //         "orderId": "1116515595178356737"
-        //     }
+        //         enterPointSource: "web",
+        //         feeDetail: [
+        //           {
+        //             feeCoin: "AAVE",
+        //             deduction: "no",
+        //             totalDeductionFee: "0",
+        //             totalFee: "-0.00010740",
+        //           },
+        //         ],
+        //         force: "gtc",
+        //         orderType: "limit",
+        //         price: "93.170000000",
+        //         fillPrice: "93.170000000",
+        //         baseSize: "0.110600000", // total amount of order
+        //         quoteSize: "10.304602000", // total cost of order (independently if order is filled or pending)
+        //         baseVolume: "0.107400000", // filled amount of order (during order's lifecycle, and not for this specific incoming update)
+        //         fillTotalAmount: "10.006458000", // filled cost of order (during order's lifecycle, and not for this specific incoming update)
+        //         side: "buy",
+        //         status: "partially_filled",
+        //         cTime: "1717875017306",
+        //         clientOid: "b57afe789a06454e9c560a2aab7f7201",
+        //         loanType: "auto-loan",
+        //         orderId: "1183419084588060673",
+        //       }
         //
         const isSpot = !('posMode' in order);
         const isMargin = ('loanType' in order);
@@ -1278,12 +1292,12 @@ export default class bitget extends bitgetRest {
         let filledAmount = undefined;
         let cost = undefined;
         let remaining = undefined;
-        const totalFilled = this.safeString(order, 'accBaseVolume');
+        let totalFilled = this.safeString(order, 'accBaseVolume');
         if (isSpot) {
             if (isMargin) {
-                filledAmount = this.omitZero(this.safeString(order, 'fillTotalAmount'));
-                totalAmount = this.omitZero(this.safeString(order, 'baseSize')); // for margin trading
-                cost = this.safeString(order, 'quoteSize');
+                totalAmount = this.safeString(order, 'baseSize');
+                totalFilled = this.safeString(order, 'baseVolume');
+                cost = this.safeString(order, 'fillTotalAmount');
             }
             else {
                 const partialFillAmount = this.safeString(order, 'baseVolume');

package/js/src/pro/bybit.js

@@ -126,7 +126,7 @@ export default class bybit extends bybitRest {
             },
             'streaming': {
                 'ping': this.ping,
-                'keepAlive': 19000,
+                'keepAlive': 18000,
             },
         });
     }

package/js/src/pro/mexc.js

@@ -37,7 +37,7 @@ export default class mexc extends mexcRest {
                 'api': {
                     'ws': {
                         'spot': 'wss://wbs.mexc.com/ws',
-                        'swap': 'wss://contract.mexc.com/ws',
+                        'swap': 'wss://contract.mexc.com/edge',
                     },
                 },
             },
@@ -64,7 +64,7 @@ export default class mexc extends mexcRest {
             },
             'streaming': {
                 'ping': this.ping,
-                'keepAlive': 10000,
+                'keepAlive': 8000,
             },
             'exceptions': {},
         });

package/js/src/pro/upbit.js

@@ -232,17 +232,21 @@ export default class upbit extends upbitRest {
     }
     async authenticate(params = {}) {
         this.checkRequiredCredentials();
-        const authenticated = this.options['ws']['token'];
+        const wsOptions = this.safeDict(this.options, 'ws', {});
+        const authenticated = this.safeString(wsOptions, 'token');
         if (authenticated === undefined) {
             const auth = {
                 'access_key': this.apiKey,
                 'nonce': this.uuid(),
             };
             const token = jwt(auth, this.encode(this.secret), sha256, false);
-            this.options['ws']['token'] = token;
-            this.options['ws']['options']['headers'] = {
-                'authorization': 'Bearer ' + token,
+            wsOptions['token'] = token;
+            wsOptions['options'] = {
+                'headers': {
+                    'authorization': 'Bearer ' + token,
+                },
             };
+            this.options['ws'] = wsOptions;
         }
         const url = this.urls['api']['ws'] + '/private';
         const client = this.client(url);

package/js/src/pro/woo.js

@@ -598,7 +598,7 @@ export default class woo extends wooRest {
     async watchMyTrades(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
-         * @name woo#watchOrders
+         * @name woo#watchMyTrades
          * @see https://docs.woo.org/#executionreport
          * @see https://docs.woo.org/#algoexecutionreportv2
          * @description watches information on multiple trades made by the user
@@ -607,7 +607,7 @@ export default class woo extends wooRest {
          * @param {int} [limit] the maximum number of order structures to retrieve
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @param {bool} [params.trigger] true if trigger order
-         * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
+         * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=trade-structure}
          */
         await this.loadMarkets();
         const trigger = this.safeBool2(params, 'stop', 'trigger', false);

package/js/src/tradeogre.d.ts

@@ -18,7 +18,7 @@ export default class tradeogre extends Exchange {
     parseBalance(response: any): import("./base/types.js").Balances;
     createOrder(symbol: string, type: OrderType, side: OrderSide, amount: number, price?: Num, params?: {}): Promise<Order>;
     cancelOrder(id: string, symbol?: Str, params?: {}): Promise<Order>;
-    cancelAllOrders(symbol?: Str, params?: {}): Promise<Order>;
+    cancelAllOrders(symbol?: Str, params?: {}): Promise<Order[]>;
     fetchOpenOrders(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<Order[]>;
     fetchOrder(id: string, symbol?: Str, params?: {}): Promise<Order>;
     parseOrder(order: Dict, market?: Market): Order;

package/js/src/tradeogre.js

@@ -6,7 +6,7 @@
 
 // ---------------------------------------------------------------------------
 import Exchange from './abstract/tradeogre.js';
-import { InsufficientFunds, AuthenticationError, BadRequest, ExchangeError } from './base/errors.js';
+import { InsufficientFunds, AuthenticationError, BadRequest, ExchangeError, ArgumentsRequired } from './base/errors.js';
 import { TICK_SIZE } from './base/functions/number.js';
 // ---------------------------------------------------------------------------
 /**
@@ -452,7 +452,7 @@ export default class tradeogre extends Exchange {
          * @name tradeogre#createOrder
          * @description create a trade order
          * @param {string} symbol unified symbol of the market to create an order in
-         * @param {string} type not used by tradeogre
+         * @param {string} type must be '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
@@ -461,14 +461,17 @@ export default class tradeogre extends Exchange {
          */
         await this.loadMarkets();
         const market = this.market(symbol);
+        if (type === 'market') {
+            throw new BadRequest(this.id + ' createOrder does not support market orders');
+        }
+        if (price === undefined) {
+            throw new ArgumentsRequired(this.id + ' createOrder requires a limit parameter');
+        }
         const request = {
             'market': market['id'],
             'quantity': this.parseToNumeric(this.amountToPrecision(symbol, amount)),
             'price': this.parseToNumeric(this.priceToPrecision(symbol, price)),
         };
-        if (type === 'market') {
-            throw new BadRequest(this.id + ' createOrder does not support market orders');
-        }
         let response = undefined;
         if (side === 'buy') {
             response = await this.privatePostOrderBuy(this.extend(request, params));
@@ -505,7 +508,10 @@ export default class tradeogre extends Exchange {
          * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
-        return await this.cancelOrder('all', symbol, params);
+        const response = await this.cancelOrder('all', symbol, params);
+        return [
+            response,
+        ];
     }
     async fetchOpenOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**

package/js/src/wavesexchange.d.ts

@@ -53,26 +53,7 @@ export default class wavesexchange extends Exchange {
     safeGetDynamic(settings: any): any;
     safeGetRates(dynamic: any): any;
     createOrder(symbol: string, type: OrderType, side: OrderSide, amount: number, price?: Num, params?: {}): Promise<Order>;
-    cancelOrder(id: string, symbol?: Str, params?: {}): Promise<{
-        info: any;
-        id: string;
-        clientOrderId: any;
-        timestamp: any;
-        datetime: any;
-        lastTradeTimestamp: any;
-        symbol: string;
-        type: any;
-        side: any;
-        price: any;
-        amount: any;
-        cost: any;
-        average: any;
-        filled: any;
-        remaining: any;
-        status: any;
-        fee: any;
-        trades: any;
-    }>;
+    cancelOrder(id: string, symbol?: Str, params?: {}): Promise<Order>;
     fetchOrder(id: string, symbol?: Str, params?: {}): Promise<Order>;
     fetchOrders(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<Order[]>;
     fetchOpenOrders(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<Order[]>;

package/js/src/wavesexchange.js

@@ -1502,7 +1502,7 @@ export default class wavesexchange extends Exchange {
         const firstMessage = this.safeValue(message, 0);
         const firstOrder = this.safeValue(firstMessage, 0);
         const returnedId = this.safeString(firstOrder, 'orderId');
-        return {
+        return this.safeOrder({
             'info': response,
             'id': returnedId,
             'clientOrderId': undefined,
@@ -1521,7 +1521,7 @@ export default class wavesexchange extends Exchange {
             'status': undefined,
             'fee': undefined,
             'trades': undefined,
-        };
+        });
     }
     async fetchOrder(id, symbol = undefined, params = {}) {
         /**

package/js/src/wazirx.d.ts

@@ -28,7 +28,7 @@ export default class wazirx extends Exchange {
     fetchBalance(params?: {}): Promise<Balances>;
     fetchOrders(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<Order[]>;
     fetchOpenOrders(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<Order[]>;
-    cancelAllOrders(symbol?: Str, params?: {}): Promise<any>;
+    cancelAllOrders(symbol?: Str, params?: {}): Promise<Order[]>;
     cancelOrder(id: string, symbol?: Str, params?: {}): Promise<Order>;
     createOrder(symbol: string, type: OrderType, side: OrderSide, amount: number, price?: Num, params?: {}): Promise<Order>;
     parseOrder(order: Dict, market?: Market): Order;

package/js/src/wazirx.js

@@ -795,7 +795,26 @@ export default class wazirx extends Exchange {
         const request = {
             'symbol': market['id'],
         };
-        return await this.privateDeleteOpenOrders(this.extend(request, params));
+        const response = await this.privateDeleteOpenOrders(this.extend(request, params));
+        //
+        //    [
+        //        {
+        //            id: "4565421197",
+        //            symbol: "adausdt",
+        //            type: "limit",
+        //            side: "buy",
+        //            status: "wait",
+        //            price: "0.41",
+        //            origQty: "11.00",
+        //            executedQty: "0.00",
+        //            avgPrice: "0.00",
+        //            createdTime: "1718089507000",
+        //            updatedTime: "1718089507000",
+        //            clientOrderId: "93d2a838-e272-405d-91e7-3a7bc6d3a003"
+        //        }
+        //    ]
+        //
+        return this.parseOrders(response);
     }
     async cancelOrder(id, symbol = undefined, params = {}) {
         /**
@@ -871,18 +890,22 @@ export default class wazirx extends Exchange {
         return this.parseOrder(response, market);
     }
     parseOrder(order, market = undefined) {
-        // {
-        //     "id":1949417813,
-        //     "symbol":"ltcusdt",
-        //     "type":"limit",
-        //     "side":"sell",
-        //     "status":"done",
-        //     "price":"146.2",
-        //     "origQty":"0.05",
-        //     "executedQty":"0.05",
-        //     "createdTime":1641252564000,
-        //     "updatedTime":1641252564000
-        // },
+        //
+        //    {
+        //        "id": 1949417813,
+        //        "symbol": "ltcusdt",
+        //        "type": "limit",
+        //        "side": "sell",
+        //        "status": "done",
+        //        "price": "146.2",
+        //        "origQty": "0.05",
+        //        "executedQty": "0.05",
+        //        "avgPrice":  "0.00",
+        //        "createdTime": 1641252564000,
+        //        "updatedTime": 1641252564000
+        //        "clientOrderId": "93d2a838-e272-405d-91e7-3a7bc6d3a003"
+        //    }
+        //
         const created = this.safeInteger(order, 'createdTime');
         const updated = this.safeInteger(order, 'updatedTime');
         const marketId = this.safeString(order, 'symbol');
@@ -897,7 +920,7 @@ export default class wazirx extends Exchange {
         return this.safeOrder({
             'info': order,
             'id': id,
-            'clientOrderId': undefined,
+            'clientOrderId': this.safeString(order, 'clientOrderId'),
             'timestamp': created,
             'datetime': this.iso8601(created),
             'lastTradeTimestamp': updated,
@@ -913,7 +936,7 @@ export default class wazirx extends Exchange {
             'remaining': undefined,
             'cost': undefined,
             'fee': undefined,
-            'average': undefined,
+            'average': this.safeString(order, 'avgPrice'),
             'trades': [],
         }, market);
     }

package/js/src/zonda.d.ts

@@ -41,7 +41,7 @@ export default class zonda extends Exchange {
     parseTrade(trade: Dict, market?: Market): Trade;
     fetchTrades(symbol: string, since?: Int, limit?: Int, params?: {}): Promise<Trade[]>;
     createOrder(symbol: string, type: OrderType, side: OrderSide, amount: number, price?: Num, params?: {}): Promise<Order>;
-    cancelOrder(id: string, symbol?: Str, params?: {}): Promise<any>;
+    cancelOrder(id: string, symbol?: Str, params?: {}): Promise<Order>;
     isFiat(currency: any): boolean;
     parseDepositAddress(depositAddress: any, currency?: Currency): {
         currency: string;

package/js/src/zonda.js

@@ -443,6 +443,13 @@ export default class zonda extends Exchange {
         //         "secondBalanceId": "ab43023b-4079-414c-b340-056e3430a3af"
         //     }
         //
+        // cancelOrder
+        //
+        //    {
+        //        status: "Ok",
+        //        errors: []
+        //    }
+        //
         const marketId = this.safeString(order, 'market');
         const symbol = this.safeSymbol(marketId, market, '-');
         const timestamp = this.safeInteger(order, 'time');
@@ -1500,9 +1507,10 @@ export default class zonda extends Exchange {
             'side': side,
             'price': price,
         };
+        const response = await this.v1_01PrivateDeleteTradingOfferSymbolIdSidePrice(this.extend(request, params));
         // { status: "Fail", errors: [ "NOT_RECOGNIZED_OFFER_TYPE" ] }  -- if required params are missing
         // { status: "Ok", errors: [] }
-        return await this.v1_01PrivateDeleteTradingOfferSymbolIdSidePrice(this.extend(request, params));
+        return this.parseOrder(response);
     }
     isFiat(currency) {
         const fiatCurrencies = {

package/package.json

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