Merge pull request #1269 from o1-labs/copilot/fix-1267

Unify the usage of Fp, Fq and curves by replacing mina_hasher::Fp with mina_curves::pasta::Fp

Author: dannywillems

CHANGELOG.md

@@ -49,6 +49,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   Ubuntu 22.04 for test binary artifacts to ensure compatibility with Debian
   Bullseye container environment ([#1249](https://github.com/o1-labs/openmina/pull/1249))
 - **Build System**: Enhanced Makefile with documentation-related targets and comprehensive formatting commands ([#1234](https://github.com/o1-labs/openmina/pull/1234))
+- Use consistent `use` statements for fields. Replace `mina_hasher::Fp` with
+  `mina_curves::pasta::Fp`.
+  ([#1269](https://github.com/o1-labs/openmina/pull/1269/)).
+
 ### Fixed
 
 - **Documentation**: Resolved broken links and bare URL warnings in Rust

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,7 +1,7 @@
 use std::{io::Cursor, str::FromStr, sync::Arc};
 
 use ark_ff::{BigInteger256, One, UniformRand, Zero};
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 use mina_p2p_messages::{
     binprot::{BinProtRead, BinProtWrite},
     v2,

ledger/src/account/account.rs

@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
 use ark_ff::{UniformRand, Zero};
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 use o1_utils::{field_helpers::FieldHelpersError, FieldHelpers};
 use serde::{Deserialize, Serialize};
 

ledger/src/account/common.rs

@@ -2,7 +2,7 @@
 
 use ark_ec::short_weierstrass_jacobian::GroupAffine;
 use ark_ff::{fields::arithmetic::InvalidBigInt, Field, PrimeField};
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 use mina_p2p_messages::{
     bigint::BigInt,
     binprot,

ledger/src/account/conv.rs

@@ -5,7 +5,7 @@ use std::{
     sync::atomic::AtomicU64,
 };
 
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 use mina_signer::CompressedPubKey;
 use serde::{Deserialize, Serialize};
 

ledger/src/base.rs

@@ -78,8 +78,7 @@ mod tests {
 
     #[test]
     fn test_cache() {
-        use mina_curves::pasta::Fq;
-        use mina_hasher::Fp;
+        use mina_curves::pasta::{Fp, Fq};
 
         static COUNTER: AtomicUsize = AtomicUsize::new(0);