forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 14:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consensus/bor: remove state root calculation from bor consensus (#1539)

Browse source 
Remove call to `IntermediateRoot` in `Finalize` method of consensus while validating a remote block as it's not required and it updates a copy of header and not the actual header.
This commit is contained in:
Manav Darji 2025-05-14 14:19:54 +05:30 committed by GitHub
parent 8d1e9d4745
commit 34db035d3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
consensus/bor/bor.go
View file

@ -878,10 +878,6 @@ func (c *Bor) Finalize(chain consensus.ChainHeaderReader, header *types.Header,
return return
} }
// No block rewards in PoA, so the state remains as is and uncles are dropped
header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
header.UncleHash = types.CalcUncleHash(nil)
// Set state sync data to blockchain // Set state sync data to blockchain
bc := chain.(*core.BlockChain) bc := chain.(*core.BlockChain)
bc.SetStateSync(stateSyncData) bc.SetStateSync(stateSyncData)

2
consensus/bor/bor_test.go
View file

@ -84,7 +84,7 @@ func TestGenesisContractChange(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, statedb.Database().TrieDB().Commit(root, true)) require.NoError(t, statedb.Database().TrieDB().Commit(root, true))
statedb, err := state.New(h.Root, state.NewDatabase(triedb.NewDatabase(db, triedb.HashDefaults), nil)) statedb, err := state.New(root, state.NewDatabase(triedb.NewDatabase(db, triedb.HashDefaults), nil))
require.NoError(t, err) require.NoError(t, err)
return root, statedb return root, statedb