ccxt 4.0.68 → 4.0.70

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.0.68';
+const version = '4.0.70';
 Exchange["default"].ccxtVersion = version;
 const exchanges = {
     'ace': ace,

package/dist/cjs/src/bitget.js

@@ -2221,6 +2221,7 @@ class bitget extends bitget$1 {
          * @param {int} [since] timestamp in ms of the earliest trade to fetch
          * @param {int} [limit] the maximum amount of trades to fetch
          * @param {object} [params] extra parameters specific to the bitget api endpoint
+         * @param {int} [params.until] the latest time in ms to fetch deposits for
          * @returns {Trade[]} a list of [trade structures]{@link https://docs.ccxt.com/en/latest/manual.html?#public-trades}
          */
         await this.loadMarkets();
@@ -2231,9 +2232,19 @@ class bitget extends bitget$1 {
         if (limit !== undefined) {
             request['limit'] = limit;
         }
+        const until = this.safeInteger2(params, 'until', 'endTime');
         if (since !== undefined) {
             request['startTime'] = since;
+            if (until === undefined) {
+                const now = this.milliseconds();
+                request['endTime'] = now;
+            }
         }
+        if (until !== undefined) {
+            this.checkRequiredArgument('fetchTrades', since, 'since');
+            request['endTime'] = until;
+        }
+        params = this.omit(params, 'until');
         const options = this.safeValue(this.options, 'fetchTrades', {});
         let response = undefined;
         if (market['spot']) {
@@ -4590,8 +4601,14 @@ class bitget extends bitget$1 {
          */
         this.checkRequiredSymbol('setMarginMode', symbol);
         marginMode = marginMode.toLowerCase();
+        if (marginMode === 'isolated') {
+            marginMode = 'fixed';
+        }
+        if (marginMode === 'cross') {
+            marginMode = 'crossed';
+        }
         if ((marginMode !== 'fixed') && (marginMode !== 'crossed')) {
-            throw new errors.ArgumentsRequired(this.id + ' setMarginMode() marginMode must be "fixed" or "crossed"');
+            throw new errors.ArgumentsRequired(this.id + ' setMarginMode() marginMode must be either fixed (isolated) or crossed (cross)');
         }
         await this.loadMarkets();
         const market = this.market(symbol);

package/dist/cjs/src/gate.js

@@ -62,7 +62,7 @@ class gate extends gate$1 {
                     },
                 },
                 'referral': {
-                    'url': 'https://www.gate.io/ref/2436035',
+                    'url': 'https://www.gate.io/signup/2436035',
                     'discount': 0.2,
                 },
             },

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

@@ -28,16 +28,10 @@ class okx extends okx$1 {
             },
             'urls': {
                 'api': {
-                    'ws': {
-                        'public': 'wss://ws.okx.com:8443/ws/v5/public',
-                        'private': 'wss://ws.okx.com:8443/ws/v5/private', // wss://wsaws.okx.com:8443/ws/v5/private
-                    },
+                    'ws': 'wss://ws.okx.com:8443/ws/v5',
                 },
                 'test': {
-                    'ws': {
-                        'public': 'wss://wspap.okx.com:8443/ws/v5/public?brokerId=9999',
-                        'private': 'wss://wspap.okx.com:8443/ws/v5/private?brokerId=9999',
-                    },
+                    'ws': 'wss://wspap.okx.com:8443/ws/v5',
                 },
             },
             'options': {
@@ -99,13 +93,25 @@ class okx extends okx$1 {
             },
         });
     }
+    getUrl(channel, access = 'public') {
+        // for context: https://www.okx.com/help-center/changes-to-v5-api-websocket-subscription-parameter-and-url
+        const isPublic = (access === 'public');
+        const url = this.urls['api']['ws'];
+        if ((channel.indexOf('candle') > -1) || (channel === 'orders-algo')) {
+            return url + '/business';
+        }
+        else if (isPublic) {
+            return url + '/public';
+        }
+        return url + '/private';
+    }
     async subscribeMultiple(access, channel, symbols = undefined, params = {}) {
         await this.loadMarkets();
         if (symbols === undefined) {
             symbols = this.symbols;
         }
         symbols = this.marketSymbols(symbols);
-        const url = this.urls['api']['ws'][access];
+        const url = this.getUrl(channel, access);
         let messageHash = channel;
         const args = [];
         messageHash += '::' + symbols.join(',');
@@ -125,7 +131,7 @@ class okx extends okx$1 {
     }
     async subscribe(access, messageHash, channel, symbol, params = {}) {
         await this.loadMarkets();
-        const url = this.urls['api']['ws'][access];
+        const url = this.getUrl(channel, access);
         const firstArgument = {
             'channel': channel,
         };
@@ -597,7 +603,7 @@ class okx extends okx$1 {
         this.checkRequiredCredentials();
         const access = this.safeString(params, 'access', 'private');
         params = this.omit(params, ['access']);
-        const url = this.urls['api']['ws'][access];
+        const url = this.getUrl('users', access);
         const messageHash = 'authenticated';
         const client = this.client(url);
         let future = this.safeValue(client.subscriptions, messageHash);
@@ -988,7 +994,7 @@ class okx extends okx$1 {
          */
         await this.loadMarkets();
         await this.authenticate();
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         let op = undefined;
         [op, params] = this.handleOptionAndParams(params, 'createOrderWs', 'op', 'batch-orders');
@@ -1057,7 +1063,7 @@ class okx extends okx$1 {
          */
         await this.loadMarkets();
         await this.authenticate();
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         let op = undefined;
         [op, params] = this.handleOptionAndParams(params, 'editOrderWs', 'op', 'amend-order');
@@ -1086,7 +1092,7 @@ class okx extends okx$1 {
         }
         await this.loadMarkets();
         await this.authenticate();
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         const clientOrderId = this.safeString2(params, 'clOrdId', 'clientOrderId');
         params = this.omit(params, ['clientOrderId', 'clOrdId']);
@@ -1126,7 +1132,7 @@ class okx extends okx$1 {
         }
         await this.loadMarkets();
         await this.authenticate();
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         const args = [];
         for (let i = 0; i < idsLength; i++) {
@@ -1162,7 +1168,7 @@ class okx extends okx$1 {
         if (market['type'] !== 'option') {
             throw new errors.BadRequest(this.id + 'cancelAllOrdersWs is only applicable to Option in Portfolio Margin mode, and MMP privilege is required.');
         }
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         const request = {
             'id': messageHash,

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 } 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 } from './src/base/errors.js';
-declare const version = "4.0.67";
+declare const version = "4.0.69";
 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 } from './src/base/errors.js';
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.0.68';
+const version = '4.0.70';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

package/js/src/bitget.js

@@ -2224,6 +2224,7 @@ export default class bitget extends Exchange {
          * @param {int} [since] timestamp in ms of the earliest trade to fetch
          * @param {int} [limit] the maximum amount of trades to fetch
          * @param {object} [params] extra parameters specific to the bitget api endpoint
+         * @param {int} [params.until] the latest time in ms to fetch deposits for
          * @returns {Trade[]} a list of [trade structures]{@link https://docs.ccxt.com/en/latest/manual.html?#public-trades}
          */
         await this.loadMarkets();
@@ -2234,9 +2235,19 @@ export default class bitget extends Exchange {
         if (limit !== undefined) {
             request['limit'] = limit;
         }
+        const until = this.safeInteger2(params, 'until', 'endTime');
         if (since !== undefined) {
             request['startTime'] = since;
+            if (until === undefined) {
+                const now = this.milliseconds();
+                request['endTime'] = now;
+            }
         }
+        if (until !== undefined) {
+            this.checkRequiredArgument('fetchTrades', since, 'since');
+            request['endTime'] = until;
+        }
+        params = this.omit(params, 'until');
         const options = this.safeValue(this.options, 'fetchTrades', {});
         let response = undefined;
         if (market['spot']) {
@@ -4593,8 +4604,14 @@ export default class bitget extends Exchange {
          */
         this.checkRequiredSymbol('setMarginMode', symbol);
         marginMode = marginMode.toLowerCase();
+        if (marginMode === 'isolated') {
+            marginMode = 'fixed';
+        }
+        if (marginMode === 'cross') {
+            marginMode = 'crossed';
+        }
         if ((marginMode !== 'fixed') && (marginMode !== 'crossed')) {
-            throw new ArgumentsRequired(this.id + ' setMarginMode() marginMode must be "fixed" or "crossed"');
+            throw new ArgumentsRequired(this.id + ' setMarginMode() marginMode must be either fixed (isolated) or crossed (cross)');
         }
         await this.loadMarkets();
         const market = this.market(symbol);

package/js/src/gate.js

@@ -65,7 +65,7 @@ export default class gate extends Exchange {
                     },
                 },
                 'referral': {
-                    'url': 'https://www.gate.io/ref/2436035',
+                    'url': 'https://www.gate.io/signup/2436035',
                     'discount': 0.2,
                 },
             },

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

@@ -3,6 +3,7 @@ import { Int, OrderSide, OrderType } from '../base/types.js';
 import Client from '../base/ws/Client.js';
 export default class okx extends okxRest {
     describe(): any;
+    getUrl(channel: string, access?: string): string;
     subscribeMultiple(access: any, channel: any, symbols?: string[], params?: {}): Promise<any>;
     subscribe(access: any, messageHash: any, channel: any, symbol: any, params?: {}): Promise<any>;
     watchTrades(symbol: string, since?: Int, limit?: Int, params?: {}): Promise<any>;

package/js/src/pro/okx.js

@@ -31,16 +31,10 @@ export default class okx extends okxRest {
             },
             'urls': {
                 'api': {
-                    'ws': {
-                        'public': 'wss://ws.okx.com:8443/ws/v5/public',
-                        'private': 'wss://ws.okx.com:8443/ws/v5/private', // wss://wsaws.okx.com:8443/ws/v5/private
-                    },
+                    'ws': 'wss://ws.okx.com:8443/ws/v5',
                 },
                 'test': {
-                    'ws': {
-                        'public': 'wss://wspap.okx.com:8443/ws/v5/public?brokerId=9999',
-                        'private': 'wss://wspap.okx.com:8443/ws/v5/private?brokerId=9999',
-                    },
+                    'ws': 'wss://wspap.okx.com:8443/ws/v5',
                 },
             },
             'options': {
@@ -102,13 +96,25 @@ export default class okx extends okxRest {
             },
         });
     }
+    getUrl(channel, access = 'public') {
+        // for context: https://www.okx.com/help-center/changes-to-v5-api-websocket-subscription-parameter-and-url
+        const isPublic = (access === 'public');
+        const url = this.urls['api']['ws'];
+        if ((channel.indexOf('candle') > -1) || (channel === 'orders-algo')) {
+            return url + '/business';
+        }
+        else if (isPublic) {
+            return url + '/public';
+        }
+        return url + '/private';
+    }
     async subscribeMultiple(access, channel, symbols = undefined, params = {}) {
         await this.loadMarkets();
         if (symbols === undefined) {
             symbols = this.symbols;
         }
         symbols = this.marketSymbols(symbols);
-        const url = this.urls['api']['ws'][access];
+        const url = this.getUrl(channel, access);
         let messageHash = channel;
         const args = [];
         messageHash += '::' + symbols.join(',');
@@ -128,7 +134,7 @@ export default class okx extends okxRest {
     }
     async subscribe(access, messageHash, channel, symbol, params = {}) {
         await this.loadMarkets();
-        const url = this.urls['api']['ws'][access];
+        const url = this.getUrl(channel, access);
         const firstArgument = {
             'channel': channel,
         };
@@ -600,7 +606,7 @@ export default class okx extends okxRest {
         this.checkRequiredCredentials();
         const access = this.safeString(params, 'access', 'private');
         params = this.omit(params, ['access']);
-        const url = this.urls['api']['ws'][access];
+        const url = this.getUrl('users', access);
         const messageHash = 'authenticated';
         const client = this.client(url);
         let future = this.safeValue(client.subscriptions, messageHash);
@@ -991,7 +997,7 @@ export default class okx extends okxRest {
          */
         await this.loadMarkets();
         await this.authenticate();
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         let op = undefined;
         [op, params] = this.handleOptionAndParams(params, 'createOrderWs', 'op', 'batch-orders');
@@ -1060,7 +1066,7 @@ export default class okx extends okxRest {
          */
         await this.loadMarkets();
         await this.authenticate();
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         let op = undefined;
         [op, params] = this.handleOptionAndParams(params, 'editOrderWs', 'op', 'amend-order');
@@ -1089,7 +1095,7 @@ export default class okx extends okxRest {
         }
         await this.loadMarkets();
         await this.authenticate();
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         const clientOrderId = this.safeString2(params, 'clOrdId', 'clientOrderId');
         params = this.omit(params, ['clientOrderId', 'clOrdId']);
@@ -1129,7 +1135,7 @@ export default class okx extends okxRest {
         }
         await this.loadMarkets();
         await this.authenticate();
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         const args = [];
         for (let i = 0; i < idsLength; i++) {
@@ -1165,7 +1171,7 @@ export default class okx extends okxRest {
         if (market['type'] !== 'option') {
             throw new BadRequest(this.id + 'cancelAllOrdersWs is only applicable to Option in Portfolio Margin mode, and MMP privilege is required.');
         }
-        const url = this.urls['api']['ws']['private'];
+        const url = this.getUrl('private', 'private');
         const messageHash = this.nonce().toString();
         const request = {
             'id': messageHash,

package/package.json

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