Merge pull request #7911 from multiversx/fix-pruning-delay-on-restart

fix a possible underflow on getPruningHandler

Author: BeniaminDrasovean

process/block/baseProcess.go

@@ -2449,7 +2449,7 @@ func (bp *baseProcessor) PruneStateOnRollback(currHeader data.HeaderHandler, cur
 }
 
 func (bp *baseProcessor) getPruningHandler(finalHeaderNonce uint64) state.PruningHandler {
-	if finalHeaderNonce-bp.lastRestartNonce <= uint64(bp.pruningDelay) {
+	if finalHeaderNonce < bp.lastRestartNonce || finalHeaderNonce-bp.lastRestartNonce <= uint64(bp.pruningDelay) {
 		log.Debug("will skip pruning",
 			"finalHeaderNonce", finalHeaderNonce,
 			"last restart nonce", bp.lastRestartNonce,

process/block/baseProcess_test.go

@@ -3810,6 +3810,10 @@ func TestBaseProcessor_getPruningHandler(t *testing.T) {
 	ph = bp.GetPruningHandler(14)
 	assert.True(t, ph.IsPruningEnabled())
 
+	bp.SetLastRestartNonce(15)
+	ph = bp.GetPruningHandler(14)
+	assert.False(t, ph.IsPruningEnabled())
+
 	bp.SetClosingNodeStarted(true)
 	ph = bp.GetPruningHandler(14)
 	assert.False(t, ph.IsPruningEnabled())