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

core: revert block validation optimization (#35490)
Some checks are pending
/ Linux Build (push) Waiting to run
Details
/ Linux Build (arm) (push) Waiting to run
Details
/ Keeper Build (push) Waiting to run
Details
/ Windows Build (push) Waiting to run
Details
/ Docker Image (push) Waiting to run
Details

Browse source 
Reverts ethereum/go-ethereum#35403

Partially resolve https://github.com/ethereum/go-ethereum/issues/35478

Note, it's safe for mainnet, as the block-level accessList hasn't been
enabled yet.
This commit is contained in:
rjl493456442 2026-08-10 14:47:29 +08:00 committed by GitHub
parent 82061af43f
commit 255842b750
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/block_validator.go
View file

@ -168,26 +168,6 @@ 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 {
@ -219,6 +199,11 @@ func (v *BlockValidator) validateResult(block *types.Block, header *types.Header
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
} }