ccxt 4.0.107 → 4.0.109

package/dist/cjs/src/bitmart.js

@@ -1948,7 +1948,7 @@ class bitmart extends bitmart$1 {
         //        "updateTime" : 1681701559408
         //    }
         //
-        // swap: fetchOpenOrders
+        // swap: fetchOrder, fetchOpenOrders
         //
         //     {
         //         "order_id": "230935812485489",
@@ -2491,29 +2491,95 @@ class bitmart extends bitmart$1 {
         /**
          * @method
          * @name bitmart#fetchOrder
+         * @description fetches information on an order made by the user
          * @see https://developer-pro.bitmart.com/en/spot/#query-order-by-id-v4-signed
          * @see https://developer-pro.bitmart.com/en/spot/#query-order-by-clientorderid-v4-signed
-         * @description fetches information on an order made by the user
+         * @see https://developer-pro.bitmart.com/en/futures/#get-order-detail-keyed
+         * @param {string} id the id of the order
          * @param {string} symbol unified symbol of the market the order was made in
          * @param {object} [params] extra parameters specific to the bitmart api endpoint
-         * @param {string} [params.clientOrderId] fetch the order by client order id instead of order id
+         * @param {string} [params.clientOrderId] *spot* fetch the order by client order id instead of order id
          * @returns {object} An [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
          */
         await this.loadMarkets();
         const request = {};
-        const clientOrderId = this.safeString(params, 'clientOrderId');
-        if (!clientOrderId) {
-            request['orderId'] = id;
-        }
+        let type = undefined;
+        let market = undefined;
         let response = undefined;
-        if (clientOrderId !== undefined) {
-            response = await this.privatePostSpotV4QueryClientOrder(this.extend(request, params));
+        if (symbol !== undefined) {
+            market = this.market(symbol);
         }
-        else {
-            response = await this.privatePostSpotV4QueryOrder(this.extend(request, params));
+        [type, params] = this.handleMarketTypeAndParams('fetchOrder', market, params);
+        if (type === 'spot') {
+            const clientOrderId = this.safeString(params, 'clientOrderId');
+            if (!clientOrderId) {
+                request['orderId'] = id;
+            }
+            if (clientOrderId !== undefined) {
+                response = await this.privatePostSpotV4QueryClientOrder(this.extend(request, params));
+            }
+            else {
+                response = await this.privatePostSpotV4QueryOrder(this.extend(request, params));
+            }
         }
+        else if (type === 'swap') {
+            this.checkRequiredSymbol('fetchOrder', symbol);
+            request['symbol'] = market['id'];
+            request['order_id'] = id;
+            response = await this.privateGetContractPrivateOrder(this.extend(request, params));
+        }
+        //
+        // spot
+        //
+        //     {
+        //         "code": 1000,
+        //         "message": "success",
+        //         "data": {
+        //             "orderId": "183347420821295423",
+        //             "clientOrderId": "183347420821295423",
+        //             "symbol": "BTC_USDT",
+        //             "side": "buy",
+        //             "orderMode": "spot",
+        //             "type": "limit",
+        //             "state": "new",
+        //             "price": "24000.00",
+        //             "priceAvg": "0.00",
+        //             "size": "0.00022",
+        //             "filledSize": "0.00000",
+        //             "notional": "5.28000000",
+        //             "filledNotional": "0.00000000",
+        //             "createTime": 1695783014734,
+        //             "updateTime": 1695783014762
+        //         },
+        //         "trace": "ce3e6422c8b44d5fag855348a68693ed.63.14957831547451715"
+        //     }
+        //
+        // swap
+        //
+        //     {
+        //         "code": 1000,
+        //         "message": "Ok",
+        //         "data": {
+        //             "order_id": "230927283405028",
+        //             "client_order_id": "",
+        //             "price": "23000",
+        //             "size": "1",
+        //             "symbol": "BTCUSDT",
+        //             "state": 2,
+        //             "side": 1,
+        //             "type": "limit",
+        //             "leverage": "10",
+        //             "open_type": "isolated",
+        //             "deal_avg_price": "0",
+        //             "deal_size": "0",
+        //             "create_time": 1695783433600,
+        //             "update_time": 1695783433613
+        //         },
+        //         "trace": "4cad855075664097af6ba5257c47605d.63.14957831547451715"
+        //     }
+        //
         const data = this.safeValue(response, 'data', {});
-        return this.parseOrder(data, undefined);
+        return this.parseOrder(data, market);
     }
     async fetchDepositAddress(code, params = {}) {
         /**

package/dist/cjs/src/exmo.js

@@ -1748,11 +1748,11 @@ class exmo extends exmo$1 {
             const marketIds = Object.keys(response);
             for (let i = 0; i < marketIds.length; i++) {
                 const marketId = marketIds[i];
-                const market = this.safeMarket(marketId);
+                const marketInner = this.safeMarket(marketId);
                 params = this.extend(params, {
                     'status': 'open',
                 });
-                const parsedOrders = this.parseOrders(response[marketId], market, since, limit, params);
+                const parsedOrders = this.parseOrders(response[marketId], marketInner, since, limit, params);
                 orders = this.arrayConcat(orders, parsedOrders);
             }
         }
@@ -1955,8 +1955,8 @@ class exmo extends exmo$1 {
         }
         const isSpot = (marginMode !== 'isolated');
         if (symbol !== undefined) {
-            const market = this.market(symbol);
-            symbol = market['symbol'];
+            const marketInner = this.market(symbol);
+            symbol = marketInner['symbol'];
         }
         const request = {
             'limit': limit,
@@ -1990,7 +1990,7 @@ class exmo extends exmo$1 {
             return this.parseOrders(response, market, since, limit, params);
         }
         else {
-            const response = await this.privatePostMarginUserOrderHistory(this.extend(request, params));
+            const responseSwap = await this.privatePostMarginUserOrderHistory(this.extend(request, params));
             //
             //    {
             //        "items": [
@@ -2015,7 +2015,7 @@ class exmo extends exmo$1 {
             //        ]
             //    }
             //
-            const items = this.safeValue(response, 'items');
+            const items = this.safeValue(responseSwap, 'items');
             const orders = this.parseOrders(items, market, since, limit, params);
             const result = [];
             for (let i = 0; i < orders.length; i++) {

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

@@ -146,11 +146,11 @@ class bitget extends bitget$1 {
         const topics = [];
         for (let i = 0; i < marketIds.length; i++) {
             const marketId = marketIds[i];
-            const market = this.market(marketId);
+            const marketInner = this.market(marketId);
             const args = {
                 'instType': instType,
                 'channel': 'ticker',
-                'instId': this.getWsMarketId(market),
+                'instId': this.getWsMarketId(marketInner),
             };
             topics.push(args);
         }
@@ -190,12 +190,12 @@ class bitget extends bitget$1 {
         // watchTickers part
         const messageHashes = this.findMessageHashes(client, 'tickers::');
         for (let i = 0; i < messageHashes.length; i++) {
-            const messageHash = messageHashes[i];
-            const parts = messageHash.split('::');
+            const messageHashTicker = messageHashes[i];
+            const parts = messageHashTicker.split('::');
             const symbolsString = parts[1];
             const symbols = symbolsString.split(',');
             if (this.inArray(symbol, symbols)) {
-                client.resolve(ticker, messageHash);
+                client.resolve(ticker, messageHashTicker);
             }
         }
         return message;

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

@@ -345,12 +345,12 @@ class bybit extends bybit$1 {
         // watchTickers part
         const messageHashes = this.findMessageHashes(client, 'tickers::');
         for (let i = 0; i < messageHashes.length; i++) {
-            const messageHash = messageHashes[i];
-            const parts = messageHash.split('::');
+            const messageHashTicker = messageHashes[i];
+            const parts = messageHashTicker.split('::');
             const symbolsString = parts[1];
             const symbols = symbolsString.split(',');
             if (this.inArray(parsed['symbol'], symbols)) {
-                client.resolve(parsed, messageHash);
+                client.resolve(parsed, messageHashTicker);
             }
         }
     }

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

@@ -13,7 +13,7 @@ class woo extends woo$1 {
         return this.deepExtend(super.describe(), {
             'has': {
                 'ws': true,
-                'watchBalance': false,
+                'watchBalance': true,
                 'watchMyTrades': false,
                 'watchOHLCV': true,
                 'watchOrderBook': true,
@@ -604,6 +604,73 @@ class woo extends woo$1 {
             client.resolve(this.orders, messageHashSymbol);
         }
     }
+    async watchBalance(params = {}) {
+        /**
+         * @method
+         * @see https://docs.woo.org/#balance
+         * @name woo#watchBalance
+         * @description watch balance and get the amount of funds available for trading or funds locked in orders
+         * @param {object} [params] extra parameters specific to the woo api endpoint
+         * @returns {object} a [balance structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#balance-structure}
+         */
+        await this.loadMarkets();
+        const topic = 'balance';
+        const messageHash = topic;
+        const request = {
+            'event': 'subscribe',
+            'topic': topic,
+        };
+        const message = this.extend(request, params);
+        return await this.watchPrivate(messageHash, message);
+    }
+    handleBalance(client, message) {
+        //
+        //   {
+        //       "topic": "balance",
+        //       "ts": 1695716888789,
+        //       "data": {
+        //          "balances": {
+        //             "USDT": {
+        //                "holding": 266.56059176,
+        //                "frozen": 0,
+        //                "interest": 0,
+        //                "pendingShortQty": 0,
+        //                "pendingExposure": 0,
+        //                "pendingLongQty": 0,
+        //                "pendingLongExposure": 0,
+        //                "version": 37,
+        //                "staked": 0,
+        //                "unbonding": 0,
+        //                "vault": 0,
+        //                "averageOpenPrice": 0,
+        //                "pnl24H": 0,
+        //                "fee24H": 0,
+        //                "markPrice": 1,
+        //                "pnl24HPercentage": 0
+        //             }
+        //          }
+        //
+        //    }
+        //
+        const data = this.safeValue(message, 'data');
+        const balances = this.safeValue(data, 'balances');
+        const keys = Object.keys(balances);
+        const ts = this.safeInteger(message, 'ts');
+        this.balance['info'] = data;
+        this.balance['timestamp'] = ts;
+        this.balance['datetime'] = this.iso8601(ts);
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i];
+            const value = balances[key];
+            const code = this.safeCurrencyCode(key);
+            const account = (code in this.balance) ? this.balance[code] : this.account();
+            account['total'] = this.safeString(value, 'holding');
+            account['used'] = this.safeString(value, 'frozen');
+            this.balance[code] = account;
+        }
+        this.balance = this.safeBalance(this.balance);
+        client.resolve(this.balance, 'balance');
+    }
     handleMessage(client, message) {
         const methods = {
             'ping': this.handlePing,
@@ -616,6 +683,7 @@ class woo extends woo$1 {
             'auth': this.handleAuth,
             'executionreport': this.handleOrderUpdate,
             'trade': this.handleTrade,
+            'balance': this.handleBalance,
         };
         const event = this.safeString(message, 'event');
         let method = this.safeValue(methods, event);

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 { Market, Trade, Fee, Ticker, OrderBook, Order, Transaction, Tickers, Currency, Balance, DepositAddress, WithdrawalResponse, DepositAddressResponse, OHLCV, Balances, PartialBalances, Dictionary, MinMax, Position } 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.0.106";
+declare const version = "4.0.108";
 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.0.107';
+const version = '4.0.109';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

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

@@ -74,11 +74,7 @@ interface Exchange {
     sapiGetFiatOrders(params?: {}): Promise<implicitReturnType>;
     sapiGetFiatPayments(params?: {}): Promise<implicitReturnType>;
     sapiGetFuturesTransfer(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanBorrowHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanRepayHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanWallet(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanAdjustCollateralHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanLiquidationHistory(params?: {}): Promise<implicitReturnType>;
+    sapiGetFuturesHistDataLink(params?: {}): Promise<implicitReturnType>;
     sapiGetRebateTaxQuery(params?: {}): Promise<implicitReturnType>;
     sapiGetCapitalConfigGetall(params?: {}): Promise<implicitReturnType>;
     sapiGetCapitalDepositAddress(params?: {}): Promise<implicitReturnType>;
@@ -442,6 +438,7 @@ interface Exchange {
     fapiPublicGetMarkPriceKlines(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetIndexPriceKlines(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetFundingRate(params?: {}): Promise<implicitReturnType>;
+    fapiPublicGetFundingInfo(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetPremiumIndex(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetTicker24hr(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetTickerPrice(params?: {}): Promise<implicitReturnType>;

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

@@ -74,11 +74,7 @@ interface binance {
     sapiGetFiatOrders(params?: {}): Promise<implicitReturnType>;
     sapiGetFiatPayments(params?: {}): Promise<implicitReturnType>;
     sapiGetFuturesTransfer(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanBorrowHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanRepayHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanWallet(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanAdjustCollateralHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanLiquidationHistory(params?: {}): Promise<implicitReturnType>;
+    sapiGetFuturesHistDataLink(params?: {}): Promise<implicitReturnType>;
     sapiGetRebateTaxQuery(params?: {}): Promise<implicitReturnType>;
     sapiGetCapitalConfigGetall(params?: {}): Promise<implicitReturnType>;
     sapiGetCapitalDepositAddress(params?: {}): Promise<implicitReturnType>;
@@ -442,6 +438,7 @@ interface binance {
     fapiPublicGetMarkPriceKlines(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetIndexPriceKlines(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetFundingRate(params?: {}): Promise<implicitReturnType>;
+    fapiPublicGetFundingInfo(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetPremiumIndex(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetTicker24hr(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetTickerPrice(params?: {}): Promise<implicitReturnType>;

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

@@ -74,11 +74,7 @@ interface binance {
     sapiGetFiatOrders(params?: {}): Promise<implicitReturnType>;
     sapiGetFiatPayments(params?: {}): Promise<implicitReturnType>;
     sapiGetFuturesTransfer(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanBorrowHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanRepayHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanWallet(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanAdjustCollateralHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanLiquidationHistory(params?: {}): Promise<implicitReturnType>;
+    sapiGetFuturesHistDataLink(params?: {}): Promise<implicitReturnType>;
     sapiGetRebateTaxQuery(params?: {}): Promise<implicitReturnType>;
     sapiGetCapitalConfigGetall(params?: {}): Promise<implicitReturnType>;
     sapiGetCapitalDepositAddress(params?: {}): Promise<implicitReturnType>;
@@ -442,6 +438,7 @@ interface binance {
     fapiPublicGetMarkPriceKlines(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetIndexPriceKlines(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetFundingRate(params?: {}): Promise<implicitReturnType>;
+    fapiPublicGetFundingInfo(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetPremiumIndex(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetTicker24hr(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetTickerPrice(params?: {}): Promise<implicitReturnType>;

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

@@ -74,11 +74,7 @@ interface binance {
     sapiGetFiatOrders(params?: {}): Promise<implicitReturnType>;
     sapiGetFiatPayments(params?: {}): Promise<implicitReturnType>;
     sapiGetFuturesTransfer(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanBorrowHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanRepayHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanWallet(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanAdjustCollateralHistory(params?: {}): Promise<implicitReturnType>;
-    sapiGetFuturesLoanLiquidationHistory(params?: {}): Promise<implicitReturnType>;
+    sapiGetFuturesHistDataLink(params?: {}): Promise<implicitReturnType>;
     sapiGetRebateTaxQuery(params?: {}): Promise<implicitReturnType>;
     sapiGetCapitalConfigGetall(params?: {}): Promise<implicitReturnType>;
     sapiGetCapitalDepositAddress(params?: {}): Promise<implicitReturnType>;
@@ -442,6 +438,7 @@ interface binance {
     fapiPublicGetMarkPriceKlines(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetIndexPriceKlines(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetFundingRate(params?: {}): Promise<implicitReturnType>;
+    fapiPublicGetFundingInfo(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetPremiumIndex(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetTicker24hr(params?: {}): Promise<implicitReturnType>;
     fapiPublicGetTickerPrice(params?: {}): Promise<implicitReturnType>;

package/js/src/base/Exchange.d.ts

@@ -255,7 +255,7 @@ export default class Exchange {
     urlencodeNested: (object: any) => string;
     parseDate: (x: any) => number;
     ymd: (timestamp: any, infix: any, fullYear?: boolean) => string;
-    isArray: (arg: any) => arg is any[];
+    isArray: (needle: any, haystack: any) => any;
     base64ToString: (string: any) => string;
     crc32: typeof functions.crc32;
     describe(): {

package/js/src/base/Exchange.js

@@ -7,7 +7,8 @@
 // ----------------------------------------------------------------------------
 /* eslint-disable */
 import * as functions from './functions.js';
-const { isNode, keys, values, deepExtend, extend, clone, flatten, unique, indexBy, sortBy, sortBy2, safeFloat2, groupBy, aggregate, uuid, unCamelCase, precisionFromString, Throttler, capitalize, now, decimalToPrecision, safeValue, safeValue2, safeString, safeString2, seconds, milliseconds, binaryToBase16, numberToBE, base16ToBinary, iso8601, omit, isJsonEncodedObject, safeInteger, sum, omitZero, implodeParams, extractParams, json, vwap, merge, binaryConcat, hash, ecdsa, arrayConcat, encode, urlencode, hmac, numberToString, parseTimeframe, safeInteger2, safeStringLower, parse8601, yyyymmdd, safeStringUpper, safeTimestamp, binaryConcatArray, uuidv1, numberToLE, ymdhms, stringToBase64, decode, uuid22, safeIntegerProduct2, safeIntegerProduct, safeStringLower2, yymmdd, base58ToBinary, binaryToBase58, safeTimestamp2, rawencode, keysort, inArray, isEmpty, ordered, filterBy, uuid16, safeFloat, base64ToBinary, safeStringUpper2, urlencodeWithArrayRepeat, microseconds, binaryToBase64, strip, toArray, safeFloatN, safeIntegerN, safeIntegerProductN, safeTimestampN, safeValueN, safeStringN, safeStringLowerN, safeStringUpperN, urlencodeNested, parseDate, ymd, isArray, base64ToString, crc32, TRUNCATE, ROUND, DECIMAL_PLACES, NO_PADDING, TICK_SIZE, SIGNIFICANT_DIGITS } = functions;
+const { isNode, deepExtend, extend, clone, flatten, unique, indexBy, sortBy, sortBy2, safeFloat2, groupBy, aggregate, uuid, unCamelCase, precisionFromString, Throttler, capitalize, now, decimalToPrecision, safeValue, safeValue2, safeString, safeString2, seconds, milliseconds, binaryToBase16, numberToBE, base16ToBinary, iso8601, omit, isJsonEncodedObject, safeInteger, sum, omitZero, implodeParams, extractParams, json, merge, binaryConcat, hash, ecdsa, arrayConcat, encode, urlencode, hmac, numberToString, parseTimeframe, safeInteger2, safeStringLower, parse8601, yyyymmdd, safeStringUpper, safeTimestamp, binaryConcatArray, uuidv1, numberToLE, ymdhms, stringToBase64, decode, uuid22, safeIntegerProduct2, safeIntegerProduct, safeStringLower2, yymmdd, base58ToBinary, binaryToBase58, safeTimestamp2, rawencode, keysort, inArray, isEmpty, ordered, filterBy, uuid16, safeFloat, base64ToBinary, safeStringUpper2, urlencodeWithArrayRepeat, microseconds, binaryToBase64, strip, toArray, safeFloatN, safeIntegerN, safeIntegerProductN, safeTimestampN, safeValueN, safeStringN, safeStringLowerN, safeStringUpperN, urlencodeNested, parseDate, ymd, base64ToString, crc32, TRUNCATE, ROUND, DECIMAL_PLACES, NO_PADDING, TICK_SIZE, SIGNIFICANT_DIGITS } = functions;
+import { keys as keysFunc, values as valuesFunc, inArray as inArrayFunc, vwap as vwapFunc } from './functions.js';
 // import exceptions from "./errors.js"
 import { // eslint-disable-line object-curly-newline
 ExchangeError, BadSymbol, NullResponse, InvalidAddress, InvalidOrder, NotSupported, BadResponse, AuthenticationError, DDoSProtection, RequestTimeout, NetworkError, ExchangeNotAvailable, ArgumentsRequired, RateLimitExceeded, BadRequest } from "./errors.js";
@@ -99,8 +100,8 @@ export default class Exchange {
         this.streaming = {};
         this.deepExtend = deepExtend;
         this.isNode = isNode;
-        this.keys = keys;
-        this.values = values;
+        this.keys = keysFunc;
+        this.values = valuesFunc;
         this.extend = extend;
         this.clone = clone;
         this.flatten = flatten;
@@ -136,7 +137,7 @@ export default class Exchange {
         this.implodeParams = implodeParams;
         this.extractParams = extractParams;
         this.json = json;
-        this.vwap = vwap;
+        this.vwap = vwapFunc;
         this.merge = merge;
         this.binaryConcat = binaryConcat;
         this.hash = hash;
@@ -191,7 +192,7 @@ export default class Exchange {
         this.urlencodeNested = urlencodeNested;
         this.parseDate = parseDate;
         this.ymd = ymd;
-        this.isArray = isArray;
+        this.isArray = inArrayFunc;
         this.base64ToString = base64ToString;
         this.crc32 = crc32;
         Object.assign(this, functions);
@@ -1837,12 +1838,12 @@ export default class Exchange {
             entry['amount'] = this.safeNumber(entry, 'amount');
             entry['price'] = this.safeNumber(entry, 'price');
             entry['cost'] = this.safeNumber(entry, 'cost');
-            const fee = this.safeValue(entry, 'fee', {});
-            fee['cost'] = this.safeNumber(fee, 'cost');
-            if ('rate' in fee) {
-                fee['rate'] = this.safeNumber(fee, 'rate');
+            const tradeFee = this.safeValue(entry, 'fee', {});
+            tradeFee['cost'] = this.safeNumber(tradeFee, 'cost');
+            if ('rate' in tradeFee) {
+                tradeFee['rate'] = this.safeNumber(tradeFee, 'rate');
             }
-            entry['fee'] = fee;
+            entry['fee'] = tradeFee;
         }
         let timeInForce = this.safeString(order, 'timeInForce');
         let postOnly = this.safeValue(order, 'postOnly');
@@ -2901,9 +2902,9 @@ export default class Exchange {
                     }
                     const inferredMarketType = (marketType === undefined) ? market['type'] : marketType;
                     for (let i = 0; i < markets.length; i++) {
-                        const market = markets[i];
-                        if (market[inferredMarketType]) {
-                            return market;
+                        const currentMarket = markets[i];
+                        if (currentMarket[inferredMarketType]) {
+                            return currentMarket;
                         }
                     }
                 }

package/js/src/binance.js

@@ -271,11 +271,7 @@ export default class binance extends Exchange {
                         'fiat/orders': 600.03,
                         'fiat/payments': 0.1,
                         'futures/transfer': 1,
-                        'futures/loan/borrow/history': 1,
-                        'futures/loan/repay/history': 1,
-                        'futures/loan/wallet': 1,
-                        'futures/loan/adjustCollateral/history': 1,
-                        'futures/loan/liquidationHistory': 1,
+                        'futures/histDataLink': 0.1,
                         'rebate/taxQuery': 80.004,
                         // https://binance-docs.github.io/apidocs/spot/en/#withdraw-sapi
                         'capital/config/getall': 1,
@@ -719,6 +715,7 @@ export default class binance extends Exchange {
                         'markPriceKlines': { 'cost': 1, 'byLimit': [[99, 1], [499, 2], [1000, 5], [10000, 10]] },
                         'indexPriceKlines': { 'cost': 1, 'byLimit': [[99, 1], [499, 2], [1000, 5], [10000, 10]] },
                         'fundingRate': 1,
+                        'fundingInfo': 1,
                         'premiumIndex': 1,
                         'ticker/24hr': { 'cost': 1, 'noSymbol': 40 },
                         'ticker/price': { 'cost': 1, 'noSymbol': 2 },
@@ -8381,9 +8378,9 @@ export default class binance extends Exchange {
             const numElements = response.length;
             if (numElements > 0) {
                 const firstElement = response[0];
-                const error = this.safeString(firstElement, 'code');
-                if (error !== undefined) {
-                    this.throwExactlyMatchedException(this.exceptions['exact'], error, this.id + ' ' + body);
+                const errorCode = this.safeString(firstElement, 'code');
+                if (errorCode !== undefined) {
+                    this.throwExactlyMatchedException(this.exceptions['exact'], errorCode, this.id + ' ' + body);
                 }
             }
         }

package/js/src/bitfinex2.js

@@ -2607,9 +2607,6 @@ export default class bitfinex2 extends Exchange {
         else if (type.indexOf('fee') >= 0 || type.indexOf('charged') >= 0) {
             return 'fee';
         }
-        else if (type.indexOf('exchange') >= 0 || type.indexOf('position') >= 0) {
-            return 'trade';
-        }
         else if (type.indexOf('rebate') >= 0) {
             return 'rebate';
         }
@@ -2622,6 +2619,9 @@ export default class bitfinex2 extends Exchange {
         else if (type.indexOf('payment') >= 0) {
             return 'payout';
         }
+        else if (type.indexOf('exchange') >= 0 || type.indexOf('position') >= 0) {
+            return 'trade';
+        }
         else {
             return type;
         }