Merge pull request #7787 from multiversx/fix-last-executed-on-reverts

fix: synchronize last executed block header with current block header…

Author: AdoAdoAdo

process/sync/baseSync.go

@@ -2025,6 +2025,11 @@ func (boot *baseBootstrap) restoreState(
 
 	boot.chainHandler.SetCurrentBlockHeaderHash(currHeaderHash)
 
+	// for legacy (non-V3) headers, keep last executed block header in sync with current block header
+	if check.IfNil(currHeader) || !currHeader.IsHeaderV3() {
+		boot.chainHandler.SetLastExecutedBlockHeaderAndRootHash(currHeader, currHeaderHash, currRootHash)
+	}
+
 	err = boot.scheduledTxsExecutionHandler.RollBackToBlock(currHeaderHash)
 	if err != nil {
 		scheduledInfo := &process.ScheduledInfo{
@@ -2055,6 +2060,11 @@ func (boot *baseBootstrap) setCurrentBlockInfo(
 
 	boot.chainHandler.SetCurrentBlockHeaderHash(headerHash)
 
+	// for legacy (non-V3) headers, keep last executed block header in sync with current block header
+	if check.IfNil(header) || !header.IsHeaderV3() {
+		boot.chainHandler.SetLastExecutedBlockHeaderAndRootHash(header, headerHash, rootHash)
+	}
+
 	return nil
 }
 

process/sync/storageBootstrap/baseStorageBootstrapper.go

@@ -671,6 +671,8 @@ func (st *storageBootstrapper) restoreBlockChainToGenesis() {
 	}
 
 	st.blkc.SetCurrentBlockHeaderHash(nil)
+	// keep last executed block header in sync when reverting to genesis
+	st.blkc.SetLastExecutedBlockHeaderAndRootHash(nil, nil, nil)
 }
 
 func checkBaseStorageBootstrapperArguments(args ArgsBaseStorageBootstrapper) error {