Enable late re-org and re-org interactive tests by hopinheimer · Pull Request #9405 · sigp/lighthouse

hopinheimer · 2026-06-03T22:32:03Z

Issue Addressed

#8959

WIP still working on adding more re-org tests and refactoring existing.

…re-orgs

michaelsproul · 2026-06-16T07:43:13Z

My bad. My changes broke the tests. Codex has fixed them allegedly in 1d728cf, but I haven't reviewed that commit yet.

@hopinheimer if you have some time can you check that change makes sense and make sure CI is green?

I think the complication is the removal of should_override (which is correct, per spec). Getting it off the Gloas path now is nice because it means we can delete it completely once all networks have forked to Gloas.

…re-orgs

michaelsproul

LFG 🚀

mergify · 2026-06-18T08:06:52Z

Merge Queue Status

✅ Entered queue — 2026-06-18 08:06 UTC · Rule: default
🟠 Checks running · on draft merge queue: queuing unstable (446f5b5) and #9405 together #9503
🚫 Left the queue — 2026-06-18 08:12 UTC · at 0f9601c78d0b0ac8bf06d5ce7975856f39ce4152

This pull request spent 5 minutes 35 seconds in the queue, with no time running CI.

Waiting for

check-success=local-testnet-success
check-success=test-suite-success

All conditions

check-success=local-testnet-success
check-success=test-suite-success
#approved-reviews-by >= 1 [🛡 GitHub branch protection]
- Enable late re-org and re-org interactive tests #9405

Reason

Pull request #9405 has been dequeued by a dequeue command

Hint

If you want to requeue this pull request, you can post a @mergifyio queue comment.

michaelsproul · 2026-06-18T08:11:54Z

@mergify dequeue

michaelsproul · 2026-06-18T08:12:03Z

@mergify requeue

mergify · 2026-06-18T08:12:57Z

Merge Queue Status

✅ Entered queue — 2026-06-18 08:12 UTC · Rule: default
✅ Checks passed · on draft merge queue: queuing unstable (446f5b5) and #9405 together #9504
✅ Merged — 2026-06-18 08:57 UTC · at 80a3cfc6db1cda29c9410b53f757990b3cb82090 · squash

This pull request spent 44 minutes 23 seconds in the queue, including 42 minutes 46 seconds running CI.

Required conditions to merge

#approved-reviews-by >= 1 [🛡 GitHub branch protection]
- Enable late re-org and re-org interactive tests #9405
check-success=local-testnet-success
check-success=test-suite-success

mergify · 2026-06-18T08:13:29Z

requeue

☑️ This pull request is already queued

hopinheimer added 4 commits June 1, 2026 21:36

enable re-orgs and post-gloas re-orgs tests

09a8573

Merge branch 'unstable' of github.com:sigp/lighthouse into re-enable-…

fc8b5ea

…re-orgs

fix merge changes

9f3499b

working interactive tests

1ffe508

michaelsproul reviewed Jun 3, 2026

View reviewed changes

Comment thread beacon_node/beacon_chain/src/block_production/mod.rs Outdated

michaelsproul reviewed Jun 4, 2026

View reviewed changes

Comment thread beacon_node/beacon_chain/src/block_production/mod.rs Outdated

michaelsproul reviewed Jun 4, 2026

View reviewed changes

Comment thread beacon_node/http_api/tests/interactive_tests.rs Outdated

michaelsproul reviewed Jun 4, 2026

View reviewed changes

Comment thread beacon_node/beacon_chain/src/beacon_chain.rs

michaelsproul added work-in-progress PR is a work-in-progress gloas fork-choice labels Jun 4, 2026

hopinheimer and others added 14 commits June 3, 2026 20:41

fix parent_payload_status in block production state

5d35329

Merge branch 'unstable' of github.com:sigp/lighthouse into re-enable-…

0af1503

…re-orgs

Use canonical payload status in reorg helper

fc2753c

WIP gloas reorg tests

ad16845

BeaconChainHarness support for payload attestation messages

76eb7ab

WIP

21bb53f

Fix prepare payload lookahead

d829d37

Harder test case

79b4f76

Three variants of test (but they use natural reorgs)

8096b65

Allow setting parent payload status

0d15b05

Just use parent payload status!

43cf850

Don't swallow payload load errors

7162a30

empty parent proposer-re-org-test added

7f21431

Merge branch 'unstable' of github.com:sigp/lighthouse into re-enable-…

8e9b59a

…re-orgs

michaelsproul mentioned this pull request Jun 13, 2026

fix(fork-choice): align proposer reorg helper with consensus spec #9444

Open

hopinheimer added 4 commits June 15, 2026 03:13

linty happy

8ace75d

Merge branch 'unstable' of github.com:sigp/lighthouse into re-enable-…

b09e65a

…re-orgs

linty linty happy

3b768f4

my bad

e45599e

michaelsproul added 2 commits June 16, 2026 15:57

Remove TODO

759d83e

Codex test fix (needs review)

1d728cf

hopinheimer added 4 commits June 17, 2026 18:33

Fork gate interactive_tests to run pre-gloas forks only.

2119829

Merge branch 'unstable' of github.com:sigp/lighthouse into re-enable-…

239fbc5

…re-orgs

Fix overlapping sync committee bug in testing harness

8527b76

Lint

bc2bcd5

michaelsproul reviewed Jun 18, 2026

View reviewed changes

Comment thread beacon_node/http_api/tests/interactive_tests.rs Outdated

hopinheimer added 2 commits June 17, 2026 22:12

Addressing comments

0d461cb

Use test_spec in proposer_reorg_test

082f325

mergify Bot added ready-for-review The code is ready for review and removed waiting-on-author The reviewer has suggested changes and awaits thier implementation. labels Jun 18, 2026

Use test_spec in Gloas tests so we run on future forks

0f9601c

michaelsproul approved these changes Jun 18, 2026

View reviewed changes

michaelsproul added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Jun 18, 2026

mergify Bot added the queued label Jun 18, 2026

mergify Bot added a commit that referenced this pull request Jun 18, 2026

Merge of #9405

59443c8

mergify Bot mentioned this pull request Jun 18, 2026

merge queue: queuing unstable (446f5b5) and #9405 together #9503

Closed

8 tasks

Skip Gloas tests before Gloas

80a3cfc

mergify Bot added a commit that referenced this pull request Jun 18, 2026

Merge of #9405

9fede13

mergify Bot mentioned this pull request Jun 18, 2026

merge queue: queuing unstable (446f5b5) and #9405 together #9504

Closed

8 tasks

mergify Bot merged commit ddfc265 into sigp:unstable Jun 18, 2026
38 checks passed

mergify Bot removed the queued label Jun 18, 2026

hopinheimer mentioned this pull request Jun 18, 2026

Gloas: re-enable late block reorgs #8959

Closed

Navigation Menu

Uh oh!

Enable late re-org and re-org interactive tests - #9405

Enable late re-org and re-org interactive tests #9405
mergify[bot] merged 38 commits into
sigp:unstablefrom
hopinheimer:re-enable-re-orgs

hopinheimer commented Jun 3, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

michaelsproul commented Jun 16, 2026

Uh oh!

Uh oh!

michaelsproul left a comment

Uh oh!

mergify Bot commented Jun 18, 2026 •

edited

Loading

Uh oh!

michaelsproul commented Jun 18, 2026

Uh oh!

michaelsproul commented Jun 18, 2026

Uh oh!

mergify Bot commented Jun 18, 2026 •

edited

Loading

Uh oh!

mergify Bot commented Jun 18, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

hopinheimer commented Jun 3, 2026

Issue Addressed

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

michaelsproul commented Jun 16, 2026

Uh oh!

Uh oh!

michaelsproul left a comment

Choose a reason for hiding this comment

Uh oh!

mergify Bot commented Jun 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Queue Status

Reason

Hint

Uh oh!

michaelsproul commented Jun 18, 2026

Uh oh!

michaelsproul commented Jun 18, 2026

Uh oh!

mergify Bot commented Jun 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Queue Status

Uh oh!

mergify Bot commented Jun 18, 2026

☑️ This pull request is already queued

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mergify Bot commented Jun 18, 2026 •

edited

Loading

mergify Bot commented Jun 18, 2026 •

edited

Loading