Remove all prod eth1 related code #7133
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7e4c8fc to
9a8bfc1
Compare
|
This pull request has merge conflicts. Could you please resolve them @pawanjay176? 🙏 |
|
Hey @pawanjay176 I am keen to get this merged, would it help if I resolved merge conflicts and rolled this out on a few more nodes? |
|
Resolved the conflicts. Would be awesome if we can roll this on some nodes with validators and check that block production works without any hitch 🙏 |
michaelsproul
added a commit
that referenced
this pull request
Jun 16, 2025
Squashed commit of the following: commit e3c7251 Merge: 7a94542 6135f41 Author: Michael Sproul <michael@sigmaprime.io> Date: Mon Jun 16 16:38:41 2025 +1000 Merge remote-tracking branch 'origin/unstable' into remove-eth1 commit 7a94542 Merge: 373062d 38a5f33 Author: Pawan Dhananjay <pawandhananjay@gmail.com> Date: Fri May 30 10:18:02 2025 -0700 Merge branch 'unstable' into remove-eth1 commit 373062d Author: Pawan Dhananjay <pawandhananjay@gmail.com> Date: Mon May 12 15:19:12 2025 -0700 Remove all eth1 related prod code
michaelsproul
added a commit
that referenced
this pull request
Jun 16, 2025
Squashed commit of the following: commit 2a10023 Author: Michael Sproul <michael@sigmaprime.io> Date: Mon Jun 16 17:11:36 2025 +1000 Remove unused deps commit e3c7251 Merge: 7a94542 6135f41 Author: Michael Sproul <michael@sigmaprime.io> Date: Mon Jun 16 16:38:41 2025 +1000 Merge remote-tracking branch 'origin/unstable' into remove-eth1 commit 7a94542 Merge: 373062d 38a5f33 Author: Pawan Dhananjay <pawandhananjay@gmail.com> Date: Fri May 30 10:18:02 2025 -0700 Merge branch 'unstable' into remove-eth1 commit 373062d Author: Pawan Dhananjay <pawandhananjay@gmail.com> Date: Mon May 12 15:19:12 2025 -0700 Remove all eth1 related prod code
Merged
eserilev
pushed a commit
to eserilev/lighthouse
that referenced
this pull request
Jun 17, 2025
Squashed commit of the following: commit 2a10023 Author: Michael Sproul <michael@sigmaprime.io> Date: Mon Jun 16 17:11:36 2025 +1000 Remove unused deps commit e3c7251 Merge: 7a94542 6135f41 Author: Michael Sproul <michael@sigmaprime.io> Date: Mon Jun 16 16:38:41 2025 +1000 Merge remote-tracking branch 'origin/unstable' into remove-eth1 commit 7a94542 Merge: 373062d 38a5f33 Author: Pawan Dhananjay <pawandhananjay@gmail.com> Date: Fri May 30 10:18:02 2025 -0700 Merge branch 'unstable' into remove-eth1 commit 373062d Author: Pawan Dhananjay <pawandhananjay@gmail.com> Date: Mon May 12 15:19:12 2025 -0700 Remove all eth1 related prod code
|
I think the failing tests are fine as well, just need to update some expected state roots due to the changes to the eth1 data voting (not significant for what those tests are testing anyway). |
michaelsproul
added a commit
that referenced
this pull request
Jun 20, 2025
Squashed commit of the following: commit b4052ae Merge: f1f5486 f67084a Author: Michael Sproul <michael@sigmaprime.io> Date: Fri Jun 20 14:03:14 2025 +1000 Merge remote-tracking branch 'origin/unstable' into remove-eth1 commit f1f5486 Author: Michael Sproul <michael@sigmaprime.io> Date: Fri Jun 20 11:45:12 2025 +1000 Remove TODOs commit 133d716 Author: Michael Sproul <michael@sigmaprime.io> Date: Fri Jun 20 11:41:32 2025 +1000 Update broadcast validation tests commit bcf3c28 Author: Michael Sproul <michael@sigmaprime.io> Date: Fri Jun 20 11:08:37 2025 +1000 Put back /lighthouse/staking API for now commit 924de42 Author: Michael Sproul <michael@sigmaprime.io> Date: Fri Jun 20 11:00:05 2025 +1000 Implement v25 database schema commit 101d7e7 Author: Michael Sproul <michael@sigmaprime.io> Date: Thu Jun 19 17:34:28 2025 +1000 Update book commit 4f413d0 Author: Michael Sproul <michael@sigmaprime.io> Date: Thu Jun 19 17:31:04 2025 +1000 Add deprecation warnings for flags commit a4aaa32 Author: Michael Sproul <michael@sigmaprime.io> Date: Thu Jun 19 16:24:14 2025 +1000 Remove more HTTP client code commit 8a7a341 Merge: 2a10023 dd98534 Author: Michael Sproul <michael@sigmaprime.io> Date: Thu Jun 19 13:22:38 2025 +1000 Merge remote-tracking branch 'origin/unstable' into remove-eth1 commit 2a10023 Author: Michael Sproul <michael@sigmaprime.io> Date: Mon Jun 16 17:11:36 2025 +1000 Remove unused deps commit e3c7251 Merge: 7a94542 6135f41 Author: Michael Sproul <michael@sigmaprime.io> Date: Mon Jun 16 16:38:41 2025 +1000 Merge remote-tracking branch 'origin/unstable' into remove-eth1 commit 7a94542 Merge: 373062d 38a5f33 Author: Pawan Dhananjay <pawandhananjay@gmail.com> Date: Fri May 30 10:18:02 2025 -0700 Merge branch 'unstable' into remove-eth1 commit 373062d Author: Pawan Dhananjay <pawandhananjay@gmail.com> Date: Mon May 12 15:19:12 2025 -0700 Remove all eth1 related prod code
michaelsproul
approved these changes
Jun 23, 2025
|
Thanks for reviewing and fixing up everything Michael ❤️ |
Merged
mergify bot
pushed a commit
that referenced
this pull request
Jun 30, 2025
When we removed the eth1 data, I wrote a v25 schema upgrade to delete the data on disk: - #7133 However, I forgot to update the current schema version, so this change was never actioned. This PR updates the current schema version to v25 so that the migration runs.
ethDreamer
pushed a commit
to ethDreamer/lighthouse
that referenced
this pull request
Jul 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue Addressed
N/A
Proposed Changes
After the electra fork which includes EIP 6110, the beacon node no longer needs the eth1 bridging mechanism to include new deposits as they are provided by the EL as a
deposit_request. So after electra + a transition period where the finalized bridge deposits pre-fork are included through the old mechanism, we no longer need the elaborate machinery we had to get deposit contract data from the execution layer.Since holesky has already forked to electra and completed the transition period, this PR basically checks to see if removing all the eth1 related logic leads to any surprises.