ccxt 4.1.39 → 4.1.41

package/README.md

@@ -215,13 +215,13 @@ console.log(version, Object.keys(exchanges));
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
-* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.1.39/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@4.1.39/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.1.41/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/ccxt@4.1.41/dist/ccxt.browser.js
 
 CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 ```HTML
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.1.39/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.1.41/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object:

package/build.sh

@@ -59,7 +59,6 @@ build_and_test_all () {
   npm run force-build
   if [[ "$IS_TRAVIS" == "TRUE" ]]; then
     npm run test-base
-    npm run static-tests
     npm run test-base-ws
     run_tests
   fi
@@ -155,8 +154,8 @@ if [ ${#REST_EXCHANGES[@]} -eq 0 ] && [ ${#WS_EXCHANGES[@]} -eq 0 ]; then
   exit
 fi
 
-# run static tests:
-npm run static-tests
+# run base tests (base js,py,php, brokerId and static-tests)
+npm run test-base
 
 # rest_args=${REST_EXCHANGES[*]} || "skip"
 rest_args=$(IFS=" " ; echo "${REST_EXCHANGES[*]}") || "skip"

package/dist/ccxt.browser.js

@@ -8057,6 +8057,17 @@ class Exchange {
         const convertedNumber = parseFloat(stringifiedNumber);
         return parseInt(convertedNumber);
     }
+    parseToNumeric(number) {
+        const stringVersion = this.numberToString(number); // this will convert 1.0 and 1 to "1" and 1.1 to "1.1"
+        // keep this in mind:
+        // in JS: 1 == 1.0 is true
+        // in Python: 1 == 1.0 is true
+        // in PHP 1 == 1.0 is false
+        if (stringVersion.indexOf('.') > 0) {
+            return parseFloat(stringVersion);
+        }
+        return parseInt(stringVersion);
+    }
     afterConstruct() {
         this.createNetworksByIdObject();
     }
@@ -11038,7 +11049,13 @@ class Exchange {
                     }
                     params[cursorSent] = cursorValue;
                 }
-                const response = await this[method](symbol, since, maxEntriesPerRequest, params);
+                let response = undefined;
+                if (method === 'fetchAccounts') {
+                    response = await this[method](params);
+                }
+                else {
+                    response = await this[method](symbol, since, maxEntriesPerRequest, params);
+                }
                 errors = 0;
                 const responseLength = response.length;
                 if (this.verbose) {
@@ -26049,6 +26066,7 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
                 'cancelOrder': true,
                 'cancelOrders': true,
                 'createOrder': true,
+                'createOrders': true,
                 'fetchBalance': true,
                 'fetchClosedOrders': true,
                 'fetchCurrencies': true,
@@ -27607,31 +27625,22 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
             'takeProfitPrice': undefined,
         });
     }
-    async createOrder(symbol, type, side, amount, price = undefined, params = {}) {
+    createOrderRequest(symbol, type, side, amount, price = undefined, params = {}) {
         /**
          * @method
-         * @name bingx#createOrder
-         * @description create a trade order
-         * @see https://bingx-api.github.io/docs/#/spot/trade-api.html#Create%20an%20Order
-         * @see https://bingx-api.github.io/docs/#/swapV2/trade-api.html#Trade%20order
+         * @ignore
+         * @name bingx#createOrderRequest
+         * @description helper function to build request
          * @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} amount how much you want to trade in units of the 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 bingx api endpoint
-         * @param {bool} [params.postOnly] true to place a post only order
-         * @param {string} [params.timeInForce] spot supports 'PO' and 'IOC', swap supports 'PO', 'GTC', 'IOC' and 'FOK'
-         * @param {bool} [params.reduceOnly] *swap only* true or false whether the order is reduce only
-         * @param {float} [params.triggerPrice] *swap only* triggerPrice at which the attached take profit / stop loss order will be triggered
-         * @param {float} [params.stopLossPrice] *swap only* stop loss trigger price
-         * @param {float} [params.takeProfitPrice] *swap only* take profit trigger price
-         * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+         * @returns {object} request to be sent to the exchange
          */
-        await this.loadMarkets();
         const market = this.market(symbol);
         let postOnly = undefined;
-        let response = undefined;
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('createOrder', market, params);
         type = type.toUpperCase();
@@ -27661,20 +27670,19 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
                         const amountString = this.numberToString(amount);
                         const priceString = this.numberToString(price);
                         const cost = this.parseNumber(_base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise.stringMul */ .O.stringMul(amountString, priceString));
-                        request['quoteOrderQty'] = this.priceToPrecision(symbol, cost);
+                        request['quoteOrderQty'] = this.parseToNumeric(this.priceToPrecision(symbol, cost));
                     }
                 }
                 else {
-                    request['quoteOrderQty'] = this.priceToPrecision(symbol, amount);
+                    request['quoteOrderQty'] = this.parseToNumeric(this.priceToPrecision(symbol, amount));
                 }
             }
             else {
-                request['quantity'] = this.amountToPrecision(symbol, amount);
+                request['quantity'] = this.parseToNumeric(this.amountToPrecision(symbol, amount));
             }
             if (!isMarketOrder) {
-                request['price'] = this.priceToPrecision(symbol, price);
+                request['price'] = this.parseToNumeric(this.priceToPrecision(symbol, price));
             }
-            response = await this.spotV1PrivatePostTradeOrder(this.extend(request, params));
         }
         else {
             [postOnly, params] = this.handlePostOnly(isMarketOrder, timeInForce === 'PostOnly', params);
@@ -27688,7 +27696,7 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
                 request['timeInForce'] = 'FOK';
             }
             if ((type === 'LIMIT') || (type === 'TRIGGER_LIMIT') || (type === 'STOP') || (type === 'TAKE_PROFIT')) {
-                request['price'] = this.priceToPrecision(symbol, price);
+                request['price'] = this.parseToNumeric(this.priceToPrecision(symbol, price));
             }
             const triggerPrice = this.safeNumber2(params, 'stopPrice', 'triggerPrice');
             const stopLossPrice = this.safeNumber(params, 'stopLossPrice');
@@ -27696,8 +27704,9 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
             const isTriggerOrder = triggerPrice !== undefined;
             const isStopLossPriceOrder = stopLossPrice !== undefined;
             const isTakeProfitPriceOrder = takeProfitPrice !== undefined;
+            let reduceOnly = this.safeValue(params, 'reduceOnly', false);
             if (isTriggerOrder) {
-                request['stopPrice'] = this.priceToPrecision(symbol, triggerPrice);
+                request['stopPrice'] = this.parseToNumeric(this.priceToPrecision(symbol, triggerPrice));
                 if (isMarketOrder || (type === 'TRIGGER_MARKET')) {
                     request['type'] = 'TRIGGER_MARKET';
                 }
@@ -27707,8 +27716,9 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
             }
             else if (isStopLossPriceOrder || isTakeProfitPriceOrder) {
                 // This can be used to set the stop loss and take profit, but the position needs to be opened first
+                reduceOnly = true;
                 if (isStopLossPriceOrder) {
-                    request['stopPrice'] = this.priceToPrecision(symbol, stopLossPrice);
+                    request['stopPrice'] = this.parseToNumeric(this.priceToPrecision(symbol, stopLossPrice));
                     if (isMarketOrder || (type === 'STOP_MARKET')) {
                         request['type'] = 'STOP_MARKET';
                     }
@@ -27717,7 +27727,7 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
                     }
                 }
                 else if (isTakeProfitPriceOrder) {
-                    request['stopPrice'] = this.priceToPrecision(symbol, takeProfitPrice);
+                    request['stopPrice'] = this.parseToNumeric(this.priceToPrecision(symbol, takeProfitPrice));
                     if (isMarketOrder || (type === 'TAKE_PROFIT_MARKET')) {
                         request['type'] = 'TAKE_PROFIT_MARKET';
                     }
@@ -27726,7 +27736,6 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
                     }
                 }
             }
-            const reduceOnly = this.safeValue(params, 'reduceOnly', false);
             let positionSide = undefined;
             if (reduceOnly) {
                 positionSide = (side === 'buy') ? 'SHORT' : 'LONG';
@@ -27735,9 +27744,41 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
                 positionSide = (side === 'buy') ? 'LONG' : 'SHORT';
             }
             request['positionSide'] = positionSide;
-            request['quantity'] = this.amountToPrecision(symbol, amount);
+            request['quantity'] = this.parseToNumeric(this.amountToPrecision(symbol, amount));
             params = this.omit(params, ['reduceOnly', 'triggerPrice', 'stopLossPrice', 'takeProfitPrice']);
-            response = await this.swapV2PrivatePostTradeOrder(this.extend(request, params));
+        }
+        return this.extend(request, params);
+    }
+    async createOrder(symbol, type, side, amount, price = undefined, params = {}) {
+        /**
+         * @method
+         * @name bingx#createOrder
+         * @description create a trade order
+         * @see https://bingx-api.github.io/docs/#/spot/trade-api.html#Create%20an%20Order
+         * @see https://bingx-api.github.io/docs/#/swapV2/trade-api.html#Trade%20order
+         * @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 you want to trade in units of the 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 bingx api endpoint
+         * @param {bool} [params.postOnly] true to place a post only order
+         * @param {string} [params.timeInForce] spot supports 'PO' and 'IOC', swap supports 'PO', 'GTC', 'IOC' and 'FOK'
+         * @param {bool} [params.reduceOnly] *swap only* true or false whether the order is reduce only
+         * @param {float} [params.triggerPrice] *swap only* triggerPrice at which the attached take profit / stop loss order will be triggered
+         * @param {float} [params.stopLossPrice] *swap only* stop loss trigger price
+         * @param {float} [params.takeProfitPrice] *swap only* take profit trigger price
+         * @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 = this.createOrderRequest(symbol, type, side, amount, price, params);
+        let response = undefined;
+        if (market['swap']) {
+            response = await this.swapV2PrivatePostTradeOrder(request);
+        }
+        else {
+            response = await this.spotV1PrivatePostTradeOrder(request);
         }
         //
         // spot
@@ -27781,6 +27822,99 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
         const order = this.safeValue(data, 'order', data);
         return this.parseOrder(order, market);
     }
+    async createOrders(orders, params = {}) {
+        /**
+         * @method
+         * @name bingx#createOrders
+         * @description create a list of trade orders
+         * @see https://bingx-api.github.io/docs/#/spot/trade-api.html#Batch%20Placing%20Orders
+         * @see https://bingx-api.github.io/docs/#/swapV2/trade-api.html#Bulk%20order
+         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {object} [params] extra parameters specific to the bingx api endpoint
+         * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+         */
+        await this.loadMarkets();
+        const ordersRequests = [];
+        let symbol = undefined;
+        for (let i = 0; i < orders.length; i++) {
+            const rawOrder = orders[i];
+            const marketId = this.safeString(rawOrder, 'symbol');
+            if (symbol === undefined) {
+                symbol = marketId;
+            }
+            else {
+                if (symbol !== marketId) {
+                    throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest(this.id + ' createOrders() requires all orders to have the same symbol');
+                }
+            }
+            const type = this.safeString(rawOrder, 'type');
+            const side = this.safeString(rawOrder, 'side');
+            const amount = this.safeNumber(rawOrder, 'amount');
+            const price = this.safeNumber(rawOrder, 'price');
+            const orderParams = this.safeValue(rawOrder, 'params', {});
+            const orderRequest = this.createOrderRequest(marketId, type, side, amount, price, orderParams);
+            ordersRequests.push(orderRequest);
+        }
+        const market = this.market(symbol);
+        const request = {};
+        let response = undefined;
+        if (market['swap']) {
+            request['batchOrders'] = this.json(ordersRequests);
+            response = await this.swapV2PrivatePostTradeBatchOrders(request);
+        }
+        else {
+            request['data'] = this.json(ordersRequests);
+            response = await this.spotV1PrivatePostTradeBatchOrders(request);
+        }
+        //
+        // spot
+        //
+        //     {
+        //         "code": 0,
+        //         "msg": "",
+        //         "debugMsg": "",
+        //         "data": {
+        //             "orders": [
+        //                 {
+        //                     "symbol": "BTC-USDT",
+        //                     "orderId": 1720661389564968960,
+        //                     "transactTime": 1699072618272,
+        //                     "price": "25000",
+        //                     "origQty": "0.0002",
+        //                     "executedQty": "0",
+        //                     "cummulativeQuoteQty": "0",
+        //                     "status": "PENDING",
+        //                     "type": "LIMIT",
+        //                     "side": "BUY"
+        //                 },
+        //             ]
+        //         }
+        //     }
+        //
+        // swap
+        //
+        //     {
+        //         "code": 0,
+        //         "msg": "",
+        //         "data": {
+        //             "orders": [
+        //                 {
+        //                     "symbol": "BTC-USDT",
+        //                     "orderId": 1720657081994006528,
+        //                     "side": "BUY",
+        //                     "positionSide": "LONG",
+        //                     "type": "LIMIT",
+        //                     "clientOrderID": "",
+        //                     "workingType": ""
+        //                 },
+        //             ]
+        //         }
+        //     }
+        //
+        const data = this.safeValue(response, 'data', {});
+        const result = this.safeValue(data, 'orders', []);
+        return this.parseOrders(result, market);
+    }
     parseOrderSide(side) {
         const sides = {
             'BUY': 'buy',
@@ -27793,7 +27927,7 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
     parseOrder(order, market = undefined) {
         //
         // spot
-        // createOrder, cancelOrder
+        // createOrder, createOrders, cancelOrder
         //
         //    {
         //        "symbol": "XRP-USDT",
@@ -27846,7 +27980,7 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
         //
         //
         // swap
-        // createOrder
+        // createOrder, createOrders
         //
         //    {
         //      "symbol": "BTC-USDT",
@@ -64563,6 +64697,7 @@ class bittrex extends _abstract_bittrex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
                         'max': undefined,
                     },
                 },
+                'networks': {},
             };
         }
         return result;
@@ -83867,6 +84002,7 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @name coinbase#fetchAccounts
          * @description fetch all the accounts associated with a profile
          * @param {object} [params] extra parameters specific to the coinbase api endpoint
+         * @param {boolean} [params.paginate] default false, when true will automatically paginate by calling this endpoint multiple times. See in the docs all the [availble parameters](https://github.com/ccxt/ccxt/wiki/Manual#pagination-params)
          * @returns {object} a dictionary of [account structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#account-structure} indexed by the account type
          */
         const method = this.safeString(this.options, 'fetchAccounts', 'fetchAccountsV3');
@@ -83877,6 +84013,11 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
     }
     async fetchAccountsV2(params = {}) {
         await this.loadMarkets();
+        let paginate = false;
+        [paginate, params] = this.handleOptionAndParams(params, 'fetchAccounts', 'paginate');
+        if (paginate) {
+            return await this.fetchPaginatedCallCursor('fetchAccounts', undefined, undefined, undefined, params, 'next_starting_after', 'starting_after', undefined, 100);
+        }
         const request = {
             'limit': 100,
         };
@@ -83926,10 +84067,24 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
         //     }
         //
         const data = this.safeValue(response, 'data', []);
+        const pagination = this.safeValue(response, 'pagination', {});
+        const cursor = this.safeString(pagination, 'next_starting_after');
+        const accounts = this.safeValue(response, 'data', []);
+        const lastIndex = accounts.length - 1;
+        const last = this.safeValue(accounts, lastIndex);
+        if ((cursor !== undefined) && (cursor !== '')) {
+            last['next_starting_after'] = cursor;
+            accounts[lastIndex] = last;
+        }
         return this.parseAccounts(data, params);
     }
     async fetchAccountsV3(params = {}) {
         await this.loadMarkets();
+        let paginate = false;
+        [paginate, params] = this.handleOptionAndParams(params, 'fetchAccounts', 'paginate');
+        if (paginate) {
+            return await this.fetchPaginatedCallCursor('fetchAccounts', undefined, undefined, undefined, params, 'cursor', 'cursor', undefined, 100);
+        }
         const request = {
             'limit': 100,
         };
@@ -83964,8 +84119,15 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
         //         "size": 9
         //     }
         //
-        const data = this.safeValue(response, 'accounts', []);
-        return this.parseAccounts(data, params);
+        const accounts = this.safeValue(response, 'accounts', []);
+        const lastIndex = accounts.length - 1;
+        const last = this.safeValue(accounts, lastIndex);
+        const cursor = this.safeString(response, 'cursor');
+        if ((cursor !== undefined) && (cursor !== '')) {
+            last['cursor'] = cursor;
+            accounts[lastIndex] = last;
+        }
+        return this.parseAccounts(accounts, params);
     }
     parseAccount(account) {
         //
@@ -182368,9 +182530,12 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                     '51028': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ContractUnavailable,
                     '51029': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ContractUnavailable,
                     '51030': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ContractUnavailable,
+                    '51031': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51046': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51047': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
-                    '51031': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
+                    '51072': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
+                    '51073': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
+                    '51074': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51100': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51101': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51102': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
@@ -182415,6 +182580,7 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                     '51163': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51166': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51174': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
+                    '51185': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51201': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51202': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
                     '51203': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder,
@@ -182562,6 +182728,8 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                     '59200': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InsufficientFunds,
                     '59201': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InsufficientFunds,
                     '59216': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.BadRequest,
+                    '59260': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.PermissionDenied,
+                    '59262': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.PermissionDenied,
                     '59300': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ExchangeError,
                     '59301': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ExchangeError,
                     '59313': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ExchangeError,
@@ -182575,6 +182743,8 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                     '59506': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ExchangeError,
                     '59507': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ExchangeError,
                     '59508': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.AccountSuspended,
+                    '59642': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.BadRequest,
+                    '59643': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ExchangeError,
                     // WebSocket error Codes from 60000-63999
                     '60001': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.AuthenticationError,
                     '60002': _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.AuthenticationError,
@@ -200943,10 +201113,11 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
     }
     async authenticate(params = {}) {
         const time = this.milliseconds();
-        let type = this.safeString2(this.options, 'defaultType', 'authenticate', 'spot');
-        type = this.safeString(params, 'type', type);
+        let query = undefined;
+        let type = undefined;
+        [type, query] = this.handleMarketTypeAndParams('authenticate', undefined, params);
         let subType = undefined;
-        [subType, params] = this.handleSubTypeAndParams('authenticate', undefined, params);
+        [subType, query] = this.handleSubTypeAndParams('authenticate', undefined, query);
         if (this.isLinear(type, subType)) {
             type = 'future';
         }
@@ -200954,11 +201125,11 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
             type = 'delivery';
         }
         let marginMode = undefined;
-        [marginMode, params] = this.handleMarginModeAndParams('authenticate', params);
+        [marginMode, query] = this.handleMarginModeAndParams('authenticate', query);
         const isIsolatedMargin = (marginMode === 'isolated');
         const isCrossMargin = (marginMode === 'cross') || (marginMode === undefined);
-        const symbol = this.safeString(params, 'symbol');
-        params = this.omit(params, 'symbol');
+        const symbol = this.safeString(query, 'symbol');
+        query = this.omit(query, 'symbol');
         const options = this.safeValue(this.options, type, {});
         const lastAuthenticatedTime = this.safeInteger(options, 'lastAuthenticatedTime', 0);
         const listenKeyRefreshRate = this.safeInteger(this.options, 'listenKeyRefreshRate', 1200000);
@@ -200980,9 +201151,9 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                     throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ArgumentsRequired(this.id + ' authenticate() requires a symbol argument for isolated margin mode');
                 }
                 const marketId = this.marketId(symbol);
-                params = this.extend(params, { 'symbol': marketId });
+                query = this.extend(query, { 'symbol': marketId });
             }
-            const response = await this[method](params);
+            const response = await this[method](query);
             this.options[type] = this.extend(options, {
                 'listenKey': this.safeString(response, 'listenKey'),
                 'lastAuthenticatedTime': time,
@@ -200994,8 +201165,8 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         // https://binance-docs.github.io/apidocs/spot/en/#listen-key-spot
         let type = this.safeString2(this.options, 'defaultType', 'authenticate', 'spot');
         type = this.safeString(params, 'type', type);
-        let subType = undefined;
-        [subType, params] = this.handleSubTypeAndParams('keepAliveListenKey', undefined, params);
+        const subTypeInfo = this.handleSubTypeAndParams('keepAliveListenKey', undefined, params);
+        const subType = subTypeInfo[0];
         if (this.isLinear(type, subType)) {
             type = 'future';
         }
@@ -201772,7 +201943,7 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
             market = this.market(symbol);
             symbol = market['symbol'];
             messageHash += ':' + symbol;
-            params = this.extend(params, { 'symbol': symbol }); // needed inside authenticate for isolated margin
+            params = this.extend(params, { 'type': market['type'], 'symbol': symbol }); // needed inside authenticate for isolated margin
         }
         await this.authenticate(params);
         let type = undefined;
@@ -201785,7 +201956,11 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         else if (this.isInverse(type, subType)) {
             type = 'delivery';
         }
-        const url = this.urls['api']['ws'][type] + '/' + this.options[type]['listenKey'];
+        let urlType = type;
+        if (type === 'margin') {
+            urlType = 'spot'; // spot-margin shares the same stream as regular spot
+        }
+        const url = this.urls['api']['ws'][urlType] + '/' + this.options[type]['listenKey'];
         const client = this.client(url);
         this.setBalanceCache(client, type);
         const message = undefined;
@@ -202125,10 +202300,15 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @returns {object[]} a list of [trade structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#trade-structure
          */
         await this.loadMarkets();
-        const defaultType = this.safeString2(this.options, 'watchMyTrades', 'defaultType', 'spot');
-        let type = this.safeString(params, 'type', defaultType);
+        let type = undefined;
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+            symbol = market['symbol'];
+        }
+        [type, params] = this.handleMarketTypeAndParams('watchMyTrades', market, params);
         let subType = undefined;
-        [subType, params] = this.handleSubTypeAndParams('watchMyTrades', undefined, params);
+        [subType, params] = this.handleSubTypeAndParams('watchMyTrades', market, params);
         if (this.isLinear(type, subType)) {
             type = 'future';
         }
@@ -202139,10 +202319,14 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         if (symbol !== undefined) {
             symbol = this.symbol(symbol);
             messageHash += ':' + symbol;
-            params = this.extend(params, { 'symbol': symbol });
+            params = this.extend(params, { 'type': market['type'], 'symbol': symbol });
         }
         await this.authenticate(params);
-        const url = this.urls['api']['ws'][type] + '/' + this.options[type]['listenKey'];
+        let urlType = type; // we don't change type because the listening key is different
+        if (type === 'margin') {
+            urlType = 'spot'; // spot-margin shares the same stream as regular spot
+        }
+        const url = this.urls['api']['ws'][urlType] + '/' + this.options[type]['listenKey'];
         const client = this.client(url);
         this.setBalanceCache(client, type);
         const message = undefined;
@@ -227524,13 +227708,13 @@ class huobi extends _huobi_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
         //     }
         //
         const channel = this.safeString(message, 'ch');
-        const timestamp = this.safeInteger(message, 'ts');
+        const data = this.safeValue(message, 'data', []);
+        const timestamp = this.safeInteger(data, 'changeTime', this.safeInteger(message, 'ts'));
         this.balance['timestamp'] = timestamp;
         this.balance['datetime'] = this.iso8601(timestamp);
-        this.balance['info'] = this.safeValue(message, 'data');
+        this.balance['info'] = data;
         if (channel !== undefined) {
             // spot balance
-            const data = this.safeValue(message, 'data', {});
             const currencyId = this.safeString(data, 'currency');
             const code = this.safeCurrencyCode(currencyId);
             const account = this.account();
@@ -227542,7 +227726,6 @@ class huobi extends _huobi_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
         }
         else {
             // contract balance
-            const data = this.safeValue(message, 'data', []);
             const dataLength = data.length;
             if (dataLength === 0) {
                 return;
@@ -281615,7 +281798,7 @@ SOFTWARE.
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.1.39';
+const version = '4.1.41';
 _src_base_Exchange_js__WEBPACK_IMPORTED_MODULE_0__/* .Exchange.ccxtVersion */ .e.ccxtVersion = version;
 //-----------------------------------------------------------------------------