Commit e0854624 authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub

fix: disable pbss when gcmode archive set (#559)

parent 555ad7dc
...@@ -850,7 +850,7 @@ snooper_enabled: true ...@@ -850,7 +850,7 @@ snooper_enabled: true
| Teku BN | ✅ | ✅ | ✅ | ✅ | ✅ | Teku BN | ✅ | ✅ | ✅ | ✅ | ✅
| Lodestar BN | ✅ | ❌ | ❌ | ✅ | ❌ | Lodestar BN | ✅ | ❌ | ❌ | ✅ | ❌
| Nimbus BN | ✅ | ❌ | ✅ | ❌ | ✅ | Nimbus BN | ✅ | ❌ | ✅ | ❌ | ✅
| Grandine BN | ✅ | ✅ | ✅ | | ✅ | Grandine BN | ✅ | ✅ | ✅ | | ✅
## Custom labels for Docker and Kubernetes ## Custom labels for Docker and Kubernetes
......
...@@ -216,6 +216,14 @@ def get_config( ...@@ -216,6 +216,14 @@ def get_config(
) )
elif constants.NETWORK_NAME.shadowfork in network: elif constants.NETWORK_NAME.shadowfork in network:
init_datadir_cmd_str = "echo shadowfork" init_datadir_cmd_str = "echo shadowfork"
elif (
"--gcmode archive" in extra_params
): # Disable path based storage scheme archive mode
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: else:
init_datadir_cmd_str = "geth init --state.scheme=path --datadir={0} {1}".format( init_datadir_cmd_str = "geth init --state.scheme=path --datadir={0} {1}".format(
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER, EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
...@@ -226,7 +234,11 @@ def get_config( ...@@ -226,7 +234,11 @@ def get_config(
"geth", "geth",
# Disable path based storage scheme for electra fork and verkle # Disable path based storage scheme for electra fork and verkle
# TODO: REMOVE Once geth default db is path based, and builder rebased # TODO: REMOVE Once geth default db is path based, and builder rebased
"{0}".format("--state.scheme=path" if "verkle" not in network else ""), "{0}".format(
"--state.scheme=path"
if "verkle" not in network and "--gcmode archive" not in extra_params
else ""
),
# Override prague fork timestamp for electra fork # Override prague fork timestamp for electra fork
"{0}".format("--cache.preimages" if "verkle" in network else ""), "{0}".format("--cache.preimages" if "verkle" in network else ""),
# Override prague fork timestamp # Override prague fork timestamp
......
...@@ -483,13 +483,14 @@ def parse_network_params(input_args): ...@@ -483,13 +483,14 @@ def parse_network_params(input_args):
total_participant_count += participant["count"] total_participant_count += participant["count"]
if total_participant_count == 1: if total_participant_count == 1:
for index, participant in enumerate(result["participants"]): for index, participant in enumerate(result["participants"]):
# If there is only one participant, we run lodestar as a single node mode # If there is only one participant, we run lodestar as a single node mode
if participant["cl_type"] == constants.CL_TYPE.lodestar: if participant["cl_type"] == constants.CL_TYPE.lodestar:
participant["cl_extra_params"].append("--sync.isSingleNode") participant["cl_extra_params"].append("--sync.isSingleNode")
participant["cl_extra_params"].append("--network.allowPublishToZeroPeers") participant["cl_extra_params"].append(
"--network.allowPublishToZeroPeers"
)
if result["network_params"]["network_id"].strip() == "": if result["network_params"]["network_id"].strip() == "":
fail("network_id is empty or spaces it needs to be of non zero length") fail("network_id is empty or spaces it needs to be of non zero length")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment