From ec0d159230235cd792652094a58f5c6d2e8e24f3 Mon Sep 17 00:00:00 2001 From: mateusfigmelo Date: Tue, 25 Feb 2025 18:34:44 +0000 Subject: [PATCH 1/3] fix ignoring global params and set the log level of reth --- src/el/op-reth/op_reth_builder_launcher.star | 1 + src/el/op-reth/op_reth_launcher.star | 1 + src/package_io/input_parser.star | 29 +++++++------------- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/el/op-reth/op_reth_builder_launcher.star b/src/el/op-reth/op_reth_builder_launcher.star index 733866ba..1701d17b 100644 --- a/src/el/op-reth/op_reth_builder_launcher.star +++ b/src/el/op-reth/op_reth_builder_launcher.star @@ -187,6 +187,7 @@ def get_config( "--discovery.port={0}".format(discovery_port), "--port={0}".format(discovery_port), "--rpc.eth-proof-window=302400", + "-" + log_level, ] # configure files diff --git a/src/el/op-reth/op_reth_launcher.star b/src/el/op-reth/op_reth_launcher.star index 2a987440..fadc4bbe 100644 --- a/src/el/op-reth/op_reth_launcher.star +++ b/src/el/op-reth/op_reth_launcher.star @@ -187,6 +187,7 @@ def get_config( "--discovery.port={0}".format(discovery_port), "--port={0}".format(discovery_port), "--rpc.eth-proof-window=302400", + "-" + log_level, ] # configure files diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 725ff100..02fb8913 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -72,11 +72,6 @@ def input_parser(plan, input_args): sanity_check.sanity_check(plan, input_args) results = parse_network_params(plan, input_args) - results["global_log_level"] = "info" - results["global_node_selectors"] = {} - results["global_tolerations"] = [] - results["persistent"] = False - return struct( observability=struct( enabled=results["observability"]["enabled"], @@ -405,23 +400,19 @@ def parse_network_params(plan, input_args): input_args.get("op_contract_deployer_params", {}) ) - results["global_log_level"] = input_args.get("global_log_level", "info") + # configure global args - return results + results["global_log_level"] = "info" + results["global_node_selectors"] = {} + results["global_tolerations"] = [] + results["persistent"] = False + results["global_log_level"] = input_args.get("global_log_level", "info") + results["global_node_selectors"].update(input_args.get("global_node_selectors", {})) + results["global_tolerations"] = input_args.get("global_tolerations", []) + results["persistent"] = input_args.get("persistent", False) -def default_optimism_params(): - return { - "observability": default_observability_params(), - "interop": default_interop_params(), - "altda": default_altda_deploy_config(), - "chains": default_chains(), - "op_contract_deployer_params": default_op_contract_deployer_params(), - "global_log_level": "info", - "global_node_selectors": {}, - "global_tolerations": [], - "persistent": False, - } + return results def default_observability_params(): From 910a26619f4f41af793be44016bf37777817d23d Mon Sep 17 00:00:00 2001 From: mateusfigmelo Date: Tue, 25 Feb 2025 18:45:55 +0000 Subject: [PATCH 2/3] fix: update verb passingose arg --- src/el/op-reth/op_reth_builder_launcher.star | 2 +- src/el/op-reth/op_reth_launcher.star | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/el/op-reth/op_reth_builder_launcher.star b/src/el/op-reth/op_reth_builder_launcher.star index 1701d17b..d794f0a7 100644 --- a/src/el/op-reth/op_reth_builder_launcher.star +++ b/src/el/op-reth/op_reth_builder_launcher.star @@ -161,6 +161,7 @@ def get_config( cmd = [ "node", + "-{0}".format(log_level), "--datadir=" + EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER, "--chain={0}".format( launcher.network @@ -187,7 +188,6 @@ def get_config( "--discovery.port={0}".format(discovery_port), "--port={0}".format(discovery_port), "--rpc.eth-proof-window=302400", - "-" + log_level, ] # configure files diff --git a/src/el/op-reth/op_reth_launcher.star b/src/el/op-reth/op_reth_launcher.star index fadc4bbe..9a716093 100644 --- a/src/el/op-reth/op_reth_launcher.star +++ b/src/el/op-reth/op_reth_launcher.star @@ -161,6 +161,7 @@ def get_config( cmd = [ "node", + "-{0}".format(log_level), "--datadir=" + EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER, "--chain={0}".format( launcher.network @@ -187,7 +188,6 @@ def get_config( "--discovery.port={0}".format(discovery_port), "--port={0}".format(discovery_port), "--rpc.eth-proof-window=302400", - "-" + log_level, ] # configure files From ccd52310625b526b55c4362dfcf8843439d7d714 Mon Sep 17 00:00:00 2001 From: mateusfigmelo Date: Thu, 27 Feb 2025 04:59:10 +0000 Subject: [PATCH 3/3] fix: test reth default --- test/el_cl_launcher_test.star | 1 + 1 file changed, 1 insertion(+) diff --git a/test/el_cl_launcher_test.star b/test/el_cl_launcher_test.star index 71aec5c8..5a88c155 100644 --- a/test/el_cl_launcher_test.star +++ b/test/el_cl_launcher_test.star @@ -129,6 +129,7 @@ def test_launch_with_defaults(plan): el_service_config.cmd, [ "node", + "-vvv", "--datadir=/data/op-reth/execution-data", "--chain=/network-configs/genesis-{0}.json".format( chain.network_params.network_id