[DO NOT MERGE] Test fast epochs feat/supernova async exec

cmd/node/config/config.toml

@@ -43,9 +43,9 @@
 
     # ChainParametersByEpoch defines chain operation configurable values that can be modified based on epochs
     ChainParametersByEpoch = [
-        { EnableEpoch = 0, RoundDuration = 6000, RoundsPerEpoch = 200, MinRoundsBetweenEpochs = 20, ShardConsensusGroupSize = 7, ShardMinNumNodes = 10, MetachainConsensusGroupSize = 10, MetachainMinNumNodes = 10, Hysteresis = 0.2, Adaptivity = false, Offset = 0 },
-        { EnableEpoch = 1, RoundDuration = 6000, RoundsPerEpoch = 200, MinRoundsBetweenEpochs = 20, ShardConsensusGroupSize = 10, ShardMinNumNodes = 10, MetachainConsensusGroupSize = 10, MetachainMinNumNodes = 10, Hysteresis = 0.2, Adaptivity = false, Offset = 0 },
-        { EnableEpoch = 2, RoundDuration = 600, RoundsPerEpoch = 2000, MinRoundsBetweenEpochs = 50, ShardConsensusGroupSize = 10, ShardMinNumNodes = 10, MetachainConsensusGroupSize = 10, MetachainMinNumNodes = 10, Hysteresis = 0.2, Adaptivity = false, Offset = 2 }
+        { EnableEpoch = 0, RoundDuration = 6000, RoundsPerEpoch = 100, MinRoundsBetweenEpochs = 20, ShardConsensusGroupSize = 7, ShardMinNumNodes = 10, MetachainConsensusGroupSize = 10, MetachainMinNumNodes = 10, Hysteresis = 0.2, Adaptivity = false, Offset = 0 },
+        { EnableEpoch = 1, RoundDuration = 6000, RoundsPerEpoch = 100, MinRoundsBetweenEpochs = 20, ShardConsensusGroupSize = 10, ShardMinNumNodes = 10, MetachainConsensusGroupSize = 10, MetachainMinNumNodes = 10, Hysteresis = 0.2, Adaptivity = false, Offset = 0 },
+        { EnableEpoch = 2, RoundDuration = 600, RoundsPerEpoch = 1000, MinRoundsBetweenEpochs = 50, ShardConsensusGroupSize = 10, ShardMinNumNodes = 10, MetachainConsensusGroupSize = 10, MetachainMinNumNodes = 10, Hysteresis = 0.2, Adaptivity = false, Offset = 2 }
     ]
 
     # EpochChangeGracePeriodEnableEpoch represents the configuration of different grace periods for epoch change with their activation epochs
@@ -81,7 +81,7 @@
             NumHeadersToRequestInAdvance = 10
         },
         {
-            EnableRound = 440,
+            EnableRound = 260,
             MaxRoundsWithoutNewBlockReceived = 100,
             MaxRoundsWithoutCommittedBlock = 100,
             RoundModulusTriggerWhenSyncIsStuck = 200,
@@ -102,7 +102,7 @@
 
     EpochStartConfigsByRound = [
         { EnableRound = 0, MaxRoundsWithoutCommittedStartInEpochBlock = 50 },
-        { EnableRound = 440, MaxRoundsWithoutCommittedStartInEpochBlock = 500 },
+        { EnableRound = 260, MaxRoundsWithoutCommittedStartInEpochBlock = 500 },
     ]
 
     ConsensusConfigsByEpoch = [
@@ -121,7 +121,7 @@
         { StartEpoch = 1, StartRound = 0, Version = "2" },
 
         # TODO The value of StartEpoch parameter for version 3 should be the same with the SupernovaEnableEpoch flag from enableEpoch.toml file and StartRound the same with the SupernovaEnableRound flag from enableRounds.toml
-        { StartEpoch = 2, StartRound = 440, Version = "3" },
+        { StartEpoch = 2, StartRound = 260, Version = "3" },
     ]
 
 [StoragePruning]
@@ -714,7 +714,7 @@
             MaxDeviationTimeInMilliseconds = 25
 
     [[Antiflood.ConfigsByRound]]
-        Round = 440
+        Round = 260
         NumConcurrentResolverJobs = 50 # TODO: analyse for meta on bootstrap there was a constant used with value 10
         NumConcurrentResolvingTrieNodesJobs = 3
 

cmd/node/config/enableRounds.toml

@@ -14,4 +14,4 @@
 
     [RoundActivations.SupernovaEnableRound]
         Options = []
-        Round = "440"
+        Round = "260"

epochStart/bootstrap/disabled/disabledAccountsAdapter.go

@@ -3,9 +3,10 @@ package disabled
 import (
 	"context"
 
+	vmcommon "github.com/multiversx/mx-chain-vm-common-go"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/state"
-	vmcommon "github.com/multiversx/mx-chain-vm-common-go"
 )
 
 type accountsAdapter struct {
@@ -99,6 +100,10 @@ func (a *accountsAdapter) RecreateTrieIfNeeded(_ common.RootHashHolder) error {
 func (a *accountsAdapter) CancelPrune(_ []byte, _ state.TriePruningIdentifier) {
 }
 
+// ResetPruning -
+func (a *accountsAdapter) ResetPruning() {
+}
+
 // SnapshotState -
 func (a *accountsAdapter) SnapshotState(_ []byte, _ uint32) {
 }
@@ -142,6 +147,11 @@ func (a *accountsAdapter) Close() error {
 	return nil
 }
 
+// GetEvictionWaitingListSize returns 0 for the disabled accounts adapter
+func (a *accountsAdapter) GetEvictionWaitingListSize() int {
+	return 0
+}
+
 // IsInterfaceNil -
 func (a *accountsAdapter) IsInterfaceNil() bool {
 	return a == nil

integrationTests/mock/blockProcessorMock.go

@@ -43,6 +43,7 @@ type BlockProcessorMock struct {
 	) error
 	OnExecutedBlockCalled                           func(header data.HeaderHandler, rootHash []byte) error
 	ProposedDirectSentTransactionsToBroadcastCalled func(proposedBody data.BodyHandler) map[string][][]byte
+	PruneTrieAsyncHeaderCalled                      func()
 }
 
 // ProcessBlock mocks processing a block
@@ -231,6 +232,13 @@ func (bpm *BlockProcessorMock) RemoveHeaderFromPool(headerHash []byte) {
 	}
 }
 
+// PruneTrieAsyncHeader -
+func (bpm *BlockProcessorMock) PruneTrieAsyncHeader() {
+	if bpm.PruneTrieAsyncHeaderCalled != nil {
+		bpm.PruneTrieAsyncHeaderCalled()
+	}
+}
+
 // VerifyBlockProposal -
 func (bpm *BlockProcessorMock) VerifyBlockProposal(
 	headerHandler data.HeaderHandler,

process/asyncExecution/executionManager/executionManager.go

@@ -12,6 +12,7 @@ import (
 	"github.com/multiversx/mx-chain-go/process"
 	"github.com/multiversx/mx-chain-go/process/asyncExecution/cache"
 	"github.com/multiversx/mx-chain-go/process/asyncExecution/disabled"
+	"github.com/multiversx/mx-chain-go/process/asyncExecution/executionTrack"
 	"github.com/multiversx/mx-chain-go/sharding"
 	"github.com/multiversx/mx-chain-go/storage"
 )
@@ -228,6 +229,11 @@ func (em *executionManager) RemovePendingExecutionResultsFromNonce(nonce uint64)
 	return em.executionResultsTracker.RemoveFromNonce(nonce)
 }
 
+// PopDismissedResults returns all batches of dismissed execution results and clears the internal queue
+func (em *executionManager) PopDismissedResults() []executionTrack.DismissedBatch {
+	return em.executionResultsTracker.PopDismissedResults()
+}
+
 // ResetAndResumeExecution resets the managed components to the last notarized result and resumes execution
 func (em *executionManager) ResetAndResumeExecution(lastNotarizedResult data.BaseExecutionResultHandler) error {
 	if check.IfNil(lastNotarizedResult) {

process/asyncExecution/executionTrack/executionResultsTracker.go

@@ -14,13 +14,24 @@ import (
 
 var log = logger.GetOrCreate("process/asyncExecution/executionTrack")
 
+const maxDismissedBatches = 100
+
+// DismissedBatch holds a group of dismissed execution results alongside the anchor
+// result that preceded them. The anchor's root hash is the "previous root hash"
+// for the first dismissed result's EWL OldRoot entry.
+type DismissedBatch struct {
+	AnchorResult data.BaseExecutionResultHandler
+	Results      []data.BaseExecutionResultHandler
+}
+
 type executionResultsTracker struct {
 	lastNotarizedResult      data.BaseExecutionResultHandler
 	mutex                    sync.RWMutex
 	executionResultsByHash   map[string]data.BaseExecutionResultHandler
 	nonceHash                *nonceHash
 	lastExecutedResultHash   []byte
 	consensusCommittedHashes map[uint64][]byte // tracks which hash was committed by consensus for each nonce
+	dismissedBatches         []DismissedBatch
 }
 
 // NewExecutionResultsTracker will create a new instance of *executionResultsTracker
@@ -211,6 +222,18 @@ func (ert *executionResultsTracker) cleanConfirmedExecutionResults(headerExecuti
 		if !areEqual {
 			ert.lastExecutedResultHash = lastMatchingHash
 
+			// Compute anchor for dismissed batch
+			var anchor data.BaseExecutionResultHandler
+			if idx > 0 {
+				anchor = pendingExecutionResult[idx-1]
+			} else {
+				anchor = ert.lastNotarizedResult
+			}
+			ert.addDismissedBatch(DismissedBatch{
+				AnchorResult: anchor,
+				Results:      pendingExecutionResult[idx:],
+			})
+
 			// different execution result should clean everything starting from this execution result and return CleanResultMismatch
 			ert.cleanExecutionResults(pendingExecutionResult[idx:])
 
@@ -314,6 +337,14 @@ func (ert *executionResultsTracker) Clean(lastNotarizedResult data.BaseExecution
 	ert.mutex.Lock()
 	defer ert.mutex.Unlock()
 
+	pending, _ := ert.getPendingExecutionResults()
+	if len(pending) > 0 {
+		ert.addDismissedBatch(DismissedBatch{
+			AnchorResult: ert.lastNotarizedResult,
+			Results:      pending,
+		})
+	}
+
 	ert.executionResultsByHash = make(map[string]data.BaseExecutionResultHandler)
 	ert.nonceHash = newNonceHash()
 
@@ -342,6 +373,21 @@ func (ert *executionResultsTracker) removePendingFromNonceUnprotected(nonce uint
 		return nil
 	}
 
+	// Compute anchor: last pending result before the dismissal point
+	var anchor data.BaseExecutionResultHandler
+	for _, result := range pendingExecutionResult {
+		if result.GetHeaderNonce() < nonce {
+			anchor = result
+		}
+	}
+	if anchor == nil {
+		anchor = ert.lastNotarizedResult
+	}
+	ert.addDismissedBatch(DismissedBatch{
+		AnchorResult: anchor,
+		Results:      resultsToRemove,
+	})
+
 	// Remove from executionResultsByHash and nonceHash, but preserve consensusCommittedHashes
 	// to continue blocking stale results from being added for these nonces
 	ert.removeExecutionResultsFromMaps(resultsToRemove)
@@ -364,6 +410,26 @@ func (ert *executionResultsTracker) removePendingFromNonceUnprotected(nonce uint
 	return nil
 }
 
+func (ert *executionResultsTracker) addDismissedBatch(batch DismissedBatch) {
+	if len(ert.dismissedBatches) >= maxDismissedBatches {
+		log.Warn("dismissed batches queue is full, dropping oldest batch",
+			"maxDismissedBatches", maxDismissedBatches,
+			"droppedResults", len(ert.dismissedBatches[0].Results),
+		)
+		ert.dismissedBatches = ert.dismissedBatches[1:]
+	}
+	ert.dismissedBatches = append(ert.dismissedBatches, batch)
+}
+
+// PopDismissedResults returns all batches of dismissed execution results and clears the internal queue
+func (ert *executionResultsTracker) PopDismissedResults() []DismissedBatch {
+	ert.mutex.Lock()
+	defer ert.mutex.Unlock()
+	batches := ert.dismissedBatches
+	ert.dismissedBatches = nil
+	return batches
+}
+
 // IsInterfaceNil returns true if there is no value under the interface
 func (ert *executionResultsTracker) IsInterfaceNil() bool {
 	return ert == nil