From dd55baf148901d6d108075c40d5d7bbf29379730 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 2 Aug 2024 07:05:45 +0200 Subject: [PATCH] chore: support snake_case for api keys --- freqtrade/configuration/config_secrets.py | 4 ++++ freqtrade/exchange/exchange.py | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/freqtrade/configuration/config_secrets.py b/freqtrade/configuration/config_secrets.py index 427e09088..e17a7925e 100644 --- a/freqtrade/configuration/config_secrets.py +++ b/freqtrade/configuration/config_secrets.py @@ -14,12 +14,16 @@ def sanitize_config(config: Config, *, show_sensitive: bool = False) -> Config: return config keys_to_remove = [ "exchange.key", + "exchange.api_key", "exchange.apiKey", "exchange.secret", "exchange.password", "exchange.uid", + "exchange.account_id", "exchange.accountId", + "exchange.wallet_address", "exchange.walletAddress", + "exchange.private_key", "exchange.privateKey", "telegram.token", "telegram.chat_id", diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index 3ed35b03d..b80b3147e 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -353,14 +353,18 @@ class Exchange: raise OperationalException(f"Exchange {name} is not supported by ccxt") ex_config = { - "apiKey": exchange_config.get("apiKey", exchange_config.get("key")), + "apiKey": exchange_config.get( + "api_key", exchange_config.get("apiKey", exchange_config.get("key")) + ), "secret": exchange_config.get("secret"), "password": exchange_config.get("password"), "uid": exchange_config.get("uid", ""), - "accountId": exchange_config.get("accountId", ""), + "accountId": exchange_config.get("account_id", exchange_config.get("accountId", "")), # DEX attributes: - "walletAddress": exchange_config.get("walletAddress"), - "privateKey": exchange_config.get("privateKey"), + "walletAddress": exchange_config.get( + "wallet_address", exchange_config.get("walletAddress") + ), + "privateKey": exchange_config.get("private_key", exchange_config.get("privateKey")), } if ccxt_kwargs: logger.info("Applying additional ccxt config: %s", ccxt_kwargs)