Merge branch 'feat/sovereign-mainchain-header-sync' into MX-15953-cro…

…ss-chain-header-storage-sync

epochStart/bootstrap/bootStrapSovereignShardProcessor.go

@@ -292,7 +292,7 @@ func (sbp *sovereignBootStrapShardProcessor) createEpochStartInterceptorsContain
 func (bp *sovereignBootStrapShardProcessor) createCrossHeaderRequester() (updateSync.CrossHeaderRequester, error) {
 	extendedHeaderRequester, castOk := bp.requestHandler.(updateSync.ExtendedShardHeaderRequestHandler)
 	if !castOk {
-		return nil, fmt.Errorf("%w in sovereignBootStrapShardProcessor.createHeadersSyncer for extendedHeaderRequester", process.ErrWrongTypeAssertion)
+		return nil, fmt.Errorf("%w in sovereignBootStrapShardProcessor.createCrossHeaderRequester for extendedHeaderRequester", process.ErrWrongTypeAssertion)
 	}
 
 	return updateSync.NewExtendedHeaderRequester(extendedHeaderRequester)

epochStart/bootstrap/bootStrapSovereignShardProcessor_test.go

@@ -294,7 +294,7 @@ func TestBootStrapSovereignShardProcessor_createEpochStartInterceptorsContainers
 	require.Zero(t, fullContainer.Len())
 }
 
-func TestBootStrapSovereignShardProcessor_createHeadersSyncer(t *testing.T) {
+func TestBootStrapSovereignShardProcessor_createCrossHeaderRequester(t *testing.T) {
 	t.Parallel()
 
 	sovProc := createSovBootStrapProc()
@@ -307,6 +307,6 @@ func TestBootStrapSovereignShardProcessor_createHeadersSyncer(t *testing.T) {
 
 	sovProc.requestHandler = &testscommon.ExtendedShardHeaderRequestHandlerStub{}
 	requester, err = sovProc.createCrossHeaderRequester()
-	require.NotNil(t, requester)
+	require.Nil(t, err)
 	require.Equal(t, "*sync.extendedHeaderRequester", fmt.Sprintf("%T", requester))
 }

process/block/sovereign/incomingHeader/extendedHeaderProcessor.go

@@ -8,10 +8,13 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/multiversx/mx-chain-core-go/hashing"
 	"github.com/multiversx/mx-chain-core-go/marshal"
+
+	"github.com/multiversx/mx-chain-go/process"
 )
 
 type extendedHeaderProcessor struct {
 	headersPool HeadersPool
+	txPool      TransactionPool
 	marshaller  marshal.Marshalizer
 	hasher      hashing.Hasher
 }
@@ -80,15 +83,24 @@ func (ehp *extendedHeaderProcessor) addPreGenesisExtendedHeaderToPool(incomingHe
 		IncomingEvents:     []*transaction.Event{},
 	}
 
-	return ehp.addExtendedHeaderToPool(extendedHeader)
+	return ehp.addExtendedHeaderAndSCRsToPool(extendedHeader, make([]*scrInfo, 0))
 }
 
-func (ehp *extendedHeaderProcessor) addExtendedHeaderToPool(extendedHeader data.ShardHeaderExtendedHandler) error {
+func (ehp *extendedHeaderProcessor) addExtendedHeaderAndSCRsToPool(extendedHeader data.ShardHeaderExtendedHandler, scrs []*scrInfo) error {
 	extendedHeaderHash, err := core.CalculateHash(ehp.marshaller, ehp.hasher, extendedHeader)
 	if err != nil {
 		return err
 	}
 
+	ehp.addSCRsToPool(scrs)
 	ehp.headersPool.AddHeaderInShard(extendedHeaderHash, extendedHeader, core.MainChainShardId)
 	return nil
 }
+
+func (ehp *extendedHeaderProcessor) addSCRsToPool(scrs []*scrInfo) {
+	cacheID := process.ShardCacherIdentifier(core.MainChainShardId, core.SovereignChainShardId)
+
+	for _, scrData := range scrs {
+		ehp.txPool.AddData(scrData.hash, scrData.scr, scrData.scr.Size(), cacheID)
+	}
+}

process/block/sovereign/incomingHeader/incomingHeaderProcessor.go

@@ -3,17 +3,16 @@ package incomingHeader
 import (
 	"encoding/hex"
 
-	sovereignBlock "github.com/multiversx/mx-chain-go/dataRetriever/dataPool/sovereign"
-	"github.com/multiversx/mx-chain-go/errors"
-	"github.com/multiversx/mx-chain-go/process"
-
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/sovereign"
 	"github.com/multiversx/mx-chain-core-go/hashing"
 	"github.com/multiversx/mx-chain-core-go/marshal"
 	logger "github.com/multiversx/mx-chain-logger-go"
+
+	sovereignBlock "github.com/multiversx/mx-chain-go/dataRetriever/dataPool/sovereign"
+	"github.com/multiversx/mx-chain-go/errors"
 )
 
 var log = logger.GetOrCreate("headerSubscriber")
@@ -34,7 +33,6 @@ type incomingHeaderProcessor struct {
 	eventsProc         *incomingEventsProcessor
 	extendedHeaderProc *extendedHeaderProcessor
 
-	txPool                          TransactionPool
 	outGoingPool                    sovereignBlock.OutGoingOperationsPool
 	mainChainNotarizationStartRound uint64
 }
@@ -74,6 +72,7 @@ func NewIncomingHeaderProcessor(args ArgsIncomingHeaderProcessor) (*incomingHead
 
 	extendedHearProc := &extendedHeaderProcessor{
 		headersPool: args.HeadersPool,
+		txPool:      args.TxPool,
 		marshaller:  args.Marshaller,
 		hasher:      args.Hasher,
 	}
@@ -83,7 +82,6 @@ func NewIncomingHeaderProcessor(args ArgsIncomingHeaderProcessor) (*incomingHead
 	return &incomingHeaderProcessor{
 		eventsProc:                      eventsProc,
 		extendedHeaderProc:              extendedHearProc,
-		txPool:                          args.TxPool,
 		outGoingPool:                    args.OutGoingOperationsPool,
 		mainChainNotarizationStartRound: args.MainChainNotarizationStartRound,
 	}, nil
@@ -127,24 +125,15 @@ func (ihp *incomingHeaderProcessor) AddHeader(headerHash []byte, header sovereig
 		return err
 	}
 
-	err = ihp.extendedHeaderProc.addExtendedHeaderToPool(extendedHeader)
+	err = ihp.extendedHeaderProc.addExtendedHeaderAndSCRsToPool(extendedHeader, res.scrs)
 	if err != nil {
 		return err
 	}
 
 	ihp.addConfirmedBridgeOpsToPool(res.confirmedBridgeOps)
-	ihp.addSCRsToPool(res.scrs)
 	return nil
 }
 
-func (ihp *incomingHeaderProcessor) addSCRsToPool(scrs []*scrInfo) {
-	cacheID := process.ShardCacherIdentifier(core.MainChainShardId, core.SovereignChainShardId)
-
-	for _, scrData := range scrs {
-		ihp.txPool.AddData(scrData.hash, scrData.scr, scrData.scr.Size(), cacheID)
-	}
-}
-
 func (ihp *incomingHeaderProcessor) addConfirmedBridgeOpsToPool(ops []*confirmedBridgeOp) {
 	for _, op := range ops {
 		// This is not a critical error. This might just happen when a leader tries to re-send unconfirmed confirmation

process/block/sovereignChainBlock.go

@@ -834,23 +834,29 @@ func (scbp *sovereignChainBlockProcessor) checkExtendedShardHeadersValidity() er
 		return err
 	}
 
+	log.Trace("checkExtendedShardHeadersValidity",
+		"lastCrossNotarizedHeader nonce", lastCrossNotarizedHeader.GetNonce(),
+		"lastCrossNotarizedHeader round", lastCrossNotarizedHeader.GetRound(),
+	)
+
 	extendedShardHdrs := scbp.sortExtendedShardHeadersForCurrentBlockByNonce()
 	if len(extendedShardHdrs) == 0 {
 		return nil
 	}
 
-	log.Trace("checkExtendedShardHeadersValidity",
-		"lastCrossNotarizedHeader nonce", lastCrossNotarizedHeader.GetNonce(),
-		"lastCrossNotarizedHeader round", lastCrossNotarizedHeader.GetRound(),
-	)
-	if scbp.receivedGenesisMainChainHeaderWithoutPreGenesis(extendedShardHdrs[0]) {
+	if scbp.isGenesisHeaderWithNoPreviousTracking(extendedShardHdrs[0]) {
 		// we are missing pre-genesis header, so we can't link it to previous header
 		if len(extendedShardHdrs) == 1 {
 			return nil
 		}
 
 		lastCrossNotarizedHeader = extendedShardHdrs[0]
 		extendedShardHdrs = extendedShardHdrs[1:]
+
+		log.Debug("checkExtendedShardHeadersValidity missing pre genesis, updating lastCrossNotarizedHeader",
+			"lastCrossNotarizedHeader nonce", lastCrossNotarizedHeader.GetNonce(),
+			"lastCrossNotarizedHeader round", lastCrossNotarizedHeader.GetRound(),
+		)
 	}
 
 	for _, extendedShardHdr := range extendedShardHdrs {
@@ -873,7 +879,7 @@ func (scbp *sovereignChainBlockProcessor) checkExtendedShardHeadersValidity() er
 //   - no notifier is attached => we did not track main chain and don't have pre-genesis header
 //   - node is in re-sync/start in the exact epoch when we start to notarize main chain => no previous
 //     main chain tracking(notifier is also disabled)
-func (scbp *sovereignChainBlockProcessor) receivedGenesisMainChainHeaderWithoutPreGenesis(incomingHeader data.HeaderHandler) bool {
+func (scbp *sovereignChainBlockProcessor) isGenesisHeaderWithNoPreviousTracking(incomingHeader data.HeaderHandler) bool {
 	return scbp.extendedShardHeaderTracker.IsGenesisLastCrossNotarizedHeader() && incomingHeader.GetRound() == scbp.mainChainNotarizationStartRound
 }
 

process/track/sovereignChainShardBlockTrack.go

@@ -126,6 +126,7 @@ func (scsbt *sovereignChainShardBlockTrack) receivedExtendedShardHeader(
 	scsbt.blockProcessor.ProcessReceivedHeader(extendedShardHeaderHandler)
 }
 
+// IsGenesisLastCrossNotarizedHeader returns true if the last cross chain notarized header is the dummy genesis header
 func (scsbt *sovereignChainShardBlockTrack) IsGenesisLastCrossNotarizedHeader() bool {
 	lastNotarizedHeader, _, err := scsbt.crossNotarizer.GetLastNotarizedHeader(core.MainChainShardId)