From 5f1fb22e512a6cfefc9a6fe800ea548519265ab9 Mon Sep 17 00:00:00 2001
From: Liam Lai <liam@home>
Date: Tue, 15 Oct 2024 19:51:57 -0700
Subject: [PATCH] fix conflict

---
 consensus/XDPoS/XDPoS.go                   | 11 +++++++++++
 consensus/XDPoS/engines/engine_v2/utils.go |  1 +
 2 files changed, 12 insertions(+)

diff --git a/consensus/XDPoS/XDPoS.go b/consensus/XDPoS/XDPoS.go
index 6d5477a1ee..5c24543b58 100644
--- a/consensus/XDPoS/XDPoS.go
+++ b/consensus/XDPoS/XDPoS.go
@@ -17,6 +17,7 @@
 package XDPoS
 
 import (
+	"errors"
 	"fmt"
 	"math/big"
 
@@ -549,3 +550,13 @@ func (x *XDPoS) CacheSigningTxs(hash common.Hash, txs []*types.Transaction) []*t
 func (x *XDPoS) GetCachedSigningTxs(hash common.Hash) (interface{}, bool) {
 	return x.signingTxsCache.Get(hash)
 }
+
+func (x *XDPoS) GetEpochSwitchInfoBetween(chain consensus.ChainReader, begin, end *types.Header) ([]*types.EpochSwitchInfo, error) {
+	beginBlockVersion := x.config.BlockConsensusVersion(begin.Number, begin.Extra, ExtraFieldCheck)
+	endBlockVersion := x.config.BlockConsensusVersion(end.Number, end.Extra, ExtraFieldCheck)
+	if beginBlockVersion == params.ConsensusEngineVersion2 && endBlockVersion == params.ConsensusEngineVersion2 {
+		return x.EngineV2.GetEpochSwitchInfoBetween(chain, begin, end)
+	}
+	// Default "v1"
+	return nil, errors.New("not supported in the v1 consensus")
+}
diff --git a/consensus/XDPoS/engines/engine_v2/utils.go b/consensus/XDPoS/engines/engine_v2/utils.go
index 86804ded3d..4619ecc14a 100644
--- a/consensus/XDPoS/engines/engine_v2/utils.go
+++ b/consensus/XDPoS/engines/engine_v2/utils.go
@@ -1,6 +1,7 @@
 package engine_v2
 
 import (
+	"errors"
 	"fmt"
 	"math/big"