Supernova meta processing

common/common.go

@@ -416,7 +416,6 @@ func ExtractBaseExecutionResultHandler(lastExecResultsHandler data.LastExecution
 // GetMiniBlocksHeaderHandlersFromExecResult returns miniblock handlers based on execution result
 func GetMiniBlocksHeaderHandlersFromExecResult(
 	baseExecResult data.BaseExecutionResultHandler,
-	headerShard uint32,
 ) ([]data.MiniBlockHeaderHandler, error) {
 	if check.IfNil(baseExecResult) {
 		return nil, ErrNilBaseExecutionResult

common/common_test.go

@@ -11,13 +11,14 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/smartContractResult"
 	"github.com/multiversx/mx-chain-core-go/data/transaction"
+	"github.com/stretchr/testify/require"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/config"
 	commonErrors "github.com/multiversx/mx-chain-go/errors"
 	"github.com/multiversx/mx-chain-go/testscommon"
 	"github.com/multiversx/mx-chain-go/testscommon/chainParameters"
 	"github.com/multiversx/mx-chain-go/testscommon/enableEpochsHandlerMock"
-	"github.com/stretchr/testify/require"
 )
 
 var testFlag = core.EnableEpochFlag("test flag")
@@ -584,7 +585,7 @@ func TestGetMiniBlockHeaderHandlersFromExecResults(t *testing.T) {
 	t.Run("should fail if nil base execution result", func(t *testing.T) {
 		t.Parallel()
 
-		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(nil, 1)
+		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(nil)
 		require.Equal(t, common.ErrNilBaseExecutionResult, err)
 		require.Nil(t, retExecResult)
 	})
@@ -594,7 +595,7 @@ func TestGetMiniBlockHeaderHandlersFromExecResults(t *testing.T) {
 
 		execResult := &block.BaseExecutionResult{}
 
-		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(execResult, 1)
+		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(execResult)
 		require.Equal(t, common.ErrWrongTypeAssertion, err)
 		require.Nil(t, retExecResult)
 	})
@@ -623,7 +624,7 @@ func TestGetMiniBlockHeaderHandlersFromExecResults(t *testing.T) {
 			&mbh2,
 		}
 
-		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(execResult, 1)
+		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(execResult)
 		require.Nil(t, err)
 		require.Equal(t, expMiniBlockHandlers, retExecResult)
 	})
@@ -652,7 +653,7 @@ func TestGetMiniBlockHeaderHandlersFromExecResults(t *testing.T) {
 			&mbh2,
 		}
 
-		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(execResult, core.MetachainShardId)
+		retExecResult, err := common.GetMiniBlocksHeaderHandlersFromExecResult(execResult)
 		require.Nil(t, err)
 		require.Equal(t, expMiniBlockHandlers, retExecResult)
 	})

dblookupext/common.go

@@ -7,6 +7,7 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/marshal"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/process"
 	"github.com/multiversx/mx-chain-go/storage"
@@ -61,7 +62,7 @@ func getIntraMbs(cache storage.Cacher, marshaller marshal.Marshalizer, headerHas
 }
 
 func getBody(cache storage.Cacher, marshaller marshal.Marshalizer, baseExecResult data.BaseExecutionResultHandler, shardID uint32) (*block.Body, error) {
-	miniBlockHeaderHandlers, err := common.GetMiniBlocksHeaderHandlersFromExecResult(baseExecResult, shardID)
+	miniBlockHeaderHandlers, err := common.GetMiniBlocksHeaderHandlersFromExecResult(baseExecResult)
 	if err != nil {
 		return nil, err
 	}

dblookupext/esdtSupply/esdtSuppliesProcessor.go

@@ -10,9 +10,10 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/marshal"
+	logger "github.com/multiversx/mx-chain-logger-go"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/storage"
-	logger "github.com/multiversx/mx-chain-logger-go"
 )
 
 var log = logger.GetOrCreate("dblookupext/esdtSupply")
@@ -89,7 +90,7 @@ func (sp *suppliesProcessor) RevertChanges(header data.HeaderHandler, body data.
 
 func (sp *suppliesProcessor) revertChangesBasedOnExecutionResults(header data.HeaderHandler) error {
 	for _, executionResult := range header.GetExecutionResultsHandlers() {
-		mbHeaders, err := common.GetMiniBlocksHeaderHandlersFromExecResult(executionResult, header.GetShardID())
+		mbHeaders, err := common.GetMiniBlocksHeaderHandlersFromExecResult(executionResult)
 		if err != nil {
 			return err
 		}

epochStart/bootstrap/disabled/disabledEpochStartTrigger.go

@@ -22,13 +22,8 @@ func (e *epochStartTrigger) ShouldProposeEpochChange(_ uint64, _ uint64) bool {
 	return false
 }
 
-// UpdateRound -
-func (e *epochStartTrigger) UpdateRound(_ uint64) {
-
-}
-
 // SetEpochChange -
-func (e *epochStartTrigger) SetEpochChange() {}
+func (e *epochStartTrigger) SetEpochChange(_ uint64) {}
 
 // ReceivedHeader -
 func (e *epochStartTrigger) ReceivedHeader(_ data.HeaderHandler) {

epochStart/bootstrap/process.go

@@ -1357,7 +1357,7 @@ func getStartOfEpochRootHashFromExecutionResults(
 	for i := len(header.GetExecutionResultsHandlers()) - 1; i >= 0; i-- {
 		executionResult := header.GetExecutionResultsHandlers()[i]
 
-		miniBlockHeaderHandlers, err := common.GetMiniBlocksHeaderHandlersFromExecResult(executionResult, header.GetShardID())
+		miniBlockHeaderHandlers, err := common.GetMiniBlocksHeaderHandlersFromExecResult(executionResult)
 		if err != nil {
 			return nil, err
 		}

epochStart/bootstrap/shardStorageHandler.go

@@ -10,13 +10,14 @@ import (
 	"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/block"
+	logger "github.com/multiversx/mx-chain-logger-go"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/epochStart"
 	"github.com/multiversx/mx-chain-go/epochStart/bootstrap/disabled"
 	"github.com/multiversx/mx-chain-go/process/block/bootstrapStorage"
 	"github.com/multiversx/mx-chain-go/storage/factory"
-	logger "github.com/multiversx/mx-chain-logger-go"
 )
 
 type shardStorageHandler struct {
@@ -942,7 +943,7 @@ func getMetaHeaderMiniBlockHandlersFromExecutionResults(
 
 	execResultsMiniBlockHeaderHandlers := make([]data.MiniBlockHeaderHandler, 0)
 	for _, baseExecutionResult := range baseExecutionResults {
-		miniBlockHeaderHandlers, err := common.GetMiniBlocksHeaderHandlersFromExecResult(baseExecutionResult, metaBlock.GetShardID())
+		miniBlockHeaderHandlers, err := common.GetMiniBlocksHeaderHandlersFromExecResult(baseExecutionResult)
 		if err != nil {
 			log.Warn("failed to get mini blocks header handlers from execution result", "err", err)
 			return nil

epochStart/interface.go

@@ -21,8 +21,7 @@ type TriggerHandler interface {
 	Epoch() uint32
 	MetaEpoch() uint32
 	Update(round uint64, nonce uint64)
-	UpdateRound(round uint64)
-	SetEpochChange()
+	SetEpochChange(round uint64)
 	ShouldProposeEpochChange(round uint64, nonce uint64) bool
 	EpochStartRound() uint64
 	EpochStartMetaHdrHash() []byte

epochStart/metachain/trigger.go

@@ -15,13 +15,14 @@ import (
 	"github.com/multiversx/mx-chain-core-go/display"
 	"github.com/multiversx/mx-chain-core-go/hashing"
 	"github.com/multiversx/mx-chain-core-go/marshal"
+	logger "github.com/multiversx/mx-chain-logger-go"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/epochStart"
 	"github.com/multiversx/mx-chain-go/process"
 	"github.com/multiversx/mx-chain-go/storage"
-	logger "github.com/multiversx/mx-chain-logger-go"
 )
 
 var log = logger.GetOrCreate("epochStart/metachain")
@@ -54,7 +55,6 @@ type trigger struct {
 	isEpochStart                bool
 	epoch                       uint32
 	epochStartMeta              data.HeaderHandler
-	currentRound                uint64
 	epochFinalityAttestingRound uint64
 	currEpochStartRound         uint64
 	prevEpochStartRound         uint64
@@ -212,14 +212,6 @@ func (t *trigger) getMinRoundsBetweenEpochs(epoch uint32) uint64 {
 	return uint64(chainParametersForEpoch.MinRoundsBetweenEpochs)
 }
 
-// UpdateRound will set the current round
-func (t *trigger) UpdateRound(round uint64) {
-	t.mutTrigger.Lock()
-	defer t.mutTrigger.Unlock()
-
-	t.currentRound = round
-}
-
 // ShouldProposeEpochChange will return true if an epoch change event should be trigger
 func (t *trigger) ShouldProposeEpochChange(currentRound uint64, currentNonce uint64) bool {
 	t.mutTrigger.RLock()
@@ -241,33 +233,30 @@ func (t *trigger) shouldTriggerEpochStart(currentRound uint64, currentNonce uint
 func (t *trigger) Update(round uint64, nonce uint64) {
 	t.mutTrigger.Lock()
 	defer t.mutTrigger.Unlock()
-
-	t.currentRound = round
-
 	if t.isEpochStart {
 		return
 	}
 
 	if t.shouldTriggerEpochStart(round, nonce) {
-		t.setEpochChange()
+		t.setEpochChange(round)
 	}
 }
 
 // SetEpochChange will increment the epoch field and all fields related with epoch change
-func (t *trigger) SetEpochChange() {
+func (t *trigger) SetEpochChange(round uint64) {
 	t.mutTrigger.Lock()
 	defer t.mutTrigger.Unlock()
 
-	t.setEpochChange()
+	t.setEpochChange(round)
 }
 
-func (t *trigger) setEpochChange() {
+func (t *trigger) setEpochChange(round uint64) {
 	t.epoch += 1
 	t.isEpochStart = true
 	t.prevEpochStartRound = t.currEpochStartRound
-	t.currEpochStartRound = t.currentRound
+	t.currEpochStartRound = round
 
-	msg := fmt.Sprintf("EPOCH %d BEGINS IN ROUND (%d)", t.epoch, t.currentRound)
+	msg := fmt.Sprintf("EPOCH %d BEGINS IN ROUND (%d)", t.epoch, t.currEpochStartRound)
 	log.Debug(display.Headline(msg, "", "#"))
 	log.Debug("trigger.Update", "isEpochStart", t.isEpochStart)
 	logger.SetCorrelationEpoch(t.epoch)
@@ -300,7 +289,6 @@ func (t *trigger) SetProcessed(header data.HeaderHandler, body data.BodyHandler)
 	t.currEpochStartRound = metaBlock.Round
 	t.epoch = metaBlock.Epoch
 	t.isEpochStart = false
-	t.currentRound = metaBlock.Round
 	t.epochStartMeta = metaBlock
 	t.epochStartMetaHash = metaHash
 
@@ -367,10 +355,6 @@ func (t *trigger) RevertStateToBlock(header data.HeaderHandler) error {
 		return err
 	}
 
-	t.mutTrigger.Lock()
-	t.currentRound = header.GetRound()
-	t.mutTrigger.Unlock()
-
 	return nil
 }
 
@@ -500,7 +484,6 @@ func (t *trigger) SetEpochStartMetaHdrHash(metaHdrHash []byte) {
 func (t *trigger) SetCurrentEpochStartRound(round uint64) {
 	t.mutTrigger.Lock()
 	t.currEpochStartRound = round
-	t.currentRound = round
 	t.saveCurrentState(round)
 	t.mutTrigger.Unlock()
 }

epochStart/metachain/triggerRegistry.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/marshal"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/epochStart"
 )
@@ -26,7 +27,6 @@ func (t *trigger) LoadState(key []byte) error {
 
 	t.mutTrigger.Lock()
 	t.triggerStateKey = key
-	t.currentRound = state.CurrentRound
 	t.epochFinalityAttestingRound = state.EpochFinalityAttestingRound
 	t.currEpochStartRound = state.CurrEpochStartRound
 	t.prevEpochStartRound = state.PrevEpochStartRound
@@ -64,7 +64,6 @@ func (t *trigger) saveState(key []byte) error {
 		return epochStart.ErrWrongTypeAssertion
 	}
 	registry := &block.MetaTriggerRegistry{}
-	registry.CurrentRound = t.currentRound
 	registry.EpochFinalityAttestingRound = t.epochFinalityAttestingRound
 	registry.CurrEpochStartRound = t.currEpochStartRound
 	registry.PrevEpochStartRound = t.prevEpochStartRound

epochStart/metachain/triggerRegistry_test.go

@@ -6,20 +6,20 @@ import (
 
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/stretchr/testify/require"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/storage"
 	"github.com/multiversx/mx-chain-go/testscommon/genericMocks"
 	storageStubs "github.com/multiversx/mx-chain-go/testscommon/storage"
-	"github.com/stretchr/testify/require"
 )
 
 func cloneTrigger(t *trigger) *trigger {
 	rt := &trigger{}
 
 	rt.isEpochStart = t.isEpochStart
 	rt.epoch = t.epoch
-	rt.currentRound = t.currentRound
 	rt.epochFinalityAttestingRound = t.epochFinalityAttestingRound
 	rt.currEpochStartRound = t.currEpochStartRound
 	rt.prevEpochStartRound = t.prevEpochStartRound
@@ -59,7 +59,6 @@ func TestTrigger_LoadStateAfterSave(t *testing.T) {
 	key := []byte("key")
 	epochStartTrigger1.triggerStateKey = key
 	epochStartTrigger1.epoch = 6
-	epochStartTrigger1.currentRound = 1000
 	epochStartTrigger1.epochFinalityAttestingRound = 998
 	epochStartTrigger1.currEpochStartRound = 800
 	epochStartTrigger1.prevEpochStartRound = 650
@@ -92,7 +91,6 @@ func TestTrigger_LoadStateBackwardsCompatibility(t *testing.T) {
 	key := []byte("key")
 	epochStartTrigger1.triggerStateKey = key
 	epochStartTrigger1.epoch = 6
-	epochStartTrigger1.currentRound = 1000
 	epochStartTrigger1.epochFinalityAttestingRound = 998
 	epochStartTrigger1.currEpochStartRound = 800
 	epochStartTrigger1.prevEpochStartRound = 650
@@ -124,7 +122,6 @@ func createLegacyTriggerRegistryFromTrigger(t *trigger) *legacyTriggerRegistry {
 	metaBlock, _ := t.epochStartMeta.(*block.MetaBlock)
 	return &legacyTriggerRegistry{
 		Epoch:                       t.epoch,
-		CurrentRound:                t.currentRound,
 		EpochFinalityAttestingRound: t.epochFinalityAttestingRound,
 		CurrEpochStartRound:         t.currEpochStartRound,
 		PrevEpochStartRound:         t.prevEpochStartRound,

epochStart/metachain/trigger_test.go

@@ -11,6 +11,9 @@ import (
 	"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/block"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/epochStart"
@@ -23,8 +26,6 @@ import (
 	statusHandlerMock "github.com/multiversx/mx-chain-go/testscommon/statusHandler"
 	storageStubs "github.com/multiversx/mx-chain-go/testscommon/storage"
 	vic "github.com/multiversx/mx-chain-go/testscommon/validatorInfoCacher"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func createMockEpochStartTriggerArguments() *ArgsNewMetaEpochStartTrigger {
@@ -168,18 +169,13 @@ func TestNewEpochStartTrigger_UpdateRoundAndSetEpochChange(t *testing.T) {
 	require.Nil(t, err)
 
 	epoch := uint32(0)
-	round := uint64(0)
+	round := uint64(2)
 	nonce := uint64(100)
-	epochStartTrigger.UpdateRound(round)
-	round++
-	epochStartTrigger.UpdateRound(round)
-	round++
-	epochStartTrigger.UpdateRound(round)
 
 	shouldProposeEpochChange := epochStartTrigger.ShouldProposeEpochChange(round, nonce)
 	require.True(t, shouldProposeEpochChange)
 
-	epochStartTrigger.SetEpochChange()
+	epochStartTrigger.SetEpochChange(round)
 	currentEpoch := epochStartTrigger.Epoch()
 	require.Equal(t, epoch+1, currentEpoch)
 	require.True(t, epochStartTrigger.IsEpochStart())
@@ -228,7 +224,6 @@ func TestTrigger_ForceEpochStartCloseToNormalEpochStartShouldNotForce(t *testing
 
 	arguments := createMockEpochStartTriggerArguments()
 	epochStartTrigger, _ := NewEpochStartTrigger(arguments)
-	epochStartTrigger.currentRound = 20
 
 	epochStartTrigger.ForceEpochStart(201)
 	assert.Equal(t, uint64(math.MaxUint64), epochStartTrigger.nextEpochStartRound)
@@ -247,7 +242,6 @@ func TestTrigger_ForceEpochStartUnderMinimumBetweenEpochs(t *testing.T) {
 		},
 	}
 	epochStartTrigger, _ := NewEpochStartTrigger(arguments)
-	epochStartTrigger.currentRound = 1
 
 	epochStartTrigger.ForceEpochStart(10)
 	assert.Equal(t, uint64(20), epochStartTrigger.nextEpochStartRound)
@@ -271,8 +265,6 @@ func TestTrigger_ForceEpochStartShouldOk(t *testing.T) {
 	epochStartTrigger, err := NewEpochStartTrigger(arguments)
 	require.Nil(t, err)
 
-	epochStartTrigger.currentRound = 50
-
 	expectedRound := uint64(60)
 	epochStartTrigger.ForceEpochStart(60)