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
94dc531e
Unverified
Commit
94dc531e
authored
Aug 29, 2024
by
Barnabas Busa
Committed by
GitHub
Aug 29, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: explicitly set client contexts (#755)
parent
f124bbf9
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
247 additions
and
186 deletions
+247
-186
ephemery.yaml
.github/tests/ephemery.yaml
+1
-0
geth-all.yaml
.github/tests/geth-all.yaml
+3
-0
pectra-devnet-2.yaml.norun
.github/tests/pectra-devnet-2.yaml.norun
+0
-0
pectra.yaml.norun
.github/tests/pectra.yaml.norun
+0
-0
peerdas-deneb.yaml.norun
.github/tests/peerdas-deneb.yaml.norun
+55
-0
peerdas-devnet-2.yaml.norun
.github/tests/peerdas-devnet-2.yaml.norun
+0
-0
peerdas-electra.yaml.norun
.github/tests/peerdas-electra.yaml.norun
+0
-0
verkle-gen-devnet-6.yaml.norun
.github/tests/verkle-gen-devnet-6.yaml.norun
+0
-0
verkle.yaml.norun
.github/tests/verkle.yaml.norun
+2
-2
nightly.yml
.github/workflows/nightly.yml
+4
-4
cl_context.star
src/cl/cl_context.star
+2
-2
grandine_launcher.star
src/cl/grandine/grandine_launcher.star
+13
-12
lighthouse_launcher.star
src/cl/lighthouse/lighthouse_launcher.star
+17
-16
lodestar_launcher.star
src/cl/lodestar/lodestar_launcher.star
+17
-16
nimbus_launcher.star
src/cl/nimbus/nimbus_launcher.star
+11
-11
prysm_launcher.star
src/cl/prysm/prysm_launcher.star
+21
-22
teku_launcher.star
src/cl/teku/teku_launcher.star
+13
-12
besu_launcher.star
src/el/besu/besu_launcher.star
+10
-11
el_context.star
src/el/el_context.star
+4
-4
erigon_launcher.star
src/el/erigon/erigon_launcher.star
+11
-11
ethereumjs_launcher.star
src/el/ethereumjs/ethereumjs_launcher.star
+10
-11
geth_launcher.star
src/el/geth/geth_launcher.star
+11
-11
nethermind_launcher.star
src/el/nethermind/nethermind_launcher.star
+10
-12
nimbus_launcher.star
src/el/nimbus-eth1/nimbus_launcher.star
+10
-11
reth_launcher.star
src/el/reth/reth_launcher.star
+10
-11
constants.star
src/package_io/constants.star
+3
-1
participant_network.star
src/participant_network.star
+9
-6
No files found.
.github/tests/ephemery.yaml
View file @
94dc531e
...
@@ -16,3 +16,4 @@ participants:
...
@@ -16,3 +16,4 @@ participants:
cl_type
:
grandine
cl_type
:
grandine
network_params
:
network_params
:
network
:
ephemery
network
:
ephemery
checkpoint_sync_enabled
:
true
.github/tests/geth-all.yaml
View file @
94dc531e
...
@@ -11,3 +11,6 @@ participants:
...
@@ -11,3 +11,6 @@ participants:
cl_type
:
lodestar
cl_type
:
lodestar
-
el_type
:
geth
-
el_type
:
geth
cl_type
:
grandine
cl_type
:
grandine
additional_services
:
-
goomy_blob
-
dora
.github/tests/pectra-devnet-2.yaml
→
.github/tests/pectra-devnet-2.yaml
.norun
View file @
94dc531e
File moved
.github/tests/pectra.yaml
→
.github/tests/pectra.yaml
.norun
View file @
94dc531e
File moved
.github/tests/peerdas-deneb.yaml
→
.github/tests/peerdas-deneb.yaml
.norun
View file @
94dc531e
participants:
participants:
# Supernodes
# Supernodes
- cl_type: prysm
- cl_type: prysm
cl_image
:
ethpandaops/prysm-beacon-chain:peerDAS
-minimal
cl_image: ethpandaops/prysm-beacon-chain:peerDAS
cl_extra_params: [--subscribe-all-subnets, --pprof]
cl_extra_params: [--subscribe-all-subnets, --pprof]
vc_image
:
ethpandaops/prysm-validator:develop
cl_max_mem: 4096
-
cl_type
:
lighthouse
count: 2
cl_image
:
ethpandaops/lighthouse:das-devnet-2
# - cl_type: lighthouse
cl_extra_params
:
[
--subscribe-all-data-column-subnets
]
# cl_image: ethpandaops/lighthouse:unstable
-
cl_type
:
teku
# cl_extra_params: [--subscribe-all-data-column-subnets]
cl_image
:
ethpandaops/teku:nashatyrev-das
#- cl_type: teku
cl_extra_params
:
[
--p2p-subscribe-all-custody-subnets-enabled
]
# cl_image: ethpandaops/teku:nashatyrev-das
-
cl_type
:
nimbus
# cl_extra_params: [--p2p-subscribe-all-custody-subnets-enabled]
cl_image
:
ethpandaops/nimbus-eth2:peerdas-p2p
# - cl_type: nimbus
cl_extra_params
:
[
--subscribe-all-subnets=true
]
# cl_image: ethpandaops/nimbus-eth2:pdsync-minimal
# Non supernodes
# cl_extra_params: [--subscribe-all-subnets=true, --sync-light-client=no ]
# count: 2
# - cl_type: lodestar
# cl_image: ethpandaops/lodestar:peerDAS
# cl_extra_params: [--persistNetworkIdentity, --supernode]
# # Non supernodes
- cl_type: prysm
- cl_type: prysm
cl_image
:
ethpandaops/prysm-beacon-chain:peerDAS-minimal
cl_image: ethpandaops/prysm-beacon-chain:peerDAS
vc_image
:
ethpandaops/prysm-validator:develop
cl_max_mem: 4096
-
cl_type
:
lighthouse
# - cl_type: lighthouse
cl_image
:
ethpandaops/lighthouse:das-devnet-2
# cl_image: ethpandaops/lighthouse:unstable
-
cl_type
:
teku
#- cl_type: teku
cl_image
:
ethpandaops/teku:nashatyrev-das
# cl_image: ethpandaops/teku:nashatyrev-das
-
cl_type
:
nimbus
# - cl_type: nimbus
cl_image
:
ethpandaops/nimbus-eth2:peerdas-p2p
# cl_image: ethpandaops/nimbus-eth2:pdsync-minimal
-
cl_type
:
lodestar
# cl_extra_params: [--sync-light-client=no]
cl_image
:
ethpandaops/lodestar:peerDAS
# - cl_type: lodestar
cl_extra_params
:
[
--persistNetworkIdentity
]
# cl_image: ethpandaops/lodestar:peerDAS
# cl_extra_params: [--persistNetworkIdentity]
network_params:
network_params:
eip7594_fork_epoch: 0
eip7594_fork_epoch: 0
eip7594_fork_version: "0x50000038"
eip7594_fork_version: "0x50000038"
preset
:
minimal
#
preset: minimal
snooper_enabled: true
snooper_enabled: true
global_log_level: debug
global_log_level: debug
additional_services:
additional_services:
...
@@ -37,6 +43,8 @@ additional_services:
...
@@ -37,6 +43,8 @@ additional_services:
- goomy_blob
- goomy_blob
- prometheus_grafana
- prometheus_grafana
- assertoor
- assertoor
dora_params:
image: ethpandaops/dora:peerdas-as-deneb
ethereum_metrics_exporter_enabled: true
ethereum_metrics_exporter_enabled: true
assertoor_params:
assertoor_params:
run_stability_check: false
run_stability_check: false
...
...
.github/tests/peerdas-devnet-2.yaml
→
.github/tests/peerdas-devnet-2.yaml
.norun
View file @
94dc531e
File moved
.github/tests/peerdas-electra.yaml
→
.github/tests/peerdas-electra.yaml
.norun
View file @
94dc531e
File moved
.github/tests/verkle-gen-devnet-6.yaml
_
norun
→
.github/tests/verkle-gen-devnet-6.yaml
.
norun
View file @
94dc531e
File moved
.github/tests/verkle.yaml
→
.github/tests/verkle.yaml
.norun
View file @
94dc531e
participants:
participants:
- el_type: geth
- el_type: geth
el_image
:
ethpandaops/geth:
t8n-verkle-exec-rebased
el_image: ethpandaops/geth:
kaustinen-with-shapella
el_extra_params:
el_extra_params:
- "--override.blockproof=true"
- "--override.blockproof=true"
- "--override.overlay-stride=100"
- "--override.overlay-stride=100"
...
@@ -9,7 +9,7 @@ participants:
...
@@ -9,7 +9,7 @@ participants:
cl_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9
cl_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9
count: 2
count: 2
- el_type: geth
- el_type: geth
el_image
:
ethpandaops/geth:
t8n-verkle-exec-rebased
el_image: ethpandaops/geth:
kaustinen-with-shapella
el_extra_params:
el_extra_params:
- "--override.blockproof=true"
- "--override.blockproof=true"
- "--override.overlay-stride=100"
- "--override.overlay-stride=100"
...
...
.github/workflows/nightly.yml
View file @
94dc531e
...
@@ -54,11 +54,11 @@ jobs:
...
@@ -54,11 +54,11 @@ jobs:
-
name
:
Notify
-
name
:
Notify
if
:
(cancelled() || failure()) && env.discord_webhook_set == 'true'
if
:
(cancelled() || failure()) && env.discord_webhook_set == 'true'
uses
:
Ilshidur/action-discord@master
uses
:
nobrayner/discord-webhook@v1
env
:
DISCORD_WEBHOOK
:
${{ secrets.DISCORD_WEBHOOK }}
with
:
with
:
args
:
"
The
nightly
test
for
${{matrix.file_name}}
on
ethereum-package
has
failed
find
it
here
${{
github.server_url
}}/${{
github.repository
}}/actions/runs/${{
github.run_id
}}"
description
:
"
The
nightly
test
for
${{matrix.file_name}}
on
ethereum-package
has
failed
find
it
here
${{
github.server_url
}}/${{
github.repository
}}/actions/runs/${{
github.run_id
}}"
github-token
:
${{ secrets.github_token }}
discord-webhook
:
${{ secrets.DISCORD_WEBHOOK }}
assertoor-mix-assert
:
assertoor-mix-assert
:
runs-on
:
ubuntu-latest
runs-on
:
ubuntu-latest
...
...
src/cl/cl_context.star
View file @
94dc531e
...
@@ -4,8 +4,8 @@ def new_cl_context(
...
@@ -4,8 +4,8 @@ def new_cl_context(
ip_addr,
ip_addr,
http_port,
http_port,
beacon_http_url,
beacon_http_url,
cl_nodes_metrics_info,
cl_nodes_metrics_info
=None
,
beacon_service_name,
beacon_service_name
=""
,
beacon_grpc_url="",
beacon_grpc_url="",
multiaddr="",
multiaddr="",
peer_id="",
peer_id="",
...
...
src/cl/grandine/grandine_launcher.star
View file @
94dc531e
...
@@ -167,13 +167,13 @@ def launch(
...
@@ -167,13 +167,13 @@ def launch(
)
)
nodes_metrics_info = [beacon_node_metrics_info]
nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context(
return cl_context.new_cl_context(
"grandine",
client_name=
"grandine",
beacon_node_enr,
enr=
beacon_node_enr,
beacon_service.ip_address,
ip_addr=
beacon_service.ip_address,
beacon_http_port.number,
http_port=
beacon_http_port.number,
beacon_http_url,
beacon_http_url
=beacon_http_url
,
nodes_metrics_info,
cl_nodes_metrics_info=
nodes_metrics_info,
beacon_service_name,
beacon_service_name
=beacon_service_name
,
multiaddr=beacon_multiaddr,
multiaddr=beacon_multiaddr,
peer_id=beacon_peer_id,
peer_id=beacon_peer_id,
snooper_enabled=snooper_enabled,
snooper_enabled=snooper_enabled,
...
@@ -306,15 +306,16 @@ def get_beacon_config(
...
@@ -306,15 +306,16 @@ def get_beacon_config(
if checkpoint_sync_url:
if checkpoint_sync_url:
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
else:
else:
if network in ["mainnet", "ephemery"]:
if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append(
cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
)
)
else:
else:
cmd.append(
fail(
"--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
"Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
)
)
if network not in constants.PUBLIC_NETWORKS:
if network not in constants.PUBLIC_NETWORKS:
...
...
src/cl/lighthouse/lighthouse_launcher.star
View file @
94dc531e
...
@@ -184,17 +184,17 @@ def launch(
...
@@ -184,17 +184,17 @@ def launch(
)
)
nodes_metrics_info = [beacon_node_metrics_info]
nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context(
return cl_context.new_cl_context(
"lighthouse",
client_name=
"lighthouse",
beacon_node_enr,
enr=
beacon_node_enr,
beacon_service.ip_address,
ip_addr=
beacon_service.ip_address,
beacon_http_port.number,
http_port=
beacon_http_port.number,
beacon_http_url,
beacon_http_url
=beacon_http_url
,
nodes_metrics_info,
cl_nodes_metrics_info=
nodes_metrics_info,
beacon_service_name,
beacon_service_name
=beacon_service_name
,
beacon_multiaddr,
multiaddr=
beacon_multiaddr,
beacon_peer_id,
peer_id=
beacon_peer_id,
snooper_enabled,
snooper_enabled
=snooper_enabled
,
snooper_engine_context,
snooper_engine_context
=snooper_engine_context
,
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
if node_keystore_files
else "",
else "",
...
@@ -310,15 +310,16 @@ def get_beacon_config(
...
@@ -310,15 +310,16 @@ def get_beacon_config(
if checkpoint_sync_url:
if checkpoint_sync_url:
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
else:
else:
if network in ["mainnet", "ephemery"]:
if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append(
cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
)
)
else:
else:
cmd.append(
fail(
"--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
"Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
)
)
if network not in constants.PUBLIC_NETWORKS:
if network not in constants.PUBLIC_NETWORKS:
...
...
src/cl/lodestar/lodestar_launcher.star
View file @
94dc531e
...
@@ -182,17 +182,17 @@ def launch(
...
@@ -182,17 +182,17 @@ def launch(
nodes_metrics_info = [beacon_node_metrics_info]
nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context(
return cl_context.new_cl_context(
"lodestar",
client_name=
"lodestar",
beacon_node_enr,
enr=
beacon_node_enr,
beacon_service.ip_address,
ip_addr=
beacon_service.ip_address,
beacon_http_port.number,
http_port=
beacon_http_port.number,
beacon_http_url,
beacon_http_url
=beacon_http_url
,
nodes_metrics_info,
cl_nodes_metrics_info=
nodes_metrics_info,
beacon_service_name,
beacon_service_name
=beacon_service_name
,
beacon_multiaddr,
multiaddr=
beacon_multiaddr,
beacon_peer_id,
peer_id=
beacon_peer_id,
snooper_enabled,
snooper_enabled
=snooper_enabled
,
snooper_engine_context,
snooper_engine_context
=snooper_engine_context
,
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
if node_keystore_files
else "",
else "",
...
@@ -297,15 +297,16 @@ def get_beacon_config(
...
@@ -297,15 +297,16 @@ def get_beacon_config(
if checkpoint_sync_url:
if checkpoint_sync_url:
cmd.append("--checkpointSyncUrl=" + checkpoint_sync_url)
cmd.append("--checkpointSyncUrl=" + checkpoint_sync_url)
else:
else:
if network in ["mainnet", "ephemery"]:
if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append(
cmd.append(
"--checkpointSyncUrl=" + constants.CHECKPOINT_SYNC_URL[network]
"--checkpointSyncUrl=" + constants.CHECKPOINT_SYNC_URL[network]
)
)
else:
else:
cmd.append(
fail(
"--checkpointSyncUrl=https://checkpoint-sync.{0}.ethpandaops.io".format(
"Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
)
)
if network not in constants.PUBLIC_NETWORKS:
if network not in constants.PUBLIC_NETWORKS:
...
...
src/cl/nimbus/nimbus_launcher.star
View file @
94dc531e
...
@@ -178,17 +178,17 @@ def launch(
...
@@ -178,17 +178,17 @@ def launch(
nodes_metrics_info = [nimbus_node_metrics_info]
nodes_metrics_info = [nimbus_node_metrics_info]
return cl_context.new_cl_context(
return cl_context.new_cl_context(
"nimbus",
client_name=
"nimbus",
beacon_node_enr,
enr=
beacon_node_enr,
beacon_service.ip_address,
ip_addr=
beacon_service.ip_address,
beacon_http_port.number,
http_port=
beacon_http_port.number,
beacon_http_url,
beacon_http_url
=beacon_http_url
,
nodes_metrics_info,
cl_nodes_metrics_info=
nodes_metrics_info,
beacon_service_name,
beacon_service_name
=beacon_service_name
,
beacon_multiaddr,
multiaddr=
beacon_multiaddr,
beacon_peer_id,
peer_id=
beacon_peer_id,
snooper_enabled,
snooper_enabled
=snooper_enabled
,
snooper_engine_context,
snooper_engine_context
=snooper_engine_context
,
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
if node_keystore_files
else "",
else "",
...
...
src/cl/prysm/prysm_launcher.star
View file @
94dc531e
...
@@ -163,18 +163,18 @@ def launch(
...
@@ -163,18 +163,18 @@ def launch(
nodes_metrics_info = [beacon_node_metrics_info]
nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context(
return cl_context.new_cl_context(
"prysm",
client_name=
"prysm",
beacon_node_enr,
enr=
beacon_node_enr,
beacon_service.ip_address,
ip_addr=
beacon_service.ip_address,
beacon_http_port.number,
http_port=
beacon_http_port.number,
beacon_http_url,
beacon_http_url
=beacon_http_url
,
nodes_metrics_info,
cl_nodes_metrics_info=
nodes_metrics_info,
beacon_service_name,
beacon_service_name
=beacon_service_name
,
beacon_grpc_url,
beacon_grpc_url
=beacon_grpc_url
,
beacon_multiaddr,
multiaddr=
beacon_multiaddr,
beacon_peer_id,
peer_id=
beacon_peer_id,
snooper_enabled,
snooper_enabled
=snooper_enabled
,
snooper_engine_context,
snooper_engine_context
=snooper_engine_context
,
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
if node_keystore_files
if node_keystore_files
else "",
else "",
...
@@ -284,8 +284,14 @@ def get_beacon_config(
...
@@ -284,8 +284,14 @@ def get_beacon_config(
if checkpoint_sync_enabled:
if checkpoint_sync_enabled:
if checkpoint_sync_url:
if checkpoint_sync_url:
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
cmd.append(
"--genesis-beacon-api-url=" + constants.CHECKPOINT_SYNC_URL[network]
)
else:
else:
if network in ["mainnet", "ephemery"]:
if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append(
cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
)
)
...
@@ -293,15 +299,8 @@ def get_beacon_config(
...
@@ -293,15 +299,8 @@ def get_beacon_config(
"--genesis-beacon-api-url=" + constants.CHECKPOINT_SYNC_URL[network]
"--genesis-beacon-api-url=" + constants.CHECKPOINT_SYNC_URL[network]
)
)
else:
else:
cmd.append(
fail(
"--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
"Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
)
cmd.append(
"--genesis-beacon-api-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
network
)
)
)
if preset == "minimal":
if preset == "minimal":
...
...
src/cl/teku/teku_launcher.star
View file @
94dc531e
...
@@ -172,13 +172,13 @@ def launch(
...
@@ -172,13 +172,13 @@ def launch(
nodes_metrics_info = [beacon_node_metrics_info]
nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context(
return cl_context.new_cl_context(
"teku",
client_name=
"teku",
beacon_node_enr,
enr=
beacon_node_enr,
beacon_service.ip_address,
ip_addr=
beacon_service.ip_address,
beacon_http_port.number,
http_port=
beacon_http_port.number,
beacon_http_url,
beacon_http_url
=beacon_http_url
,
nodes_metrics_info,
cl_nodes_metrics_info=
nodes_metrics_info,
beacon_service_name,
beacon_service_name
=beacon_service_name
,
multiaddr=beacon_multiaddr,
multiaddr=beacon_multiaddr,
peer_id=beacon_peer_id,
peer_id=beacon_peer_id,
snooper_enabled=snooper_enabled,
snooper_enabled=snooper_enabled,
...
@@ -327,15 +327,16 @@ def get_beacon_config(
...
@@ -327,15 +327,16 @@ def get_beacon_config(
if checkpoint_sync_url:
if checkpoint_sync_url:
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
cmd.append("--checkpoint-sync-url=" + checkpoint_sync_url)
else:
else:
if network in ["mainnet", "ephemery"]:
if (
network in constants.PUBLIC_NETWORKS
or network == constants.NETWORK_NAME.ephemery
):
cmd.append(
cmd.append(
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
"--checkpoint-sync-url=" + constants.CHECKPOINT_SYNC_URL[network]
)
)
else:
else:
cmd.append(
fail(
"--checkpoint-sync-url=https://checkpoint-sync.{0}.ethpandaops.io".format(
"Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
network
)
)
)
if network not in constants.PUBLIC_NETWORKS:
if network not in constants.PUBLIC_NETWORKS:
...
...
src/el/besu/besu_launcher.star
View file @
94dc531e
...
@@ -124,17 +124,16 @@ def launch(
...
@@ -124,17 +124,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context(
return el_context.new_el_context(
"besu",
client_name="besu",
"", # besu has no ENR
enode=enode,
enode,
ip_addr=service.ip_address,
service.ip_address,
rpc_port_num=RPC_PORT_NUM,
RPC_PORT_NUM,
ws_port_num=WS_PORT_NUM,
WS_PORT_NUM,
engine_rpc_port_num=ENGINE_HTTP_RPC_PORT_NUM,
ENGINE_HTTP_RPC_PORT_NUM,
rpc_http_url=http_url,
http_url,
ws_url=ws_url,
ws_url,
service_name=service_name,
service_name,
el_metrics_info=[besu_metrics_info],
[besu_metrics_info],
)
)
...
...
src/el/el_context.star
View file @
94dc531e
def new_el_context(
def new_el_context(
client_name,
client_name,
enr,
enode,
enode,
ip_addr,
ip_addr,
rpc_port_num,
rpc_port_num,
ws_port_num,
ws_port_num,
engine_rpc_port_num,
engine_rpc_port_num,
rpc_http_url,
rpc_http_url,
ws_url,
ws_url="",
enr="",
service_name="",
service_name="",
el_metrics_info=None,
el_metrics_info=None,
):
):
return struct(
return struct(
service_name=service_name,
client_name=client_name,
client_name=client_name,
enr=enr,
enode=enode,
enode=enode,
ip_addr=ip_addr,
ip_addr=ip_addr,
rpc_port_num=rpc_port_num,
rpc_port_num=rpc_port_num,
...
@@ -22,5 +20,7 @@ def new_el_context(
...
@@ -22,5 +20,7 @@ def new_el_context(
engine_rpc_port_num=engine_rpc_port_num,
engine_rpc_port_num=engine_rpc_port_num,
rpc_http_url=rpc_http_url,
rpc_http_url=rpc_http_url,
ws_url=ws_url,
ws_url=ws_url,
enr=enr,
service_name=service_name,
el_metrics_info=el_metrics_info,
el_metrics_info=el_metrics_info,
)
)
src/el/erigon/erigon_launcher.star
View file @
94dc531e
...
@@ -122,17 +122,17 @@ def launch(
...
@@ -122,17 +122,17 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
return el_context.new_el_context(
return el_context.new_el_context(
"erigon",
client_name=
"erigon",
en
r
,
en
ode=enode
,
enode
,
ip_addr=service.ip_address
,
service.ip_address
,
rpc_port_num=WS_RPC_PORT_NUM
,
WS_RPC_PORT_NUM,
ws_port_num=
WS_RPC_PORT_NUM,
WS
_RPC_PORT_NUM,
engine_rpc_port_num=ENGINE
_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM
,
rpc_http_url=http_url
,
http
_url,
ws_url=ws
_url,
ws_url
,
enr=enr
,
service_name,
service_name
=service_name
,
[erigon_metrics_info],
el_metrics_info=
[erigon_metrics_info],
)
)
...
...
src/el/ethereumjs/ethereumjs_launcher.star
View file @
94dc531e
...
@@ -121,17 +121,16 @@ def launch(
...
@@ -121,17 +121,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context(
return el_context.new_el_context(
"ethereumjs",
client_name="ethereumjs",
"", # ethereumjs has no enr
enode=enode,
enode,
ip_addr=service.ip_address,
service.ip_address,
rpc_port_num=RPC_PORT_NUM,
RPC_PORT_NUM,
ws_port_num=WS_PORT_NUM,
WS_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM,
rpc_http_url=http_url,
http_url,
ws_url=ws_url,
ws_url,
service_name=service_name,
service_name,
el_metrics_info=[ethjs_metrics_info],
[ethjs_metrics_info],
)
)
...
...
src/el/geth/geth_launcher.star
View file @
94dc531e
...
@@ -133,17 +133,17 @@ def launch(
...
@@ -133,17 +133,17 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context(
return el_context.new_el_context(
"geth",
client_name=
"geth",
en
r
,
en
ode=enode
,
enode
,
ip_addr=service.ip_address
,
service.ip_address
,
rpc_port_num=RPC_PORT_NUM
,
RPC
_PORT_NUM,
ws_port_num=WS
_PORT_NUM,
WS
_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC
_PORT_NUM,
ENGINE_RPC_PORT_NUM
,
rpc_http_url=http_url
,
http
_url,
ws_url=ws
_url,
ws_url
,
enr=enr
,
service_name,
service_name
=service_name
,
[geth_metrics_info],
el_metrics_info=
[geth_metrics_info],
)
)
...
...
src/el/nethermind/nethermind_launcher.star
View file @
94dc531e
...
@@ -119,18 +119,16 @@ def launch(
...
@@ -119,18 +119,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context(
return el_context.new_el_context(
"nethermind",
client_name="nethermind",
"", # nethermind has no ENR in the eth2-merge-kurtosis-module either
enode=enode,
# Nethermind node info endpoint doesn't return ENR field https://docs.nethermind.io/nethermind/ethereum-client/json-rpc/admin
ip_addr=service.ip_address,
enode,
rpc_port_num=RPC_PORT_NUM,
service.ip_address,
ws_port_num=WS_PORT_NUM,
RPC_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
WS_PORT_NUM,
rpc_http_url=http_url,
ENGINE_RPC_PORT_NUM,
ws_url=ws_url,
http_url,
service_name=service_name,
ws_url,
el_metrics_info=[nethermind_metrics_info],
service_name,
[nethermind_metrics_info],
)
)
...
...
src/el/nimbus-eth1/nimbus_launcher.star
View file @
94dc531e
...
@@ -120,17 +120,16 @@ def launch(
...
@@ -120,17 +120,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
return el_context.new_el_context(
return el_context.new_el_context(
"nimbus",
client_name="nimbus",
"", # nimbus has no enr
enode=enode,
enode,
ip_addr=service.ip_address,
service.ip_address,
rpc_port_num=WS_RPC_PORT_NUM,
WS_RPC_PORT_NUM,
ws_port_num=WS_RPC_PORT_NUM,
WS_RPC_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM,
rpc_http_url=http_url,
http_url,
ws_url=ws_url,
ws_url,
service_name=service_name,
service_name,
el_metrics_info=[nimbus_metrics_info],
[nimbus_metrics_info],
)
)
...
...
src/el/reth/reth_launcher.star
View file @
94dc531e
...
@@ -125,17 +125,16 @@ def launch(
...
@@ -125,17 +125,16 @@ def launch(
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
return el_context.new_el_context(
return el_context.new_el_context(
"reth",
client_name="reth",
"", # reth has no enr
enode=enode,
enode,
ip_addr=service.ip_address,
service.ip_address,
rpc_port_num=RPC_PORT_NUM,
RPC_PORT_NUM,
ws_port_num=WS_PORT_NUM,
WS_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM,
rpc_http_url=http_url,
http_url,
ws_url=ws_url,
ws_url,
service_name=service_name,
service_name,
el_metrics_info=[reth_metrics_info],
[reth_metrics_info],
)
)
...
...
src/package_io/constants.star
View file @
94dc531e
...
@@ -134,7 +134,9 @@ NETWORK_ID = {
...
@@ -134,7 +134,9 @@ NETWORK_ID = {
CHECKPOINT_SYNC_URL = {
CHECKPOINT_SYNC_URL = {
"mainnet": "https://beaconstate.info",
"mainnet": "https://beaconstate.info",
"ephemery": "https://checkpointz.bordel.wtf/",
"ephemery": "https://checkpoint-sync.ephemery.ethpandaops.io/",
"sepolia": "https://checkpoint-sync.sepolia.ethpandaops.io/",
"holesky": "https://checkpoint-sync.holesky.ethpandaops.io/",
}
}
GENESIS_VALIDATORS_ROOT = {
GENESIS_VALIDATORS_ROOT = {
...
...
src/participant_network.star
View file @
94dc531e
...
@@ -96,22 +96,25 @@ def launch_participant_network(
...
@@ -96,22 +96,25 @@ def launch_participant_network(
total_number_of_validator_keys,
total_number_of_validator_keys,
latest_block.files_artifacts[0] if latest_block != "" else "",
latest_block.files_artifacts[0] if latest_block != "" else "",
)
)
elif network_params.network
in constants.PUBLIC_NETWORKS
:
elif network_params.network
== constants.NETWORK_NAME.ephemery
:
# We are running a
public
network
# We are running a
n ephemery
network
(
(
el_cl_data,
el_cl_data,
final_genesis_timestamp,
final_genesis_timestamp,
network_id,
network_id,
validator_data,
validator_data,
) = launch_public_network.launch(plan, network_params.network, prague_time)
) = launch_ephemery.launch(plan, prague_time)
elif network_params.network == constants.NETWORK_NAME.ephemery:
elif (
# We are running an ephemery network
network_params.network in constants.PUBLIC_NETWORKS
and network_params.network != constants.NETWORK_NAME.ephemery
):
# We are running a public network
(
(
el_cl_data,
el_cl_data,
final_genesis_timestamp,
final_genesis_timestamp,
network_id,
network_id,
validator_data,
validator_data,
) = launch_
ephemery.launch(plan
, prague_time)
) = launch_
public_network.launch(plan, network_params.network
, prague_time)
else:
else:
# We are running a devnet
# We are running a devnet
(
(
...
...
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