ccxt 4.2.34 → 4.2.35

package/README.md

@@ -209,13 +209,13 @@ console.log(version, Object.keys(exchanges));
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
-* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.2.34/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@4.2.34/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.2.35/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/ccxt@4.2.35/dist/ccxt.browser.js
 
 CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 ```HTML
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.2.34/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.2.35/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object:

package/dist/ccxt.browser.js

@@ -8080,9 +8080,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]) {
@@ -8464,6 +8464,9 @@ class Exchange {
          * @returns {object | undefined}
          */
         const value = this.safeValueN(dictionaryOrList, keys, defaultValue);
+        if (value === undefined) {
+            return defaultValue;
+        }
         if (typeof value === 'object') {
             return value;
         }
@@ -8495,6 +8498,9 @@ class Exchange {
          * @returns {Array | undefined}
          */
         const value = this.safeValueN(dictionaryOrList, keys, defaultValue);
+        if (value === undefined) {
+            return defaultValue;
+        }
         if (Array.isArray(value)) {
             return value;
         }
@@ -12294,7 +12300,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) {
@@ -12339,7 +12346,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) {
@@ -21088,9 +21096,24 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
         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'] = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.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');
@@ -21107,13 +21130,13 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
             }
         }
         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 = {};
@@ -21123,7 +21146,7 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
             }
         }
         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');
@@ -21152,7 +21175,7 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
         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];
@@ -21182,10 +21205,12 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
          * @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();
@@ -21193,13 +21218,19 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
         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));
         }
@@ -21208,7 +21239,7 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
             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 = '';
@@ -21424,6 +21455,26 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
         //       }
         //     ]
         //
+        // 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 = {}) {
@@ -37690,11 +37741,13 @@ class bitfinex2 extends _abstract_bitfinex2_js__WEBPACK_IMPORTED_MODULE_0__/* ["
             '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,
@@ -37711,8 +37764,13 @@ class bitfinex2 extends _abstract_bitfinex2_js__WEBPACK_IMPORTED_MODULE_0__/* ["
                 '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,
@@ -37721,6 +37779,8 @@ class bitfinex2 extends _abstract_bitfinex2_js__WEBPACK_IMPORTED_MODULE_0__/* ["
                 'fetchFundingRateHistory': true,
                 'fetchFundingRates': true,
                 'fetchIndexOHLCV': false,
+                'fetchIsolatedBorrowRate': false,
+                'fetchIsolatedBorrowRates': false,
                 'fetchLedger': true,
                 'fetchLeverage': false,
                 'fetchLeverageTiers': false,
@@ -37748,6 +37808,8 @@ class bitfinex2 extends _abstract_bitfinex2_js__WEBPACK_IMPORTED_MODULE_0__/* ["
                 'fetchTransactionFees': undefined,
                 'fetchTransactions': 'emulated',
                 'reduceMargin': false,
+                'repayCrossMargin': false,
+                'repayIsolatedMargin': false,
                 'setLeverage': false,
                 'setMargin': true,
                 'setMarginMode': false,
@@ -159955,10 +160017,32 @@ class krakenfutures extends _abstract_krakenfutures_js__WEBPACK_IMPORTED_MODULE_
             },
             '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': {
@@ -217112,7 +217196,7 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         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,
@@ -217266,9 +217350,9 @@ class binance extends _binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         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) {
@@ -301317,7 +301401,7 @@ SOFTWARE.
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.2.34';
+const version = '4.2.35';
 _src_base_Exchange_js__WEBPACK_IMPORTED_MODULE_0__/* .Exchange */ .e.ccxtVersion = version;
 //-----------------------------------------------------------------------------