diff --git a/dataRetriever/dataPool/proofsCache/proofsPool.go b/dataRetriever/dataPool/proofsCache/proofsPool.go index 10bff84687..6a9b4d1840 100644 --- a/dataRetriever/dataPool/proofsCache/proofsPool.go +++ b/dataRetriever/dataPool/proofsCache/proofsPool.go @@ -60,12 +60,15 @@ func (pp *proofsPool) AddProof( } pp.mutCache.Unlock() - log.Trace("added proof to pool", + log.Debug("added proof to pool", "header hash", headerProof.GetHeaderHash(), "epoch", headerProof.GetHeaderEpoch(), "nonce", headerProof.GetHeaderNonce(), "shardID", headerProof.GetHeaderShardId(), "pubKeys bitmap", headerProof.GetPubKeysBitmap(), + "round", headerProof.GetHeaderRound(), + "nonce", headerProof.GetHeaderNonce(), + "isStartOfEpoch", headerProof.GetIsStartOfEpoch(), ) proofsPerShard.addProof(headerProof) diff --git a/process/block/baseProcess.go b/process/block/baseProcess.go index 6438eeb94a..5b56ae4e7b 100644 --- a/process/block/baseProcess.go +++ b/process/block/baseProcess.go @@ -372,12 +372,22 @@ func displayHeader(headerHandler data.HeaderHandler) []*display.LineData { proof := headerHandler.GetPreviousProof() - var prevAggregatedSig, prevBitmap []byte + var prevAggregatedSig, prevBitmap, prevHash []byte + var proofShard, proofEpoch uint32 + var proofRound, proofNonce uint64 + var isStartOfEpoch, hasProofInfo bool if !check.IfNilReflect(proof) { + hasProofInfo = true prevAggregatedSig, prevBitmap = proof.GetAggregatedSignature(), proof.GetPubKeysBitmap() + prevHash = proof.GetHeaderHash() + proofShard = proof.GetHeaderShardId() + proofEpoch = proof.GetHeaderEpoch() + proofRound = proof.GetHeaderRound() + proofNonce = proof.GetHeaderNonce() + isStartOfEpoch = proof.GetIsStartOfEpoch() } - return []*display.LineData{ + logLines := []*display.LineData{ display.NewLineData(false, []string{ "", "ChainID", @@ -438,19 +448,50 @@ func displayHeader(headerHandler data.HeaderHandler) []*display.LineData { "", "Receipts hash", logger.DisplayByteSlice(headerHandler.GetReceiptsHash())}), - display.NewLineData(false, []string{ + display.NewLineData(true, []string{ "", "Epoch start meta hash", logger.DisplayByteSlice(epochStartMetaHash)}), - display.NewLineData(false, []string{ - "Previous proof", - "Aggregated signature", - logger.DisplayByteSlice(prevAggregatedSig)}), - display.NewLineData(true, []string{ - "", - "Pub keys bitmap", - logger.DisplayByteSlice(prevBitmap)}), } + + if hasProofInfo { + logLines = append(logLines, + display.NewLineData(false, []string{ + "Previous proof", + "Header hash", + logger.DisplayByteSlice(prevHash)}), + display.NewLineData(false, []string{ + "", + "Aggregated signature", + logger.DisplayByteSlice(prevAggregatedSig)}), + display.NewLineData(false, []string{ + "", + "Pub keys bitmap", + logger.DisplayByteSlice(prevBitmap)}), + display.NewLineData(false, []string{ + "", + "Epoch", + fmt.Sprintf("%d", proofEpoch)}), + display.NewLineData(false, []string{ + "", + "Round", + fmt.Sprintf("%d", proofRound)}), + display.NewLineData(false, []string{ + "", + "Shard", + fmt.Sprintf("%d", proofShard)}), + display.NewLineData(false, []string{ + "", + "Nonce", + fmt.Sprintf("%d", proofNonce)}), + display.NewLineData(true, []string{ + "", + "IsStartOfEpoch", + fmt.Sprintf("%t", isStartOfEpoch)}), + ) + } + + return logLines } // checkProcessorParameters will check the input parameters values @@ -2233,6 +2274,18 @@ func (bp *baseProcessor) addPrevProofIfNeeded(header data.HeaderHandler) error { } header.SetPreviousProof(prevBlockProof) + + log.Debug("added proof on header", + "header hash", prevBlockProof.GetHeaderHash(), + "epoch", prevBlockProof.GetHeaderEpoch(), + "nonce", prevBlockProof.GetHeaderNonce(), + "shardID", prevBlockProof.GetHeaderShardId(), + "pubKeys bitmap", prevBlockProof.GetPubKeysBitmap(), + "round", prevBlockProof.GetHeaderRound(), + "nonce", prevBlockProof.GetHeaderNonce(), + "isStartOfEpoch", prevBlockProof.GetIsStartOfEpoch(), + ) + return nil }