Merge pull request #1988 from ElrondNetwork/prune-state-behind-final-bug

Prune state only behind finalized
multiversx · Jun 24, 2020 · 770d618 · 770d618
2 parents f319f74 + 86e5e23
commit 770d618
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/integrationTests/testProcessorNode.go b/integrationTests/testProcessorNode.go
@@ -1111,7 +1111,7 @@ func (tpn *TestProcessorNode) initBlockProcessor(stateCheckpointModulus uint) {
 			return nil
 		},
 		GetHighestFinalBlockNonceCalled: func() uint64 {
-			return 0
+			return 100
 		},
 		ProbableHighestNonceCalled: func() uint64 {
 			return 0

diff --git a/process/block/shardblock.go b/process/block/shardblock.go
@@ -943,6 +943,10 @@ func (sp *shardProcessor) updateState(headers []data.HeaderHandler, currentHeade
 	sp.snapShotEpochStartFromMeta(currentHeader)
 
 	for _, hdr := range headers {
+		if sp.forkDetector.GetHighestFinalBlockNonce() < hdr.GetNonce() {
+			break
+		}
+
 		prevHeader, errNotCritical := process.GetShardHeaderFromStorage(hdr.GetPrevHash(), sp.marshalizer, sp.store)
 		if errNotCritical != nil {
 			log.Debug("could not get shard header from storage")