ccxt 4.1.22 → 4.1.23

package/dist/cjs/ccxt.js

@@ -180,7 +180,7 @@ var woo$1 = require('./src/pro/woo.js');
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.1.22';
+const version = '4.1.23';
 Exchange["default"].ccxtVersion = version;
 const exchanges = {
     'ace': ace,

package/dist/cjs/src/ascendex.js

@@ -220,6 +220,7 @@ class ascendex extends ascendex$1 {
                                 'futures/position': 1,
                                 'futures/free-margin': 1,
                                 'futures/order/hist/current': 1,
+                                'futures/funding-payments': 1,
                                 'futures/order/open': 1,
                                 'futures/order/status': 1,
                             },

package/dist/cjs/src/base/ws/OrderBookSide.js

@@ -180,14 +180,22 @@ class IndexedOrderBookSide extends Array {
                 // in case price is not sent
                 delta[0] = Math.abs(index_price);
                 if (index_price === old_price) {
-                    const index = bisectLeft(this.index, index_price);
+                    // find index by price and advance till the id is found
+                    let index = bisectLeft(this.index, index_price);
+                    while (this[index][2] !== id) {
+                        index++;
+                    }
                     this.index[index] = index_price;
                     this[index] = delta;
                     return;
                 }
                 else {
                     // remove old price from index
-                    const old_index = bisectLeft(this.index, old_price);
+                    // find index by price and advance till the id is found
+                    let old_index = bisectLeft(this.index, old_price);
+                    while (this[old_index][2] !== id) {
+                        old_index++;
+                    }
                     this.index.copyWithin(old_index, old_index + 1, this.index.length);
                     this.index[this.length - 1] = Number.MAX_VALUE;
                     this.copyWithin(old_index, old_index + 1, this.length);
@@ -196,7 +204,12 @@ class IndexedOrderBookSide extends Array {
             }
             // insert new price level
             this.hashmap.set(id, index_price);
-            const index = bisectLeft(this.index, index_price);
+            // find index by price to insert
+            let index = bisectLeft(this.index, index_price);
+            // if several with the same price order by id
+            while (index < this.length && this.index[index] === index_price && this[index][2] < id) {
+                index++;
+            }
             // insert new price level into index
             this.length++;
             this.index.copyWithin(index + 1, index, this.index.length);
@@ -213,7 +226,10 @@ class IndexedOrderBookSide extends Array {
         }
         else if (this.hashmap.has(id)) {
             const old_price = this.hashmap.get(id);
-            const index = bisectLeft(this.index, old_price);
+            let index = bisectLeft(this.index, old_price);
+            while (this[index][2] !== id) {
+                index++;
+            }
             this.index.copyWithin(index, index + 1, this.index.length);
             this.index[this.length - 1] = Number.MAX_VALUE;
             this.copyWithin(index, index + 1, this.length);

package/dist/cjs/src/bybit.js

@@ -3285,8 +3285,10 @@ class bybit extends bybit$1 {
             request['accountType'] = unifiedType;
             response = await this.privateGetV5AssetTransferQueryAccountCoinsBalance(this.extend(request, params));
         }
-        request['accountType'] = unifiedType;
-        response = await this.privateGetV5AccountWalletBalance(this.extend(request, params));
+        else {
+            request['accountType'] = unifiedType;
+            response = await this.privateGetV5AccountWalletBalance(this.extend(request, params));
+        }
         //
         // cross
         //     {

package/dist/cjs/src/pro/bitfinex2.js

@@ -574,7 +574,6 @@ class bitfinex2 extends bitfinex2$1 {
         const messageHash = channel + ':' + marketId;
         const prec = this.safeString(subscription, 'prec', 'P0');
         const isRaw = (prec === 'R0');
-        const id = this.safeString(message, 0);
         // if it is an initial snapshot
         let orderbook = this.safeValue(this.orderbooks, symbol);
         if (orderbook === undefined) {
@@ -613,6 +612,7 @@ class bitfinex2 extends bitfinex2$1 {
                     bookside.store(price, size, counter);
                 }
             }
+            orderbook['symbol'] = symbol;
             client.resolve(orderbook, messageHash);
         }
         else {
@@ -625,7 +625,8 @@ class bitfinex2 extends bitfinex2$1 {
                 const bookside = orderbookItem[side];
                 // price = 0 means that you have to remove the order from your book
                 const amount = Precise["default"].stringGt(price, '0') ? size : '0';
-                bookside.store(this.parseNumber(price), this.parseNumber(amount), id);
+                const idString = this.safeString(deltas, 0);
+                bookside.store(this.parseNumber(price), this.parseNumber(amount), idString);
             }
             else {
                 const amount = this.safeString(deltas, 2);
@@ -655,16 +656,19 @@ class bitfinex2 extends bitfinex2$1 {
         const stringArray = [];
         const bids = book['bids'];
         const asks = book['asks'];
+        const prec = this.safeString(subscription, 'prec', 'P0');
+        const isRaw = (prec === 'R0');
+        const idToCheck = isRaw ? 2 : 0;
         // pepperoni pizza from bitfinex
         for (let i = 0; i < depth; i++) {
             const bid = this.safeValue(bids, i);
             const ask = this.safeValue(asks, i);
             if (bid !== undefined) {
-                stringArray.push(this.numberToString(bids[i][0]));
+                stringArray.push(this.numberToString(bids[i][idToCheck]));
                 stringArray.push(this.numberToString(bids[i][1]));
             }
             if (ask !== undefined) {
-                stringArray.push(this.numberToString(asks[i][0]));
+                stringArray.push(this.numberToString(asks[i][idToCheck]));
                 stringArray.push(this.numberToString(-asks[i][1]));
             }
         }

package/js/ccxt.d.ts

@@ -4,7 +4,7 @@ import * as functions from './src/base/functions.js';
 import * as errors from './src/base/errors.js';
 import { Market, Trade, Fee, Ticker, OrderBook, Order, Transaction, Tickers, Currency, Balance, DepositAddress, WithdrawalResponse, DepositAddressResponse, OHLCV, Balances, PartialBalances, Dictionary, MinMax, Position, FundingRateHistory, Liquidation } from './src/base/types.js';
 import { BaseError, ExchangeError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, NotSupported, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, AuthenticationError, AddressPending, NoChange } from './src/base/errors.js';
-declare const version = "4.1.21";
+declare const version = "4.1.22";
 import ace from './src/ace.js';
 import alpaca from './src/alpaca.js';
 import ascendex from './src/ascendex.js';

package/js/ccxt.js

@@ -38,7 +38,7 @@ import * as errors from './src/base/errors.js';
 import { BaseError, ExchangeError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, NotSupported, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, AuthenticationError, AddressPending, NoChange } from './src/base/errors.js';
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.1.22';
+const version = '4.1.23';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

package/js/src/abstract/ascendex.d.ts

@@ -58,6 +58,7 @@ interface Exchange {
     v2PrivateAccountGroupGetFuturesPosition(params?: {}): Promise<implicitReturnType>;
     v2PrivateAccountGroupGetFuturesFreeMargin(params?: {}): Promise<implicitReturnType>;
     v2PrivateAccountGroupGetFuturesOrderHistCurrent(params?: {}): Promise<implicitReturnType>;
+    v2PrivateAccountGroupGetFuturesFundingPayments(params?: {}): Promise<implicitReturnType>;
     v2PrivateAccountGroupGetFuturesOrderOpen(params?: {}): Promise<implicitReturnType>;
     v2PrivateAccountGroupGetFuturesOrderStatus(params?: {}): Promise<implicitReturnType>;
     v2PrivateAccountGroupPostFuturesIsolatedPositionMargin(params?: {}): Promise<implicitReturnType>;

package/js/src/ascendex.js

@@ -223,6 +223,7 @@ export default class ascendex extends Exchange {
                                 'futures/position': 1,
                                 'futures/free-margin': 1,
                                 'futures/order/hist/current': 1,
+                                'futures/funding-payments': 1,
                                 'futures/order/open': 1,
                                 'futures/order/status': 1,
                             },

package/js/src/base/ws/OrderBookSide.js

@@ -182,14 +182,22 @@ class IndexedOrderBookSide extends Array {
                 // in case price is not sent
                 delta[0] = Math.abs(index_price);
                 if (index_price === old_price) {
-                    const index = bisectLeft(this.index, index_price);
+                    // find index by price and advance till the id is found
+                    let index = bisectLeft(this.index, index_price);
+                    while (this[index][2] !== id) {
+                        index++;
+                    }
                     this.index[index] = index_price;
                     this[index] = delta;
                     return;
                 }
                 else {
                     // remove old price from index
-                    const old_index = bisectLeft(this.index, old_price);
+                    // find index by price and advance till the id is found
+                    let old_index = bisectLeft(this.index, old_price);
+                    while (this[old_index][2] !== id) {
+                        old_index++;
+                    }
                     this.index.copyWithin(old_index, old_index + 1, this.index.length);
                     this.index[this.length - 1] = Number.MAX_VALUE;
                     this.copyWithin(old_index, old_index + 1, this.length);
@@ -198,7 +206,12 @@ class IndexedOrderBookSide extends Array {
             }
             // insert new price level
             this.hashmap.set(id, index_price);
-            const index = bisectLeft(this.index, index_price);
+            // find index by price to insert
+            let index = bisectLeft(this.index, index_price);
+            // if several with the same price order by id
+            while (index < this.length && this.index[index] === index_price && this[index][2] < id) {
+                index++;
+            }
             // insert new price level into index
             this.length++;
             this.index.copyWithin(index + 1, index, this.index.length);
@@ -215,7 +228,10 @@ class IndexedOrderBookSide extends Array {
         }
         else if (this.hashmap.has(id)) {
             const old_price = this.hashmap.get(id);
-            const index = bisectLeft(this.index, old_price);
+            let index = bisectLeft(this.index, old_price);
+            while (this[index][2] !== id) {
+                index++;
+            }
             this.index.copyWithin(index, index + 1, this.index.length);
             this.index[this.length - 1] = Number.MAX_VALUE;
             this.copyWithin(index, index + 1, this.length);

package/js/src/bybit.js

@@ -3288,8 +3288,10 @@ export default class bybit extends Exchange {
             request['accountType'] = unifiedType;
             response = await this.privateGetV5AssetTransferQueryAccountCoinsBalance(this.extend(request, params));
         }
-        request['accountType'] = unifiedType;
-        response = await this.privateGetV5AccountWalletBalance(this.extend(request, params));
+        else {
+            request['accountType'] = unifiedType;
+            response = await this.privateGetV5AccountWalletBalance(this.extend(request, params));
+        }
         //
         // cross
         //     {

package/js/src/pro/bitfinex2.js

@@ -577,7 +577,6 @@ export default class bitfinex2 extends bitfinex2Rest {
         const messageHash = channel + ':' + marketId;
         const prec = this.safeString(subscription, 'prec', 'P0');
         const isRaw = (prec === 'R0');
-        const id = this.safeString(message, 0);
         // if it is an initial snapshot
         let orderbook = this.safeValue(this.orderbooks, symbol);
         if (orderbook === undefined) {
@@ -616,6 +615,7 @@ export default class bitfinex2 extends bitfinex2Rest {
                     bookside.store(price, size, counter);
                 }
             }
+            orderbook['symbol'] = symbol;
             client.resolve(orderbook, messageHash);
         }
         else {
@@ -628,7 +628,8 @@ export default class bitfinex2 extends bitfinex2Rest {
                 const bookside = orderbookItem[side];
                 // price = 0 means that you have to remove the order from your book
                 const amount = Precise.stringGt(price, '0') ? size : '0';
-                bookside.store(this.parseNumber(price), this.parseNumber(amount), id);
+                const idString = this.safeString(deltas, 0);
+                bookside.store(this.parseNumber(price), this.parseNumber(amount), idString);
             }
             else {
                 const amount = this.safeString(deltas, 2);
@@ -658,16 +659,19 @@ export default class bitfinex2 extends bitfinex2Rest {
         const stringArray = [];
         const bids = book['bids'];
         const asks = book['asks'];
+        const prec = this.safeString(subscription, 'prec', 'P0');
+        const isRaw = (prec === 'R0');
+        const idToCheck = isRaw ? 2 : 0;
         // pepperoni pizza from bitfinex
         for (let i = 0; i < depth; i++) {
             const bid = this.safeValue(bids, i);
             const ask = this.safeValue(asks, i);
             if (bid !== undefined) {
-                stringArray.push(this.numberToString(bids[i][0]));
+                stringArray.push(this.numberToString(bids[i][idToCheck]));
                 stringArray.push(this.numberToString(bids[i][1]));
             }
             if (ask !== undefined) {
-                stringArray.push(this.numberToString(asks[i][0]));
+                stringArray.push(this.numberToString(asks[i][idToCheck]));
                 stringArray.push(this.numberToString(-asks[i][1]));
             }
         }

package/package.json

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

package/skip-tests.json

@@ -174,7 +174,7 @@
         }
     },
     "bitfinex2": {
-        "skipWs": true,
+        "//skipWs": true,
         "skipMethods": {
             "loadMarkets": {
                 "currencyIdAndCode": "broken currencies"
@@ -509,6 +509,7 @@
         }
     },
     "btcalpha": {
+	"skip": true, 
         "skipMethods": {
             "fetchOrderBook": "bids[0][0] is not < asks[0][0]",
             "fetchL2OrderBook": "same",