forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 12:46:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

implement a todo

Browse source
This commit is contained in:
Lucia 2025-11-11 22:45:07 +13:00
parent 7368b34a4b
commit 67191cb77f
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
eth/catalyst/api.go
View file

@ -159,6 +159,17 @@ func newConsensusAPIWithoutHeartbeat(eth *eth.Ethereum) *ConsensusAPI {
return api return api
} }
// forkchoiceHeadUpdateWithError applies the forkchoice update without starting payload
// building and returns the supplied error. This is used when the payload attributes
// are invalid but the spec still requires us to process the forkchoice change.
func (api *ConsensusAPI) forkchoiceHeadUpdateWithError(update engine.ForkchoiceStateV1, payloadVersion engine.PayloadVersion, payloadWitness bool, retErr error) (engine.ForkChoiceResponse, error) {
resp, err := api.forkchoiceUpdated(update, nil, payloadVersion, payloadWitness)
if err != nil {
return resp, err
}
return resp, retErr
}
// ForkchoiceUpdatedV1 has several responsibilities: // ForkchoiceUpdatedV1 has several responsibilities:
// //
// We try to set our blockchain to the headBlock. // We try to set our blockchain to the headBlock.
@ -209,17 +220,13 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV3(update engine.ForkchoiceStateV1, pa
if params != nil { if params != nil {
switch { switch {
case params.Withdrawals == nil: case params.Withdrawals == nil:
return engine.STATUS_INVALID, attributesErr("missing withdrawals") return api.forkchoiceHeadUpdateWithError(update, engine.PayloadV3, false, attributesErr("missing withdrawals"))
case params.BeaconRoot == nil: case params.BeaconRoot == nil:
return engine.STATUS_INVALID, attributesErr("missing beacon root") return api.forkchoiceHeadUpdateWithError(update, engine.PayloadV3, false, attributesErr("missing beacon root"))
case !api.checkFork(params.Timestamp, forks.Cancun, forks.Prague, forks.Osaka, forks.BPO1, forks.BPO2, forks.BPO3, forks.BPO4, forks.BPO5): case !api.checkFork(params.Timestamp, forks.Cancun, forks.Prague, forks.Osaka, forks.BPO1, forks.BPO2, forks.BPO3, forks.BPO4, forks.BPO5):
return engine.STATUS_INVALID, unsupportedForkErr("fcuV3 must only be called for cancun/prague/osaka payloads") return api.forkchoiceHeadUpdateWithError(update, engine.PayloadV3, false, unsupportedForkErr("fcuV3 must only be called for cancun/prague/osaka payloads"))
} }
} }
// TODO(matt): the spec requires that fcu is applied when called on a valid
// hash, even if params are wrong. To do this we need to split up
// forkchoiceUpdate into a function that only updates the head and then a
// function that kicks off block construction.
return api.forkchoiceUpdated(update, params, engine.PayloadV3, false) return api.forkchoiceUpdated(update, params, engine.PayloadV3, false)
} }
@ -263,6 +270,10 @@ func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payl
// potentially more data to the freezer from the get go. // potentially more data to the freezer from the get go.
finalized := api.remoteBlocks.get(update.FinalizedBlockHash) finalized := api.remoteBlocks.get(update.FinalizedBlockHash)
if finalized == nil {
finalized = api.eth.BlockChain().GetHeaderByHash(update.FinalizedBlockHash)
}
// Header advertised via a past newPayload request. Start syncing to it. // Header advertised via a past newPayload request. Start syncing to it.
context := []interface{}{"number", header.Number, "hash", header.Hash()} context := []interface{}{"number", header.Number, "hash", header.Hash()}
if update.FinalizedBlockHash != (common.Hash{}) { if update.FinalizedBlockHash != (common.Hash{}) {

10
eth/catalyst/witness.go
View file

@ -70,17 +70,13 @@ func (api *ConsensusAPI) ForkchoiceUpdatedWithWitnessV3(update engine.Forkchoice
if params != nil { if params != nil {
switch { switch {
case params.Withdrawals == nil: case params.Withdrawals == nil:
return engine.STATUS_INVALID, attributesErr("missing withdrawals") return api.forkchoiceHeadUpdateWithError(update, engine.PayloadV3, true, attributesErr("missing withdrawals"))
case params.BeaconRoot == nil: case params.BeaconRoot == nil:
return engine.STATUS_INVALID, attributesErr("missing beacon root") return api.forkchoiceHeadUpdateWithError(update, engine.PayloadV3, true, attributesErr("missing beacon root"))
case !api.checkFork(params.Timestamp, forks.Cancun, forks.Prague, forks.Osaka, forks.BPO1, forks.BPO2, forks.BPO3, forks.BPO4, forks.BPO5): case !api.checkFork(params.Timestamp, forks.Cancun, forks.Prague, forks.Osaka, forks.BPO1, forks.BPO2, forks.BPO3, forks.BPO4, forks.BPO5):
return engine.STATUS_INVALID, unsupportedForkErr("fcuV3 must only be called for cancun/prague/osaka payloads") return api.forkchoiceHeadUpdateWithError(update, engine.PayloadV3, true, unsupportedForkErr("fcuV3 must only be called for cancun/prague/osaka payloads"))
} }
} }
// TODO(matt): the spec requires that fcu is applied when called on a valid
// hash, even if params are wrong. To do this we need to split up
// forkchoiceUpdate into a function that only updates the head and then a
// function that kicks off block construction.
return api.forkchoiceUpdated(update, params, engine.PayloadV3, true) return api.forkchoiceUpdated(update, params, engine.PayloadV3, true)
} }