status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix engine_forkchoiceUpdated bug (#2274) 

* fCU Ignore update to old head

* Only enable terminal PoW block conditions for fCUV1

* Typo fix: TDD -> TTD

* Add link to Shanghai fCUV2 specification

* Add link to Paris fCUV1 specification
This commit is contained in:
andri lim 2024-06-01 20:26:12 +07:00 committed by GitHub
parent 0f0ac0bc14
commit 1565c57ae6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nimbus/beacon/api_handler/api_forkchoice.nim
View File

@ -102,6 +102,10 @@ proc forkchoiceUpdated*(ben: BeaconEngineRef,
# Block is known locally, just sanity check that the beacon client does not
# attempt to push us back to before the merge.
#
# Disable terminal PoW block conditions validation for fCUV2 and later.
# https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/shanghai.md#specification-1
if apiVersion == Version.V1:
let blockNumber = header.blockNumber.truncate(uint64)
if header.difficulty > 0.u256 or blockNumber == 0'u64:
var
@ -115,7 +119,7 @@ proc forkchoiceUpdated*(ben: BeaconEngineRef,
td = td,
parent = header.parentHash.short,
ptd = ptd
return simpleFCU(PayloadExecutionStatus.invalid, "TDs unavailable for TDD check")
return simpleFCU(PayloadExecutionStatus.invalid, "TDs unavailable for TTD check")
if td < ttd or (blockNumber > 0'u64 and ptd > ttd):
notice "Refusing beacon update to pre-merge",
@ -129,11 +133,14 @@ proc forkchoiceUpdated*(ben: BeaconEngineRef,
# If the head block is already in our canonical chain, the beacon client is
# probably resyncing. Ignore the update.
# See point 2 of fCUV1 specification
# https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/paris.md#specification-1
var canonHash: common.Hash256
if db.getBlockHash(header.blockNumber, canonHash) and canonHash == blockHash:
# TODO should this be possible?
# If we allow these types of reorgs, we will do lots and lots of reorgs during sync
notice "Reorg to previous block", blockHash
notice "Ignoring beacon update to old head",
blockHash=blockHash.short,
blockNumber=header.blockNumber
return validFCU(none(PayloadID), blockHash)
chain.setCanonical(header).isOkOr:
return invalidFCU(error, com, header)