From da4e28eac2f56080a30263ef87cb18771c505d83 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Fri, 20 Oct 2023 17:28:48 +0200 Subject: [PATCH 1/2] fix: remove path based storage when builder is used --- src/el/geth/geth_launcher.star | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star index 5920e1fd5..60e07eece 100644 --- a/src/el/geth/geth_launcher.star +++ b/src/el/geth/geth_launcher.star @@ -155,6 +155,11 @@ def get_config( EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER, constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json", ) + elif "--builder" in extra_params: + init_datadir_cmd_str = "geth init --datadir={0} {1}".format( + EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER, + constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json", + ) else: init_datadir_cmd_str = "geth init --state.scheme=path --datadir={0} {1}".format( EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER, @@ -163,8 +168,8 @@ def get_config( cmd = [ "geth", - # Disable path based storage scheme for electra fork - "{0}".format("--state.scheme=path" if electra_fork_epoch == None else ""), + # Disable path based storage scheme for electra fork or when builder image is used + "{0}".format("--state.scheme=path" if electra_fork_epoch != None or "--builder" not in extra_params else ""), # Override prague fork timestamp for electra fork "{0}".format( "--override.prague=" + final_genesis_timestamp From f152d94aff1b368d634a77b53ffcd0f00393b82f Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Fri, 20 Oct 2023 17:29:53 +0200 Subject: [PATCH 2/2] fix: remove path based storage when builder is used --- src/el/geth/geth_launcher.star | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star index 60e07eece..0e9fde28b 100644 --- a/src/el/geth/geth_launcher.star +++ b/src/el/geth/geth_launcher.star @@ -155,7 +155,7 @@ def get_config( EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER, constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json", ) - elif "--builder" in extra_params: + elif "--builder" in extra_params: init_datadir_cmd_str = "geth init --datadir={0} {1}".format( EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER, constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json", @@ -169,7 +169,12 @@ def get_config( cmd = [ "geth", # Disable path based storage scheme for electra fork or when builder image is used - "{0}".format("--state.scheme=path" if electra_fork_epoch != None or "--builder" not in extra_params else ""), + # TODO: REMOVE Once geth default db is path based, and builder rebased + "{0}".format( + "--state.scheme=path" + if electra_fork_epoch != None or "--builder" not in extra_params + else "" + ), # Override prague fork timestamp for electra fork "{0}".format( "--override.prague=" + final_genesis_timestamp