mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-24 21:56:43 +00:00
core: optimize block validation (#35403)
This PR parallelizes the block validation alongside the IntermediateRoot, saving the time spent on the receiptRoot hashing, BAL hashing and so on.
This commit is contained in:
parent
e317407d16
commit
f03b91cf28
1 changed files with 20 additions and 5 deletions
|
|
@ -168,6 +168,26 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
|
||||||
if stateless {
|
if stateless {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
resultCh := make(chan error, 1)
|
||||||
|
go func() {
|
||||||
|
resultCh <- v.validateResult(block, header, res)
|
||||||
|
}()
|
||||||
|
// Validate the state root against the received state root and throw
|
||||||
|
// an error if they don't match.
|
||||||
|
var rootErr error
|
||||||
|
if root := statedb.IntermediateRoot(v.config.IsEIP158(header.Number)); header.Root != root {
|
||||||
|
rootErr = fmt.Errorf("invalid merkle root (remote: %x local: %x) dberr: %w", header.Root, root, statedb.Error())
|
||||||
|
}
|
||||||
|
if err := <-resultCh; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return rootErr
|
||||||
|
}
|
||||||
|
|
||||||
|
// validateResult validates the derivable fields of the block header (receipt
|
||||||
|
// root, requests hash and the block access list hash) against the provided
|
||||||
|
// process result.
|
||||||
|
func (v *BlockValidator) validateResult(block *types.Block, header *types.Header, res *ProcessResult) error {
|
||||||
// The receipt Trie's root (R = (Tr [[H1, R1], ... [Hn, Rn]]))
|
// The receipt Trie's root (R = (Tr [[H1, R1], ... [Hn, Rn]]))
|
||||||
receiptSha := types.DeriveSha(res.Receipts, trie.NewStackTrie(nil))
|
receiptSha := types.DeriveSha(res.Receipts, trie.NewStackTrie(nil))
|
||||||
if receiptSha != header.ReceiptHash {
|
if receiptSha != header.ReceiptHash {
|
||||||
|
|
@ -199,11 +219,6 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
|
||||||
return fmt.Errorf("invalid block access list: %v", err)
|
return fmt.Errorf("invalid block access list: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Validate the state root against the received state root and throw
|
|
||||||
// an error if they don't match.
|
|
||||||
if root := statedb.IntermediateRoot(v.config.IsEIP158(header.Number)); header.Root != root {
|
|
||||||
return fmt.Errorf("invalid merkle root (remote: %x local: %x) dberr: %w", header.Root, root, statedb.Error())
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue