Skip to content

Fix wrong chain account loading #189

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Fix wrong chain account loading #189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions src/aleph/sdk/account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,14 @@ def account_from_hex_string(
private_key_str = private_key_str[2:]

if not chain:
if not account_type:
account_type = load_chain_account_type(Chain.ETH) # type: ignore
return account_type(bytes.fromhex(private_key_str)) # type: ignore
chain = settings.DEFAULT_CHAIN
if not account_type:
account_type = load_chain_account_type(chain) # type: ignore
account = account_type(
bytes.fromhex(private_key_str),
**({"chain": chain} if type(account_type) in [ETHAccount, EVMAccount] else {}),
) # type: ignore

account_type = load_chain_account_type(chain)
account = account_type(bytes.fromhex(private_key_str), chain)
if chain in get_chains_with_super_token():
account.switch_chain(chain)
return account # type: ignore
Expand All @@ -73,12 +75,14 @@ def account_from_file(
private_key = private_key_path.read_bytes()

if not chain:
if not account_type:
account_type = load_chain_account_type(Chain.ETH) # type: ignore
return account_type(private_key) # type: ignore
chain = settings.DEFAULT_CHAIN
if not account_type:
account_type = load_chain_account_type(chain) # type: ignore
account = account_type(
private_key,
**({"chain": chain} if type(account_type) in [ETHAccount, EVMAccount] else {}),
) # type: ignore

account_type = load_chain_account_type(chain)
account = account_type(private_key, chain)
if chain in get_chains_with_super_token():
account.switch_chain(chain)
return account
Expand Down Expand Up @@ -106,8 +110,6 @@ def _load_account(
logger.warning(
f"No main configuration found on path {settings.CONFIG_FILE}, defaulting to {chain}"
)
else:
chain = default_chain

# Loads configuration if no account_type is specified
if not account_type:
Expand Down
Loading