Skip to content

Commit e085462

Browse files
authored
fix: disable pbss when gcmode archive set (ethereum#559)
1 parent 555ad7d commit e085462

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ snooper_enabled: true
850850
| Teku BN | ✅ | ✅ | ✅ | ✅ | ✅
851851
| Lodestar BN | ✅ | ❌ | ❌ | ✅ | ❌
852852
| Nimbus BN | ✅ | ❌ | ✅ | ❌ | ✅
853-
| Grandine BN | ✅ | ✅ | ✅ | | ✅
853+
| Grandine BN | ✅ | ✅ | ✅ | | ✅
854854
855855
## Custom labels for Docker and Kubernetes
856856

src/el/geth/geth_launcher.star

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,14 @@ def get_config(
216216
)
217217
elif constants.NETWORK_NAME.shadowfork in network:
218218
init_datadir_cmd_str = "echo shadowfork"
219+
220+
elif (
221+
"--gcmode archive" in extra_params
222+
): # Disable path based storage scheme archive mode
223+
init_datadir_cmd_str = "geth init --datadir={0} {1}".format(
224+
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
225+
constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json",
226+
)
219227
else:
220228
init_datadir_cmd_str = "geth init --state.scheme=path --datadir={0} {1}".format(
221229
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
@@ -226,7 +234,11 @@ def get_config(
226234
"geth",
227235
# Disable path based storage scheme for electra fork and verkle
228236
# TODO: REMOVE Once geth default db is path based, and builder rebased
229-
"{0}".format("--state.scheme=path" if "verkle" not in network else ""),
237+
"{0}".format(
238+
"--state.scheme=path"
239+
if "verkle" not in network and "--gcmode archive" not in extra_params
240+
else ""
241+
),
230242
# Override prague fork timestamp for electra fork
231243
"{0}".format("--cache.preimages" if "verkle" in network else ""),
232244
# Override prague fork timestamp

src/package_io/input_parser.star

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,13 +483,14 @@ def parse_network_params(input_args):
483483

484484
total_participant_count += participant["count"]
485485

486-
487486
if total_participant_count == 1:
488487
for index, participant in enumerate(result["participants"]):
489488
# If there is only one participant, we run lodestar as a single node mode
490489
if participant["cl_type"] == constants.CL_TYPE.lodestar:
491490
participant["cl_extra_params"].append("--sync.isSingleNode")
492-
participant["cl_extra_params"].append("--network.allowPublishToZeroPeers")
491+
participant["cl_extra_params"].append(
492+
"--network.allowPublishToZeroPeers"
493+
)
493494

494495
if result["network_params"]["network_id"].strip() == "":
495496
fail("network_id is empty or spaces it needs to be of non zero length")

0 commit comments

Comments
 (0)