From 63010bc5e9eb62d68b9e16cb09d8e20b3c9d1646 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 03:05:41 +0000 Subject: [PATCH 1/2] chore(deps): bump ccxt from 4.4.69 to 4.4.71 Bumps [ccxt](https://github.com/ccxt/ccxt) from 4.4.69 to 4.4.71. - [Release notes](https://github.com/ccxt/ccxt/releases) - [Changelog](https://github.com/ccxt/ccxt/blob/master/CHANGELOG.md) - [Commits](https://github.com/ccxt/ccxt/compare/v4.4.69...v4.4.71) --- updated-dependencies: - dependency-name: ccxt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 928954c21..9f55b7cd3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ bottleneck==1.4.2 numexpr==2.10.2 pandas-ta==0.3.14b -ccxt==4.4.69 +ccxt==4.4.71 cryptography==44.0.2 aiohttp==3.9.5 SQLAlchemy==2.0.39 From 795a0b81eec3c401d511f6b0799e43a0b3b79ddd Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 31 Mar 2025 06:47:23 +0200 Subject: [PATCH 2/2] chore: remove workaround for Kraken ".F" workaround --- freqtrade/exchange/kraken.py | 2 +- tests/exchange/test_kraken.py | 2 +- tests/exchange_online/conftest.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/freqtrade/exchange/kraken.py b/freqtrade/exchange/kraken.py index 03c97569a..d82725bbb 100644 --- a/freqtrade/exchange/kraken.py +++ b/freqtrade/exchange/kraken.py @@ -69,7 +69,7 @@ class Kraken(Exchange): consolidated: CcxtBalances = {} for currency, balance in balances.items(): base_currency = currency[:-2] if currency.endswith(".F") else currency - base_currency = self._api.commonCurrencies.get(base_currency, base_currency) + if base_currency in consolidated: consolidated[base_currency]["free"] += balance["free"] consolidated[base_currency]["used"] += balance["used"] diff --git a/tests/exchange/test_kraken.py b/tests/exchange/test_kraken.py index 5cfdac15f..fd36a359d 100644 --- a/tests/exchange/test_kraken.py +++ b/tests/exchange/test_kraken.py @@ -71,7 +71,7 @@ def test_get_balances_prod_kraken(default_conf, mocker): "4TH": balance_item.copy(), "EUR": balance_item.copy(), "BTC": {"free": 0.0, "total": 0.0, "used": 0.0}, - "XBT.F": balance_item.copy(), + "BTC.F": balance_item.copy(), "timestamp": 123123, } ) diff --git a/tests/exchange_online/conftest.py b/tests/exchange_online/conftest.py index 8eedcfb01..f7cf49aa4 100644 --- a/tests/exchange_online/conftest.py +++ b/tests/exchange_online/conftest.py @@ -156,7 +156,7 @@ EXCHANGES = { "ADA.F": {"free": 2.0, "total": 2.0, "used": 0.0}, "BTC": {"free": 0.0006, "total": 0.0006, "used": 0.0}, # XBT.F should be mapped to BTC.F - "XBT.F": {"free": 0.001, "total": 0.001, "used": 0.0}, + "BTC.F": {"free": 0.001, "total": 0.001, "used": 0.0}, }, }, },