Skip to content
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

fix requesting attesting blocks after equivalent proofs #6732

Merged
merged 8 commits into from
Jan 23, 2025
+232 −50
Merged

fix requesting attesting blocks after equivalent proofs #6732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
38bd438
fix requesting attesting blocks after equivalent proofs
AdoAdoAdo Jan 23, 2025
e41ab2b
re-add early exit check for prev proof
AdoAdoAdo Jan 23, 2025
2a79a9c
fixes after review
AdoAdoAdo Jan 23, 2025
eb334dc
more fixes on the notarization part
sstanculeanu Jan 23, 2025
99d6a13
reverted code not needed from prev commit
sstanculeanu Jan 23, 2025
79024b3
Merge pull request #6733 from multiversx/further_notarization_fixes
sstanculeanu Jan 23, 2025
7d215ea
add log, and early exit
AdoAdoAdo Jan 23, 2025
2e837f1
Merge branch 'fix-requesting-attesting-blocks' of github.com:multiver…
AdoAdoAdo Jan 23, 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
16 changes: 14 additions & 2 deletions process/block/baseProcess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,11 @@ func (bp *baseProcessor) sortHeaderHashesForCurrentBlockByNonce(usedInBlock bool

func (bp *baseProcessor) hasMissingProof(headerInfo *hdrInfo, hdrHash string) bool {
isFlagEnabledForHeader := bp.enableEpochsHandler.IsFlagEnabledInEpoch(common.EquivalentMessagesFlag, headerInfo.hdr.GetEpoch())
hasProof := bp.proofsPool.HasProof(headerInfo.hdr.GetShardID(), []byte(hdrHash))
return isFlagEnabledForHeader && !hasProof
if !isFlagEnabledForHeader {
return false
}

return !bp.proofsPool.HasProof(headerInfo.hdr.GetShardID(), []byte(hdrHash))
}

func (bp *baseProcessor) createMiniBlockHeaderHandlers(
Expand Down Expand Up @@ -2232,3 +2235,12 @@ func (bp *baseProcessor) addPrevProofIfNeeded(header data.HeaderHandler) error {
header.SetPreviousProof(prevBlockProof)
return nil
}

func (bp *baseProcessor) getHeaderHash(header data.HeaderHandler) ([]byte, error) {
marshalledHeader, errMarshal := bp.marshalizer.Marshal(header)
if errMarshal != nil {
return nil, errMarshal
}

return bp.hasher.Compute(string(marshalledHeader)), nil
}
Loading
Loading