Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix get_coldkey_password_from_environment resolving wrong password #1843

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions bittensor/keyfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,12 @@ def get_coldkey_password_from_environment(coldkey_name: str) -> Optional[str]:
Returns:
password (str): The password retrieved from the environment variables, or ``None`` if not found.
"""
for env_var in os.environ:
if env_var.upper().startswith("BT_COLD_PW_") and env_var.upper().endswith(
coldkey_name.upper()
):
return os.getenv(env_var)

return None
envs = {
normalized_env_name: env_value
for env_name, env_value in os.environ.items()
if (normalized_env_name := env_name.upper()).startswith("BT_COLD_PW_")
}
return envs.get(f"BT_COLD_PW_{coldkey_name.upper()}")


def decrypt_keyfile_data(
Expand Down
17 changes: 17 additions & 0 deletions tests/unit_tests/test_keyfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
from substrateinterface.exceptions import ConfigurationError
from bip39 import bip39_validate

from bittensor import get_coldkey_password_from_environment


def test_generate_mnemonic():
"""
Expand Down Expand Up @@ -606,3 +608,18 @@ def test_deserialize_keypair_from_keyfile_data(keyfile_setup_teardown):
assert deserialized_keypair.ss58_address == keypair.ss58_address
assert deserialized_keypair.public_key == keypair.public_key
assert deserialized_keypair.private_key == keypair.private_key


def test_get_coldkey_password_from_environment(monkeypatch):
password_by_wallet = {
"WALLET": "password",
"my_wallet": "password",
}

monkeypatch.setenv("bt_cold_pw_wallet", password_by_wallet["WALLET"])
monkeypatch.setenv("BT_COLD_PW_My_Wallet", password_by_wallet["my_wallet"])

for wallet, password in password_by_wallet.items():
assert get_coldkey_password_from_environment(wallet) == password

assert get_coldkey_password_from_environment("non_existent_wallet") is None