ccxt 4.3.53 → 4.3.54

package/js/src/pro/bybit.js

@@ -135,7 +135,7 @@ export default class bybit extends bybitRest {
         this.options['requestId'] = requestId;
         return requestId;
     }
-    getUrlByMarketType(symbol = undefined, isPrivate = false, method = undefined, params = {}) {
+    async getUrlByMarketType(symbol = undefined, isPrivate = false, method = undefined, params = {}) {
         const accessibility = isPrivate ? 'private' : 'public';
         let isUsdcSettled = undefined;
         let isSpot = undefined;
@@ -155,7 +155,15 @@ export default class bybit extends bybitRest {
         }
         isSpot = (type === 'spot');
         if (isPrivate) {
-            url = (isUsdcSettled) ? url[accessibility]['usdc'] : url[accessibility]['contract'];
+            const unified = await this.isUnifiedEnabled();
+            const isUnifiedMargin = this.safeBool(unified, 0, false);
+            const isUnifiedAccount = this.safeBool(unified, 1, false);
+            if (isUsdcSettled && !isUnifiedMargin && !isUnifiedAccount) {
+                url = url[accessibility]['usdc'];
+            }
+            else {
+                url = url[accessibility]['contract'];
+            }
         }
         else {
             if (isSpot) {
@@ -322,7 +330,7 @@ export default class bybit extends bybitRest {
         const market = this.market(symbol);
         symbol = market['symbol'];
         const messageHash = 'ticker:' + symbol;
-        const url = this.getUrlByMarketType(symbol, false, 'watchTicker', params);
+        const url = await this.getUrlByMarketType(symbol, false, 'watchTicker', params);
         params = this.cleanParams(params);
         const options = this.safeValue(this.options, 'watchTicker', {});
         let topic = this.safeString(options, 'name', 'tickers');
@@ -347,7 +355,7 @@ export default class bybit extends bybitRest {
         await this.loadMarkets();
         symbols = this.marketSymbols(symbols, undefined, false);
         const messageHashes = [];
-        const url = this.getUrlByMarketType(symbols[0], false, 'watchTickers', params);
+        const url = await this.getUrlByMarketType(symbols[0], false, 'watchTickers', params);
         params = this.cleanParams(params);
         const options = this.safeValue(this.options, 'watchTickers', {});
         const topic = this.safeString(options, 'name', 'tickers');
@@ -528,7 +536,7 @@ export default class bybit extends bybitRest {
         await this.loadMarkets();
         const market = this.market(symbol);
         symbol = market['symbol'];
-        const url = this.getUrlByMarketType(symbol, false, 'watchOHLCV', params);
+        const url = await this.getUrlByMarketType(symbol, false, 'watchOHLCV', params);
         params = this.cleanParams(params);
         let ohlcv = undefined;
         const timeframeId = this.safeString(this.timeframes, timeframe, timeframe);
@@ -646,7 +654,7 @@ export default class bybit extends bybitRest {
             throw new ArgumentsRequired(this.id + ' watchOrderBookForSymbols() requires a non-empty array of symbols');
         }
         symbols = this.marketSymbols(symbols);
-        const url = this.getUrlByMarketType(symbols[0], false, 'watchOrderBook', params);
+        const url = await this.getUrlByMarketType(symbols[0], false, 'watchOrderBook', params);
         params = this.cleanParams(params);
         const market = this.market(symbols[0]);
         if (limit === undefined) {
@@ -778,7 +786,7 @@ export default class bybit extends bybitRest {
             throw new ArgumentsRequired(this.id + ' watchTradesForSymbols() requires a non-empty array of symbols');
         }
         params = this.cleanParams(params);
-        const url = this.getUrlByMarketType(symbols[0], false, 'watchTrades', params);
+        const url = await this.getUrlByMarketType(symbols[0], false, 'watchTrades', params);
         const topics = [];
         const messageHashes = [];
         for (let i = 0; i < symbols.length; i++) {
@@ -941,7 +949,7 @@ export default class bybit extends bybitRest {
             symbol = this.symbol(symbol);
             messageHash += ':' + symbol;
         }
-        const url = this.getUrlByMarketType(symbol, true, method, params);
+        const url = await this.getUrlByMarketType(symbol, true, method, params);
         await this.authenticate(url);
         const topicByMarket = {
             'spot': 'ticketInfo',
@@ -1070,7 +1078,7 @@ export default class bybit extends bybitRest {
             messageHash = '::' + symbols.join(',');
         }
         const firstSymbol = this.safeString(symbols, 0);
-        const url = this.getUrlByMarketType(firstSymbol, true, method, params);
+        const url = await this.getUrlByMarketType(firstSymbol, true, method, params);
         messageHash = 'positions' + messageHash;
         const client = this.client(url);
         await this.authenticate(url);
@@ -1221,7 +1229,7 @@ export default class bybit extends bybitRest {
         await this.loadMarkets();
         const market = this.market(symbol);
         symbol = market['symbol'];
-        const url = this.getUrlByMarketType(symbol, false, 'watchLiquidations', params);
+        const url = await this.getUrlByMarketType(symbol, false, 'watchLiquidations', params);
         params = this.cleanParams(params);
         const messageHash = 'liquidations::' + symbol;
         const topic = 'liquidation.' + market['id'];
@@ -1305,7 +1313,7 @@ export default class bybit extends bybitRest {
             symbol = this.symbol(symbol);
             messageHash += ':' + symbol;
         }
-        const url = this.getUrlByMarketType(symbol, true, method, params);
+        const url = await this.getUrlByMarketType(symbol, true, method, params);
         await this.authenticate(url);
         const topicsByMarket = {
             'spot': ['order', 'stopOrder'],
@@ -1617,7 +1625,7 @@ export default class bybit extends bybitRest {
         const unified = await this.isUnifiedEnabled();
         const isUnifiedMargin = this.safeBool(unified, 0, false);
         const isUnifiedAccount = this.safeBool(unified, 1, false);
-        const url = this.getUrlByMarketType(undefined, true, method, params);
+        const url = await this.getUrlByMarketType(undefined, true, method, params);
         await this.authenticate(url);
         const topicByMarket = {
             'spot': 'outboundAccountInfo',

package/js/src/pro/kucoin.js

@@ -159,6 +159,7 @@ export default class kucoin extends kucoinRest {
          * @method
          * @name kucoin#watchTicker
          * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @see https://www.kucoin.com/docs/websocket/spot-trading/public-channels/market-snapshot
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
@@ -391,6 +392,7 @@ export default class kucoin extends kucoinRest {
          * @method
          * @name kucoin#watchOHLCV
          * @description watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://www.kucoin.com/docs/websocket/spot-trading/public-channels/klines
          * @param {string} symbol unified symbol of the market to fetch OHLCV data for
          * @param {string} timeframe the length of time each candle represents
          * @param {int} [since] timestamp in ms of the earliest candle to fetch
@@ -459,6 +461,7 @@ export default class kucoin extends kucoinRest {
          * @method
          * @name kucoin#watchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://www.kucoin.com/docs/websocket/spot-trading/public-channels/match-execution-data
          * @param {string} symbol unified symbol of the market to fetch trades for
          * @param {int} [since] timestamp in ms of the earliest trade to fetch
          * @param {int} [limit] the maximum amount of trades to fetch
@@ -472,6 +475,7 @@ export default class kucoin extends kucoinRest {
          * @method
          * @name kucoin#watchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://www.kucoin.com/docs/websocket/spot-trading/public-channels/match-execution-data
          * @param {string} symbol unified symbol of the market to fetch trades for
          * @param {int} [since] timestamp in ms of the earliest trade to fetch
          * @param {int} [limit] the maximum amount of trades to fetch
@@ -806,6 +810,8 @@ export default class kucoin extends kucoinRest {
          * @method
          * @name kucoin#watchOrders
          * @description watches information on multiple orders made by the user
+         * @see https://www.kucoin.com/docs/websocket/spot-trading/private-channels/private-order-change
+         * @see https://www.kucoin.com/docs/websocket/spot-trading/private-channels/stop-order-event
          * @param {string} symbol unified market symbol of the market orders were made in
          * @param {int} [since] the earliest time in ms to fetch orders for
          * @param {int} [limit] the maximum number of order structures to retrieve
@@ -942,6 +948,10 @@ export default class kucoin extends kucoinRest {
         //
         const messageHash = 'orders';
         const data = this.safeValue(message, 'data');
+        const tradeId = this.safeString(data, 'tradeId');
+        if (tradeId !== undefined) {
+            this.handleMyTrade(client, message);
+        }
         const parsed = this.parseWsOrder(data);
         const symbol = this.safeString(parsed, 'symbol');
         const orderId = this.safeString(parsed, 'id');
@@ -971,6 +981,7 @@ export default class kucoin extends kucoinRest {
          * @method
          * @name kucoin#watchMyTrades
          * @description watches information on multiple trades made by the user
+         * @see https://www.kucoin.com/docs/websocket/spot-trading/private-channels/private-order-change
          * @param {string} symbol unified market symbol of the market trades were made in
          * @param {int} [since] the earliest time in ms to fetch trades for
          * @param {int} [limit] the maximum number of trade structures to retrieve
@@ -979,7 +990,7 @@ export default class kucoin extends kucoinRest {
          */
         await this.loadMarkets();
         const url = await this.negotiate(true);
-        const topic = '/spot/tradeFills';
+        const topic = '/spotMarket/tradeOrders';
         const request = {
             'privateChannel': true,
         };
@@ -996,6 +1007,34 @@ export default class kucoin extends kucoinRest {
         return this.filterBySymbolSinceLimit(trades, symbol, since, limit, true);
     }
     handleMyTrade(client, message) {
+        //
+        //     {
+        //         "type": "message",
+        //         "topic": "/spotMarket/tradeOrders",
+        //         "subject": "orderChange",
+        //         "channelType": "private",
+        //         "data": {
+        //             "symbol": "KCS-USDT",
+        //             "orderType": "limit",
+        //             "side": "sell",
+        //             "orderId": "5efab07953bdea00089965fa",
+        //             "liquidity": "taker",
+        //             "type": "match",
+        //             "feeType": "takerFee",
+        //             "orderTime": 1670329987026,
+        //             "size": "0.1",
+        //             "filledSize": "0.1",
+        //             "price": "0.938",
+        //             "matchPrice": "0.96738",
+        //             "matchSize": "0.1",
+        //             "tradeId": "5efab07a4ee4c7000a82d6d9",
+        //             "clientOid": "1593487481000313",
+        //             "remainSize": "0",
+        //             "status": "match",
+        //             "ts": 1670329987311000000
+        //         }
+        //     }
+        //
         if (this.myTrades === undefined) {
             const limit = this.safeInteger(this.options, 'tradesLimit', 1000);
             this.myTrades = new ArrayCacheBySymbolById(limit);
@@ -1010,19 +1049,26 @@ export default class kucoin extends kucoinRest {
     }
     parseWsTrade(trade, market = undefined) {
         //
-        // {
-        //     "fee": 0.00262148,
-        //     "feeCurrency": "USDT",
-        //     "feeRate": 0.001,
-        //     "orderId": "62417436b29df8000183df2f",
-        //     "orderType": "market",
-        //     "price": 131.074,
-        //     "side": "sell",
-        //     "size": 0.02,
-        //     "symbol": "LTC-USDT",
-        //     "time": "1648456758734571745",
-        //     "tradeId": "624174362e113d2f467b3043"
-        //   }
+        //     {
+        //         "symbol": "KCS-USDT",
+        //         "orderType": "limit",
+        //         "side": "sell",
+        //         "orderId": "5efab07953bdea00089965fa",
+        //         "liquidity": "taker",
+        //         "type": "match",
+        //         "feeType": "takerFee",
+        //         "orderTime": 1670329987026,
+        //         "size": "0.1",
+        //         "filledSize": "0.1",
+        //         "price": "0.938",
+        //         "matchPrice": "0.96738",
+        //         "matchSize": "0.1",
+        //         "tradeId": "5efab07a4ee4c7000a82d6d9",
+        //         "clientOid": "1593487481000313",
+        //         "remainSize": "0",
+        //         "status": "match",
+        //         "ts": 1670329987311000000
+        //     }
         //
         const marketId = this.safeString(trade, 'symbol');
         market = this.safeMarket(marketId, market, '-');
@@ -1033,15 +1079,7 @@ export default class kucoin extends kucoinRest {
         const price = this.safeString(trade, 'price');
         const amount = this.safeString(trade, 'size');
         const order = this.safeString(trade, 'orderId');
-        const timestamp = this.safeIntegerProduct(trade, 'time', 0.000001);
-        const feeCurrency = market['quote'];
-        const feeRate = this.safeString(trade, 'feeRate');
-        const feeCost = this.safeString(trade, 'fee');
-        const fee = {
-            'cost': feeCost,
-            'rate': feeRate,
-            'currency': feeCurrency,
-        };
+        const timestamp = this.safeIntegerProduct(trade, 'ts', 0.000001);
         return this.safeTrade({
             'info': trade,
             'timestamp': timestamp,
@@ -1050,12 +1088,12 @@ export default class kucoin extends kucoinRest {
             'id': tradeId,
             'order': order,
             'type': type,
-            'takerOrMaker': undefined,
+            'takerOrMaker': this.safeString(trade, 'liquidity'),
             'side': side,
             'price': price,
             'amount': amount,
             'cost': undefined,
-            'fee': fee,
+            'fee': undefined,
         }, market);
     }
     async watchBalance(params = {}) {
@@ -1063,6 +1101,7 @@ export default class kucoin extends kucoinRest {
          * @method
          * @name kucoin#watchBalance
          * @description watch balance and get the amount of funds available for trading or funds locked in orders
+         * @see https://www.kucoin.com/docs/websocket/spot-trading/private-channels/account-balance-change
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
          */
@@ -1161,7 +1200,6 @@ export default class kucoin extends kucoinRest {
             'trade.l3match': this.handleTrade,
             'trade.candles.update': this.handleOHLCV,
             'account.balance': this.handleBalance,
-            '/spot/tradeFills': this.handleMyTrade,
             'orderChange': this.handleOrder,
             'stopOrder': this.handleOrder,
         };

package/js/src/pro/vertex.js

@@ -325,7 +325,7 @@ export default class vertex extends vertexRest {
         //     "ask_qty": "1000" // quantity at the lowest ask
         // }
         //
-        const timestamp = Precise.stringDiv(this.safeString(ticker, 'timestamp'), '1000000');
+        const timestamp = this.safeIntegerProduct(ticker, 'timestamp', 0.000001);
         return this.safeTicker({
             'symbol': this.safeSymbol(undefined, market),
             'timestamp': timestamp,

package/js/src/woo.d.ts

@@ -22,6 +22,7 @@ export default class woo extends Exchange {
     fetchTradingFees(params?: {}): Promise<TradingFees>;
     fetchCurrencies(params?: {}): Promise<Currencies>;
     createMarketBuyOrderWithCost(symbol: string, cost: number, params?: {}): Promise<Order>;
+    createMarketSellOrderWithCost(symbol: string, cost: number, params?: {}): Promise<Order>;
     createTrailingAmountOrder(symbol: string, type: OrderType, side: OrderSide, amount: number, price?: Num, trailingAmount?: any, trailingTriggerPrice?: any, params?: {}): Promise<Order>;
     createTrailingPercentOrder(symbol: string, type: OrderType, side: OrderSide, amount: number, price?: Num, trailingPercent?: any, trailingTriggerPrice?: any, params?: {}): Promise<Order>;
     createOrder(symbol: string, type: OrderType, side: OrderSide, amount: number, price?: Num, params?: {}): Promise<Order>;

package/js/src/woo.js

@@ -45,7 +45,7 @@ export default class woo extends Exchange {
                 'createMarketBuyOrderWithCost': true,
                 'createMarketOrder': false,
                 'createMarketOrderWithCost': false,
-                'createMarketSellOrderWithCost': false,
+                'createMarketSellOrderWithCost': true,
                 'createOrder': true,
                 'createOrderWithTakeProfitAndStopLoss': true,
                 'createReduceOnlyOrder': true,
@@ -853,8 +853,25 @@ export default class woo extends Exchange {
         if (!market['spot']) {
             throw new NotSupported(this.id + ' createMarketBuyOrderWithCost() supports spot orders only');
         }
-        params['createMarketBuyOrderRequiresPrice'] = false;
-        return await this.createOrder(symbol, 'market', 'buy', cost, undefined, params);
+        return await this.createOrder(symbol, 'market', 'buy', cost, 1, params);
+    }
+    async createMarketSellOrderWithCost(symbol, cost, params = {}) {
+        /**
+         * @method
+         * @name woo#createMarketSellOrderWithCost
+         * @description create a market sell order by providing the symbol and cost
+         * @see https://docs.woo.org/#send-order
+         * @param {string} symbol unified symbol of the market to create an order in
+         * @param {float} cost how much you want to trade in units of the quote currency
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        if (!market['spot']) {
+            throw new NotSupported(this.id + ' createMarketSellOrderWithCost() supports spot orders only');
+        }
+        return await this.createOrder(symbol, 'market', 'sell', cost, 1, params);
     }
     async createTrailingAmountOrder(symbol, type, side, amount, price = undefined, trailingAmount = undefined, trailingTriggerPrice = undefined, params = {}) {
         /**
@@ -977,33 +994,24 @@ export default class woo extends Exchange {
         if (reduceOnly) {
             request[reduceOnlyKey] = reduceOnly;
         }
-        if (price !== undefined) {
+        if (!isMarket && price !== undefined) {
             request[priceKey] = this.priceToPrecision(symbol, price);
         }
         if (isMarket && !isStop) {
             // for market buy it requires the amount of quote currency to spend
-            if (market['spot'] && orderSide === 'BUY') {
+            const cost = this.safeString2(params, 'cost', 'order_amount');
+            params = this.omit(params, ['cost', 'order_amount']);
+            const isPriceProvided = price !== undefined;
+            if (market['spot'] && (isPriceProvided || (cost !== undefined))) {
                 let quoteAmount = undefined;
-                let createMarketBuyOrderRequiresPrice = true;
-                [createMarketBuyOrderRequiresPrice, params] = this.handleOptionAndParams(params, 'createOrder', 'createMarketBuyOrderRequiresPrice', true);
-                const cost = this.safeNumber2(params, 'cost', 'order_amount');
-                params = this.omit(params, ['cost', 'order_amount']);
                 if (cost !== undefined) {
                     quoteAmount = this.costToPrecision(symbol, cost);
                 }
-                else if (createMarketBuyOrderRequiresPrice) {
-                    if (price === undefined) {
-                        throw new InvalidOrder(this.id + ' createOrder() requires the price argument for market buy orders to calculate the total cost to spend (amount * price), alternatively set the createMarketBuyOrderRequiresPrice option or param to false and pass the cost to spend (quote quantity) in the amount argument');
-                    }
-                    else {
-                        const amountString = this.numberToString(amount);
-                        const priceString = this.numberToString(price);
-                        const costRequest = Precise.stringMul(amountString, priceString);
-                        quoteAmount = this.costToPrecision(symbol, costRequest);
-                    }
-                }
                 else {
-                    quoteAmount = this.costToPrecision(symbol, amount);
+                    const amountString = this.numberToString(amount);
+                    const priceString = this.numberToString(price);
+                    const costRequest = Precise.stringMul(amountString, priceString);
+                    quoteAmount = this.costToPrecision(symbol, costRequest);
                 }
                 request['order_amount'] = quoteAmount;
             }

package/package.json

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