ccxt 4.1.4 → 4.1.5

package/dist/cjs/ccxt.js

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

package/dist/cjs/src/coinex.js

@@ -887,7 +887,7 @@ class coinex extends coinex$1 {
         //         message: 'OK'
         //     }
         //
-        return this.safeNumber(response, 'data');
+        return this.safeInteger(response, 'data');
     }
     async fetchOrderBook(symbol, limit = 20, params = {}) {
         /**

package/dist/cjs/src/coinsph.js

@@ -540,7 +540,6 @@ class coinsph extends coinsph$1 {
             const quoteId = this.safeString(market, 'quoteAsset');
             const base = this.safeCurrencyCode(baseId);
             const quote = this.safeCurrencyCode(quoteId);
-            const isActive = this.safeString(market, 'status') === 'TRADING';
             const limits = this.indexBy(this.safeValue(market, 'filters'), 'filterType');
             const amountLimits = this.safeValue(limits, 'LOT_SIZE', {});
             const priceLimits = this.safeValue(limits, 'PRICE_FILTER', {});
@@ -560,7 +559,7 @@ class coinsph extends coinsph$1 {
                 'swap': false,
                 'future': false,
                 'option': false,
-                'active': isActive,
+                'active': this.safeStringLower(market, 'status') === 'trading',
                 'contract': false,
                 'linear': undefined,
                 'inverse': undefined,

package/dist/cjs/src/kraken.js

@@ -936,11 +936,7 @@ class kraken extends kraken$1 {
         else {
             direction = 'in';
         }
-        const time = this.safeNumber(item, 'time');
-        let timestamp = undefined;
-        if (time !== undefined) {
-            timestamp = this.parseToInt(time * 1000);
-        }
+        const timestamp = this.safeIntegerProduct(item, 'time', 1000);
         return {
             'info': item,
             'id': id,

package/dist/cjs/src/kuna.js

@@ -4,12 +4,14 @@ var kuna$1 = require('./abstract/kuna.js');
 var errors = require('./base/errors.js');
 var number = require('./base/functions/number.js');
 var sha256 = require('./static_dependencies/noble-hashes/sha256.js');
+var sha512 = require('./static_dependencies/noble-hashes/sha512.js');
 
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 /**
  * @class kuna
  * @extends Exchange
+ * @description Use the public-key as your apiKey
  */
 class kuna extends kuna$1 {
     describe() {
@@ -67,6 +69,7 @@ class kuna extends kuna$1 {
                 'api': {
                     'xreserve': 'https://api.xreserve.fund',
                     'v3': 'https://api.kuna.io',
+                    'v4': 'https://api.kuna.io',
                     'public': 'https://kuna.io',
                     'private': 'https://kuna.io', // v2
                 },
@@ -85,6 +88,54 @@ class kuna extends kuna$1 {
                         'delegate-transfer': 1,
                     },
                 },
+                'v4': {
+                    'private': {
+                        'get': {
+                            'me': 1,
+                            'getBalance': 1,
+                            'active': 1,
+                            'order/history': 1,
+                            'order/private/{id}/trades': 1,
+                            'order/details/{id}?withTrades={withTrades}': 1,
+                            'trade/history': 1,
+                            'transaction/{hash}': 1,
+                            'deposit/preRequest': 1,
+                            'deposit/crypto/address': 1,
+                            'deposit/crypto/getMerchantAddress': 1,
+                            'deposit/history': 1,
+                            'deposit/details/{depositId}': 1,
+                            'withdraw/preRequest': 1,
+                            'withdraw/history': 1,
+                            'withdraw/details/{withdrawId}': 1,
+                            'kuna-code/{id}': 1,
+                            'kuna-code/{code}/check': 1,
+                            'kuna-code/issued-by-me': 1,
+                            'kuna-code/redeemed-by-me': 1,
+                        },
+                        'post': {
+                            'order/create': 1,
+                            'order/cancel': 1,
+                            'order/cancel/multi': 1,
+                            'deposit/crypto/generateAddress': 1,
+                            'deposit/crypto/generateMerchantAddress': 1,
+                            'withdraw/create': 1,
+                            'kuna-code': 1,
+                        },
+                        'put': {
+                            'kuna-code/redeem': 1,
+                        },
+                    },
+                    'public': {
+                        'get': {
+                            'timestamp': 1,
+                            'fees': 1,
+                            'currencies?type={type}': 1,
+                            'markets/getAll': 1,
+                            'markets/tickers?pairs={pairs}': 1,
+                            'order/book/{pairs}': 1,
+                        },
+                    },
+                },
                 'v3': {
                     'public': {
                         'get': {
@@ -292,6 +343,9 @@ class kuna extends kuna$1 {
                 '2002': errors.InsufficientFunds,
                 '2003': errors.OrderNotFound,
             },
+            'options': {
+            // 'account': 'pro'      // Only for pro accounts
+            },
         });
     }
     async fetchTime(params = {}) {
@@ -848,20 +902,53 @@ class kuna extends kuna$1 {
         let url = undefined;
         if (Array.isArray(api)) {
             const [version, access] = api;
-            url = this.urls['api'][version] + '/' + version + '/' + this.implodeParams(path, params);
-            if (access === 'public') {
-                if (method === 'GET') {
-                    if (Object.keys(params).length) {
-                        url += '?' + this.urlencode(params);
+            if (version === 'v3') {
+                url = this.urls['api'][version] + '/' + version + '/' + this.implodeParams(path, params);
+                if (access === 'public') {
+                    if (method === 'GET') {
+                        if (Object.keys(params).length) {
+                            url += '?' + this.urlencode(params);
+                        }
+                    }
+                    else if ((method === 'POST') || (method === 'PUT')) {
+                        headers = { 'Content-Type': 'application/json' };
+                        body = this.json(params);
                     }
                 }
-                else if ((method === 'POST') || (method === 'PUT')) {
-                    headers = { 'Content-Type': 'application/json' };
-                    body = this.json(params);
+                else if (access === 'private') {
+                    throw new errors.NotSupported(this.id + ' private v3 API is not supported yet');
                 }
             }
-            else if (access === 'private') {
-                throw new errors.NotSupported(this.id + ' private v3 API is not supported yet');
+            else if (version === 'v4') {
+                const splitPath = path.split('/');
+                const splitPathLength = splitPath.length;
+                let urlPath = '';
+                if ((splitPathLength > 1) && (splitPath[0] !== 'kuna-code')) {
+                    let pathTail = '';
+                    for (let i = 1; i < splitPathLength; i++) {
+                        pathTail += splitPath[i];
+                    }
+                    urlPath = '/' + version + '/' + splitPath[0] + '/' + access + '/' + this.implodeParams(pathTail, params);
+                }
+                else {
+                    urlPath = '/' + version + '/' + access + '/' + this.implodeParams(path, params);
+                }
+                url = this.urls['api'][version] + urlPath;
+                if (access === 'private') {
+                    const nonce = this.nonce();
+                    const auth = urlPath + nonce + this.json(params);
+                    headers = {
+                        'content-type': 'application/json',
+                        'accept': 'application/json',
+                        'nonce': nonce,
+                        'public-key': this.apiKey,
+                        'signature': this.hmac(this.encode(auth), this.encode(this.secret), sha512.sha384, 'hex'),
+                    };
+                    const account = this.safeString(this.options, 'account');
+                    if (account === 'pro') {
+                        headers['account'] = 'pro';
+                    }
+                }
             }
         }
         else {

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

@@ -8,6 +8,11 @@ var sha256 = require('../static_dependencies/noble-hashes/sha256.js');
 
 //  ---------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
+/**
+ * @class bitget
+ * @extends Exchange
+ * @description watching delivery future markets is not yet implemented (perpertual future / swap is implemented)
+ */
 class bitget extends bitget$1 {
     describe() {
         return this.deepExtend(super.describe(), {
@@ -80,10 +85,10 @@ class bitget extends bitget$1 {
         }
         else {
             if (!sandboxMode) {
-                return market['id'].replace('_UMCBL', '');
+                return market['id'].replace('_UMCBL', '').replace('_DMCBL', '').replace('_CMCBL', '');
             }
             else {
-                return market['id'].replace('_SUMCBL', '');
+                return market['id'].replace('_SUMCBL', '').replace('_SDMCBL', '').replace('_SCMCBL', '');
             }
         }
     }
@@ -95,15 +100,24 @@ class bitget extends bitget$1 {
         const sandboxMode = this.safeValue(this.options, 'sandboxMode', false);
         let marketId = this.safeString(arg, 'instId');
         if (instType === 'sp') {
-            marketId += '_SPBL';
+            marketId = marketId + '_SPBL';
         }
         else {
-            if (!sandboxMode) {
-                marketId += '_UMCBL';
+            let extension = sandboxMode ? '_S' : '_';
+            const splitByUSDT = marketId.split('USDT');
+            const splitByPERP = marketId.split('PERP');
+            const splitByUSDTLength = splitByUSDT.length;
+            const splitByPERPLength = splitByPERP.length;
+            if (splitByUSDTLength > 1) {
+                extension += 'UMCBL';
+            }
+            else if (splitByPERPLength > 1) {
+                extension += 'CMCBL';
             }
             else {
-                marketId += '_SUMCBL';
+                extension += 'DMCBL';
             }
+            marketId = marketId + extension;
         }
         return marketId;
     }
@@ -606,6 +620,8 @@ class bitget extends bitget$1 {
          * @method
          * @name bitget#watchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://bitgetlimited.github.io/apidoc/en/spot/#trades-channel
+         * @see https://bitgetlimited.github.io/apidoc/en/mix/#trades-channel
          * @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

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 } 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.3";
+declare const version = "4.1.4";
 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.4';
+const version = '4.1.5';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

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

@@ -5,6 +5,40 @@ interface Exchange {
     xreserveGetFee(params?: {}): Promise<implicitReturnType>;
     xreserveGetDelegatedTransactions(params?: {}): Promise<implicitReturnType>;
     xreservePostDelegateTransfer(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetMe(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetGetBalance(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetActive(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetOrderHistory(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetOrderPrivateIdTrades(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetOrderDetailsIdWithTradesWithTrades(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetTradeHistory(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetTransactionHash(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetDepositPreRequest(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetDepositCryptoAddress(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetDepositCryptoGetMerchantAddress(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetDepositHistory(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetDepositDetailsDepositId(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetWithdrawPreRequest(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetWithdrawHistory(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetWithdrawDetailsWithdrawId(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetKunaCodeId(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetKunaCodeCodeCheck(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetKunaCodeIssuedByMe(params?: {}): Promise<implicitReturnType>;
+    v4PrivateGetKunaCodeRedeemedByMe(params?: {}): Promise<implicitReturnType>;
+    v4PrivatePostOrderCreate(params?: {}): Promise<implicitReturnType>;
+    v4PrivatePostOrderCancel(params?: {}): Promise<implicitReturnType>;
+    v4PrivatePostOrderCancelMulti(params?: {}): Promise<implicitReturnType>;
+    v4PrivatePostDepositCryptoGenerateAddress(params?: {}): Promise<implicitReturnType>;
+    v4PrivatePostDepositCryptoGenerateMerchantAddress(params?: {}): Promise<implicitReturnType>;
+    v4PrivatePostWithdrawCreate(params?: {}): Promise<implicitReturnType>;
+    v4PrivatePostKunaCode(params?: {}): Promise<implicitReturnType>;
+    v4PrivatePutKunaCodeRedeem(params?: {}): Promise<implicitReturnType>;
+    v4PublicGetTimestamp(params?: {}): Promise<implicitReturnType>;
+    v4PublicGetFees(params?: {}): Promise<implicitReturnType>;
+    v4PublicGetCurrenciesTypeType(params?: {}): Promise<implicitReturnType>;
+    v4PublicGetMarketsGetAll(params?: {}): Promise<implicitReturnType>;
+    v4PublicGetMarketsTickersPairsPairs(params?: {}): Promise<implicitReturnType>;
+    v4PublicGetOrderBookPairs(params?: {}): Promise<implicitReturnType>;
     v3PublicGetTimestamp(params?: {}): Promise<implicitReturnType>;
     v3PublicGetCurrencies(params?: {}): Promise<implicitReturnType>;
     v3PublicGetMarkets(params?: {}): Promise<implicitReturnType>;

package/js/src/coinex.js

@@ -890,7 +890,7 @@ export default class coinex extends Exchange {
         //         message: 'OK'
         //     }
         //
-        return this.safeNumber(response, 'data');
+        return this.safeInteger(response, 'data');
     }
     async fetchOrderBook(symbol, limit = 20, params = {}) {
         /**

package/js/src/coinsph.js

@@ -543,7 +543,6 @@ export default class coinsph extends Exchange {
             const quoteId = this.safeString(market, 'quoteAsset');
             const base = this.safeCurrencyCode(baseId);
             const quote = this.safeCurrencyCode(quoteId);
-            const isActive = this.safeString(market, 'status') === 'TRADING';
             const limits = this.indexBy(this.safeValue(market, 'filters'), 'filterType');
             const amountLimits = this.safeValue(limits, 'LOT_SIZE', {});
             const priceLimits = this.safeValue(limits, 'PRICE_FILTER', {});
@@ -563,7 +562,7 @@ export default class coinsph extends Exchange {
                 'swap': false,
                 'future': false,
                 'option': false,
-                'active': isActive,
+                'active': this.safeStringLower(market, 'status') === 'trading',
                 'contract': false,
                 'linear': undefined,
                 'inverse': undefined,

package/js/src/kraken.d.ts

@@ -48,7 +48,7 @@ export default class kraken extends Exchange {
         before: any;
         after: number;
         status: string;
-        timestamp: any;
+        timestamp: number;
         datetime: string;
         fee: {
             cost: number;

package/js/src/kraken.js

@@ -939,11 +939,7 @@ export default class kraken extends Exchange {
         else {
             direction = 'in';
         }
-        const time = this.safeNumber(item, 'time');
-        let timestamp = undefined;
-        if (time !== undefined) {
-            timestamp = this.parseToInt(time * 1000);
-        }
+        const timestamp = this.safeIntegerProduct(item, 'time', 1000);
         return {
             'info': item,
             'id': id,

package/js/src/kuna.d.ts

@@ -3,6 +3,7 @@ import { Int, OrderSide, OrderType } from './base/types.js';
 /**
  * @class kuna
  * @extends Exchange
+ * @description Use the public-key as your apiKey
  */
 export default class kuna extends Exchange {
     describe(): any;

package/js/src/kuna.js

@@ -9,10 +9,12 @@ import Exchange from './abstract/kuna.js';
 import { ArgumentsRequired, InsufficientFunds, OrderNotFound, NotSupported } from './base/errors.js';
 import { TICK_SIZE } from './base/functions/number.js';
 import { sha256 } from './static_dependencies/noble-hashes/sha256.js';
+import { sha384 } from './static_dependencies/noble-hashes/sha512.js';
 // ---------------------------------------------------------------------------
 /**
  * @class kuna
  * @extends Exchange
+ * @description Use the public-key as your apiKey
  */
 export default class kuna extends Exchange {
     describe() {
@@ -70,6 +72,7 @@ export default class kuna extends Exchange {
                 'api': {
                     'xreserve': 'https://api.xreserve.fund',
                     'v3': 'https://api.kuna.io',
+                    'v4': 'https://api.kuna.io',
                     'public': 'https://kuna.io',
                     'private': 'https://kuna.io', // v2
                 },
@@ -88,6 +91,54 @@ export default class kuna extends Exchange {
                         'delegate-transfer': 1,
                     },
                 },
+                'v4': {
+                    'private': {
+                        'get': {
+                            'me': 1,
+                            'getBalance': 1,
+                            'active': 1,
+                            'order/history': 1,
+                            'order/private/{id}/trades': 1,
+                            'order/details/{id}?withTrades={withTrades}': 1,
+                            'trade/history': 1,
+                            'transaction/{hash}': 1,
+                            'deposit/preRequest': 1,
+                            'deposit/crypto/address': 1,
+                            'deposit/crypto/getMerchantAddress': 1,
+                            'deposit/history': 1,
+                            'deposit/details/{depositId}': 1,
+                            'withdraw/preRequest': 1,
+                            'withdraw/history': 1,
+                            'withdraw/details/{withdrawId}': 1,
+                            'kuna-code/{id}': 1,
+                            'kuna-code/{code}/check': 1,
+                            'kuna-code/issued-by-me': 1,
+                            'kuna-code/redeemed-by-me': 1,
+                        },
+                        'post': {
+                            'order/create': 1,
+                            'order/cancel': 1,
+                            'order/cancel/multi': 1,
+                            'deposit/crypto/generateAddress': 1,
+                            'deposit/crypto/generateMerchantAddress': 1,
+                            'withdraw/create': 1,
+                            'kuna-code': 1,
+                        },
+                        'put': {
+                            'kuna-code/redeem': 1,
+                        },
+                    },
+                    'public': {
+                        'get': {
+                            'timestamp': 1,
+                            'fees': 1,
+                            'currencies?type={type}': 1,
+                            'markets/getAll': 1,
+                            'markets/tickers?pairs={pairs}': 1,
+                            'order/book/{pairs}': 1,
+                        },
+                    },
+                },
                 'v3': {
                     'public': {
                         'get': {
@@ -295,6 +346,9 @@ export default class kuna extends Exchange {
                 '2002': InsufficientFunds,
                 '2003': OrderNotFound,
             },
+            'options': {
+            // 'account': 'pro'      // Only for pro accounts
+            },
         });
     }
     async fetchTime(params = {}) {
@@ -851,20 +905,53 @@ export default class kuna extends Exchange {
         let url = undefined;
         if (Array.isArray(api)) {
             const [version, access] = api;
-            url = this.urls['api'][version] + '/' + version + '/' + this.implodeParams(path, params);
-            if (access === 'public') {
-                if (method === 'GET') {
-                    if (Object.keys(params).length) {
-                        url += '?' + this.urlencode(params);
+            if (version === 'v3') {
+                url = this.urls['api'][version] + '/' + version + '/' + this.implodeParams(path, params);
+                if (access === 'public') {
+                    if (method === 'GET') {
+                        if (Object.keys(params).length) {
+                            url += '?' + this.urlencode(params);
+                        }
+                    }
+                    else if ((method === 'POST') || (method === 'PUT')) {
+                        headers = { 'Content-Type': 'application/json' };
+                        body = this.json(params);
                     }
                 }
-                else if ((method === 'POST') || (method === 'PUT')) {
-                    headers = { 'Content-Type': 'application/json' };
-                    body = this.json(params);
+                else if (access === 'private') {
+                    throw new NotSupported(this.id + ' private v3 API is not supported yet');
                 }
             }
-            else if (access === 'private') {
-                throw new NotSupported(this.id + ' private v3 API is not supported yet');
+            else if (version === 'v4') {
+                const splitPath = path.split('/');
+                const splitPathLength = splitPath.length;
+                let urlPath = '';
+                if ((splitPathLength > 1) && (splitPath[0] !== 'kuna-code')) {
+                    let pathTail = '';
+                    for (let i = 1; i < splitPathLength; i++) {
+                        pathTail += splitPath[i];
+                    }
+                    urlPath = '/' + version + '/' + splitPath[0] + '/' + access + '/' + this.implodeParams(pathTail, params);
+                }
+                else {
+                    urlPath = '/' + version + '/' + access + '/' + this.implodeParams(path, params);
+                }
+                url = this.urls['api'][version] + urlPath;
+                if (access === 'private') {
+                    const nonce = this.nonce();
+                    const auth = urlPath + nonce + this.json(params);
+                    headers = {
+                        'content-type': 'application/json',
+                        'accept': 'application/json',
+                        'nonce': nonce,
+                        'public-key': this.apiKey,
+                        'signature': this.hmac(this.encode(auth), this.encode(this.secret), sha384, 'hex'),
+                    };
+                    const account = this.safeString(this.options, 'account');
+                    if (account === 'pro') {
+                        headers['account'] = 'pro';
+                    }
+                }
             }
         }
         else {

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

@@ -1,6 +1,11 @@
 import bitgetRest from '../bitget.js';
 import { Int } from '../base/types.js';
 import Client from '../base/ws/Client.js';
+/**
+ * @class bitget
+ * @extends Exchange
+ * @description watching delivery future markets is not yet implemented (perpertual future / swap is implemented)
+ */
 export default class bitget extends bitgetRest {
     describe(): any;
     getWsMarketId(market: any): any;

package/js/src/pro/bitget.js

@@ -11,6 +11,11 @@ import { Precise } from '../base/Precise.js';
 import { ArrayCache, ArrayCacheBySymbolById, ArrayCacheByTimestamp } from '../base/ws/Cache.js';
 import { sha256 } from '../static_dependencies/noble-hashes/sha256.js';
 //  ---------------------------------------------------------------------------
+/**
+ * @class bitget
+ * @extends Exchange
+ * @description watching delivery future markets is not yet implemented (perpertual future / swap is implemented)
+ */
 export default class bitget extends bitgetRest {
     describe() {
         return this.deepExtend(super.describe(), {
@@ -83,10 +88,10 @@ export default class bitget extends bitgetRest {
         }
         else {
             if (!sandboxMode) {
-                return market['id'].replace('_UMCBL', '');
+                return market['id'].replace('_UMCBL', '').replace('_DMCBL', '').replace('_CMCBL', '');
             }
             else {
-                return market['id'].replace('_SUMCBL', '');
+                return market['id'].replace('_SUMCBL', '').replace('_SDMCBL', '').replace('_SCMCBL', '');
             }
         }
     }
@@ -98,15 +103,24 @@ export default class bitget extends bitgetRest {
         const sandboxMode = this.safeValue(this.options, 'sandboxMode', false);
         let marketId = this.safeString(arg, 'instId');
         if (instType === 'sp') {
-            marketId += '_SPBL';
+            marketId = marketId + '_SPBL';
         }
         else {
-            if (!sandboxMode) {
-                marketId += '_UMCBL';
+            let extension = sandboxMode ? '_S' : '_';
+            const splitByUSDT = marketId.split('USDT');
+            const splitByPERP = marketId.split('PERP');
+            const splitByUSDTLength = splitByUSDT.length;
+            const splitByPERPLength = splitByPERP.length;
+            if (splitByUSDTLength > 1) {
+                extension += 'UMCBL';
+            }
+            else if (splitByPERPLength > 1) {
+                extension += 'CMCBL';
             }
             else {
-                marketId += '_SUMCBL';
+                extension += 'DMCBL';
             }
+            marketId = marketId + extension;
         }
         return marketId;
     }
@@ -609,6 +623,8 @@ export default class bitget extends bitgetRest {
          * @method
          * @name bitget#watchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://bitgetlimited.github.io/apidoc/en/spot/#trades-channel
+         * @see https://bitgetlimited.github.io/apidoc/en/mix/#trades-channel
          * @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

package/package.json

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