forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth/catalyst/api: refactor api.invalid(..) to return nil latest valid hash if none provided

Browse source
This commit is contained in:
lightclient 2023-09-28 14:53:48 -06:00
parent 7b718d5be8
commit 144fed4150
No known key found for this signature in database
GPG key ID: 75C916AFEE20183E
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eth/catalyst/api.go
View file

@ -513,8 +513,7 @@ func (api *ConsensusAPI) newPayload(params engine.ExecutableData, versionedHashe
block, err := engine.ExecutableDataToBlock(params, versionedHashes, beaconRoot) block, err := engine.ExecutableDataToBlock(params, versionedHashes, beaconRoot)
if err != nil { if err != nil {
log.Warn("Invalid NewPayload params", "params", params, "error", err) log.Warn("Invalid NewPayload params", "params", params, "error", err)
errMsg := err.Error() return api.invalid(err, nil), nil
return engine.PayloadStatusV1{Status: engine.INVALID, LatestValidHash: nil, ValidationError: &errMsg}, nil
} }
// Stash away the last update to warn the user if the beacon client goes offline // Stash away the last update to warn the user if the beacon client goes offline
api.lastNewPayloadLock.Lock() api.lastNewPayloadLock.Lock()
@ -695,20 +694,21 @@ func (api *ConsensusAPI) checkInvalidAncestor(check common.Hash, head common.Has
} }
} }
// invalid returns a response "INVALID" with the latest valid hash supplied by latest or to the current head // invalid returns a response "INVALID" with the latest valid hash supplied by latest.
// if no latestValid block was provided.
func (api *ConsensusAPI) invalid(err error, latestValid *types.Header) engine.PayloadStatusV1 { func (api *ConsensusAPI) invalid(err error, latestValid *types.Header) engine.PayloadStatusV1 {
currentHash := api.eth.BlockChain().CurrentBlock().Hash() var currentHash *common.Hash
if latestValid != nil { if latestValid != nil {
// Set latest valid hash to 0x0 if parent is PoW block if latestValid.Difficulty.BitLen() != 0 {
currentHash = common.Hash{} // Set latest valid hash to 0x0 if parent is PoW block
if latestValid.Difficulty.BitLen() == 0 { currentHash = &common.Hash{}
} else {
// Otherwise set latest valid hash to parent hash // Otherwise set latest valid hash to parent hash
currentHash = latestValid.Hash() h := latestValid.Hash()
currentHash = &h
} }
} }
errorMsg := err.Error() errorMsg := err.Error()
return engine.PayloadStatusV1{Status: engine.INVALID, LatestValidHash: &currentHash, ValidationError: &errorMsg} return engine.PayloadStatusV1{Status: engine.INVALID, LatestValidHash: currentHash, ValidationError: &errorMsg}
} }
// heartbeat loops indefinitely, and checks if there have been beacon client updates // heartbeat loops indefinitely, and checks if there have been beacon client updates