Merge pull request #654 from openmina/fix/block_producer/slot_falsely_discarded

binier · web-flow · commit 88be2b06f6a0 · 2024-09-09T15:48:24.000+04:00
Fix Block Producer: slot falsely discarded if staking ledger between best tip and won slot is different
diff --git a/node/src/block_producer/block_producer_state.rs b/node/src/block_producer/block_producer_state.rs
@@ -310,7 +310,9 @@ impl BlockProducerCurrentState {
             return Some(BlockProducerWonSlotDiscardReason::BestTipGlobalSlotHigher);
         }
 
-        if &won_slot.staking_ledger_hash != best_tip.staking_epoch_ledger_hash() {
+        if &won_slot.staking_ledger_hash != best_tip.staking_epoch_ledger_hash()
+            && &won_slot.staking_ledger_hash != best_tip.next_epoch_ledger_hash()
+        {
             return Some(BlockProducerWonSlotDiscardReason::BestTipStakingLedgerDifferent);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,9 @@ impl BlockProducerCurrentState {`
`310`	`310`	`return Some(BlockProducerWonSlotDiscardReason::BestTipGlobalSlotHigher);`
`311`	`311`	`}`
`312`	`312`
`313`		`- if &won_slot.staking_ledger_hash != best_tip.staking_epoch_ledger_hash() {`
	`313`	`+ if &won_slot.staking_ledger_hash != best_tip.staking_epoch_ledger_hash()`
	`314`	`+ && &won_slot.staking_ledger_hash != best_tip.next_epoch_ledger_hash()`
	`315`	`+ {`
`314`	`316`	`return Some(BlockProducerWonSlotDiscardReason::BestTipStakingLedgerDifferent);`
`315`	`317`	`}`
`316`	`318`