Ported block producer and VRF evaluator

Author: 0xMimir

node/common/src/service/block_producer/vrf_evaluator.rs

@@ -51,7 +51,9 @@ pub fn vrf_evaluator(
     }
 }
 
-impl node::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorService for NodeService {
+impl node::block_producer_effectful::vrf_evaluator_effectful::BlockProducerVrfEvaluatorService
+    for NodeService
+{
     fn evaluate(&mut self, data: VrfEvaluatorInput) {
         if let Some(bp) = self.block_producer.as_mut() {
             let _ = bp.vrf_evaluation_sender.send(data);

node/src/action.rs

@@ -5,6 +5,7 @@ pub type ActionWithMeta = redux::ActionWithMeta<Action>;
 pub type ActionWithMetaRef<'a> = redux::ActionWithMeta<&'a Action>;
 
 pub use crate::block_producer::BlockProducerAction;
+pub use crate::block_producer_effectful::BlockProducerEffectfulAction;
 pub use crate::consensus::ConsensusAction;
 pub use crate::event_source::EventSourceAction;
 pub use crate::external_snark_worker::ExternalSnarkWorkerAction;
@@ -48,6 +49,7 @@ pub enum Action {
     TransactionPoolEffect(TransactionPoolEffectfulAction),
     ExternalSnarkWorker(ExternalSnarkWorkerAction),
     BlockProducer(BlockProducerAction),
+    BlockProducerEffectful(BlockProducerEffectfulAction),
     Rpc(RpcAction),
     RpcEffectful(RpcEffectfulAction),
 
@@ -92,6 +94,7 @@ impl redux::EnablingCondition<crate::State> for Action {
             Action::SnarkPoolEffect(a) => a.is_enabled(state, time),
             Action::ExternalSnarkWorker(a) => a.is_enabled(state, time),
             Action::BlockProducer(a) => a.is_enabled(state, time),
+            Action::BlockProducerEffectful(a) => a.is_enabled(state, time),
             Action::Rpc(a) => a.is_enabled(state, time),
             Action::WatchedAccounts(a) => a.is_enabled(state, time),
             Action::TransactionPool(a) => a.is_enabled(state, time),

node/src/action_kind.rs

@@ -17,6 +17,8 @@ use strum_macros::VariantArray;
 
 use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorAction;
 use crate::block_producer::BlockProducerAction;
+use crate::block_producer_effectful::vrf_evaluator_effectful::BlockProducerVrfEvaluatorEffectfulAction;
+use crate::block_producer_effectful::BlockProducerEffectfulAction;
 use crate::consensus::ConsensusAction;
 use crate::event_source::EventSourceAction;
 use crate::external_snark_worker::ExternalSnarkWorkerAction;
@@ -129,6 +131,13 @@ pub enum ActionKind {
     BlockProducerWonSlotTransactionsGet,
     BlockProducerWonSlotTransactionsSuccess,
     BlockProducerWonSlotWait,
+    BlockProducerEffectfulBlockProveInit,
+    BlockProducerEffectfulBlockProveSuccess,
+    BlockProducerEffectfulBlockUnprovenBuild,
+    BlockProducerEffectfulStagedLedgerDiffCreateInit,
+    BlockProducerEffectfulStagedLedgerDiffCreateSuccess,
+    BlockProducerEffectfulWonSlot,
+    BlockProducerEffectfulWonSlotDiscard,
     BlockProducerVrfEvaluatorBeginDelegatorTableConstruction,
     BlockProducerVrfEvaluatorBeginEpochEvaluation,
     BlockProducerVrfEvaluatorCheckEpochBounds,
@@ -145,6 +154,7 @@ pub enum ActionKind {
     BlockProducerVrfEvaluatorProcessSlotEvaluationSuccess,
     BlockProducerVrfEvaluatorSelectInitialSlot,
     BlockProducerVrfEvaluatorWaitForNextEvaluation,
+    BlockProducerVrfEvaluatorEffectfulEvaluateSlot,
     CheckTimeouts,
     ConsensusBestTipUpdate,
     ConsensusBlockChainProofUpdate,
@@ -694,7 +704,7 @@ pub enum ActionKind {
 }
 
 impl ActionKind {
-    pub const COUNT: u16 = 581;
+    pub const COUNT: u16 = 589;
 }
 
 impl std::fmt::Display for ActionKind {
@@ -721,6 +731,7 @@ impl ActionKindGet for Action {
             Self::TransactionPoolEffect(a) => a.kind(),
             Self::ExternalSnarkWorker(a) => a.kind(),
             Self::BlockProducer(a) => a.kind(),
+            Self::BlockProducerEffectful(a) => a.kind(),
             Self::Rpc(a) => a.kind(),
             Self::RpcEffectful(a) => a.kind(),
             Self::WatchedAccounts(a) => a.kind(),
@@ -969,6 +980,25 @@ impl ActionKindGet for BlockProducerAction {
     }
 }
 
+impl ActionKindGet for BlockProducerEffectfulAction {
+    fn kind(&self) -> ActionKind {
+        match self {
+            Self::VrfEvaluator(a) => a.kind(),
+            Self::WonSlot { .. } => ActionKind::BlockProducerEffectfulWonSlot,
+            Self::WonSlotDiscard { .. } => ActionKind::BlockProducerEffectfulWonSlotDiscard,
+            Self::StagedLedgerDiffCreateInit => {
+                ActionKind::BlockProducerEffectfulStagedLedgerDiffCreateInit
+            }
+            Self::StagedLedgerDiffCreateSuccess => {
+                ActionKind::BlockProducerEffectfulStagedLedgerDiffCreateSuccess
+            }
+            Self::BlockUnprovenBuild => ActionKind::BlockProducerEffectfulBlockUnprovenBuild,
+            Self::BlockProveInit => ActionKind::BlockProducerEffectfulBlockProveInit,
+            Self::BlockProveSuccess => ActionKind::BlockProducerEffectfulBlockProveSuccess,
+        }
+    }
+}
+
 impl ActionKindGet for RpcAction {
     fn kind(&self) -> ActionKind {
         match self {
@@ -1482,6 +1512,14 @@ impl ActionKindGet for BlockProducerVrfEvaluatorAction {
     }
 }
 
+impl ActionKindGet for BlockProducerVrfEvaluatorEffectfulAction {
+    fn kind(&self) -> ActionKind {
+        match self {
+            Self::EvaluateSlot { .. } => ActionKind::BlockProducerVrfEvaluatorEffectfulEvaluateSlot,
+        }
+    }
+}
+
 impl ActionKindGet for P2pConnectionOutgoingAction {
     fn kind(&self) -> ActionKind {
         match self {

node/src/block_producer/block_producer_actions.rs

@@ -4,11 +4,10 @@ use openmina_core::block::ArcBlockWithHash;
 use openmina_core::ActionEvent;
 use serde::{Deserialize, Serialize};
 
+use crate::block_producer_effectful::StagedLedgerDiffCreateOutput;
+
 use super::vrf_evaluator::BlockProducerVrfEvaluatorAction;
-use super::{
-    BlockProducerCurrentState, BlockProducerWonSlot, BlockProducerWonSlotDiscardReason,
-    StagedLedgerDiffCreateOutput,
-};
+use super::{BlockProducerCurrentState, BlockProducerWonSlot, BlockProducerWonSlotDiscardReason};
 
 pub type BlockProducerActionWithMeta = redux::ActionWithMeta<BlockProducerAction>;
 pub type BlockProducerActionWithMetaRef<'a> = redux::ActionWithMeta<&'a BlockProducerAction>;