FEAT: Intercepted sovereign block header with mb headers checker

process/block/interceptedBlocks/common.go

@@ -122,13 +122,13 @@ func checkShardData(sd data.ShardDataHandler, coordinator sharding.Coordinator)
 	return nil
 }
 
-func checkMiniBlocksHeaders(mbHeaders []data.MiniBlockHeaderHandler, coordinator sharding.Coordinator) error {
+func checkMiniBlocksHeaders(mbHeaders []data.MiniBlockHeaderHandler, coordinator sharding.Coordinator, acceptedCrossShardID uint32) error {
 	for _, mbHeader := range mbHeaders {
 		isWrongSenderShardId := mbHeader.GetSenderShardID() >= coordinator.NumberOfShards() &&
-			mbHeader.GetSenderShardID() != core.MainChainShardId &&
+			mbHeader.GetSenderShardID() != acceptedCrossShardID &&
 			mbHeader.GetSenderShardID() != core.AllShardId
 		isWrongDestinationShardId := mbHeader.GetReceiverShardID() >= coordinator.NumberOfShards() &&
-			mbHeader.GetReceiverShardID() != core.MainChainShardId &&
+			mbHeader.GetReceiverShardID() != acceptedCrossShardID &&
 			mbHeader.GetReceiverShardID() != core.AllShardId
 		isWrongShardId := isWrongSenderShardId || isWrongDestinationShardId
 		if isWrongShardId {

process/block/interceptedBlocks/common_test.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-go/process"
@@ -453,8 +454,8 @@ func TestCheckMiniBlocksHeaders_WithNilOrEmptyShouldReturnNil(t *testing.T) {
 
 	shardCoordinator := mock.NewOneShardCoordinatorMock()
 
-	err1 := checkMiniBlocksHeaders(nil, shardCoordinator)
-	err2 := checkMiniBlocksHeaders(make([]data.MiniBlockHeaderHandler, 0), shardCoordinator)
+	err1 := checkMiniBlocksHeaders(nil, shardCoordinator, core.MainChainShardId)
+	err2 := checkMiniBlocksHeaders(make([]data.MiniBlockHeaderHandler, 0), shardCoordinator, core.MainChainShardId)
 
 	assert.Nil(t, err1)
 	assert.Nil(t, err2)
@@ -473,7 +474,7 @@ func TestCheckMiniBlocksHeaders_WrongMiniblockSenderShardIdShouldErr(t *testing.
 		Type:            0,
 	}
 
-	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator)
+	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator, core.MainChainShardId)
 
 	assert.Equal(t, process.ErrInvalidShardId, err)
 }
@@ -491,7 +492,7 @@ func TestCheckMiniBlocksHeaders_WrongMiniblockReceiverShardIdShouldErr(t *testin
 		Type:            0,
 	}
 
-	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator)
+	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator, core.MainChainShardId)
 
 	assert.Equal(t, process.ErrInvalidShardId, err)
 }
@@ -509,7 +510,7 @@ func TestCheckMiniBlocksHeaders_ReservedPopulatedShouldErr(t *testing.T) {
 		Reserved:        []byte("rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr"),
 	}
 
-	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator)
+	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator, core.MainChainShardId)
 
 	assert.Equal(t, process.ErrReservedFieldInvalid, err)
 }
@@ -527,7 +528,7 @@ func TestCheckMiniBlocksHeaders_ReservedPopulatedCorrectly(t *testing.T) {
 		Reserved:        []byte("r"),
 	}
 
-	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator)
+	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator, core.MainChainShardId)
 
 	assert.Nil(t, err)
 }
@@ -544,7 +545,7 @@ func TestCheckMiniBlocksHeaders_OkValsShouldWork(t *testing.T) {
 		Type:            0,
 	}
 
-	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator)
+	err := checkMiniBlocksHeaders([]data.MiniBlockHeaderHandler{&miniblockHeader}, shardCoordinator, core.MainChainShardId)
 
 	assert.Nil(t, err)
 }

process/block/interceptedBlocks/errors.go

@@ -0,0 +1,5 @@
+package interceptedBlocks
+
+import "errors"
+
+var errNilInterceptedBlockHeader = errors.New("nil intercepted block header provided")

process/block/interceptedBlocks/interceptedBlockHeader.go

@@ -26,6 +26,8 @@ type InterceptedHeader struct {
 	isForCurrentShard bool
 	validityAttester  process.ValidityAttester
 	epochStartTrigger process.EpochStartTriggerHandler
+
+	mbHeadersChecker mbHeadersChecker
 }
 
 // NewInterceptedHeader creates a new instance of InterceptedHeader struct
@@ -50,6 +52,7 @@ func NewInterceptedHeader(arg *ArgInterceptedBlockHeader) (*InterceptedHeader, e
 		epochStartTrigger: arg.EpochStartTrigger,
 	}
 	inHdr.processFields(arg.HdrBuff)
+	inHdr.mbHeadersChecker = inHdr
 
 	return inHdr, nil
 }
@@ -138,14 +141,18 @@ func (inHdr *InterceptedHeader) integrity() error {
 		return err
 	}
 
-	err = checkMiniBlocksHeaders(inHdr.hdr.GetMiniBlockHeaderHandlers(), inHdr.shardCoordinator)
+	err = inHdr.mbHeadersChecker.checkMiniBlocksHeaders(inHdr.hdr.GetMiniBlockHeaderHandlers(), inHdr.shardCoordinator)
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
 
+func (inHdr *InterceptedHeader) checkMiniBlocksHeaders(mbHeaders []data.MiniBlockHeaderHandler, coordinator sharding.Coordinator) error {
+	return checkMiniBlocksHeaders(mbHeaders, coordinator, core.MetachainShardId)
+}
+
 // Hash gets the hash of this header
 func (inHdr *InterceptedHeader) Hash() []byte {
 	return inHdr.hash

process/block/interceptedBlocks/interceptedSovereignBlockHeader.go

@@ -0,0 +1,35 @@
+package interceptedBlocks
+
+import (
+	"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-go/sharding"
+)
+
+type interceptedSovereignBlockHeader struct {
+	*InterceptedHeader
+}
+
+// NewSovereignInterceptedBlockHeader creates a new intercepted sovereign block header
+func NewSovereignInterceptedBlockHeader(blockHeaderInterceptor *InterceptedHeader) (*interceptedSovereignBlockHeader, error) {
+	if check.IfNil(blockHeaderInterceptor) {
+		return nil, errNilInterceptedBlockHeader
+	}
+
+	sovInterceptedBlock := &interceptedSovereignBlockHeader{
+		blockHeaderInterceptor,
+	}
+
+	sovInterceptedBlock.mbHeadersChecker = sovInterceptedBlock
+	return sovInterceptedBlock, nil
+}
+
+func (isbh *interceptedSovereignBlockHeader) checkMiniBlocksHeaders(mbHeaders []data.MiniBlockHeaderHandler, coordinator sharding.Coordinator) error {
+	return checkMiniBlocksHeaders(mbHeaders, coordinator, core.MainChainShardId)
+}
+
+// IsInterfaceNil returns true if there is no value under the interface
+func (isbh *interceptedSovereignBlockHeader) IsInterfaceNil() bool {
+	return isbh == nil
+}

process/block/interceptedBlocks/interface.go

@@ -0,0 +1,10 @@
+package interceptedBlocks
+
+import (
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-go/sharding"
+)
+
+type mbHeadersChecker interface {
+	checkMiniBlocksHeaders(mbHeaders []data.MiniBlockHeaderHandler, coordinator sharding.Coordinator) error
+}