Replace mina_hasher::Fp with mina_curves::pasta::Fp in core and some ledger files

Co-authored-by: dannywillems <[email protected]>

Author: Copilot

Cargo.lock

@@ -35,6 +35,7 @@ graphannis-malloc_size_of_derive = { workspace = true }
 ark-ff = { workspace = true }
 hex = "0.4.3"
 libp2p-identity = { version = "=0.2.7", features = ["serde", "peerid"] }
+mina-curves = { workspace = true }
 mina-hasher = { workspace = true }
 mina-p2p-messages = { workspace = true }
 poseidon = { workspace = true }

core/Cargo.toml

@@ -1,5 +1,5 @@
 use binprot_derive::BinProtWrite;
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 use mina_p2p_messages::{bigint, number, v2};
 
 pub const GENESIS_PRODUCER_SK: &str = "EKFKgDtU3rcuFTVSEpmpXSkukjmX4cKefYREi6Sdsk7E7wsT7KRw";

core/src/constants.rs

@@ -111,7 +111,7 @@ impl NetworkConfig {
 pub mod devnet {
     use super::{CircuitsConfig, NetworkId};
     use crate::constants::{ConstraintConstants, ForkConstants};
-    use mina_hasher::Fp;
+    use mina_curves::pasta::Fp;
 
     pub const NETWORK_ID: NetworkId = NetworkId::TESTNET;
     pub const NAME: &str = "devnet";
@@ -194,7 +194,7 @@ pub mod devnet {
 pub mod mainnet {
     use super::{CircuitsConfig, NetworkId};
     use crate::constants::{ConstraintConstants, ForkConstants};
-    use mina_hasher::Fp;
+    use mina_curves::pasta::Fp;
 
     pub const NETWORK_ID: NetworkId = NetworkId::MAINNET;
     pub const NAME: &str = "mainnet";

core/src/network.rs

@@ -1,6 +1,6 @@
 use ark_ff::fields::arithmetic::InvalidBigInt;
 use mina_curves::pasta::Vesta;
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 use mina_p2p_messages::{bigint::BigInt, v2::PicklesProofProofsVerified2ReprStableV2};
 use poly_commitment::{commitment::CommitmentCurve, srs::SRS};
 

ledger/src/proofs/accumulator_check.rs

@@ -1,6 +1,6 @@
 use ark_ff::{One, Zero};
 use mina_curves::pasta::Fq;
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 
 use super::{
     field::Boolean,

ledger/src/proofs/constants.rs

@@ -99,7 +99,7 @@ pub mod bw19 {
 }
 
 use ark_ff::{FpParameters, One};
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 
 use self::tock::Conic;
 

ledger/src/proofs/group_map.rs

@@ -8,7 +8,7 @@ use crate::proofs::{
 };
 use ark_ff::fields::arithmetic::InvalidBigInt;
 use mina_curves::pasta::Fq;
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 use mina_p2p_messages::v2;
 
 use crate::{

ledger/src/proofs/merge.rs

@@ -47,19 +47,19 @@ pub type ProverProof<F> = kimchi::proof::ProverProof<
 pub fn generate_tx_proof(
     params: transaction::TransactionParams,
 ) -> anyhow::Result<wrap::WrapProof> {
-    use mina_hasher::Fp;
+    use mina_curves::pasta::Fp;
     use witness::Witness;
     let mut w: Witness<Fp> = Witness::new::<constants::StepTransactionProof>();
     transaction::generate_tx_proof(params, &mut w)
 }
 pub fn generate_merge_proof(params: merge::MergeParams) -> anyhow::Result<wrap::WrapProof> {
-    use mina_hasher::Fp;
+    use mina_curves::pasta::Fp;
     use witness::Witness;
     let mut w: Witness<Fp> = Witness::new::<constants::StepMergeProof>();
     merge::generate_merge_proof(params, &mut w)
 }
 pub fn generate_block_proof(params: block::BlockParams) -> anyhow::Result<wrap::WrapProof> {
-    use mina_hasher::Fp;
+    use mina_curves::pasta::Fp;
     use witness::Witness;
     let mut w: Witness<Fp> = Witness::new::<constants::StepBlockProof>();
     block::generate_block_proof(params, &mut w)

ledger/src/proofs/mod.rs

@@ -1,4 +1,4 @@
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 
 use crate::{
     proofs::{