core: improve ambiguous block validation message (#26582)

pull/26587/head
Martin Holst Swende 2 years ago committed by GitHub
parent bd6a05e1ee
commit 5c8cc10d1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      core/block_validator.go

@ -60,14 +60,14 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
return err
}
if hash := types.CalcUncleHash(block.Uncles()); hash != header.UncleHash {
return fmt.Errorf("uncle root hash mismatch: have %x, want %x", hash, header.UncleHash)
return fmt.Errorf("uncle root hash mismatch (header value %x, calculated %x)", header.UncleHash, hash)
}
if hash := types.DeriveSha(block.Transactions(), trie.NewStackTrie(nil)); hash != header.TxHash {
return fmt.Errorf("transaction root hash mismatch: have %x, want %x", hash, header.TxHash)
return fmt.Errorf("transaction root hash mismatch (header value %x, calculated %x)", header.TxHash, hash)
}
if header.WithdrawalsHash != nil {
if hash := types.DeriveSha(block.Withdrawals(), trie.NewStackTrie(nil)); hash != *header.WithdrawalsHash {
return fmt.Errorf("withdrawals root hash mismatch: have %x, want %x", hash, *header.WithdrawalsHash)
return fmt.Errorf("withdrawals root hash mismatch (header value %x, calculated %x)", *header.WithdrawalsHash, hash)
}
}
if !v.bc.HasBlockAndState(block.ParentHash(), block.NumberU64()-1) {

Loading…
Cancel
Save