Merge pull request #957 from openmina/feat/block-proof-sharing

tizoc · web-flow · commit dbda80c720dc · 2024-12-02T18:22:14.000-03:00
feat(node): Wrap ledger and block proofs in `Arc` and share them
diff --git a/ledger/src/proofs/block.rs b/ledger/src/proofs/block.rs
@@ -1855,7 +1855,7 @@ pub(super) fn generate_block_proof(
     } = params;
 
     let (txn_snark_statement, txn_snark_proof) =
-        ledger_proof_opt(ledger_proof.as_ref(), next_state)?;
+        ledger_proof_opt(ledger_proof.as_deref(), next_state)?;
     let prev_state_proof = &chain.proof;
 
     let (new_state_hash, previous_proof_statements) = block_main(
diff --git a/mina-p2p-messages/src/v2/generated.rs b/mina-p2p-messages/src/v2/generated.rs
@@ -3,6 +3,7 @@ use derive_more::Deref;
 use openmina_macros::SerdeYojsonEnum;
 use rsexp_derive::{OfSexp, SexpOf};
 use serde::{Deserialize, Serialize};
+use std::sync::Arc;
 
 use crate::{array::ArrayN16, list::List, pseq::PaddedSeq};
 
@@ -243,7 +244,7 @@ pub struct TrustSystemPeerStatusStableV1 {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite)]
 pub struct BlockchainSnarkBlockchainStableV2 {
     pub state: MinaStateProtocolStateValueStableV2,
-    pub proof: MinaBaseProofStableV2,
+    pub proof: Arc<MinaBaseProofStableV2>,
 }
 
 /// **OCaml name**: `Transaction_witness.Stable.V2`
@@ -270,7 +271,7 @@ pub struct ProverExtendBlockchainInputStableV2 {
     pub chain: BlockchainSnarkBlockchainStableV2,
     pub next_state: MinaStateProtocolStateValueStableV2,
     pub block: MinaStateSnarkTransitionValueStableV2,
-    pub ledger_proof: Option<LedgerProofProdStableV2>,
+    pub ledger_proof: Option<Arc<LedgerProofProdStableV2>>,
     pub prover_state: ConsensusStakeProofStableV2,
     pub pending_coinbase: MinaBasePendingCoinbaseWitnessStableV2,
 }
@@ -3199,7 +3200,7 @@ pub struct TransactionSnarkScanStateLedgerProofWithSokMessageStableV2(
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite)]
 pub struct MinaBlockHeaderStableV2 {
     pub protocol_state: MinaStateProtocolStateValueStableV2,
-    pub protocol_state_proof: MinaBaseProofStableV2,
+    pub protocol_state_proof: Arc<MinaBaseProofStableV2>,
     pub delta_block_chain_proof: (StateHash, List<StateBodyHash>),
     pub current_protocol_version: ProtocolVersionStableV2,
     pub proposed_protocol_version_opt: Option<ProtocolVersionStableV2>,
diff --git a/node/common/src/service/block_producer/mod.rs b/node/common/src/service/block_producer/mod.rs
@@ -1,5 +1,7 @@
 mod vrf_evaluator;
 
+use std::sync::Arc;
+
 use ledger::proofs::{
     block::BlockParams, generate_block_proof, provers::BlockProver, transaction::ProofError,
 };
@@ -67,7 +69,7 @@ pub fn prove(
     mut input: Box<ProverExtendBlockchainInputStableV2>,
     keypair: AccountSecretKey,
     only_verify_constraints: bool,
-) -> Result<Box<MinaBaseProofStableV2>, ProofError> {
+) -> Result<Arc<MinaBaseProofStableV2>, ProofError> {
     let height = input
         .next_state
         .body
diff --git a/node/src/block_producer/block_producer_actions.rs b/node/src/block_producer/block_producer_actions.rs
@@ -53,13 +53,13 @@ pub enum BlockProducerAction {
     StagedLedgerDiffCreateInit,
     StagedLedgerDiffCreatePending,
     StagedLedgerDiffCreateSuccess {
-        output: Box<StagedLedgerDiffCreateOutput>,
+        output: Arc<StagedLedgerDiffCreateOutput>,
     },
     BlockUnprovenBuild,
     BlockProveInit,
     BlockProvePending,
     BlockProveSuccess {
-        proof: Box<MinaBaseProofStableV2>,
+        proof: Arc<MinaBaseProofStableV2>,
     },
     BlockProduced,
     #[action_event(level = trace)]
diff --git a/node/src/block_producer/block_producer_event.rs b/node/src/block_producer/block_producer_event.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use mina_p2p_messages::v2::{MinaBaseProofStableV2, StateHash};
 use serde::{Deserialize, Serialize};
 
@@ -6,7 +8,7 @@ pub use super::vrf_evaluator::BlockProducerVrfEvaluatorEvent;
 #[derive(derive_more::From, Serialize, Deserialize, Debug, Clone)]
 pub enum BlockProducerEvent {
     VrfEvaluator(BlockProducerVrfEvaluatorEvent),
-    BlockProve(StateHash, Result<Box<MinaBaseProofStableV2>, String>),
+    BlockProve(StateHash, Result<Arc<MinaBaseProofStableV2>, String>),
 }
 
 impl std::fmt::Display for BlockProducerEvent {
diff --git a/node/src/block_producer/block_producer_reducer.rs b/node/src/block_producer/block_producer_reducer.rs
@@ -299,7 +299,7 @@ impl BlockProducerEnabled {
                         time: meta.time(),
                         won_slot,
                         chain,
-                        block: block.with_hash_and_proof(block_hash, *proof),
+                        block: block.with_hash_and_proof(block_hash, proof),
                     };
                 } else {
                     bug_condition!("Invalid state for `BlockProducerAction::BlockProduced` expected: `BlockProducerCurrentState::BlockProveSuccess`, found: {:?}", current_state);
@@ -767,7 +767,7 @@ fn broadcast_injected_block(global_state: &State, dispatcher: &mut Dispatcher<Ac
         return;
     };
 
-    let message = Box::new(GossipNetMessageV2::NewState(block));
+    let message = GossipNetMessageV2::NewState(block);
     dispatcher.push(P2pNetworkPubsubAction::Broadcast { message });
 }
 
diff --git a/node/src/block_producer/block_producer_state.rs b/node/src/block_producer/block_producer_state.rs
@@ -1,4 +1,4 @@
-use std::{collections::BTreeSet, time::Duration};
+use std::{collections::BTreeSet, sync::Arc, time::Duration};
 
 use ledger::scan_state::transaction_logic::valid;
 use mina_p2p_messages::v2;
@@ -81,7 +81,7 @@ pub enum BlockProducerCurrentState {
         /// `protocol_state.blockchain_state.body_reference`
         diff_hash: v2::ConsensusBodyReferenceStableV1,
         staged_ledger_hash: v2::MinaBaseStagedLedgerHashStableV1,
-        emitted_ledger_proof: Option<Box<v2::LedgerProofProdStableV2>>,
+        emitted_ledger_proof: Option<Arc<v2::LedgerProofProdStableV2>>,
         pending_coinbase_update: v2::MinaBasePendingCoinbaseUpdateStableV1,
         pending_coinbase_witness: v2::MinaBasePendingCoinbaseWitnessStableV2,
         stake_proof_sparse_ledger: v2::MinaBaseSparseLedgerBaseStableV2,
@@ -91,7 +91,7 @@ pub enum BlockProducerCurrentState {
         won_slot: BlockProducerWonSlot,
         /// Chain that we are extending.
         chain: Vec<AppliedBlock>,
-        emitted_ledger_proof: Option<Box<v2::LedgerProofProdStableV2>>,
+        emitted_ledger_proof: Option<Arc<v2::LedgerProofProdStableV2>>,
         pending_coinbase_update: v2::MinaBasePendingCoinbaseUpdateStableV1,
         pending_coinbase_witness: v2::MinaBasePendingCoinbaseWitnessStableV2,
         stake_proof_sparse_ledger: v2::MinaBaseSparseLedgerBaseStableV2,
@@ -103,7 +103,7 @@ pub enum BlockProducerCurrentState {
         won_slot: BlockProducerWonSlot,
         /// Chain that we are extending.
         chain: Vec<AppliedBlock>,
-        emitted_ledger_proof: Option<Box<v2::LedgerProofProdStableV2>>,
+        emitted_ledger_proof: Option<Arc<v2::LedgerProofProdStableV2>>,
         pending_coinbase_update: v2::MinaBasePendingCoinbaseUpdateStableV1,
         pending_coinbase_witness: v2::MinaBasePendingCoinbaseWitnessStableV2,
         stake_proof_sparse_ledger: v2::MinaBaseSparseLedgerBaseStableV2,
@@ -117,7 +117,7 @@ pub enum BlockProducerCurrentState {
         chain: Vec<AppliedBlock>,
         block: BlockWithoutProof,
         block_hash: v2::StateHash,
-        proof: Box<v2::MinaBaseProofStableV2>,
+        proof: Arc<v2::MinaBaseProofStableV2>,
     },
     Produced {
         time: redux::Timestamp,
diff --git a/node/src/block_producer/mod.rs b/node/src/block_producer/mod.rs
@@ -1,6 +1,8 @@
 pub mod vrf_evaluator;
 
 mod block_producer_config;
+use std::sync::Arc;
+
 pub use block_producer_config::*;
 
 mod block_producer_state;
@@ -188,7 +190,7 @@ impl BlockWithoutProof {
     pub fn with_hash_and_proof(
         self,
         hash: v2::StateHash,
-        proof: v2::MinaBaseProofStableV2,
+        proof: Arc<v2::MinaBaseProofStableV2>,
     ) -> ArcBlockWithHash {
         let block = v2::MinaBlockBlockStableV2 {
             header: v2::MinaBlockHeaderStableV2 {
diff --git a/node/src/block_producer_effectful/block_producer_effectful_effects.rs b/node/src/block_producer_effectful/block_producer_effectful_effects.rs
@@ -164,7 +164,7 @@ pub fn block_producer_effects<S: crate::Service>(
                             .clone(),
                         pending_coinbase_update: pending_coinbase_update.clone(),
                     },
-                    ledger_proof: emitted_ledger_proof.as_ref().map(|proof| (**proof).clone()),
+                    ledger_proof: emitted_ledger_proof.clone(),
                     prover_state: ConsensusStakeProofStableV2 {
                         delegator: won_slot.delegator.1.into(),
                         delegator_pk: won_slot.delegator.0.clone(),
diff --git a/node/src/block_producer_effectful/block_producer_effectful_service.rs b/node/src/block_producer_effectful/block_producer_effectful_service.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use ledger::proofs::provers::BlockProver;
 use mina_p2p_messages::v2::{
     ConsensusBodyReferenceStableV1, LedgerProofProdStableV2, MinaBasePendingCoinbaseUpdateStableV1,
@@ -13,7 +15,7 @@ pub struct StagedLedgerDiffCreateOutput {
     /// `protocol_state.blockchain_state.body_reference`
     pub diff_hash: ConsensusBodyReferenceStableV1,
     pub staged_ledger_hash: MinaBaseStagedLedgerHashStableV1,
-    pub emitted_ledger_proof: Option<Box<LedgerProofProdStableV2>>,
+    pub emitted_ledger_proof: Option<Arc<LedgerProofProdStableV2>>,
     pub pending_coinbase_update: MinaBasePendingCoinbaseUpdateStableV1,
     pub pending_coinbase_witness: MinaBasePendingCoinbaseWitnessStableV2,
     pub stake_proof_sparse_ledger: MinaBaseSparseLedgerBaseStableV2,
diff --git a/node/src/ledger/ledger_service.rs b/node/src/ledger/ledger_service.rs
@@ -830,15 +830,16 @@ impl LedgerCtx {
             })
             .unwrap_or_default();
 
-        let available_jobs = self
-            .staged_ledger_mut(new_best_tip.staged_ledger_hashes())
-            .map(|l| {
-                l.scan_state()
-                    .all_job_pairs_iter()
-                    .map(|job| job.map(|single| AvailableJobMessage::from(single)))
-                    .collect()
-            })
-            .unwrap_or_default();
+        let available_jobs = Arc::new(
+            self.staged_ledger_mut(new_best_tip.staged_ledger_hashes())
+                .map(|l| {
+                    l.scan_state()
+                        .all_job_pairs_iter()
+                        .map(|job| job.map(|single| AvailableJobMessage::from(single)))
+                        .collect()
+                })
+                .unwrap_or_default(),
+        );
 
         CommitResult {
             available_jobs,
@@ -1048,7 +1049,7 @@ impl LedgerCtx {
             emitted_ledger_proof: res
                 .ledger_proof
                 .map(|(proof, ..)| (&proof).into())
-                .map(Box::new),
+                .map(Arc::new),
             pending_coinbase_update: (&res.pending_coinbase_update.1).into(),
             pending_coinbase_witness: MinaBasePendingCoinbaseWitnessStableV2 {
                 pending_coinbases: pending_coinbase_witness,
diff --git a/node/src/ledger/write/mod.rs b/node/src/ledger/write/mod.rs
@@ -70,7 +70,7 @@ pub enum LedgerWriteResponse {
     StagedLedgerDiffCreate {
         pred_block_hash: v2::StateHash,
         global_slot_since_genesis: v2::MinaNumbersGlobalSlotSinceGenesisMStableV1,
-        result: Result<Box<StagedLedgerDiffCreateOutput>, String>,
+        result: Result<Arc<StagedLedgerDiffCreateOutput>, String>,
     },
     BlockApply {
         block_hash: v2::StateHash,
@@ -89,7 +89,7 @@ pub struct BlockApplyResult {
 
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
 pub struct CommitResult {
-    pub available_jobs: Vec<OneOrTwo<AvailableJobMessage>>,
+    pub available_jobs: Arc<Vec<OneOrTwo<AvailableJobMessage>>>,
     pub needed_protocol_states: BTreeSet<v2::StateHash>,
 }
 
diff --git a/node/src/snark_pool/snark_pool_actions.rs b/node/src/snark_pool/snark_pool_actions.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use ledger::scan_state::scan_state::transaction_snark::OneOrTwo;
 use ledger::scan_state::scan_state::AvailableJobMessage;
 use openmina_core::snark::{Snark, SnarkJobCommitment, SnarkJobId};
@@ -17,7 +19,7 @@ pub enum SnarkPoolAction {
     Candidate(SnarkPoolCandidateAction),
 
     JobsUpdate {
-        jobs: Vec<OneOrTwo<AvailableJobMessage>>,
+        jobs: Arc<Vec<OneOrTwo<AvailableJobMessage>>>,
         orphaned_snarks: Vec<SnarkWork>,
     },
     AutoCreateCommitment,
diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use mina_p2p_messages::v2;
 use openmina_core::ActionEvent;
 use serde::{Deserialize, Serialize};
@@ -25,7 +27,7 @@ pub enum TransitionFrontierGenesisAction {
     /// Genesis block proved.
     #[action_event(level = info)]
     ProveSuccess {
-        proof: Box<v2::MinaBaseProofStableV2>,
+        proof: Arc<v2::MinaBaseProofStableV2>,
     },
     // TODO(refactor): add prove error
 }
diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_reducer.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_reducer.rs
@@ -138,7 +138,7 @@ impl TransitionFrontierGenesisState {
                 let input = v2::ProverExtendBlockchainInputStableV2 {
                     chain: v2::BlockchainSnarkBlockchainStableV2 {
                         state: negative_one.clone(),
-                        proof: (*dummy_blockchain_proof()).clone(),
+                        proof: dummy_blockchain_proof().clone(),
                     },
                     next_state: genesis.clone(),
                     block: v2::MinaStateSnarkTransitionValueStableV2 {
@@ -212,7 +212,7 @@ impl TransitionFrontierGenesisState {
                 let block = v2::MinaBlockBlockStableV2 {
                     header: v2::MinaBlockHeaderStableV2 {
                         protocol_state: genesis.clone(),
-                        protocol_state_proof: (**proof).clone(),
+                        protocol_state_proof: proof.clone(),
                         delta_block_chain_proof: (
                             genesis_hash.clone(),
                             std::iter::empty().collect(),
diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_state.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_state.rs
@@ -49,7 +49,7 @@ impl TransitionFrontierGenesisState {
             v2::MinaBlockBlockStableV2 {
                 header: v2::MinaBlockHeaderStableV2 {
                     protocol_state: genesis.clone(),
-                    protocol_state_proof: (*dummy_blockchain_proof()).clone(),
+                    protocol_state_proof: dummy_blockchain_proof().clone(),
                     delta_block_chain_proof: (genesis_hash.clone(), std::iter::empty().collect()),
                     current_protocol_version: PROTOCOL_VERSION.clone(),
                     proposed_protocol_version_opt: None,
diff --git a/node/testing/src/service/mod.rs b/node/testing/src/service/mod.rs
@@ -501,7 +501,7 @@ impl BlockProducerVrfEvaluatorService for NodeTestingService {
 
 use std::cell::RefCell;
 thread_local! {
-    static GENESIS_PROOF: RefCell<Option<(StateHash, Box<MinaBaseProofStableV2>)>> = const { RefCell::new(None)};
+    static GENESIS_PROOF: RefCell<Option<(StateHash, Arc<MinaBaseProofStableV2>)>> = const { RefCell::new(None)};
 }
 
 impl BlockProducerService for NodeTestingService {
diff --git a/p2p/src/channels/snark/p2p_channels_snark_reducer.rs b/p2p/src/channels/snark/p2p_channels_snark_reducer.rs
@@ -216,7 +216,7 @@ impl P2pChannelsSnarkState {
                 let message = Box::new((snark.statement(), (&snark).into()));
                 let message = v2::NetworkPoolSnarkPoolDiffVersionedStableV2::AddSolvedWork(message);
                 let nonce = nonce.into();
-                let message = Box::new(GossipNetMessageV2::SnarkPoolDiff { message, nonce });
+                let message = GossipNetMessageV2::SnarkPoolDiff { message, nonce };
                 dispatcher.push(P2pNetworkPubsubAction::Broadcast { message });
                 Ok(())
             }
diff --git a/p2p/src/channels/transaction/p2p_channels_transaction_reducer.rs b/p2p/src/channels/transaction/p2p_channels_transaction_reducer.rs
@@ -223,7 +223,7 @@ impl P2pChannelsTransactionState {
                     std::iter::once(*transaction).collect(),
                 );
                 let nonce = nonce.into();
-                let message = Box::new(GossipNetMessageV2::TransactionPoolDiff { message, nonce });
+                let message = GossipNetMessageV2::TransactionPoolDiff { message, nonce };
                 dispatcher.push(P2pNetworkPubsubAction::Broadcast { message });
                 Ok(())
             }
diff --git a/p2p/src/network/pubsub/p2p_network_pubsub_actions.rs b/p2p/src/network/pubsub/p2p_network_pubsub_actions.rs
@@ -73,7 +73,7 @@ pub enum P2pNetworkPubsubAction {
     ///
     /// **Fields:**
     /// - `message`: The gossip network message to broadcast.
-    Broadcast { message: Box<GossipNetMessageV2> },
+    Broadcast { message: GossipNetMessageV2 },
 
     /// Prepare a message for signing before broadcasting.
     ///
