ccxt 4.3.65 → 4.3.67

package/js/src/pro/okx.js

@@ -6,7 +6,7 @@
 
 //  ---------------------------------------------------------------------------
 import okxRest from '../okx.js';
-import { ArgumentsRequired, BadRequest, ExchangeError, ChecksumError, AuthenticationError } from '../base/errors.js';
+import { ArgumentsRequired, BadRequest, ExchangeError, ChecksumError, AuthenticationError, InvalidNonce } from '../base/errors.js';
 import { ArrayCache, ArrayCacheByTimestamp, ArrayCacheBySymbolById, ArrayCacheBySymbolBySide } from '../base/ws/Cache.js';
 import { sha256 } from '../static_dependencies/noble-hashes/sha256.js';
 //  ---------------------------------------------------------------------------
@@ -897,7 +897,7 @@ export default class okx extends okxRest {
             this.handleDelta(bookside, deltas[i]);
         }
     }
-    handleOrderBookMessage(client, message, orderbook, messageHash) {
+    handleOrderBookMessage(client, message, orderbook, messageHash, market = undefined) {
         //
         //     {
         //         "asks": [
@@ -912,6 +912,9 @@ export default class okx extends okxRest {
         //         ],
         //         "instId": "BTC-USDT",
         //         "ts": "1626537446491"
+        //         "checksum": -855196043,
+        //         "prevSeqId": 123456,
+        //         "seqId": 123457
         //     }
         //
         const asks = this.safeValue(message, 'asks', []);
@@ -921,9 +924,12 @@ export default class okx extends okxRest {
         this.handleDeltas(storedAsks, asks);
         this.handleDeltas(storedBids, bids);
         const marketId = this.safeString(message, 'instId');
-        const symbol = this.safeSymbol(marketId);
+        const symbol = this.safeSymbol(marketId, market);
         const checksum = this.handleOption('watchOrderBook', 'checksum', true);
+        const seqId = this.safeInteger(message, 'seqId');
         if (checksum) {
+            const prevSeqId = this.safeInteger(message, 'prevSeqId');
+            const nonce = orderbook['nonce'];
             const asksLength = storedAsks.length;
             const bidsLength = storedBids.length;
             const payloadArray = [];
@@ -940,14 +946,21 @@ export default class okx extends okxRest {
             const payload = payloadArray.join(':');
             const responseChecksum = this.safeInteger(message, 'checksum');
             const localChecksum = this.crc32(payload, true);
+            let error = undefined;
+            if (prevSeqId !== -1 && nonce !== prevSeqId) {
+                error = new InvalidNonce(this.id + ' watchOrderBook received invalid nonce');
+            }
             if (responseChecksum !== localChecksum) {
-                const error = new ChecksumError(this.id + ' ' + this.orderbookChecksumMessage(symbol));
+                error = new ChecksumError(this.id + ' ' + this.orderbookChecksumMessage(symbol));
+            }
+            if (error !== undefined) {
                 delete client.subscriptions[messageHash];
                 delete this.orderbooks[symbol];
                 client.reject(error, messageHash);
             }
         }
         const timestamp = this.safeInteger(message, 'ts');
+        orderbook['nonce'] = seqId;
         orderbook['timestamp'] = timestamp;
         orderbook['datetime'] = this.iso8601(timestamp);
         return orderbook;
@@ -1069,7 +1082,7 @@ export default class okx extends okxRest {
                 const orderbook = this.orderbooks[symbol];
                 for (let i = 0; i < data.length; i++) {
                     const update = data[i];
-                    this.handleOrderBookMessage(client, update, orderbook, messageHash);
+                    this.handleOrderBookMessage(client, update, orderbook, messageHash, market);
                     client.resolve(orderbook, messageHash);
                 }
             }
@@ -1640,7 +1653,7 @@ export default class okx extends okxRest {
         await this.loadMarkets();
         await this.authenticate();
         const url = this.getUrl('private', 'private');
-        const messageHash = this.nonce().toString();
+        const messageHash = this.milliseconds().toString();
         let op = undefined;
         [op, params] = this.handleOptionAndParams(params, 'createOrderWs', 'op', 'batch-orders');
         const args = this.createOrderRequest(symbol, type, side, amount, price, params);
@@ -1710,7 +1723,7 @@ export default class okx extends okxRest {
         await this.loadMarkets();
         await this.authenticate();
         const url = this.getUrl('private', 'private');
-        const messageHash = this.nonce().toString();
+        const messageHash = this.milliseconds().toString();
         let op = undefined;
         [op, params] = this.handleOptionAndParams(params, 'editOrderWs', 'op', 'amend-order');
         const args = this.editOrderRequest(id, symbol, type, side, amount, price, params);
@@ -1739,7 +1752,7 @@ export default class okx extends okxRest {
         await this.loadMarkets();
         await this.authenticate();
         const url = this.getUrl('private', 'private');
-        const messageHash = this.nonce().toString();
+        const messageHash = this.milliseconds().toString();
         const clientOrderId = this.safeString2(params, 'clOrdId', 'clientOrderId');
         params = this.omit(params, ['clientOrderId', 'clOrdId']);
         const arg = {
@@ -1779,7 +1792,7 @@ export default class okx extends okxRest {
         await this.loadMarkets();
         await this.authenticate();
         const url = this.getUrl('private', 'private');
-        const messageHash = this.nonce().toString();
+        const messageHash = this.milliseconds().toString();
         const args = [];
         for (let i = 0; i < idsLength; i++) {
             const arg = {
@@ -1815,7 +1828,7 @@ export default class okx extends okxRest {
             throw new BadRequest(this.id + 'cancelAllOrdersWs is only applicable to Option in Portfolio Margin mode, and MMP privilege is required.');
         }
         const url = this.getUrl('private', 'private');
-        const messageHash = this.nonce().toString();
+        const messageHash = this.milliseconds().toString();
         const request = {
             'id': messageHash,
             'op': 'mass-cancel',

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

@@ -32,7 +32,7 @@ export default class oxfun extends oxfunRest {
     cancelOrdersWs(ids: string[], symbol?: Str, params?: {}): Promise<any>;
     authenticate(params?: {}): Promise<any>;
     handleAuthenticationMessage(client: Client, message: any): void;
-    ping(client: any): string;
+    ping(client: Client): string;
     handlePong(client: Client, message: any): any;
     handleMessage(client: Client, message: any): void;
 }

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

@@ -14,7 +14,7 @@ export default class p2b extends p2bRest {
     handleOrderBook(client: Client, message: any): void;
     handleMessage(client: Client, message: any): void;
     handleErrorMessage(client: Client, message: any): boolean;
-    ping(client: any): {
+    ping(client: Client): {
         method: string;
         params: any[];
         id: number;

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

@@ -36,7 +36,7 @@ export default class poloniex extends poloniexRest {
     handleMessage(client: Client, message: any): void;
     handleErrorMessage(client: Client, message: any): boolean;
     handleAuthenticate(client: Client, message: any): any;
-    ping(client: any): {
+    ping(client: Client): {
         event: string;
     };
 }

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

@@ -31,7 +31,7 @@ export default class whitebit extends whitebitRest {
     handleMessage(client: Client, message: any): void;
     handleSubscriptionStatus(client: Client, message: any, id: any): void;
     handlePong(client: Client, message: any): any;
-    ping(client: any): {
+    ping(client: Client): {
         id: number;
         method: string;
         params: any[];

package/package.json

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

package/dist/cjs/src/abstract/bittrex.js

@@ -1,9 +0,0 @@
-'use strict';
-
-var Exchange$1 = require('../base/Exchange.js');
-
-// -------------------------------------------------------------------------------
-class Exchange extends Exchange$1["default"] {
-}
-
-module.exports = Exchange;