ccxt 4.0.78 → 4.0.80

package/js/src/binance.js

@@ -189,12 +189,11 @@ export default class binance extends Exchange {
             'api': {
                 // the API structure below will need 3-layer apidefs
                 'sapi': {
-                    // IP (api) = 1200 per minute => (rateLimit = 50)
                     // IP (sapi) request rate limit of 12 000 per minute
-                    // 1 IP (sapi) => cost = 0.1
+                    // 1 IP (sapi) => cost = 0.1 => (1000 / (50 * 0.1)) * 60 = 12000
                     // 10 IP (sapi) => cost = 1
                     // UID (sapi) request rate limit of 180 000 per minute
-                    // 1 UID (sapi) => cost = 1200 / 180 000 = 0.006667
+                    // 1 UID (sapi) => cost = 0.006667 => (1000 / (50 * 0.006667)) * 60 = 180000
                     'get': {
                         'system/status': 0.1,
                         // these endpoints require this.apiKey
@@ -210,7 +209,7 @@ export default class binance extends Exchange {
                         'asset/transfer': 0.1,
                         'asset/assetDetail': 0.1,
                         'asset/tradeFee': 0.1,
-                        'asset/ledger-transfer/cloud-mining/queryByPage': 4,
+                        'asset/ledger-transfer/cloud-mining/queryByPage': 4.0002,
                         'asset/convert-transfer/queryByPage': 0.033335,
                         'margin/loan': 1,
                         'margin/repay': 1,
@@ -239,15 +238,16 @@ export default class binance extends Exchange {
                         'margin/isolatedMarginTier': 0.1,
                         'margin/rateLimit/order': 2,
                         'margin/dribblet': 0.1,
-                        'margin/dust': 20,
+                        'margin/dust': 20.001,
                         'margin/crossMarginCollateralRatio': 10,
                         'margin/exchange-small-liability': 0.6667,
                         'margin/exchange-small-liability-history': 0.6667,
                         'margin/next-hourly-interest-rate': 0.6667,
+                        'margin/delist-schedule': 0.6667,
                         'loan/vip/loanable/data': 40,
                         'loan/vip/collateral/data': 40,
-                        'loan/vip/request/data': 40,
-                        'loan/income': 40,
+                        'loan/vip/request/data': 2.6668,
+                        'loan/income': 40.002,
                         'loan/ongoing/orders': 40,
                         'loan/ltv/adjustment/history': 40,
                         'loan/borrow/history': 40,
@@ -266,7 +266,7 @@ export default class binance extends Exchange {
                         'futures/loan/wallet': 1,
                         'futures/loan/adjustCollateral/history': 1,
                         'futures/loan/liquidationHistory': 1,
-                        'rebate/taxQuery': 20.001,
+                        'rebate/taxQuery': 80.004,
                         // https://binance-docs.github.io/apidocs/spot/en/#withdraw-sapi
                         'capital/config/getall': 1,
                         'capital/deposit/address': 1,
@@ -275,7 +275,7 @@ export default class binance extends Exchange {
                         'capital/deposit/subHisrec': 0.1,
                         'capital/withdraw/history': 0.1,
                         'capital/contract/convertible-coins': 4.0002,
-                        'convert/tradeFlow': 20.0001,
+                        'convert/tradeFlow': 20.001,
                         'convert/exchangeInfo': 50,
                         'convert/assetInfo': 10,
                         'convert/orderStatus': 0.6667,
@@ -283,7 +283,6 @@ export default class binance extends Exchange {
                         'account/apiTradingStatus': 0.1,
                         'account/apiRestrictions/ipRestriction': 0.1,
                         'bnbBurn': 0.1,
-                        // 'sub-account/assets': 1, (v3 endpoint)
                         'sub-account/futures/account': 1,
                         'sub-account/futures/accountSummary': 0.1,
                         'sub-account/futures/positionRisk': 1,
@@ -297,15 +296,16 @@ export default class binance extends Exchange {
                         'sub-account/transfer/subUserHistory': 0.1,
                         'sub-account/universalTransfer': 0.1,
                         'sub-account/apiRestrictions/ipRestriction/thirdPartyList': 1,
-                        'sub-account/transaction-tatistics': 0.4,
+                        'sub-account/transaction-statistics': 0.40002,
+                        'sub-account/subAccountApi/ipRestriction': 20.001,
                         'managed-subaccount/asset': 0.1,
                         'managed-subaccount/accountSnapshot': 240,
                         'managed-subaccount/queryTransLogForInvestor': 0.1,
-                        'managed-subaccount/queryTransLogForTradeParent': 0.1,
-                        'managed-subaccount/fetch-future-asset': 0.1,
+                        'managed-subaccount/queryTransLogForTradeParent': 0.40002,
+                        'managed-subaccount/fetch-future-asset': 0.40002,
                         'managed-subaccount/marginAsset': 0.1,
-                        'managed-subaccount/info': 0.4,
-                        'managed-subaccount/deposit/address': 0.1,
+                        'managed-subaccount/info': 0.40002,
+                        'managed-subaccount/deposit/address': 0.006667,
                         'managed-subaccount/query-trans-log': 0.40002,
                         // lending endpoints
                         'lending/daily/product/list': 0.1,
@@ -383,6 +383,9 @@ export default class binance extends Exchange {
                         'giftcard/verify': 0.1,
                         'giftcard/cryptography/rsa-public-key': 0.1,
                         'giftcard/buyCode/token-limit': 0.1,
+                        'algo/spot/openOrders': 0.1,
+                        'algo/spot/historicalOrders': 0.1,
+                        'algo/spot/subOrders': 0.1,
                         'algo/futures/openOrders': 0.1,
                         'algo/futures/historicalOrders': 0.1,
                         'algo/futures/subOrders': 0.1,
@@ -424,9 +427,9 @@ export default class binance extends Exchange {
                         'simple-earn/flexible/history/collateralRecord': 0.1,
                     },
                     'post': {
-                        'asset/dust': 1,
+                        'asset/dust': 0.06667,
                         'asset/dust-btc': 0.1,
-                        'asset/transfer': 0.1,
+                        'asset/transfer': 6.0003,
                         'asset/get-funding-asset': 0.1,
                         'asset/convert-transfer': 0.033335,
                         'account/disableFastWithdrawSwitch': 0.1,
@@ -436,12 +439,12 @@ export default class binance extends Exchange {
                         'capital/withdraw/apply': 4.0002,
                         'capital/contract/convertible-coins': 4.0002,
                         'capital/deposit/credit-apply': 0.1,
-                        'margin/transfer': 1,
+                        'margin/transfer': 4.0002,
                         'margin/loan': 20.001,
                         'margin/repay': 20.001,
                         'margin/order': 0.040002,
                         'margin/order/oco': 0.040002,
-                        'margin/dust': 20,
+                        'margin/dust': 20.001,
                         'margin/exchange-small-liability': 20.001,
                         // 'margin/isolated/create': 1, discontinued
                         'margin/isolated/transfer': 4.0002,
@@ -458,8 +461,6 @@ export default class binance extends Exchange {
                         'sub-account/transfer/subToMaster': 0.1,
                         'sub-account/universalTransfer': 0.1,
                         'sub-account/options/enable': 0.1,
-                        // v2 not supported yet
-                        // 'sub-account/subAccountApi/ipRestriction': 20,
                         'managed-subaccount/deposit': 0.1,
                         'managed-subaccount/withdraw': 0.1,
                         'userDataStream': 0.1,
@@ -505,6 +506,7 @@ export default class binance extends Exchange {
                         'giftcard/createCode': 0.1,
                         'giftcard/redeemCode': 0.1,
                         'giftcard/buyCode': 0.1,
+                        'algo/spot/newOrderTwap': 20.001,
                         'algo/futures/newOrderVp': 20.001,
                         'algo/futures/newOrderTwap': 20.001,
                         // staking
@@ -512,14 +514,14 @@ export default class binance extends Exchange {
                         'staking/redeem': 0.1,
                         'staking/setAutoStaking': 0.1,
                         'portfolio/repay': 20.001,
-                        'loan/vip/renew': 40,
-                        'loan/vip/borrow': 40,
-                        'loan/borrow': 40,
-                        'loan/repay': 40,
-                        'loan/adjust/ltv': 40,
-                        'loan/customize/margin_call': 40,
-                        'loan/vip/repay': 40,
-                        'convert/getQuote': 20.001,
+                        'loan/vip/renew': 40.002,
+                        'loan/vip/borrow': 40.002,
+                        'loan/borrow': 40.002,
+                        'loan/repay': 40.002,
+                        'loan/adjust/ltv': 40.002,
+                        'loan/customize/margin_call': 40.002,
+                        'loan/vip/repay': 40.002,
+                        'convert/getQuote': 1.3334,
                         'convert/acceptQuote': 3.3335,
                         'portfolio/auto-collection': 150,
                         'portfolio/asset-collection': 6,
@@ -544,15 +546,17 @@ export default class binance extends Exchange {
                     'delete': {
                         // 'account/apiRestrictions/ipRestriction/ipList': 1, discontinued
                         'margin/openOrders': 0.1,
-                        'margin/order': 0.0066667,
-                        'margin/orderList': 0.0066667,
+                        'margin/order': 0.006667,
+                        'margin/orderList': 0.006667,
                         'margin/isolated/account': 2.0001,
                         'userDataStream': 0.1,
                         'userDataStream/isolated': 0.1,
                         // brokerage API TODO NO MENTION OF RATELIMIT IN BROKERAGE DOCS
                         'broker/subAccountApi': 1,
                         'broker/subAccountApi/ipRestriction/ipList': 1,
+                        'algo/spot/order': 0.1,
                         'algo/futures/order': 0.1,
+                        'sub-account/subAccountApi/ipRestriction/ipList': 20.001, // Weight(UID): 3000 => cost = 0.006667 * 3000 = 20.001
                     },
                 },
                 'sapiV2': {
@@ -560,10 +564,13 @@ export default class binance extends Exchange {
                         'sub-account/futures/account': 0.1,
                         'sub-account/futures/positionRisk': 0.1,
                     },
+                    'post': {
+                        'sub-account/subAccountApi/ipRestriction': 20.001, // Weight(UID): 3000 => cost = 0.006667 * 3000 = 20.001
+                    },
                 },
                 'sapiV3': {
                     'get': {
-                        'sub-account/assets': 1,
+                        'sub-account/assets': 0.40002, // Weight(UID): 60 => cost =  0.006667 * 60 = 0.40002
                     },
                     'post': {
                         'asset/getUserAsset': 0.5,
@@ -571,7 +578,7 @@ export default class binance extends Exchange {
                 },
                 'sapiV4': {
                     'get': {
-                        'sub-account/assets': 1,
+                        'sub-account/assets': 0.40002, // Weight(UID): 60 => cost = 0.006667 * 60 = 0.40002
                     },
                 },
                 // deprecated
@@ -826,55 +833,59 @@ export default class binance extends Exchange {
                     },
                 },
                 'public': {
+                    // IP (api) request rate limit of 6000 per minute
+                    // 1 IP (api) => cost = 0.2 => (1000 / (50 * 0.2)) * 60 = 6000
                     'get': {
-                        'ping': 1,
-                        'time': 1,
-                        'depth': { 'cost': 1, 'byLimit': [[100, 1], [500, 5], [1000, 10], [5000, 50]] },
-                        'trades': 1,
-                        'aggTrades': 1,
-                        'historicalTrades': 5,
-                        'klines': 1,
-                        'ticker/24hr': { 'cost': 1, 'noSymbol': 40 },
-                        'ticker/price': { 'cost': 1, 'noSymbol': 2 },
-                        'ticker/bookTicker': { 'cost': 1, 'noSymbol': 2 },
-                        'exchangeInfo': 10,
+                        'ping': 0.2,
+                        'time': 0.2,
+                        'depth': { 'cost': 0.4, 'byLimit': [[100, 0.4], [500, 2], [1000, 4], [5000, 20]] },
+                        'trades': 0.4,
+                        'aggTrades': 0.4,
+                        'historicalTrades': 2,
+                        'klines': 0.4,
+                        'uiKlines': 0.4,
+                        'ticker/24hr': { 'cost': 0.4, 'noSymbol': 16 },
+                        'ticker/price': { 'cost': 0.4, 'noSymbol': 0.8 },
+                        'ticker/bookTicker': { 'cost': 0.4, 'noSymbol': 0.8 },
+                        'exchangeInfo': 4,
+                        'avgPrice': 0.4,
                     },
                     'put': {
-                        'userDataStream': 1,
+                        'userDataStream': 0.4,
                     },
                     'post': {
-                        'userDataStream': 1,
+                        'userDataStream': 0.4,
                     },
                     'delete': {
-                        'userDataStream': 1,
+                        'userDataStream': 0.4,
                     },
                 },
                 'private': {
                     'get': {
-                        'allOrderList': 10,
-                        'openOrderList': 3,
-                        'orderList': 2,
-                        'order': 2,
-                        'openOrders': { 'cost': 3, 'noSymbol': 40 },
-                        'allOrders': 10,
-                        'account': 10,
-                        'myTrades': 10,
-                        'rateLimit/order': 20,
-                        'myPreventedMatches': 1,
-                        'myAllocations': 10,
+                        'allOrderList': 4,
+                        'openOrderList': 1.2,
+                        'orderList': 0.8,
+                        'order': 0.8,
+                        'openOrders': { 'cost': 1.2, 'noSymbol': 16 },
+                        'allOrders': 4,
+                        'account': 4,
+                        'myTrades': 4,
+                        'rateLimit/order': 8,
+                        'myPreventedMatches': 4,
+                        'myAllocations': 4,
                     },
                     'post': {
-                        'order/oco': 1,
-                        'sor/order': 1,
-                        'sor/order/test': 1,
-                        'order': 1,
-                        'order/cancelReplace': 1,
-                        'order/test': 1,
+                        'order/oco': 0.2,
+                        'sor/order': 0.2,
+                        'sor/order/test': 0.2,
+                        'order': 0.2,
+                        'order/cancelReplace': 0.2,
+                        'order/test': 0.2,
                     },
                     'delete': {
-                        'openOrders': 1,
-                        'orderList': 1,
-                        'order': 1,
+                        'openOrders': 0.2,
+                        'orderList': 0.2,
+                        'order': 0.2,
                     },
                 },
                 'papi': {

package/js/src/bithumb.js

@@ -636,7 +636,7 @@ export default class bithumb extends Exchange {
         await this.loadMarkets();
         const market = this.market(symbol);
         const request = {
-            'currency': market['base'],
+            'currency': market['base'] + '_' + market['quote'],
         };
         if (limit !== undefined) {
             request['count'] = limit; // default 20, max 100

package/js/src/bitmex.js

@@ -1354,8 +1354,8 @@ export default class bitmex extends Exchange {
             'change': undefined,
             'percentage': undefined,
             'average': undefined,
-            'baseVolume': this.convertFromRawQuantity(symbol, this.safeString(ticker, 'homeNotional24h')),
-            'quoteVolume': this.convertFromRawQuantity(symbol, this.safeString(ticker, 'foreignNotional24h')),
+            'baseVolume': this.safeString(ticker, 'homeNotional24h'),
+            'quoteVolume': this.safeString(ticker, 'foreignNotional24h'),
             'info': ticker,
         }, market);
     }

package/js/src/bybit.js

@@ -251,6 +251,7 @@ export default class bybit extends Exchange {
                         'v5/spot-lever-token/info': 2.5,
                         'v5/spot-lever-token/reference': 2.5,
                         // spot margin trade
+                        'v5/spot-margin-trade/data': 2.5,
                         'v5/spot-cross-margin-trade/data': 2.5,
                         'v5/spot-cross-margin-trade/pledge-token': 2.5,
                         'v5/spot-cross-margin-trade/borrow-token': 2.5,
@@ -2530,7 +2531,8 @@ export default class bybit extends Exchange {
         if (symbols !== undefined) {
             symbols = this.marketSymbols(symbols);
             market = this.market(symbols[0]);
-            if (symbols.length === 1) {
+            const symbolsLength = symbols.length;
+            if (symbolsLength === 1) {
                 request['symbol'] = market['id'];
             }
         }
@@ -3914,7 +3916,7 @@ export default class bybit extends Exchange {
                 const cost = this.safeNumber(params, 'cost');
                 params = this.omit(params, 'cost');
                 if (price === undefined && cost === undefined) {
-                    throw new InvalidOrder(this.id + " createOrder() requires the price argument with market buy orders to calculate total order cost (amount to spend), where cost = amount * price. Supply a price argument to createOrder() call if you want the cost to be calculated for you from price and amount, or, alternatively, add .options['createMarketBuyOrderRequiresPrice'] = false to supply the cost in the amount argument (the exchange-specific behaviour)");
+                    throw new InvalidOrder(this.id + ' createOrder() requires the price argument with market buy orders to calculate total order cost (amount to spend), where cost = amount * price. Supply a price argument to createOrder() call if you want the cost to be calculated for you from price and amount, or, alternatively, add .options["createMarketBuyOrderRequiresPrice"] = false to supply the cost in the amount argument (the exchange-specific behaviour)');
                 }
                 else {
                     const amountString = this.numberToString(amount);

package/js/src/coinsph.js

@@ -1868,9 +1868,9 @@ export default class coinsph extends Exchange {
                 if (i !== 0) {
                     encodedArrayParams += '&';
                 }
-                const array = query[key];
+                const innerArray = query[key];
                 query = this.omit(query, key);
-                const encodedArrayParam = this.parseArrayParam(array, key);
+                const encodedArrayParam = this.parseArrayParam(innerArray, key);
                 encodedArrayParams += encodedArrayParam;
             }
         }

package/js/src/krakenfutures.js

@@ -1220,7 +1220,7 @@ export default class krakenfutures extends Exchange {
         let statusId = undefined;
         let price = undefined;
         let trades = [];
-        if (orderEvents.length > 0) {
+        if (orderEvents.length) {
             const executions = [];
             for (let i = 0; i < orderEvents.length; i++) {
                 const item = orderEvents[i];
@@ -1268,7 +1268,7 @@ export default class krakenfutures extends Exchange {
         let remaining = this.safeString(details, 'unfilledSize');
         let average = undefined;
         let filled2 = '0.0';
-        if (trades.length > 0) {
+        if (trades.length) {
             let vwapSum = '0.0';
             for (let i = 0; i < trades.length; i++) {
                 const trade = trades[i];

package/js/src/mexc.js

@@ -195,6 +195,7 @@ export default class mexc extends Exchange {
                             'rebate/detail': 1,
                             'rebate/detail/kickback': 1,
                             'rebate/referCode': 1,
+                            'rebate/affiliate/commission': 1,
                             'mxDeduct/enable': 1,
                             'userDataStream': 1,
                         },

package/js/src/okcoin.js

@@ -2013,7 +2013,7 @@ export default class okcoin extends Exchange {
                             }
                         }
                         else if (notional === undefined) {
-                            throw new InvalidOrder(this.id + " createOrder() requires the price argument with market buy orders to calculate total order cost (amount to spend), where cost = amount * price. Supply a price argument to createOrder() call if you want the cost to be calculated for you from price and amount, or, alternatively, add .options['createMarketBuyOrderRequiresPrice'] = false and supply the total cost value in the 'amount' argument or in the 'notional' extra parameter (the exchange-specific behaviour)");
+                            throw new InvalidOrder(this.id + ' createOrder() requires the price argument with market buy orders to calculate total order cost (amount to spend), where cost = amount * price. Supply a price argument to createOrder() call if you want the cost to be calculated for you from price and amount, or, alternatively, add .options["createMarketBuyOrderRequiresPrice"] = false and supply the total cost value in the "amount" argument or in the "notional" extra parameter (the exchange-specific behaviour)');
                         }
                     }
                     else {
@@ -3490,7 +3490,7 @@ export default class okcoin extends Exchange {
         let currency = undefined;
         if (type === 'spot') {
             if (code === undefined) {
-                throw new ArgumentsRequired(this.id + " fetchLedger() requires a currency code argument for '" + type + "' markets");
+                throw new ArgumentsRequired(this.id + ' fetchLedger() requires a currency code argument for "' + type + '" markets');
             }
             argument = 'Currency';
             currency = this.currency(code);

package/js/src/okx.js

@@ -4318,7 +4318,7 @@ export default class okx extends Exchange {
             const targetNetwork = this.safeValue(currency['networks'], this.networkIdToCode(network), {});
             fee = this.safeString(targetNetwork, 'fee');
             if (fee === undefined) {
-                throw new ArgumentsRequired(this.id + " withdraw() requires a 'fee' string parameter, network transaction fee must be ≥ 0. Withdrawals to OKCoin or OKX are fee-free, please set '0'. Withdrawing to external digital asset address requires network transaction fee.");
+                throw new ArgumentsRequired(this.id + ' withdraw() requires a "fee" string parameter, network transaction fee must be ≥ 0. Withdrawals to OKCoin or OKX are fee-free, please set "0". Withdrawing to external digital asset address requires network transaction fee.');
             }
         }
         request['fee'] = this.numberToString(fee); // withdrawals to OKCoin or OKX are fee-free, please set 0

package/js/src/phemex.js

@@ -1610,8 +1610,13 @@ export default class phemex extends Exchange {
             id = this.safeString2(trade, 'execId', 'execID');
             orderId = this.safeString(trade, 'orderID');
             if (market['settle'] === 'USDT') {
-                const sideId = this.safeString(trade, 'side');
-                side = (sideId === '1') ? 'buy' : 'sell';
+                const sideId = this.safeStringLower(trade, 'side');
+                if ((sideId === 'buy') || (sideId === 'sell')) {
+                    side = sideId;
+                }
+                else if (sideId !== undefined) {
+                    side = (sideId === '1') ? 'buy' : 'sell';
+                }
                 const ordType = this.safeString(trade, 'ordType');
                 if (ordType === '1') {
                     type = 'market';
@@ -1619,7 +1624,7 @@ export default class phemex extends Exchange {
                 else if (ordType === '2') {
                     type = 'limit';
                 }
-                priceString = this.safeString(trade, 'priceRp');
+                priceString = this.safeString(trade, 'execPriceRp');
                 amountString = this.safeString(trade, 'execQtyRq');
                 costString = this.safeString(trade, 'execValueRv');
                 feeCostString = this.safeString(trade, 'execFeeRv');

package/js/src/poloniex.js

@@ -1207,25 +1207,21 @@ export default class poloniex extends Exchange {
         return this.parseOrders(response, market, since, limit, extension);
     }
     async createOrder(symbol, type, side, amount, price = undefined, params = {}) {
-        //
-        // @method
-        // @name poloniex#createOrder
-        // @description create a trade order
-        // @see https://docs.poloniex.com/#authenticated-endpoints-orders-create-order
-        // @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-create-order  // trigger orders
-        // @param {string} symbol unified symbol of the market to create an order in
-        // @param {string} type 'market' or 'limit'
-        // @param {string} side 'buy' or 'sell'
-        // @param {float} amount how much of currency you want to trade in units of base currency
-        // @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
-        // @param {object} [params] extra parameters specific to the poloniex api endpoint
-        // <<<<<<< HEAD
-        // @param {float} [params.triggerPrice] *spot only* The price at which a trigger order is triggered at
-        // @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // =======
-        // @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // >>>>>>> 1e1c747220aa06f7c710fc71e9b6658d1260c4d1
-        //
+        /**
+        * @method
+        * @name poloniex#createOrder
+        * @description create a trade order
+        * @see https://docs.poloniex.com/#authenticated-endpoints-orders-create-order
+        * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-create-order  // trigger orders
+        * @param {string} symbol unified symbol of the market to create an order in
+        * @param {string} type 'market' or 'limit'
+        * @param {string} side 'buy' or 'sell'
+        * @param {float} amount how much of currency you want to trade in units of base currency
+        * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
+        * @param {object} [params] extra parameters specific to the poloniex api endpoint
+        * @param {float} [params.triggerPrice] *spot only* The price at which a trigger order is triggered at
+        * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+        */
         await this.loadMarkets();
         const market = this.market(symbol);
         if (!market['spot']) {
@@ -1294,26 +1290,22 @@ export default class poloniex extends Exchange {
         return [request, params];
     }
     async editOrder(id, symbol, type, side, amount = undefined, price = undefined, params = {}) {
-        //
-        // @method
-        // @name poloniex#editOrder
-        // @description edit a trade order
-        // @see https://docs.poloniex.com/#authenticated-endpoints-orders-cancel-replace-order
-        // @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-cancel-replace-order
-        // @param {string} id order id
-        // @param {string} symbol unified symbol of the market to create an order in
-        // @param {string} type 'market' or 'limit'
-        // @param {string} side 'buy' or 'sell'
-        // @param {float} [amount] how much of the currency you want to trade in units of the base currency
-        // @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
-        // @param {object} [params] extra parameters specific to the poloniex api endpoint
-        // <<<<<<< HEAD
-        // @param {float} [params.triggerPrice] The price at which a trigger order is triggered at
-        // @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // =======
-        // @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // >>>>>>> 1e1c747220aa06f7c710fc71e9b6658d1260c4d1
-        //
+        /**
+        * @method
+        * @name poloniex#editOrder
+        * @description edit a trade order
+        * @see https://docs.poloniex.com/#authenticated-endpoints-orders-cancel-replace-order
+        * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-cancel-replace-order
+        * @param {string} id order id
+        * @param {string} symbol unified symbol of the market to create an order in
+        * @param {string} type 'market' or 'limit'
+        * @param {string} side 'buy' or 'sell'
+        * @param {float} [amount] how much of the currency you want to trade in units of the base currency
+        * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
+        * @param {object} [params] extra parameters specific to the poloniex api endpoint
+        * @param {float} [params.triggerPrice] The price at which a trigger order is triggered at
+        * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+        */
         await this.loadMarkets();
         const market = this.market(symbol);
         if (!market['spot']) {
@@ -1353,12 +1345,8 @@ export default class poloniex extends Exchange {
         // @param {string} id order id
         // @param {string} symbol unified symbol of the market the order was made in
         // @param {object} [params] extra parameters specific to the poloniex api endpoint
-        // <<<<<<< HEAD
         // @param {boolean} [params.trigger] true if canceling a trigger order
         // @returns {object} An [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // =======
-        // @returns {object} An [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // >>>>>>> 1e1c747220aa06f7c710fc71e9b6658d1260c4d1
         //
         await this.loadMarkets();
         const request = {};
@@ -1388,21 +1376,17 @@ export default class poloniex extends Exchange {
         return this.parseOrder(response);
     }
     async cancelAllOrders(symbol = undefined, params = {}) {
-        //
-        // @method
-        // @name poloniex#cancelAllOrders
-        // @description cancel all open orders
-        // @see https://docs.poloniex.com/#authenticated-endpoints-orders-cancel-all-orders
-        // @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-cancel-all-orders  // trigger orders
-        // @param {string} symbol unified market symbol, only orders in the market of this symbol are cancelled when symbol is not undefined
-        // @param {object} [params] extra parameters specific to the poloniex api endpoint
-        // <<<<<<< HEAD
-        // @param {boolean} [params.trigger] true if canceling trigger orders
-        // @returns {object[]} a list of [order structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // =======
-        // @returns {object[]} a list of [order structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // >>>>>>> 1e1c747220aa06f7c710fc71e9b6658d1260c4d1
-        //
+        /**
+        * @method
+        * @name poloniex#cancelAllOrders
+        * @description cancel all open orders
+        * @see https://docs.poloniex.com/#authenticated-endpoints-orders-cancel-all-orders
+        * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-cancel-all-orders  // trigger orders
+        * @param {string} symbol unified market symbol, only orders in the market of this symbol are cancelled when symbol is not undefined
+        * @param {object} [params] extra parameters specific to the poloniex api endpoint
+        * @param {boolean} [params.trigger] true if canceling trigger orders
+        * @returns {object[]} a list of [order structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+        */
         await this.loadMarkets();
         const request = {
             // 'accountTypes': 'SPOT',
@@ -1444,22 +1428,18 @@ export default class poloniex extends Exchange {
         return this.parseOrders(response, market);
     }
     async fetchOrder(id, symbol = undefined, params = {}) {
-        //
-        // @method
-        // @name poloniex#fetchOrder
-        // @description fetch an order by it's id
-        // @see https://docs.poloniex.com/#authenticated-endpoints-orders-order-details
-        // @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-open-orders  // trigger orders
-        // @param {string} id order id
-        // @param {string} symbol unified market symbol, default is undefined
-        // @param {object} [params] extra parameters specific to the poloniex api endpoint
-        // <<<<<<< HEAD
-        // @param {boolean} [params.trigger] true if fetching a trigger order
-        // @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // =======
-        // @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        // >>>>>>> 1e1c747220aa06f7c710fc71e9b6658d1260c4d1
-        //
+        /**
+        * @method
+        * @name poloniex#fetchOrder
+        * @description fetch an order by it's id
+        * @see https://docs.poloniex.com/#authenticated-endpoints-orders-order-details
+        * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-open-orders  // trigger orders
+        * @param {string} id order id
+        * @param {string} symbol unified market symbol, default is undefined
+        * @param {object} [params] extra parameters specific to the poloniex api endpoint
+        * @param {boolean} [params.trigger] true if fetching a trigger order
+        * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+        */
         await this.loadMarkets();
         id = id.toString();
         const request = {