tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eth/catalyst: return 0x0 on Invalid block on top of pow block (#25006)

Browse Source
This commit is contained in:
Marius van der Wijden 2022-06-02 13:15:17 +02:00 committed by GitHub
parent 3c6d6f7ee8
commit 2227589f9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eth/catalyst/api.go
View File

@ -354,8 +354,13 @@ func computePayloadId(headBlockHash common.Hash, params *beacon.PayloadAttribute
func (api *ConsensusAPI) invalid(err error, latestValid *types.Block) beacon.PayloadStatusV1 { func (api *ConsensusAPI) invalid(err error, latestValid *types.Block) beacon.PayloadStatusV1 {
currentHash := api.eth.BlockChain().CurrentBlock().Hash() currentHash := api.eth.BlockChain().CurrentBlock().Hash()
if latestValid != nil { if latestValid != nil {
// Set latest valid hash to 0x0 if parent is PoW block
currentHash = common.Hash{}
if latestValid.Difficulty().BitLen() == 0 {
// Otherwise set latest valid hash to parent hash
currentHash = latestValid.Hash() currentHash = latestValid.Hash()
} }
}
errorMsg := err.Error() errorMsg := err.Error()
return beacon.PayloadStatusV1{Status: beacon.INVALID, LatestValidHash: &currentHash, ValidationError: &errorMsg} return beacon.PayloadStatusV1{Status: beacon.INVALID, LatestValidHash: &currentHash, ValidationError: &errorMsg}
} }

3
eth/catalyst/api_test.go
View File

@ -647,7 +647,8 @@ func TestEmptyBlocks(t *testing.T) {
if status.Status != beacon.INVALID { if status.Status != beacon.INVALID {
t.Errorf("invalid status: expected INVALID got: %v", status.Status) t.Errorf("invalid status: expected INVALID got: %v", status.Status)
} }
expected := commonAncestor.Hash() // Expect 0x0 on INVALID block on top of PoW block
expected := common.Hash{}
if !bytes.Equal(status.LatestValidHash[:], expected[:]) { if !bytes.Equal(status.LatestValidHash[:], expected[:]) {
t.Fatalf("invalid LVH: got %v want %v", status.LatestValidHash, expected) t.Fatalf("invalid LVH: got %v want %v", status.LatestValidHash, expected)
} }