ccxt 4.5.24 → 4.5.26

package/dist/cjs/ccxt.js

@@ -196,7 +196,7 @@ var xt$1 = require('./src/pro/xt.js');
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.5.24';
+const version = '4.5.26';
 Exchange["default"].ccxtVersion = version;
 const exchanges = {
     'alpaca': alpaca["default"],

package/dist/cjs/src/bitmart.js

@@ -525,7 +525,6 @@ class bitmart extends bitmart$1["default"] {
                 },
                 'broad': {
                     'You contract account available balance not enough': errors.InsufficientFunds,
-                    'you contract account available balance not enough': errors.InsufficientFunds,
                     'This trading pair does not support API trading': errors.BadSymbol, // {"message":"This trading pair does not support API trading","code":51008,"trace":"5d3ebd46-4e7a-4505-b37b-74464f398f01","data":{}}
                 },
             },
@@ -5629,8 +5628,9 @@ class bitmart extends bitmart$1["default"] {
         //
         //     {"errno":"OK","message":"INVALID_PARAMETER","code":49998,"trace":"eb5ebb54-23cd-4de2-9064-e090b6c3b2e3","data":null}
         //
-        const message = this.safeStringLower(response, 'message');
-        const isErrorMessage = (message !== undefined) && (message !== 'ok') && (message !== 'success');
+        const message = this.safeString(response, 'message');
+        const messageLower = message.toLowerCase();
+        const isErrorMessage = (message !== undefined) && (messageLower !== 'ok') && (messageLower !== 'success');
         const errorCode = this.safeString(response, 'code');
         const isErrorCode = (errorCode !== undefined) && (errorCode !== '1000');
         if (isErrorCode || isErrorMessage) {

package/dist/cjs/src/htx.js

@@ -916,6 +916,10 @@ class htx extends htx$1["default"] {
                     'order-marketorder-amount-min-error': errors.InvalidOrder,
                     'order-limitorder-price-min-error': errors.InvalidOrder,
                     'order-limitorder-price-max-error': errors.InvalidOrder,
+                    'order-limitorder-price-buy-min-error': errors.InvalidOrder,
+                    'order-limitorder-price-buy-max-error': errors.InvalidOrder,
+                    'order-limitorder-price-sell-min-error': errors.InvalidOrder,
+                    'order-limitorder-price-sell-max-error': errors.InvalidOrder,
                     'order-stop-order-hit-trigger': errors.InvalidOrder,
                     'order-value-min-error': errors.InvalidOrder,
                     'order-invalid-price': errors.InvalidOrder,
@@ -7613,7 +7617,7 @@ class htx extends htx$1["default"] {
         }
         if ('status' in response) {
             //
-            //     {"status":"error","err-code":"order-limitorder-amount-min-error","err-msg":"limit order amount error, min: `0.001`","data":null}
+            //     {"status":"error","err-code":"o-amount-min-error","err-msg":"limit order amount error, min: `0.001`","data":null}
             //     {"status":"ok","data":{"errors":[{"order_id":"1349442392365359104","err_code":1061,"err_msg":"The order does not exist."}],"successes":""},"ts":1741773744526}
             //
             const status = this.safeString(response, 'status');

package/dist/cjs/src/hyperliquid.js

@@ -223,6 +223,7 @@ class hyperliquid extends hyperliquid$1["default"] {
                 'defaultSlippage': 0.05,
                 'marketHelperProps': ['hip3TokensByName', 'cachedCurrenciesById'],
                 'zeroAddress': '0x0000000000000000000000000000000000000000',
+                // below will be filled automatically
                 'spotCurrencyMapping': {
                     'UDZ': '2Z',
                     'UBONK': 'BONK',
@@ -363,51 +364,20 @@ class hyperliquid extends hyperliquid$1["default"] {
         if (this.markets === undefined) {
             throw new errors.ExchangeError(this.id + ' markets not loaded');
         }
-        if (symbol in this.markets) {
-            const market = this.markets[symbol];
-            if (market['spot']) {
-                const baseName = this.safeString(market, 'baseName');
-                const spotCurrencyMapping = this.safeDict(this.options, 'spotCurrencyMapping', {});
-                if (baseName in spotCurrencyMapping) {
-                    const unifiedBaseName = this.safeString(spotCurrencyMapping, baseName);
-                    const quote = this.safeString(market, 'quote');
-                    const newSymbol = this.safeCurrencyCode(unifiedBaseName) + '/' + quote;
-                    if (newSymbol in this.markets) {
-                        return this.markets[newSymbol];
-                    }
-                }
-            }
-        }
-        const res = super.market(symbol);
-        return res;
-    }
-    safeMarket(marketId = undefined, market = undefined, delimiter = undefined, marketType = undefined) {
-        if (marketId !== undefined) {
-            if ((this.markets_by_id !== undefined) && (marketId in this.markets_by_id)) {
-                const markets = this.markets_by_id[marketId];
-                const numMarkets = markets.length;
-                if (numMarkets === 1) {
-                    return markets[0];
-                }
-                else {
-                    if (numMarkets > 2) {
-                        throw new errors.ExchangeError(this.id + ' safeMarket() found more than two markets with the same market id ' + marketId);
-                    }
-                    const firstMarket = markets[0];
-                    const secondMarket = markets[1];
-                    if (this.safeString(firstMarket, 'type') !== this.safeString(secondMarket, 'type')) {
-                        throw new errors.ExchangeError(this.id + ' safeMarket() found two different market types with the same market id ' + marketId);
-                    }
-                    const baseCurrency = this.safeString(firstMarket, 'base');
-                    const spotCurrencyMapping = this.safeDict(this.options, 'spotCurrencyMapping', {});
-                    if (baseCurrency in spotCurrencyMapping) {
-                        return secondMarket;
-                    }
-                    return firstMarket;
+        if ((symbol !== undefined) && !(symbol in this.markets)) {
+            const symbolParts = symbol.split('/');
+            const baseName = this.safeString(symbolParts, 0);
+            const spotCurrencyMapping = this.safeDict(this.options, 'spotCurrencyMapping', {});
+            if (baseName in spotCurrencyMapping) {
+                const unifiedBaseName = this.safeString(spotCurrencyMapping, baseName);
+                const quote = this.safeString(symbolParts, 1);
+                const newSymbol = this.safeCurrencyCode(unifiedBaseName) + '/' + quote;
+                if (newSymbol in this.markets) {
+                    return this.markets[newSymbol];
                 }
             }
         }
-        return super.safeMarket(marketId, market, delimiter, marketType);
+        return super.market(symbol);
     }
     /**
      * @method
@@ -518,6 +488,20 @@ class hyperliquid extends hyperliquid$1["default"] {
                     },
                 },
             });
+            // add in wrapped map
+            const fullName = this.safeString(data, 'fullName');
+            if (fullName !== undefined && name !== undefined) {
+                const isWrapped = fullName.startsWith('Unit ') && name.startsWith('U');
+                if (isWrapped) {
+                    const parts = name.split('U');
+                    let nameWithoutU = '';
+                    for (let j = 0; j < parts.length; j++) {
+                        nameWithoutU = nameWithoutU + parts[j];
+                    }
+                    const baseCode = this.safeCurrencyCode(nameWithoutU);
+                    this.options['spotCurrencyMapping'][code] = baseCode;
+                }
+            }
         }
         return result;
     }
@@ -951,18 +935,18 @@ class hyperliquid extends hyperliquid$1["default"] {
                 'info': this.extend(extraData, market),
             };
             markets.push(this.safeMarketStructure(entry));
-            // backward support
-            const base = this.safeCurrencyCode(baseName);
-            const quote = this.safeCurrencyCode(quoteId);
-            const newEntry = this.extend({}, entry);
-            const symbol = base + '/' + quote;
-            if (symbol !== mappedSymbol) {
-                newEntry['symbol'] = symbol;
-                newEntry['base'] = base;
-                newEntry['quote'] = quote;
-                newEntry['baseName'] = baseName;
-                markets.push(this.safeMarketStructure(newEntry));
-            }
+            // // backward support
+            // const base = this.safeCurrencyCode (baseName);
+            // const quote = this.safeCurrencyCode (quoteId);
+            // const newEntry = this.extend ({}, entry);
+            // const symbol = base + '/' + quote;
+            // if (symbol !== mappedSymbol) {
+            //     newEntry['symbol'] = symbol;
+            //     newEntry['base'] = base;
+            //     newEntry['quote'] = quote;
+            //     newEntry['baseName'] = baseName;
+            //     markets.push (this.safeMarketStructure (newEntry));
+            // }
         }
         return markets;
     }
@@ -1242,9 +1226,11 @@ class hyperliquid extends hyperliquid$1["default"] {
         if (symbols !== undefined) {
             // infer from first symbol
             const firstSymbol = this.safeString(symbols, 0);
-            const market = this.market(firstSymbol);
-            if (this.safeBool(this.safeDict(market, 'info'), 'hip3')) {
-                hip3 = true;
+            if (firstSymbol !== undefined) {
+                const market = this.market(firstSymbol);
+                if (this.safeBool(this.safeDict(market, 'info'), 'hip3')) {
+                    hip3 = true;
+                }
             }
         }
         if (hip3) {
@@ -1513,7 +1499,10 @@ class hyperliquid extends hyperliquid$1["default"] {
         let userAddress = undefined;
         [userAddress, params] = this.handlePublicAddress('fetchTrades', params);
         await this.loadMarkets();
-        const market = this.safeMarket(symbol);
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+        }
         const request = {
             'user': userAddress,
         };
@@ -2826,7 +2815,10 @@ class hyperliquid extends hyperliquid$1["default"] {
         let userAddress = undefined;
         [userAddress, params] = this.handlePublicAddress('fetchOrder', params);
         await this.loadMarkets();
-        const market = this.safeMarket(symbol);
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+        }
         const clientOrderId = this.safeString(params, 'clientOrderId');
         const request = {
             'type': 'orderStatus',
@@ -3076,7 +3068,10 @@ class hyperliquid extends hyperliquid$1["default"] {
         let userAddress = undefined;
         [userAddress, params] = this.handlePublicAddress('fetchMyTrades', params);
         await this.loadMarkets();
-        const market = this.safeMarket(symbol);
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+        }
         const request = {
             'user': userAddress,
         };
@@ -3187,6 +3182,30 @@ class hyperliquid extends hyperliquid$1["default"] {
         const positions = await this.fetchPositions([symbol], params);
         return this.safeDict(positions, 0, {});
     }
+    getDexFromSymbols(methodName, symbols = undefined) {
+        if (symbols === undefined) {
+            return undefined;
+        }
+        const symbolsLength = symbols.length;
+        if (symbolsLength === 0) {
+            return undefined;
+        }
+        let dexName = undefined;
+        for (let i = 0; i < symbolsLength; i++) {
+            if (dexName === undefined) {
+                const market = this.market(symbols[i]);
+                dexName = this.getDexFromHip3Symbol(market);
+            }
+            else {
+                const market = this.market(symbols[i]);
+                const currentDexName = this.getDexFromHip3Symbol(market);
+                if (currentDexName !== dexName) {
+                    throw new errors.NotSupported(this.id + ' ' + methodName + ' only supports fetching positions for one DEX at a time for HIP3 markets');
+                }
+            }
+        }
+        return dexName;
+    }
     /**
      * @method
      * @name hyperliquid#fetchPositions
@@ -3208,12 +3227,9 @@ class hyperliquid extends hyperliquid$1["default"] {
             'type': 'clearinghouseState',
             'user': userAddress,
         };
-        if (symbols !== undefined) {
-            const market = this.market(symbols[0]);
-            const dexName = this.getDexFromHip3Symbol(market);
-            if (dexName !== undefined) {
-                request['dex'] = dexName;
-            }
+        const dexName = this.getDexFromSymbols('fetchPositions', symbols);
+        if (dexName !== undefined) {
+            request['dex'] = dexName;
         }
         const response = await this.publicPostInfo(this.extend(request, params));
         //

package/dist/cjs/src/mexc.js

@@ -1759,8 +1759,8 @@ class mexc extends mexc$1["default"] {
     /**
      * @method
      * @name mexc#fetchOHLCV
-     * @see https://mexcdevelop.github.io/apidocs/spot_v3_en/#kline-candlestick-data
-     * @see https://mexcdevelop.github.io/apidocs/contract_v1_en/#k-line-data
+     * @see https://www.mexc.com/api-docs/spot-v3/market-data-endpoints#klinecandlestick-data
+     * @see https://www.mexc.com/api-docs/futures/market-endpoints#get-candlestick-data
      * @description fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
      * @param {string} symbol unified symbol of the market to fetch OHLCV data for
      * @param {string} timeframe the length of time each candle represents
@@ -1774,7 +1774,7 @@ class mexc extends mexc$1["default"] {
     async fetchOHLCV(symbol, timeframe = '1m', since = undefined, limit = undefined, params = {}) {
         await this.loadMarkets();
         const market = this.market(symbol);
-        const maxLimit = (market['spot']) ? 1000 : 2000;
+        const maxLimit = (market['spot']) ? 500 : 2000; // docs say 1000 for spot, but in practice it's 500
         let paginate = false;
         [paginate, params] = this.handleOptionAndParams(params, 'fetchOHLCV', 'paginate', false);
         if (paginate) {
@@ -1789,10 +1789,16 @@ class mexc extends mexc$1["default"] {
             'interval': timeframeValue,
         };
         let candles = undefined;
+        const until = this.safeIntegerN(params, ['until', 'endTime']);
+        let start = since;
+        if ((until !== undefined) && (since === undefined)) {
+            params = this.omit(params, ['until']);
+            const usedLimit = limit ? limit : maxLimit;
+            start = until - (usedLimit * duration);
+        }
         if (market['spot']) {
-            const until = this.safeIntegerN(params, ['until', 'endTime']);
-            if (since !== undefined) {
-                request['startTime'] = since;
+            if (start !== undefined) {
+                request['startTime'] = start;
                 if (until === undefined) {
                     // we have to calculate it assuming we can get at most 2000 entries per request
                     const end = this.sum(since, maxLimit * duration);
@@ -1804,8 +1810,7 @@ class mexc extends mexc$1["default"] {
                 request['limit'] = limit;
             }
             if (until !== undefined) {
-                params = this.omit(params, ['until']);
-                request['endTime'] = until;
+                request['endTime'] = until + 1; // mexc's endTime is not inclusive, so we add 1 ms to avoid missing the last candle in the results
             }
             const response = await this.spotPublicGetKlines(this.extend(request, params));
             //
@@ -1825,13 +1830,14 @@ class mexc extends mexc$1["default"] {
             candles = response;
         }
         else if (market['swap']) {
-            const until = this.safeIntegerProductN(params, ['until', 'endTime'], 0.001);
             if (since !== undefined) {
                 request['start'] = this.parseToInt(since / 1000);
             }
             if (until !== undefined) {
-                params = this.omit(params, ['until']);
-                request['end'] = until;
+                request['end'] = this.parseToInt(until / 1000);
+                if (since === undefined) {
+                    request['start'] = this.parseToInt(start / 1000);
+                }
             }
             const priceType = this.safeString(params, 'price', 'default');
             params = this.omit(params, 'price');

package/js/ccxt.d.ts

@@ -4,7 +4,7 @@ import * as functions from './src/base/functions.js';
 import * as errors from './src/base/errors.js';
 import type { Int, int, Str, Strings, Num, Bool, IndexType, OrderSide, OrderType, MarketType, SubType, Dict, NullableDict, List, NullableList, Fee, OHLCV, OHLCVC, implicitReturnType, Market, Currency, Dictionary, MinMax, FeeInterface, TradingFeeInterface, MarketInterface, Trade, Order, OrderBook, Ticker, Transaction, Tickers, CurrencyInterface, Balance, BalanceAccount, Account, PartialBalances, Balances, DepositAddress, WithdrawalResponse, FundingRate, FundingRates, Position, BorrowInterest, LeverageTier, LedgerEntry, DepositWithdrawFeeNetwork, DepositWithdrawFee, TransferEntry, CrossBorrowRate, IsolatedBorrowRate, FundingRateHistory, OpenInterest, Liquidation, OrderRequest, CancellationRequest, FundingHistory, MarketMarginModes, MarginMode, Greeks, Conversion, Option, LastPrice, Leverage, MarginModification, Leverages, LastPrices, Currencies, TradingFees, MarginModes, OptionChain, IsolatedBorrowRates, CrossBorrowRates, LeverageTiers, LongShortRatio, OrderBooks, OpenInterests, ConstructorArgs } from './src/base/types.js';
 import { BaseError, ExchangeError, AuthenticationError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, OperationRejected, NoChange, MarginModeAlreadySet, MarketClosed, ManualInteractionNeeded, RestrictedLocation, InsufficientFunds, InvalidAddress, AddressPending, InvalidOrder, OrderNotFound, OrderNotCached, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, ContractUnavailable, NotSupported, InvalidProxySettings, ExchangeClosedByUser, OperationFailed, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, ChecksumError, RequestTimeout, BadResponse, NullResponse, CancelPending, UnsubscribeError } from './src/base/errors.js';
-declare const version = "4.5.23";
+declare const version = "4.5.25";
 import alpaca from './src/alpaca.js';
 import apex from './src/apex.js';
 import arkham from './src/arkham.js';

package/js/ccxt.js

@@ -38,7 +38,7 @@ import * as errors from './src/base/errors.js';
 import { BaseError, ExchangeError, AuthenticationError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, OperationRejected, NoChange, MarginModeAlreadySet, MarketClosed, ManualInteractionNeeded, RestrictedLocation, InsufficientFunds, InvalidAddress, AddressPending, InvalidOrder, OrderNotFound, OrderNotCached, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, ContractUnavailable, NotSupported, InvalidProxySettings, ExchangeClosedByUser, OperationFailed, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, ChecksumError, RequestTimeout, BadResponse, NullResponse, CancelPending, UnsubscribeError } from './src/base/errors.js';
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.5.23';
+const version = '4.5.25';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import alpaca from './src/alpaca.js';

package/js/src/bitmart.js

@@ -526,7 +526,6 @@ export default class bitmart extends Exchange {
                 },
                 'broad': {
                     'You contract account available balance not enough': InsufficientFunds,
-                    'you contract account available balance not enough': InsufficientFunds,
                     'This trading pair does not support API trading': BadSymbol, // {"message":"This trading pair does not support API trading","code":51008,"trace":"5d3ebd46-4e7a-4505-b37b-74464f398f01","data":{}}
                 },
             },
@@ -5630,8 +5629,9 @@ export default class bitmart extends Exchange {
         //
         //     {"errno":"OK","message":"INVALID_PARAMETER","code":49998,"trace":"eb5ebb54-23cd-4de2-9064-e090b6c3b2e3","data":null}
         //
-        const message = this.safeStringLower(response, 'message');
-        const isErrorMessage = (message !== undefined) && (message !== 'ok') && (message !== 'success');
+        const message = this.safeString(response, 'message');
+        const messageLower = message.toLowerCase();
+        const isErrorMessage = (message !== undefined) && (messageLower !== 'ok') && (messageLower !== 'success');
         const errorCode = this.safeString(response, 'code');
         const isErrorCode = (errorCode !== undefined) && (errorCode !== '1000');
         if (isErrorCode || isErrorMessage) {

package/js/src/htx.js

@@ -917,6 +917,10 @@ export default class htx extends Exchange {
                     'order-marketorder-amount-min-error': InvalidOrder,
                     'order-limitorder-price-min-error': InvalidOrder,
                     'order-limitorder-price-max-error': InvalidOrder,
+                    'order-limitorder-price-buy-min-error': InvalidOrder,
+                    'order-limitorder-price-buy-max-error': InvalidOrder,
+                    'order-limitorder-price-sell-min-error': InvalidOrder,
+                    'order-limitorder-price-sell-max-error': InvalidOrder,
                     'order-stop-order-hit-trigger': InvalidOrder,
                     'order-value-min-error': InvalidOrder,
                     'order-invalid-price': InvalidOrder,
@@ -7614,7 +7618,7 @@ export default class htx extends Exchange {
         }
         if ('status' in response) {
             //
-            //     {"status":"error","err-code":"order-limitorder-amount-min-error","err-msg":"limit order amount error, min: `0.001`","data":null}
+            //     {"status":"error","err-code":"o-amount-min-error","err-msg":"limit order amount error, min: `0.001`","data":null}
             //     {"status":"ok","data":{"errors":[{"order_id":"1349442392365359104","err_code":1061,"err_msg":"The order does not exist."}],"successes":""},"ts":1741773744526}
             //
             const status = this.safeString(response, 'status');

package/js/src/hyperliquid.d.ts

@@ -8,7 +8,6 @@ export default class hyperliquid extends Exchange {
     describe(): any;
     setSandboxMode(enabled: any): void;
     market(symbol: string): MarketInterface;
-    safeMarket(marketId?: Str, market?: Market, delimiter?: Str, marketType?: Str): MarketInterface;
     /**
      * @method
      * @name hyperliquid#fetchStatus
@@ -483,6 +482,7 @@ export default class hyperliquid extends Exchange {
      * @returns {object} a [position structure]{@link https://docs.ccxt.com/#/?id=position-structure}
      */
     fetchPosition(symbol: string, params?: {}): Promise<Position>;
+    getDexFromSymbols(methodName: string, symbols?: Strings): any;
     /**
      * @method
      * @name hyperliquid#fetchPositions

package/js/src/hyperliquid.js

@@ -224,6 +224,7 @@ export default class hyperliquid extends Exchange {
                 'defaultSlippage': 0.05,
                 'marketHelperProps': ['hip3TokensByName', 'cachedCurrenciesById'],
                 'zeroAddress': '0x0000000000000000000000000000000000000000',
+                // below will be filled automatically
                 'spotCurrencyMapping': {
                     'UDZ': '2Z',
                     'UBONK': 'BONK',
@@ -364,51 +365,20 @@ export default class hyperliquid extends Exchange {
         if (this.markets === undefined) {
             throw new ExchangeError(this.id + ' markets not loaded');
         }
-        if (symbol in this.markets) {
-            const market = this.markets[symbol];
-            if (market['spot']) {
-                const baseName = this.safeString(market, 'baseName');
-                const spotCurrencyMapping = this.safeDict(this.options, 'spotCurrencyMapping', {});
-                if (baseName in spotCurrencyMapping) {
-                    const unifiedBaseName = this.safeString(spotCurrencyMapping, baseName);
-                    const quote = this.safeString(market, 'quote');
-                    const newSymbol = this.safeCurrencyCode(unifiedBaseName) + '/' + quote;
-                    if (newSymbol in this.markets) {
-                        return this.markets[newSymbol];
-                    }
-                }
-            }
-        }
-        const res = super.market(symbol);
-        return res;
-    }
-    safeMarket(marketId = undefined, market = undefined, delimiter = undefined, marketType = undefined) {
-        if (marketId !== undefined) {
-            if ((this.markets_by_id !== undefined) && (marketId in this.markets_by_id)) {
-                const markets = this.markets_by_id[marketId];
-                const numMarkets = markets.length;
-                if (numMarkets === 1) {
-                    return markets[0];
-                }
-                else {
-                    if (numMarkets > 2) {
-                        throw new ExchangeError(this.id + ' safeMarket() found more than two markets with the same market id ' + marketId);
-                    }
-                    const firstMarket = markets[0];
-                    const secondMarket = markets[1];
-                    if (this.safeString(firstMarket, 'type') !== this.safeString(secondMarket, 'type')) {
-                        throw new ExchangeError(this.id + ' safeMarket() found two different market types with the same market id ' + marketId);
-                    }
-                    const baseCurrency = this.safeString(firstMarket, 'base');
-                    const spotCurrencyMapping = this.safeDict(this.options, 'spotCurrencyMapping', {});
-                    if (baseCurrency in spotCurrencyMapping) {
-                        return secondMarket;
-                    }
-                    return firstMarket;
+        if ((symbol !== undefined) && !(symbol in this.markets)) {
+            const symbolParts = symbol.split('/');
+            const baseName = this.safeString(symbolParts, 0);
+            const spotCurrencyMapping = this.safeDict(this.options, 'spotCurrencyMapping', {});
+            if (baseName in spotCurrencyMapping) {
+                const unifiedBaseName = this.safeString(spotCurrencyMapping, baseName);
+                const quote = this.safeString(symbolParts, 1);
+                const newSymbol = this.safeCurrencyCode(unifiedBaseName) + '/' + quote;
+                if (newSymbol in this.markets) {
+                    return this.markets[newSymbol];
                 }
             }
         }
-        return super.safeMarket(marketId, market, delimiter, marketType);
+        return super.market(symbol);
     }
     /**
      * @method
@@ -519,6 +489,20 @@ export default class hyperliquid extends Exchange {
                     },
                 },
             });
+            // add in wrapped map
+            const fullName = this.safeString(data, 'fullName');
+            if (fullName !== undefined && name !== undefined) {
+                const isWrapped = fullName.startsWith('Unit ') && name.startsWith('U');
+                if (isWrapped) {
+                    const parts = name.split('U');
+                    let nameWithoutU = '';
+                    for (let j = 0; j < parts.length; j++) {
+                        nameWithoutU = nameWithoutU + parts[j];
+                    }
+                    const baseCode = this.safeCurrencyCode(nameWithoutU);
+                    this.options['spotCurrencyMapping'][code] = baseCode;
+                }
+            }
         }
         return result;
     }
@@ -952,18 +936,18 @@ export default class hyperliquid extends Exchange {
                 'info': this.extend(extraData, market),
             };
             markets.push(this.safeMarketStructure(entry));
-            // backward support
-            const base = this.safeCurrencyCode(baseName);
-            const quote = this.safeCurrencyCode(quoteId);
-            const newEntry = this.extend({}, entry);
-            const symbol = base + '/' + quote;
-            if (symbol !== mappedSymbol) {
-                newEntry['symbol'] = symbol;
-                newEntry['base'] = base;
-                newEntry['quote'] = quote;
-                newEntry['baseName'] = baseName;
-                markets.push(this.safeMarketStructure(newEntry));
-            }
+            // // backward support
+            // const base = this.safeCurrencyCode (baseName);
+            // const quote = this.safeCurrencyCode (quoteId);
+            // const newEntry = this.extend ({}, entry);
+            // const symbol = base + '/' + quote;
+            // if (symbol !== mappedSymbol) {
+            //     newEntry['symbol'] = symbol;
+            //     newEntry['base'] = base;
+            //     newEntry['quote'] = quote;
+            //     newEntry['baseName'] = baseName;
+            //     markets.push (this.safeMarketStructure (newEntry));
+            // }
         }
         return markets;
     }
@@ -1243,9 +1227,11 @@ export default class hyperliquid extends Exchange {
         if (symbols !== undefined) {
             // infer from first symbol
             const firstSymbol = this.safeString(symbols, 0);
-            const market = this.market(firstSymbol);
-            if (this.safeBool(this.safeDict(market, 'info'), 'hip3')) {
-                hip3 = true;
+            if (firstSymbol !== undefined) {
+                const market = this.market(firstSymbol);
+                if (this.safeBool(this.safeDict(market, 'info'), 'hip3')) {
+                    hip3 = true;
+                }
             }
         }
         if (hip3) {
@@ -1514,7 +1500,10 @@ export default class hyperliquid extends Exchange {
         let userAddress = undefined;
         [userAddress, params] = this.handlePublicAddress('fetchTrades', params);
         await this.loadMarkets();
-        const market = this.safeMarket(symbol);
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+        }
         const request = {
             'user': userAddress,
         };
@@ -2827,7 +2816,10 @@ export default class hyperliquid extends Exchange {
         let userAddress = undefined;
         [userAddress, params] = this.handlePublicAddress('fetchOrder', params);
         await this.loadMarkets();
-        const market = this.safeMarket(symbol);
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+        }
         const clientOrderId = this.safeString(params, 'clientOrderId');
         const request = {
             'type': 'orderStatus',
@@ -3077,7 +3069,10 @@ export default class hyperliquid extends Exchange {
         let userAddress = undefined;
         [userAddress, params] = this.handlePublicAddress('fetchMyTrades', params);
         await this.loadMarkets();
-        const market = this.safeMarket(symbol);
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+        }
         const request = {
             'user': userAddress,
         };
@@ -3188,6 +3183,30 @@ export default class hyperliquid extends Exchange {
         const positions = await this.fetchPositions([symbol], params);
         return this.safeDict(positions, 0, {});
     }
+    getDexFromSymbols(methodName, symbols = undefined) {
+        if (symbols === undefined) {
+            return undefined;
+        }
+        const symbolsLength = symbols.length;
+        if (symbolsLength === 0) {
+            return undefined;
+        }
+        let dexName = undefined;
+        for (let i = 0; i < symbolsLength; i++) {
+            if (dexName === undefined) {
+                const market = this.market(symbols[i]);
+                dexName = this.getDexFromHip3Symbol(market);
+            }
+            else {
+                const market = this.market(symbols[i]);
+                const currentDexName = this.getDexFromHip3Symbol(market);
+                if (currentDexName !== dexName) {
+                    throw new NotSupported(this.id + ' ' + methodName + ' only supports fetching positions for one DEX at a time for HIP3 markets');
+                }
+            }
+        }
+        return dexName;
+    }
     /**
      * @method
      * @name hyperliquid#fetchPositions
@@ -3209,12 +3228,9 @@ export default class hyperliquid extends Exchange {
             'type': 'clearinghouseState',
             'user': userAddress,
         };
-        if (symbols !== undefined) {
-            const market = this.market(symbols[0]);
-            const dexName = this.getDexFromHip3Symbol(market);
-            if (dexName !== undefined) {
-                request['dex'] = dexName;
-            }
+        const dexName = this.getDexFromSymbols('fetchPositions', symbols);
+        if (dexName !== undefined) {
+            request['dex'] = dexName;
         }
         const response = await this.publicPostInfo(this.extend(request, params));
         //