ccxt 4.0.86 → 4.0.87

package/dist/cjs/ccxt.js

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

package/dist/cjs/src/bitget.js

@@ -147,6 +147,7 @@ class bitget extends bitget$1 {
                             'market/candles': 1,
                             'market/depth': 1,
                             'market/spot-vip-level': 2,
+                            'market/merge-depth': 1,
                             'market/history-candles': 1,
                             'public/loan/coinInfos': 2,
                             'public/loan/hour-interest': 2, // 10 times/1s (IP) => 20/10 = 2
@@ -174,6 +175,7 @@ class bitget extends bitget$1 {
                             'market/history-candles': 1,
                             'market/history-index-candles': 1,
                             'market/history-mark-candles': 1,
+                            'market/merge-depth': 1,
                         },
                     },
                     'margin': {

package/dist/cjs/src/exmo.js

@@ -1173,6 +1173,19 @@ class exmo extends exmo$1 {
         //         "commission_percent": "0.2"
         //     }
         //
+        // margin
+        //
+        //    {
+        //        "is_maker": false,
+        //        "order_id": "123",
+        //        "pair": "BTC_USD",
+        //        "price": "54122.25",
+        //        "quantity": "0.00069994",
+        //        "trade_dt": "1619069561718824428",
+        //        "trade_id": "692842802860135010",
+        //        "type": "sell"
+        //    }
+        //
         const timestamp = this.safeTimestamp(trade, 'date');
         const id = this.safeString(trade, 'trade_id');
         const orderId = this.safeString(trade, 'order_id');
@@ -1184,7 +1197,12 @@ class exmo extends exmo$1 {
         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) {
@@ -1424,13 +1442,21 @@ class exmo extends exmo$1 {
          * @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 errors.BadRequest(this.id + ' only supports isolated margin');
+        }
         let market = undefined;
         if (symbol !== undefined) {
             market = this.market(symbol);
@@ -1438,32 +1464,54 @@ class exmo extends exmo$1 {
         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/dist/cjs/src/hitbtc.js

@@ -1232,6 +1232,9 @@ class hitbtc extends hitbtc$1 {
         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/dist/cjs/src/pro/bitfinex2.js

@@ -267,13 +267,13 @@ class bitfinex2 extends bitfinex2$1 {
             const limit = this.safeInteger(this.options, 'tradesLimit', 1000);
             this.myTrades = new Cache.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/dist/cjs/src/pro/blockchaincom.js

@@ -738,8 +738,8 @@ class blockchaincom extends blockchaincom$1 {
         };
     }
     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/dist/cjs/src/pro/luno.js

@@ -288,13 +288,13 @@ class luno extends luno$1 {
         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/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 } 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 } from './src/base/errors.js';
-declare const version = "4.0.85";
+declare const version = "4.0.86";
 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 } from './src/base/errors.js';
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.0.86';
+const version = '4.0.87';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

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

@@ -13,6 +13,7 @@ interface Exchange {
     publicSpotGetMarketCandles(params?: {}): Promise<implicitReturnType>;
     publicSpotGetMarketDepth(params?: {}): Promise<implicitReturnType>;
     publicSpotGetMarketSpotVipLevel(params?: {}): Promise<implicitReturnType>;
+    publicSpotGetMarketMergeDepth(params?: {}): Promise<implicitReturnType>;
     publicSpotGetMarketHistoryCandles(params?: {}): Promise<implicitReturnType>;
     publicSpotGetPublicLoanCoinInfos(params?: {}): Promise<implicitReturnType>;
     publicSpotGetPublicLoanHourInterest(params?: {}): Promise<implicitReturnType>;
@@ -36,6 +37,7 @@ interface Exchange {
     publicMixGetMarketHistoryCandles(params?: {}): Promise<implicitReturnType>;
     publicMixGetMarketHistoryIndexCandles(params?: {}): Promise<implicitReturnType>;
     publicMixGetMarketHistoryMarkCandles(params?: {}): Promise<implicitReturnType>;
+    publicMixGetMarketMergeDepth(params?: {}): Promise<implicitReturnType>;
     publicMarginGetCrossPublicInterestRateAndLimit(params?: {}): Promise<implicitReturnType>;
     publicMarginGetIsolatedPublicInterestRateAndLimit(params?: {}): Promise<implicitReturnType>;
     publicMarginGetCrossPublicTierData(params?: {}): Promise<implicitReturnType>;

package/js/src/bitget.js

@@ -150,6 +150,7 @@ export default class bitget extends Exchange {
                             'market/candles': 1,
                             'market/depth': 1,
                             'market/spot-vip-level': 2,
+                            'market/merge-depth': 1,
                             'market/history-candles': 1,
                             'public/loan/coinInfos': 2,
                             'public/loan/hour-interest': 2, // 10 times/1s (IP) => 20/10 = 2
@@ -177,6 +178,7 @@ export default class bitget extends Exchange {
                             'market/history-candles': 1,
                             'market/history-index-candles': 1,
                             'market/history-mark-candles': 1,
+                            'market/merge-depth': 1,
                         },
                     },
                     'margin': {

package/js/src/exmo.js

@@ -1176,6 +1176,19 @@ export default class exmo extends Exchange {
         //         "commission_percent": "0.2"
         //     }
         //
+        // margin
+        //
+        //    {
+        //        "is_maker": false,
+        //        "order_id": "123",
+        //        "pair": "BTC_USD",
+        //        "price": "54122.25",
+        //        "quantity": "0.00069994",
+        //        "trade_dt": "1619069561718824428",
+        //        "trade_id": "692842802860135010",
+        //        "type": "sell"
+        //    }
+        //
         const timestamp = this.safeTimestamp(trade, 'date');
         const id = this.safeString(trade, 'trade_id');
         const orderId = this.safeString(trade, 'order_id');
@@ -1187,7 +1200,12 @@ export default class exmo extends Exchange {
         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) {
@@ -1427,13 +1445,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 +1467,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/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/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.87",
   "description": "A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 130+ exchanges",
   "unpkg": "dist/ccxt.browser.js",
   "type": "module",