mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-19 21:31:37 +00:00
Merge branch 'master' into dev-upgrade-fix-merge
This commit is contained in:
commit
0e9052b2e5
1 changed files with 2 additions and 0 deletions
|
|
@ -664,8 +664,10 @@ func (bc *BlockChain) ExportN(w io.Writer, first uint64, last uint64) error {
|
|||
//
|
||||
// Note, this function assumes that the `mu` mutex is held!
|
||||
func (bc *BlockChain) insert(block *types.Block, writeBlock bool) {
|
||||
|
||||
blockHash := block.Hash()
|
||||
blockNumberU64 := block.NumberU64()
|
||||
|
||||
// If the block is on a side chain or an unknown one, force other heads onto it too
|
||||
updateHeads := GetCanonicalHash(bc.db, blockNumberU64) != blockHash
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue