Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: make deneb genesis default #518

Merged
merged 12 commits into from
Mar 21, 2024
Merged

feat: make deneb genesis default #518

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2d67cab
feat: make deneb genesis default
barnabasbusa Mar 19, 2024
90a0f8a
remove bellatrix genesis
barnabasbusa Mar 19, 2024
baf53dd
remove electra from els
barnabasbusa Mar 19, 2024
0dc0e16
fix lint
barnabasbusa Mar 19, 2024
09fe39f
yeet verkle tests
barnabasbusa Mar 19, 2024
d3d3965
Merge branch 'main' into bbusa/default-deneb-genesis
barnabasbusa Mar 20, 2024
120c7cd
Merge branch 'main' into bbusa/default-deneb-genesis
barnabasbusa Mar 20, 2024
2aff094
fix github runner?
barnabasbusa Mar 21, 2024
28572a7
yeet devnet 12
barnabasbusa Mar 21, 2024
8eb55d0
remove capella fork epoch configuration
barnabasbusa Mar 21, 2024
710be2f
move lh to top
barnabasbusa Mar 21, 2024
fbfa47b
Merge branch 'main' into bbusa/default-deneb-genesis
barnabasbusa Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ network_params:

# The epoch at which the capella/deneb/electra forks are set to occur.
capella_fork_epoch: 0
deneb_fork_epoch: 4
deneb_fork_epoch: 0
electra_fork_epoch: null

# Network sync base url for syncing public networks from a custom snapshot (mostly useful for shadowforks)
Expand Down Expand Up @@ -750,8 +750,8 @@ participants:
cl_type: lighthouse
cl_image: sigp/lighthouse:latest
network_params:
capella_fork_epoch: 2
deneb_fork_epoch: 4
capella_fork_epoch: 0
barnabasbusa marked this conversation as resolved.
Show resolved Hide resolved
deneb_fork_epoch: 0
additional_services: []
wait_for_finalization: false
wait_for_verifications: false
Expand Down
12 changes: 2 additions & 10 deletions src/network_launcher/kurtosis.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,16 @@ def launch(plan, network_params, participants, parallel_keystore_generation):

plan.print("Generating EL CL data")

# we are running bellatrix genesis (deprecated) - will be removed in the future
# we are running capella genesis - deprecated
if (
network_params.capella_fork_epoch > 0
and network_params.electra_fork_epoch == None
):
ethereum_genesis_generator_image = (
constants.ETHEREUM_GENESIS_GENERATOR.bellatrix_genesis
)
# we are running capella genesis - default behavior
elif (
network_params.capella_fork_epoch == 0
and network_params.electra_fork_epoch == None
and network_params.deneb_fork_epoch > 0
):
ethereum_genesis_generator_image = (
constants.ETHEREUM_GENESIS_GENERATOR.capella_genesis
)
# we are running deneb genesis - experimental, soon to become default
# we are running deneb genesis - default behavior
elif network_params.deneb_fork_epoch == 0:
ethereum_genesis_generator_image = (
constants.ETHEREUM_GENESIS_GENERATOR.deneb_genesis
Expand Down
9 changes: 4 additions & 5 deletions src/package_io/constants.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,10 @@ DENEB_FORK_VERSION = "0x50000038"
ELECTRA_FORK_VERSION = "0x60000038"

ETHEREUM_GENESIS_GENERATOR = struct(
bellatrix_genesis="ethpandaops/ethereum-genesis-generator:1.3.15", # EOL
capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Default
deneb_genesis="ethpandaops/ethereum-genesis-generator:default-deneb-genesis", # Soon to become default
verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis
verkle_genesis="ethpandaops/ethereum-genesis-generator:4.0.0-rc.7",
capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Deprecated
deneb_genesis="ethpandaops/ethereum-genesis-generator:3.0.0", # Default
verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis, waiting for rebase
verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
)

NETWORK_NAME = struct(
Expand Down
2 changes: 1 addition & 1 deletion src/package_io/input_parser.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ def default_network_params():
"min_validator_withdrawability_delay": 256,
"shard_committee_period": 256,
"capella_fork_epoch": 0,
"deneb_fork_epoch": 4,
"deneb_fork_epoch": 0,
"electra_fork_epoch": None,
"network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/",
}
Expand Down
Loading