ccxt 4.0.86 → 4.0.88

package/js/src/exmo.js

@@ -6,7 +6,7 @@
 
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/exmo.js';
-import { ArgumentsRequired, ExchangeError, OrderNotFound, AuthenticationError, InsufficientFunds, InvalidOrder, InvalidNonce, OnMaintenance, RateLimitExceeded, BadRequest, PermissionDenied } from './base/errors.js';
+import { ExchangeError, OrderNotFound, AuthenticationError, InsufficientFunds, InvalidOrder, InvalidNonce, OnMaintenance, RateLimitExceeded, BadRequest, PermissionDenied } from './base/errors.js';
 import { Precise } from './base/Precise.js';
 import { TICK_SIZE } from './base/functions/number.js';
 import { sha512 } from './static_dependencies/noble-hashes/sha512.js';
@@ -1176,18 +1176,35 @@ export default class exmo extends Exchange {
         //         "commission_percent": "0.2"
         //     }
         //
+        // fetchMyTrades (margin)
+        //
+        //    {
+        //        "trade_id": "692861757015952517",
+        //        "trade_dt": "1693951853197811824",
+        //        "trade_type": "buy",
+        //        "pair": "ADA_USDT",
+        //        "quantity": "1.96607879",
+        //        "price": "0.2568",
+        //        "amount": "0.50488903"
+        //    }
+        //
         const timestamp = this.safeTimestamp(trade, 'date');
         const id = this.safeString(trade, 'trade_id');
         const orderId = this.safeString(trade, 'order_id');
         const priceString = this.safeString(trade, 'price');
         const amountString = this.safeString(trade, 'quantity');
         const costString = this.safeString(trade, 'amount');
-        const side = this.safeString(trade, 'type');
+        const side = this.safeString2(trade, 'type', 'trade_type');
         const type = undefined;
         const marketId = this.safeString(trade, 'pair');
         market = this.safeMarket(marketId, market, '_');
         const symbol = market['symbol'];
-        const takerOrMaker = this.safeString(trade, 'exec_type');
+        const isMaker = this.safeValue(trade, 'is_maker');
+        let takerOrMakerDefault = undefined;
+        if (isMaker !== undefined) {
+            takerOrMakerDefault = isMaker ? 'maker' : 'taker';
+        }
+        const takerOrMaker = this.safeString(trade, 'exec_type', takerOrMakerDefault);
         let fee = undefined;
         const feeCostString = this.safeString(trade, 'commission_amount');
         if (feeCostString !== undefined) {
@@ -1266,38 +1283,91 @@ export default class exmo extends Exchange {
          * @method
          * @name exmo#fetchMyTrades
          * @description fetch all trades made by the user
-         * @param {string} symbol unified market symbol
+         * @see https://documenter.getpostman.com/view/10287440/SzYXWKPi#b8d8d9af-4f46-46a1-939b-ad261d79f452  // spot
+         * @see https://documenter.getpostman.com/view/10287440/SzYXWKPi#f4b1aaf8-399f-403b-ab5e-4926d967a106  // margin
+         * @param {string} symbol a symbol is required but it can be a single string, or a non-empty array
          * @param {int} [since] the earliest time in ms to fetch trades for
-         * @param {int} [limit] the maximum number of trades structures to retrieve
+         * @param {int} [limit] *required for margin orders* the maximum number of trades structures to retrieve
          * @param {object} [params] extra parameters specific to the exmo api endpoint
+         *
+         * EXCHANGE SPECIFIC PARAMETERS
+         * @param {int} [params.offset] last deal offset, default = 0
          * @returns {Trade[]} a list of [trade structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#trade-structure}
          */
-        // a symbol is required but it can be a single string, or a non-empty array
-        if (symbol === undefined) {
-            throw new ArgumentsRequired(this.id + ' fetchMyTrades() requires a symbol argument (a single symbol or an array)');
+        this.checkRequiredSymbol('fetchMyTrades', symbol);
+        let marginMode = undefined;
+        [marginMode, params] = this.handleMarginModeAndParams('fetchMyTrades', params);
+        if (marginMode === 'cross') {
+            throw new BadRequest(this.id + 'only isolated margin is supported');
         }
         await this.loadMarkets();
-        let pair = undefined;
-        let market = undefined;
-        if (Array.isArray(symbol)) {
-            const numSymbols = symbol.length;
-            if (numSymbols < 1) {
-                throw new ArgumentsRequired(this.id + ' fetchMyTrades() requires a non-empty symbol array');
-            }
-            const marketIds = this.marketIds(symbol);
-            pair = marketIds.join(',');
+        const market = this.market(symbol);
+        const pair = market['id'];
+        const isSpot = marginMode !== 'isolated';
+        if (limit === undefined) {
+            limit = 100;
+        }
+        const request = {};
+        if (isSpot) {
+            request['pair'] = pair;
         }
         else {
-            market = this.market(symbol);
-            pair = market['id'];
+            request['pair_name'] = pair;
         }
-        const request = {
-            'pair': pair,
-        };
         if (limit !== undefined) {
             request['limit'] = limit;
         }
-        const response = await this.privatePostUserTrades(this.extend(request, params));
+        const offset = this.safeInteger(params, 'offset', 0);
+        request['offset'] = offset;
+        let response = undefined;
+        if (isSpot) {
+            response = await this.privatePostUserTrades(this.extend(request, params));
+            //
+            //    {
+            //        "BTC_USD": [
+            //            {
+            //                "trade_id": 20056872,
+            //                "client_id": 100500,
+            //                "date": 1435488248,
+            //                "type": "buy",
+            //                "pair": "BTC_USD",
+            //                "quantity": "1",
+            //                "price": "100",
+            //                "amount": "100",
+            //                "order_id": 7,
+            //                "parent_order_id": 117684023830293,
+            //                "exec_type": "taker",
+            //                "commission_amount": "0.02",
+            //                "commission_currency": "BTC",
+            //                "commission_percent": "0.2"
+            //            }
+            //        ],
+            //        ...
+            //    }
+            //
+        }
+        else {
+            const responseFromExchange = await this.privatePostMarginTrades(this.extend(request, params));
+            //
+            //    {
+            //        "trades": {
+            //            "ADA_USDT": [
+            //                {
+            //                    "trade_id": "692861757015952517",
+            //                    "trade_dt": "1693951853197811824",
+            //                    "trade_type": "buy",
+            //                    "pair": "ADA_USDT",
+            //                    "quantity": "1.96607879",
+            //                    "price": "0.2568",
+            //                    "amount": "0.50488903"
+            //                },
+            //            ]
+            //            ...
+            //        }
+            //    }
+            //
+            response = this.safeValue(responseFromExchange, 'trades');
+        }
         let result = [];
         const marketIdsInner = Object.keys(response);
         for (let i = 0; i < marketIdsInner.length; i++) {
@@ -1427,13 +1497,21 @@ export default class exmo extends Exchange {
          * @method
          * @name exmo#fetchOrderTrades
          * @description fetch all the trades made from a single order
+         * @see https://documenter.getpostman.com/view/10287440/SzYXWKPi#cf27781e-28e5-4b39-a52d-3110f5d22459  // spot
+         * @see https://documenter.getpostman.com/view/10287440/SzYXWKPi#00810661-9119-46c5-aec5-55abe9cb42c7  // margin
          * @param {string} id order id
          * @param {string} symbol unified market symbol
          * @param {int} [since] the earliest time in ms to fetch trades for
          * @param {int} [limit] the maximum number of trades to retrieve
          * @param {object} [params] extra parameters specific to the exmo api endpoint
+         * @param {string} [params.marginMode] set to "isolated" to fetch trades for a margin order
          * @returns {object[]} a list of [trade structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#trade-structure}
          */
+        let marginMode = undefined;
+        [marginMode, params] = this.handleMarginModeAndParams('fetchOrderTrades', params);
+        if (marginMode === 'cross') {
+            throw new BadRequest(this.id + ' only supports isolated margin');
+        }
         let market = undefined;
         if (symbol !== undefined) {
             market = this.market(symbol);
@@ -1441,32 +1519,54 @@ export default class exmo extends Exchange {
         const request = {
             'order_id': id.toString(),
         };
-        const response = await this.privatePostOrderTrades(this.extend(request, params));
-        //
-        //     {
-        //         "type": "buy",
-        //         "in_currency": "BTC",
-        //         "in_amount": "1",
-        //         "out_currency": "USD",
-        //         "out_amount": "100",
-        //         "trades": [
-        //             {
-        //                 "trade_id": 3,
-        //                 "date": 1435488248,
-        //                 "type": "buy",
-        //                 "pair": "BTC_USD",
-        //                 "order_id": 12345,
-        //                 "quantity": 1,
-        //                 "price": 100,
-        //                 "amount": 100,
-        //                 "exec_type": "taker",
-        //                 "commission_amount": "0.02",
-        //                 "commission_currency": "BTC",
-        //                 "commission_percent": "0.2"
-        //             }
-        //         ]
-        //     }
-        //
+        let response = undefined;
+        if (marginMode === 'isolated') {
+            response = await this.privatePostMarginUserOrderTrades(this.extend(request, params));
+            //
+            //    {
+            //        "trades": [
+            //            {
+            //                "is_maker": false,
+            //                "order_id": "123",
+            //                "pair": "BTC_USD",
+            //                "price": "54122.25",
+            //                "quantity": "0.00069994",
+            //                "trade_dt": "1619069561718824428",
+            //                "trade_id": "692842802860135010",
+            //                "type": "sell"
+            //            }
+            //        ]
+            //    }
+            //
+        }
+        else {
+            response = await this.privatePostOrderTrades(this.extend(request, params));
+            //
+            //     {
+            //         "type": "buy",
+            //         "in_currency": "BTC",
+            //         "in_amount": "1",
+            //         "out_currency": "USD",
+            //         "out_amount": "100",
+            //         "trades": [
+            //             {
+            //                 "trade_id": 3,
+            //                 "date": 1435488248,
+            //                 "type": "buy",
+            //                 "pair": "BTC_USD",
+            //                 "order_id": 12345,
+            //                 "quantity": 1,
+            //                 "price": 100,
+            //                 "amount": 100,
+            //                 "exec_type": "taker",
+            //                 "commission_amount": "0.02",
+            //                 "commission_currency": "BTC",
+            //                 "commission_percent": "0.2"
+            //             }
+            //         ]
+            //     }
+            //
+        }
         const trades = this.safeValue(response, 'trades');
         return this.parseTrades(trades, market, since, limit);
     }

package/js/src/gate.d.ts

@@ -410,5 +410,6 @@ export default class gate extends Exchange {
     };
     parseLedgerEntryType(type: any): string;
     setPositionMode(hedged: any, symbol?: any, params?: {}): Promise<any>;
+    fetchUnderlyingAssets(params?: {}): Promise<any[]>;
     handleErrors(code: any, reason: any, url: any, method: any, headers: any, body: any, response: any, requestHeaders: any, requestBody: any): any;
 }

package/js/src/gate.js

@@ -133,6 +133,7 @@ export default class gate extends Exchange {
                 'fetchTradingFee': true,
                 'fetchTradingFees': true,
                 'fetchTransactionFees': true,
+                'fetchUnderlyingAssets': true,
                 'fetchVolatilityHistory': false,
                 'fetchWithdrawals': true,
                 'reduceMargin': true,
@@ -6225,6 +6226,44 @@ export default class gate extends Exchange {
         request['dual_mode'] = hedged;
         return await this.privateFuturesPostSettleDualMode(this.extend(request, query));
     }
+    async fetchUnderlyingAssets(params = {}) {
+        /**
+         * @method
+         * @name gate#fetchUnderlyingAssets
+         * @description fetches the market ids of underlying assets for a specific contract market type
+         * @param {object} [params] exchange specific params
+         * @param {string} [params.type] the contract market type, 'option', 'swap' or 'future', the default is 'option'
+         * @returns {object[]} a list of [underlying assets]{@link https://github.com/ccxt/ccxt/wiki/Manual#underlying-assets-structure}
+         */
+        await this.loadMarkets();
+        let marketType = undefined;
+        [marketType, params] = this.handleMarketTypeAndParams('fetchUnderlyingAssets', undefined, params);
+        if ((marketType === undefined) || (marketType === 'spot')) {
+            marketType = 'option';
+        }
+        if (marketType !== 'option') {
+            throw new NotSupported(this.id + ' fetchUnderlyingAssets() supports option markets only');
+        }
+        const response = await this.publicOptionsGetUnderlyings(params);
+        //
+        //    [
+        //        {
+        //            "index_time": "1646915796",
+        //            "name": "BTC_USDT",
+        //            "index_price": "39142.73"
+        //        }
+        //    ]
+        //
+        const underlyings = [];
+        for (let i = 0; i < response.length; i++) {
+            const underlying = response[i];
+            const name = this.safeString(underlying, 'name');
+            if (name !== undefined) {
+                underlyings.push(name);
+            }
+        }
+        return underlyings;
+    }
     handleErrors(code, reason, url, method, headers, body, response, requestHeaders, requestBody) {
         if (response === undefined) {
             return undefined;

package/js/src/hitbtc.js

@@ -1235,6 +1235,9 @@ export default class hitbtc extends Exchange {
         if (taker !== undefined) {
             takerOrMaker = taker ? 'taker' : 'maker';
         }
+        else {
+            takerOrMaker = 'taker'; // the only case when `taker` field is missing, is public fetchTrades and it must be taker
+        }
         if (feeCostString !== undefined) {
             const info = this.safeValue(market, 'info', {});
             const feeCurrency = this.safeString(info, 'fee_currency');

package/js/src/okx.d.ts

@@ -432,5 +432,6 @@ export default class okx extends Exchange {
         datetime: any;
     };
     parseSettlements(settlements: any, market: any): any[];
+    fetchUnderlyingAssets(params?: {}): Promise<any>;
     handleErrors(httpCode: any, reason: any, url: any, method: any, headers: any, body: any, response: any, requestHeaders: any, requestBody: any): any;
 }

package/js/src/okx.js

@@ -110,6 +110,7 @@ export default class okx extends Exchange {
                 'fetchTransactions': false,
                 'fetchTransfer': true,
                 'fetchTransfers': true,
+                'fetchUnderlyingAssets': true,
                 'fetchVolatilityHistory': false,
                 'fetchWithdrawal': true,
                 'fetchWithdrawals': true,
@@ -6703,6 +6704,44 @@ export default class okx extends Exchange {
         }
         return result;
     }
+    async fetchUnderlyingAssets(params = {}) {
+        /**
+         * @method
+         * @name okx#fetchUnderlyingAssets
+         * @description fetches the market ids of underlying assets for a specific contract market type
+         * @see https://www.okx.com/docs-v5/en/#public-data-rest-api-get-underlying
+         * @param {object} [params] exchange specific params
+         * @param {string} [params.type] the contract market type, 'option', 'swap' or 'future', the default is 'option'
+         * @returns {object[]} a list of [underlying assets]{@link https://github.com/ccxt/ccxt/wiki/Manual#underlying-assets-structure}
+         */
+        await this.loadMarkets();
+        let marketType = undefined;
+        [marketType, params] = this.handleMarketTypeAndParams('fetchUnderlyingAssets', undefined, params);
+        if ((marketType === undefined) || (marketType === 'spot')) {
+            marketType = 'option';
+        }
+        if ((marketType !== 'option') && (marketType !== 'swap') && (marketType !== 'future')) {
+            throw new NotSupported(this.id + ' fetchUnderlyingAssets() supports contract markets only');
+        }
+        const request = {
+            'instType': this.convertToInstrumentType(marketType),
+        };
+        const response = await this.publicGetPublicUnderlying(this.extend(request, params));
+        //
+        //     {
+        //         "code": "0",
+        //         "data": [
+        //             [
+        //                 "BTC-USD",
+        //                 "ETH-USD"
+        //             ]
+        //         ],
+        //         "msg": ""
+        //     }
+        //
+        const underlyings = this.safeValue(response, 'data', []);
+        return underlyings[0];
+    }
     handleErrors(httpCode, reason, url, method, headers, body, response, requestHeaders, requestBody) {
         if (!response) {
             return undefined; // fallback to default error handler

package/js/src/pro/bitfinex2.js

@@ -270,13 +270,13 @@ export default class bitfinex2 extends bitfinex2Rest {
             const limit = this.safeInteger(this.options, 'tradesLimit', 1000);
             this.myTrades = new ArrayCacheBySymbolById(limit);
         }
-        const array = this.myTrades;
-        array.append(trade);
-        this.myTrades = array;
+        const tradesArray = this.myTrades;
+        tradesArray.append(trade);
+        this.myTrades = tradesArray;
         // generic subscription
-        client.resolve(array, name);
+        client.resolve(tradesArray, name);
         // specific subscription
-        client.resolve(array, messageHash);
+        client.resolve(tradesArray, messageHash);
     }
     handleTrades(client, message, subscription) {
         //

package/js/src/pro/blockchaincom.js

@@ -741,8 +741,8 @@ export default class blockchaincom extends blockchaincomRest {
         };
     }
     handleDelta(bookside, delta) {
-        const array = this.parseCountedBidAsk(delta, 'px', 'qty', 'num');
-        bookside.storeArray(array);
+        const bookArray = this.parseCountedBidAsk(delta, 'px', 'qty', 'num');
+        bookside.storeArray(bookArray);
     }
     handleDeltas(bookside, deltas) {
         for (let i = 0; i < deltas.length; i++) {

package/js/src/pro/luno.js

@@ -291,13 +291,13 @@ export default class luno extends lunoRest {
         const asksOrderSide = orderbook['asks'];
         const bidsOrderSide = orderbook['bids'];
         if (createUpdate !== undefined) {
-            const array = this.customParseBidAsk(createUpdate, 'price', 'volume', 'order_id');
+            const bidAskArray = this.customParseBidAsk(createUpdate, 'price', 'volume', 'order_id');
             const type = this.safeString(createUpdate, 'type');
             if (type === 'ASK') {
-                asksOrderSide.storeArray(array);
+                asksOrderSide.storeArray(bidAskArray);
             }
             else if (type === 'BID') {
-                bidsOrderSide.storeArray(array);
+                bidsOrderSide.storeArray(bidAskArray);
             }
         }
         const deleteUpdate = this.safeValue(message, 'delete_update');

package/package.json

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