ccxt 4.1.30 → 4.1.32

package/js/src/pro/bittrex.js

@@ -6,7 +6,7 @@
 
 //  ---------------------------------------------------------------------------
 import bittrexRest from '../bittrex.js';
-import { InvalidNonce, BadRequest } from '../base/errors.js';
+import { InvalidNonce, BadRequest, ExchangeError, AuthenticationError } from '../base/errors.js';
 import { ArrayCache, ArrayCacheByTimestamp, ArrayCacheBySymbolById } from '../base/ws/Cache.js';
 import { sha512 } from '../static_dependencies/noble-hashes/sha512.js';
 import { inflateSync as inflate } from '../static_dependencies/fflake/browser.js';
@@ -49,6 +49,12 @@ export default class bittrex extends bittrexRest {
                     'maxRetries': 3,
                 },
             },
+            'exceptions': {
+                'exact': {
+                    'INVALID_APIKEY': AuthenticationError,
+                    'UNAUTHORIZED_USER': AuthenticationError,
+                },
+            },
         });
     }
     getSignalRUrl(negotiation) {
@@ -99,6 +105,7 @@ export default class bittrex extends bittrexRest {
         return await this.watch(url, messageHash, request, messageHash, subscription);
     }
     async authenticate(params = {}) {
+        this.checkRequiredCredentials();
         await this.loadMarkets();
         const request = await this.negotiate();
         return await this.sendRequestToAuthenticate(request, false, params);
@@ -119,7 +126,7 @@ export default class bittrex extends bittrexRest {
                 'negotiation': negotiation,
                 'method': this.handleAuthenticate,
             };
-            this.spawn(this.watch, url, messageHash, request, requestId, subscription);
+            this.watch(url, messageHash, request, requestId, subscription);
         }
         return await future;
     }
@@ -526,7 +533,9 @@ export default class bittrex extends bittrexRest {
          * @returns {object[]} a list of [trade structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#trade-structure
          */
         await this.loadMarkets();
-        symbol = this.symbol(symbol);
+        if (symbol !== undefined) {
+            symbol = this.symbol(symbol);
+        }
         const authentication = await this.authenticate();
         const trades = await this.subscribeToMyTrades(authentication, params);
         if (this.newUpdates) {
@@ -791,6 +800,60 @@ export default class bittrex extends bittrexRest {
         }
         return message;
     }
+    handleErrorMessage(client, message) {
+        //
+        //    {
+        //        R: [{ Success: false, ErrorCode: 'UNAUTHORIZED_USER' }, ... ],
+        //        I: '1698601759267'
+        //    }
+        //    {
+        //        R: { Success: false, ErrorCode: 'INVALID_APIKEY' },
+        //        I: '1698601759266'
+        //    }
+        //
+        const R = this.safeValue(message, 'R');
+        if (R === undefined) {
+            // Return there is no error
+            return false;
+        }
+        const I = this.safeString(message, 'I');
+        let errorCode = undefined;
+        if (Array.isArray(R)) {
+            for (let i = 0; i < R.length; i++) {
+                const response = this.safeValue(R, i);
+                const success = this.safeValue(response, 'Success', true);
+                if (!success) {
+                    errorCode = this.safeString(response, 'ErrorCode');
+                    break;
+                }
+            }
+        }
+        else {
+            const success = this.safeValue(R, 'Success', true);
+            if (!success) {
+                errorCode = this.safeString(R, 'ErrorCode');
+            }
+        }
+        if (errorCode === undefined) {
+            // Return there is no error
+            return false;
+        }
+        const feedback = this.id + ' ' + errorCode;
+        try {
+            this.throwExactlyMatchedException(this.exceptions['exact'], errorCode, feedback);
+            if (message !== undefined) {
+                this.throwBroadlyMatchedException(this.exceptions['broad'], errorCode, feedback);
+            }
+            throw new ExchangeError(feedback);
+        }
+        catch (e) {
+            if (e instanceof AuthenticationError) {
+                client.reject(e, 'authenticate');
+            }
+            client.reject(e, I);
+        }
+        return true;
+    }
     handleMessage(client, message) {
         //
         // subscription confirmation
@@ -837,6 +900,9 @@ export default class bittrex extends bittrexRest {
         //         M: [ { H: 'C3', M: 'authenticationExpiring', A: [] } ]
         //     }
         //
+        if (this.handleErrorMessage(client, message)) {
+            return;
+        }
         const methods = {
             'authenticationExpiring': this.handleAuthenticationExpiring,
             'order': this.handleOrder,

package/js/src/pro/huobi.js

@@ -105,7 +105,8 @@ export default class huobi extends huobiRest {
                         '2021': BadRequest,
                         '2001': BadSymbol,
                         '2011': BadSymbol,
-                        '2040': BadRequest, // { op: 'sub', cid: '1649152947', 'err-code': 2040, 'err-msg': 'Missing required parameter.', ts: 1649152948684 }
+                        '2040': BadRequest,
+                        '4007': BadRequest, // { op: 'sub', cid: '1', topic: 'accounts_unify.USDT', 'err-code': 4007, 'err-msg': 'Non - single account user is not available, please check through the cross and isolated account asset interface', ts: 1698419318540 }
                     },
                 },
             },
@@ -1194,12 +1195,12 @@ export default class huobi extends huobiRest {
          * @param {object} [params] extra parameters specific to the huobi api endpoint
          * @returns {object} a [balance structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#balance-structure}
          */
-        let type = this.safeString2(this.options, 'watchBalance', 'defaultType', 'spot');
-        type = this.safeString(params, 'type', type);
-        let subType = this.safeString2(this.options, 'watchBalance', 'subType', 'linear');
-        subType = this.safeString(params, 'subType', subType);
-        params = this.omit(params, ['type', 'subType']);
-        params = this.omit(params, 'type');
+        let type = undefined;
+        [type, params] = this.handleMarketTypeAndParams('watchBalance', undefined, params);
+        let subType = undefined;
+        [subType, params] = this.handleSubTypeAndParams('watchBalance', undefined, params, 'linear');
+        const isUnifiedAccount = this.safeValue2(params, 'isUnifiedAccount', 'unified', false);
+        params = this.omit(params, ['isUnifiedAccount', 'unified']);
         await this.loadMarkets();
         let messageHash = undefined;
         let channel = undefined;
@@ -1220,29 +1221,37 @@ export default class huobi extends huobiRest {
             let prefix = 'accounts';
             messageHash = prefix;
             if (subType === 'linear') {
-                // usdt contracts account
-                prefix = (marginMode === 'cross') ? prefix + '_cross' : prefix;
-                messageHash = prefix;
-                if (marginMode === 'isolated') {
-                    // isolated margin only allows filtering by symbol3
-                    if (symbol !== undefined) {
-                        messageHash += '.' + market['id'];
-                        channel = messageHash;
-                    }
-                    else {
-                        // subscribe to all
-                        channel = prefix + '.' + '*';
-                    }
+                if (isUnifiedAccount) {
+                    // usdt contracts account
+                    prefix = 'accounts_unify';
+                    messageHash = prefix;
+                    channel = prefix + '.' + 'usdt';
                 }
                 else {
-                    // cross margin
-                    if (currencyCode !== undefined) {
-                        channel = prefix + '.' + currencyCode['id'];
-                        messageHash = channel;
+                    // usdt contracts account
+                    prefix = (marginMode === 'cross') ? prefix + '_cross' : prefix;
+                    messageHash = prefix;
+                    if (marginMode === 'isolated') {
+                        // isolated margin only allows filtering by symbol3
+                        if (symbol !== undefined) {
+                            messageHash += '.' + market['id'];
+                            channel = messageHash;
+                        }
+                        else {
+                            // subscribe to all
+                            channel = prefix + '.' + '*';
+                        }
                     }
                     else {
-                        // subscribe to all
-                        channel = prefix + '.' + '*';
+                        // cross margin
+                        if (currencyCode !== undefined) {
+                            channel = prefix + '.' + currencyCode['id'];
+                            messageHash = channel;
+                        }
+                        else {
+                            // subscribe to all
+                            channel = prefix + '.' + '*';
+                        }
                     }
                 }
             }
@@ -1420,7 +1429,9 @@ export default class huobi extends huobiRest {
                 return;
             }
             const first = this.safeValue(data, 0, {});
-            let messageHash = this.safeString(message, 'topic');
+            const topic = this.safeString(message, 'topic');
+            const splitTopic = topic.split('.');
+            let messageHash = this.safeString(splitTopic, 0);
             let subscription = this.safeValue2(client.subscriptions, messageHash, messageHash + '.*');
             if (subscription === undefined) {
                 // if subscription not found means that we subscribed to a specific currency/symbol
@@ -1428,13 +1439,37 @@ export default class huobi extends huobiRest {
                 // Example: topic = 'accounts'
                 // client.subscription hash = 'accounts.usdt'
                 // we do 'accounts' + '.' + data[0]]['margin_asset'] to get it
-                const marginAsset = this.safeString(first, 'margin_asset');
-                messageHash += '.' + marginAsset.toLowerCase();
+                const currencyId = this.safeString2(first, 'margin_asset', 'symbol');
+                messageHash += '.' + currencyId.toLowerCase();
                 subscription = this.safeValue(client.subscriptions, messageHash);
             }
             const type = this.safeString(subscription, 'type');
             const subType = this.safeString(subscription, 'subType');
-            if (subType === 'linear') {
+            if (topic === 'accounts_unify') {
+                // {
+                //     margin_asset: 'USDT',
+                //     margin_static: 10,
+                //     cross_margin_static: 10,
+                //     margin_balance: 10,
+                //     cross_profit_unreal: 0,
+                //     margin_frozen: 0,
+                //     withdraw_available: 10,
+                //     cross_risk_rate: null,
+                //     cross_swap: [],
+                //     cross_future: [],
+                //     isolated_swap: []
+                // }
+                const marginAsset = this.safeString(first, 'margin_asset');
+                const code = this.safeCurrencyCode(marginAsset);
+                const marginFrozen = this.safeString(first, 'margin_frozen');
+                const unifiedAccount = this.account();
+                unifiedAccount['free'] = this.safeString(first, 'withdraw_available');
+                unifiedAccount['used'] = marginFrozen;
+                this.balance[code] = unifiedAccount;
+                this.balance = this.safeBalance(this.balance);
+                client.resolve(this.balance, 'accounts_unify');
+            }
+            else if (subType === 'linear') {
                 const margin = this.safeString(subscription, 'margin');
                 if (margin === 'cross') {
                     const fieldName = (type === 'future') ? 'futures_contract_detail' : 'contract_detail';
@@ -1732,6 +1767,15 @@ export default class huobi extends huobiRest {
         //         id: '2'
         //     }
         //
+        //     {
+        //         op: 'sub',
+        //         cid: '1',
+        //         topic: 'accounts_unify.USDT',
+        //         'err-code': 4007,
+        //         'err-msg': 'Non - single account user is not available, please check through the cross and isolated account asset interface',
+        //         ts: 1698419490189
+        //     }
+        //
         const status = this.safeString(message, 'status');
         if (status === 'error') {
             const id = this.safeString(message, 'id');
@@ -1753,8 +1797,8 @@ export default class huobi extends huobiRest {
             }
             return false;
         }
-        const code = this.safeInteger(message, 'code');
-        if (code !== undefined && code !== 200) {
+        const code = this.safeInteger2(message, 'code', 'err-code');
+        if (code !== undefined && ((code !== 200) && (code !== 0))) {
             const feedback = this.id + ' ' + this.json(message);
             try {
                 this.throwExactlyMatchedException(this.exceptions['ws']['exact'], code, feedback);

package/js/src/woo.d.ts

@@ -160,7 +160,7 @@ export default class woo extends Exchange {
         amount: number;
         rate: number;
     };
-    fetchFundingHistory(symbol?: string, since?: Int, limit?: Int, params?: {}): Promise<any>;
+    fetchFundingHistory(symbol?: string, since?: Int, limit?: Int, params?: {}): Promise<import("./base/types.js").FundingHistory[]>;
     parseFundingRate(fundingRate: any, market?: any): {
         info: any;
         symbol: any;

package/js/src/woo.js

@@ -950,29 +950,27 @@ export default class woo extends Exchange {
         if (stopPrice !== undefined) {
             request['triggerPrice'] = this.priceToPrecision(symbol, stopPrice);
         }
+        params = this.omit(params, ['clOrdID', 'clientOrderId', 'client_order_id', 'stopPrice', 'triggerPrice', 'takeProfitPrice', 'stopLossPrice']);
         const isStop = (stopPrice !== undefined) || (this.safeValue(params, 'childOrders') !== undefined);
-        let method = undefined;
+        let response = undefined;
         if (isByClientOrder) {
+            request['client_order_id'] = clientOrderIdExchangeSpecific;
             if (isStop) {
-                method = 'v3PrivatePutAlgoOrderClientClientOrderId';
-                request['oid'] = id;
+                response = await this.v3PrivatePutAlgoOrderClientClientOrderId(this.extend(request, params));
             }
             else {
-                method = 'v3PrivatePutOrderClientClientOrderId';
-                request['client_order_id'] = clientOrderIdExchangeSpecific;
+                response = await this.v3PrivatePutOrderClientClientOrderId(this.extend(request, params));
             }
         }
         else {
+            request['oid'] = id;
             if (isStop) {
-                method = 'v3PrivatePutAlgoOrderOid';
+                response = await this.v3PrivatePutAlgoOrderOid(this.extend(request, params));
             }
             else {
-                method = 'v3PrivatePutOrderOid';
+                response = await this.v3PrivatePutOrderOid(this.extend(request, params));
             }
-            request['oid'] = id;
         }
-        params = this.omit(params, ['clOrdID', 'clientOrderId', 'client_order_id', 'stopPrice', 'triggerPrice', 'takeProfitPrice', 'stopLossPrice']);
-        const response = await this[method](this.extend(request, params));
         //
         //     {
         //         "code": 0,
@@ -1008,32 +1006,31 @@ export default class woo extends Exchange {
             this.checkRequiredSymbol('cancelOrder', symbol);
         }
         await this.loadMarkets();
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+        }
         const request = {};
         const clientOrderIdUnified = this.safeString2(params, 'clOrdID', 'clientOrderId');
         const clientOrderIdExchangeSpecific = this.safeString(params, 'client_order_id', clientOrderIdUnified);
         const isByClientOrder = clientOrderIdExchangeSpecific !== undefined;
-        let method = undefined;
+        let response = undefined;
         if (stop) {
-            method = 'v3PrivateDeleteAlgoOrderOrderId';
             request['order_id'] = id;
-        }
-        else if (isByClientOrder) {
-            method = 'v1PrivateDeleteClientOrder';
-            request['client_order_id'] = clientOrderIdExchangeSpecific;
-            params = this.omit(params, ['clOrdID', 'clientOrderId', 'client_order_id']);
+            response = await this.v3PrivateDeleteAlgoOrderOrderId(this.extend(request, params));
         }
         else {
-            method = 'v1PrivateDeleteOrder';
-            request['order_id'] = id;
-        }
-        let market = undefined;
-        if (symbol !== undefined) {
-            market = this.market(symbol);
-        }
-        if (!stop) {
             request['symbol'] = market['id'];
+            if (isByClientOrder) {
+                request['client_order_id'] = clientOrderIdExchangeSpecific;
+                params = this.omit(params, ['clOrdID', 'clientOrderId', 'client_order_id']);
+                response = await this.v1PrivateDeleteClientOrder(this.extend(request, params));
+            }
+            else {
+                request['order_id'] = id;
+                response = await this.v1PrivateDeleteOrder(this.extend(request, params));
+            }
         }
-        const response = await this[method](this.extend(request, params));
         //
         // { success: true, status: 'CANCEL_SENT' }
         //
@@ -1097,20 +1094,19 @@ export default class woo extends Exchange {
         params = this.omit(params, 'stop');
         const request = {};
         const clientOrderId = this.safeString2(params, 'clOrdID', 'clientOrderId');
-        let method = undefined;
+        let response = undefined;
         if (stop) {
-            method = 'v3PrivateGetAlgoOrderOid';
             request['oid'] = id;
+            response = await this.v3PrivateGetAlgoOrderOid(this.extend(request, params));
         }
         else if (clientOrderId) {
-            method = 'v1PrivateGetClientOrderClientOrderId';
             request['client_order_id'] = clientOrderId;
+            response = await this.v1PrivateGetClientOrderClientOrderId(this.extend(request, params));
         }
         else {
-            method = 'v1PrivateGetOrderOid';
             request['oid'] = id;
+            response = await this.v1PrivateGetOrderOid(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         //
         // {
         //     success: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "4.1.30",
+  "version": "4.1.32",
   "description": "A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 130+ exchanges",
   "unpkg": "dist/ccxt.browser.js",
   "type": "module",
@@ -39,7 +39,7 @@
     "fast-test": "npm run commonjs-test && node run-tests --js",
     "commonjs-test": "node test-commonjs.cjs",
     "fast-test-ws": "node run-tests-ws --js",
-    "test-js": "npm run commonjs-test && node run-tests --js",
+    "test-js": "npm run commonjs-test && node js/src/test/static/test.ids && node run-tests --js",
     "test-js-ws": "node run-tests-ws --js",
     "test-py": "node run-tests --python",
     "test-py-ws": "node run-tests-ws --python",