Merge branch 'secp256r1-precompile' of github.com:OffchainLabs/go-eth…

…ereum into secp256r1-precompile

core/blockchain_arbitrum.go

@@ -18,7 +18,7 @@
 package core
 
 import (
-	"errors"
+	"fmt"
 	"time"
 
 	"github.com/ethereum/go-ethereum/core/state"
@@ -40,21 +40,9 @@ func (bc *BlockChain) WriteBlockAndSetHeadWithTime(block *types.Block, receipts
 func (bc *BlockChain) ReorgToOldBlock(newHead *types.Block) error {
 	bc.wg.Add(1)
 	defer bc.wg.Done()
-	locked := bc.chainmu.TryLock()
-	if !locked {
-		return errors.New("couldn't catch lock to reorg")
+	if _, err := bc.SetCanonical(newHead); err != nil {
+		return fmt.Errorf("error reorging to old block: %w", err)
 	}
-	defer bc.chainmu.Unlock()
-	oldHead := bc.CurrentBlock()
-	if oldHead.Hash() == newHead.Hash() {
-		return nil
-	}
-	bc.writeHeadBlock(newHead)
-	err := bc.reorg(oldHead, newHead)
-	if err != nil {
-		return err
-	}
-	bc.chainHeadFeed.Send(ChainHeadEvent{Block: newHead})
 	return nil
 }