fix(snark/block_verify): use on_init callback, otherwise verify init action isn't enabled

Author: binier

node/src/consensus/consensus_reducer.rs

@@ -3,7 +3,7 @@ use openmina_core::{
     bug_condition,
     consensus::{is_short_range_fork, long_range_fork_take, short_range_fork_take},
 };
-use snark::block_verify::{SnarkBlockVerifyAction, SnarkBlockVerifyError};
+use snark::block_verify::{SnarkBlockVerifyAction, SnarkBlockVerifyError, SnarkBlockVerifyId};
 
 use crate::{
     transition_frontier::sync::{
@@ -48,11 +48,13 @@ impl ConsensusState {
                 );
 
                 // Dispatch
-                let (dispatcher, global_state) = state_context.into_dispatcher_and_state();
-                let req_id = global_state.snark.block_verify.next_req_id();
+                let dispatcher = state_context.into_dispatcher();
                 dispatcher.push(SnarkBlockVerifyAction::Init {
-                    req_id,
                     block: (hash.clone(), block.clone()).into(),
+                    on_init: redux::callback!(
+                        on_received_block_snark_verify_init((hash: BlockHash, req_id: SnarkBlockVerifyId)) -> crate::Action {
+                            ConsensusAction::BlockSnarkVerifyPending { hash, req_id }
+                        }),
                     on_success: redux::callback!(
                         on_received_block_snark_verify_success(hash: BlockHash) -> crate::Action {
                             ConsensusAction::BlockSnarkVerifySuccess { hash }
@@ -62,10 +64,6 @@ impl ConsensusState {
                             ConsensusAction::BlockSnarkVerifyError { hash, error }
                         }),
                 });
-                dispatcher.push(ConsensusAction::BlockSnarkVerifyPending {
-                    req_id,
-                    hash: hash.clone(),
-                });
             }
             ConsensusAction::BlockChainProofUpdate { hash, chain_proof } => {
                 if state.best_tip.as_ref() == Some(hash) {

snark/src/block_verify/snark_block_verify_actions.rs

@@ -9,8 +9,9 @@ pub type SnarkBlockVerifyActionWithMetaRef<'a> = redux::ActionWithMeta<&'a Snark
 #[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)]
 pub enum SnarkBlockVerifyAction {
     Init {
-        req_id: SnarkBlockVerifyId,
         block: VerifiableBlockWithHash,
+
+        on_init: redux::Callback<(BlockHash, SnarkBlockVerifyId)>,
         on_success: redux::Callback<BlockHash>,
         on_error: redux::Callback<(BlockHash, SnarkBlockVerifyError)>,
     },
@@ -32,9 +33,7 @@ pub enum SnarkBlockVerifyAction {
 impl redux::EnablingCondition<crate::SnarkState> for SnarkBlockVerifyAction {
     fn is_enabled(&self, state: &crate::SnarkState, _time: redux::Timestamp) -> bool {
         match self {
-            SnarkBlockVerifyAction::Init { req_id, .. } => {
-                state.block_verify.jobs.next_req_id() == *req_id
-            }
+            SnarkBlockVerifyAction::Init { .. } => true,
             SnarkBlockVerifyAction::Pending { req_id } => state
                 .block_verify
                 .jobs

snark/src/block_verify/snark_block_verify_reducer.rs

@@ -27,11 +27,11 @@ pub fn reducer<State, Action>(
     match action {
         SnarkBlockVerifyAction::Init {
             block,
-            req_id,
+            on_init,
             on_success,
             on_error,
         } => {
-            state.jobs.add(SnarkBlockVerifyStatus::Init {
+            let req_id = state.jobs.add(SnarkBlockVerifyStatus::Init {
                 time: meta.time(),
                 block: block.clone(),
                 on_success: on_success.clone(),
@@ -42,13 +42,14 @@ pub fn reducer<State, Action>(
             let verifier_index = state.verifier_index.clone();
             let verifier_srs = state.verifier_srs.clone();
             let dispatcher = state_context.into_dispatcher();
+            dispatcher.push_callback(on_init.clone(), (block.hash_ref().clone(), req_id));
             dispatcher.push(SnarkBlockVerifyEffectfulAction::Init {
-                req_id: *req_id,
+                req_id,
                 block: block.clone(),
                 verifier_index,
                 verifier_srs,
             });
-            dispatcher.push(SnarkBlockVerifyAction::Pending { req_id: *req_id });
+            dispatcher.push(SnarkBlockVerifyAction::Pending { req_id });
         }
         SnarkBlockVerifyAction::Pending { req_id } => {
             if let Some(req) = state.jobs.get_mut(*req_id) {