ccxt 4.2.22 → 4.2.24

package/js/src/pro/bitopro.js

@@ -7,7 +7,7 @@
 // ----------------------------------------------------------------------------
 import bitoproRest from '../bitopro.js';
 import { ExchangeError } from '../base/errors.js';
-import { ArrayCache } from '../base/ws/Cache.js';
+import { ArrayCache, ArrayCacheBySymbolById } from '../base/ws/Cache.js';
 import { sha384 } from '../static_dependencies/noble-hashes/sha512.js';
 // ----------------------------------------------------------------------------
 export default class bitopro extends bitoproRest {
@@ -16,7 +16,7 @@ export default class bitopro extends bitoproRest {
             'has': {
                 'ws': true,
                 'watchBalance': true,
-                'watchMyTrades': false,
+                'watchMyTrades': true,
                 'watchOHLCV': false,
                 'watchOrderBook': true,
                 'watchOrders': false,
@@ -177,6 +177,150 @@ export default class bitopro extends bitoproRest {
         this.trades[symbol] = tradesCache;
         client.resolve(tradesCache, messageHash);
     }
+    async watchMyTrades(symbol = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name bitopro#watchMyTrades
+         * @description watches information on multiple trades made by the user
+         * @see https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/private/matches_stream.md
+         * @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
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=trade-structure
+         */
+        this.checkRequiredCredentials();
+        await this.loadMarkets();
+        let messageHash = 'USER_TRADE';
+        if (symbol !== undefined) {
+            const market = this.market(symbol);
+            messageHash = messageHash + ':' + market['symbol'];
+        }
+        const url = this.urls['ws']['private'] + '/' + 'user-trades';
+        this.authenticate(url);
+        const trades = await this.watch(url, messageHash, undefined, messageHash);
+        if (this.newUpdates) {
+            limit = trades.getLimit(symbol, limit);
+        }
+        return this.filterBySinceLimit(trades, since, limit, 'timestamp', true);
+    }
+    handleMyTrade(client, message) {
+        //
+        //     {
+        //         "event": "USER_TRADE",
+        //         "timestamp": 1694667358782,
+        //         "datetime": "2023-09-14T12:55:58.782Z",
+        //         "data": {
+        //             "base": "usdt",
+        //             "quote": "twd",
+        //             "side": "ask",
+        //             "price": "32.039",
+        //             "volume": "1",
+        //             "fee": "6407800",
+        //             "feeCurrency": "twd",
+        //             "transactionTimestamp": 1694667358,
+        //             "eventTimestamp": 1694667358,
+        //             "orderID": 390733918,
+        //             "orderType": "LIMIT",
+        //             "matchID": "bd07673a-94b1-419e-b5ee-d7b723261a5d",
+        //             "isMarket": false,
+        //             "isMaker": false
+        //         }
+        //     }
+        //
+        const data = this.safeValue(message, 'data', {});
+        const baseId = this.safeString(data, 'base');
+        const quoteId = this.safeString(data, 'quote');
+        const base = this.safeCurrencyCode(baseId);
+        const quote = this.safeCurrencyCode(quoteId);
+        const symbol = this.symbol(base + '/' + quote);
+        const messageHash = this.safeString(message, 'event');
+        if (this.myTrades === undefined) {
+            const limit = this.safeInteger(this.options, 'tradesLimit', 1000);
+            this.myTrades = new ArrayCacheBySymbolById(limit);
+        }
+        const trades = this.myTrades;
+        const parsed = this.parseWsTrade(data);
+        trades.append(parsed);
+        client.resolve(trades, messageHash);
+        client.resolve(trades, messageHash + ':' + symbol);
+    }
+    parseWsTrade(trade, market = undefined) {
+        //
+        //     {
+        //         "base": "usdt",
+        //         "quote": "twd",
+        //         "side": "ask",
+        //         "price": "32.039",
+        //         "volume": "1",
+        //         "fee": "6407800",
+        //         "feeCurrency": "twd",
+        //         "transactionTimestamp": 1694667358,
+        //         "eventTimestamp": 1694667358,
+        //         "orderID": 390733918,
+        //         "orderType": "LIMIT",
+        //         "matchID": "bd07673a-94b1-419e-b5ee-d7b723261a5d",
+        //         "isMarket": false,
+        //         "isMaker": false
+        //     }
+        //
+        const id = this.safeString(trade, 'matchID');
+        const orderId = this.safeString(trade, 'orderID');
+        const timestamp = this.safeTimestamp(trade, 'transactionTimestamp');
+        const baseId = this.safeString(trade, 'base');
+        const quoteId = this.safeString(trade, 'quote');
+        const base = this.safeCurrencyCode(baseId);
+        const quote = this.safeCurrencyCode(quoteId);
+        const symbol = this.symbol(base + '/' + quote);
+        market = this.safeMarket(symbol, market);
+        const price = this.safeString(trade, 'price');
+        const type = this.safeStringLower(trade, 'orderType');
+        let side = this.safeString(trade, 'side');
+        if (side !== undefined) {
+            if (side === 'ask') {
+                side = 'sell';
+            }
+            else if (side === 'bid') {
+                side = 'buy';
+            }
+        }
+        const amount = this.safeString(trade, 'volume');
+        let fee = undefined;
+        const feeAmount = this.safeString(trade, 'fee');
+        const feeSymbol = this.safeCurrencyCode(this.safeString(trade, 'feeCurrency'));
+        if (feeAmount !== undefined) {
+            fee = {
+                'cost': feeAmount,
+                'currency': feeSymbol,
+                'rate': undefined,
+            };
+        }
+        const isMaker = this.safeValue(trade, 'isMaker');
+        let takerOrMaker = undefined;
+        if (isMaker !== undefined) {
+            if (isMaker) {
+                takerOrMaker = 'maker';
+            }
+            else {
+                takerOrMaker = 'taker';
+            }
+        }
+        return this.safeTrade({
+            'id': id,
+            'info': trade,
+            'order': orderId,
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'symbol': symbol,
+            'takerOrMaker': takerOrMaker,
+            'type': type,
+            'side': side,
+            'price': price,
+            'amount': amount,
+            'cost': undefined,
+            'fee': fee,
+        }, market);
+    }
     async watchTicker(symbol, params = {}) {
         /**
          * @method
@@ -319,6 +463,7 @@ export default class bitopro extends bitoproRest {
             'TICKER': this.handleTicker,
             'ORDER_BOOK': this.handleOrderBook,
             'ACCOUNT_BALANCE': this.handleBalance,
+            'USER_TRADE': this.handleMyTrade,
         };
         const event = this.safeString(message, 'event');
         const method = this.safeValue(methods, event);

package/js/src/pro/hitbtc.js

@@ -35,6 +35,12 @@ export default class hitbtc extends hitbtcRest {
                         'private': 'wss://api.hitbtc.com/api/3/ws/trading',
                     },
                 },
+                'test': {
+                    'ws': {
+                        'public': 'wss://api.demo.hitbtc.com/api/3/ws/public',
+                        'private': 'wss://api.demo.hitbtc.com/api/3/ws/trading',
+                    },
+                },
             },
             'options': {
                 'tradesLimit': 1000,

package/js/src/pro/okx.js

@@ -853,13 +853,15 @@ export default class okx extends okxRest {
         /**
          * @method
          * @name okx#watchMyTrades
-         * @see https://www.okx.com/docs-v5/en/#order-book-trading-trade-ws-order-channel
          * @description watches information on multiple trades made by the user
+         * @see https://www.okx.com/docs-v5/en/#order-book-trading-trade-ws-order-channel
          * @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
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @param {bool} [params.stop] true if fetching trigger or conditional trades
+         * @param {string} [params.type] 'spot', 'swap', 'future', 'option', 'ANY', 'SPOT', 'MARGIN', 'SWAP', 'FUTURES' or 'OPTION'
+         * @param {string} [params.marginMode] 'cross' or 'isolated', for automatically setting the type to spot margin
          * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=trade-structure
          */
         // By default, receive order updates from any instrument type
@@ -881,7 +883,14 @@ export default class okx extends okxRest {
         if (type === 'future') {
             type = 'futures';
         }
-        const uppercaseType = type.toUpperCase();
+        let uppercaseType = type.toUpperCase();
+        let marginMode = undefined;
+        [marginMode, params] = this.handleMarginModeAndParams('watchMyTrades', params);
+        if (uppercaseType === 'SPOT') {
+            if (marginMode !== undefined) {
+                uppercaseType = 'MARGIN';
+            }
+        }
         const request = {
             'instType': uppercaseType,
         };
@@ -1027,7 +1036,6 @@ export default class okx extends okxRest {
          */
         let type = undefined;
         // By default, receive order updates from any instrument type
-        [type, params] = this.handleOptionAndParams(params, 'watchOrders', 'defaultType');
         [type, params] = this.handleOptionAndParams(params, 'watchOrders', 'type', 'ANY');
         const isStop = this.safeValue2(params, 'stop', 'trigger', false);
         params = this.omit(params, ['stop', 'trigger']);

package/package.json

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

package/skip-tests.json

@@ -338,6 +338,7 @@
         }
     },
     "bitopro": {
+        "skipWs": true,
         "skipMethods": {
             "fetchCurrencies": {
                 "precision": "not provided",