Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion consensus/spos/bls/v2/subroundBlock.go
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,15 @@ func (sr *subroundBlock) receivedBlockHeader(headerHandler data.HeaderHandler) {

if sr.IsConsensusDataSet() {
log.Debug("subroundBlock.receivedBlockHeader - consensus data is set")
if !check.IfNil(sr.GetHeader()) {
log.Debug("consensus data",
"current data", sr.GetData(),
"current nonce", sr.GetHeader().GetNonce(),
"current round", sr.GetHeader().GetRound(),
"new nonce", headerHandler.GetNonce(),
"new round", headerHandler.GetRound(),
)
}
return
}

Expand All @@ -743,7 +752,13 @@ func (sr *subroundBlock) receivedBlockHeader(headerHandler data.HeaderHandler) {
}

if sr.IsHeaderAlreadyReceived() {
log.Debug("subroundBlock.receivedBlockHeader - header is already received")
log.Debug("subroundBlock.receivedBlockHeader - header is already received",
"current data", sr.GetData(),
"current nonce", sr.GetHeader().GetNonce(),
"current round", sr.GetHeader().GetRound(),
"new nonce", headerHandler.GetNonce(),
"new round", headerHandler.GetRound(),
)
return
}

Expand Down
8 changes: 7 additions & 1 deletion dataRetriever/blockchain/blockchain.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,14 @@ func (bc *blockChain) SetCurrentBlockHeaderAndHash(
bc.mut.Lock()
defer bc.mut.Unlock()

err := bc.setCurrentBlockHeaderUnprotected(header)
if err != nil {
return err
}

bc.currentBlockHeaderHash = headerHash
return bc.setCurrentBlockHeaderUnprotected(header)

return nil
}

// SetCurrentBlockHeaderAndRootHash sets current block header pointer and the root hash
Expand Down
8 changes: 7 additions & 1 deletion dataRetriever/blockchain/metachain.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,14 @@ func (mc *metaChain) SetCurrentBlockHeaderAndHash(
mc.mut.Lock()
defer mc.mut.Unlock()

err := mc.setCurrentBlockHeaderUnprotected(header)
if err != nil {
return err
}

mc.currentBlockHeaderHash = headerHash
return mc.setCurrentBlockHeaderUnprotected(header)

return nil
}

func (mc *metaChain) setCurrentBlockHeaderUnprotected(header data.HeaderHandler) error {
Expand Down
4 changes: 4 additions & 0 deletions dataRetriever/dataPool/proofsCache/proofsCache.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ func (pc *proofsCache) addProof(proof data.HeaderProofHandler) {

// Delete the old hash from proofsByHash if it's different from the new hash
if len(oldHash) != 0 && oldHash != newHash {
log.Warn("proofsCache.addProof: overwrite proof by hash",
"oldHash", oldHash,
"newHash", newHash,
)
delete(pc.proofsByHash, oldHash)
}

Expand Down
Loading