Skip to content

Fix reorgBack: send back FCU only after payload verification #594

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

Closed
wants to merge 2 commits into from
Closed

Fix reorgBack: send back FCU only after payload verification #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
617785c
Fix reorgBack: send back FCU only after payload verification
yperbasis Jul 5, 2022
4d94402
OnVerificationEnd -> OnBlockProductionEnd
yperbasis Jul 5, 2022
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: 4 additions & 0 deletions simulators/ethereum/engine/clmock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ type BlockProcessCallbacks struct {
OnForkchoiceBroadcast func()
OnSafeBlockChange func()
OnFinalizedBlockChange func()
OnBlockProductionEnd func()
}

func (cl *CLMocker) produceSingleBlock(callbacks BlockProcessCallbacks) {
Expand Down Expand Up @@ -451,6 +452,9 @@ func (cl *CLMocker) produceSingleBlock(callbacks BlockProcessCallbacks) {
cl.Fatalf("CLMocker: None of the clients accepted the newly constructed payload")
}

if callbacks.OnBlockProductionEnd != nil {
callbacks.OnBlockProductionEnd()
}
}

// Loop produce PoS blocks by using the Engine API
Expand Down
2 changes: 1 addition & 1 deletion simulators/ethereum/engine/enginetests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,7 +1496,7 @@ func reorgBack(t *TestEnv) {

// Produce blocks before starting the test (So we don't try to reorg back to the genesis block)
t.CLMock.produceBlocks(5, BlockProcessCallbacks{
OnForkchoiceBroadcast: func() {
OnBlockProductionEnd: func() {
// Send a fcU with the HeadBlockHash pointing back to the previous block
forkchoiceUpdatedBack := ForkchoiceStateV1{
HeadBlockHash: previousHash,
Expand Down