Add mina-vrf and mina-snark workspace dependencies to crates

dannywillems · dannywillems · commit b41436e15476 · 2025-12-16T19:39:31.000-08:00
Update Cargo.toml files to use mina-vrf and mina-snark as workspace
dependencies instead of path-only references. Fix imports in source
files to use the correct external crate names (mina_vrf, mina_snark)
while preserving internal module re-exports (node::snark, node::vrf).
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -23,6 +23,8 @@ mina-node-account = { workspace = true }
 mina-node-native = { path = "../node/native" }
 mina-p2p-messages = { workspace = true }
 mina-signer = { workspace = true }
+mina-snark = { workspace = true }
+mina-vrf = { workspace = true }
 nix = { workspace = true, features = ["signal"] }
 node = { path = "../node", features = ["replay"], package = "mina-node" }
 num_cpus = { workspace = true }
@@ -37,7 +39,6 @@ shellexpand = { workspace = true }
 time = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
-vrf = { path = "../vrf", package = "mina-vrf" }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 redux = { workspace = true, features = ["serializable_callbacks"] }
diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml
@@ -24,6 +24,8 @@ mina-hasher = { workspace = true }
 mina-node-account = { workspace = true }
 mina-p2p-messages = { workspace = true }
 mina-signer = { workspace = true }
+mina-snark = { workspace = true }
+mina-vrf = { workspace = true }
 multihash = { workspace = true }
 num_enum = { workspace = true }
 p2p = { path = "../p2p", package = "mina-p2p" }
@@ -37,14 +39,12 @@ serde_json = { workspace = true, features = [
   "arbitrary_precision",
 ] }
 serde_with = { workspace = true, features = ["time_0_3"] }
-snark = { path = "../snark", package = "mina-snark" }
 static_assertions = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 thiserror = { workspace = true }
 time = { workspace = true, features = ["parsing"] }
 tokio = { workspace = true }
-vrf = { path = "../vrf", package = "mina-vrf" }
 
 [build-dependencies]
 regex = { workspace = true }
diff --git a/crates/node/common/Cargo.toml b/crates/node/common/Cargo.toml
@@ -15,6 +15,7 @@ ledger = { workspace = true }
 mina-core = { workspace = true }
 mina-p2p-messages = { workspace = true }
 mina-signer = { workspace = true }
+mina-vrf = { workspace = true }
 node = { path = "..", features = ["replay"], package = "mina-node" }
 rand = { workspace = true }
 rayon = { workspace = true }
@@ -25,7 +26,6 @@ sha3 = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["time", "macros"] }
 tracing = { workspace = true }
-vrf = { path = "../../vrf", package = "mina-vrf" }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 redux = { workspace = true }
diff --git a/crates/node/common/src/service/block_producer/vrf_evaluator.rs b/crates/node/common/src/service/block_producer/vrf_evaluator.rs
@@ -1,4 +1,5 @@
 use mina_signer::Keypair;
+use mina_vrf::{VrfEvaluationInput, VrfEvaluationOutput};
 use node::{
     block_producer::{
         vrf_evaluator::{VrfEvaluationOutputWithHash, VrfEvaluatorInput},
@@ -7,7 +8,6 @@ use node::{
     core::channels::mpsc::{TrackedUnboundedReceiver, UnboundedSender},
     event_source::Event,
 };
-use vrf::{VrfEvaluationInput, VrfEvaluationOutput};
 
 use crate::NodeService;
 
@@ -42,7 +42,7 @@ pub fn vrf_evaluator(
                     total_currency: (*total_currency).into(),
                 };
 
-                let vrf_result = vrf::evaluate_vrf(vrf_input).unwrap();
+                let vrf_result = mina_vrf::evaluate_vrf(vrf_input).unwrap();
 
                 // the first delegate that won the slot
                 if let VrfEvaluationOutput::SlotWon(_) = vrf_result {
diff --git a/crates/node/native/Cargo.toml b/crates/node/native/Cargo.toml
@@ -21,6 +21,8 @@ mina-core = { path = "../../core" }
 mina-node-common = { path = "../common" }
 mina-p2p-messages = { workspace = true }
 mina-signer = { workspace = true }
+mina-snark = { workspace = true }
+mina-vrf = { workspace = true }
 nix = { workspace = true, features = ["signal"] }
 node = { path = "..", features = ["replay"], package = "mina-node" }
 o1-utils = { workspace = true }
@@ -37,7 +39,6 @@ thiserror = { workspace = true }
 tokio = { workspace = true, features = ["process", "macros"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-vrf = { path = "../../vrf", package = "mina-vrf" }
 warp = { workspace = true }
 
 [features]
diff --git a/crates/node/src/block_producer/mod.rs b/crates/node/src/block_producer/mod.rs
@@ -19,9 +19,9 @@ mod block_producer_reducer;
 use ledger::AccountIndex;
 use mina_core::{block::ArcBlockWithHash, constants::constraint_constants};
 use mina_p2p_messages::{list::List, v2};
+use mina_vrf::output::VrfOutput;
 use poseidon::hash::params::MINA_EPOCH_SEED;
 use serde::{Deserialize, Serialize};
-use vrf::output::VrfOutput;
 
 use self::vrf_evaluator::VrfWonSlotWithHash;
 
diff --git a/crates/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs b/crates/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs
@@ -9,8 +9,8 @@ use mina_p2p_messages::v2::{
     ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1,
     ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1, LedgerHash,
 };
+use mina_vrf::{VrfEvaluationOutput, VrfWonSlot};
 use serde::{Deserialize, Serialize};
-use vrf::{VrfEvaluationOutput, VrfWonSlot};
 
 use super::{DelegatorTable, EpochData, InterruptReason, VrfEvaluatorInput};
 
diff --git a/crates/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs b/crates/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs
@@ -1,5 +1,5 @@
 use mina_core::bug_condition;
-use vrf::VrfEvaluationOutput;
+use mina_vrf::VrfEvaluationOutput;
 
 use crate::{
     block_producer::to_epoch_and_slot,
@@ -41,7 +41,7 @@ impl BlockProducerVrfEvaluatorState {
                 staking_ledger_hash,
             } => {
                 let global_slot_evaluated = match &vrf_output {
-                    vrf::VrfEvaluationOutput::SlotWon(won_slot_data) => {
+                    mina_vrf::VrfEvaluationOutput::SlotWon(won_slot_data) => {
                         state.won_slots.insert(
                             won_slot_data.global_slot,
                             VrfWonSlotWithHash::new(
@@ -51,7 +51,7 @@ impl BlockProducerVrfEvaluatorState {
                         );
                         won_slot_data.global_slot
                     }
-                    vrf::VrfEvaluationOutput::SlotLost(global_slot) => *global_slot,
+                    mina_vrf::VrfEvaluationOutput::SlotLost(global_slot) => *global_slot,
                 };
                 state.set_latest_evaluated_global_slot(&global_slot_evaluated);
 
diff --git a/crates/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_state.rs b/crates/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_state.rs
@@ -610,7 +610,7 @@ mod test {
             UnsignedExtendedUInt64Int64ForVersionTagsStableV1,
         },
     };
-    use vrf::VrfWonSlot;
+    use mina_vrf::VrfWonSlot;
 
     use crate::block_producer::vrf_evaluator::{
         BlockProducerVrfEvaluatorState, BlockProducerVrfEvaluatorStatus, EpochContext,
@@ -918,8 +918,10 @@ mod test {
                 producer: AccountSecretKey::genesis_producer().public_key(),
                 winner_account: AccountSecretKey::genesis_producer().public_key(),
                 vrf_output: Box::new(
-                    vrf::genesis_vrf(EpochSeed::from(MinaBaseEpochSeedStableV1(BigInt::zero())))
-                        .unwrap(),
+                    mina_vrf::genesis_vrf(EpochSeed::from(MinaBaseEpochSeedStableV1(
+                        BigInt::zero(),
+                    )))
+                    .unwrap(),
                 ),
                 global_slot: slot,
                 account_index: AccountIndex(0),
diff --git a/crates/node/src/block_producer/vrf_evaluator/mod.rs b/crates/node/src/block_producer/vrf_evaluator/mod.rs
@@ -13,8 +13,8 @@ use std::{collections::BTreeMap, sync::Arc};
 
 use ledger::AccountIndex;
 use mina_p2p_messages::v2::{EpochSeed, LedgerHash};
+use mina_vrf::{VrfEvaluationOutput, VrfWonSlot};
 use serde::{Deserialize, Serialize};
-use vrf::{VrfEvaluationOutput, VrfWonSlot};
 
 use crate::account::AccountPublicKey;
 
diff --git a/crates/node/src/event_source/event_source_effects.rs b/crates/node/src/event_source/event_source_effects.rs
@@ -1,3 +1,4 @@
+use mina_snark::user_command_verify::{SnarkUserCommandVerifyAction, SnarkUserCommandVerifyError};
 use p2p::channels::{
     signaling::{
         discovery::P2pChannelsSignalingDiscoveryAction,
@@ -7,7 +8,6 @@ use p2p::channels::{
     streaming_rpc::P2pChannelsStreamingRpcAction,
     transaction::P2pChannelsTransactionAction,
 };
-use snark::user_command_verify::{SnarkUserCommandVerifyAction, SnarkUserCommandVerifyError};
 
 #[cfg(feature = "p2p-libp2p")]
 use crate::p2p::{MioEvent, P2pNetworkSchedulerAction};
diff --git a/crates/node/src/external_snark_worker_effectful/external_snark_worker_service.rs b/crates/node/src/external_snark_worker_effectful/external_snark_worker_service.rs
@@ -1,6 +1,6 @@
 use mina_p2p_messages::v2::{CurrencyFeeStableV1, NonZeroCurvePoint};
+use mina_snark::TransactionVerifier;
 use serde::{Deserialize, Serialize};
-use snark::TransactionVerifier;
 
 use crate::external_snark_worker::{
     ExternalSnarkWorkerError, ExternalSnarkWorkerWorkError, SnarkWorkResult, SnarkWorkSpec,
diff --git a/crates/node/src/reducer.rs b/crates/node/src/reducer.rs
@@ -62,7 +62,10 @@ pub fn reducer(
         }
         Action::LedgerEffects(_) => {}
         Action::Snark(a) => {
-            snark::SnarkState::reducer(Substate::new(state, dispatcher), meta.with_action(a));
+            crate::snark::SnarkState::reducer(
+                Substate::new(state, dispatcher),
+                meta.with_action(a),
+            );
         }
         Action::TransitionFrontier(a) => {
             crate::transition_frontier::TransitionFrontierState::reducer(
diff --git a/crates/node/src/service.rs b/crates/node/src/service.rs
@@ -19,8 +19,8 @@ pub use crate::{
         sync::ledger::snarked::TransitionFrontierSyncLedgerSnarkedService,
     },
 };
+pub use mina_snark::user_command_verify_effectful::SnarkUserCommandVerifyService;
 pub use redux::TimeService;
-pub use snark::user_command_verify_effectful::SnarkUserCommandVerifyService;
 
 use crate::stats::Stats;
 
diff --git a/crates/node/src/snark/block_verify/mod.rs b/crates/node/src/snark/block_verify/mod.rs
@@ -1,3 +1,3 @@
-pub use ::snark::{block_verify::*, block_verify_effectful::*};
+pub use ::mina_snark::{block_verify::*, block_verify_effectful::*};
 
 mod snark_block_verify_actions;
diff --git a/crates/node/src/snark/mod.rs b/crates/node/src/snark/mod.rs
@@ -1,4 +1,4 @@
-pub use ::snark::*;
+pub use ::mina_snark::*;
 
 pub mod block_verify;
 pub mod user_command_verify;
diff --git a/crates/node/src/snark/user_command_verify/mod.rs b/crates/node/src/snark/user_command_verify/mod.rs
@@ -1,3 +1,3 @@
-pub use ::snark::user_command_verify::*;
+pub use ::mina_snark::user_command_verify::*;
 
 mod snark_user_command_verify_actions;
diff --git a/crates/node/src/snark/user_command_verify/snark_user_command_verify_actions.rs b/crates/node/src/snark/user_command_verify/snark_user_command_verify_actions.rs
@@ -1,4 +1,4 @@
-use snark::user_command_verify_effectful::SnarkUserCommandVerifyEffectfulAction;
+use mina_snark::user_command_verify_effectful::SnarkUserCommandVerifyEffectfulAction;
 
 use super::*;
 
diff --git a/crates/node/src/snark/work_verify/mod.rs b/crates/node/src/snark/work_verify/mod.rs
@@ -1,3 +1,3 @@
-pub use ::snark::{work_verify::*, work_verify_effectful::*};
+pub use ::mina_snark::{work_verify::*, work_verify_effectful::*};
 
 mod snark_work_verify_actions;
diff --git a/crates/node/src/snark_pool/candidate/snark_pool_candidate_reducer.rs b/crates/node/src/snark_pool/candidate/snark_pool_candidate_reducer.rs
@@ -2,12 +2,12 @@ use std::collections::BTreeMap;
 
 use crate::{p2p_ready, SnarkPoolAction};
 use mina_core::snark::{Snark, SnarkJobId};
+use mina_snark::{work_verify::SnarkWorkVerifyAction, work_verify_effectful::SnarkWorkVerifyId};
 use p2p::{
     channels::rpc::{P2pChannelsRpcAction, P2pRpcId, P2pRpcRequest},
     disconnection::{P2pDisconnectionAction, P2pDisconnectionReason},
     BroadcastMessageId, P2pNetworkPubsubAction, PeerId,
 };
-use snark::{work_verify::SnarkWorkVerifyAction, work_verify_effectful::SnarkWorkVerifyId};
 
 use super::{
     SnarkPoolCandidateAction, SnarkPoolCandidateActionWithMetaRef, SnarkPoolCandidatesState,
diff --git a/crates/node/src/state.rs b/crates/node/src/state.rs
@@ -18,6 +18,10 @@ use mina_core::{
     snark::{Snark, SnarkInfo, SnarkJobCommitment},
     ChainId,
 };
+use mina_snark::{
+    block_verify::SnarkBlockVerifyState, user_command_verify::SnarkUserCommandVerifyState,
+    work_verify::SnarkWorkVerifyState,
+};
 use p2p::{
     bootstrap::P2pNetworkKadBootstrapState,
     channels::{
@@ -30,10 +34,6 @@ use p2p::{
 };
 use redux::{ActionMeta, EnablingCondition, Timestamp};
 use serde::{Deserialize, Serialize};
-use snark::{
-    block_verify::SnarkBlockVerifyState, user_command_verify::SnarkUserCommandVerifyState,
-    work_verify::SnarkWorkVerifyState,
-};
 
 use crate::{
     block_producer::vrf_evaluator::BlockProducerVrfEvaluatorState,
diff --git a/crates/node/src/transaction_pool/transaction_pool_reducer.rs b/crates/node/src/transaction_pool/transaction_pool_reducer.rs
@@ -11,11 +11,11 @@ use mina_core::{
     constants::constraint_constants,
     transaction::{Transaction, TransactionPoolMessageSource, TransactionWithHash},
 };
+use mina_snark::user_command_verify::{SnarkUserCommandVerifyAction, SnarkUserCommandVerifyId};
 use p2p::{
     channels::transaction::P2pChannelsTransactionAction, BroadcastMessageId, P2pNetworkPubsubAction,
 };
 use redux::callback;
-use snark::user_command_verify::{SnarkUserCommandVerifyAction, SnarkUserCommandVerifyId};
 use std::collections::{BTreeMap, BTreeSet};
 
 use crate::{BlockProducerAction, RpcAction};
diff --git a/crates/node/src/transition_frontier/candidate/transition_frontier_candidate_actions.rs b/crates/node/src/transition_frontier/candidate/transition_frontier_candidate_actions.rs
@@ -4,8 +4,8 @@ use mina_core::{
     ActionEvent,
 };
 use mina_p2p_messages::v2::StateHash;
+use mina_snark::block_verify::SnarkBlockVerifyError;
 use serde::{Deserialize, Serialize};
-use snark::block_verify::SnarkBlockVerifyError;
 
 use crate::snark::block_verify::SnarkBlockVerifyId;
 
diff --git a/crates/node/src/transition_frontier/candidate/transition_frontier_candidate_reducer.rs b/crates/node/src/transition_frontier/candidate/transition_frontier_candidate_reducer.rs
@@ -2,7 +2,7 @@ use mina_core::{
     block::{ArcBlockWithHash, BlockHash},
     bug_condition,
 };
-use snark::block_verify::{SnarkBlockVerifyAction, SnarkBlockVerifyError, SnarkBlockVerifyId};
+use mina_snark::block_verify::{SnarkBlockVerifyAction, SnarkBlockVerifyError, SnarkBlockVerifyId};
 
 use crate::{
     transition_frontier::sync::{
diff --git a/crates/node/src/transition_frontier/genesis/transition_frontier_genesis_reducer.rs b/crates/node/src/transition_frontier/genesis/transition_frontier_genesis_reducer.rs
@@ -58,7 +58,7 @@ impl TransitionFrontierGenesisState {
                     return;
                 };
 
-                let genesis_vrf = ::vrf::genesis_vrf(data.staking_epoch_seed.clone()).unwrap();
+                let genesis_vrf = ::mina_vrf::genesis_vrf(data.staking_epoch_seed.clone()).unwrap();
                 let genesis_vrf_hash = genesis_vrf.hash();
 
                 let Ok((negative_one, genesis, genesis_hash)) =
diff --git a/crates/node/web/Cargo.toml b/crates/node/web/Cargo.toml
@@ -20,14 +20,14 @@ libp2p-identity = { workspace = true, features = ["peerid"] }
 mina-node-common = { workspace = true }
 mina-p2p-messages = { workspace = true }
 mina-signer = { workspace = true }
+mina-vrf = { workspace = true }
 node = { path = "..", package = "mina-node" }
 rand = { workspace = true }
 rayon = { workspace = true }
 redux = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-vrf = { path = "../../vrf", package = "mina-vrf" }
 wasm-bindgen = { workspace = true }
 wasm-bindgen-futures = { workspace = true }
 
diff --git a/tools/testing/Cargo.toml b/tools/testing/Cargo.toml
@@ -42,6 +42,8 @@ mina-core = { workspace = true }
 mina-node-invariants = { workspace = true }
 mina-node-native = { workspace = true }
 mina-p2p-messages = { workspace = true }
+mina-snark = { workspace = true }
+mina-vrf = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 nix = { workspace = true }
@@ -66,7 +68,6 @@ tokio = { workspace = true }
 tower-http = { workspace = true }
 tracing = { workspace = true }
 tracing-log = { workspace = true }
-vrf = { path = "../../crates/vrf", package = "mina-vrf" }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 redux = { workspace = true, features = ["serializable_callbacks"] }
diff --git a/tools/testing/src/scenarios/multi_node/vrf_correct_slots.rs b/tools/testing/src/scenarios/multi_node/vrf_correct_slots.rs
@@ -1,5 +1,6 @@
 use std::{collections::BTreeMap, str::FromStr, time::Duration};
 
+use mina_vrf::VrfEvaluationOutput;
 use node::{
     account::AccountSecretKey,
     block_producer::{
@@ -10,7 +11,6 @@ use node::{
     p2p::P2pTimeouts,
     BlockProducerConfig,
 };
-use vrf::VrfEvaluationOutput;
 
 use crate::{
     node::{OcamlVrfOutput, RustNodeBlockProducerTestingConfig, RustNodeTestingConfig},
