ccxt 4.1.100 → 4.2.2

package/dist/cjs/src/poloniexfutures.js

@@ -1189,9 +1189,15 @@ class poloniexfutures extends poloniexfutures$1 {
         if (symbol !== undefined) {
             request['symbol'] = this.marketId(symbol);
         }
-        const stop = this.safeValue(params, 'stop');
-        const method = stop ? 'privateDeleteStopOrders' : 'privateDeleteOrders';
-        const response = await this[method](this.extend(request, params));
+        const stop = this.safeValue2(params, 'stop', 'trigger');
+        params = this.omit(params, ['stop', 'trigger']);
+        let response = undefined;
+        if (stop) {
+            response = await this.privateDeleteStopOrders(this.extend(request, params));
+        }
+        else {
+            response = await this.privateDeleteOrders(this.extend(request, params));
+        }
         //
         //   {
         //       "code": "200000",
@@ -1253,9 +1259,9 @@ class poloniexfutures extends poloniexfutures$1 {
          * @returns An [array of order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
-        const stop = this.safeValue(params, 'stop');
+        const stop = this.safeValue2(params, 'stop', 'trigger');
         const until = this.safeInteger2(params, 'until', 'till');
-        params = this.omit(params, ['stop', 'until', 'till']);
+        params = this.omit(params, ['triger', 'stop', 'until', 'till']);
         if (status === 'closed') {
             status = 'done';
         }
@@ -1277,8 +1283,13 @@ class poloniexfutures extends poloniexfutures$1 {
         if (until !== undefined) {
             request['endAt'] = until;
         }
-        const method = stop ? 'privateGetStopOrders' : 'privateGetOrders';
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (stop) {
+            response = await this.privateGetStopOrders(this.extend(request, params));
+        }
+        else {
+            response = await this.privateGetOrders(this.extend(request, params));
+        }
         //
         //    {
         //        "code": "200000",
@@ -1388,20 +1399,20 @@ class poloniexfutures extends poloniexfutures$1 {
          */
         await this.loadMarkets();
         const request = {};
-        let method = 'privateGetOrdersOrderId';
+        let response = undefined;
         if (id === undefined) {
             const clientOrderId = this.safeString2(params, 'clientOid', 'clientOrderId');
             if (clientOrderId === undefined) {
                 throw new errors.InvalidOrder(this.id + ' fetchOrder() requires parameter id or params.clientOid');
             }
             request['clientOid'] = clientOrderId;
-            method = 'privateGetOrdersByClientOid';
             params = this.omit(params, ['clientOid', 'clientOrderId']);
+            response = await this.privateGetClientOrderIdClientOid(this.extend(request, params));
         }
         else {
             request['order-id'] = id;
+            response = await this.privateGetOrdersOrderId(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         //
         //    {
         //        "code": "200000",
@@ -1721,7 +1732,7 @@ class poloniexfutures extends poloniexfutures$1 {
         const version = this.safeString(params, 'version', defaultVersion);
         const tail = '/api/' + version + '/' + this.implodeParams(path, params);
         url += tail;
-        const query = this.omit(params, path);
+        const query = this.omit(params, this.extractParams(path));
         const queryLength = Object.keys(query).length;
         if (api === 'public') {
             if (queryLength) {

package/dist/cjs/src/pro/binance.js

@@ -1114,25 +1114,27 @@ class binance extends binance$1 {
         const listenKeyRefreshRate = this.safeInteger(this.options, 'listenKeyRefreshRate', 1200000);
         const delay = this.sum(listenKeyRefreshRate, 10000);
         if (time - lastAuthenticatedTime > delay) {
-            let method = 'publicPostUserDataStream';
+            let response = undefined;
             if (type === 'future') {
-                method = 'fapiPrivatePostListenKey';
+                response = await this.fapiPrivatePostListenKey(query);
             }
             else if (type === 'delivery') {
-                method = 'dapiPrivatePostListenKey';
+                response = await this.dapiPrivatePostListenKey(query);
             }
             else if (type === 'margin' && isCrossMargin) {
-                method = 'sapiPostUserDataStream';
+                response = await this.sapiPostUserDataStream(query);
             }
             else if (isIsolatedMargin) {
-                method = 'sapiPostUserDataStreamIsolated';
                 if (symbol === undefined) {
                     throw new errors.ArgumentsRequired(this.id + ' authenticate() requires a symbol argument for isolated margin mode');
                 }
                 const marketId = this.marketId(symbol);
                 query = this.extend(query, { 'symbol': marketId });
+                response = await this.sapiPostUserDataStreamIsolated(query);
+            }
+            else {
+                response = await this.publicPostUserDataStream(query);
             }
-            const response = await this[method](query);
             this.options[type] = this.extend(options, {
                 'listenKey': this.safeString(response, 'listenKey'),
                 'lastAuthenticatedTime': time,
@@ -1158,26 +1160,27 @@ class binance extends binance$1 {
             // A network error happened: we can't renew a listen key that does not exist.
             return;
         }
-        let method = 'publicPutUserDataStream';
         const request = {};
         const symbol = this.safeString(params, 'symbol');
         const sendParams = this.omit(params, ['type', 'symbol']);
-        if (type === 'future') {
-            method = 'fapiPrivatePutListenKey';
-        }
-        else if (type === 'delivery') {
-            method = 'dapiPrivatePutListenKey';
-        }
-        else {
-            request['listenKey'] = listenKey;
-            if (type === 'margin') {
-                request['symbol'] = symbol;
-                method = 'sapiPutUserDataStream';
-            }
-        }
         const time = this.milliseconds();
         try {
-            await this[method](this.extend(request, sendParams));
+            if (type === 'future') {
+                await this.fapiPrivatePutListenKey(this.extend(request, sendParams));
+            }
+            else if (type === 'delivery') {
+                await this.dapiPrivatePutListenKey(this.extend(request, sendParams));
+            }
+            else {
+                request['listenKey'] = listenKey;
+                if (type === 'margin') {
+                    request['symbol'] = symbol;
+                    await this.sapiPutUserDataStream(this.extend(request, sendParams));
+                }
+                else {
+                    await this.publicPutUserDataStream(this.extend(request, sendParams));
+                }
+            }
         }
         catch (error) {
             const url = this.urls['api']['ws'][type] + '/' + this.options[type]['listenKey'];

package/dist/cjs/src/pro/bitmart.js

@@ -51,7 +51,7 @@ class bitmart extends bitmart$1 {
                     'awaitBalanceSnapshot': false, // whether to wait for the balance snapshot before providing updates
                 },
                 'watchOrderBook': {
-                    'depth': 'depth50', // depth5, depth20, depth50
+                    'depth': 'depth/increase100', // depth/increase100, depth5, depth20, depth50
                 },
                 'ws': {
                     'inflate': true,
@@ -1069,6 +1069,7 @@ class bitmart extends bitmart$1 {
          * @method
          * @name bitmart#watchOrderBook
          * @see https://developer-pro.bitmart.com/en/spot/#public-depth-all-channel
+         * @see https://developer-pro.bitmart.com/en/spot/#public-depth-increase-channel
          * @see https://developer-pro.bitmart.com/en/futures/#public-depth-channel
          * @description watches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
          * @param {string} symbol unified symbol of the market to fetch the order book for
@@ -1078,11 +1079,14 @@ class bitmart extends bitmart$1 {
          */
         await this.loadMarkets();
         const options = this.safeValue(this.options, 'watchOrderBook', {});
-        const depth = this.safeString(options, 'depth', 'depth50');
+        let depth = this.safeString(options, 'depth', 'depth/increase100');
         symbol = this.symbol(symbol);
         const market = this.market(symbol);
         let type = 'spot';
         [type, params] = this.handleMarketTypeAndParams('watchOrderBook', market, params);
+        if (type === 'swap' && depth === 'depth/increase100') {
+            depth = 'depth50';
+        }
         const orderbook = await this.subscribe(depth, symbol, type, params);
         return orderbook.limit();
     }
@@ -1131,46 +1135,72 @@ class bitmart extends bitmart$1 {
     }
     handleOrderBook(client, message) {
         //
-        // spot
-        //     {
-        //         "data": [
-        //             {
-        //                 "asks": [
-        //                     [ '46828.38', "0.21847" ],
-        //                     [ '46830.68', "0.08232" ],
-        //                     ...
-        //                 ],
-        //                 "bids": [
-        //                     [ '46820.78', "0.00444" ],
-        //                     [ '46814.33', "0.00234" ],
-        //                     ...
+        // spot depth-all
+        //    {
+        //        "data": [
+        //            {
+        //                "asks": [
+        //                    [ '46828.38', "0.21847" ],
+        //                    [ '46830.68', "0.08232" ],
+        //                    ...
+        //                ],
+        //                "bids": [
+        //                    [ '46820.78', "0.00444" ],
+        //                    [ '46814.33', "0.00234" ],
+        //                    ...
+        //                ],
+        //                "ms_t": 1631044962431,
+        //                "symbol": "BTC_USDT"
+        //            }
+        //        ],
+        //        "table": "spot/depth5"
+        //    }
+        // spot increse depth snapshot
+        //    {
+        //        "data":[
+        //           {
+        //              "asks":[
+        //                 [
+        //                    "43652.52",
+        //                    "0.02039"
         //                 ],
-        //                 "ms_t": 1631044962431,
-        //                 "symbol": "BTC_USDT"
-        //             }
-        //         ],
-        //         "table": "spot/depth5"
-        //     }
+        //                 ...
+        //              ],
+        //              "bids":[
+        //                [
+        //                   "43652.51",
+        //                   "0.00500"
+        //                ],
+        //                ...
+        //              ],
+        //              "ms_t":1703376836487,
+        //              "symbol":"BTC_USDT",
+        //              "type":"snapshot", // or update
+        //              "version":2141731
+        //           }
+        //        ],
+        //        "table":"spot/depth/increase100"
+        //    }
         // swap
-        //     {
-        //         "group":"futures/depth50:BTCUSDT",
-        //         "data":{
-        //            "symbol":"BTCUSDT",
-        //            "way":1,
-        //            "depths":[
-        //               {
-        //                  "price":"39509.8",
-        //                  "vol":"2379"
-        //               },
-        //               {
-        //                  "price":"39509.6",
-        //                  "vol":"6815"
-        //               },
-        //               ...
-        //            ],
-        //            "ms_t":1701566021194
-        //         }
-        //     }
+        //    {
+        //        "group":"futures/depth50:BTCUSDT",
+        //        "data":{
+        //           "symbol":"BTCUSDT",
+        //           "way":1,
+        //           "depths":[
+        //              {
+        //                 "price":"39509.8",
+        //                 "vol":"2379"
+        //              },
+        //              {
+        //                 "price":"39509.6",
+        //                 "vol":"6815"
+        //              },
+        //              ...
+        //           ],
+        //           "ms_t":1701566021194
+        //        }
+        //    }
         //
         const data = this.safeValue(message, 'data');
         if (data === undefined) {
@@ -1179,12 +1209,16 @@ class bitmart extends bitmart$1 {
         const depths = this.safeValue(data, 'depths');
         const isSpot = (depths === undefined);
         const table = this.safeString2(message, 'table', 'group');
-        const parts = table.split('/');
-        const lastPart = this.safeString(parts, 1);
-        let limitString = lastPart.replace('depth', '');
-        const dotsIndex = limitString.indexOf(':');
-        limitString = limitString.slice(0, dotsIndex);
-        const limit = this.parseToInt(limitString);
+        // find limit subscribed to
+        const limitsToCheck = ['100', '50', '20', '10', '5'];
+        let limit = 0;
+        for (let i = 0; i < limitsToCheck.length; i++) {
+            const limitString = limitsToCheck[i];
+            if (table.indexOf(limitString) >= 0) {
+                limit = this.parseToInt(limitString);
+                break;
+            }
+        }
         if (isSpot) {
             for (let i = 0; i < data.length; i++) {
                 const update = data[i];
@@ -1196,7 +1230,10 @@ class bitmart extends bitmart$1 {
                     orderbook['symbol'] = symbol;
                     this.orderbooks[symbol] = orderbook;
                 }
-                orderbook.reset({});
+                const type = this.safeValue(update, 'type');
+                if ((type === 'snapshot') || (!(table.indexOf('increase') >= 0))) {
+                    orderbook.reset({});
+                }
                 this.handleOrderBookMessage(client, update, orderbook);
                 const timestamp = this.safeInteger(update, 'ms_t');
                 orderbook['timestamp'] = timestamp;
@@ -1388,9 +1425,7 @@ class bitmart extends bitmart$1 {
         }
         else {
             const methods = {
-                'depth5': this.handleOrderBook,
-                'depth20': this.handleOrderBook,
-                'depth50': this.handleOrderBook,
+                'depth': this.handleOrderBook,
                 'ticker': this.handleTicker,
                 'trade': this.handleTrade,
                 'kline': this.handleOHLCV,

package/dist/cjs/src/pro/bybit.js

@@ -886,10 +886,15 @@ class bybit extends bybit$1 {
         }
         const trades = this.myTrades;
         const symbols = {};
-        const method = spot ? 'parseWsTrade' : 'parseTrade';
         for (let i = 0; i < data.length; i++) {
             const rawTrade = data[i];
-            const parsed = this[method](rawTrade);
+            let parsed = undefined;
+            if (spot) {
+                parsed = this.parseWsTrade(rawTrade);
+            }
+            else {
+                parsed = this.parseTrade(rawTrade);
+            }
             const symbol = parsed['symbol'];
             symbols[symbol] = true;
             trades.append(parsed);

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 { Market, Trade, Fee, Ticker, OrderBook, Order, Transaction, Tickers, Currency, Balance, DepositAddress, WithdrawalResponse, DepositAddressResponse, OHLCV, Balances, PartialBalances, Dictionary, MinMax, Position, FundingRateHistory, Liquidation, FundingHistory, MarginMode, Greeks } from './src/base/types.js';
 import { BaseError, ExchangeError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, NotSupported, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, AuthenticationError, AddressPending, NoChange } from './src/base/errors.js';
-declare const version = "4.1.99";
+declare const version = "4.2.1";
 import ace from './src/ace.js';
 import alpaca from './src/alpaca.js';
 import ascendex from './src/ascendex.js';

package/js/ccxt.js

@@ -38,7 +38,7 @@ import * as errors from './src/base/errors.js';
 import { BaseError, ExchangeError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, NotSupported, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, AuthenticationError, AddressPending, NoChange } from './src/base/errors.js';
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.1.100';
+const version = '4.2.2';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

package/js/src/abstract/bingx.d.ts

@@ -9,11 +9,13 @@ interface Exchange {
     spotV1PrivateGetTradeQuery(params?: {}): Promise<implicitReturnType>;
     spotV1PrivateGetTradeOpenOrders(params?: {}): Promise<implicitReturnType>;
     spotV1PrivateGetTradeHistoryOrders(params?: {}): Promise<implicitReturnType>;
+    spotV1PrivateGetUserCommissionRate(params?: {}): Promise<implicitReturnType>;
     spotV1PrivateGetAccountBalance(params?: {}): Promise<implicitReturnType>;
     spotV1PrivatePostTradeOrder(params?: {}): Promise<implicitReturnType>;
     spotV1PrivatePostTradeCancel(params?: {}): Promise<implicitReturnType>;
     spotV1PrivatePostTradeBatchOrders(params?: {}): Promise<implicitReturnType>;
     spotV1PrivatePostTradeCancelOrders(params?: {}): Promise<implicitReturnType>;
+    spotV1PrivatePostTradeCancelOpenOrders(params?: {}): Promise<implicitReturnType>;
     spotV3PrivateGetGetAssetTransfer(params?: {}): Promise<implicitReturnType>;
     spotV3PrivateGetAssetTransfer(params?: {}): Promise<implicitReturnType>;
     spotV3PrivateGetCapitalDepositHisrec(params?: {}): Promise<implicitReturnType>;

package/js/src/binance.js

@@ -1595,6 +1595,7 @@ export default class binance extends Exchange {
                     '-4046': AuthenticationError,
                     '-4047': BadRequest,
                     '-4054': BadRequest,
+                    '-4164': InvalidOrder,
                     '-5001': BadRequest,
                     '-5002': InsufficientFunds,
                     '-5003': InsufficientFunds,

package/js/src/bingx.js

@@ -120,6 +120,7 @@ export default class bingx extends Exchange {
                                 'trade/query': 3,
                                 'trade/openOrders': 3,
                                 'trade/historyOrders': 3,
+                                'user/commissionRate': 3,
                                 'account/balance': 3,
                             },
                             'post': {
@@ -127,6 +128,7 @@ export default class bingx extends Exchange {
                                 'trade/cancel': 3,
                                 'trade/batchOrders': 3,
                                 'trade/cancelOrders': 3,
+                                'trade/cancelOpenOrders': 3,
                             },
                         },
                     },
@@ -1317,22 +1319,30 @@ export default class bingx extends Exchange {
         //    }
         //
         const marketId = this.safeString(ticker, 'symbol');
-        // const change = this.safeString (ticker, 'priceChange'); // this is not ccxt's change because it does high-low instead of last-open
         const lastQty = this.safeString(ticker, 'lastQty');
         // in spot markets, lastQty is not present
         // it's (bad, but) the only way we can check the tickers origin
         const type = (lastQty === undefined) ? 'spot' : 'swap';
-        const symbol = this.safeSymbol(marketId, market, undefined, type);
+        market = this.safeMarket(marketId, market, undefined, type);
+        const symbol = market['symbol'];
         const open = this.safeString(ticker, 'openPrice');
         const high = this.safeString(ticker, 'highPrice');
         const low = this.safeString(ticker, 'lowPrice');
         const close = this.safeString(ticker, 'lastPrice');
         const quoteVolume = this.safeString(ticker, 'quoteVolume');
         const baseVolume = this.safeString(ticker, 'volume');
+        let percentage = undefined;
+        let change = undefined;
+        if (market['swap']) {
+            // right now only swap uses the 24h change, spot will be added soon
+            percentage = this.safeString(ticker, 'priceChangePercent');
+            change = this.safeString(ticker, 'priceChange');
+        }
         // let percentage = this.safeString (ticker, 'priceChangePercent');
         // if (percentage !== undefined) {
         //     percentage = percentage.replace ('%', '');
         // } similarly to change, it's not ccxt's percentage because it does priceChange/open, and priceChange is high-low
+        // const change = this.safeString (ticker, 'priceChange'); // this is not ccxt's change because it does high-low instead of last-open
         const ts = this.safeInteger(ticker, 'closeTime');
         const datetime = this.iso8601(ts);
         const bid = this.safeString(ticker, 'bidPrice');
@@ -1354,8 +1364,8 @@ export default class bingx extends Exchange {
             'close': close,
             'last': undefined,
             'previousClose': undefined,
-            'change': undefined,
-            'percentage': undefined,
+            'change': change,
+            'percentage': percentage,
             'average': undefined,
             'baseVolume': baseVolume,
             'quoteVolume': quoteVolume,
@@ -2206,6 +2216,7 @@ export default class bingx extends Exchange {
          * @method
          * @name bingx#cancelAllOrders
          * @description cancel all open orders
+         * @see https://bingx-api.github.io/docs/#/en-us/spot/trade-api.html#Cancel%20orders%20by%20symbol
          * @see https://bingx-api.github.io/docs/#/swapV2/trade-api.html#Cancel%20All%20Orders
          * @param {string} [symbol] unified market symbol, only orders in the market of this symbol are cancelled when symbol is not undefined
          * @param {object} [params] extra parameters specific to the exchange API endpoint
@@ -2216,42 +2227,70 @@ export default class bingx extends Exchange {
         }
         await this.loadMarkets();
         const market = this.market(symbol);
-        if (market['type'] !== 'swap') {
-            throw new BadRequest(this.id + ' cancelAllOrders is only supported for swap markets.');
-        }
         const request = {
             'symbol': market['id'],
         };
-        const response = await this.swapV2PrivateDeleteTradeAllOpenOrders(this.extend(request, params));
-        //
-        //    {
-        //        "code": 0,
-        //        "msg": "",
-        //        "data": {
-        //          "success": [
-        //            {
-        //              "symbol": "LINK-USDT",
-        //              "orderId": 1597783835095859200,
-        //              "side": "BUY",
-        //              "positionSide": "LONG",
-        //              "type": "TRIGGER_LIMIT",
-        //              "origQty": "5.0",
-        //              "price": "9.0000",
-        //              "executedQty": "0.0",
-        //              "avgPrice": "0.0000",
-        //              "cumQuote": "0",
-        //              "stopPrice": "9.5000",
-        //              "profit": "",
-        //              "commission": "",
-        //              "status": "NEW",
-        //              "time": 1669776326000,
-        //              "updateTime": 1669776326000
-        //            }
-        //          ],
-        //          "failed": null
-        //        }
-        //    }
-        //
+        let response = undefined;
+        if (market['spot']) {
+            response = await this.spotV1PrivatePostTradeCancelOpenOrders(this.extend(request, params));
+            //
+            //     {
+            //         "code": 0,
+            //         "msg": "",
+            //         "debugMsg": "",
+            //         "data": {
+            //             "orders": [{
+            //                 "symbol": "ADA-USDT",
+            //                 "orderId": 1740659971369992192,
+            //                 "transactTime": 1703840651730,
+            //                 "price": 5,
+            //                 "stopPrice": 0,
+            //                 "origQty": 10,
+            //                 "executedQty": 0,
+            //                 "cummulativeQuoteQty": 0,
+            //                 "status": "CANCELED",
+            //                 "type": "LIMIT",
+            //                 "side": "SELL"
+            //             }]
+            //         }
+            //     }
+            //
+        }
+        else if (market['swap']) {
+            response = await this.swapV2PrivateDeleteTradeAllOpenOrders(this.extend(request, params));
+            //
+            //    {
+            //        "code": 0,
+            //        "msg": "",
+            //        "data": {
+            //          "success": [
+            //            {
+            //              "symbol": "LINK-USDT",
+            //              "orderId": 1597783835095859200,
+            //              "side": "BUY",
+            //              "positionSide": "LONG",
+            //              "type": "TRIGGER_LIMIT",
+            //              "origQty": "5.0",
+            //              "price": "9.0000",
+            //              "executedQty": "0.0",
+            //              "avgPrice": "0.0000",
+            //              "cumQuote": "0",
+            //              "stopPrice": "9.5000",
+            //              "profit": "",
+            //              "commission": "",
+            //              "status": "NEW",
+            //              "time": 1669776326000,
+            //              "updateTime": 1669776326000
+            //            }
+            //          ],
+            //          "failed": null
+            //        }
+            //    }
+            //
+        }
+        else {
+            throw new BadRequest(this.id + ' cancelAllOrders is only supported for spot and swap markets.');
+        }
         return response;
     }
     async cancelOrders(ids, symbol = undefined, params = {}) {

package/js/src/bitget.js

@@ -3224,14 +3224,13 @@ export default class bitget extends Exchange {
         //         "1399132.341"
         //     ]
         //
-        const volumeIndex = (market['inverse']) ? 6 : 5;
         return [
             this.safeInteger(ohlcv, 0),
             this.safeNumber(ohlcv, 1),
             this.safeNumber(ohlcv, 2),
             this.safeNumber(ohlcv, 3),
             this.safeNumber(ohlcv, 4),
-            this.safeNumber(ohlcv, volumeIndex),
+            this.safeNumber(ohlcv, 5),
         ];
     }
     async fetchOHLCV(symbol, timeframe = '1m', since = undefined, limit = undefined, params = {}) {
@@ -3539,10 +3538,16 @@ export default class bitget extends Exchange {
                 // Use transferable instead of available for swap and margin https://github.com/ccxt/ccxt/pull/19127
                 const spotAccountFree = this.safeString(entry, 'available');
                 const contractAccountFree = this.safeString(entry, 'maxTransferOut');
-                account['free'] = (contractAccountFree !== undefined) ? contractAccountFree : spotAccountFree;
-                const frozen = this.safeString(entry, 'frozen');
-                const locked = this.safeString(entry, 'locked');
-                account['used'] = Precise.stringAdd(frozen, locked);
+                if (contractAccountFree !== undefined) {
+                    account['free'] = contractAccountFree;
+                    account['total'] = this.safeString(entry, 'accountEquity');
+                }
+                else {
+                    account['free'] = spotAccountFree;
+                    const frozen = this.safeString(entry, 'frozen');
+                    const locked = this.safeString(entry, 'locked');
+                    account['used'] = Precise.stringAdd(frozen, locked);
+                }
             }
             result[code] = account;
         }