Skip to content

fix shard header finalized state #6911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 26, 2025
+10 −1
Merged

fix shard header finalized state #6911

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
836273b
add log on shard header prev proof verification
ssd04 Mar 24, 2025
4683b9e
Merge branch 'rc/andromeda' into proof-checks-logging
ssd04 Mar 25, 2025
35d11a6
fix shard header finalized state
ssd04 Mar 26, 2025
dc5612b
Merge pull request #6905 from multiversx/proof-checks-logging
ssd04 Mar 26, 2025
629c6e5
change log to warn
ssd04 Mar 26, 2025
d67a22b
Merge branch 'feat/andromeda-fixes' into fix-shard-header-outport-fin…
sstanculeanu Mar 26, 2025
72e4d73
change log to debug
ssd04 Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions process/block/interceptedBlocks/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ func checkMetaShardInfo(
continue
}

log.Warn("proof in pool not equal to provided prev proof, will check prev proof",
"headerHash", sd.GetPreviousProof().GetHeaderHash(),
)

err = checkProof(sd.GetPreviousProof(), headerSigVerifier)
if err != nil {
return err
Expand Down
7 changes: 6 additions & 1 deletion process/block/shardblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,12 @@ func (sp *shardProcessor) CommitBlock(
sp.lastRestartNonce = header.GetNonce()
}

sp.updateState(selfNotarizedHeaders, header, currentHeaderHash)
finalHeaderHash := headerHash
if !common.ShouldBlockHavePrevProof(header, sp.enableEpochsHandler, common.EquivalentMessagesFlag) {
finalHeaderHash = currentHeaderHash
}

sp.updateState(selfNotarizedHeaders, header, finalHeaderHash)
Copy link
Collaborator

@sstanculeanu sstanculeanu Mar 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should do the same for header

Copy link
Collaborator

@sstanculeanu sstanculeanu Mar 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my bad, should not be needed


highestFinalBlockNonce := sp.forkDetector.GetHighestFinalBlockNonce()
log.Debug("highest final shard block",
Expand Down