Skip to content

chore: remove merge transition code #8680

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
twoeths merged 23 commits into from
Dec 12, 2025
Merged

chore: remove merge transition code #8680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0b1c83a
chore: remove merge transition code
nflaig Dec 3, 2025
2aa79f0
Restore merge transition panda banner
nflaig Dec 9, 2025
299f13b
Remove isOptimisticallySafe
nflaig Dec 9, 2025
580a178
Remove usage of SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY
nflaig Dec 9, 2025
6a8663f
Fix running node from phase0
nflaig Dec 9, 2025
27f7924
Remove stale comments
nflaig Dec 9, 2025
4ea9014
Review changes
nflaig Dec 10, 2025
69c08b1
Merge branch 'unstable' into nflaig/remove-merge-transition
nflaig Dec 10, 2025
f3a4d30
Remove merge tracking dashboard panels
nflaig Dec 10, 2025
06c1dd2
Review changes
nflaig Dec 10, 2025
9d90bae
Fix check types
nflaig Dec 10, 2025
76a05e6
Remove ttd usage
nflaig Dec 10, 2025
d238646
Keep PowBlock ssz type
nflaig Dec 10, 2025
c424099
Wording
nflaig Dec 10, 2025
ad20cf9
Keep ttd in execution genesis options
nflaig Dec 10, 2025
0ccdfd2
Skip merge transition spec tests
nflaig Dec 10, 2025
dc56e5e
Restore some ttd related code in sim tests
nflaig Dec 10, 2025
650ac9f
Move comment
nflaig Dec 10, 2025
17c7b79
Skip more spec tests related to merge transition
nflaig Dec 10, 2025
f6960b3
Update scripts
nflaig Dec 10, 2025
19384ff
Update docs
nflaig Dec 10, 2025
69b4422
Update geth image
nflaig Dec 10, 2025
4a408c9
Merge branch 'unstable' into nflaig/remove-merge-transition
nflaig Dec 10, 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
4 changes: 1 addition & 3 deletions .env.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# We use these images during sim and e2e tests
# This is the last version which supports pre/post merge chains in the same network
# All newer versions only work with post merge chains
GETH_DOCKER_IMAGE=ethereum/client-go:v1.16.2
GETH_DOCKER_IMAGE=ethereum/client-go:v1.16.7
# Use either image or local binary for the testing
GETH_BINARY_DIR=
LIGHTHOUSE_DOCKER_IMAGE=ethpandaops/lighthouse:unstable-d235f2c
Expand Down
58 changes: 0 additions & 58 deletions .github/workflows/test-sim-merge.yml
View file
Open in desktop

This file was deleted.

Loading
Loading