ccxt 4.4.86 → 4.4.88

package/js/src/bybit.js

@@ -2349,20 +2349,9 @@ export default class bybit extends Exchange {
             // 'baseCoin': '', Base coin. For option only
             // 'expDate': '', Expiry date. e.g., 25DEC22. For option only
         };
-        if (market['spot']) {
-            request['category'] = 'spot';
-        }
-        else {
-            if (market['option']) {
-                request['category'] = 'option';
-            }
-            else if (market['linear']) {
-                request['category'] = 'linear';
-            }
-            else if (market['inverse']) {
-                request['category'] = 'inverse';
-            }
-        }
+        let category = undefined;
+        [category, params] = this.getBybitType('fetchTicker', market, params);
+        request['category'] = category;
         const response = await this.publicGetV5MarketTickers(this.extend(request, params));
         //
         //     {
@@ -2463,28 +2452,16 @@ export default class bybit extends Exchange {
         // 'baseCoin': '', // Base coin. For option only
         // 'expDate': '', // Expiry date. e.g., 25DEC22. For option only
         };
-        let type = undefined;
-        [type, params] = this.handleMarketTypeAndParams('fetchTickers', market, params);
-        // Calls like `.fetchTickers (undefined, {subType:'inverse'})` should be supported for this exchange, so
-        // as "options.defaultSubType" is also set in exchange options, we should consider `params.subType`
-        // with higher priority and only default to spot, if `subType` is not set in params
-        const passedSubType = this.safeString(params, 'subType');
-        let subType = undefined;
-        [subType, params] = this.handleSubTypeAndParams('fetchTickers', market, params, 'linear');
-        // only if passedSubType is undefined, then use spot
-        if (type === 'spot' && passedSubType === undefined) {
-            request['category'] = 'spot';
-        }
-        else if (type === 'option') {
+        let category = undefined;
+        [category, params] = this.getBybitType('fetchTickers', market, params);
+        request['category'] = category;
+        if (category === 'option') {
             request['category'] = 'option';
             if (code === undefined) {
                 code = 'BTC';
             }
             request['baseCoin'] = code;
         }
-        else if (type === 'swap' || type === 'future' || subType !== undefined) {
-            request['category'] = subType;
-        }
         const response = await this.publicGetV5MarketTickers(this.extend(request, params));
         //
         //     {
@@ -4085,18 +4062,9 @@ export default class bybit extends Exchange {
                 request['price'] = priceString;
             }
         }
-        if (market['spot']) {
-            request['category'] = 'spot';
-        }
-        else if (market['option']) {
-            request['category'] = 'option';
-        }
-        else if (market['linear']) {
-            request['category'] = 'linear';
-        }
-        else if (market['inverse']) {
-            request['category'] = 'inverse';
-        }
+        let category = undefined;
+        [category, params] = this.getBybitType('createOrderRequest', market, params);
+        request['category'] = category;
         const cost = this.safeString(params, 'cost');
         params = this.omit(params, 'cost');
         // if the cost is inferable, let's keep the old logic and ignore marketUnit, to minimize the impact of the changes
@@ -4325,18 +4293,9 @@ export default class bybit extends Exchange {
             // Valid for option only.
             // 'orderIv': '0', // Implied volatility; parameters are passed according to the real value; for example, for 10%, 0.1 is passed
         };
-        if (market['spot']) {
-            request['category'] = 'spot';
-        }
-        else if (market['linear']) {
-            request['category'] = 'linear';
-        }
-        else if (market['inverse']) {
-            request['category'] = 'inverse';
-        }
-        else if (market['option']) {
-            request['category'] = 'option';
-        }
+        let category = undefined;
+        [category, params] = this.getBybitType('editOrderRequest', market, params);
+        request['category'] = category;
         if (amount !== undefined) {
             request['qty'] = this.getAmount(symbol, amount);
         }
@@ -4542,18 +4501,9 @@ export default class bybit extends Exchange {
         if (id !== undefined) { // The user can also use argument params["orderLinkId"]
             request['orderId'] = id;
         }
-        if (market['spot']) {
-            request['category'] = 'spot';
-        }
-        else if (market['linear']) {
-            request['category'] = 'linear';
-        }
-        else if (market['inverse']) {
-            request['category'] = 'inverse';
-        }
-        else if (market['option']) {
-            request['category'] = 'option';
-        }
+        let category = undefined;
+        [category, params] = this.getBybitType('cancelOrderRequest', market, params);
+        request['category'] = category;
         return this.extend(request, params);
     }
     /**
@@ -7607,18 +7557,7 @@ export default class bybit extends Exchange {
             'symbol': market['id'],
         };
         let category = undefined;
-        if (market['linear']) {
-            category = 'linear';
-        }
-        else if (market['inverse']) {
-            category = 'inverse';
-        }
-        else if (market['spot']) {
-            category = 'spot';
-        }
-        else {
-            category = 'option';
-        }
+        [category, params] = this.getBybitType('fetchTradingFee', market, params);
         request['category'] = category;
         const response = await this.privateGetV5AccountFeeRate(this.extend(request, params));
         //
@@ -7866,10 +7805,10 @@ export default class bybit extends Exchange {
         }
         let type = undefined;
         [type, params] = this.getBybitType('fetchMySettlementHistory', market, params);
-        if (type === 'spot' || type === 'inverse') {
+        if (type === 'spot') {
             throw new NotSupported(this.id + ' fetchMySettlementHistory() is not supported for spot market');
         }
-        request['category'] = 'linear';
+        request['category'] = type;
         if (limit !== undefined) {
             request['limit'] = limit;
         }

package/js/src/coinmetro.js

@@ -388,7 +388,11 @@ export default class coinmetro extends Exchange {
             else if (typeRaw === 'fiat') {
                 type = 'fiat';
             }
-            const precisionDigits = this.safeString2(currency, 'digits', 'notabeneDecimals');
+            let precisionDigits = this.safeString2(currency, 'digits', 'notabeneDecimals');
+            if (code === 'RENDER') {
+                // RENDER is an exception (with broken info)
+                precisionDigits = '4';
+            }
             result[code] = this.safeCurrencyStructure({
                 'id': id,
                 'code': code,

package/js/src/derive.js

@@ -5,12 +5,13 @@
 // EDIT THE CORRESPONDENT .ts FILE INSTEAD
 
 //  ---------------------------------------------------------------------------
-import { BadRequest, InvalidOrder, Precise, ExchangeError, OrderNotFound, ArgumentsRequired, InsufficientFunds, RateLimitExceeded, AuthenticationError } from '../ccxt.js';
 import Exchange from './abstract/derive.js';
-import { TICK_SIZE } from './base/functions/number.js';
+import Precise from './base/Precise.js';
+import { BadRequest, InvalidOrder, ExchangeError, OrderNotFound, ArgumentsRequired, InsufficientFunds, RateLimitExceeded, AuthenticationError } from './base/errors.js';
+import { ecdsa } from './base/functions/crypto.js';
 import { keccak_256 as keccak } from './static_dependencies/noble-hashes/sha3.js';
 import { secp256k1 } from './static_dependencies/noble-curves/secp256k1.js';
-import { ecdsa } from './base/functions/crypto.js';
+import { TICK_SIZE } from './base/functions/number.js';
 //  ---------------------------------------------------------------------------
 /**
  * @class derive

package/js/src/ellipx.d.ts

@@ -1,5 +1,5 @@
 import Exchange from './abstract/ellipx.js';
-import { Str, Int, int, Dict, Num, Market, Ticker, OrderBook, OHLCV, Currencies, Trade, Balances, OrderType, OrderSide, Order, DepositAddress, TradingFeeInterface, Transaction } from '../ccxt.js';
+import { Str, Int, int, Dict, Num, Market, Ticker, OrderBook, OHLCV, Currencies, Trade, Balances, OrderType, OrderSide, Order, DepositAddress, TradingFeeInterface, Transaction } from './base/types.js';
 /**
  * @class ellipx
  * @augments Exchange

package/js/src/ellipx.js

@@ -7,13 +7,11 @@
 // ---------------------------------------------------------------------------
 import Exchange from './abstract/ellipx.js';
 import { AuthenticationError, BadRequest, DDoSProtection, ExchangeError, PermissionDenied, NotSupported, ArgumentsRequired } from './base/errors.js';
-// import { Precise } from './base/Precise.js';
-import { TICK_SIZE } from './base/functions/number.js';
-// import { sha256 } from './static_dependencies/noble-hashes/sha256.js';
-import { Precise } from '../ccxt.js';
-import { sha256 } from './static_dependencies/noble-hashes/sha256.js';
 import { ed25519 } from './static_dependencies/noble-curves/ed25519.js';
 import { eddsa } from './base/functions/crypto.js';
+import { Precise } from './base/Precise.js';
+import { sha256 } from './static_dependencies/noble-hashes/sha256.js';
+import { TICK_SIZE } from './base/functions/number.js';
 // ---------------------------------------------------------------------------
 /**
  * @class ellipx

package/js/src/gate.js

@@ -111,7 +111,7 @@ export default class gate extends Exchange {
                 'fetchCurrencies': true,
                 'fetchDepositAddress': true,
                 'fetchDepositAddresses': false,
-                'fetchDepositAddressesByNetwork': false,
+                'fetchDepositAddressesByNetwork': true,
                 'fetchDeposits': true,
                 'fetchDepositWithdrawFee': 'emulated',
                 'fetchDepositWithdrawFees': true,
@@ -720,6 +720,16 @@ export default class gate extends Exchange {
                 },
                 'networksById': {
                     'OPETH': 'OP',
+                    'ETH': 'ERC20',
+                    'ERC20': 'ERC20',
+                    'TRX': 'TRC20',
+                    'TRC20': 'TRC20',
+                    'HT': 'HRC20',
+                    'HECO': 'HRC20',
+                    'BSC': 'BEP20',
+                    'BEP20': 'BEP20',
+                    'POLYGON': 'MATIC',
+                    'POL': 'MATIC',
                 },
                 'timeInForce': {
                     'GTC': 'gtc',
@@ -1216,6 +1226,9 @@ export default class gate extends Exchange {
         if (this.options['adjustForTimeDifference']) {
             await this.loadTimeDifference();
         }
+        if (this.checkRequiredCredentials(false)) {
+            await this.loadUnifiedStatus();
+        }
         const sandboxMode = this.safeBool(this.options, 'sandboxMode', false);
         let rawPromises = [
             this.fetchContractMarkets(params),
@@ -1829,88 +1842,93 @@ export default class gate extends Exchange {
         if (apiBackup !== undefined) {
             return undefined;
         }
-        if (this.checkRequiredCredentials(false)) {
-            await this.loadUnifiedStatus();
-        }
         const response = await this.publicSpotGetCurrencies(params);
         //
-        //  [
-        //   {
-        //       "currency": "USDT_ETH",
-        //       "name": "Tether",
-        //       "delisted": false,
-        //       "withdraw_disabled": false,
-        //       "withdraw_delayed": false,
-        //       "deposit_disabled": false,
-        //       "trade_disabled": true,
-        //       "chain": "ETH"
-        //    },
-        //  ]
+        //    [
+        //      {
+        //         "currency": "USDT",
+        //         "name": "Tether",
+        //         "delisted": false,
+        //         "withdraw_disabled": false,
+        //         "withdraw_delayed": false,
+        //         "deposit_disabled": false,
+        //         "trade_disabled": false,
+        //         "fixed_rate": "",
+        //         "chain": "ETH",
+        //         "chains": [
+        //           {
+        //             "name": "ETH",
+        //             "addr": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+        //             "withdraw_disabled": false,
+        //             "withdraw_delayed": false,
+        //             "deposit_disabled": false
+        //           },
+        //           {
+        //             "name": "ARBEVM",
+        //             "addr": "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9",
+        //             "withdraw_disabled": false,
+        //             "withdraw_delayed": false,
+        //             "deposit_disabled": false
+        //           },
+        //           {
+        //             "name": "BSC",
+        //             "addr": "0x55d398326f99059fF775485246999027B3197955",
+        //             "withdraw_disabled": false,
+        //             "withdraw_delayed": false,
+        //             "deposit_disabled": false
+        //           },
+        //         ]
+        //       },
+        //    ]
         //
         const indexedCurrencies = this.indexBy(response, 'currency');
         const result = {};
         for (let i = 0; i < response.length; i++) {
             const entry = response[i];
             const currencyId = this.safeString(entry, 'currency');
-            const parts = currencyId.split('_');
-            const partFirst = this.safeString(parts, 0);
-            // if there's an underscore then the second part is always the chain name (except the _OLD suffix)
-            const currencyName = currencyId.endsWith('_OLD') ? currencyId : partFirst;
-            const withdrawDisabled = this.safeBool(entry, 'withdraw_disabled', false);
-            const depositDisabled = this.safeBool(entry, 'deposit_disabled', false);
-            const tradeDisabled = this.safeBool(entry, 'trade_disabled', false);
-            const precision = this.parseNumber('0.0001'); // temporary safe default, because no value provided from API
-            const code = this.safeCurrencyCode(currencyName);
+            const code = this.safeCurrencyCode(currencyId);
             // check leveraged tokens (e.g. BTC3S, ETH5L)
-            let isLeveragedToken = false;
-            if (currencyId.endsWith('3S') || currencyId.endsWith('3L') || currencyId.endsWith('5S') || currencyId.endsWith('5L')) {
-                const realCurrencyId = currencyId.slice(0, -2);
-                if (realCurrencyId in indexedCurrencies) {
-                    isLeveragedToken = true;
-                }
-            }
-            const type = isLeveragedToken ? 'leveraged' : 'crypto';
-            // some networks are null, they are mostly obsolete & unsupported dead tokens, so we can default their networkId to their tokenname
-            const networkId = this.safeString(entry, 'chain', currencyId);
-            const networkCode = this.networkIdToCode(networkId, code);
-            const networkEntry = {
-                'info': entry,
-                'id': networkId,
-                'network': networkCode,
-                'limits': {
-                    'deposit': {
-                        'min': undefined,
-                        'max': undefined,
-                    },
-                    'withdraw': {
-                        'min': undefined,
-                        'max': undefined,
+            const type = this.isLeveragedCurrency(currencyId, true, indexedCurrencies) ? 'leveraged' : 'crypto';
+            const chains = this.safeList(entry, 'chains', []);
+            const networks = {};
+            for (let j = 0; j < chains.length; j++) {
+                const chain = chains[j];
+                const networkId = this.safeString(chain, 'name');
+                const networkCode = this.networkIdToCode(networkId);
+                networks[networkCode] = {
+                    'info': chain,
+                    'id': networkId,
+                    'network': networkCode,
+                    'active': undefined,
+                    'deposit': !this.safeBool(chain, 'deposit_disabled'),
+                    'withdraw': !this.safeBool(chain, 'withdraw_disabled'),
+                    'fee': undefined,
+                    'precision': this.parseNumber('0.0001'),
+                    'limits': {
+                        'deposit': {
+                            'min': undefined,
+                            'max': undefined,
+                        },
+                        'withdraw': {
+                            'min': undefined,
+                            'max': undefined,
+                        },
                     },
-                },
-                'active': !tradeDisabled,
-                'deposit': !depositDisabled,
-                'withdraw': !withdrawDisabled,
-                'fee': undefined,
-                'precision': precision,
-            };
-            // check if first entry for the specific currency
-            if (!(code in result)) {
-                result[code] = {
-                    'id': currencyName,
-                    'lowerCaseId': currencyName.toLowerCase(),
-                    'code': code,
-                    'type': type,
-                    'precision': precision,
-                    'limits': undefined,
-                    'networks': {},
-                    'info': [], // will be filled below
                 };
             }
-            result[code]['networks'][networkCode] = networkEntry;
-            const info = this.safeList(result[code], 'info', []);
-            info.push(entry);
-            result[code]['info'] = info;
-            result[code] = this.safeCurrencyStructure(result[code]); // this is needed after adding network entry
+            result[code] = this.safeCurrencyStructure({
+                'id': currencyId,
+                'code': code,
+                'name': this.safeString(entry, 'name'),
+                'type': type,
+                'active': !this.safeBool(entry, 'delisted'),
+                'deposit': !this.safeBool(entry, 'deposit_disabled'),
+                'withdraw': !this.safeBool(entry, 'withdraw_disabled'),
+                'fee': undefined,
+                'networks': networks,
+                'precision': this.parseNumber('0.0001'),
+                'info': entry,
+            });
         }
         return result;
     }
@@ -2182,9 +2200,7 @@ export default class gate extends Exchange {
         const chains = this.safeValue(response, 'multichain_addresses', []);
         const currencyId = this.safeString(response, 'currency');
         currency = this.safeCurrency(currencyId, currency);
-        const parsed = this.parseDepositAddresses(chains, [currency['code']], false, {
-            'currency': currency['id'],
-        });
+        const parsed = this.parseDepositAddresses(chains, undefined, false);
         return this.indexBy(parsed, 'network');
     }
     /**
@@ -2202,8 +2218,8 @@ export default class gate extends Exchange {
         let networkCode = undefined;
         [networkCode, params] = this.handleNetworkCodeAndParams(params);
         const chainsIndexedById = await this.fetchDepositAddressesByNetwork(code, params);
-        const selectedNetworkId = this.selectNetworkCodeFromUnifiedNetworks(code, networkCode, chainsIndexedById);
-        return chainsIndexedById[selectedNetworkId];
+        const selectedNetworkIdOrCode = this.selectNetworkCodeFromUnifiedNetworks(code, networkCode, chainsIndexedById);
+        return chainsIndexedById[selectedNetworkIdOrCode];
     }
     parseDepositAddress(depositAddress, currency = undefined) {
         //

package/js/src/htx.js

@@ -4543,6 +4543,8 @@ export default class htx extends Exchange {
         const request = {};
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('fetchOpenOrders', market, params);
+        let subType = undefined;
+        [subType, params] = this.handleSubTypeAndParams('fetchOpenOrders', market, params, 'linear');
         let response = undefined;
         if (marketType === 'spot') {
             if (symbol !== undefined) {
@@ -4571,18 +4573,18 @@ export default class htx extends Exchange {
             response = await this.spotPrivateGetV1OrderOpenOrders(this.extend(request, params));
         }
         else {
-            if (symbol === undefined) {
-                throw new ArgumentsRequired(this.id + ' fetchOpenOrders() requires a symbol argument');
+            if (symbol !== undefined) {
+                // throw new ArgumentsRequired (this.id + ' fetchOpenOrders() requires a symbol argument');
+                request['contract_code'] = market['id'];
             }
             if (limit !== undefined) {
                 request['page_size'] = limit;
             }
-            request['contract_code'] = market['id'];
             const trigger = this.safeBool2(params, 'stop', 'trigger');
             const stopLossTakeProfit = this.safeValue(params, 'stopLossTakeProfit');
             const trailing = this.safeBool(params, 'trailing', false);
             params = this.omit(params, ['stop', 'stopLossTakeProfit', 'trailing', 'trigger']);
-            if (market['linear']) {
+            if (subType === 'linear') {
                 let marginMode = undefined;
                 [marginMode, params] = this.handleMarginModeAndParams('fetchOpenOrders', params);
                 marginMode = (marginMode === undefined) ? 'cross' : marginMode;
@@ -4615,8 +4617,8 @@ export default class htx extends Exchange {
                     }
                 }
             }
-            else if (market['inverse']) {
-                if (market['swap']) {
+            else if (subType === 'inverse') {
+                if (marketType === 'swap') {
                     if (trigger) {
                         response = await this.contractPrivatePostSwapApiV1SwapTriggerOpenorders(this.extend(request, params));
                     }
@@ -4630,8 +4632,8 @@ export default class htx extends Exchange {
                         response = await this.contractPrivatePostSwapApiV1SwapOpenorders(this.extend(request, params));
                     }
                 }
-                else if (market['future']) {
-                    request['symbol'] = market['settleId'];
+                else if (marketType === 'future') {
+                    request['symbol'] = this.safeString(market, 'settleId', 'usdt');
                     if (trigger) {
                         response = await this.contractPrivatePostApiV1ContractTriggerOpenorders(this.extend(request, params));
                     }

package/js/src/hyperliquid.js

@@ -1529,7 +1529,9 @@ export default class hyperliquid extends Exchange {
             }
             orderReq.push(orderObj);
         }
-        const vaultAddress = this.formatVaultAddress(this.safeString(params, 'vaultAddress'));
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'createOrder', 'vaultAddress');
+        vaultAddress = this.formatVaultAddress(vaultAddress);
         const orderAction = {
             'type': 'order',
             'orders': orderReq,
@@ -1624,7 +1626,9 @@ export default class hyperliquid extends Exchange {
             }
         }
         cancelAction['cancels'] = cancelReq;
-        const vaultAddress = this.formatVaultAddress(this.safeString(params, 'vaultAddress'));
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'cancelOrders', 'vaultAddress');
+        vaultAddress = this.formatVaultAddress(vaultAddress);
         const signature = this.signL1Action(cancelAction, nonce, vaultAddress);
         request['action'] = cancelAction;
         request['signature'] = signature;
@@ -1708,7 +1712,9 @@ export default class hyperliquid extends Exchange {
         }
         cancelAction['type'] = cancelByCloid ? 'cancelByCloid' : 'cancel';
         cancelAction['cancels'] = cancelReq;
-        const vaultAddress = this.formatVaultAddress(this.safeString(params, 'vaultAddress'));
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'cancelOrdersForSymbols', 'vaultAddress');
+        vaultAddress = this.formatVaultAddress(vaultAddress);
         const signature = this.signL1Action(cancelAction, nonce, vaultAddress);
         request['action'] = cancelAction;
         request['signature'] = signature;
@@ -1754,7 +1760,9 @@ export default class hyperliquid extends Exchange {
             'type': 'scheduleCancel',
             'time': nonce + timeout,
         };
-        const vaultAddress = this.formatVaultAddress(this.safeString(params, 'vaultAddress'));
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'cancelAllOrdersAfter', 'vaultAddress');
+        vaultAddress = this.formatVaultAddress(vaultAddress);
         const signature = this.signL1Action(cancelAction, nonce, vaultAddress);
         request['action'] = cancelAction;
         request['signature'] = signature;
@@ -1879,7 +1887,9 @@ export default class hyperliquid extends Exchange {
             'type': 'batchModify',
             'modifies': modifies,
         };
-        const vaultAddress = this.formatVaultAddress(this.safeString(params, 'vaultAddress'));
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'editOrder', 'vaultAddress');
+        vaultAddress = this.formatVaultAddress(vaultAddress);
         const signature = this.signL1Action(modifyAction, nonce, vaultAddress);
         const request = {
             'action': modifyAction,
@@ -1888,7 +1898,6 @@ export default class hyperliquid extends Exchange {
             // 'vaultAddress': vaultAddress,
         };
         if (vaultAddress !== undefined) {
-            params = this.omit(params, 'vaultAddress');
             request['vaultAddress'] = vaultAddress;
         }
         return request;
@@ -2743,9 +2752,9 @@ export default class hyperliquid extends Exchange {
             'isCross': isCross,
             'leverage': leverage,
         };
-        let vaultAddress = this.safeString(params, 'vaultAddress');
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'setMarginMode', 'vaultAddress');
         if (vaultAddress !== undefined) {
-            params = this.omit(params, 'vaultAddress');
             if (vaultAddress.startsWith('0x')) {
                 vaultAddress = vaultAddress.replace('0x', '');
             }
@@ -2798,7 +2807,9 @@ export default class hyperliquid extends Exchange {
             'isCross': isCross,
             'leverage': leverage,
         };
-        const vaultAddress = this.formatVaultAddress(this.safeString(params, 'vaultAddress'));
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'setLeverage', 'vaultAddress');
+        vaultAddress = this.formatVaultAddress(vaultAddress);
         const signature = this.signL1Action(updateAction, nonce, vaultAddress);
         const request = {
             'action': updateAction,
@@ -2862,7 +2873,9 @@ export default class hyperliquid extends Exchange {
             'isBuy': true,
             'ntli': sz,
         };
-        const vaultAddress = this.formatVaultAddress(this.safeString(params, 'vaultAddress'));
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'modifyMargin', 'vaultAddress');
+        vaultAddress = this.formatVaultAddress(vaultAddress);
         const signature = this.signL1Action(updateAction, nonce, vaultAddress);
         const request = {
             'action': updateAction,
@@ -2871,7 +2884,6 @@ export default class hyperliquid extends Exchange {
             // 'vaultAddress': vaultAddress,
         };
         if (vaultAddress !== undefined) {
-            params = this.omit(params, 'vaultAddress');
             request['vaultAddress'] = vaultAddress;
         }
         const response = await this.privatePostExchange(request);
@@ -2930,8 +2942,9 @@ export default class hyperliquid extends Exchange {
                 throw new NotSupported(this.id + ' transfer() only support spot <> swap transfer');
             }
             let strAmount = this.numberToString(amount);
-            const vaultAddress = this.formatVaultAddress(this.safeString(params, 'vaultAddress'));
-            params = this.omit(params, 'vaultAddress');
+            let vaultAddress = undefined;
+            [vaultAddress, params] = this.handleOptionAndParams(params, 'transfer', 'vaultAddress');
+            vaultAddress = this.formatVaultAddress(vaultAddress);
             if (vaultAddress !== undefined) {
                 strAmount = strAmount + ' subaccount:' + vaultAddress;
             }
@@ -3034,7 +3047,9 @@ export default class hyperliquid extends Exchange {
                 throw new NotSupported(this.id + ' withdraw() only support USDC');
             }
         }
-        const vaultAddress = this.formatVaultAddress(this.safeString(params, 'vaultAddress'));
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'withdraw', 'vaultAddress');
+        vaultAddress = this.formatVaultAddress(vaultAddress);
         params = this.omit(params, 'vaultAddress');
         const nonce = this.milliseconds();
         let action = {};
@@ -3660,8 +3675,9 @@ export default class hyperliquid extends Exchange {
     }
     parseCreateEditOrderArgs(id, symbol, type, side, amount, price = undefined, params = {}) {
         const market = this.market(symbol);
-        const vaultAddress = this.safeString(params, 'vaultAddress');
-        params = this.omit(params, 'vaultAddress');
+        let vaultAddress = undefined;
+        [vaultAddress, params] = this.handleOptionAndParams(params, 'createOrder', 'vaultAddress');
+        vaultAddress = this.formatVaultAddress(vaultAddress);
         symbol = market['symbol'];
         const order = {
             'symbol': symbol,