allow deferred revert current block to work

factory/consensus/consensusComponents_test.go

@@ -9,9 +9,10 @@ import (
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/data"
 	crypto "github.com/multiversx/mx-chain-crypto-go"
-	"github.com/multiversx/mx-chain-go/testscommon/processMocks"
 	"github.com/stretchr/testify/require"
 
+	"github.com/multiversx/mx-chain-go/testscommon/processMocks"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/consensus"
 	retriever "github.com/multiversx/mx-chain-go/dataRetriever"
@@ -118,7 +119,7 @@ func createMockConsensusComponentsFactoryArgs() consensusComp.ConsensusComponent
 				},
 			},
 			MbProvider: &testsMocks.MiniBlocksProviderStub{},
-			Store:      &genericMocks.ChainStorerMock{},
+			Store:      genericMocks.NewChainStorerMock(0),
 		},
 		ProcessComponents: &testsMocks.ProcessComponentsStub{
 			EpochTrigger:                  &testsMocks.EpochStartTriggerStub{},

integrationTests/chainSimulator/staking/stakingProvider/delegation_test.go

@@ -316,7 +316,7 @@ func testChainSimulatorMakeNewContractFromValidatorData(t *testing.T, cs chainSi
 	delegator2, err := cs.GenerateAndMintWalletAddress(core.AllShardId, mintValue)
 	require.Nil(t, err)
 
-	err = cs.GenerateBlocks(1)
+	err = cs.GenerateBlocks(2)
 	require.Nil(t, err)
 
 	log.Info("working with the following addresses",

node/chainSimulator/chainSimulator.go

@@ -21,6 +21,8 @@ import (
 	crypto "github.com/multiversx/mx-chain-crypto-go"
 	"github.com/multiversx/mx-chain-crypto-go/signing"
 	"github.com/multiversx/mx-chain-crypto-go/signing/mcl"
+	logger "github.com/multiversx/mx-chain-logger-go"
+
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/factory"
 	"github.com/multiversx/mx-chain-go/node/chainSimulator/components"
@@ -29,7 +31,6 @@ import (
 	"github.com/multiversx/mx-chain-go/node/chainSimulator/dtos"
 	chainSimulatorErrors "github.com/multiversx/mx-chain-go/node/chainSimulator/errors"
 	"github.com/multiversx/mx-chain-go/node/chainSimulator/process"
-	logger "github.com/multiversx/mx-chain-logger-go"
 )
 
 const delaySendTxs = time.Millisecond

process/block/metablockProposal.go

@@ -355,8 +355,11 @@ func (mp *metaProcessor) ProcessBlockProposal(
 		return nil, err
 	}
 
+	var execResult data.BaseExecutionResultHandler
 	if header.IsEpochChangeProposed() {
-		return mp.processEpochStartProposeBlock(header, body)
+		// in case of error, will be picked up by the deferred revert
+		execResult, err = mp.processEpochStartProposeBlock(header, body)
+		return execResult, err
 	}
 
 	mp.txCoordinator.RequestBlockTransactions(body)
@@ -398,12 +401,20 @@ func (mp *metaProcessor) ProcessBlockProposal(
 		return nil, err
 	}
 
-	valStatRootHash, err := mp.updateValidatorStatistics(header)
+	var valStatRootHash []byte
+	valStatRootHash, err = mp.updateValidatorStatistics(header)
 	if err != nil {
 		return nil, err
 	}
 
-	err = mp.commitState(headerHandler)
+	var headerHash []byte
+	headerHash, err = core.CalculateHash(mp.marshalizer, mp.hasher, header)
+	if err != nil {
+		return nil, err
+	}
+
+	// in case of error, will be picked up by the deferred revert
+	execResult, err = mp.collectExecutionResults(headerHash, header, body, valStatRootHash)
 	if err != nil {
 		return nil, err
 	}
@@ -413,12 +424,12 @@ func (mp *metaProcessor) ProcessBlockProposal(
 		return nil, err
 	}
 
-	headerHash, err := core.CalculateHash(mp.marshalizer, mp.hasher, header)
+	err = mp.commitState(headerHandler)
 	if err != nil {
 		return nil, err
 	}
 
-	return mp.collectExecutionResults(headerHash, header, body, valStatRootHash)
+	return execResult, nil
 }
 
 func (mp *metaProcessor) processEpochStartProposeBlock(
@@ -447,7 +458,8 @@ func (mp *metaProcessor) processEpochStartProposeBlock(
 		return nil, err
 	}
 
-	computedEconomics, err := mp.getComputedEconomics(metaHeader.GetEpoch() + 1)
+	var computedEconomics *block.Economics
+	computedEconomics, err = mp.getComputedEconomics(metaHeader.GetEpoch() + 1)
 	if err != nil {
 		return nil, err
 	}
@@ -462,7 +474,12 @@ func (mp *metaProcessor) processEpochStartProposeBlock(
 		return nil, err
 	}
 
-	err = mp.commitState(metaHeader)
+	headerHash, err := core.CalculateHash(mp.marshalizer, mp.hasher, metaHeader)
+	if err != nil {
+		return nil, err
+	}
+
+	execResult, err := mp.collectExecutionResultsEpochStartProposal(headerHash, metaHeader, constructedBody, valStatRootHash)
 	if err != nil {
 		return nil, err
 	}
@@ -472,12 +489,12 @@ func (mp *metaProcessor) processEpochStartProposeBlock(
 		return nil, err
 	}
 
-	headerHash, err := core.CalculateHash(mp.marshalizer, mp.hasher, metaHeader)
+	err = mp.commitState(metaHeader)
 	if err != nil {
 		return nil, err
 	}
 
-	return mp.collectExecutionResultsEpochStartProposal(headerHash, metaHeader, constructedBody, valStatRootHash)
+	return execResult, nil
 }
 
 func (mp *metaProcessor) updateValidatorStatistics(header data.MetaHeaderHandler) ([]byte, error) {

process/block/metablockProposal_test.go

@@ -3222,6 +3222,15 @@ func TestMetaProcessor_processIfFirstBlockAfterEpochStartBlockV3(t *testing.T) {
 func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 	t.Parallel()
 
+	defaultMetaBlockV3 := block.MetaBlockV3{
+		LastExecutionResult: &block.MetaExecutionResultInfo{
+			ExecutionResult: &block.BaseMetaExecutionResult{
+				AccumulatedFeesInEpoch: big.NewInt(0),
+				DevFeesInEpoch:         big.NewInt(0),
+			},
+		},
+	}
+
 	t.Run("should return ErrNilBlockHeader because of nil metaHeader argument", func(t *testing.T) {
 		t.Parallel()
 
@@ -3244,7 +3253,7 @@ func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 		mp, err := blproc.NewMetaProcessor(arguments)
 		require.Nil(t, err)
 
-		_, err = mp.ProcessEpochStartProposeBlock(&block.MetaBlockV3{}, nil)
+		_, err = mp.ProcessEpochStartProposeBlock(&defaultMetaBlockV3, nil)
 		require.Equal(t, process.ErrNilBlockBody, err)
 	})
 
@@ -3257,7 +3266,7 @@ func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 		mp, err := blproc.NewMetaProcessor(arguments)
 		require.Nil(t, err)
 
-		_, err = mp.ProcessEpochStartProposeBlock(&block.MetaBlockV3{}, &block.Body{
+		_, err = mp.ProcessEpochStartProposeBlock(&defaultMetaBlockV3, &block.Body{
 			MiniBlocks: []*block.MiniBlock{
 				{},
 			},
@@ -3282,7 +3291,7 @@ func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 		})
 		require.Nil(t, err)
 
-		_, err = mp.ProcessEpochStartProposeBlock(&block.MetaBlockV3{}, &block.Body{})
+		_, err = mp.ProcessEpochStartProposeBlock(&defaultMetaBlockV3, &block.Body{})
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -3307,7 +3316,7 @@ func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 		require.Nil(t, err)
 
 		mp.SetEpochStartData(&blproc.EpochStartDataWrapper{})
-		_, err = mp.ProcessEpochStartProposeBlock(&block.MetaBlockV3{}, &block.Body{})
+		_, err = mp.ProcessEpochStartProposeBlock(&defaultMetaBlockV3, &block.Body{})
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -3342,7 +3351,7 @@ func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 
 		mp.SetEpochStartData(&blproc.EpochStartDataWrapper{})
 
-		_, err = mp.ProcessEpochStartProposeBlock(&block.MetaBlockV3{}, &block.Body{})
+		_, err = mp.ProcessEpochStartProposeBlock(&defaultMetaBlockV3, &block.Body{})
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -3381,7 +3390,7 @@ func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 
 		mp.SetEpochStartData(&blproc.EpochStartDataWrapper{})
 
-		_, err = mp.ProcessEpochStartProposeBlock(&block.MetaBlockV3{}, &block.Body{})
+		_, err = mp.ProcessEpochStartProposeBlock(&defaultMetaBlockV3, &block.Body{})
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -3416,7 +3425,7 @@ func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 
 		mp.SetEpochStartData(&blproc.EpochStartDataWrapper{})
 
-		_, err = mp.ProcessEpochStartProposeBlock(&block.MetaBlockV3{}, &block.Body{})
+		_, err = mp.ProcessEpochStartProposeBlock(&defaultMetaBlockV3, &block.Body{})
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -3452,7 +3461,7 @@ func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 
 		mp.SetEpochStartData(&blproc.EpochStartDataWrapper{})
 
-		_, err = mp.ProcessEpochStartProposeBlock(&block.MetaBlockV3{}, &block.Body{})
+		_, err = mp.ProcessEpochStartProposeBlock(&defaultMetaBlockV3, &block.Body{})
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -3486,21 +3495,23 @@ func TestMetaProcessor_processEpochStartProposeBlock(t *testing.T) {
 			},
 		})
 
-		_, err = mp.ProcessEpochStartProposeBlock(&block.MetaBlockV3{
-			LastExecutionResult: &block.MetaExecutionResultInfo{
-				ExecutionResult: &block.BaseMetaExecutionResult{
-					AccumulatedFeesInEpoch: big.NewInt(0),
-					DevFeesInEpoch:         big.NewInt(0),
-				},
-			},
-		}, &block.Body{})
+		_, err = mp.ProcessEpochStartProposeBlock(&defaultMetaBlockV3, &block.Body{})
 		require.Nil(t, err)
 	})
 }
 
 func TestMetaProcessor_processEconomicsDataForEpochStartProposeBlock(t *testing.T) {
 	t.Parallel()
 
+	defaultMetaBlockV3 := block.MetaBlockV3{
+		LastExecutionResult: &block.MetaExecutionResultInfo{
+			ExecutionResult: &block.BaseMetaExecutionResult{
+				AccumulatedFeesInEpoch: big.NewInt(0),
+				DevFeesInEpoch:         big.NewInt(0),
+			},
+		},
+	}
+
 	t.Run("should return ErrNilBaseExecutionResult error on nil last execution result", func(t *testing.T) {
 		t.Parallel()
 
@@ -3513,7 +3524,7 @@ func TestMetaProcessor_processEconomicsDataForEpochStartProposeBlock(t *testing.
 		})
 		require.Nil(t, err)
 
-		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&block.MetaBlockV3{})
+		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&defaultMetaBlockV3)
 		require.ErrorContains(t, err, process.ErrNilBaseExecutionResult.Error())
 	})
 
@@ -3529,7 +3540,7 @@ func TestMetaProcessor_processEconomicsDataForEpochStartProposeBlock(t *testing.
 		})
 		require.Nil(t, err)
 
-		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&block.MetaBlockV3{})
+		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&defaultMetaBlockV3)
 		require.Equal(t, common.ErrWrongTypeAssertion, err)
 	})
 
@@ -3550,7 +3561,7 @@ func TestMetaProcessor_processEconomicsDataForEpochStartProposeBlock(t *testing.
 		})
 		require.Nil(t, err)
 
-		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&block.MetaBlockV3{})
+		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&defaultMetaBlockV3)
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -3578,7 +3589,7 @@ func TestMetaProcessor_processEconomicsDataForEpochStartProposeBlock(t *testing.
 		})
 		require.Nil(t, err)
 
-		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&block.MetaBlockV3{})
+		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&defaultMetaBlockV3)
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -3607,7 +3618,7 @@ func TestMetaProcessor_processEconomicsDataForEpochStartProposeBlock(t *testing.
 		require.Nil(t, err)
 
 		mp.SetEpochStartData(&blproc.EpochStartDataWrapper{})
-		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&block.MetaBlockV3{})
+		err = mp.ProcessEconomicsDataForEpochStartProposeBlock(&defaultMetaBlockV3)
 		require.Nil(t, err)
 	})
 }
@@ -3854,6 +3865,14 @@ func TestMetaProcessor_collectExecutionResultsEpochStartProposal(t *testing.T) {
 func TestMetaProcessor_ProcessBlockProposal(t *testing.T) {
 	t.Parallel()
 
+	defaultMetaBlockV3 := block.MetaBlockV3{
+		LastExecutionResult: &block.MetaExecutionResultInfo{
+			ExecutionResult: &block.BaseMetaExecutionResult{
+				AccumulatedFeesInEpoch: big.NewInt(0),
+				DevFeesInEpoch:         big.NewInt(0),
+			},
+		},
+	}
 	t.Run("should return ErrNilBlockHeader because of nil argument", func(t *testing.T) {
 		t.Parallel()
 
@@ -4291,7 +4310,7 @@ func TestMetaProcessor_ProcessBlockProposal(t *testing.T) {
 				return &block.MetaExecutionResult{}
 			},
 			GetLastExecutedBlockHeaderCalled: func() data.HeaderHandler {
-				return &block.MetaBlockV3{}
+				return &defaultMetaBlockV3
 			},
 		}
 
@@ -4317,9 +4336,9 @@ func TestMetaProcessor_ProcessBlockProposal(t *testing.T) {
 		mp, err := blproc.NewMetaProcessor(arguments)
 		require.Nil(t, err)
 
-		_, err = mp.ProcessBlockProposal(&block.MetaBlockV3{
-			Nonce: 1,
-		}, &block.Body{})
+		newBlock := defaultMetaBlockV3
+		newBlock.Nonce = 1
+		_, err = mp.ProcessBlockProposal(&newBlock, &block.Body{})
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -4332,7 +4351,7 @@ func TestMetaProcessor_ProcessBlockProposal(t *testing.T) {
 				return &block.MetaExecutionResult{}
 			},
 			GetLastExecutedBlockHeaderCalled: func() data.HeaderHandler {
-				return &block.MetaBlockV3{}
+				return &defaultMetaBlockV3
 			},
 		}
 
@@ -4345,9 +4364,9 @@ func TestMetaProcessor_ProcessBlockProposal(t *testing.T) {
 		mp, err := blproc.NewMetaProcessor(arguments)
 		require.Nil(t, err)
 
-		_, err = mp.ProcessBlockProposal(&block.MetaBlockV3{
-			Nonce: 1,
-		}, &block.Body{})
+		newBlock := defaultMetaBlockV3
+		newBlock.Nonce = 1
+		_, err = mp.ProcessBlockProposal(&newBlock, &block.Body{})
 		require.Equal(t, expectedErr, err)
 	})
 

process/block/shardblockProposal.go

@@ -369,18 +369,20 @@ func (sp *shardProcessor) ProcessBlockProposal(
 		return nil, err
 	}
 
-	errCutoff := sp.blockProcessingCutoffHandler.HandleProcessErrorCutoff(header)
-	if errCutoff != nil {
-		return nil, errCutoff
+	// TODO: should receive the header hash instead of re-computing it
+	var headerHash []byte
+	headerHash, err = core.CalculateHash(sp.marshalizer, sp.hasher, header)
+	if err != nil {
+		return nil, err
 	}
 
-	// TODO: should receive the header hash instead of re-computing it
-	headerHash, err := core.CalculateHash(sp.marshalizer, sp.hasher, header)
+	var executionResult data.BaseExecutionResultHandler
+	executionResult, err = sp.collectExecutionResults(headerHash, header, body)
 	if err != nil {
 		return nil, err
 	}
 
-	executionResult, err := sp.collectExecutionResults(headerHash, header, body)
+	err = sp.blockProcessingCutoffHandler.HandleProcessErrorCutoff(header)
 	if err != nil {
 		return nil, err
 	}