ccxt 4.0.107 → 4.0.108

package/js/src/bitforex.js

@@ -159,6 +159,7 @@ export default class bitforex extends Exchange {
          * @method
          * @name bitforex#fetchMarkets
          * @description retrieves data on all markets for bitforex
+         * @see https://apidoc.bitforex.com/#exchange-information
          * @param {object} [params] extra parameters specific to the exchange api endpoint
          * @returns {object[]} an array of objects representing market data
          */
@@ -314,6 +315,7 @@ export default class bitforex extends Exchange {
          * @method
          * @name bitforex#fetchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://apidoc.bitforex.com/#recent-trades-list
          * @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
@@ -426,6 +428,7 @@ export default class bitforex extends Exchange {
          * @method
          * @name bitforex#fetchBalance
          * @description query for balance and get the amount of funds available for trading or funds locked in orders
+         * @see https://apidoc.bitforex.com/#user-all-asset-information-user_data
          * @param {object} [params] extra parameters specific to the bitforex api endpoint
          * @returns {object} a [balance structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#balance-structure}
          */
@@ -475,6 +478,7 @@ export default class bitforex extends Exchange {
          * @method
          * @name bitforex#fetchTicker
          * @description fetches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @see https://apidoc.bitforex.com/#exchange-information
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the bitforex api endpoint
          * @returns {object} a [ticker structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#ticker-structure}
@@ -529,6 +533,7 @@ export default class bitforex extends Exchange {
          * @method
          * @name bitforex#fetchOHLCV
          * @description fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://apidoc.bitforex.com/#kline
          * @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
@@ -565,6 +570,7 @@ export default class bitforex extends Exchange {
          * @method
          * @name bitforex#fetchOrderBook
          * @description fetches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+         * @see https://apidoc.bitforex.com/#order-book
          * @param {string} symbol unified symbol of the market to fetch the order book for
          * @param {int} [limit] the maximum amount of order book entries to return
          * @param {object} [params] extra parameters specific to the bitforex api endpoint
@@ -653,6 +659,7 @@ export default class bitforex extends Exchange {
          * @method
          * @name bitforex#fetchOrder
          * @description fetches information on an order made by the user
+         * @see
          * @param {string} symbol unified symbol of the market the order was made in
          * @param {object} [params] extra parameters specific to the bitforex api endpoint
          * @returns {object} An [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
@@ -718,6 +725,7 @@ export default class bitforex extends Exchange {
          * @method
          * @name bitforex#createOrder
          * @description create a trade order
+         * @see https://apidoc.bitforex.com/#new-order-trade
          * @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'
@@ -753,6 +761,7 @@ export default class bitforex extends Exchange {
          * @method
          * @name bitforex#cancelOrder
          * @description cancels an open order
+         * @see https://apidoc.bitforex.com/#cancel-order-trade
          * @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 bitforex api endpoint

package/js/src/exmo.js

@@ -1751,11 +1751,11 @@ export default class exmo extends Exchange {
             const marketIds = Object.keys(response);
             for (let i = 0; i < marketIds.length; i++) {
                 const marketId = marketIds[i];
-                const market = this.safeMarket(marketId);
+                const marketInner = this.safeMarket(marketId);
                 params = this.extend(params, {
                     'status': 'open',
                 });
-                const parsedOrders = this.parseOrders(response[marketId], market, since, limit, params);
+                const parsedOrders = this.parseOrders(response[marketId], marketInner, since, limit, params);
                 orders = this.arrayConcat(orders, parsedOrders);
             }
         }
@@ -1958,8 +1958,8 @@ export default class exmo extends Exchange {
         }
         const isSpot = (marginMode !== 'isolated');
         if (symbol !== undefined) {
-            const market = this.market(symbol);
-            symbol = market['symbol'];
+            const marketInner = this.market(symbol);
+            symbol = marketInner['symbol'];
         }
         const request = {
             'limit': limit,
@@ -1993,7 +1993,7 @@ export default class exmo extends Exchange {
             return this.parseOrders(response, market, since, limit, params);
         }
         else {
-            const response = await this.privatePostMarginUserOrderHistory(this.extend(request, params));
+            const responseSwap = await this.privatePostMarginUserOrderHistory(this.extend(request, params));
             //
             //    {
             //        "items": [
@@ -2018,7 +2018,7 @@ export default class exmo extends Exchange {
             //        ]
             //    }
             //
-            const items = this.safeValue(response, 'items');
+            const items = this.safeValue(responseSwap, 'items');
             const orders = this.parseOrders(items, market, since, limit, params);
             const result = [];
             for (let i = 0; i < orders.length; i++) {

package/js/src/pro/bitget.js

@@ -149,11 +149,11 @@ export default class bitget extends bitgetRest {
         const topics = [];
         for (let i = 0; i < marketIds.length; i++) {
             const marketId = marketIds[i];
-            const market = this.market(marketId);
+            const marketInner = this.market(marketId);
             const args = {
                 'instType': instType,
                 'channel': 'ticker',
-                'instId': this.getWsMarketId(market),
+                'instId': this.getWsMarketId(marketInner),
             };
             topics.push(args);
         }
@@ -193,12 +193,12 @@ export default class bitget extends bitgetRest {
         // watchTickers part
         const messageHashes = this.findMessageHashes(client, 'tickers::');
         for (let i = 0; i < messageHashes.length; i++) {
-            const messageHash = messageHashes[i];
-            const parts = messageHash.split('::');
+            const messageHashTicker = messageHashes[i];
+            const parts = messageHashTicker.split('::');
             const symbolsString = parts[1];
             const symbols = symbolsString.split(',');
             if (this.inArray(symbol, symbols)) {
-                client.resolve(ticker, messageHash);
+                client.resolve(ticker, messageHashTicker);
             }
         }
         return message;

package/js/src/pro/bybit.js

@@ -348,12 +348,12 @@ export default class bybit extends bybitRest {
         // watchTickers part
         const messageHashes = this.findMessageHashes(client, 'tickers::');
         for (let i = 0; i < messageHashes.length; i++) {
-            const messageHash = messageHashes[i];
-            const parts = messageHash.split('::');
+            const messageHashTicker = messageHashes[i];
+            const parts = messageHashTicker.split('::');
             const symbolsString = parts[1];
             const symbols = symbolsString.split(',');
             if (this.inArray(parsed['symbol'], symbols)) {
-                client.resolve(parsed, messageHash);
+                client.resolve(parsed, messageHashTicker);
             }
         }
     }

package/js/src/pro/woo.d.ts

@@ -24,6 +24,8 @@ export default class woo extends wooRest {
     parseWsOrder(order: any, market?: any): import("../base/types.js").Order;
     handleOrderUpdate(client: Client, message: any): void;
     handleOrder(client: Client, message: any): void;
+    watchBalance(params?: {}): Promise<any>;
+    handleBalance(client: any, message: any): void;
     handleMessage(client: Client, message: any): any;
     ping(client: any): {
         event: string;

package/js/src/pro/woo.js

@@ -16,7 +16,7 @@ export default class woo extends wooRest {
         return this.deepExtend(super.describe(), {
             'has': {
                 'ws': true,
-                'watchBalance': false,
+                'watchBalance': true,
                 'watchMyTrades': false,
                 'watchOHLCV': true,
                 'watchOrderBook': true,
@@ -607,6 +607,73 @@ export default class woo extends wooRest {
             client.resolve(this.orders, messageHashSymbol);
         }
     }
+    async watchBalance(params = {}) {
+        /**
+         * @method
+         * @see https://docs.woo.org/#balance
+         * @name woo#watchBalance
+         * @description watch balance and get the amount of funds available for trading or funds locked in orders
+         * @param {object} [params] extra parameters specific to the woo api endpoint
+         * @returns {object} a [balance structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#balance-structure}
+         */
+        await this.loadMarkets();
+        const topic = 'balance';
+        const messageHash = topic;
+        const request = {
+            'event': 'subscribe',
+            'topic': topic,
+        };
+        const message = this.extend(request, params);
+        return await this.watchPrivate(messageHash, message);
+    }
+    handleBalance(client, message) {
+        //
+        //   {
+        //       "topic": "balance",
+        //       "ts": 1695716888789,
+        //       "data": {
+        //          "balances": {
+        //             "USDT": {
+        //                "holding": 266.56059176,
+        //                "frozen": 0,
+        //                "interest": 0,
+        //                "pendingShortQty": 0,
+        //                "pendingExposure": 0,
+        //                "pendingLongQty": 0,
+        //                "pendingLongExposure": 0,
+        //                "version": 37,
+        //                "staked": 0,
+        //                "unbonding": 0,
+        //                "vault": 0,
+        //                "averageOpenPrice": 0,
+        //                "pnl24H": 0,
+        //                "fee24H": 0,
+        //                "markPrice": 1,
+        //                "pnl24HPercentage": 0
+        //             }
+        //          }
+        //
+        //    }
+        //
+        const data = this.safeValue(message, 'data');
+        const balances = this.safeValue(data, 'balances');
+        const keys = Object.keys(balances);
+        const ts = this.safeInteger(message, 'ts');
+        this.balance['info'] = data;
+        this.balance['timestamp'] = ts;
+        this.balance['datetime'] = this.iso8601(ts);
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i];
+            const value = balances[key];
+            const code = this.safeCurrencyCode(key);
+            const account = (code in this.balance) ? this.balance[code] : this.account();
+            account['total'] = this.safeString(value, 'holding');
+            account['used'] = this.safeString(value, 'frozen');
+            this.balance[code] = account;
+        }
+        this.balance = this.safeBalance(this.balance);
+        client.resolve(this.balance, 'balance');
+    }
     handleMessage(client, message) {
         const methods = {
             'ping': this.handlePing,
@@ -619,6 +686,7 @@ export default class woo extends wooRest {
             'auth': this.handleAuth,
             'executionreport': this.handleOrderUpdate,
             'trade': this.handleTrade,
+            'balance': this.handleBalance,
         };
         const event = this.safeString(message, 'event');
         let method = this.safeValue(methods, event);

package/package.json

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