ccxt 4.2.34 → 4.2.35

package/dist/cjs/ccxt.js

@@ -176,7 +176,7 @@ var woo$1 = require('./src/pro/woo.js');
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.2.34';
+const version = '4.2.35';
 Exchange["default"].ccxtVersion = version;
 const exchanges = {
     'ace': ace,

package/dist/cjs/src/base/Exchange.js

@@ -1069,9 +1069,9 @@ class Exchange {
     }
     handleMessage(client, message) { } // stub to override
     // ping (client) {} // stub to override
-    ping(client) {
-        return undefined;
-    }
+    // ping (client) {
+    //     return undefined;
+    // }
     client(url) {
         this.clients = this.clients || {};
         if (!this.clients[url]) {
@@ -1451,6 +1451,9 @@ class Exchange {
          * @returns {object | undefined}
          */
         const value = this.safeValueN(dictionaryOrList, keys, defaultValue);
+        if (value === undefined) {
+            return defaultValue;
+        }
         if (typeof value === 'object') {
             return value;
         }
@@ -1482,6 +1485,9 @@ class Exchange {
          * @returns {Array | undefined}
          */
         const value = this.safeValueN(dictionaryOrList, keys, defaultValue);
+        if (value === undefined) {
+            return defaultValue;
+        }
         if (Array.isArray(value)) {
             return value;
         }
@@ -5281,7 +5287,8 @@ class Exchange {
                 errors = 0;
                 const responseLength = response.length;
                 if (this.verbose) {
-                    const cursorMessage = 'Cursor pagination call ' + i + 1 + ' method ' + method + ' response length ' + responseLength + ' cursor ' + cursorValue;
+                    const iteration = (i + 1).toString();
+                    const cursorMessage = 'Cursor pagination call ' + iteration + ' method ' + method + ' response length ' + responseLength.toString() + ' cursor ' + cursorValue;
                     this.log(cursorMessage);
                 }
                 if (responseLength === 0) {
@@ -5326,7 +5333,8 @@ class Exchange {
                 errors = 0;
                 const responseLength = response.length;
                 if (this.verbose) {
-                    const incrementalMessage = 'Incremental pagination call ' + i + 1 + ' method ' + method + ' response length ' + responseLength;
+                    const iteration = (i + 1).toString();
+                    const incrementalMessage = 'Incremental pagination call ' + iteration + ' method ' + method + ' response length ' + responseLength.toString();
                     this.log(incrementalMessage);
                 }
                 if (responseLength === 0) {

package/dist/cjs/src/binance.js

@@ -3143,9 +3143,24 @@ class binance extends binance$1 {
         let timestamp = undefined;
         const isolated = marginMode === 'isolated';
         const cross = (type === 'margin') || (marginMode === 'cross');
-        if (!isolated && ((type === 'spot') || cross)) {
+        if (type === 'papi') {
+            for (let i = 0; i < response.length; i++) {
+                const entry = response[i];
+                const account = this.account();
+                const currencyId = this.safeString(entry, 'asset');
+                const code = this.safeCurrencyCode(currencyId);
+                const borrowed = this.safeString(entry, 'crossMarginBorrowed');
+                const interest = this.safeString(entry, 'crossMarginInterest');
+                account['free'] = this.safeString(entry, 'crossMarginFree');
+                account['used'] = this.safeString(entry, 'crossMarginLocked');
+                account['total'] = this.safeString(entry, 'crossMarginAsset');
+                account['debt'] = Precise["default"].stringAdd(borrowed, interest);
+                result[code] = account;
+            }
+        }
+        else if (!isolated && ((type === 'spot') || cross)) {
             timestamp = this.safeInteger(response, 'updateTime');
-            const balances = this.safeValue2(response, 'balances', 'userAssets', []);
+            const balances = this.safeList2(response, 'balances', 'userAssets', []);
             for (let i = 0; i < balances.length; i++) {
                 const balance = balances[i];
                 const currencyId = this.safeString(balance, 'asset');
@@ -3162,13 +3177,13 @@ class binance extends binance$1 {
             }
         }
         else if (isolated) {
-            const assets = this.safeValue(response, 'assets');
+            const assets = this.safeList(response, 'assets');
             for (let i = 0; i < assets.length; i++) {
                 const asset = assets[i];
-                const marketId = this.safeValue(asset, 'symbol');
+                const marketId = this.safeString(asset, 'symbol');
                 const symbol = this.safeSymbol(marketId, undefined, undefined, 'spot');
-                const base = this.safeValue(asset, 'baseAsset', {});
-                const quote = this.safeValue(asset, 'quoteAsset', {});
+                const base = this.safeDict(asset, 'baseAsset', {});
+                const quote = this.safeDict(asset, 'quoteAsset', {});
                 const baseCode = this.safeCurrencyCode(this.safeString(base, 'asset'));
                 const quoteCode = this.safeCurrencyCode(this.safeString(quote, 'asset'));
                 const subResult = {};
@@ -3178,7 +3193,7 @@ class binance extends binance$1 {
             }
         }
         else if (type === 'savings') {
-            const positionAmountVos = this.safeValue(response, 'positionAmountVos', []);
+            const positionAmountVos = this.safeList(response, 'positionAmountVos', []);
             for (let i = 0; i < positionAmountVos.length; i++) {
                 const entry = positionAmountVos[i];
                 const currencyId = this.safeString(entry, 'asset');
@@ -3207,7 +3222,7 @@ class binance extends binance$1 {
         else {
             let balances = response;
             if (!Array.isArray(response)) {
-                balances = this.safeValue(response, 'assets', []);
+                balances = this.safeList(response, 'assets', []);
             }
             for (let i = 0; i < balances.length; i++) {
                 const balance = balances[i];
@@ -3237,10 +3252,12 @@ class binance extends binance$1 {
          * @see https://binance-docs.github.io/apidocs/futures/en/#account-information-v2-user_data            // swap
          * @see https://binance-docs.github.io/apidocs/delivery/en/#account-information-user_data              // future
          * @see https://binance-docs.github.io/apidocs/voptions/en/#option-account-information-trade           // option
+         * @see https://binance-docs.github.io/apidocs/pm/en/#account-balance-user_data                        // portfolio margin
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @param {string} [params.type] 'future', 'delivery', 'savings', 'funding', or 'spot'
+         * @param {string} [params.type] 'future', 'delivery', 'savings', 'funding', or 'spot' or 'papi'
          * @param {string} [params.marginMode] 'cross' or 'isolated', for margin trading, uses this.options.defaultMarginMode if not passed, defaults to undefined/None/null
          * @param {string[]|undefined} [params.symbols] unified market symbols, only used in isolated margin mode
+         * @param {boolean} [params.portfolioMargin] set to true if you would like to fetch the balance for a portfolio margin account
          * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
          */
         await this.loadMarkets();
@@ -3248,13 +3265,19 @@ class binance extends binance$1 {
         let type = this.safeString(params, 'type', defaultType);
         let subType = undefined;
         [subType, params] = this.handleSubTypeAndParams('fetchBalance', undefined, params);
+        let isPortfolioMargin = undefined;
+        [isPortfolioMargin, params] = this.handleOptionAndParams2(params, 'fetchBalance', 'papi', 'portfolioMargin', false);
         let marginMode = undefined;
         let query = undefined;
         [marginMode, query] = this.handleMarginModeAndParams('fetchBalance', params);
         query = this.omit(query, 'type');
         let response = undefined;
         const request = {};
-        if (this.isLinear(type, subType)) {
+        if (isPortfolioMargin || (type === 'papi')) {
+            type = 'papi';
+            response = await this.papiGetBalance(this.extend(request, query));
+        }
+        else if (this.isLinear(type, subType)) {
             type = 'linear';
             response = await this.fapiPrivateV2GetAccount(this.extend(request, query));
         }
@@ -3263,7 +3286,7 @@ class binance extends binance$1 {
             response = await this.dapiPrivateGetAccount(this.extend(request, query));
         }
         else if (marginMode === 'isolated') {
-            const paramSymbols = this.safeValue(params, 'symbols');
+            const paramSymbols = this.safeList(params, 'symbols');
             query = this.omit(query, 'symbols');
             if (paramSymbols !== undefined) {
                 let symbols = '';
@@ -3479,6 +3502,26 @@ class binance extends binance$1 {
         //       }
         //     ]
         //
+        // portfolio margin
+        //
+        //     [
+        //         {
+        //             "asset": "USDT",
+        //             "totalWalletBalance": "66.9923261",
+        //             "crossMarginAsset": "35.9697141",
+        //             "crossMarginBorrowed": "0.0",
+        //             "crossMarginFree": "35.9697141",
+        //             "crossMarginInterest": "0.0",
+        //             "crossMarginLocked": "0.0",
+        //             "umWalletBalance": "31.022612",
+        //             "umUnrealizedPNL": "0.0",
+        //             "cmWalletBalance": "0.0",
+        //             "cmUnrealizedPNL": "0.0",
+        //             "updateTime": 0,
+        //             "negativeBalance": "0.0"
+        //         },
+        //     ]
+        //
         return this.parseBalanceCustom(response, type, marginMode);
     }
     async fetchOrderBook(symbol, limit = undefined, params = {}) {

package/dist/cjs/src/bitfinex2.js

@@ -25,11 +25,13 @@ class bitfinex2 extends bitfinex2$1 {
             'has': {
                 'CORS': undefined,
                 'spot': true,
-                'margin': undefined,
+                'margin': true,
                 'swap': true,
                 'future': undefined,
                 'option': undefined,
                 'addMargin': false,
+                'borrowCrossMargin': false,
+                'borrowIsolatedMargin': false,
                 'cancelAllOrders': true,
                 'cancelOrder': true,
                 'cancelOrders': true,
@@ -46,8 +48,13 @@ class bitfinex2 extends bitfinex2$1 {
                 'createTriggerOrder': true,
                 'editOrder': true,
                 'fetchBalance': true,
+                'fetchBorrowInterest': false,
+                'fetchBorrowRateHistories': false,
+                'fetchBorrowRateHistory': false,
                 'fetchClosedOrder': true,
                 'fetchClosedOrders': true,
+                'fetchCrossBorrowRate': false,
+                'fetchCrossBorrowRates': false,
                 'fetchCurrencies': true,
                 'fetchDepositAddress': true,
                 'fetchDepositsWithdrawals': true,
@@ -56,6 +63,8 @@ class bitfinex2 extends bitfinex2$1 {
                 'fetchFundingRateHistory': true,
                 'fetchFundingRates': true,
                 'fetchIndexOHLCV': false,
+                'fetchIsolatedBorrowRate': false,
+                'fetchIsolatedBorrowRates': false,
                 'fetchLedger': true,
                 'fetchLeverage': false,
                 'fetchLeverageTiers': false,
@@ -83,6 +92,8 @@ class bitfinex2 extends bitfinex2$1 {
                 'fetchTransactionFees': undefined,
                 'fetchTransactions': 'emulated',
                 'reduceMargin': false,
+                'repayCrossMargin': false,
+                'repayIsolatedMargin': false,
                 'setLeverage': false,
                 'setMargin': true,
                 'setMarginMode': false,

package/dist/cjs/src/krakenfutures.js

@@ -151,10 +151,32 @@ class krakenfutures extends krakenfutures$1 {
             },
             'fees': {
                 'trading': {
-                    'tierBased': false,
+                    'tierBased': true,
                     'percentage': true,
-                    'maker': this.parseNumber('-0.0002'),
-                    'taker': this.parseNumber('0.00075'),
+                    'taker': this.parseNumber('0.0005'),
+                    'maker': this.parseNumber('0.0002'),
+                    'tiers': {
+                        'taker': [
+                            [this.parseNumber('0'), this.parseNumber('0.0005')],
+                            [this.parseNumber('100000'), this.parseNumber('0.0004')],
+                            [this.parseNumber('1000000'), this.parseNumber('0.0003')],
+                            [this.parseNumber('5000000'), this.parseNumber('0.00025')],
+                            [this.parseNumber('10000000'), this.parseNumber('0.0002')],
+                            [this.parseNumber('20000000'), this.parseNumber('0.00015')],
+                            [this.parseNumber('50000000'), this.parseNumber('0.000125')],
+                            [this.parseNumber('100000000'), this.parseNumber('0.0001')],
+                        ],
+                        'maker': [
+                            [this.parseNumber('0'), this.parseNumber('0.0002')],
+                            [this.parseNumber('100000'), this.parseNumber('0.0015')],
+                            [this.parseNumber('1000000'), this.parseNumber('0.000125')],
+                            [this.parseNumber('5000000'), this.parseNumber('0.0001')],
+                            [this.parseNumber('10000000'), this.parseNumber('0.000075')],
+                            [this.parseNumber('20000000'), this.parseNumber('0.00005')],
+                            [this.parseNumber('50000000'), this.parseNumber('0.000025')],
+                            [this.parseNumber('100000000'), this.parseNumber('0')],
+                        ],
+                    },
                 },
             },
             'exceptions': {

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

@@ -2439,7 +2439,7 @@ class binance extends binance$1 {
         return this.safePosition({
             'info': position,
             'id': undefined,
-            'symbol': this.safeSymbol(marketId, undefined, undefined, 'future'),
+            'symbol': this.safeSymbol(marketId, undefined, undefined, 'contract'),
             'notional': undefined,
             'marginMode': this.safeString(position, 'mt'),
             'liquidationPrice': undefined,
@@ -2593,9 +2593,9 @@ class binance extends binance$1 {
         const messageHash = 'myTrades';
         const executionType = this.safeString(message, 'x');
         if (executionType === 'TRADE') {
-            const trade = this.parseTrade(message);
+            const trade = this.parseWsTrade(message);
             const orderId = this.safeString(trade, 'order');
-            let tradeFee = this.safeValue(trade, 'fee');
+            let tradeFee = this.safeValue(trade, 'fee', {});
             tradeFee = this.extend({}, tradeFee);
             const symbol = this.safeString(trade, 'symbol');
             if (orderId !== undefined && tradeFee !== undefined && symbol !== undefined) {

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.2.33";
+declare const version = "4.2.34";
 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.2.34';
+const version = '4.2.35';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

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

@@ -556,7 +556,6 @@ export default class Exchange {
     indexedOrderBook(snapshot?: {}, depth?: number): IndexedOrderBook;
     countedOrderBook(snapshot?: {}, depth?: number): CountedOrderBook;
     handleMessage(client: any, message: any): void;
-    ping(client: any): any;
     client(url: any): WsClient;
     watchMultiple(url: any, messageHashes: any, message?: any, subscribeHashes?: any, subscription?: any): import("./ws/Future.js").FutureInterface;
     watch(url: any, messageHash: any, message?: any, subscribeHash?: any, subscription?: any): any;

package/js/src/base/Exchange.js

@@ -1063,9 +1063,9 @@ export default class Exchange {
     }
     handleMessage(client, message) { } // stub to override
     // ping (client) {} // stub to override
-    ping(client) {
-        return undefined;
-    }
+    // ping (client) {
+    //     return undefined;
+    // }
     client(url) {
         this.clients = this.clients || {};
         if (!this.clients[url]) {
@@ -1447,6 +1447,9 @@ export default class Exchange {
          * @returns {object | undefined}
          */
         const value = this.safeValueN(dictionaryOrList, keys, defaultValue);
+        if (value === undefined) {
+            return defaultValue;
+        }
         if (typeof value === 'object') {
             return value;
         }
@@ -1478,6 +1481,9 @@ export default class Exchange {
          * @returns {Array | undefined}
          */
         const value = this.safeValueN(dictionaryOrList, keys, defaultValue);
+        if (value === undefined) {
+            return defaultValue;
+        }
         if (Array.isArray(value)) {
             return value;
         }
@@ -5277,7 +5283,8 @@ export default class Exchange {
                 errors = 0;
                 const responseLength = response.length;
                 if (this.verbose) {
-                    const cursorMessage = 'Cursor pagination call ' + i + 1 + ' method ' + method + ' response length ' + responseLength + ' cursor ' + cursorValue;
+                    const iteration = (i + 1).toString();
+                    const cursorMessage = 'Cursor pagination call ' + iteration + ' method ' + method + ' response length ' + responseLength.toString() + ' cursor ' + cursorValue;
                     this.log(cursorMessage);
                 }
                 if (responseLength === 0) {
@@ -5322,7 +5329,8 @@ export default class Exchange {
                 errors = 0;
                 const responseLength = response.length;
                 if (this.verbose) {
-                    const incrementalMessage = 'Incremental pagination call ' + i + 1 + ' method ' + method + ' response length ' + responseLength;
+                    const iteration = (i + 1).toString();
+                    const incrementalMessage = 'Incremental pagination call ' + iteration + ' method ' + method + ' response length ' + responseLength.toString();
                     this.log(incrementalMessage);
                 }
                 if (responseLength === 0) {

package/js/src/binance.js

@@ -3146,9 +3146,24 @@ export default class binance extends Exchange {
         let timestamp = undefined;
         const isolated = marginMode === 'isolated';
         const cross = (type === 'margin') || (marginMode === 'cross');
-        if (!isolated && ((type === 'spot') || cross)) {
+        if (type === 'papi') {
+            for (let i = 0; i < response.length; i++) {
+                const entry = response[i];
+                const account = this.account();
+                const currencyId = this.safeString(entry, 'asset');
+                const code = this.safeCurrencyCode(currencyId);
+                const borrowed = this.safeString(entry, 'crossMarginBorrowed');
+                const interest = this.safeString(entry, 'crossMarginInterest');
+                account['free'] = this.safeString(entry, 'crossMarginFree');
+                account['used'] = this.safeString(entry, 'crossMarginLocked');
+                account['total'] = this.safeString(entry, 'crossMarginAsset');
+                account['debt'] = Precise.stringAdd(borrowed, interest);
+                result[code] = account;
+            }
+        }
+        else if (!isolated && ((type === 'spot') || cross)) {
             timestamp = this.safeInteger(response, 'updateTime');
-            const balances = this.safeValue2(response, 'balances', 'userAssets', []);
+            const balances = this.safeList2(response, 'balances', 'userAssets', []);
             for (let i = 0; i < balances.length; i++) {
                 const balance = balances[i];
                 const currencyId = this.safeString(balance, 'asset');
@@ -3165,13 +3180,13 @@ export default class binance extends Exchange {
             }
         }
         else if (isolated) {
-            const assets = this.safeValue(response, 'assets');
+            const assets = this.safeList(response, 'assets');
             for (let i = 0; i < assets.length; i++) {
                 const asset = assets[i];
-                const marketId = this.safeValue(asset, 'symbol');
+                const marketId = this.safeString(asset, 'symbol');
                 const symbol = this.safeSymbol(marketId, undefined, undefined, 'spot');
-                const base = this.safeValue(asset, 'baseAsset', {});
-                const quote = this.safeValue(asset, 'quoteAsset', {});
+                const base = this.safeDict(asset, 'baseAsset', {});
+                const quote = this.safeDict(asset, 'quoteAsset', {});
                 const baseCode = this.safeCurrencyCode(this.safeString(base, 'asset'));
                 const quoteCode = this.safeCurrencyCode(this.safeString(quote, 'asset'));
                 const subResult = {};
@@ -3181,7 +3196,7 @@ export default class binance extends Exchange {
             }
         }
         else if (type === 'savings') {
-            const positionAmountVos = this.safeValue(response, 'positionAmountVos', []);
+            const positionAmountVos = this.safeList(response, 'positionAmountVos', []);
             for (let i = 0; i < positionAmountVos.length; i++) {
                 const entry = positionAmountVos[i];
                 const currencyId = this.safeString(entry, 'asset');
@@ -3210,7 +3225,7 @@ export default class binance extends Exchange {
         else {
             let balances = response;
             if (!Array.isArray(response)) {
-                balances = this.safeValue(response, 'assets', []);
+                balances = this.safeList(response, 'assets', []);
             }
             for (let i = 0; i < balances.length; i++) {
                 const balance = balances[i];
@@ -3240,10 +3255,12 @@ export default class binance extends Exchange {
          * @see https://binance-docs.github.io/apidocs/futures/en/#account-information-v2-user_data            // swap
          * @see https://binance-docs.github.io/apidocs/delivery/en/#account-information-user_data              // future
          * @see https://binance-docs.github.io/apidocs/voptions/en/#option-account-information-trade           // option
+         * @see https://binance-docs.github.io/apidocs/pm/en/#account-balance-user_data                        // portfolio margin
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @param {string} [params.type] 'future', 'delivery', 'savings', 'funding', or 'spot'
+         * @param {string} [params.type] 'future', 'delivery', 'savings', 'funding', or 'spot' or 'papi'
          * @param {string} [params.marginMode] 'cross' or 'isolated', for margin trading, uses this.options.defaultMarginMode if not passed, defaults to undefined/None/null
          * @param {string[]|undefined} [params.symbols] unified market symbols, only used in isolated margin mode
+         * @param {boolean} [params.portfolioMargin] set to true if you would like to fetch the balance for a portfolio margin account
          * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
          */
         await this.loadMarkets();
@@ -3251,13 +3268,19 @@ export default class binance extends Exchange {
         let type = this.safeString(params, 'type', defaultType);
         let subType = undefined;
         [subType, params] = this.handleSubTypeAndParams('fetchBalance', undefined, params);
+        let isPortfolioMargin = undefined;
+        [isPortfolioMargin, params] = this.handleOptionAndParams2(params, 'fetchBalance', 'papi', 'portfolioMargin', false);
         let marginMode = undefined;
         let query = undefined;
         [marginMode, query] = this.handleMarginModeAndParams('fetchBalance', params);
         query = this.omit(query, 'type');
         let response = undefined;
         const request = {};
-        if (this.isLinear(type, subType)) {
+        if (isPortfolioMargin || (type === 'papi')) {
+            type = 'papi';
+            response = await this.papiGetBalance(this.extend(request, query));
+        }
+        else if (this.isLinear(type, subType)) {
             type = 'linear';
             response = await this.fapiPrivateV2GetAccount(this.extend(request, query));
         }
@@ -3266,7 +3289,7 @@ export default class binance extends Exchange {
             response = await this.dapiPrivateGetAccount(this.extend(request, query));
         }
         else if (marginMode === 'isolated') {
-            const paramSymbols = this.safeValue(params, 'symbols');
+            const paramSymbols = this.safeList(params, 'symbols');
             query = this.omit(query, 'symbols');
             if (paramSymbols !== undefined) {
                 let symbols = '';
@@ -3482,6 +3505,26 @@ export default class binance extends Exchange {
         //       }
         //     ]
         //
+        // portfolio margin
+        //
+        //     [
+        //         {
+        //             "asset": "USDT",
+        //             "totalWalletBalance": "66.9923261",
+        //             "crossMarginAsset": "35.9697141",
+        //             "crossMarginBorrowed": "0.0",
+        //             "crossMarginFree": "35.9697141",
+        //             "crossMarginInterest": "0.0",
+        //             "crossMarginLocked": "0.0",
+        //             "umWalletBalance": "31.022612",
+        //             "umUnrealizedPNL": "0.0",
+        //             "cmWalletBalance": "0.0",
+        //             "cmUnrealizedPNL": "0.0",
+        //             "updateTime": 0,
+        //             "negativeBalance": "0.0"
+        //         },
+        //     ]
+        //
         return this.parseBalanceCustom(response, type, marginMode);
     }
     async fetchOrderBook(symbol, limit = undefined, params = {}) {

package/js/src/bitfinex2.js

@@ -28,11 +28,13 @@ export default class bitfinex2 extends Exchange {
             'has': {
                 'CORS': undefined,
                 'spot': true,
-                'margin': undefined,
+                'margin': true,
                 'swap': true,
                 'future': undefined,
                 'option': undefined,
                 'addMargin': false,
+                'borrowCrossMargin': false,
+                'borrowIsolatedMargin': false,
                 'cancelAllOrders': true,
                 'cancelOrder': true,
                 'cancelOrders': true,
@@ -49,8 +51,13 @@ export default class bitfinex2 extends Exchange {
                 'createTriggerOrder': true,
                 'editOrder': true,
                 'fetchBalance': true,
+                'fetchBorrowInterest': false,
+                'fetchBorrowRateHistories': false,
+                'fetchBorrowRateHistory': false,
                 'fetchClosedOrder': true,
                 'fetchClosedOrders': true,
+                'fetchCrossBorrowRate': false,
+                'fetchCrossBorrowRates': false,
                 'fetchCurrencies': true,
                 'fetchDepositAddress': true,
                 'fetchDepositsWithdrawals': true,
@@ -59,6 +66,8 @@ export default class bitfinex2 extends Exchange {
                 'fetchFundingRateHistory': true,
                 'fetchFundingRates': true,
                 'fetchIndexOHLCV': false,
+                'fetchIsolatedBorrowRate': false,
+                'fetchIsolatedBorrowRates': false,
                 'fetchLedger': true,
                 'fetchLeverage': false,
                 'fetchLeverageTiers': false,
@@ -86,6 +95,8 @@ export default class bitfinex2 extends Exchange {
                 'fetchTransactionFees': undefined,
                 'fetchTransactions': 'emulated',
                 'reduceMargin': false,
+                'repayCrossMargin': false,
+                'repayIsolatedMargin': false,
                 'setLeverage': false,
                 'setMargin': true,
                 'setMarginMode': false,

package/js/src/krakenfutures.js

@@ -154,10 +154,32 @@ export default class krakenfutures extends Exchange {
             },
             'fees': {
                 'trading': {
-                    'tierBased': false,
+                    'tierBased': true,
                     'percentage': true,
-                    'maker': this.parseNumber('-0.0002'),
-                    'taker': this.parseNumber('0.00075'),
+                    'taker': this.parseNumber('0.0005'),
+                    'maker': this.parseNumber('0.0002'),
+                    'tiers': {
+                        'taker': [
+                            [this.parseNumber('0'), this.parseNumber('0.0005')],
+                            [this.parseNumber('100000'), this.parseNumber('0.0004')],
+                            [this.parseNumber('1000000'), this.parseNumber('0.0003')],
+                            [this.parseNumber('5000000'), this.parseNumber('0.00025')],
+                            [this.parseNumber('10000000'), this.parseNumber('0.0002')],
+                            [this.parseNumber('20000000'), this.parseNumber('0.00015')],
+                            [this.parseNumber('50000000'), this.parseNumber('0.000125')],
+                            [this.parseNumber('100000000'), this.parseNumber('0.0001')],
+                        ],
+                        'maker': [
+                            [this.parseNumber('0'), this.parseNumber('0.0002')],
+                            [this.parseNumber('100000'), this.parseNumber('0.0015')],
+                            [this.parseNumber('1000000'), this.parseNumber('0.000125')],
+                            [this.parseNumber('5000000'), this.parseNumber('0.0001')],
+                            [this.parseNumber('10000000'), this.parseNumber('0.000075')],
+                            [this.parseNumber('20000000'), this.parseNumber('0.00005')],
+                            [this.parseNumber('50000000'), this.parseNumber('0.000025')],
+                            [this.parseNumber('100000000'), this.parseNumber('0')],
+                        ],
+                    },
                 },
             },
             'exceptions': {

package/js/src/pro/binance.js

@@ -2442,7 +2442,7 @@ export default class binance extends binanceRest {
         return this.safePosition({
             'info': position,
             'id': undefined,
-            'symbol': this.safeSymbol(marketId, undefined, undefined, 'future'),
+            'symbol': this.safeSymbol(marketId, undefined, undefined, 'contract'),
             'notional': undefined,
             'marginMode': this.safeString(position, 'mt'),
             'liquidationPrice': undefined,
@@ -2596,9 +2596,9 @@ export default class binance extends binanceRest {
         const messageHash = 'myTrades';
         const executionType = this.safeString(message, 'x');
         if (executionType === 'TRADE') {
-            const trade = this.parseTrade(message);
+            const trade = this.parseWsTrade(message);
             const orderId = this.safeString(trade, 'order');
-            let tradeFee = this.safeValue(trade, 'fee');
+            let tradeFee = this.safeValue(trade, 'fee', {});
             tradeFee = this.extend({}, tradeFee);
             const symbol = this.safeString(trade, 'symbol');
             if (orderId !== undefined && tradeFee !== undefined && symbol !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "4.2.34",
+  "version": "4.2.35",
   "description": "A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 100+ exchanges",
   "unpkg": "dist/ccxt.browser.js",
   "type": "module",