Skip to content

ci(l1): update to new ethereum package version. #3860

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

Merged
mpaulucci merged 15 commits into from
Aug 1, 2025
Merged

ci(l1): update to new ethereum package version. #3860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
738032f
Update to new ethereum package version.
mpaulucci Jul 29, 2025
486b644
Use new branch.
mpaulucci Jul 29, 2025
8e080ab
Update branch.
mpaulucci Jul 29, 2025
f613efa
Make `add-ethrex` brach specific.
mpaulucci Jul 29, 2025
a76a44e
Update commit.
mpaulucci Jul 29, 2025
0239541
Update ethereum-package version.
mpaulucci Jul 30, 2025
24f165d
Update kurtosis version.
mpaulucci Jul 30, 2025
a925844
update commit.
mpaulucci Jul 30, 2025
bf21efb
Update all network_params files to make sure they use the locally bui…
mpaulucci Jul 31, 2025
b9d9527
Update CI ethereum package version.
mpaulucci Jul 31, 2025
7a2dc39
Improve `checkout-ethereum-package`
mpaulucci Jul 31, 2025
8578642
Downgrade to warn.
mpaulucci Jul 31, 2025
6754adc
Go back to old kurtosis version.
mpaulucci Jul 31, 2025
8820c1e
Remove cache to avoid docker pull rates.
mpaulucci Jul 31, 2025
d19acf0
Merge branch 'main' of github.com:lambdaclass/ethrex into try-new-kur…
mpaulucci Aug 1, 2025
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
8 changes: 3 additions & 5 deletions .github/config/assertoor/network_params_blob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ participants:
validator_count: 32
count: 2
- el_type: ethrex
el_image: ethrex:latest

@mpaulucci mpaulucci Jul 31, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now needed because the default is the deployed version: https://github.com/ethpandaops/ethereum-package/blob/82e5a7178138d892c0c31c3839c89d53ffd42d9a/src/package_io/input_parser.star#L17

cl_type: lighthouse
cl_image: sigp/lighthouse:v7.1.0
validator_count: 32

network_params:
# The address of the staking contract address on the Eth1 chain
deposit_contract_address: "0x4242424242424242424242424242424242424242"

Comment on lines -13 to -16

@rodrigo-o rodrigo-o Aug 1, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed anymore? maybe we can remove it from the other ones?

@mpaulucci mpaulucci Aug 1, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes its needed, I moved it further down in the same file

additional_services:
- assertoor
- tx_fuzz
Expand All @@ -23,7 +20,8 @@ additional_services:
# Uncomment the previous lines to enable metrics dashboards and dora explorer, useful for local testing

network_params:
electra_fork_epoch: 1
# The address of the staking contract address on the Eth1 chain
deposit_contract_address: "0x4242424242424242424242424242424242424242"

assertoor_params:
run_stability_check: false
Expand Down
7 changes: 4 additions & 3 deletions .github/config/assertoor/network_params_ethrex_multiple_cl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
participants:
- el_type: ethrex
el_image: ethrex:latest
cl_type: lighthouse
cl_image: sigp/lighthouse:v7.1.0
validator_count: 32
ethereum_metrics_exporter_enabled: true
- el_type: ethrex
el_image: ethrex:latest
cl_type: teku
cl_image: consensys/teku:25.6.0
validator_count: 32
ethereum_metrics_exporter_enabled: true
- el_type: ethrex
el_image: ethrex:latest
cl_type: prysm
cl_image: gcr.io/offchainlabs/prysm/beacon-chain:v6.0.4
validator_count: 32
Expand All @@ -18,7 +21,6 @@ participants:
network_params:
# The address of the staking contract address on the Eth1 chain
deposit_contract_address: "0x4242424242424242424242424242424242424242"
electra_fork_epoch: 0 # This field won't be needed when ethereum-package is merged
seconds_per_slot: 3

additional_services:
Expand All @@ -27,7 +29,6 @@ additional_services:

assertoor_params:
tests:
- https://raw.githubusercontent.com/lambdaclass/ethrex/refs/heads/main/.github/config/assertoor/el-stability-check.yaml # Check that all el clients are synced with the corresponding cl
- https://raw.githubusercontent.com/lambdaclass/ethrex/refs/heads/main/.github/config/assertoor/el-stability-check.yaml # Check that all el clients are synced with the corresponding cl
- https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/stable/blob-transactions-test.yaml
- https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/stable/eoa-transactions-test.yaml

3 changes: 1 addition & 2 deletions .github/config/assertoor/network_params_tx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ participants:
cl_image: sigp/lighthouse:v7.1.0
validator_count: 32
- el_type: ethrex
el_image: ethrex:latest
cl_type: lighthouse
cl_image: sigp/lighthouse:v7.1.0
validator_count: 32
Expand All @@ -25,8 +26,6 @@ spamoor_params:
throughput: 6

network_params:
electra_fork_epoch: 1

# The address of the staking contract address on the Eth1 chain
deposit_contract_address: "0x4242424242424242424242424242424242424242"

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/pr-main_l1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ jobs:
needs: [docker_build]
if: ${{ github.event_name != 'merge_group' }}
strategy:
fail-fast: true

@mpaulucci mpaulucci Jul 31, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the default, just making it explicit. Sometimes I want to change it to false when testing stuff

matrix:
include:
- name: Transaction Check
Expand Down Expand Up @@ -154,8 +155,8 @@ jobs:
with:
enclave_name: ${{ matrix.enclave_name }}
kurtosis_version: "1.10.2"
ethereum_package_url: "github.com/lambdaclass/ethereum-package"
ethereum_package_branch: "7d0d6c6d91f1745a6b396b3965df69d580cf70a9"
ethereum_package_url: "github.com/ethpandaops/ethereum-package"
ethereum_package_branch: "82e5a7178138d892c0c31c3839c89d53ffd42d9a"
ethereum_package_args: ${{ matrix.ethereum_package_args }}

run-hive:
Expand All @@ -164,6 +165,7 @@ jobs:
needs: [docker_build, setup-hive-fork, setup-hive-upstream]
if: ${{ github.event_name != 'merge_group' }}
strategy:
fail-fast: true
matrix:
include:
- name: "Rpc Compat tests"
Expand Down
29 changes: 17 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,23 @@ dev: ## 🏃 Run the ethrex client in DEV_MODE with the InMemory Engine
--dev \
--datadir memory

ETHEREUM_PACKAGE_REVISION := 6a896a15e6d686b0a60adf4ee97954065bc82435

# Shallow clones can't specify a single revision, but at least we avoid working
# the whole history by making it shallow since a given date (one day before our
# target revision).
ethereum-package:
git clone https://github.com/lambdaclass/ethereum-package

checkout-ethereum-package: ethereum-package ## 📦 Checkout specific Ethereum package revision
cd ethereum-package && \
git fetch && \
git checkout $(ETHEREUM_PACKAGE_REVISION)
ETHEREUM_PACKAGE_REVISION := 82e5a7178138d892c0c31c3839c89d53ffd42d9a
ETHEREUM_PACKAGE_DIR := ethereum-package

checkout-ethereum-package: ## 📦 Checkout specific Ethereum package revision
@if [ ! -d "$(ETHEREUM_PACKAGE_DIR)" ]; then \
echo "Cloning ethereum-package repository..."; \
git clone --quiet https://github.com/ethpandaops/ethereum-package $(ETHEREUM_PACKAGE_DIR); \
fi
@cd $(ETHEREUM_PACKAGE_DIR) && \
CURRENT_REV=$$(git rev-parse HEAD) && \
if [ "$$CURRENT_REV" != "$(ETHEREUM_PACKAGE_REVISION)" ]; then \
echo "Current HEAD ($$CURRENT_REV) is not the target revision. Checking out $(ETHEREUM_PACKAGE_REVISION)..."; \
git fetch --quiet && \
git checkout --quiet $(ETHEREUM_PACKAGE_REVISION); \
else \
echo "ethereum-package is already at the correct revision."; \
fi

ENCLAVE ?= lambdanet

Expand Down
2 changes: 1 addition & 1 deletion cmd/ethrex/initializers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ pub fn get_bootnodes(opts: &Options, network: &Network, data_dir: &str) -> Vec<N

match read_node_config_file(config_file) {
Ok(ref mut config) => bootnodes.append(&mut config.known_peers),
Err(e) => error!("Could not read from peers file: {e}"),
Err(e) => warn!("Could not read from peers file: {e}"),

@mpaulucci mpaulucci Jul 31, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Theres an issue to fix this properly: #3908

};

bootnodes
Expand Down
3 changes: 1 addition & 2 deletions fixtures/network/network_params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ participants:
validator_count: 32
count: 1
- el_type: ethrex
el_image: ethrex:latest
cl_type: lighthouse
cl_image: sigp/lighthouse:v7.0.0-beta.0
validator_count: 32
snooper_enabled: true

network_params:
electra_fork_epoch: 1

# The address of the staking contract address on the Eth1 chain
deposit_contract_address: "0x4242424242424242424242424242424242424242"

Expand Down
7 changes: 4 additions & 3 deletions fixtures/network/network_params_client_comparision.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
participants:
- el_type: ethrex
el_image: ethrex:latest
cl_type: lighthouse
cl_image: sigp/lighthouse:v7.0.1
el_extra_labels: {"evm": "levm"}
el_extra_labels: { "evm": "levm" }
validator_count: 32
count: 1
- el_type: ethrex
el_image: ethrex:latest
el_extra_params: ["--evm revm"]
cl_type: lighthouse
cl_image: sigp/lighthouse:v7.0.1
el_extra_labels: {"evm": "revm"}
el_extra_labels: { "evm": "revm" }
validator_count: 32
count: 1
- el_type: reth
Expand All @@ -23,7 +25,6 @@ ethereum_metrics_exporter_enabled: true
network_params:
# The address of the staking contract address on the Eth1 chain
deposit_contract_address: "0x4242424242424242424242424242424242424242"
electra_fork_epoch: 0

additional_services:
- dora
Expand Down
2 changes: 1 addition & 1 deletion fixtures/network/network_params_ethrex_only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
participants:
- el_type: ethrex
el_image: ethrex:latest
cl_type: lighthouse
cl_image: sigp/lighthouse:v7.0.0-beta.0
validator_count: 32
Expand All @@ -8,7 +9,6 @@ participants:
network_params:
# The address of the staking contract address on the Eth1 chain
deposit_contract_address: "0x4242424242424242424242424242424242424242"
electra_fork_epoch: 0 # This field won't be needed when ethereum-package is merged

additional_services:
- assertoor
Expand Down
Loading