Skip to content

Merge merge-upstream into main #16

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

Jump to bottom
Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open

Merge merge-upstream into main #16

wants to merge 45 commits into from

Conversation

santiago-MV
Copy link

After merging upstream into the ethrex-integration-pectra some changes were required in ethrex_launcher.star

The get_config function received too many params
A get_el_context function was needed
All the get_config extra params were redundant and had been deleted.
The get_el_context was implemented.
Commit: 7d0d6c6

rodrigo-o and others added 30 commits March 3, 2025 17:30
@rodrigo-o
Merge pull request #5 from ethpandaops/main
24f8f81 
chore: `main` fork Syncing to support pectra
@mpaulucci @rodrigo-o
Add support for ethereum_rust.
be2d0e4
@mpaulucci @rodrigo-o
Remove port arg.
54f3167
@mpaulucci @rodrigo-o
Rename chain to network.
7e3f9cf
@mpaulucci @rodrigo-o
Rename metrics_info.
4604b6a
@MegaRedHand @rodrigo-o
chore: rename ethereum_rust/ethereumrust -> ethrex
05a2185
@ricomateo @rodrigo-o
uncomment stuff related to genesis and kurtosis bootnodes
34bb9f4
@MegaRedHand @rodrigo-o
chore: rename ethrex -> ethereum_rust
3697ebb
@mpaulucci @rodrigo-o
Fix renaming issues.
7e3af36
@fmoletta @rodrigo-o
Add datadir arg
12fceeb
@vicentevieytes @rodrigo-o
pass jwt secret to client
acb5b6b
@rodrigo-o
Point to the correct repo in kurtosis.yml (needed for assertoor)
c5cbfba
@jrchatruc @rodrigo-o
Rename to ethrex
6afa75c
@jrchatruc @rodrigo-o
Rename file
f9a9008
@rodrigo-o
Update ethrex integration
5879bcd
@rodrigo-o
Fix active ports
8a26540
@rodrigo-o
Fix labels
a58d66a
Remove legacy config and update ethrex-launcher to support that change
42963f5
@rodrigo-o
Merge remote-tracking branch 'upstream/main' into ethrex-integration-…
e73f52c 
…pectra
@rodrigo-o
Merge remote-tracking branch 'upstream/main' into ethrex-integration-…
5b7aefb 
…pectra
@fedacking
Fixed network params usage after syncing with upstream/main (#10)
e9abded 
* Added network_params to launch ethrex

Added the missing parameter for the launch. It's
not used right now.

* changed parameters format to standarize
@santiago-MV
Changed the value in the file
b90f1c0
@santiago-MV
fix in to be able to have multiple ethrex instances
9de19db
@santiago-MV
Changes in to follow the defaults
b32a30b
@santiago-MV
Update per-pr.yml
f47c98c 
trying to fix lint
@santiago-MV
Changes for lint
a2a2533
@santiago-MV
Update conventional-pr-title-checker.yml
4879716 
update title check
@santiago-MV
Revert "Update conventional-pr-title-checker.yml"
db8f24c 
This reverts commit 4879716.
@santiago-MV
Revert "Update per-pr.yml"
369e845 
This reverts commit f47c98c.
@santiago-MV
reverting unrelated changes
a844f83
santiago-MV and others added 14 commits June 3, 2025 10:09
@santiago-MV
fix port assignment
ef1bd96
@santiago-MV
run lint
45877ef
@santiago-MV
Removed unnecesary print
0428592
@santiago-MV
Merge pull request #11 from lambdaclass/fix-ethrex-container
7d7864c 
Change the way in which port assignation is done. Now its possible to run a testnet with multiple ethrex instances
@santiago-MV
Removed commented code and added enr
731d7c9
@santiago-MV
Merge pull request #12 from lambdaclass/add-enr-and-clean
6509f47 
Removed commented code and added enr
@santiago-MV
Added metrics port
639e9c0
@santiago-MV
Merge pull request #13 from lambdaclass/add-metrics-ports
6a896a1 
Added metrics port
@santiago-MV
Removed unnecessary constants
fff30ab
@santiago-MV
removed unnecessary if clause
5abaa54
@santiago-MV
removed subcommand_str
6146c4a
@santiago-MV
Merge pull request #14 from lambdaclass/small-changes-for-ethrex-laun…
1900ee9 
…cher

Removed unnecessary code
@santiago-MV
Merge remote-tracking branch 'upstream/main' into ethrex-integration-…
a5b32ea 
…pectra
@santiago-MV
modified get_config signature and added get_el_context
7d0d6c6
@santiago-MV santiago-MV changed the title Merge upstream Merge merge-upstream into main Jul 18, 2025
@santiago-MV santiago-MV mentioned this pull request Jul 18, 2025
Merged
github-merge-queue bot pushed a commit to lambdaclass/ethrex that referenced this pull request Jul 18, 2025
@santiago-MV
ci(l1): fix assertoor tests (#3718)
552bc18 
**Motivation**

We were using an old kurtosis version and when the
`ethrex-only-different-cl` job was failing because of this

**Description**

In this PR the kurtosis version used in Github actions was updated to
latest from 1.6 (up to now the current version is 1.10.2)
Also the el and cl images used in those jobs were removed, by doing this
the default one is used
This PR changes the `lambda/ethereum-package` branch into main.

⚠️ **Depends on this
[PR](lambdaclass/ethereum-package#16 ⚠️


Closes #3712
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@santiago-MV @rodrigo-o @mpaulucci @MegaRedHand @ricomateo @fmoletta @vicentevieytes @jrchatruc @fedacking