ccxt 4.5.59 → 4.5.61

package/js/src/htx.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// 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 { sha256 } from '@noble/hashes/sha2.js';
 import Exchange from './abstract/htx.js';
@@ -121,7 +127,7 @@ export default class htx extends Exchange {
                 'fetchTransactionFee': undefined,
                 'fetchTransactionFees': undefined,
                 'fetchTransactions': undefined,
-                'fetchTransfers': undefined,
+                'fetchTransfers': true,
                 'fetchWithdrawAddresses': true,
                 'fetchWithdrawal': undefined,
                 'fetchWithdrawals': true,
@@ -446,6 +452,8 @@ export default class htx extends Exchange {
                             'v1/cross-margin/loan-orders': 1,
                             'v1/cross-margin/accounts/balance': 1,
                             'v2/account/repayment': 5,
+                            // Universal Transfer
+                            'v5/account/universal_transfer_records': 4, // 5 requests per 2 seconds
                             // Stable Coin Exchange
                             'v1/stable-coin/quote': 1,
                             'v1/stable_coin/exchange_rate': 1,
@@ -574,7 +582,7 @@ export default class htx extends Exchange {
                             'swap-api/v3/swap_liquidation_orders': 1,
                             'index/market/history/swap_estimated_rate_kline': 1,
                             'index/market/history/swap_basis': 1,
-                            // Swap Market Data interface
+                            // Linear Swap Market Data interface
                             'linear-swap-api/v1/swap_contract_info': 1,
                             'linear-swap-api/v1/swap_index': 1,
                             'linear-swap-api/v1/swap_query_elements': 1,
@@ -588,7 +596,6 @@ export default class htx extends Exchange {
                             'v2/linear-swap-ex/market/detail/batch_merged': 1,
                             'linear-swap-ex/market/trade': 1,
                             'linear-swap-ex/market/history/trade': 1,
-                            'linear-swap-api/v1/swap_risk_info': 1,
                             'swap-api/v1/linear-swap-api/v1/swap_insurance_fund': 1,
                             'linear-swap-api/v1/swap_adjustfactor': 1,
                             'linear-swap-api/v1/swap_cross_adjustfactor': 1,
@@ -596,11 +603,8 @@ export default class htx extends Exchange {
                             'linear-swap-api/v1/swap_ladder_margin': 1,
                             'linear-swap-api/v1/swap_cross_ladder_margin': 1,
                             'linear-swap-api/v1/swap_api_state': 1,
-                            'linear-swap-api/v1/swap_cross_transfer_state': 1,
-                            'linear-swap-api/v1/swap_cross_trade_state': 1,
                             'linear-swap-api/v1/swap_elite_account_ratio': 1,
                             'linear-swap-api/v1/swap_elite_position_ratio': 1,
-                            'linear-swap-api/v1/swap_liquidation_orders': 1,
                             'linear-swap-api/v1/swap_settlement_records': 1,
                             'linear-swap-api/v3/swap_liquidation_orders': 1,
                             'index/market/history/linear_swap_premium_index_kline': 1,
@@ -626,15 +630,7 @@ export default class htx extends Exchange {
                             // Swap Account Interface
                             'swap-api/v1/swap_sub_auth_list': 1,
                             'swap-api/v1/swap_api_trading_status': 1,
-                            // Swap Account Interface
-                            'linear-swap-api/v1/swap_sub_auth_list': 1,
-                            'linear-swap-api/v1/swap_api_trading_status': 1,
-                            'linear-swap-api/v1/swap_cross_position_side': 1,
-                            'linear-swap-api/v1/swap_position_side': 1,
-                            'linear-swap-api/v3/unified_account_info': 1,
-                            'linear-swap-api/v3/fix_position_margin_change_record': 1,
-                            'linear-swap-api/v3/swap_unified_account_type': 1,
-                            'linear-swap-api/v3/linear_swap_overview_account_info': 1,
+                            // Linear Swap Interface
                             'v5/account/asset_mode': 0.20834, // 48 requests per second = 1000ms / ( 100 * 0.20834)
                             'v5/account/balance': 0.20834,
                             'v5/account/bills': 0.20834,
@@ -772,49 +768,8 @@ export default class htx extends Exchange {
                             'swap-api/v1/swap_track_cancelall': 1,
                             'swap-api/v1/swap_track_openorders': 1,
                             'swap-api/v1/swap_track_hisorders': 1,
-                            // Swap Account Interface
-                            'linear-swap-api/v1/swap_lever_position_limit': 1,
-                            'linear-swap-api/v1/swap_cross_lever_position_limit': 1,
-                            'linear-swap-api/v1/swap_balance_valuation': 1,
-                            'linear-swap-api/v1/swap_sub_auth': 1,
-                            'linear-swap-api/v1/swap_sub_account_list': 1,
-                            'linear-swap-api/v1/swap_cross_sub_account_list': 1,
-                            'linear-swap-api/v1/swap_sub_account_info_list': 1,
-                            'linear-swap-api/v1/swap_cross_sub_account_info_list': 1,
-                            'linear-swap-api/v1/swap_sub_account_info': 1,
-                            'linear-swap-api/v1/swap_cross_sub_account_info': 1,
-                            'linear-swap-api/v1/swap_sub_position_info': 1,
-                            'linear-swap-api/v1/swap_cross_sub_position_info': 1,
-                            'linear-swap-api/v1/swap_financial_record': 1,
-                            'linear-swap-api/v1/swap_financial_record_exact': 1,
-                            'linear-swap-api/v1/swap_user_settlement_records': 1,
-                            'linear-swap-api/v1/swap_cross_user_settlement_records': 1,
-                            'linear-swap-api/v1/swap_available_level_rate': 1,
-                            'linear-swap-api/v1/swap_cross_available_level_rate': 1,
-                            'linear-swap-api/v1/swap_order_limit': 1,
-                            'linear-swap-api/v1/swap_fee': 1,
-                            'linear-swap-api/v1/swap_transfer_limit': 1,
-                            'linear-swap-api/v1/swap_cross_transfer_limit': 1,
-                            'linear-swap-api/v1/swap_position_limit': 1,
-                            'linear-swap-api/v1/swap_cross_position_limit': 1,
-                            'linear-swap-api/v1/swap_master_sub_transfer': 1,
-                            'linear-swap-api/v1/swap_master_sub_transfer_record': 1,
-                            'linear-swap-api/v1/swap_transfer_inner': 1,
-                            'linear-swap-api/v3/swap_financial_record': 1,
-                            'linear-swap-api/v3/swap_financial_record_exact': 1,
-                            // Swap Trade Interface
-                            'linear-swap-api/v1/swap_cross_matchresults': 1,
-                            'linear-swap-api/v1/swap_cross_matchresults_exact': 1,
-                            'linear-swap-api/v1/linear-cancel-after': 1,
-                            'linear-swap-api/v3/swap_cross_matchresults': 1,
-                            'linear-swap-api/v3/swap_cross_matchresults_exact': 1,
-                            'linear-swap-api/v3/fix_position_margin_change': 1,
-                            'linear-swap-api/v3/swap_switch_account_type': 1,
-                            'linear-swap-api/v3/linear_swap_fee_switch': 1,
-                            // Swap Strategy Order Interface
-                            'linear-swap-api/v1/swap_relation_tpsl_order': 1,
-                            'linear-swap-api/v1/swap_cross_relation_tpsl_order': 1,
-                            'v5/account/asset_mode': 100, // 0.1 requests per second = 1000ms / ( 100 * 100)
+                            // Linear Swap Interface
+                            'v5/account/asset_mode': 100, // 0.1 requests per second = 1000ms / (100 * 100)
                             'v5/trade/order': 0.41679,
                             'v5/trade/batch_orders': 0.41679,
                             'v5/trade/cancel_order': 0.41679,
@@ -1161,6 +1116,9 @@ export default class htx extends Exchange {
                     'grid-trading': 'grid-trading',
                     'deposit-earning': 'deposit-earning',
                     'otc-options': 'otc-options',
+                    'linear-swap': 'swap',
+                    'swap': 'swap',
+                    'futures': 'future',
                 },
                 'typesByAccount': {
                     'pro': 'spot',
@@ -2568,7 +2526,7 @@ export default class htx extends Exchange {
      * @param {string} symbol unified symbol of the market to fetch the order book for
      * @param {int} [limit] the maximum amount of order book entries to return
      * @param {object} [params] extra parameters specific to the exchange API endpoint
-     * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/?id=order-book-structure} indexed by market symbols
+     * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/?id=order-book-structure}
      */
     async fetchOrderBook(symbol, limit = undefined, params = {}) {
         await this.loadMarkets();
@@ -2940,21 +2898,21 @@ export default class htx extends Exchange {
                 request['start_time'] = since;
             }
             [request, params] = this.handleUntilOption('end_time', request, params);
-            if (market['linear']) {
-                request['contract_code'] = market['id'];
+            if (this.safeBool(market, 'linear')) {
+                request['contract_code'] = this.safeString(market, 'id');
                 if (limit !== undefined) {
                     request['limit'] = limit; // default 100, max 500
                 }
                 response = await this.contractPrivateGetV5TradeOrderDetails(this.extend(request, params));
             }
-            else if (market['inverse']) {
+            else if (this.safeBool(market, 'inverse')) {
                 if (limit !== undefined) {
                     request['page_size'] = limit; // default 100, max 500
                 }
-                request['contract'] = market['id'];
+                request['contract'] = this.safeString(market, 'id');
                 request['trade_type'] = 0; // 0 all, 1 open long, 2 open short, 3 close short, 4 close long, 5 liquidate long positions, 6 liquidate short positions
                 if (marketType === 'future') {
-                    request['symbol'] = market['settleId'];
+                    request['symbol'] = this.safeString(market, 'settleId');
                     response = await this.contractPrivatePostApiV3ContractMatchresultsExact(this.extend(request, params));
                 }
                 else if (marketType === 'swap') {
@@ -3587,29 +3545,32 @@ export default class htx extends Exchange {
      * @description query for balance and get the amount of funds available for trading or funds locked in orders
      * @see https://huobiapi.github.io/docs/spot/v1/en/#get-account-balance-of-a-specific-account
      * @see https://www.htx.com/en-us/opend/newApiPages/?id=7ec4b429-7773-11ed-9966-0242ac110003
-     * @see https://www.htx.com/en-us/opend/newApiPages/?id=10000074-77b7-11ed-9966-0242ac110003
      * @see https://huobiapi.github.io/docs/dm/v1/en/#query-asset-valuation
      * @see https://huobiapi.github.io/docs/coin_margined_swap/v1/en/#query-user-s-account-information
      * @see https://www.htx.com/en-us/opend/newApiPages/?id=8cb89359-77b5-11ed-9966-19588469969
      * @param {object} [params] extra parameters specific to the exchange API endpoint
-     * @param {string} [params.subType] linear or future
-     * @param {bool} [params.uta] provide this parameter if you have a recent account with unified cross+isolated margin account
+     * @param {string} [params.type] spot, margin, future or swap
+     * @param {string} [params.subType] linear or inverse
      * @param {bool} [params.multiAssetMode] set to true if you are using multi-asset mode for USDT-margined contracts
      * @returns {object} a [balance structure]{@link https://docs.ccxt.com/?id=balance-structure}
      */
     async fetchBalance(params = {}) {
         await this.loadMarkets();
+        let isUnifiedAccount = undefined;
+        [isUnifiedAccount, params] = this.handleOptionAndParams2(params, 'fetchBalance', 'unified', 'uta', false);
+        if (isUnifiedAccount) {
+            throw new NotSupported(this.id + ' fetchBalance() unified account has been deprecated on htx');
+        }
         let type = undefined;
         [type, params] = this.handleMarketTypeAndParams('fetchBalance', undefined, params);
         let subType = undefined;
-        let isUnifiedAccount = undefined;
         let isMultiAssetMode = undefined;
         [subType, params] = this.handleOptionAndParams2(params, 'fetchBalance', 'defaultSubType', 'subType', 'linear');
-        [isUnifiedAccount, params] = this.handleOptionAndParams2(params, 'fetchBalance', 'unified', 'uta', false);
         [isMultiAssetMode, params] = this.handleOptionAndParams(params, 'fetchBalance', 'multiAssetMode', false);
         const request = {};
         const spot = (type === 'spot');
         const future = (type === 'future');
+        const swap = (type === 'swap');
         const inverse = (subType === 'inverse');
         const linear = (subType === 'linear');
         let marginMode = undefined;
@@ -3618,7 +3579,7 @@ export default class htx extends Exchange {
         const cross = (marginMode === 'cross');
         const margin = (type === 'margin') || (spot && (cross || isolated));
         let response = undefined;
-        if (isMultiAssetMode) {
+        if (isMultiAssetMode || (linear && (swap || future))) {
             response = await this.contractPrivateGetV5AccountBalance(this.extend(request, params));
         }
         else if (spot || margin) {
@@ -3637,12 +3598,6 @@ export default class htx extends Exchange {
                 response = await this.spotPrivateGetV1AccountAccountsAccountIdBalance(this.extend(request, params));
             }
         }
-        else if (linear) {
-            response = await this.contractPrivateGetV5AccountBalance(this.extend(request, params));
-        }
-        else if (isUnifiedAccount) {
-            response = await this.contractPrivateGetLinearSwapApiV3UnifiedAccountInfo(this.extend(request, params));
-        }
         else if (inverse) {
             if (future) {
                 response = await this.contractPrivatePostApiV1ContractAccountInfo(this.extend(request, params));
@@ -3795,14 +3750,15 @@ export default class htx extends Exchange {
         const finalResponse = response;
         let result = { 'info': finalResponse };
         const data = this.safeValue(response, 'data');
-        if (isMultiAssetMode) {
+        if (isMultiAssetMode || (linear && (swap || future))) {
             const details = this.safeList(data, 'details', []);
             for (let i = 0; i < details.length; i++) {
                 const balance = details[i];
                 const currencyId = this.safeString(balance, 'currency');
                 const code = this.safeCurrencyCode(currencyId);
                 const account = this.account();
-                account['free'] = this.safeString(balance, 'withdraw_available');
+                account['free'] = this.safeString(balance, 'available_margin');
+                account['total'] = this.safeString(balance, 'equity');
                 result[code] = account;
             }
             result = this.safeBalance(result);
@@ -3834,46 +3790,6 @@ export default class htx extends Exchange {
                 result = this.safeBalance(result);
             }
         }
-        else if (linear) {
-            const details = this.safeList(data, 'details', []);
-            for (let i = 0; i < details.length; i++) {
-                const balance = details[i];
-                const currencyId = this.safeString(balance, 'currency');
-                const code = this.safeCurrencyCode(currencyId);
-                const account = this.account();
-                account['free'] = this.safeString(balance, 'withdraw_available');
-                result[code] = account;
-            }
-            result = this.safeBalance(result);
-        }
-        else if (isUnifiedAccount) {
-            for (let i = 0; i < data.length; i++) {
-                const entry = data[i];
-                const marginAsset = this.safeString(entry, 'margin_asset');
-                const currencyCode = this.safeCurrencyCode(marginAsset);
-                if (isolated) {
-                    const isolated_swap = this.safeValue(entry, 'isolated_swap', {});
-                    for (let j = 0; j < isolated_swap.length; j++) {
-                        const balance = isolated_swap[j];
-                        const marketId = this.safeString(balance, 'contract_code');
-                        const subBalance = {
-                            'code': currencyCode,
-                            'free': this.safeNumber(balance, 'margin_available'),
-                        };
-                        const symbol = this.safeSymbol(marketId);
-                        result[symbol] = subBalance;
-                        result = this.safeBalance(result);
-                    }
-                }
-                else {
-                    const account = this.account();
-                    account['free'] = this.safeString(entry, 'margin_static');
-                    account['used'] = this.safeString(entry, 'margin_frozen');
-                    result[currencyCode] = account;
-                    result = this.safeBalance(result);
-                }
-            }
-        }
         else if (inverse) {
             for (let i = 0; i < data.length; i++) {
                 const balance = data[i];
@@ -3968,7 +3884,7 @@ export default class htx extends Exchange {
                 }
                 params = this.omit(params, ['client_order_id', 'clientOrderId', 'algo_client_order_id']);
             }
-            if (market['linear']) {
+            if (this.safeBool(market, 'linear')) {
                 if (isAlgo) {
                     if (trigger) {
                         request['type'] = 'trigger';
@@ -3991,7 +3907,7 @@ export default class htx extends Exchange {
                     if (symbol === undefined) {
                         throw new ArgumentsRequired(this.id + ' fetchOrder() requires a symbol argument');
                     }
-                    request['contract_code'] = market['id'];
+                    request['contract_code'] = this.safeString(market, 'id');
                     let marginMode = undefined;
                     [marginMode, params] = this.handleMarginModeAndParams('fetchOrder', params);
                     marginMode = (marginMode === undefined) ? 'cross' : marginMode;
@@ -3999,13 +3915,13 @@ export default class htx extends Exchange {
                     response = await this.contractPrivateGetV5TradeOrder(this.extend(request, params));
                 }
             }
-            else if (market['inverse']) {
+            else if (this.safeBool(market, 'inverse')) {
                 if (marketType === 'future') {
-                    request['symbol'] = market['settleId'];
+                    request['symbol'] = this.safeString(market, 'settleId');
                     response = await this.contractPrivatePostApiV1ContractOrderInfo(this.extend(request, params));
                 }
                 else if (marketType === 'swap') {
-                    request['contract_code'] = market['id'];
+                    request['contract_code'] = this.safeString(market, 'id');
                     response = await this.contractPrivatePostSwapApiV1SwapOrderInfo(this.extend(request, params));
                 }
                 else {
@@ -4485,7 +4401,7 @@ export default class htx extends Exchange {
                 throw new ArgumentsRequired(this.id + ' fetchCanceledOrders() requires a symbol argument for ' + marketType + ' orders');
             }
             const request = {};
-            if (market['linear']) {
+            if (this.safeBool(market, 'linear')) {
                 const trigger = this.safeBool2(params, 'stop', 'trigger');
                 const stopLossTakeProfit = this.safeValue(params, 'stopLossTakeProfit');
                 const stopLoss = this.safeBool(params, 'stopLoss');
@@ -4576,7 +4492,7 @@ export default class htx extends Exchange {
         let response = undefined;
         if (marketType === 'spot') {
             if (symbol !== undefined) {
-                request['symbol'] = market['id'];
+                request['symbol'] = this.safeString(market, 'id');
             }
             // todo replace with fetchAccountIdByType
             let accountId = this.safeString(params, 'account-id');
@@ -4603,7 +4519,7 @@ export default class htx extends Exchange {
         else {
             if (symbol !== undefined) {
                 // throw new ArgumentsRequired (this.id + ' fetchOpenOrders() requires a symbol argument');
-                request['contract_code'] = market['id'];
+                request['contract_code'] = this.safeString(market, 'id');
             }
             if (limit !== undefined) {
                 if (isLinear) {
@@ -5920,19 +5836,19 @@ export default class htx extends Exchange {
         }
         const request = {};
         let response = undefined;
-        if (market['spot']) {
+        if (this.safeBool(market, 'spot')) {
             response = await this.privatePostOrderBatchOrders(ordersRequests);
         }
         else {
-            if (market['linear']) {
+            if (this.safeBool(market, 'linear')) {
                 response = await this.contractPrivatePostV5TradeBatchOrders(ordersRequests);
             }
-            else if (market['inverse']) {
+            else if (this.safeBool(market, 'inverse')) {
                 request['orders_data'] = ordersRequests;
-                if (market['swap']) {
+                if (this.safeBool(market, 'swap')) {
                     response = await this.contractPrivatePostSwapApiV1SwapBatchorder(request);
                 }
-                else if (market['future']) {
+                else if (this.safeBool(market, 'future')) {
                     response = await this.contractPrivatePostApiV1ContractBatchorder(request);
                 }
             }
@@ -6002,7 +5918,7 @@ export default class htx extends Exchange {
         //
         //
         let result = undefined;
-        if (market['spot']) {
+        if (this.safeBool(market, 'spot')) {
             result = this.safeValue(response, 'data', []);
         }
         else {
@@ -6089,16 +6005,16 @@ export default class htx extends Exchange {
                     params = this.omit(params, ['client_order_id', 'clientOrderId']);
                 }
             }
-            if (market['future']) {
-                request['symbol'] = market['settleId'];
+            if (this.safeBool(market, 'future')) {
+                request['symbol'] = this.safeString(market, 'settleId');
             }
             else {
-                request['contract_code'] = market['id'];
+                request['contract_code'] = this.safeString(market, 'id');
             }
             if (isLinear) {
                 if (trigger || stopLossTakeProfit || trailing) {
                     const requestItem = {
-                        'contract_code': market['id'],
+                        'contract_code': this.safeString(market, 'id'),
                     };
                     if (clientOrderId === undefined) {
                         requestItem['algo_id'] = id;
@@ -6115,8 +6031,8 @@ export default class htx extends Exchange {
                     response = await this.contractPrivatePostV5TradeCancelOrder(this.extend(request, params));
                 }
             }
-            else if (market['inverse']) {
-                if (market['swap']) {
+            else if (this.safeBool(market, 'inverse')) {
+                if (this.safeBool(market, 'swap')) {
                     if (trigger) {
                         response = await this.contractPrivatePostSwapApiV1SwapTriggerCancel(this.extend(request, params));
                     }
@@ -6130,7 +6046,7 @@ export default class htx extends Exchange {
                         response = await this.contractPrivatePostSwapApiV1SwapCancel(this.extend(request, params));
                     }
                 }
-                else if (market['future']) {
+                else if (this.safeBool(market, 'future')) {
                     if (trigger) {
                         response = await this.contractPrivatePostApiV1ContractTriggerCancel(this.extend(request, params));
                     }
@@ -6277,7 +6193,7 @@ export default class htx extends Exchange {
             let clientOrderIds = this.safeValue2(params, 'client_order_id', 'clientOrderId');
             clientOrderIds = this.safeValue2(params, 'client_order_ids', 'clientOrderIds', clientOrderIds);
             params = this.omit(params, ['client_order_id', 'client_order_ids', 'clientOrderId', 'clientOrderIds']);
-            if (!market['linear']) {
+            if (!this.safeBool(market, 'linear')) {
                 if (clientOrderIds === undefined) {
                     request['order_id'] = ids.join(',');
                 }
@@ -6285,13 +6201,13 @@ export default class htx extends Exchange {
                     request['client_order_id'] = clientOrderIds;
                 }
             }
-            if (market['future']) {
-                request['symbol'] = market['settleId'];
+            if (this.safeBool(market, 'future')) {
+                request['symbol'] = this.safeString(market, 'settleId');
             }
             else {
-                request['contract_code'] = market['id'];
+                request['contract_code'] = this.safeString(market, 'id');
             }
-            if (market['linear']) {
+            if (this.safeBool(market, 'linear')) {
                 if (clientOrderIds === undefined) {
                     request['order_id'] = ids;
                 }
@@ -6305,8 +6221,8 @@ export default class htx extends Exchange {
                 }
                 response = await this.contractPrivatePostV5TradeCancelBatchOrders(this.extend(request, params));
             }
-            else if (market['inverse']) {
-                if (market['swap']) {
+            else if (this.safeBool(market, 'inverse')) {
+                if (this.safeBool(market, 'swap')) {
                     if (trigger) {
                         response = await this.contractPrivatePostSwapApiV1SwapTriggerCancel(this.extend(request, params));
                     }
@@ -6317,7 +6233,7 @@ export default class htx extends Exchange {
                         response = await this.contractPrivatePostSwapApiV1SwapCancel(this.extend(request, params));
                     }
                 }
-                else if (market['future']) {
+                else if (this.safeBool(market, 'future')) {
                     if (trigger) {
                         response = await this.contractPrivatePostApiV1ContractTriggerCancel(this.extend(request, params));
                     }
@@ -6406,7 +6322,7 @@ export default class htx extends Exchange {
         //         "ts": 1780822053167
         //     }
         //
-        if (market['linear'] && !trigger && !stopLossTakeProfit) {
+        if (this.safeBool(market, 'linear') && !trigger && !stopLossTakeProfit) {
             return this.parseCancelOrders(response);
         }
         const data = this.safeDict(response, 'data');
@@ -6539,7 +6455,7 @@ export default class htx extends Exchange {
         let response = undefined;
         if (marketType === 'spot') {
             if (symbol !== undefined) {
-                request['symbol'] = market['id'];
+                request['symbol'] = this.safeString(market, 'id');
             }
             response = await this.spotPrivatePostV1OrderOrdersBatchCancelOpenOrders(this.extend(request, params));
             //
@@ -6563,15 +6479,15 @@ export default class htx extends Exchange {
             if (symbol === undefined) {
                 throw new ArgumentsRequired(this.id + ' cancelAllOrders() requires a symbol argument');
             }
-            if (market['future']) {
-                request['symbol'] = market['settleId'];
+            if (this.safeBool(market, 'future')) {
+                request['symbol'] = this.safeString(market, 'settleId');
             }
-            request['contract_code'] = market['id'];
+            request['contract_code'] = this.safeString(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 (this.safeBool(market, 'linear')) {
                 response = await this.contractPrivatePostV5TradeCancelAllOrders(this.extend(request, params));
                 //
                 //     {
@@ -6589,8 +6505,8 @@ export default class htx extends Exchange {
                 //     }
                 //
             }
-            else if (market['inverse']) {
-                if (market['swap']) {
+            else if (this.safeBool(market, 'inverse')) {
+                if (this.safeBool(market, 'swap')) {
                     if (trigger) {
                         response = await this.contractPrivatePostSwapApiV1SwapTriggerCancelall(this.extend(request, params));
                     }
@@ -6604,7 +6520,7 @@ export default class htx extends Exchange {
                         response = await this.contractPrivatePostSwapApiV1SwapCancelall(this.extend(request, params));
                     }
                 }
-                else if (market['future']) {
+                else if (this.safeBool(market, 'future')) {
                     if (trigger) {
                         response = await this.contractPrivatePostApiV1ContractTriggerCancelall(this.extend(request, params));
                     }
@@ -6632,7 +6548,7 @@ export default class htx extends Exchange {
             //         "ts": "1683435723755"
             //     }
             //
-            if (market['linear'] && (!trigger && !trailing && !stopLossTakeProfit)) {
+            if (this.safeBool(market, 'linear') && (!trigger && !trailing && !stopLossTakeProfit)) {
                 return this.parseCancelOrders(response);
             }
             const data = this.safeDict(response, 'data');
@@ -7083,18 +6999,52 @@ export default class htx extends Exchange {
         //         "status": "ok"
         //     }
         //
-        const id = this.safeString(transfer, 'data');
-        const code = this.safeCurrencyCode(undefined, currency);
+        // fetchTransfers
+        //
+        //     {
+        //         "id": 12345,
+        //         "transfer_id": "12345",
+        //         "amount": "10",
+        //         "currency": "USDT",
+        //         "status": "success",
+        //         "from_account_type": "spot",
+        //         "to_account_type": "margin",
+        //         "from_asset_type": "",
+        //         "to_asset_type": "ETHUSDT",
+        //         "transfer_time": 1770357494000
+        //     }
+        //
+        const accountsById = this.safeDict(this.options, 'accountsById', {});
+        const id = this.safeString2(transfer, 'transfer_id', 'data');
+        const currencyId = this.safeString(transfer, 'currency');
+        const code = this.safeCurrencyCode(currencyId, currency);
+        const amount = this.safeNumber(transfer, 'amount');
+        const timestamp = this.safeInteger(transfer, 'transfer_time');
+        const fromAccountRaw = this.safeString(transfer, 'from_account_type');
+        const toAccountRaw = this.safeString(transfer, 'to_account_type');
+        const fromAccount = this.safeString(accountsById, fromAccountRaw, fromAccountRaw);
+        const toAccount = this.safeString(accountsById, toAccountRaw, toAccountRaw);
+        const statusRaw = this.safeString(transfer, 'status');
+        let status = undefined;
+        if (statusRaw === 'success') {
+            status = 'ok';
+        }
+        else if (statusRaw === 'pending') {
+            status = 'pending';
+        }
+        else if (statusRaw === 'failed') {
+            status = 'failed';
+        }
         return {
             'info': transfer,
             'id': id,
-            'timestamp': undefined,
-            'datetime': undefined,
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
             'currency': code,
-            'amount': undefined,
-            'fromAccount': undefined,
-            'toAccount': undefined,
-            'status': undefined,
+            'amount': amount,
+            'fromAccount': fromAccount,
+            'toAccount': toAccount,
+            'status': status,
         };
     }
     /**
@@ -7193,6 +7143,64 @@ export default class htx extends Exchange {
         //
         return this.parseTransfer(response, currency);
     }
+    /**
+     * @method
+     * @name htx#fetchTransfers
+     * @description fetch a history of internal transfers made on an account
+     * @see https://www.huobi.com/en-us/opend/newApiPages/
+     * @param {string} [code] unified currency code of the currency transferred
+     * @param {int} [since] the earliest time in ms to fetch transfers for
+     * @param {int} [limit] the maximum number of transfer structures to retrieve
+     * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @param {string} [params.status] transfer status: 'success', 'pending', 'failed'
+     * @param {int} [params.from] the starting ID for pagination
+     * @param {string} [params.direct] pagination direction: 'prev' or 'next', default 'next'
+     * @param {int} [params.until] the latest time in ms to fetch transfers for
+     * @returns {object[]} a list of [transfer structures]{@link https://docs.ccxt.com/?id=transfer-structure}
+     */
+    async fetchTransfers(code = undefined, since = undefined, limit = undefined, params = {}) {
+        await this.loadMarkets();
+        let currency = undefined;
+        const request = {};
+        if (code !== undefined) {
+            currency = this.currency(code);
+            request['currency'] = currency['id'];
+        }
+        if (since !== undefined) {
+            request['start_time'] = since;
+        }
+        const until = this.safeInteger(params, 'until');
+        if (until !== undefined) {
+            params = this.omit(params, 'until');
+            request['end_time'] = until;
+        }
+        if (limit !== undefined) {
+            request['limit'] = limit;
+        }
+        const response = await this.spotPrivateGetV5AccountUniversalTransferRecords(this.extend(request, params));
+        //
+        //     {
+        //         "code": 200,
+        //         "message": "Success",
+        //         "data": [
+        //             {
+        //                 "id": 12345,
+        //                 "transfer_id": "12345",
+        //                 "amount": "10",
+        //                 "currency": "USDT",
+        //                 "status": "success",
+        //                 "from_account_type": "spot",
+        //                 "to_account_type": "margin",
+        //                 "from_asset_type": "",
+        //                 "to_asset_type": "ETHUSDT",
+        //                 "transfer_time": 1770357494000
+        //             }
+        //         ]
+        //     }
+        //
+        const data = this.safeList(response, 'data', []);
+        return this.parseTransfers(data, currency, since, limit);
+    }
     /**
      * @method
      * @name htx#fetchIsolatedBorrowRates
@@ -7926,63 +7934,66 @@ export default class htx extends Exchange {
      * @method
      * @name htx#fetchFundingHistory
      * @description fetch the history of funding payments paid and received on this account
-     * @see https://huobiapi.github.io/docs/usdt_swap/v1/en/#general-query-account-financial-records-via-multiple-fields-new   // linear swaps
-     * @see https://huobiapi.github.io/docs/dm/v1/en/#query-financial-records-via-multiple-fields-new                          // coin-m futures
-     * @see https://huobiapi.github.io/docs/coin_margined_swap/v1/en/#query-financial-records-via-multiple-fields-new          // coin-m swaps
+     * @see https://www.htx.com/en-us/opend/newApiPages/?id=8cb89359-77b5-11ed-9966-19b930b8bee                         // linear swaps
+     * @see https://huobiapi.github.io/docs/dm/v1/en/#query-financial-records-via-multiple-fields-new                   // coin-m futures
+     * @see https://huobiapi.github.io/docs/coin_margined_swap/v1/en/#query-financial-records-via-multiple-fields-new   // coin-m swaps
      * @param {string} symbol unified market symbol
      * @param {int} [since] the earliest time in ms to fetch funding history for
      * @param {int} [limit] the maximum number of funding history structures to retrieve
      * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @param {int} [params.until] the latest time in ms to fetch entries for
      * @returns {object} a [funding history structure]{@link https://docs.ccxt.com/?id=funding-history-structure}
      */
     async fetchFundingHistory(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         await this.loadMarkets();
         const market = this.market(symbol);
-        const [marketType, query] = this.handleMarketTypeAndParams('fetchFundingHistory', market, params);
-        const request = {
+        let marketType = undefined;
+        [marketType, params] = this.handleMarketTypeAndParams('fetchFundingHistory', market, params);
+        let request = {
             'type': '30,31',
         };
+        [request, params] = this.handleUntilOption('end_time', request, params);
         if (since !== undefined) {
-            request['start_date'] = since;
+            if (market['linear']) {
+                request['start_time'] = since;
+            }
+            else {
+                request['start_date'] = since;
+            }
         }
         let response = undefined;
         if (marketType === 'swap') {
-            request['contract'] = market['id'];
             if (market['linear']) {
-                //
-                //    {
-                //        "status": "ok",
-                //        "data": {
-                //           "financial_record": [
-                //               {
-                //                   "id": "1320088022",
-                //                   "type": "30",
-                //                   "amount": "0.004732510000000000",
-                //                   "ts": "1641168019321",
-                //                   "contract_code": "BTC-USDT",
-                //                   "asset": "USDT",
-                //                   "margin_account": "BTC-USDT",
-                //                   "face_margin_account": ''
-                //               },
-                //           ],
-                //           "remain_size": "0",
-                //           "next_id": null
-                //        },
-                //        "ts": "1641189898425"
-                //    }
-                //
                 let marginMode = undefined;
                 [marginMode, params] = this.handleMarginModeAndParams('fetchFundingHistory', params);
                 marginMode = (marginMode === undefined) ? 'cross' : marginMode;
-                if (marginMode === 'isolated') {
-                    request['mar_acct'] = market['id'];
-                }
-                else {
-                    request['mar_acct'] = market['quoteId'];
+                request['margin_mode'] = marginMode;
+                request['contract_code'] = market['id'];
+                if (limit !== undefined) {
+                    request['limit'] = limit;
                 }
-                response = await this.contractPrivatePostLinearSwapApiV3SwapFinancialRecordExact(this.extend(request, query));
+                response = await this.contractPrivateGetV5AccountBills(this.extend(request, params));
+                //
+                //     {
+                //         "code": 200,
+                //         "message": "Success",
+                //         "data": [
+                //             {
+                //                 "id": "2194774775",
+                //                 "type": "30",
+                //                 "currency": "USDT",
+                //                 "amount": "0.000433432461821856",
+                //                 "contract_code": "BTC-USDT",
+                //                 "margin_mode": "cross",
+                //                 "created_time": "1780963213165"
+                //             },
+                //         ],
+                //         "ts": 1781772448836
+                //     }
+                //
             }
             else {
+                request['contract'] = market['id'];
                 //
                 //     {
                 //         "code": 200,
@@ -8003,12 +8014,12 @@ export default class htx extends Exchange {
                 //         "ts": 1604312615051
                 //     }
                 //
-                response = await this.contractPrivatePostSwapApiV3SwapFinancialRecordExact(this.extend(request, query));
+                response = await this.contractPrivatePostSwapApiV3SwapFinancialRecordExact(this.extend(request, params));
             }
         }
         else {
             request['symbol'] = market['id'];
-            response = await this.contractPrivatePostApiV3ContractFinancialRecordExact(this.extend(request, query));
+            response = await this.contractPrivatePostApiV3ContractFinancialRecordExact(this.extend(request, params));
         }
         const data = this.safeList(response, 'data', []);
         return this.parseIncomes(data, market, since, limit);
@@ -8102,12 +8113,24 @@ export default class htx extends Exchange {
         //       "contract_code": "BTC-USD"
         //     }
         //
+        // linear swap
+        //
+        //     {
+        //         "id": "2194774775",
+        //         "type": "30",
+        //         "currency": "USDT",
+        //         "amount": "0.000433432461821856",
+        //         "contract_code": "BTC-USDT",
+        //         "margin_mode": "cross",
+        //         "created_time": "1780963213165"
+        //     }
+        //
         const marketId = this.safeString(income, 'contract_code');
         const symbol = this.safeSymbol(marketId, market);
         const amount = this.safeNumber(income, 'amount');
-        const timestamp = this.safeInteger(income, 'ts');
+        const timestamp = this.safeInteger2(income, 'ts', 'created_time');
         const id = this.safeString(income, 'id');
-        const currencyId = this.safeString2(income, 'symbol', 'asset');
+        const currencyId = this.safeStringN(income, ['symbol', 'asset', 'currency']);
         const code = this.safeCurrencyCode(currencyId);
         return {
             'info': income,
@@ -9330,7 +9353,7 @@ export default class htx extends Exchange {
      * @description Fetches historical settlement records
      * @see https://huobiapi.github.io/docs/dm/v1/en/#query-historical-settlement-records-of-the-platform-interface
      * @see https://huobiapi.github.io/docs/coin_margined_swap/v1/en/#query-historical-settlement-records-of-the-platform-interface
-     * @see https://huobiapi.github.io/docs/usdt_swap/v1/en/#general-query-historical-settlement-records-of-the-platform-interface
+     * @see https://www.htx.com/en-us/opend/newApiPages/?id=8cb89359-77b5-11ed-9966-19b931869f0
      * @param {string} symbol unified symbol of the market to fetch the settlement history for
      * @param {int} [since] timestamp in ms, value range = current time - 90 days，default = current time - 90 days
      * @param {int} [limit] page items, default 20, shall not exceed 50
@@ -9344,29 +9367,30 @@ export default class htx extends Exchange {
         if (symbol === undefined) {
             throw new ArgumentsRequired(this.id + ' fetchSettlementHistory() requires a symbol argument');
         }
-        const until = this.safeInteger(params, 'until');
-        params = this.omit(params, ['until']);
         const market = this.market(symbol);
-        const request = {};
+        let request = {};
         if (market['future']) {
             request['symbol'] = market['baseId'];
         }
         else {
             request['contract_code'] = market['id'];
         }
-        if (since !== undefined) {
-            request['start_at'] = since;
-        }
         if (limit !== undefined) {
-            request['page_size'] = limit;
+            if (market['linear'] && market['swap']) {
+                request['limit'] = limit;
+            }
+            else {
+                request['page_size'] = limit;
+            }
         }
-        if (until !== undefined) {
-            request['end_at'] = until;
+        if (since !== undefined) {
+            request['start_time'] = since;
         }
+        [request, params] = this.handleUntilOption('end_time', request, params);
         let response = undefined;
         if (market['swap']) {
             if (market['linear']) {
-                response = await this.contractPublicGetLinearSwapApiV1SwapSettlementRecords(this.extend(request, params));
+                response = await this.contractPublicGetV5MarketSettlementHistory(this.extend(request, params));
             }
             else {
                 response = await this.contractPublicGetSwapApiV1SwapSettlementRecords(this.extend(request, params));
@@ -9376,7 +9400,7 @@ export default class htx extends Exchange {
             response = await this.contractPublicGetApiV1ContractSettlementRecords(this.extend(request, params));
         }
         //
-        // linear swap, coin-m swap
+        // coin-m swap
         //
         //    {
         //        "status": "ok",
@@ -9427,6 +9451,28 @@ export default class htx extends Exchange {
         //        }
         //    }
         //
+        // linear swap
+        //
+        //     {
+        //         "code": 200,
+        //         "message": "Success",
+        //         "data": [
+        //             {
+        //                 "id": "14900",
+        //                 "contract_code": "BTC-USDT",
+        //                 "settlement_time": "1781827200000",
+        //                 "clawback_ratio": "0",
+        //                 "settlement_price": "62933.747161774209291325"
+        //             },
+        //         ],
+        //         "ts": 1781853150623
+        //     }
+        //
+        if (market['linear']) {
+            const dataLinear = this.safeList(response, 'data', []);
+            const settlementsLinear = this.parseSettlements(dataLinear, market);
+            return this.sortBy(settlementsLinear, 'timestamp');
+        }
         const data = this.safeValue(response, 'data');
         const settlementRecord = this.safeValue(data, 'settlement_record');
         const settlements = this.parseSettlements(settlementRecord, market);
@@ -9552,7 +9598,7 @@ export default class htx extends Exchange {
     }
     parseSettlements(settlements, market) {
         //
-        // linear swap, coin-m swap, fetchSettlementHistory
+        // coin-m swap, fetchSettlementHistory
         //
         //    [
         //        {
@@ -9587,11 +9633,27 @@ export default class htx extends Exchange {
         //        },
         //    ]
         //
+        // linear swap fetchSettlementHistory
+        //
+        //     [
+        //         {
+        //             "id": "14900",
+        //             "contract_code": "BTC-USDT",
+        //             "settlement_time": "1781827200000",
+        //             "clawback_ratio": "0",
+        //             "settlement_price": "62933.747161774209291325"
+        //         }
+        //     ]
+        //
         const result = [];
         for (let i = 0; i < settlements.length; i++) {
             const settlement = settlements[i];
             const list = this.safeValue(settlement, 'list');
-            if (list !== undefined) {
+            if (market['linear']) {
+                const parsedSettlement = this.parseSettlement(settlement, market);
+                result.push(parsedSettlement);
+            }
+            else if (list !== undefined) {
                 const timestamp = this.safeInteger(settlement, 'settlement_time');
                 const timestampDetails = {
                     'timestamp': timestamp,
@@ -9611,7 +9673,7 @@ export default class htx extends Exchange {
     }
     parseSettlement(settlement, market) {
         //
-        // linear swap, coin-m swap, fetchSettlementHistory
+        // coin-m swap, fetchSettlementHistory
         //
         //    {
         //        "symbol": "ADA",
@@ -9633,6 +9695,16 @@ export default class htx extends Exchange {
         //        "settlement_type": "settlement"
         //    }
         //
+        // linear swap fetchSettlementHistory
+        //
+        //     {
+        //         "id": "14900",
+        //         "contract_code": "BTC-USDT",
+        //         "settlement_time": "1781827200000",
+        //         "clawback_ratio": "0",
+        //         "settlement_price": "62933.747161774209291325"
+        //     }
+        //
         const timestamp = this.safeInteger(settlement, 'settlement_time');
         const marketId = this.safeString(settlement, 'contract_code');
         return {
@@ -9647,7 +9719,7 @@ export default class htx extends Exchange {
      * @method
      * @name htx#fetchLiquidations
      * @description retrieves the public liquidations of a trading pair
-     * @see https://huobiapi.github.io/docs/usdt_swap/v1/en/#general-query-liquidation-orders-new
+     * @see https://www.htx.com/en-us/opend/newApiPages/?id=8cb89359-77b5-11ed-9966-19b975edf5a
      * @see https://huobiapi.github.io/docs/coin_margined_swap/v1/en/#query-liquidation-orders-new
      * @see https://huobiapi.github.io/docs/dm/v1/en/#query-liquidation-order-information-new
      * @param {string} symbol unified CCXT market symbol
@@ -9655,27 +9727,53 @@ export default class htx extends Exchange {
      * @param {int} [limit] the maximum number of liquidation structures to retrieve
      * @param {object} [params] exchange specific parameters for the huobi api endpoint
      * @param {int} [params.until] timestamp in ms of the latest liquidation
-     * @param {int} [params.tradeType] default 0, linear swap 0: all liquidated orders, 5: liquidated longs; 6: liquidated shorts, inverse swap and future 0: filled liquidated orders, 5: liquidated close orders, 6: liquidated open orders
+     * @param {int} [params.tradeType] *not supported for linear swap* default 0: filled liquidated orders, 5: liquidated close orders, 6: liquidated open orders
      * @returns {object} an array of [liquidation structures]{@link https://docs.ccxt.com/?id=liquidation-structure}
      */
     async fetchLiquidations(symbol, since = undefined, limit = undefined, params = {}) {
         await this.loadMarkets();
         const market = this.market(symbol);
-        const tradeType = this.safeInteger(params, 'trade_type', 0);
-        let request = {
-            'trade_type': tradeType,
-        };
+        const tradeType = this.safeInteger2(params, 'trade_type', 'tradeType', 0);
+        let request = {};
+        if (!market['linear']) {
+            request['trade_type'] = tradeType;
+        }
+        params = this.omit(params, ['trade_type', 'tradeType']);
         if (since !== undefined) {
             request['start_time'] = since;
         }
         [request, params] = this.handleUntilOption('end_time', request, params);
         let response = undefined;
         if (market['swap']) {
-            request['contract'] = market['id'];
             if (market['linear']) {
-                response = await this.contractPublicGetLinearSwapApiV3SwapLiquidationOrders(this.extend(request, params));
+                request['contract_code'] = market['id'];
+                if (limit !== undefined) {
+                    request['limit'] = limit;
+                }
+                response = await this.contractPublicGetV5MarketLiquidationOrders(this.extend(request, params));
+                //
+                //     {
+                //         "code": 200,
+                //         "message": "Success",
+                //         "data": [
+                //             {
+                //                 "id": "150153038758",
+                //                 "contract_code": "BTC-USDT",
+                //                 "liquidation_time": "1781849094165",
+                //                 "side": "buy",
+                //                 "position_side": "short",
+                //                 "volume": "2",
+                //                 "amount": "2",
+                //                 "bankrupt_price": "62978.5",
+                //                 "trade_turnover": "125.957"
+                //             }
+                //         ],
+                //         "ts": 1781854869221
+                //     }
+                //
             }
             else {
+                request['contract'] = market['id'];
                 response = await this.contractPublicGetSwapApiV3SwapLiquidationOrders(this.extend(request, params));
             }
         }
@@ -9729,15 +9827,29 @@ export default class htx extends Exchange {
         //         "pair": "BTC-USDT"
         //     }
         //
+        // linear swap
+        //
+        //     {
+        //         "id": "150153038758",
+        //         "contract_code": "BTC-USDT",
+        //         "liquidation_time": "1781849094165",
+        //         "side": "buy",
+        //         "position_side": "short",
+        //         "volume": "2",
+        //         "amount": "2",
+        //         "bankrupt_price": "62978.5",
+        //         "trade_turnover": "125.957"
+        //     }
+        //
         const marketId = this.safeString(liquidation, 'contract_code');
-        const timestamp = this.safeInteger(liquidation, 'created_at');
+        const timestamp = this.safeInteger2(liquidation, 'created_at', 'liquidation_time');
         return this.safeLiquidation({
             'info': liquidation,
             'symbol': this.safeSymbol(marketId, market),
             'contracts': this.safeNumber(liquidation, 'volume'),
             'contractSize': this.safeNumber(market, 'contractSize'),
-            'price': this.safeNumber(liquidation, 'price'),
-            'side': this.safeStringLower(liquidation, 'direction'),
+            'price': this.safeNumber2(liquidation, 'price', 'bankrupt_price'),
+            'side': this.safeStringLower2(liquidation, 'direction', 'side'),
             'baseValue': this.safeNumber(liquidation, 'amount'),
             'quoteValue': this.safeNumber(liquidation, 'trade_turnover'),
             'timestamp': timestamp,