Fix unwind

consensus/bor/bor.go

@@ -409,7 +409,7 @@ func New(
 		libcommon.Address{},
 		func(_ libcommon.Address, _ string, i []byte) ([]byte, error) {
 			// return an error to prevent panics
-			return nil, &UnauthorizedSignerError{libcommon.Hash{}, 0, libcommon.Address{}.Bytes()}
+			return nil, &UnauthorizedSignerError{0, libcommon.Address{}.Bytes()}
 		},
 	})
 
@@ -871,7 +871,7 @@ func (c *Bor) verifySeal(chain consensus.ChainHeaderReader, header *types.Header
 
 	if !snap.ValidatorSet.HasAddress(signer) {
 		// Check the UnauthorizedSignerError.Error() msg to see why we pass number-1
-		return &UnauthorizedSignerError{header.Hash(), number, signer.Bytes()}
+		return &UnauthorizedSignerError{number, signer.Bytes()}
 	}
 
 	succession, err := snap.GetSignerSuccessionNumber(signer)
@@ -1134,7 +1134,7 @@ func (c *Bor) Seal(chain consensus.ChainHeaderReader, block *types.Block, result
 	// Bail out if we're unauthorized to sign a block
 	if !snap.ValidatorSet.HasAddress(signer) {
 		// Check the UnauthorizedSignerError.Error() msg to see why we pass number-1
-		return &UnauthorizedSignerError{header.Hash(), number, signer.Bytes()}
+		return &UnauthorizedSignerError{number, signer.Bytes()}
 	}
 
 	successionNumber, err := snap.GetSignerSuccessionNumber(signer)

consensus/bor/errors.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"time"
 
-	libcommon "github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon/consensus/bor/clerk"
 )
 
@@ -68,7 +67,6 @@ func (e *UnauthorizedProposerError) Error() string {
 
 // UnauthorizedSignerError is returned if a header is [being] signed by an unauthorized entity.
 type UnauthorizedSignerError struct {
-	Hash   libcommon.Hash
 	Number uint64
 	Signer []byte
 }

consensus/bor/snapshot.go

@@ -8,7 +8,6 @@ import (
 	lru "github.com/hashicorp/golang-lru/arc/v2"
 	"github.com/ledgerwatch/erigon-lib/chain"
 	"github.com/ledgerwatch/erigon-lib/common"
-	libcommon "github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon/consensus/bor/valset"
 	"github.com/ledgerwatch/erigon/core/types"
@@ -160,7 +159,7 @@ func (s *Snapshot) Apply(parent *types.Header, headers []*types.Header, logger l
 
 		// check if signer is in validator set
 		if !snap.ValidatorSet.HasAddress(signer) {
-			return snap, &UnauthorizedSignerError{header.Hash(), number, signer.Bytes()}
+			return snap, &UnauthorizedSignerError{number, signer.Bytes()}
 		}
 		if succession, err = snap.GetSignerSuccessionNumber(signer); err != nil {
 			return snap, err
@@ -190,14 +189,13 @@ func (s *Snapshot) Apply(parent *types.Header, headers []*types.Header, logger l
 		}
 
 		if number > 64 && !validSigner {
-			return snap, &UnauthorizedSignerError{header.Hash(), number, signer.Bytes()}
+			return snap, &UnauthorizedSignerError{number, signer.Bytes()}
 		}
 		parent = header
+		snap.Number = number
+		snap.Hash = header.Hash()
 	}
 
-	snap.Number += uint64(len(headers))
-	snap.Hash = headers[len(headers)-1].Hash()
-
 	return snap, nil
 }
 
@@ -214,7 +212,7 @@ func (s *Snapshot) GetSignerSuccessionNumber(signer common.Address) (int, error)
 	signerIndex, _ := s.ValidatorSet.GetByAddress(signer)
 
 	if signerIndex == -1 {
-		return -1, &UnauthorizedSignerError{libcommon.Hash{}, s.Number + 1, signer.Bytes()}
+		return -1, &UnauthorizedSignerError{s.Number + 1, signer.Bytes()}
 	}
 
 	tempIndex := signerIndex

eth/stagedsync/stage_bor_heimdall.go

@@ -11,6 +11,7 @@ import (
 
 	lru "github.com/hashicorp/golang-lru/arc/v2"
 	"github.com/ledgerwatch/erigon-lib/chain"
+	"github.com/ledgerwatch/erigon-lib/common"
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon/accounts/abi"
@@ -543,8 +544,16 @@ func persistValidatorSets(
 	if len(headers) > 0 {
 		var err error
 		if snap, err = snap.Apply(parent, headers, logger); err != nil {
-			if signErr, ok := err.(*bor.UnauthorizedSignerError); ok {
-				u.UnwindTo(signErr.Number-1, signErr.Hash)
+			if snap != nil {
+				var badHash common.Hash
+				for _, header := range headers {
+					if header.Number.Uint64() == snap.Number+1 {
+						badHash = header.Hash()
+						break
+					}
+				}
+				u.UnwindTo(snap.Number, badHash)
+				logger.Error("Hey", "number", snap.Number, "badHash", badHash, "err", err)
 			} else {
 				return fmt.Errorf("snap.Apply %d, headers %d-%d: %w", blockNum, headers[0].Number.Uint64(), headers[len(headers)-1].Number.Uint64(), err)
 			}