ccxt 4.5.50 → 4.5.51

package/js/src/kucoinfutures.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import kucoin from './kucoin.js';
 import { BadRequest } from './base/errors.js';
@@ -34,7 +28,6 @@ export default class kucoinfutures extends kucoin {
                 },
                 'defaultType': 'swap',
                 'defaultAccountType': 'contract',
-                'uta': false,
             },
         });
     }

package/js/src/latoken.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/latoken.js';
 import { ExchangeError, AuthenticationError, InvalidNonce, BadRequest, ExchangeNotAvailable, PermissionDenied, AccountSuspended, RateLimitExceeded, InsufficientFunds, BadSymbol, InvalidOrder, ArgumentsRequired, NotSupported } from './base/errors.js';

package/js/src/lbank.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/lbank.js';
 import { ExchangeError, InvalidAddress, DuplicateOrderId, InsufficientFunds, InvalidOrder, InvalidNonce, AuthenticationError, RateLimitExceeded, PermissionDenied, BadRequest, BadSymbol, ArgumentsRequired, NotSupported } from './base/errors.js';

package/js/src/lighter.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/lighter.js';
 import { ArgumentsRequired, BadRequest, ExchangeError, InvalidOrder, NotSupported, RateLimitExceeded } from './base/errors.js';
@@ -645,7 +639,7 @@ export default class lighter extends Exchange {
         const strAccountIndex = this.numberToString(accountIndex);
         const strApiKeyIndex = this.numberToString(apiKeyIndex);
         const signer = await this.loadAccount(this.options['chainId'], this.getLighterPrivateKey(strAccountIndex, strApiKeyIndex), strApiKeyIndex, strAccountIndex, params);
-        const nonce = await this.fetchNonce(accountIndex, apiKeyIndex, params);
+        const nonce = await this.fetchNonce(accountIndex, apiKeyIndex, this.extend(params, { 'skipNonce': false }));
         const expiry = this.milliseconds() + 365 * 864000;
         const signRaw = {
             'integrator_account_index': builder,
@@ -674,7 +668,7 @@ export default class lighter extends Exchange {
         const strApiKeyIndex = this.numberToString(apiKeyIndex);
         const signerNotLoad = this.options['auths'][strAccountIndex][strApiKeyIndex]['signer'];
         const [privateKey, publicKey] = this.lighterGenerateApiKey(signerNotLoad);
-        const nonce = await this.fetchNonce(accountIndex, apiKeyIndex, params);
+        const nonce = await this.fetchNonce(accountIndex, apiKeyIndex, this.extend(params, { 'skipNonce': false }));
         const signRaw = {
             'pubkey': this.encode(publicKey),
             'nonce': nonce,
@@ -878,6 +872,12 @@ export default class lighter extends Exchange {
         if (nonceInOptions !== undefined) {
             return nonceInOptions;
         }
+        // avoid skipNonce for l1 operations
+        let skipNonce = true;
+        [skipNonce, params] = this.handleOptionAndParams(params, 'fetchNonce', 'skipNonce', true);
+        if (skipNonce) {
+            return this.milliseconds();
+        }
         const response = await this.publicGetNextNonce({ 'account_index': accountIndex, 'api_key_index': apiKeyIndex });
         return this.safeInteger(response, 'nonce');
     }

package/js/src/luno.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/luno.js';
 import { ExchangeError, ArgumentsRequired } from './base/errors.js';

package/js/src/mercado.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/mercado.js';
 import { ExchangeError, ArgumentsRequired, InvalidOrder } from './base/errors.js';

package/js/src/mexc.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 // ---------------------------------------------------------------------------
 import Exchange from './abstract/mexc.js';
 import { BadRequest, InvalidNonce, BadSymbol, InvalidOrder, InvalidAddress, ExchangeError, ArgumentsRequired, NotSupported, InsufficientFunds, PermissionDenied, AuthenticationError, AccountSuspended, OnMaintenance } from './base/errors.js';

package/js/src/modetrade.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 // ---------------------------------------------------------------------------
 import Exchange from './abstract/modetrade.js';
 import { AuthenticationError, RateLimitExceeded, BadRequest, ExchangeError, InvalidOrder, InsufficientFunds, ArgumentsRequired, NetworkError, NotSupported } from './base/errors.js';

package/js/src/myokx.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 // ---------------------------------------------------------------------------
 import okx from './okx.js';
 // ---------------------------------------------------------------------------

package/js/src/ndax.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 // ---------------------------------------------------------------------------
 import Exchange from './abstract/ndax.js';
 import { ExchangeError, AuthenticationError, InsufficientFunds, BadSymbol, OrderNotFound } from './base/errors.js';

package/js/src/novadax.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/novadax.js';
 import { AuthenticationError, ExchangeError, PermissionDenied, BadRequest, CancelPending, OrderNotFound, InsufficientFunds, RateLimitExceeded, InvalidOrder, AccountSuspended, BadSymbol, OnMaintenance, ArgumentsRequired, AccountNotEnabled } from './base/errors.js';

package/js/src/okx.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/okx.js';
 import { ExchangeError, ExchangeNotAvailable, OnMaintenance, ArgumentsRequired, BadRequest, AccountSuspended, InvalidAddress, DDoSProtection, PermissionDenied, InsufficientFunds, InvalidNonce, InvalidOrder, OrderNotFound, AuthenticationError, RequestTimeout, BadSymbol, RateLimitExceeded, NetworkError, CancelPending, NotSupported, AccountNotEnabled, ContractUnavailable, ManualInteractionNeeded, OperationRejected, RestrictedLocation } from './base/errors.js';

package/js/src/okxus.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 // ---------------------------------------------------------------------------
 import okx from './okx.js';
 // ---------------------------------------------------------------------------

package/js/src/onetrading.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/onetrading.js';
 import { AuthenticationError, ExchangeError, PermissionDenied, BadRequest, ArgumentsRequired, OrderNotFound, InsufficientFunds, ExchangeNotAvailable, DDoSProtection, InvalidAddress, InvalidOrder, NotSupported } from './base/errors.js';

package/js/src/oxfun.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/oxfun.js';
 import { AccountNotEnabled, ArgumentsRequired, AuthenticationError, BadRequest, BadSymbol, ExchangeError, InvalidOrder, InsufficientFunds, OrderNotFound, MarketClosed, NetworkError, NotSupported, OperationFailed, RateLimitExceeded, RequestTimeout } from './base/errors.js';

package/js/src/p2b.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 // ---------------------------------------------------------------------------
 import Exchange from './abstract/p2b.js';
 import { InsufficientFunds, AuthenticationError, BadRequest, ExchangeNotAvailable, ArgumentsRequired } from './base/errors.js';

package/js/src/pacifica.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/pacifica.js';
 import { ExchangeError, ArgumentsRequired, InvalidOrder, OrderNotFound, BadRequest, InsufficientFunds, PermissionDenied, RateLimitExceeded, ExchangeNotAvailable, RequestTimeout, NotSupported } from './base/errors.js';

package/js/src/paradex.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import { Precise } from './base/Precise.js';
 import Exchange from './abstract/paradex.js';

package/js/src/paymium.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/paymium.js';
 import { ExchangeError } from './base/errors.js';

package/js/src/phemex.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 // ----------------------------------------------------------------------------
 import Exchange from './abstract/phemex.js';
 import { ExchangeError, BadSymbol, AuthenticationError, InsufficientFunds, InvalidOrder, ArgumentsRequired, OrderNotFound, BadRequest, PermissionDenied, AccountSuspended, CancelPending, DDoSProtection, DuplicateOrderId, RateLimitExceeded } from './base/errors.js';

package/js/src/poloniex.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/poloniex.js';
 import { ArgumentsRequired, ExchangeError, ExchangeNotAvailable, NotSupported, RequestTimeout, AuthenticationError, PermissionDenied, InsufficientFunds, OrderNotFound, InvalidOrder, AccountSuspended, OnMaintenance, BadSymbol, BadRequest } from './base/errors.js';

package/js/src/pro/aftermath.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 // ----------------------------------------------------------------------------
 import aftermathRest from '../aftermath.js';
 import { AuthenticationError, ExchangeError } from '../base/errors.js';

package/js/src/pro/alpaca.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import alpacaRest from '../alpaca.js';
 import { ExchangeError, AuthenticationError } from '../base/errors.js';

package/js/src/pro/apex.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import apexRest from '../apex.js';
 import { ArrayCache, ArrayCacheBySymbolById, ArrayCacheBySymbolBySide, ArrayCacheByTimestamp } from '../base/ws/Cache.js';

package/js/src/pro/arkham.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import arkhamRest from '../arkham.js';
 import { sha256 } from '../static_dependencies/noble-hashes/sha256.js';

package/js/src/pro/ascendex.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import ascendexRest from '../ascendex.js';
 import { AuthenticationError, NetworkError } from '../base/errors.js';

package/js/src/pro/aster.d.ts

@@ -3,7 +3,7 @@ import type { Balances, Str, Strings, Tickers, Ticker, Int, Trade, Order, OrderB
 import Client from '../base/ws/Client.js';
 export default class aster extends asterRest {
     describe(): any;
-    getAccountTypeFromSubscriptions(subscriptions: string[]): string;
+    getAccountTypeFromUrl(url: string): string;
     /**
      * @method
      * @name aster#watchTicker

package/js/src/pro/aster.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import asterRest from '../aster.js';
 import { Precise } from '../base/Precise.js';
@@ -83,16 +77,11 @@ export default class aster extends asterRest {
             'exceptions': {},
         });
     }
-    getAccountTypeFromSubscriptions(subscriptions) {
-        let accountType = '';
-        for (let i = 0; i < subscriptions.length; i++) {
-            const subscription = subscriptions[i];
-            if ((subscription === 'spot') || (subscription === 'swap')) {
-                accountType = subscription;
-                break;
-            }
+    getAccountTypeFromUrl(url) {
+        if (url.indexOf('fstream') > -1) {
+            return 'swap';
         }
-        return accountType;
+        return 'spot';
     }
     /**
      * @method
@@ -160,7 +149,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@ticker');
             messageHashes.push('ticker:' + market['symbol']);
         }
-        const newTicker = await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        const newTicker = await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
         if (this.newUpdates) {
             const result = {};
             result[newTicker['symbol']] = newTicker;
@@ -203,7 +192,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@ticker');
             messageHashes.push('unsubscribe:ticker:' + market['symbol']);
         }
-        return await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
     }
     /**
      * @method
@@ -273,7 +262,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@markPrice' + suffix);
             messageHashes.push('ticker:' + market['symbol']);
         }
-        const newTicker = await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        const newTicker = await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
         if (this.newUpdates) {
             const result = {};
             result[newTicker['symbol']] = newTicker;
@@ -318,7 +307,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@markPrice' + suffix);
             messageHashes.push('unsubscribe:ticker:' + market['symbol']);
         }
-        return await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
     }
     handleTicker(client, message) {
         //
@@ -359,9 +348,7 @@ export default class aster extends asterRest {
         //         }
         //     }
         //
-        const subscriptions = client.subscriptions;
-        const subscriptionsKeys = Object.keys(subscriptions);
-        const marketType = this.getAccountTypeFromSubscriptions(subscriptionsKeys);
+        const marketType = this.getAccountTypeFromUrl(client.url);
         const ticker = this.safeDict(message, 'data');
         const parsed = this.parseWsTicker(ticker, marketType);
         const symbol = parsed['symbol'];
@@ -442,7 +429,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@bookTicker');
             messageHashes.push('bidask:' + market['symbol']);
         }
-        const newTicker = await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        const newTicker = await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
         if (this.newUpdates) {
             const result = {};
             result[newTicker['symbol']] = newTicker;
@@ -482,7 +469,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@bookTicker');
             messageHashes.push('unsubscribe:bidask:' + market['symbol']);
         }
-        return await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
     }
     handleBidAsk(client, message) {
         //
@@ -501,9 +488,7 @@ export default class aster extends asterRest {
         //         }
         //     }
         //
-        const subscriptions = client.subscriptions;
-        const subscriptionsKeys = Object.keys(subscriptions);
-        const marketType = this.getAccountTypeFromSubscriptions(subscriptionsKeys);
+        const marketType = this.getAccountTypeFromUrl(client.url);
         const data = this.safeDict(message, 'data', {});
         const marketId = this.safeString(data, 's');
         const market = this.safeMarket(marketId, undefined, undefined, marketType);
@@ -593,7 +578,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@aggTrade');
             messageHashes.push('trade:' + market['symbol']);
         }
-        const trades = await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        const trades = await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
         if (this.newUpdates) {
             const first = this.safeValue(trades, 0);
             const tradeSymbol = this.safeString(first, 'symbol');
@@ -636,7 +621,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@aggTrade');
             messageHashes.push('unsubscribe:trade:' + market['symbol']);
         }
-        return await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
     }
     handleTrade(client, message) {
         //
@@ -656,9 +641,7 @@ export default class aster extends asterRest {
         //         }
         //     }
         //
-        const subscriptions = client.subscriptions;
-        const subscriptionsKeys = Object.keys(subscriptions);
-        const marketType = this.getAccountTypeFromSubscriptions(subscriptionsKeys);
+        const marketType = this.getAccountTypeFromUrl(client.url);
         const trade = this.safeDict(message, 'data');
         const marketId = this.safeString(trade, 's');
         const market = this.safeMarket(marketId, undefined, undefined, marketType);
@@ -906,7 +889,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@depth' + limit.toString());
             messageHashes.push('orderbook:' + market['symbol']);
         }
-        const orderbook = await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        const orderbook = await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
         return orderbook.limit();
     }
     /**
@@ -950,7 +933,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@depth' + limit);
             messageHashes.push('unsubscribe:orderbook:' + market['symbol']);
         }
-        return await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
     }
     handleOrderBook(client, message) {
         //
@@ -979,9 +962,7 @@ export default class aster extends asterRest {
         //         }
         //     }
         //
-        const subscriptions = client.subscriptions;
-        const subscriptionsKeys = Object.keys(subscriptions);
-        const marketType = this.getAccountTypeFromSubscriptions(subscriptionsKeys);
+        const marketType = this.getAccountTypeFromUrl(client.url);
         const data = this.safeDict(message, 'data');
         const marketId = this.safeString(data, 's');
         const timestamp = this.safeInteger(data, 'T');
@@ -1074,7 +1055,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@kline_' + timeframeId);
             messageHashes.push('ohlcv:' + market['symbol'] + ':' + unfiedTimeframe);
         }
-        const [symbol, timeframe, stored] = await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        const [symbol, timeframe, stored] = await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
         if (this.newUpdates) {
             limit = stored.getLimit(symbol, limit);
         }
@@ -1121,7 +1102,7 @@ export default class aster extends asterRest {
             subscriptionArgs.push(this.safeStringLower(market, 'id') + '@kline_' + timeframeId);
             messageHashes.push('unsubscribe:ohlcv:' + market['symbol'] + ':' + unfiedTimeframe);
         }
-        return await this.watchMultiple(url, messageHashes, this.extend(request, params), [type]);
+        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes);
     }
     handleOHLCV(client, message) {
         //
@@ -1153,9 +1134,7 @@ export default class aster extends asterRest {
         //         }
         //     }
         //
-        const subscriptions = client.subscriptions;
-        const subscriptionsKeys = Object.keys(subscriptions);
-        const marketType = this.getAccountTypeFromSubscriptions(subscriptionsKeys);
+        const marketType = this.getAccountTypeFromUrl(client.url);
         const data = this.safeDict(message, 'data');
         const marketId = this.safeString(data, 's');
         const market = this.safeMarket(marketId, undefined, undefined, marketType);
@@ -1353,9 +1332,7 @@ export default class aster extends asterRest {
         //         }
         //     }
         //
-        const subscriptions = client.subscriptions;
-        const subscriptionsKeys = Object.keys(subscriptions);
-        const accountType = this.getAccountTypeFromSubscriptions(subscriptionsKeys);
+        const accountType = this.getAccountTypeFromUrl(client.url);
         const messageHash = accountType + ':balance';
         if (this.balance[accountType] === undefined) {
             this.balance[accountType] = {};
@@ -1884,9 +1861,7 @@ export default class aster extends asterRest {
     }
     getMarketFromOrder(client, order) {
         const marketId = this.safeString(order, 's');
-        const subscriptions = client.subscriptions;
-        const subscriptionsKeys = Object.keys(subscriptions);
-        const marketType = this.getAccountTypeFromSubscriptions(subscriptionsKeys);
+        const marketType = this.getAccountTypeFromUrl(client.url);
         return this.safeMarket(marketId, undefined, undefined, marketType);
     }
     handleMessage(client, message) {

package/js/src/pro/backpack.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import backpackRest from '../backpack.js';
 import { ArgumentsRequired, ExchangeError } from '../base/errors.js';

package/js/src/pro/bequant.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import hitbtc from './hitbtc.js';
 import hitbtcRest from '../hitbtc.js';

package/js/src/pro/binance.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 // ----------------------------------------------------------------------------
 import binanceRest from '../binance.js';
 import { Precise } from '../base/Precise.js';
@@ -3917,7 +3911,7 @@ export default class binance extends binanceRest {
             'datetime': this.iso8601(timestamp),
             'lastTradeTimestamp': lastTradeTimestamp,
             'lastUpdateTimestamp': lastUpdateTimestamp,
-            'type': this.parseOrderType(this.safeStringLower(order, 'o')),
+            'type': this.parseOrderTypeByMarket(this.safeStringLower(order, 'o'), marketType),
             'timeInForce': timeInForce,
             'postOnly': undefined,
             'reduceOnly': this.safeBool(order, 'R'),

package/js/src/pro/binancecoinm.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import binance from './binance.js';
 import binancecoinmRest from '../binancecoinm.js';

package/js/src/pro/binanceus.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import binance from './binance.js';
 import binanceusRest from '../binanceus.js';

package/js/src/pro/binanceusdm.js

@@ -1,9 +1,3 @@
-// ----------------------------------------------------------------------------
-
-// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
-// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
-// EDIT THE CORRESPONDENT .ts FILE INSTEAD
-
 //  ---------------------------------------------------------------------------
 import binance from './binance.js';
 import { InvalidOrder } from '../base/errors.js';