From baab3b61d3eb9cd6d191ca429f55cae95451a806 Mon Sep 17 00:00:00 2001 From: Sorin Stanculeanu Date: Thu, 30 Jan 2025 18:10:55 +0200 Subject: [PATCH] fix after discussion --- process/block/metablock.go | 8 ++++---- process/block/shardblock.go | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/process/block/metablock.go b/process/block/metablock.go index f0a469ef9d..a9f5a73c2c 100644 --- a/process/block/metablock.go +++ b/process/block/metablock.go @@ -437,15 +437,15 @@ func (mp *metaProcessor) checkProofsForShardData(header *block.MetaBlock) error continue } - if !common.ShouldBlockHavePrevProof(shardHeader.hdr, mp.enableEpochsHandler, common.EquivalentMessagesFlag) { - continue - } - err := mp.checkProofRequestingNextHeaderBlockingIfMissing(shardData.ShardID, shardData.HeaderHash, shardData.Nonce) if err != nil { return err } + if !common.ShouldBlockHavePrevProof(shardHeader.hdr, mp.enableEpochsHandler, common.EquivalentMessagesFlag) { + continue + } + shardHeadersStorer, err := mp.store.GetStorer(dataRetriever.BlockHeaderUnit) if err != nil { return err diff --git a/process/block/shardblock.go b/process/block/shardblock.go index 82746340c1..dc2835a8db 100644 --- a/process/block/shardblock.go +++ b/process/block/shardblock.go @@ -301,10 +301,6 @@ func (sp *shardProcessor) ProcessBlock( return fmt.Errorf("%w for header hash %s", process.ErrMissingHeader, hex.EncodeToString(metaBlockHash)) } - if !common.ShouldBlockHavePrevProof(hInfo.hdr, sp.enableEpochsHandler, common.EquivalentMessagesFlag) { - continue - } - if !sp.enableEpochsHandler.IsFlagEnabledInEpoch(common.EquivalentMessagesFlag, hInfo.hdr.GetEpoch()) { continue }