From 9aaf2a4116199fc04b496b80098d7750708a0aa8 Mon Sep 17 00:00:00 2001 From: Mario Vega Date: Mon, 4 Nov 2024 19:38:04 +0000 Subject: [PATCH 1/2] fix: incorporate environment resolutions in supported forks --- src/ethereum_spec_evm_resolver/main.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ethereum_spec_evm_resolver/main.py b/src/ethereum_spec_evm_resolver/main.py index 5be3d48..1f110ce 100644 --- a/src/ethereum_spec_evm_resolver/main.py +++ b/src/ethereum_spec_evm_resolver/main.py @@ -5,11 +5,24 @@ import platformdirs from .daemon import Daemon as Daemon -from .forks import get_default_resolutions, get_fork_resolution +from .forks import ( + get_default_resolutions, + get_env_resolutions, + get_fork_resolution, +) def main(): - supported_forks = "\n".join(get_default_resolutions().keys()) + supported_forks_resolutions = {} + try: + # First try to get the resolutions from the environment + supported_forks_resolutions = get_env_resolutions() + except Exception: + pass + if not supported_forks_resolutions: + # If the environment does not have the resolutions, use the defaults + supported_forks_resolutions = get_default_resolutions() + supported_forks = "\n".join(supported_forks_resolutions.keys()) epilog = "Supported Forks:\n" + supported_forks parser = argparse.ArgumentParser( From 90badd7dcf50b5148b841ce04c53da6ac03e0765 Mon Sep 17 00:00:00 2001 From: Peter Miller Date: Tue, 12 Nov 2024 23:40:13 +0700 Subject: [PATCH 2/2] Merge default and env resolutions when generating help string --- src/ethereum_spec_evm_resolver/main.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ethereum_spec_evm_resolver/main.py b/src/ethereum_spec_evm_resolver/main.py index 1f110ce..8753517 100644 --- a/src/ethereum_spec_evm_resolver/main.py +++ b/src/ethereum_spec_evm_resolver/main.py @@ -13,15 +13,12 @@ def main(): - supported_forks_resolutions = {} + supported_forks_resolutions = get_default_resolutions() try: # First try to get the resolutions from the environment - supported_forks_resolutions = get_env_resolutions() + supported_forks_resolutions.update(get_env_resolutions()) except Exception: pass - if not supported_forks_resolutions: - # If the environment does not have the resolutions, use the defaults - supported_forks_resolutions = get_default_resolutions() supported_forks = "\n".join(supported_forks_resolutions.keys()) epilog = "Supported Forks:\n" + supported_forks