ccxt 4.4.25 → 4.4.26

package/js/src/pro/exmo.js

@@ -20,7 +20,7 @@ export default class exmo extends exmoRest {
                 'watchTickers': true,
                 'watchTrades': true,
                 'watchMyTrades': true,
-                'watchOrders': false,
+                'watchOrders': true,
                 'watchOrderBook': true,
                 'watchOHLCV': false,
             },
@@ -573,6 +573,219 @@ export default class exmo extends exmoRest {
             this.handleDelta(bookside, deltas[i]);
         }
     }
+    async watchOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name exmo#watchOrders
+         * @see https://documenter.getpostman.com/view/10287440/SzYXWKPi#85f7bc03-b1c9-4cd2-bd22-8fd422272825
+         * @see https://documenter.getpostman.com/view/10287440/SzYXWKPi#95e4ed18-1791-4e6d-83ad-cbfe9be1051c
+         * @description watches information on multiple orders made by the user
+         * @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
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
+        await this.loadMarkets();
+        await this.authenticate(params);
+        const [type, query] = this.handleMarketTypeAndParams('watchOrders', undefined, params);
+        const url = this.urls['api']['ws'][type];
+        let messageHash = undefined;
+        if (symbol === undefined) {
+            messageHash = 'orders:' + type;
+        }
+        else {
+            const market = this.market(symbol);
+            symbol = market['symbol'];
+            messageHash = 'orders:' + market['symbol'];
+        }
+        const message = {
+            'method': 'subscribe',
+            'topics': [
+                type + '/orders',
+            ],
+            'id': this.requestId(),
+        };
+        const request = this.deepExtend(message, query);
+        const orders = await this.watch(url, messageHash, request, messageHash, request);
+        return this.filterBySymbolSinceLimit(orders, symbol, since, limit, true);
+    }
+    handleOrders(client, message) {
+        //
+        //  spot
+        // {
+        //     "ts": 1574427585174,
+        //     "event": "snapshot",
+        //     "topic": "spot/orders",
+        //     "data": [
+        //       {
+        //         "order_id": "14",
+        //         "client_id":"100500",
+        //         "created": "1574427585",
+        //         "pair": "BTC_USD",
+        //         "price": "7750",
+        //         "quantity": "0.1",
+        //         "amount": "775",
+        //         "original_quantity": "0.1",
+        //         "original_amount": "775",
+        //         "type": "sell",
+        //         "status": "open"
+        //       }
+        //     ]
+        // }
+        //
+        //  margin
+        // {
+        //     "ts":1624371281773,
+        //     "event":"snapshot",
+        //     "topic":"margin/orders",
+        //     "data":[
+        //        {
+        //           "order_id":"692844278081168665",
+        //           "created":"1624371250919761600",
+        //           "type":"limit_buy",
+        //           "previous_type":"limit_buy",
+        //           "pair":"BTC_USD",
+        //           "leverage":"2",
+        //           "price":"10000",
+        //           "stop_price":"0",
+        //           "distance":"0",
+        //           "trigger_price":"10000",
+        //           "init_quantity":"0.1",
+        //           "quantity":"0.1",
+        //           "funding_currency":"USD",
+        //           "funding_quantity":"1000",
+        //           "funding_rate":"0",
+        //           "client_id":"111111",
+        //           "expire":0,
+        //           "src":1,
+        //           "comment":"comment1",
+        //           "updated":1624371250938136600,
+        //           "status":"active"
+        //        }
+        //     ]
+        // }
+        //
+        const topic = this.safeString(message, 'topic');
+        const parts = topic.split('/');
+        const type = this.safeString(parts, 0);
+        const messageHash = 'orders:' + type;
+        const event = this.safeString(message, 'event');
+        if (this.orders === undefined) {
+            const limit = this.safeInteger(this.options, 'ordersLimit', 1000);
+            this.orders = new ArrayCacheBySymbolById(limit);
+        }
+        const cachedOrders = this.orders;
+        let rawOrders = [];
+        if (event === 'snapshot') {
+            rawOrders = this.safeValue(message, 'data', []);
+        }
+        else if (event === 'update') {
+            const rawOrder = this.safeDict(message, 'data', {});
+            rawOrders.push(rawOrder);
+        }
+        const symbols = {};
+        for (let j = 0; j < rawOrders.length; j++) {
+            const order = this.parseWsOrder(rawOrders[j]);
+            cachedOrders.append(order);
+            symbols[order['symbol']] = true;
+        }
+        const symbolKeys = Object.keys(symbols);
+        for (let i = 0; i < symbolKeys.length; i++) {
+            const symbol = symbolKeys[i];
+            const symbolSpecificMessageHash = 'orders:' + symbol;
+            client.resolve(cachedOrders, symbolSpecificMessageHash);
+        }
+        client.resolve(cachedOrders, messageHash);
+    }
+    parseWsOrder(order, market = undefined) {
+        //
+        // {
+        //     order_id: '43226756791',
+        //     client_id: 0,
+        //     created: '1730371416',
+        //     type: 'market_buy',
+        //     pair: 'TRX_USD',
+        //     quantity: '0',
+        //     original_quantity: '30',
+        //     status: 'cancelled',
+        //     last_trade_id: '726480870',
+        //     last_trade_price: '0.17',
+        //     last_trade_quantity: '30'
+        // }
+        //
+        const id = this.safeString(order, 'order_id');
+        const timestamp = this.safeTimestamp(order, 'created');
+        const orderType = this.safeString(order, 'type');
+        const side = this.parseSide(orderType);
+        const marketId = this.safeString(order, 'pair');
+        market = this.safeMarket(marketId, market);
+        const symbol = market['symbol'];
+        let amount = this.safeString(order, 'quantity');
+        if (amount === undefined) {
+            const amountField = (side === 'buy') ? 'in_amount' : 'out_amount';
+            amount = this.safeString(order, amountField);
+        }
+        const price = this.safeString(order, 'price');
+        const clientOrderId = this.omitZero(this.safeString(order, 'client_id'));
+        const triggerPrice = this.omitZero(this.safeString(order, 'stop_price'));
+        let type = undefined;
+        if ((orderType !== 'buy') && (orderType !== 'sell')) {
+            type = orderType;
+        }
+        let trades = undefined;
+        if ('last_trade_id' in order) {
+            const trade = this.parseWsTrade(order, market);
+            trades = [trade];
+        }
+        return this.safeOrder({
+            'id': id,
+            'clientOrderId': clientOrderId,
+            'datetime': this.iso8601(timestamp),
+            'timestamp': timestamp,
+            'lastTradeTimestamp': undefined,
+            'status': this.parseStatus(this.safeString(order, 'status')),
+            'symbol': symbol,
+            'type': type,
+            'timeInForce': undefined,
+            'postOnly': undefined,
+            'side': side,
+            'price': price,
+            'stopPrice': triggerPrice,
+            'triggerPrice': triggerPrice,
+            'cost': undefined,
+            'amount': this.safeString(order, 'original_quantity'),
+            'filled': undefined,
+            'remaining': this.safeString(order, 'quantity'),
+            'average': undefined,
+            'trades': trades,
+            'fee': undefined,
+            'info': order,
+        }, market);
+    }
+    parseWsTrade(trade, market = undefined) {
+        const id = this.safeString(trade, 'order_id');
+        const orderType = this.safeString(trade, 'type');
+        const side = this.parseSide(orderType);
+        const marketId = this.safeString(trade, 'pair');
+        market = this.safeMarket(marketId, market);
+        const symbol = market['symbol'];
+        let type = undefined;
+        if ((orderType !== 'buy') && (orderType !== 'sell')) {
+            type = orderType;
+        }
+        return this.safeTrade({
+            'id': this.safeString(trade, 'last_trade_id'),
+            'symbol': symbol,
+            'order': id,
+            'type': type,
+            'side': side,
+            'price': this.safeString(trade, 'last_trade_price'),
+            'amount': this.safeString(trade, 'last_trade_quantity'),
+            'cost': undefined,
+            'fee': undefined,
+        }, market);
+    }
     handleMessage(client, message) {
         //
         // {
@@ -613,8 +826,8 @@ export default class exmo extends exmoRest {
                     'spot/trades': this.handleTrades,
                     'margin/trades': this.handleTrades,
                     'spot/order_book_updates': this.handleOrderBook,
-                    // 'spot/orders': this.handleOrders,
-                    // 'margin/orders': this.handleOrders,
+                    'spot/orders': this.handleOrders,
+                    'margin/orders': this.handleOrders,
                     'spot/user_trades': this.handleMyTrades,
                     'margin/user_trades': this.handleMyTrades,
                 };

package/js/src/whitebit.d.ts

@@ -1,5 +1,5 @@
 import Exchange from './abstract/whitebit.js';
-import type { TransferEntry, Balances, Currency, Int, Market, OHLCV, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, Trade, Transaction, Num, Currencies, TradingFees, Dict, int, FundingRate, FundingRates, DepositAddress } from './base/types.js';
+import type { TransferEntry, Balances, Currency, Int, Market, OHLCV, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, Trade, Transaction, Num, Currencies, TradingFees, Dict, int, FundingRate, FundingRates, DepositAddress, BorrowInterest } from './base/types.js';
 /**
  * @class whitebit
  * @augments Exchange
@@ -57,18 +57,8 @@ export default class whitebit extends Exchange {
     parseTransactionStatus(status: Str): string;
     fetchDeposit(id: string, code?: Str, params?: {}): Promise<Transaction>;
     fetchDeposits(code?: Str, since?: Int, limit?: Int, params?: {}): Promise<Transaction[]>;
-    fetchBorrowInterest(code?: Str, symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<any>;
-    parseBorrowInterest(info: Dict, market?: Market): {
-        symbol: string;
-        marginMode: string;
-        currency: string;
-        interest: number;
-        interestRate: number;
-        amountBorrowed: number;
-        timestamp: number;
-        datetime: string;
-        info: Dict;
-    };
+    fetchBorrowInterest(code?: Str, symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<BorrowInterest[]>;
+    parseBorrowInterest(info: Dict, market?: Market): BorrowInterest;
     fetchFundingRate(symbol: string, params?: {}): Promise<FundingRate>;
     fetchFundingRates(symbols?: Strings, params?: {}): Promise<FundingRates>;
     parseFundingRate(contract: any, market?: Market): FundingRate;

package/js/src/whitebit.js

@@ -2360,15 +2360,15 @@ export default class whitebit extends Exchange {
         const symbol = this.safeSymbol(marketId, market, '_');
         const timestamp = this.safeTimestamp(info, 'modifyDate');
         return {
+            'info': info,
             'symbol': symbol,
-            'marginMode': 'cross',
             'currency': 'USDT',
             'interest': this.safeNumber(info, 'unrealizedFunding'),
             'interestRate': 0.00098,
             'amountBorrowed': this.safeNumber(info, 'amount'),
+            'marginMode': 'cross',
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
-            'info': info,
         };
     }
     async fetchFundingRate(symbol, params = {}) {

package/js/src/woo.d.ts

@@ -69,7 +69,7 @@ export default class woo extends Exchange {
     parseTransfer(transfer: Dict, currency?: Currency): TransferEntry;
     parseTransferStatus(status: Str): Str;
     withdraw(code: string, amount: number, address: string, tag?: any, params?: {}): Promise<Transaction>;
-    repayMargin(code: string, amount: any, symbol?: Str, params?: {}): Promise<any>;
+    repayMargin(code: string, amount: number, symbol?: Str, params?: {}): Promise<any>;
     parseMarginLoan(info: any, currency?: Currency): {
         id: any;
         currency: string;

package/js/src/xt.js

@@ -1973,6 +1973,17 @@ export default class xt extends Exchange {
         //         "b": true
         //     }
         //
+        // spot: watchTrades
+        //
+        //    {
+        //        s: 'btc_usdt',
+        //        i: '228825383103928709',
+        //        t: 1684258222702,
+        //        p: '27003.65',
+        //        q: '0.000796',
+        //        b: true
+        //    }
+        //
         // spot: watchMyTrades
         //
         //    {
@@ -1985,17 +1996,6 @@ export default class xt extends Exchange {
         //        "v": "90000"                    // volume trade amount
         //    }
         //
-        // spot: watchTrades
-        //
-        //    {
-        //        s: 'btc_usdt',
-        //        i: '228825383103928709',
-        //        t: 1684258222702,
-        //        p: '27003.65',
-        //        q: '0.000796',
-        //        b: true
-        //    }
-        //
         // swap and future: fetchTrades
         //
         //     {
@@ -2075,22 +2075,34 @@ export default class xt extends Exchange {
             marketType = hasSpotKeys ? 'spot' : 'contract';
         }
         market = this.safeMarket(marketId, market, '_', marketType);
-        const bidOrAsk = this.safeString(trade, 'm');
-        let side = this.safeStringLower(trade, 'orderSide');
-        if (bidOrAsk !== undefined) {
-            side = (bidOrAsk === 'BID') ? 'buy' : 'sell';
-        }
-        const buyerMaker = this.safeValue(trade, 'b');
-        if (buyerMaker !== undefined) {
-            side = 'buy';
-        }
-        let takerOrMaker = this.safeStringLower(trade, 'takerMaker');
-        if (buyerMaker !== undefined) {
-            takerOrMaker = buyerMaker ? 'maker' : 'taker';
-        }
-        const isMaker = this.safeBool(trade, 'isMaker');
-        if (isMaker !== undefined) {
-            takerOrMaker = isMaker ? 'maker' : 'taker';
+        let side = undefined;
+        let takerOrMaker = undefined;
+        const isBuyerMaker = this.safeBool(trade, 'b');
+        if (isBuyerMaker !== undefined) {
+            side = isBuyerMaker ? 'sell' : 'buy';
+            takerOrMaker = 'taker'; // public trades always taker
+        }
+        else {
+            const takerMaker = this.safeStringLower(trade, 'takerMaker');
+            if (takerMaker !== undefined) {
+                takerOrMaker = takerMaker;
+            }
+            else {
+                const isMaker = this.safeBool(trade, 'isMaker');
+                if (isMaker !== undefined) {
+                    takerOrMaker = isMaker ? 'maker' : 'taker';
+                }
+            }
+            const orderSide = this.safeStringLower(trade, 'orderSide');
+            if (orderSide !== undefined) {
+                side = orderSide;
+            }
+            else {
+                const bidOrAsk = this.safeString(trade, 'm');
+                if (bidOrAsk !== undefined) {
+                    side = (bidOrAsk === 'BID') ? 'buy' : 'sell';
+                }
+            }
         }
         const timestamp = this.safeIntegerN(trade, ['t', 'time', 'timestamp']);
         const quantity = this.safeString2(trade, 'q', 'quantity');

package/package.json

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