fix(p2p): Broadcast produced block only after successful injection

Author: tizoc

node/src/block_producer/block_producer_reducer.rs

@@ -338,13 +338,6 @@ impl BlockProducerEnabled {
                         }
                     )),
                 });
-
-                #[cfg(feature = "p2p-libp2p")]
-                {
-                    use mina_p2p_messages::gossip::GossipNetMessageV2;
-                    let message = Box::new(GossipNetMessageV2::NewState(best_tip.block.clone()));
-                    dispatcher.push(P2pNetworkPubsubAction::Broadcast { message });
-                }
             }
             BlockProducerAction::BlockInjected => {
                 if let BlockProducerCurrentState::Produced {
@@ -365,7 +358,10 @@ impl BlockProducerEnabled {
                     bug_condition!("Invalid state for `BlockProducerAction::BlockInjected` expected: `BlockProducerCurrentState::Produced`, found: {:?}", state.current);
                 }
 
-                let dispatcher = state_context.into_dispatcher();
+                let (dispatcher, global_state) = state_context.into_dispatcher_and_state();
+
+                #[cfg(feature = "p2p-libp2p")]
+                broadcast_injected_block(global_state, dispatcher);
 
                 dispatcher.push(BlockProducerAction::WonSlotSearch);
             }
@@ -757,6 +753,24 @@ impl BlockProducerEnabled {
     }
 }
 
+#[cfg(feature = "p2p-libp2p")]
+fn broadcast_injected_block(global_state: &State, dispatcher: &mut Dispatcher<Action, State>) {
+    use mina_p2p_messages::gossip::GossipNetMessageV2;
+
+    let Some(block) = global_state
+        .block_producer
+        .as_ref()
+        .and_then(|bp| bp.current.injected_block())
+        .map(|pb| pb.block.clone())
+    else {
+        // Should be impossible, we call this immediately after having injected the block.
+        return;
+    };
+
+    let message = Box::new(GossipNetMessageV2::NewState(block));
+    dispatcher.push(P2pNetworkPubsubAction::Broadcast { message });
+}
+
 fn can_apply_supercharged_coinbase(
     block_stake_winner: &v2::NonZeroCurvePoint,
     stake_proof_sparse_ledger: &v2::MinaBaseSparseLedgerBaseStableV2,

node/src/block_producer/block_producer_state.rs

@@ -372,6 +372,13 @@ impl BlockProducerCurrentState {
         }
     }
 
+    pub fn injected_block(&self) -> Option<&ArcBlockWithHash> {
+        match self {
+            Self::Injected { block, .. } => Some(block),
+            _ => None,
+        }
+    }
+
     pub fn produced_block_with_chain(&self) -> Option<(&ArcBlockWithHash, &[AppliedBlock])> {
         match self {
             Self::Produced { chain, block, .. } => Some((block, chain)),