Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ethereum-package
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
ethereum-package
Commits
e721373f
Unverified
Commit
e721373f
authored
Oct 23, 2023
by
Barnabas Busa
Committed by
GitHub
Oct 23, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: geth flags for verkle genesis (#328)
parent
242a4cde
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
5 deletions
+22
-5
main.star
main.star
+1
-0
dora_launcher.star
src/dora/dora_launcher.star
+16
-3
geth_launcher.star
src/el/geth/geth_launcher.star
+5
-2
No files found.
main.star
View file @
e721373f
...
@@ -311,6 +311,7 @@ def run(plan, args={}):
...
@@ -311,6 +311,7 @@ def run(plan, args={}):
dora_config_template,
dora_config_template,
all_cl_client_contexts,
all_cl_client_contexts,
el_cl_data_files_artifact_uuid,
el_cl_data_files_artifact_uuid,
network_params.electra_fork_epoch,
)
)
plan.print("Succesfully launched dora")
plan.print("Succesfully launched dora")
elif additional_service == "full_beaconchain_explorer":
elif additional_service == "full_beaconchain_explorer":
...
...
src/dora/dora_launcher.star
View file @
e721373f
shared_utils = import_module("../shared_utils/shared_utils.star")
shared_utils = import_module("../shared_utils/shared_utils.star")
constants = import_module("../package_io/constants.star")
constants = import_module("../package_io/constants.star")
SERVICE_NAME = "dora"
SERVICE_NAME = "dora"
IMAGE_NAME = "ethpandaops/dora:master"
HTTP_PORT_ID = "http"
HTTP_PORT_ID = "http"
HTTP_PORT_NUMBER = 8080
HTTP_PORT_NUMBER = 8080
...
@@ -24,7 +23,11 @@ USED_PORTS = {
...
@@ -24,7 +23,11 @@ USED_PORTS = {
def launch_dora(
def launch_dora(
plan, config_template, cl_client_contexts, el_cl_data_files_artifact_uuid
plan,
config_template,
cl_client_contexts,
el_cl_data_files_artifact_uuid,
electra_fork_epoch,
):
):
all_cl_client_info = []
all_cl_client_info = []
for index, client in enumerate(cl_client_contexts):
for index, client in enumerate(cl_client_contexts):
...
@@ -49,16 +52,26 @@ def launch_dora(
...
@@ -49,16 +52,26 @@ def launch_dora(
config = get_config(
config = get_config(
config_files_artifact_name,
config_files_artifact_name,
el_cl_data_files_artifact_uuid,
el_cl_data_files_artifact_uuid,
electra_fork_epoch,
)
)
plan.add_service(SERVICE_NAME, config)
plan.add_service(SERVICE_NAME, config)
def get_config(config_files_artifact_name, el_cl_data_files_artifact_uuid):
def get_config(
config_files_artifact_name, el_cl_data_files_artifact_uuid, electra_fork_epoch
):
config_file_path = shared_utils.path_join(
config_file_path = shared_utils.path_join(
DORA_CONFIG_MOUNT_DIRPATH_ON_SERVICE,
DORA_CONFIG_MOUNT_DIRPATH_ON_SERVICE,
DORA_CONFIG_FILENAME,
DORA_CONFIG_FILENAME,
)
)
# TODO: This is a hack to get the verkle support image for the electra fork
if electra_fork_epoch != None:
IMAGE_NAME = "ethpandaops/dora:verkle-support"
else:
IMAGE_NAME = "ethpandaops/dora:master"
return ServiceConfig(
return ServiceConfig(
image=IMAGE_NAME,
image=IMAGE_NAME,
ports=USED_PORTS,
ports=USED_PORTS,
...
...
src/el/geth/geth_launcher.star
View file @
e721373f
...
@@ -151,7 +151,8 @@ def get_config(
...
@@ -151,7 +151,8 @@ def get_config(
):
):
# TODO: Remove this once electra fork has path based storage scheme implemented
# TODO: Remove this once electra fork has path based storage scheme implemented
if electra_fork_epoch != None:
if electra_fork_epoch != None:
init_datadir_cmd_str = "geth init --cache.preimages --datadir={0} {1}".format(
init_datadir_cmd_str = "geth init --cache.preimages --override.prague={0} --datadir={1} {2}".format(
final_genesis_timestamp,
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json",
constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/genesis.json",
)
)
...
@@ -172,10 +173,12 @@ def get_config(
...
@@ -172,10 +173,12 @@ def get_config(
# 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(
"{0}".format(
"--state.scheme=path"
"--state.scheme=path"
if electra_fork_epoch
!= None or
"--builder" not in extra_params
if electra_fork_epoch
== None and
"--builder" not in extra_params
else ""
else ""
),
),
# Override prague fork timestamp for electra fork
# Override prague fork timestamp for electra fork
"{0}".format("--cache.preimages" if electra_fork_epoch != None else ""),
# Override prague fork timestamp for electra fork
"{0}".format(
"{0}".format(
"--override.prague=" + final_genesis_timestamp
"--override.prague=" + final_genesis_timestamp
if electra_fork_epoch != None
if electra_fork_epoch != None
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment