Merge pull request #912 from openmina/fix/producer-status-rpc

fix(rpc): Replace `next_won_slot` in `/status` with `current_block_production_attempt`

Author: tizoc

node/src/rpc/mod.rs

@@ -453,7 +453,7 @@ pub struct RpcNodeStatus {
     pub peers: Vec<RpcPeerInfo>,
     pub snark_pool: RpcNodeStatusSnarkPool,
     pub transaction_pool: RpcNodeStatusTransactionPool,
-    pub next_won_slot: Option<BlockProductionAttemptWonSlot>,
+    pub current_block_production_attempt: Option<BlockProductionAttempt>,
 }
 
 #[derive(Serialize, Debug, Clone)]

node/src/rpc_effectful/rpc_effectful_effects.rs

@@ -17,11 +17,10 @@ use crate::{
         RpcTransactionInjectResponse, TransactionStatus,
     },
     snark_pool::SnarkPoolAction,
-    stats::block_producer::BlockProductionAttemptWonSlot,
     transition_frontier::sync::{
         ledger::TransitionFrontierSyncLedgerState, TransitionFrontierSyncState,
     },
-    Service, State, Store,
+    Service, Store,
 };
 use ledger::{
     scan_state::currency::{Balance, Magnitude},
@@ -47,14 +46,6 @@ macro_rules! respond_or_log {
     };
 }
 
-fn get_next_won_slot(state: &State) -> Option<BlockProductionAttemptWonSlot> {
-    let best_tip = state.transition_frontier.best_tip()?;
-    let cur_global_slot = state.cur_global_slot()?;
-    let vrf = state.block_producer.vrf_evaluator()?;
-    let won_slot = vrf.next_won_slot(cur_global_slot, best_tip)?;
-    Some((&won_slot).into())
-}
-
 pub fn rpc_effects<S: Service>(store: &mut Store<S>, action: ActionWithMeta<RpcEffectfulAction>) {
     let (action, meta) = action.split();
 
@@ -73,7 +64,10 @@ pub fn rpc_effects<S: Service>(store: &mut Store<S>, action: ActionWithMeta<RpcE
                     height: b.height(),
                     global_slot: b.global_slot(),
                 };
-            let next_won_slot = get_next_won_slot(state);
+            let current_block_production_attempt = store
+                .service
+                .stats()
+                .and_then(|stats| Some(stats.block_producer().collect_attempts().last()?.clone()));
             let status = RpcNodeStatus {
                 chain_id,
                 transition_frontier: RpcNodeStatusTransitionFrontier {
@@ -99,7 +93,7 @@ pub fn rpc_effects<S: Service>(store: &mut Store<S>, action: ActionWithMeta<RpcE
                 transaction_pool: RpcNodeStatusTransactionPool {
                     transactions: state.transaction_pool.size(),
                 },
-                next_won_slot,
+                current_block_production_attempt,
             };
             let _ = store.service.respond_status_get(rpc_id, Some(status));
         }