diff --git a/CHANGELOG.md b/CHANGELOG.md index c2d50b9c3461..6e1989e9fa87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### 2.9.10 (2023-03-09) + ### 2.9.9 (2023-03-09) ### 2.9.8 (2023-03-08) diff --git a/README.md b/README.md index 0179da7ef725..eea81aefea58 100644 --- a/README.md +++ b/README.md @@ -209,13 +209,13 @@ console.log (ccxt.exchanges) // print all available exchanges All-in-one browser bundle (dependencies included), served from a CDN of your choice: -* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@2.9.9/dist/ccxt.browser.js -* unpkg: https://unpkg.com/ccxt@2.9.9/dist/ccxt.browser.js +* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@2.9.10/dist/ccxt.browser.js +* unpkg: https://unpkg.com/ccxt@2.9.10/dist/ccxt.browser.js CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers. ```HTML - + ``` Creates a global `ccxt` object: diff --git a/ccxt.js b/ccxt.js index 52275de3780b..3831376b517f 100644 --- a/ccxt.js +++ b/ccxt.js @@ -37,7 +37,7 @@ const Exchange = require ('./js/base/Exchange') //----------------------------------------------------------------------------- // this is updated by vss.js when building -const version = '2.9.9' +const version = '2.9.10' Exchange.ccxtVersion = version diff --git a/dist/ccxt.browser.js b/dist/ccxt.browser.js index 86629c76ae7e..e195ce6bff37 100644 --- a/dist/ccxt.browser.js +++ b/dist/ccxt.browser.js @@ -47,7 +47,7 @@ const Exchange = require ('./js/base/Exchange') //----------------------------------------------------------------------------- // this is updated by vss.js when building -const version = '2.9.9' +const version = '2.9.10' Exchange.ccxtVersion = version @@ -69275,10 +69275,14 @@ module.exports = class bybit extends Exchange { // use this endpoint only we have no other choice // because it requires transfer permission method = 'privateGetAssetV3PrivateTransferAccountCoinsBalanceQuery'; - request['accountType'] = unifiedType; } else { - method = 'privateGetContractV3PrivateAccountWalletBalance'; + if (enableUnifiedAccount) { + method = 'privateGetV5AccountWalletBalance'; + } else { + method = 'privateGetContractV3PrivateAccountWalletBalance'; + } } + request['accountType'] = unifiedType; } const response = await this[method] (this.extend (request, params)); // diff --git a/package-lock.json b/package-lock.json index c010519e1fb9..1ea3940170b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ccxt", - "version": "2.9.9", + "version": "2.9.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ccxt", - "version": "2.9.9", + "version": "2.9.10", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 8a11c9411527..3173e067db1b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ccxt", - "version": "2.9.9", + "version": "2.9.10", "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 130+ exchanges", "main": "./ccxt.js", "unpkg": "dist/ccxt.browser.js", diff --git a/php/Exchange.php b/php/Exchange.php index 7ceaa9cdb10a..2dffb5b6c108 100644 --- a/php/Exchange.php +++ b/php/Exchange.php @@ -36,7 +36,7 @@ use BN\BN; use Exception; -$version = '2.9.9'; +$version = '2.9.10'; // rounding mode const TRUNCATE = 0; @@ -55,7 +55,7 @@ class Exchange { - const VERSION = '2.9.9'; + const VERSION = '2.9.10'; private static $base58_alphabet = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'; private static $base58_encoder = null; diff --git a/php/async/Exchange.php b/php/async/Exchange.php index 26be9914deea..ae76bb43b528 100644 --- a/php/async/Exchange.php +++ b/php/async/Exchange.php @@ -34,11 +34,11 @@ include 'Throttle.php'; -$version = '2.9.9'; +$version = '2.9.10'; class Exchange extends \ccxt\Exchange { - const VERSION = '2.9.9'; + const VERSION = '2.9.10'; public $browser; public $marketsLoading = null; diff --git a/php/async/bybit.php b/php/async/bybit.php index 3dd3b8e44818..d04552f5af0e 100644 --- a/php/async/bybit.php +++ b/php/async/bybit.php @@ -2983,10 +2983,14 @@ public function fetch_balance($params = array ()) { // use this endpoint only we have no other choice // because it requires transfer permission $method = 'privateGetAssetV3PrivateTransferAccountCoinsBalanceQuery'; - $request['accountType'] = $unifiedType; } else { - $method = 'privateGetContractV3PrivateAccountWalletBalance'; + if ($enableUnifiedAccount) { + $method = 'privateGetV5AccountWalletBalance'; + } else { + $method = 'privateGetContractV3PrivateAccountWalletBalance'; + } } + $request['accountType'] = $unifiedType; } $response = Async\await($this->$method (array_merge($request, $params))); // diff --git a/php/bybit.php b/php/bybit.php index 2125babeea40..ecba1d86909e 100644 --- a/php/bybit.php +++ b/php/bybit.php @@ -2942,10 +2942,14 @@ public function fetch_balance($params = array ()) { // use this endpoint only we have no other choice // because it requires transfer permission $method = 'privateGetAssetV3PrivateTransferAccountCoinsBalanceQuery'; - $request['accountType'] = $unifiedType; } else { - $method = 'privateGetContractV3PrivateAccountWalletBalance'; + if ($enableUnifiedAccount) { + $method = 'privateGetV5AccountWalletBalance'; + } else { + $method = 'privateGetContractV3PrivateAccountWalletBalance'; + } } + $request['accountType'] = $unifiedType; } $response = $this->$method (array_merge($request, $params)); // diff --git a/python/README.md b/python/README.md index 0179da7ef725..eea81aefea58 100644 --- a/python/README.md +++ b/python/README.md @@ -209,13 +209,13 @@ console.log (ccxt.exchanges) // print all available exchanges All-in-one browser bundle (dependencies included), served from a CDN of your choice: -* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@2.9.9/dist/ccxt.browser.js -* unpkg: https://unpkg.com/ccxt@2.9.9/dist/ccxt.browser.js +* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@2.9.10/dist/ccxt.browser.js +* unpkg: https://unpkg.com/ccxt@2.9.10/dist/ccxt.browser.js CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers. ```HTML - + ``` Creates a global `ccxt` object: diff --git a/python/ccxt/__init__.py b/python/ccxt/__init__.py index 066a4092c91e..084b43e00c57 100644 --- a/python/ccxt/__init__.py +++ b/python/ccxt/__init__.py @@ -22,7 +22,7 @@ # ---------------------------------------------------------------------------- -__version__ = '2.9.9' +__version__ = '2.9.10' # ---------------------------------------------------------------------------- diff --git a/python/ccxt/async_support/__init__.py b/python/ccxt/async_support/__init__.py index c3d3c3a696cb..9514c51a2d25 100644 --- a/python/ccxt/async_support/__init__.py +++ b/python/ccxt/async_support/__init__.py @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- -__version__ = '2.9.9' +__version__ = '2.9.10' # ----------------------------------------------------------------------------- diff --git a/python/ccxt/async_support/base/exchange.py b/python/ccxt/async_support/base/exchange.py index cbef53823ee8..2aa8c292b705 100644 --- a/python/ccxt/async_support/base/exchange.py +++ b/python/ccxt/async_support/base/exchange.py @@ -2,7 +2,7 @@ # ----------------------------------------------------------------------------- -__version__ = '2.9.9' +__version__ = '2.9.10' # ----------------------------------------------------------------------------- diff --git a/python/ccxt/async_support/bybit.py b/python/ccxt/async_support/bybit.py index a732c85b5f50..5952309e939b 100644 --- a/python/ccxt/async_support/bybit.py +++ b/python/ccxt/async_support/bybit.py @@ -2868,9 +2868,12 @@ async def fetch_balance(self, params={}): # use self endpoint only we have no other choice # because it requires transfer permission method = 'privateGetAssetV3PrivateTransferAccountCoinsBalanceQuery' - request['accountType'] = unifiedType else: - method = 'privateGetContractV3PrivateAccountWalletBalance' + if enableUnifiedAccount: + method = 'privateGetV5AccountWalletBalance' + else: + method = 'privateGetContractV3PrivateAccountWalletBalance' + request['accountType'] = unifiedType response = await getattr(self, method)(self.extend(request, params)) # # spot wallet diff --git a/python/ccxt/base/exchange.py b/python/ccxt/base/exchange.py index 93a89ac5e582..fc1c57edfef4 100644 --- a/python/ccxt/base/exchange.py +++ b/python/ccxt/base/exchange.py @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- -__version__ = '2.9.9' +__version__ = '2.9.10' # ----------------------------------------------------------------------------- diff --git a/python/ccxt/bybit.py b/python/ccxt/bybit.py index 3ecae653390d..50d07e084a7f 100644 --- a/python/ccxt/bybit.py +++ b/python/ccxt/bybit.py @@ -2866,9 +2866,12 @@ def fetch_balance(self, params={}): # use self endpoint only we have no other choice # because it requires transfer permission method = 'privateGetAssetV3PrivateTransferAccountCoinsBalanceQuery' - request['accountType'] = unifiedType else: - method = 'privateGetContractV3PrivateAccountWalletBalance' + if enableUnifiedAccount: + method = 'privateGetV5AccountWalletBalance' + else: + method = 'privateGetContractV3PrivateAccountWalletBalance' + request['accountType'] = unifiedType response = getattr(self, method)(self.extend(request, params)) # # spot wallet diff --git a/python/ccxt/pro/__init__.py b/python/ccxt/pro/__init__.py index 89ffbecc4d4b..6b8c7531653e 100644 --- a/python/ccxt/pro/__init__.py +++ b/python/ccxt/pro/__init__.py @@ -4,7 +4,7 @@ # ---------------------------------------------------------------------------- -__version__ = '2.9.9' +__version__ = '2.9.10' # ---------------------------------------------------------------------------- diff --git a/python/ccxt/pro/base/exchange.py b/python/ccxt/pro/base/exchange.py index 859eca4a9c25..ea792540e575 100644 --- a/python/ccxt/pro/base/exchange.py +++ b/python/ccxt/pro/base/exchange.py @@ -2,7 +2,7 @@ # ----------------------------------------------------------------------------- -__version__ = '2.9.9' +__version__ = '2.9.10' # ----------------------------------------------------------------------------- diff --git a/python/package.json b/python/package.json index 8a11c9411527..3173e067db1b 100644 --- a/python/package.json +++ b/python/package.json @@ -1,6 +1,6 @@ { "name": "ccxt", - "version": "2.9.9", + "version": "2.9.10", "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 130+ exchanges", "main": "./ccxt.js", "unpkg": "dist/ccxt.browser.js", diff --git a/wiki/Install.md b/wiki/Install.md index fb993f87dec3..817c11eb83ae 100644 --- a/wiki/Install.md +++ b/wiki/Install.md @@ -40,13 +40,13 @@ console.log (ccxt.exchanges) // print all available exchanges All-in-one browser bundle (dependencies included), served from a CDN of your choice: -* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@2.9.9/dist/ccxt.browser.js -* unpkg: https://unpkg.com/ccxt@2.9.9/dist/ccxt.browser.js +* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@2.9.10/dist/ccxt.browser.js +* unpkg: https://unpkg.com/ccxt@2.9.10/dist/ccxt.browser.js You can obtain a live-updated version of the bundle by removing the version number from the URL (the `@a.b.c` thing) — however, we do not recommend to do that, as it may break your app eventually. Also, please keep in mind that we are not responsible for the correct operation of those CDN servers. ```HTML - + ``` Creates a global `ccxt` object: