From 300707b50c04852469a6c49cd7e4ed23a10026e5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:00:59 +0000 Subject: [PATCH 1/5] Initial plan From a810bedbcb25f68ffecd308fbdc70f96680d9b59 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:15:43 +0000 Subject: [PATCH 2/5] Replace mina_hasher::Fp with mina_curves::pasta::Fp in core and some ledger files Co-authored-by: dannywillems <6018454+dannywillems@users.noreply.github.com> --- Cargo.lock | 1 + core/Cargo.toml | 1 + core/src/constants.rs | 2 +- core/src/network.rs | 4 ++-- ledger/src/proofs/accumulator_check.rs | 2 +- ledger/src/proofs/constants.rs | 2 +- ledger/src/proofs/group_map.rs | 2 +- ledger/src/proofs/merge.rs | 2 +- ledger/src/proofs/mod.rs | 6 +++--- ledger/src/proofs/numbers/nat.rs | 2 +- ledger/src/proofs/prover.rs | 2 +- ledger/src/proofs/provers.rs | 2 +- ledger/src/proofs/step.rs | 2 +- ledger/src/proofs/to_field_elements.rs | 2 +- ledger/src/proofs/transaction.rs | 2 +- ledger/src/proofs/unfinalized.rs | 4 ++-- ledger/src/proofs/verification.rs | 4 ++-- ledger/src/proofs/verifiers.rs | 2 +- ledger/src/proofs/wrap.rs | 2 +- ledger/src/tree.rs | 2 +- 20 files changed, 25 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1629fc80dc..0abc7c54a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5991,6 +5991,7 @@ dependencies = [ "lazy_static", "libp2p-identity", "md5", + "mina-curves", "mina-hasher", "mina-p2p-messages", "multihash 0.18.1", diff --git a/core/Cargo.toml b/core/Cargo.toml index 76158f8020..0e50c6895d 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -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 } diff --git a/core/src/constants.rs b/core/src/constants.rs index 070adfbddc..f2514f1081 100644 --- a/core/src/constants.rs +++ b/core/src/constants.rs @@ -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"; diff --git a/core/src/network.rs b/core/src/network.rs index 53d670e0de..56d9e8f5ee 100644 --- a/core/src/network.rs +++ b/core/src/network.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"; diff --git a/ledger/src/proofs/accumulator_check.rs b/ledger/src/proofs/accumulator_check.rs index ad5e2f7df0..4e0164e861 100644 --- a/ledger/src/proofs/accumulator_check.rs +++ b/ledger/src/proofs/accumulator_check.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}; diff --git a/ledger/src/proofs/constants.rs b/ledger/src/proofs/constants.rs index 9f5e2b1699..2c4b8b6ab3 100644 --- a/ledger/src/proofs/constants.rs +++ b/ledger/src/proofs/constants.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, diff --git a/ledger/src/proofs/group_map.rs b/ledger/src/proofs/group_map.rs index a0b5c525e4..5663a5d8db 100644 --- a/ledger/src/proofs/group_map.rs +++ b/ledger/src/proofs/group_map.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; diff --git a/ledger/src/proofs/merge.rs b/ledger/src/proofs/merge.rs index a1383ea7a5..0e1c192078 100644 --- a/ledger/src/proofs/merge.rs +++ b/ledger/src/proofs/merge.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::{ diff --git a/ledger/src/proofs/mod.rs b/ledger/src/proofs/mod.rs index 96ba6e1bda..cd2c76ac0f 100644 --- a/ledger/src/proofs/mod.rs +++ b/ledger/src/proofs/mod.rs @@ -47,19 +47,19 @@ pub type ProverProof = kimchi::proof::ProverProof< pub fn generate_tx_proof( params: transaction::TransactionParams, ) -> anyhow::Result { - use mina_hasher::Fp; + use mina_curves::pasta::Fp; use witness::Witness; let mut w: Witness = Witness::new::(); transaction::generate_tx_proof(params, &mut w) } pub fn generate_merge_proof(params: merge::MergeParams) -> anyhow::Result { - use mina_hasher::Fp; + use mina_curves::pasta::Fp; use witness::Witness; let mut w: Witness = Witness::new::(); merge::generate_merge_proof(params, &mut w) } pub fn generate_block_proof(params: block::BlockParams) -> anyhow::Result { - use mina_hasher::Fp; + use mina_curves::pasta::Fp; use witness::Witness; let mut w: Witness = Witness::new::(); block::generate_block_proof(params, &mut w) diff --git a/ledger/src/proofs/numbers/nat.rs b/ledger/src/proofs/numbers/nat.rs index 9965c43450..e09a83b4c0 100644 --- a/ledger/src/proofs/numbers/nat.rs +++ b/ledger/src/proofs/numbers/nat.rs @@ -1,4 +1,4 @@ -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use crate::{ proofs::{ diff --git a/ledger/src/proofs/prover.rs b/ledger/src/proofs/prover.rs index eb8b9ad281..28ba21f755 100644 --- a/ledger/src/proofs/prover.rs +++ b/ledger/src/proofs/prover.rs @@ -5,7 +5,7 @@ use kimchi::{ proof::{PointEvaluations, ProofEvaluations, ProverCommitments, RecursionChallenge}, }; use mina_curves::pasta::Pallas; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use once_cell::sync::Lazy; use poly_commitment::{commitment::CommitmentCurve, evaluation_proof::OpeningProof}; diff --git a/ledger/src/proofs/provers.rs b/ledger/src/proofs/provers.rs index 3afd8aa71c..e94cc40a1b 100644 --- a/ledger/src/proofs/provers.rs +++ b/ledger/src/proofs/provers.rs @@ -2,7 +2,7 @@ use std::{collections::HashMap, path::Path, sync::Arc}; use kimchi::circuits::gate::CircuitGate; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use once_cell::sync::OnceCell; use openmina_core::network::CircuitsConfig; diff --git a/ledger/src/proofs/step.rs b/ledger/src/proofs/step.rs index 3ddcc92615..8b052b03a1 100644 --- a/ledger/src/proofs/step.rs +++ b/ledger/src/proofs/step.rs @@ -24,7 +24,7 @@ use ark_poly::{ }; use kimchi::proof::{PointEvaluations, ProverCommitments, RecursionChallenge}; use mina_curves::pasta::{Fq, Pallas}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2; use poly_commitment::{commitment::b_poly_coefficients, evaluation_proof::OpeningProof}; diff --git a/ledger/src/proofs/to_field_elements.rs b/ledger/src/proofs/to_field_elements.rs index 5d89bec5c9..f78c27f780 100644 --- a/ledger/src/proofs/to_field_elements.rs +++ b/ledger/src/proofs/to_field_elements.rs @@ -7,7 +7,7 @@ use crate::{ use ark_ff::{Field, One, Zero}; use kimchi::proof::{PointEvaluations, ProofEvaluations, ProverCommitments, ProverProof}; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{string::ByteString, v2}; use mina_signer::CompressedPubKey; use poly_commitment::evaluation_proof::OpeningProof; diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs index 4ccbca1526..f444d858fc 100644 --- a/ledger/src/proofs/transaction.rs +++ b/ledger/src/proofs/transaction.rs @@ -8,7 +8,7 @@ use kimchi::{ proof::RecursionChallenge, }; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2::{ self, ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1, ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1, CurrencyAmountStableV1, diff --git a/ledger/src/proofs/unfinalized.rs b/ledger/src/proofs/unfinalized.rs index daaac4e1ec..2681e47781 100644 --- a/ledger/src/proofs/unfinalized.rs +++ b/ledger/src/proofs/unfinalized.rs @@ -1,7 +1,7 @@ use ark_ff::fields::arithmetic::InvalidBigInt; use kimchi::proof::{PointEvaluations, ProofEvaluations}; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2; use crate::proofs::{ @@ -26,7 +26,7 @@ use super::{ pub mod ro { use mina_curves::pasta::Fq; - use mina_hasher::Fp; + use mina_curves::pasta::Fp; use crate::proofs::{ field::FieldWitness, public_input::scalar_challenge::ScalarChallenge, diff --git a/ledger/src/proofs/verification.rs b/ledger/src/proofs/verification.rs index b5a15ba55f..5ab2a777f9 100644 --- a/ledger/src/proofs/verification.rs +++ b/ledger/src/proofs/verification.rs @@ -41,7 +41,7 @@ use kimchi::{ proof::{PointEvaluations, ProofEvaluations}, }; use mina_curves::pasta::{Fq, Vesta}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{ bigint::BigInt, binprot::BinProtWrite, @@ -1033,7 +1033,7 @@ mod on_fail { mod tests { use std::path::Path; - use mina_hasher::Fp; + use mina_curves::pasta::Fp; use mina_p2p_messages::{binprot::BinProtRead, v2}; use crate::proofs::{provers::devnet_circuit_directory, transaction::tests::panic_in_ci}; diff --git a/ledger/src/proofs/verifiers.rs b/ledger/src/proofs/verifiers.rs index 5bcb1a5f64..33815a8c3f 100644 --- a/ledger/src/proofs/verifiers.rs +++ b/ledger/src/proofs/verifiers.rs @@ -22,7 +22,7 @@ use kimchi::{ mina_curves::pasta::Pallas, }; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use poly_commitment::srs::SRS; use crate::{proofs::BACKEND_TOCK_ROUNDS_N, VerificationKey}; diff --git a/ledger/src/proofs/wrap.rs b/ledger/src/proofs/wrap.rs index 412bbe5dcf..86b3b661f2 100644 --- a/ledger/src/proofs/wrap.rs +++ b/ledger/src/proofs/wrap.rs @@ -8,7 +8,7 @@ use kimchi::{ proof::{PointEvaluations, ProofEvaluations, RecursionChallenge}, }; use mina_curves::pasta::{Fq, Pallas, Vesta}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2::{ CompositionTypesBranchDataDomainLog2StableV1, CompositionTypesBranchDataStableV1, PicklesBaseProofsVerifiedStableV1, diff --git a/ledger/src/tree.rs b/ledger/src/tree.rs index 69cb444549..63e9ddd9a6 100644 --- a/ledger/src/tree.rs +++ b/ledger/src/tree.rs @@ -5,7 +5,7 @@ use crate::{ base::AccountIndex, tree_version::{TreeVersion, V2}, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use once_cell::sync::Lazy; #[derive(Clone, Debug)] From 916998a88aec875294be238eb6aeda78810ec01c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:31:11 +0000 Subject: [PATCH 3/5] Complete replacement of mina_hasher::Fp with mina_curves::pasta::Fp across all files Co-authored-by: dannywillems <6018454+dannywillems@users.noreply.github.com> --- Cargo.lock | 1 + ledger/src/account/account.rs | 2 +- ledger/src/account/common.rs | 2 +- ledger/src/account/conv.rs | 2 +- ledger/src/base.rs | 2 +- ledger/src/cache.rs | 2 +- ledger/src/database/database.rs | 2 +- ledger/src/database/database_impl.rs | 2 +- ledger/src/ffi/database.rs | 2 +- ledger/src/ffi/mask.rs | 2 +- ledger/src/generators/zkapp_command.rs | 2 +- ledger/src/hash.rs | 2 +- ledger/src/mask/mask.rs | 2 +- ledger/src/mask/mask_impl.rs | 2 +- ledger/src/port_ocaml/hash.rs | 2 +- ledger/src/poseidon/fp.rs | 14 +++++++------- ledger/src/proofs/block.rs | 2 +- ledger/src/proofs/conv.rs | 2 +- ledger/src/proofs/field.rs | 2 +- ledger/src/proofs/public_input/messages.rs | 2 +- ledger/src/proofs/public_input/plonk_checks.rs | 2 +- .../src/proofs/public_input/prepared_statement.rs | 2 +- ledger/src/proofs/public_input/protocol_state.rs | 2 +- ledger/src/proofs/public_input/scalar_challenge.rs | 2 +- ledger/src/proofs/public_input/scalars.rs | 4 ++-- ledger/src/proofs/transition_chain.rs | 2 +- ledger/src/proofs/zkapp.rs | 2 +- ledger/src/scan_state/conv.rs | 2 +- ledger/src/scan_state/fee_excess.rs | 2 +- ledger/src/scan_state/pending_coinbase.rs | 2 +- ledger/src/scan_state/protocol_state.rs | 2 +- ledger/src/scan_state/scan_state.rs | 4 ++-- ledger/src/sparse_ledger/mod.rs | 2 +- ledger/src/sparse_ledger/sparse_ledger.rs | 2 +- ledger/src/sparse_ledger/sparse_ledger_impl.rs | 2 +- ledger/src/staged_ledger/hash.rs | 2 +- ledger/src/staged_ledger/staged_ledger.rs | 4 ++-- ledger/src/transaction_pool.rs | 2 +- ledger/src/tree_version.rs | 2 +- ledger/src/util/mod.rs | 2 +- ledger/src/verifier/mod.rs | 2 +- ledger/src/zkapps/checks.rs | 2 +- ledger/src/zkapps/intefaces.rs | 2 +- ledger/src/zkapps/non_snark.rs | 2 +- ledger/src/zkapps/snark.rs | 2 +- ledger/src/zkapps/zkapp_logic.rs | 2 +- mina-p2p-messages/src/bigint.rs | 4 ++-- mina-p2p-messages/src/hash.rs | 2 +- mina-p2p-messages/src/v2/hashing.rs | 6 +++--- mina-p2p-messages/src/v2/manual.rs | 8 ++++---- node/Cargo.toml | 1 + node/src/block_producer/mod.rs | 2 +- node/src/daemon_json/json_ledger.rs | 2 +- node/src/ledger/ledger_service.rs | 2 +- node/src/ledger/mod.rs | 6 +++--- .../genesis/transition_frontier_genesis_config.rs | 2 +- .../transition_frontier/sync/ledger/staged/mod.rs | 2 +- snark/src/lib.rs | 2 +- tools/fuzzing/src/main.rs | 2 +- tools/fuzzing/src/transaction_fuzzer/context.rs | 2 +- tools/fuzzing/src/transaction_fuzzer/generator.rs | 2 +- tools/fuzzing/src/transaction_fuzzer/mutator.rs | 2 +- vrf/src/message.rs | 2 +- 63 files changed, 80 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0abc7c54a1..870bc0a544 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5575,6 +5575,7 @@ dependencies = [ "hex", "lazy_static", "linkme", + "mina-curves", "mina-hasher", "mina-p2p-messages", "mina-signer", diff --git a/ledger/src/account/account.rs b/ledger/src/account/account.rs index bc52bf84c7..3a77f6f202 100644 --- a/ledger/src/account/account.rs +++ b/ledger/src/account/account.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, diff --git a/ledger/src/account/common.rs b/ledger/src/account/common.rs index 7ee6e18e22..84b9cb3591 100644 --- a/ledger/src/account/common.rs +++ b/ledger/src/account/common.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}; diff --git a/ledger/src/account/conv.rs b/ledger/src/account/conv.rs index bfe2cd56f1..b4b08b8578 100644 --- a/ledger/src/account/conv.rs +++ b/ledger/src/account/conv.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, diff --git a/ledger/src/base.rs b/ledger/src/base.rs index 208c141ac5..b5ca981dd4 100644 --- a/ledger/src/base.rs +++ b/ledger/src/base.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}; diff --git a/ledger/src/cache.rs b/ledger/src/cache.rs index 5ab034a784..e67ddbe344 100644 --- a/ledger/src/cache.rs +++ b/ledger/src/cache.rs @@ -79,7 +79,7 @@ mod tests { #[test] fn test_cache() { use mina_curves::pasta::Fq; - use mina_hasher::Fp; + use mina_curves::pasta::Fp; static COUNTER: AtomicUsize = AtomicUsize::new(0); diff --git a/ledger/src/database/database.rs b/ledger/src/database/database.rs index 00d40ac8d5..8d0ee7db4c 100644 --- a/ledger/src/database/database.rs +++ b/ledger/src/database/database.rs @@ -4,7 +4,7 @@ use std::{ sync::{Arc, Mutex}, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use crate::{ diff --git a/ledger/src/database/database_impl.rs b/ledger/src/database/database_impl.rs index 3f9b2a7569..b5a2ae19fb 100644 --- a/ledger/src/database/database_impl.rs +++ b/ledger/src/database/database_impl.rs @@ -4,7 +4,7 @@ use std::{ path::PathBuf, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use crate::{ diff --git a/ledger/src/ffi/database.rs b/ledger/src/ffi/database.rs index d2b280d5de..75cd545b6e 100644 --- a/ledger/src/ffi/database.rs +++ b/ledger/src/ffi/database.rs @@ -10,7 +10,7 @@ use std::{ use ark_ff::BigInteger256; use binprot::BinProtWrite; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{ bigint::BigInt, binprot, diff --git a/ledger/src/ffi/mask.rs b/ledger/src/ffi/mask.rs index 5a47e732c9..5e89e90957 100644 --- a/ledger/src/ffi/mask.rs +++ b/ledger/src/ffi/mask.rs @@ -1,6 +1,6 @@ use std::{borrow::Borrow, cell::RefCell, rc::Rc, str::FromStr}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2::NonZeroCurvePointUncompressedStableV1; use ocaml_interop::{ impl_to_ocaml_polymorphic_variant, impl_to_ocaml_variant, ocaml_export, DynBox, OCaml, diff --git a/ledger/src/generators/zkapp_command.rs b/ledger/src/generators/zkapp_command.rs index 474cba65d6..f52f49b54b 100644 --- a/ledger/src/generators/zkapp_command.rs +++ b/ledger/src/generators/zkapp_command.rs @@ -7,7 +7,7 @@ use std::{ }; use ark_ff::{UniformRand, Zero}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::{CompressedPubKey, Keypair, Signature}; use rand::{ rngs::ThreadRng, diff --git a/ledger/src/hash.rs b/ledger/src/hash.rs index d90f3f424a..6a6f68a14f 100644 --- a/ledger/src/hash.rs +++ b/ledger/src/hash.rs @@ -1,4 +1,4 @@ -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use crate::{proofs::witness::Witness, scan_state::currency}; diff --git a/ledger/src/mask/mask.rs b/ledger/src/mask/mask.rs index 0b4b74b7ea..d20fd5de92 100644 --- a/ledger/src/mask/mask.rs +++ b/ledger/src/mask/mask.rs @@ -4,7 +4,7 @@ use std::{ sync::{Arc, Mutex}, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use crate::{ diff --git a/ledger/src/mask/mask_impl.rs b/ledger/src/mask/mask_impl.rs index a970e6f263..94475f4cc7 100644 --- a/ledger/src/mask/mask_impl.rs +++ b/ledger/src/mask/mask_impl.rs @@ -3,7 +3,7 @@ use std::{ path::PathBuf, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use crate::{ diff --git a/ledger/src/port_ocaml/hash.rs b/ledger/src/port_ocaml/hash.rs index d32e281f4b..42542aec7b 100644 --- a/ledger/src/port_ocaml/hash.rs +++ b/ledger/src/port_ocaml/hash.rs @@ -4,7 +4,7 @@ use std::hash::Hasher; use ark_ff::{BigInteger, BigInteger256}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use crate::AccountId; diff --git a/ledger/src/poseidon/fp.rs b/ledger/src/poseidon/fp.rs index 58c7868197..15b9aaa89b 100644 --- a/ledger/src/poseidon/fp.rs +++ b/ledger/src/poseidon/fp.rs @@ -519,7 +519,7 @@ mod tests { .collect::>(); let mina_fps = CONSTANTS .iter() - .map(|s| mina_hasher::Fp::from_str(s).unwrap()) + .map(|s| mina_curves::pasta::Fp::from_str(s).unwrap()) .collect::>(); let mut fp = fps[0].clone(); @@ -545,7 +545,7 @@ mod tests { assert_eq!(fp.0, mina_fp.0 .0); // let fp = Fp::from_str(CONSTANTS[0]).unwrap(); - // let mina_fp = mina_hasher::Fp::from_str(CONSTANTS[0]).unwrap(); + // let mina_fp = mina_curves::pasta::Fp::from_str(CONSTANTS[0]).unwrap(); // for s in CONSTANTS { // fp.mul_assign(s); @@ -554,12 +554,12 @@ mod tests { #[test] fn test_fp() { - assert_eq!(Fp::zero().0, mina_hasher::Fp::zero().0 .0); - assert_eq!(Fp::from(10).0, mina_hasher::Fp::from(10).0 .0); + assert_eq!(Fp::zero().0, mina_curves::pasta::Fp::zero().0 .0); + assert_eq!(Fp::from(10).0, mina_curves::pasta::Fp::from(10).0 .0); for s in CONSTANTS { let fp = Fp::from_str(s).unwrap(); - let mina_fp = mina_hasher::Fp::from_str(s).unwrap(); + let mina_fp = mina_curves::pasta::Fp::from_str(s).unwrap(); assert_eq!(fp.0, mina_fp.0 .0); assert_eq!(fp.into_repr(), mina_fp.into_repr().0) @@ -571,8 +571,8 @@ mod tests { let mut fp1 = Fp::from_str(s1).unwrap(); let fp2 = Fp::from_str(s2).unwrap(); - let mut mina_fp1 = mina_hasher::Fp::from_str(s1).unwrap(); - let mina_fp2 = mina_hasher::Fp::from_str(s2).unwrap(); + let mut mina_fp1 = mina_curves::pasta::Fp::from_str(s1).unwrap(); + let mina_fp2 = mina_curves::pasta::Fp::from_str(s2).unwrap(); fp1.mul_assign(&fp2); mina_fp1.mul_assign(mina_fp2); diff --git a/ledger/src/proofs/block.rs b/ledger/src/proofs/block.rs index 77dbcd2caa..b3babf81ce 100644 --- a/ledger/src/proofs/block.rs +++ b/ledger/src/proofs/block.rs @@ -4,7 +4,7 @@ use anyhow::Context; use ark_ff::fields::arithmetic::InvalidBigInt; use consensus::ConsensusState; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2; use openmina_core::constants::{constraint_constants, ForkConstants}; use poseidon::hash::{ diff --git a/ledger/src/proofs/conv.rs b/ledger/src/proofs/conv.rs index 82ec1179eb..5c6d5007de 100644 --- a/ledger/src/proofs/conv.rs +++ b/ledger/src/proofs/conv.rs @@ -1,5 +1,5 @@ use ark_ff::fields::arithmetic::InvalidBigInt; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2; use crate::scan_state::{ diff --git a/ledger/src/proofs/field.rs b/ledger/src/proofs/field.rs index af90e612ea..43034ffa1d 100644 --- a/ledger/src/proofs/field.rs +++ b/ledger/src/proofs/field.rs @@ -9,7 +9,7 @@ use kimchi::curve::KimchiCurve; use mina_curves::pasta::{ Fq, PallasParameters, ProjectivePallas, ProjectiveVesta, VestaParameters, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_poseidon::{constants::PlonkSpongeConstantsKimchi, sponge::DefaultFqSponge}; use poseidon::SpongeParamsForField; diff --git a/ledger/src/proofs/public_input/messages.rs b/ledger/src/proofs/public_input/messages.rs index 28cb7b1581..bd4cf0df77 100644 --- a/ledger/src/proofs/public_input/messages.rs +++ b/ledger/src/proofs/public_input/messages.rs @@ -9,7 +9,7 @@ use crate::proofs::{ use ark_ec::short_weierstrass_jacobian::GroupAffine; use ark_ff::{BigInteger256, PrimeField}; use mina_curves::pasta::{Fq, Pallas}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use poly_commitment::PolyComm; use poseidon::hash::hash_fields; diff --git a/ledger/src/proofs/public_input/plonk_checks.rs b/ledger/src/proofs/public_input/plonk_checks.rs index 28f193c1bb..15d5d02648 100644 --- a/ledger/src/proofs/public_input/plonk_checks.rs +++ b/ledger/src/proofs/public_input/plonk_checks.rs @@ -8,7 +8,7 @@ use kimchi::{ proof::{PointEvaluations, ProofEvaluations}, }; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use crate::{ proofs::{ diff --git a/ledger/src/proofs/public_input/prepared_statement.rs b/ledger/src/proofs/public_input/prepared_statement.rs index dee6bf15dc..cec982d948 100644 --- a/ledger/src/proofs/public_input/prepared_statement.rs +++ b/ledger/src/proofs/public_input/prepared_statement.rs @@ -1,6 +1,6 @@ use ark_ff::{BigInteger256, Zero}; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2::{ CompositionTypesBranchDataStableV1, PicklesBaseProofsVerifiedStableV1, }; diff --git a/ledger/src/proofs/public_input/protocol_state.rs b/ledger/src/proofs/public_input/protocol_state.rs index c414f1ae14..5933557b34 100644 --- a/ledger/src/proofs/public_input/protocol_state.rs +++ b/ledger/src/proofs/public_input/protocol_state.rs @@ -1,4 +1,4 @@ -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2::MinaBaseProtocolConstantsCheckedValueStableV1; use crate::{ diff --git a/ledger/src/proofs/public_input/scalar_challenge.rs b/ledger/src/proofs/public_input/scalar_challenge.rs index b7f104c602..e63e862620 100644 --- a/ledger/src/proofs/public_input/scalar_challenge.rs +++ b/ledger/src/proofs/public_input/scalar_challenge.rs @@ -112,7 +112,7 @@ mod tests { use super::*; use mina_curves::pasta::Fq; - use mina_hasher::Fp; + use mina_curves::pasta::Fp; #[cfg(target_family = "wasm")] use wasm_bindgen_test::wasm_bindgen_test as test; diff --git a/ledger/src/proofs/public_input/scalars.rs b/ledger/src/proofs/public_input/scalars.rs index 1da3b5cc8b..468f364079 100644 --- a/ledger/src/proofs/public_input/scalars.rs +++ b/ledger/src/proofs/public_input/scalars.rs @@ -1,7 +1,7 @@ use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, Field, FromBytes}; use kimchi::proof::ProofEvaluations; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use crate::proofs::field::FieldWitness; @@ -689,7 +689,7 @@ mod tests { linearization::{constraints_expr, linearization_columns}, }; use mina_curves::pasta::Fq; - use mina_hasher::Fp; + use mina_curves::pasta::Fp; use sha2::{Digest, Sha256}; #[cfg(target_family = "wasm")] use wasm_bindgen_test::wasm_bindgen_test as test; diff --git a/ledger/src/proofs/transition_chain.rs b/ledger/src/proofs/transition_chain.rs index 7f405b1cae..128f3541a1 100644 --- a/ledger/src/proofs/transition_chain.rs +++ b/ledger/src/proofs/transition_chain.rs @@ -1,4 +1,4 @@ -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use crate::scan_state::protocol_state::hashes_abstract; diff --git a/ledger/src/proofs/zkapp.rs b/ledger/src/proofs/zkapp.rs index f5d8b251d1..51e7c1a230 100644 --- a/ledger/src/proofs/zkapp.rs +++ b/ledger/src/proofs/zkapp.rs @@ -3,7 +3,7 @@ use std::{cell::RefCell, rc::Rc}; use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, Zero}; use kimchi::proof::PointEvaluations; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2; use poseidon::hash::{ hash_with_kimchi, diff --git a/ledger/src/scan_state/conv.rs b/ledger/src/scan_state/conv.rs index a68a44799b..a91c2ee778 100644 --- a/ledger/src/scan_state/conv.rs +++ b/ledger/src/scan_state/conv.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use ark_ff::fields::arithmetic::InvalidBigInt; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{ binprot, list::List, diff --git a/ledger/src/scan_state/fee_excess.rs b/ledger/src/scan_state/fee_excess.rs index 2b8e6fc9dc..614e7a84b2 100644 --- a/ledger/src/scan_state/fee_excess.rs +++ b/ledger/src/scan_state/fee_excess.rs @@ -32,7 +32,7 @@ //! use ark_ff::{BigInteger, BigInteger256, Zero}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use poseidon::hash::Inputs; use crate::{ diff --git a/ledger/src/scan_state/pending_coinbase.rs b/ledger/src/scan_state/pending_coinbase.rs index 157bfce39a..83f2f9f7d8 100644 --- a/ledger/src/scan_state/pending_coinbase.rs +++ b/ledger/src/scan_state/pending_coinbase.rs @@ -21,7 +21,7 @@ use std::{collections::HashMap, fmt::Write, marker::PhantomData}; use ark_ff::{fields::arithmetic::InvalidBigInt, Zero}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use openmina_core::constants::constraint_constants; use poseidon::hash::{ diff --git a/ledger/src/scan_state/protocol_state.rs b/ledger/src/scan_state/protocol_state.rs index 4d94c89cf0..b27181156f 100644 --- a/ledger/src/scan_state/protocol_state.rs +++ b/ledger/src/scan_state/protocol_state.rs @@ -1,4 +1,4 @@ -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use crate::{proofs::block::ProtocolState, ToInputs}; use poseidon::hash::{ diff --git a/ledger/src/scan_state/scan_state.rs b/ledger/src/scan_state/scan_state.rs index f4e561dd6d..887d7e2915 100644 --- a/ledger/src/scan_state/scan_state.rs +++ b/ledger/src/scan_state/scan_state.rs @@ -4,7 +4,7 @@ use blake2::{ digest::{generic_array::GenericArray, typenum::U32}, Digest, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{ binprot, v2::{ @@ -96,7 +96,7 @@ pub mod transaction_snark { use std::sync::Arc; use itertools::Itertools; - use mina_hasher::Fp; + use mina_curves::pasta::Fp; use mina_p2p_messages::{binprot, string::ByteString, v2::TransactionSnarkProofStableV2}; use mina_signer::CompressedPubKey; use serde::{Deserialize, Serialize}; diff --git a/ledger/src/sparse_ledger/mod.rs b/ledger/src/sparse_ledger/mod.rs index 4904b6d773..28312f2904 100644 --- a/ledger/src/sparse_ledger/mod.rs +++ b/ledger/src/sparse_ledger/mod.rs @@ -2,7 +2,7 @@ mod sparse_ledger; mod sparse_ledger_impl; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; pub use sparse_ledger::*; use crate::{ diff --git a/ledger/src/sparse_ledger/sparse_ledger.rs b/ledger/src/sparse_ledger/sparse_ledger.rs index cabcac9736..82e56d8512 100644 --- a/ledger/src/sparse_ledger/sparse_ledger.rs +++ b/ledger/src/sparse_ledger/sparse_ledger.rs @@ -4,7 +4,7 @@ use std::{ }; use ark_ff::{fields::arithmetic::InvalidBigInt, Zero}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use openmina_core::constants::constraint_constants; use crate::{ diff --git a/ledger/src/sparse_ledger/sparse_ledger_impl.rs b/ledger/src/sparse_ledger/sparse_ledger_impl.rs index 3e0ca4f6f2..455d5b7337 100644 --- a/ledger/src/sparse_ledger/sparse_ledger_impl.rs +++ b/ledger/src/sparse_ledger/sparse_ledger_impl.rs @@ -1,7 +1,7 @@ use std::collections::{BTreeMap, HashMap, VecDeque}; use ark_ff::Zero; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use poseidon::hash::params::get_merkle_param_for_height; diff --git a/ledger/src/staged_ledger/hash.rs b/ledger/src/staged_ledger/hash.rs index 024c060fc2..bd38a26a75 100644 --- a/ledger/src/staged_ledger/hash.rs +++ b/ledger/src/staged_ledger/hash.rs @@ -1,5 +1,5 @@ use ark_ff::{PrimeField, ToBytes}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use poseidon::hash::Inputs; use sha2::{Digest, Sha256}; diff --git a/ledger/src/staged_ledger/staged_ledger.rs b/ledger/src/staged_ledger/staged_ledger.rs index 54f4609ff8..db76fa06d0 100644 --- a/ledger/src/staged_ledger/staged_ledger.rs +++ b/ledger/src/staged_ledger/staged_ledger.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2::MinaStateProtocolStateValueStableV2; use mina_signer::CompressedPubKey; use openmina_core::constants::ConstraintConstants; @@ -5855,7 +5855,7 @@ mod tests_ocaml { mod tests { use std::{collections::BTreeMap, fs::File}; - use mina_hasher::Fp; + use mina_curves::pasta::Fp; use mina_p2p_messages::{binprot, list::List}; use crate::{ diff --git a/ledger/src/transaction_pool.rs b/ledger/src/transaction_pool.rs index 14a8ca340f..ff034264ba 100644 --- a/ledger/src/transaction_pool.rs +++ b/ledger/src/transaction_pool.rs @@ -6,7 +6,7 @@ use std::{ }; use itertools::Itertools; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{bigint::BigInt, v2}; use openmina_core::{bug_condition, consensus::ConsensusConstants}; diff --git a/ledger/src/tree_version.rs b/ledger/src/tree_version.rs index 69913c1b64..f1b9426518 100644 --- a/ledger/src/tree_version.rs +++ b/ledger/src/tree_version.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, hash::Hash}; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use poseidon::hash::params::get_merkle_param_for_height; use crate::account::{get_legacy_hash_of, Account, AccountLegacy, TokenId, TokenIdLegacy}; diff --git a/ledger/src/util/mod.rs b/ledger/src/util/mod.rs index 830382c8fb..8f43bfcdc6 100644 --- a/ledger/src/util/mod.rs +++ b/ledger/src/util/mod.rs @@ -2,7 +2,7 @@ use std::ops::Neg; use ark_ff::{BigInteger, PrimeField}; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::{CompressedPubKey, CurvePoint, Keypair, PubKey}; mod backtrace; diff --git a/ledger/src/verifier/mod.rs b/ledger/src/verifier/mod.rs index 256b6dab68..7969c00a90 100644 --- a/ledger/src/verifier/mod.rs +++ b/ledger/src/verifier/mod.rs @@ -18,7 +18,7 @@ use self::common::CheckResult; pub struct Verifier; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::v2::{ PicklesProofProofsVerified2ReprStableV2, PicklesProofProofsVerifiedMaxStableV2, }; diff --git a/ledger/src/zkapps/checks.rs b/ledger/src/zkapps/checks.rs index 13e5e1a88c..d0e80b7876 100644 --- a/ledger/src/zkapps/checks.rs +++ b/ledger/src/zkapps/checks.rs @@ -1,4 +1,4 @@ -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use crate::{ diff --git a/ledger/src/zkapps/intefaces.rs b/ledger/src/zkapps/intefaces.rs index 39b1f946fd..5da6bf7325 100644 --- a/ledger/src/zkapps/intefaces.rs +++ b/ledger/src/zkapps/intefaces.rs @@ -1,6 +1,6 @@ use std::marker::PhantomData; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use crate::proofs::{ diff --git a/ledger/src/zkapps/non_snark.rs b/ledger/src/zkapps/non_snark.rs index 1b6503a12d..6f0c818c93 100644 --- a/ledger/src/zkapps/non_snark.rs +++ b/ledger/src/zkapps/non_snark.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use crate::{ diff --git a/ledger/src/zkapps/snark.rs b/ledger/src/zkapps/snark.rs index aa11fe0c85..01b6bd6dc2 100644 --- a/ledger/src/zkapps/snark.rs +++ b/ledger/src/zkapps/snark.rs @@ -1,7 +1,7 @@ use std::{cell::Cell, marker::PhantomData}; use ark_ff::Zero; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use poseidon::hash::{ params::{ diff --git a/ledger/src/zkapps/zkapp_logic.rs b/ledger/src/zkapps/zkapp_logic.rs index ff1743f75e..dff4c575d7 100644 --- a/ledger/src/zkapps/zkapp_logic.rs +++ b/ledger/src/zkapps/zkapp_logic.rs @@ -1,4 +1,4 @@ -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_signer::CompressedPubKey; use openmina_core::constants::constraint_constants; diff --git a/mina-p2p-messages/src/bigint.rs b/mina-p2p-messages/src/bigint.rs index 6fc13c944e..5ae5d73067 100644 --- a/mina-p2p-messages/src/bigint.rs +++ b/mina-p2p-messages/src/bigint.rs @@ -432,9 +432,9 @@ mod tests { println!("rx: {:?}", deser_rx); println!("s: {:?}", deser_s); - let _ = deser_rx.to_field::().unwrap(); + let _ = deser_rx.to_field::().unwrap(); println!("rx OK"); - let _ = deser_s.to_field::().unwrap(); + let _ = deser_s.to_field::().unwrap(); println!("s OK"); } diff --git a/mina-p2p-messages/src/hash.rs b/mina-p2p-messages/src/hash.rs index 4860124b04..4c2cad0ff3 100644 --- a/mina-p2p-messages/src/hash.rs +++ b/mina-p2p-messages/src/hash.rs @@ -1,5 +1,5 @@ use ark_ff::fields::arithmetic::InvalidBigInt; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; pub trait MinaHash { fn try_hash(&self) -> Result; diff --git a/mina-p2p-messages/src/v2/hashing.rs b/mina-p2p-messages/src/v2/hashing.rs index 3b65d27e6b..cd8be5b0a0 100644 --- a/mina-p2p-messages/src/v2/hashing.rs +++ b/mina-p2p-messages/src/v2/hashing.rs @@ -3,7 +3,7 @@ use std::{fmt, io, sync::Arc}; use ark_ff::fields::arithmetic::InvalidBigInt; use binprot::{BinProtRead, BinProtWrite}; use generated::MinaStateBlockchainStateValueStableV2; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use poseidon::hash::{ hash_with_kimchi, params::{MINA_PROTO_STATE, MINA_PROTO_STATE_BODY}, @@ -454,7 +454,7 @@ impl generated::MinaBlockBlockStableV2 { } impl MinaHash for MinaStateProtocolStateBodyValueStableV2 { - fn try_hash(&self) -> Result { + fn try_hash(&self) -> Result { let mut inputs = Inputs::new(); self.to_input(&mut inputs)?; Ok(hash_with_kimchi( @@ -465,7 +465,7 @@ impl MinaHash for MinaStateProtocolStateBodyValueStableV2 { } impl MinaHash for MinaStateProtocolStateValueStableV2 { - fn try_hash(&self) -> Result { + fn try_hash(&self) -> Result { Ok(fp_state_hash_from_fp_hashes( self.previous_state_hash.to_field()?, MinaHash::try_hash(&self.body)?, diff --git a/mina-p2p-messages/src/v2/manual.rs b/mina-p2p-messages/src/v2/manual.rs index 18e43937e2..3be802eace 100644 --- a/mina-p2p-messages/src/v2/manual.rs +++ b/mina-p2p-messages/src/v2/manual.rs @@ -586,14 +586,14 @@ impl MinaBaseStagedLedgerHashNonSnarkStableV1 { } } -impl From for LedgerHash { - fn from(value: mina_hasher::Fp) -> Self { +impl From for LedgerHash { + fn from(value: mina_curves::pasta::Fp) -> Self { MinaBaseLedgerHash0StableV1(value.into()).into() } } -impl From<&mina_hasher::Fp> for LedgerHash { - fn from(value: &mina_hasher::Fp) -> Self { +impl From<&mina_curves::pasta::Fp> for LedgerHash { + fn from(value: &mina_curves::pasta::Fp) -> Self { MinaBaseLedgerHash0StableV1(value.into()).into() } } diff --git a/node/Cargo.toml b/node/Cargo.toml index b27a249ad1..12bad11cbc 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -16,6 +16,7 @@ derive_more = "0.99.17" hex = "0.4" lazy_static = "1.4.0" ledger = { workspace = true } +mina-curves = { workspace = true } mina-hasher = { workspace = true } mina-p2p-messages = { workspace = true } mina-signer = { workspace = true } diff --git a/node/src/block_producer/mod.rs b/node/src/block_producer/mod.rs index 80ba62dd11..5f45fbfa74 100644 --- a/node/src/block_producer/mod.rs +++ b/node/src/block_producer/mod.rs @@ -209,7 +209,7 @@ impl BlockWithoutProof { pub fn calc_epoch_seed( prev_epoch_seed: &v2::EpochSeed, - vrf_hash: mina_hasher::Fp, + vrf_hash: mina_curves::pasta::Fp, ) -> v2::EpochSeed { // TODO(adonagy): fix this unwrap let old_seed = prev_epoch_seed.to_field().unwrap(); diff --git a/node/src/daemon_json/json_ledger.rs b/node/src/daemon_json/json_ledger.rs index f6ff17fa6b..30e217b9b9 100644 --- a/node/src/daemon_json/json_ledger.rs +++ b/node/src/daemon_json/json_ledger.rs @@ -1,5 +1,5 @@ use core::str::FromStr; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::binprot::BinProtWrite; use multihash::{Blake2b256, Hasher}; use serde::{Deserialize, Deserializer, Serialize}; diff --git a/node/src/ledger/ledger_service.rs b/node/src/ledger/ledger_service.rs index fdb0b8973e..89af2adb5a 100644 --- a/node/src/ledger/ledger_service.rs +++ b/node/src/ledger/ledger_service.rs @@ -47,7 +47,7 @@ use ledger::{ verifier::Verifier, Account, AccountId, AccountIndex, BaseLedger, Database, Mask, TokenId, UnregisterBehavior, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{ binprot::BinProtRead, list::List, diff --git a/node/src/ledger/mod.rs b/node/src/ledger/mod.rs index aa2f7fc67f..b2fe47a648 100644 --- a/node/src/ledger/mod.rs +++ b/node/src/ledger/mod.rs @@ -103,9 +103,9 @@ pub fn complete_num_accounts_tree_with_empties( pub fn hash_node_at_depth( depth: usize, - left: mina_hasher::Fp, - right: mina_hasher::Fp, -) -> mina_hasher::Fp { + left: mina_curves::pasta::Fp, + right: mina_curves::pasta::Fp, +) -> mina_curves::pasta::Fp { let height = LEDGER_DEPTH.saturating_sub(depth).saturating_sub(1); ledger::V2::hash_node(height, left, right) } diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs index 82e609113d..e91f215344 100644 --- a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs +++ b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs @@ -13,7 +13,7 @@ use ledger::{ scan_state::currency::Balance, BaseLedger, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{ binprot::{ self, diff --git a/node/src/transition_frontier/sync/ledger/staged/mod.rs b/node/src/transition_frontier/sync/ledger/staged/mod.rs index 0a421d26ae..81803af7af 100644 --- a/node/src/transition_frontier/sync/ledger/staged/mod.rs +++ b/node/src/transition_frontier/sync/ledger/staged/mod.rs @@ -1,6 +1,6 @@ mod transition_frontier_sync_ledger_staged_state; use ark_ff::fields::arithmetic::InvalidBigInt; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; pub use transition_frontier_sync_ledger_staged_state::*; mod transition_frontier_sync_ledger_staged_actions; diff --git a/snark/src/lib.rs b/snark/src/lib.rs index ebe3be3d55..79082982ba 100644 --- a/snark/src/lib.rs +++ b/snark/src/lib.rs @@ -41,5 +41,5 @@ pub trait SnarkStore: impl> SnarkStore for T {} pub fn get_srs() -> std::sync::Arc> { - ledger::verifier::get_srs::() + ledger::verifier::get_srs::() } diff --git a/tools/fuzzing/src/main.rs b/tools/fuzzing/src/main.rs index 43bde9859c..e431e09b32 100644 --- a/tools/fuzzing/src/main.rs +++ b/tools/fuzzing/src/main.rs @@ -23,7 +23,7 @@ pub mod transaction_fuzzer { sparse_ledger::LedgerIntf, Account, BaseLedger, }; - use mina_hasher::Fp; + use mina_curves::pasta::Fp; use mina_p2p_messages::bigint::BigInt; use openmina_core::constants::ConstraintConstantsUnversioned; use std::{ diff --git a/tools/fuzzing/src/transaction_fuzzer/context.rs b/tools/fuzzing/src/transaction_fuzzer/context.rs index f9b6edc4e2..05a29b5be2 100644 --- a/tools/fuzzing/src/transaction_fuzzer/context.rs +++ b/tools/fuzzing/src/transaction_fuzzer/context.rs @@ -25,7 +25,7 @@ use ledger::{ Account, AccountId, Database, Mask, Timing, TokenId, }; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{ bigint, binprot, binprot::SmallString1k, diff --git a/tools/fuzzing/src/transaction_fuzzer/generator.rs b/tools/fuzzing/src/transaction_fuzzer/generator.rs index 3fc2ec53d0..17b6f48844 100644 --- a/tools/fuzzing/src/transaction_fuzzer/generator.rs +++ b/tools/fuzzing/src/transaction_fuzzer/generator.rs @@ -28,7 +28,7 @@ use ledger::{ TokenSymbol, VerificationKey, VerificationKeyWire, VotingFor, ZkAppUri, TXN_VERSION_CURRENT, }; use mina_curves::pasta::Fq; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{ array::ArrayN, list::List, diff --git a/tools/fuzzing/src/transaction_fuzzer/mutator.rs b/tools/fuzzing/src/transaction_fuzzer/mutator.rs index 76fb00305d..b609814050 100644 --- a/tools/fuzzing/src/transaction_fuzzer/mutator.rs +++ b/tools/fuzzing/src/transaction_fuzzer/mutator.rs @@ -21,7 +21,7 @@ use ledger::{ Account, AuthRequired, MutableFp, Permissions, Timing, TokenId, TokenSymbol, VerificationKey, VerificationKeyWire, }; -use mina_hasher::Fp; +use mina_curves::pasta::Fp; use mina_p2p_messages::{ array::ArrayN16, bigint::BigInt, diff --git a/vrf/src/message.rs b/vrf/src/message.rs index 10f67bbb62..0ce7ba3dcd 100644 --- a/vrf/src/message.rs +++ b/vrf/src/message.rs @@ -94,7 +94,7 @@ impl ToInputs for VrfMessage { Ok(epoch_seed) => epoch_seed, Err(_) => { // TODO: Return an error somehow - mina_hasher::Fp::zero() + mina_curves::pasta::Fp::zero() } }; inputs.append_field(epoch_seed); From a16a702c26275e7029b8e539807213ed89412283 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Fri, 25 Jul 2025 23:08:37 +0200 Subject: [PATCH 4/5] Run make format --- ledger/src/cache.rs | 3 +-- ledger/src/proofs/accumulator_check.rs | 3 +-- ledger/src/proofs/block.rs | 3 +-- ledger/src/proofs/constants.rs | 3 +-- ledger/src/proofs/field.rs | 3 +-- ledger/src/proofs/merge.rs | 3 +-- ledger/src/proofs/prover.rs | 3 +-- ledger/src/proofs/provers.rs | 3 +-- ledger/src/proofs/public_input/messages.rs | 3 +-- ledger/src/proofs/public_input/plonk_checks.rs | 3 +-- ledger/src/proofs/public_input/prepared_statement.rs | 3 +-- ledger/src/proofs/public_input/scalar_challenge.rs | 3 +-- ledger/src/proofs/public_input/scalars.rs | 6 ++---- ledger/src/proofs/step.rs | 3 +-- ledger/src/proofs/to_field_elements.rs | 3 +-- ledger/src/proofs/transaction.rs | 3 +-- ledger/src/proofs/unfinalized.rs | 6 ++---- ledger/src/proofs/verification.rs | 3 +-- ledger/src/proofs/verifiers.rs | 3 +-- ledger/src/proofs/wrap.rs | 3 +-- ledger/src/proofs/zkapp.rs | 3 +-- ledger/src/util/mod.rs | 3 +-- ledger/src/verifier/mod.rs | 3 +-- tools/fuzzing/src/transaction_fuzzer/context.rs | 3 +-- tools/fuzzing/src/transaction_fuzzer/generator.rs | 3 +-- 25 files changed, 27 insertions(+), 54 deletions(-) diff --git a/ledger/src/cache.rs b/ledger/src/cache.rs index e67ddbe344..26b9bf12f2 100644 --- a/ledger/src/cache.rs +++ b/ledger/src/cache.rs @@ -78,8 +78,7 @@ mod tests { #[test] fn test_cache() { - use mina_curves::pasta::Fq; - use mina_curves::pasta::Fp; + use mina_curves::pasta::{Fp, Fq}; static COUNTER: AtomicUsize = AtomicUsize::new(0); diff --git a/ledger/src/proofs/accumulator_check.rs b/ledger/src/proofs/accumulator_check.rs index 4e0164e861..adab8b5374 100644 --- a/ledger/src/proofs/accumulator_check.rs +++ b/ledger/src/proofs/accumulator_check.rs @@ -1,6 +1,5 @@ use ark_ff::fields::arithmetic::InvalidBigInt; -use mina_curves::pasta::Vesta; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Vesta}; use mina_p2p_messages::{bigint::BigInt, v2::PicklesProofProofsVerified2ReprStableV2}; use poly_commitment::{commitment::CommitmentCurve, srs::SRS}; diff --git a/ledger/src/proofs/block.rs b/ledger/src/proofs/block.rs index b3babf81ce..d0407094ae 100644 --- a/ledger/src/proofs/block.rs +++ b/ledger/src/proofs/block.rs @@ -3,8 +3,7 @@ use std::{rc::Rc, sync::Arc}; use anyhow::Context; use ark_ff::fields::arithmetic::InvalidBigInt; use consensus::ConsensusState; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::v2; use openmina_core::constants::{constraint_constants, ForkConstants}; use poseidon::hash::{ diff --git a/ledger/src/proofs/constants.rs b/ledger/src/proofs/constants.rs index 2c4b8b6ab3..55863ef29c 100644 --- a/ledger/src/proofs/constants.rs +++ b/ledger/src/proofs/constants.rs @@ -1,6 +1,5 @@ use ark_ff::{One, Zero}; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use super::{ field::Boolean, diff --git a/ledger/src/proofs/field.rs b/ledger/src/proofs/field.rs index 43034ffa1d..3facb1f124 100644 --- a/ledger/src/proofs/field.rs +++ b/ledger/src/proofs/field.rs @@ -7,9 +7,8 @@ use ark_ff::{ }; use kimchi::curve::KimchiCurve; use mina_curves::pasta::{ - Fq, PallasParameters, ProjectivePallas, ProjectiveVesta, VestaParameters, + Fp, Fq, PallasParameters, ProjectivePallas, ProjectiveVesta, VestaParameters, }; -use mina_curves::pasta::Fp; use mina_poseidon::{constants::PlonkSpongeConstantsKimchi, sponge::DefaultFqSponge}; use poseidon::SpongeParamsForField; diff --git a/ledger/src/proofs/merge.rs b/ledger/src/proofs/merge.rs index 0e1c192078..f15aa7123c 100644 --- a/ledger/src/proofs/merge.rs +++ b/ledger/src/proofs/merge.rs @@ -7,8 +7,7 @@ use crate::proofs::{ wrap::{wrap, WrapParams}, }; use ark_ff::fields::arithmetic::InvalidBigInt; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::v2; use crate::{ diff --git a/ledger/src/proofs/prover.rs b/ledger/src/proofs/prover.rs index 28ba21f755..d955c50549 100644 --- a/ledger/src/proofs/prover.rs +++ b/ledger/src/proofs/prover.rs @@ -4,8 +4,7 @@ use kimchi::{ poly_commitment::PolyComm, proof::{PointEvaluations, ProofEvaluations, ProverCommitments, RecursionChallenge}, }; -use mina_curves::pasta::Pallas; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Pallas}; use once_cell::sync::Lazy; use poly_commitment::{commitment::CommitmentCurve, evaluation_proof::OpeningProof}; diff --git a/ledger/src/proofs/provers.rs b/ledger/src/proofs/provers.rs index e94cc40a1b..4ce80b95ad 100644 --- a/ledger/src/proofs/provers.rs +++ b/ledger/src/proofs/provers.rs @@ -1,8 +1,7 @@ use std::{collections::HashMap, path::Path, sync::Arc}; use kimchi::circuits::gate::CircuitGate; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use once_cell::sync::OnceCell; use openmina_core::network::CircuitsConfig; diff --git a/ledger/src/proofs/public_input/messages.rs b/ledger/src/proofs/public_input/messages.rs index bd4cf0df77..d52638e88b 100644 --- a/ledger/src/proofs/public_input/messages.rs +++ b/ledger/src/proofs/public_input/messages.rs @@ -8,8 +8,7 @@ use crate::proofs::{ }; use ark_ec::short_weierstrass_jacobian::GroupAffine; use ark_ff::{BigInteger256, PrimeField}; -use mina_curves::pasta::{Fq, Pallas}; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq, Pallas}; use poly_commitment::PolyComm; use poseidon::hash::hash_fields; diff --git a/ledger/src/proofs/public_input/plonk_checks.rs b/ledger/src/proofs/public_input/plonk_checks.rs index 15d5d02648..e7a961464a 100644 --- a/ledger/src/proofs/public_input/plonk_checks.rs +++ b/ledger/src/proofs/public_input/plonk_checks.rs @@ -7,8 +7,7 @@ use kimchi::{ curve::KimchiCurve, proof::{PointEvaluations, ProofEvaluations}, }; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use crate::{ proofs::{ diff --git a/ledger/src/proofs/public_input/prepared_statement.rs b/ledger/src/proofs/public_input/prepared_statement.rs index cec982d948..54e1b6ddda 100644 --- a/ledger/src/proofs/public_input/prepared_statement.rs +++ b/ledger/src/proofs/public_input/prepared_statement.rs @@ -1,6 +1,5 @@ use ark_ff::{BigInteger256, Zero}; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::v2::{ CompositionTypesBranchDataStableV1, PicklesBaseProofsVerifiedStableV1, }; diff --git a/ledger/src/proofs/public_input/scalar_challenge.rs b/ledger/src/proofs/public_input/scalar_challenge.rs index e63e862620..580ef7c6d4 100644 --- a/ledger/src/proofs/public_input/scalar_challenge.rs +++ b/ledger/src/proofs/public_input/scalar_challenge.rs @@ -111,8 +111,7 @@ mod tests { use super::*; - use mina_curves::pasta::Fq; - use mina_curves::pasta::Fp; + use mina_curves::pasta::{Fp, Fq}; #[cfg(target_family = "wasm")] use wasm_bindgen_test::wasm_bindgen_test as test; diff --git a/ledger/src/proofs/public_input/scalars.rs b/ledger/src/proofs/public_input/scalars.rs index 468f364079..471584c0bc 100644 --- a/ledger/src/proofs/public_input/scalars.rs +++ b/ledger/src/proofs/public_input/scalars.rs @@ -1,7 +1,6 @@ use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, Field, FromBytes}; use kimchi::proof::ProofEvaluations; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use crate::proofs::field::FieldWitness; @@ -688,8 +687,7 @@ mod tests { circuits::expr::Linearization, linearization::{constraints_expr, linearization_columns}, }; - use mina_curves::pasta::Fq; - use mina_curves::pasta::Fp; + use mina_curves::pasta::{Fp, Fq}; use sha2::{Digest, Sha256}; #[cfg(target_family = "wasm")] use wasm_bindgen_test::wasm_bindgen_test as test; diff --git a/ledger/src/proofs/step.rs b/ledger/src/proofs/step.rs index 8b052b03a1..0190bd2cd1 100644 --- a/ledger/src/proofs/step.rs +++ b/ledger/src/proofs/step.rs @@ -23,8 +23,7 @@ use ark_poly::{ univariate::DensePolynomial, EvaluationDomain, Radix2EvaluationDomain, UVPolynomial, }; use kimchi::proof::{PointEvaluations, ProverCommitments, RecursionChallenge}; -use mina_curves::pasta::{Fq, Pallas}; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq, Pallas}; use mina_p2p_messages::v2; use poly_commitment::{commitment::b_poly_coefficients, evaluation_proof::OpeningProof}; diff --git a/ledger/src/proofs/to_field_elements.rs b/ledger/src/proofs/to_field_elements.rs index f78c27f780..7741053975 100644 --- a/ledger/src/proofs/to_field_elements.rs +++ b/ledger/src/proofs/to_field_elements.rs @@ -6,8 +6,7 @@ use crate::{ }; use ark_ff::{Field, One, Zero}; use kimchi::proof::{PointEvaluations, ProofEvaluations, ProverCommitments, ProverProof}; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::{string::ByteString, v2}; use mina_signer::CompressedPubKey; use poly_commitment::evaluation_proof::OpeningProof; diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs index f444d858fc..a96f072708 100644 --- a/ledger/src/proofs/transaction.rs +++ b/ledger/src/proofs/transaction.rs @@ -7,8 +7,7 @@ use kimchi::{ circuits::{gate::CircuitGate, wires::COLUMNS}, proof::RecursionChallenge, }; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::v2::{ self, ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1, ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1, CurrencyAmountStableV1, diff --git a/ledger/src/proofs/unfinalized.rs b/ledger/src/proofs/unfinalized.rs index 2681e47781..ae6a137770 100644 --- a/ledger/src/proofs/unfinalized.rs +++ b/ledger/src/proofs/unfinalized.rs @@ -1,7 +1,6 @@ use ark_ff::fields::arithmetic::InvalidBigInt; use kimchi::proof::{PointEvaluations, ProofEvaluations}; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::v2; use crate::proofs::{ @@ -25,8 +24,7 @@ use super::{ pub mod ro { - use mina_curves::pasta::Fq; - use mina_curves::pasta::Fp; + use mina_curves::pasta::{Fp, Fq}; use crate::proofs::{ field::FieldWitness, public_input::scalar_challenge::ScalarChallenge, diff --git a/ledger/src/proofs/verification.rs b/ledger/src/proofs/verification.rs index 5ab2a777f9..8cdc05514a 100644 --- a/ledger/src/proofs/verification.rs +++ b/ledger/src/proofs/verification.rs @@ -40,8 +40,7 @@ use kimchi::{ mina_curves::pasta::Pallas, proof::{PointEvaluations, ProofEvaluations}, }; -use mina_curves::pasta::{Fq, Vesta}; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq, Vesta}; use mina_p2p_messages::{ bigint::BigInt, binprot::BinProtWrite, diff --git a/ledger/src/proofs/verifiers.rs b/ledger/src/proofs/verifiers.rs index 33815a8c3f..5adca43e3e 100644 --- a/ledger/src/proofs/verifiers.rs +++ b/ledger/src/proofs/verifiers.rs @@ -21,8 +21,7 @@ use kimchi::{ linearization::expr_linearization, mina_curves::pasta::Pallas, }; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use poly_commitment::srs::SRS; use crate::{proofs::BACKEND_TOCK_ROUNDS_N, VerificationKey}; diff --git a/ledger/src/proofs/wrap.rs b/ledger/src/proofs/wrap.rs index 86b3b661f2..90e6a2eab3 100644 --- a/ledger/src/proofs/wrap.rs +++ b/ledger/src/proofs/wrap.rs @@ -7,8 +7,7 @@ use kimchi::{ oracles::OraclesResult, proof::{PointEvaluations, ProofEvaluations, RecursionChallenge}, }; -use mina_curves::pasta::{Fq, Pallas, Vesta}; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq, Pallas, Vesta}; use mina_p2p_messages::v2::{ CompositionTypesBranchDataDomainLog2StableV1, CompositionTypesBranchDataStableV1, PicklesBaseProofsVerifiedStableV1, diff --git a/ledger/src/proofs/zkapp.rs b/ledger/src/proofs/zkapp.rs index 51e7c1a230..ded2ab1763 100644 --- a/ledger/src/proofs/zkapp.rs +++ b/ledger/src/proofs/zkapp.rs @@ -2,8 +2,7 @@ use std::{cell::RefCell, rc::Rc}; use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, Zero}; use kimchi::proof::PointEvaluations; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::v2; use poseidon::hash::{ hash_with_kimchi, diff --git a/ledger/src/util/mod.rs b/ledger/src/util/mod.rs index 8f43bfcdc6..67c07df279 100644 --- a/ledger/src/util/mod.rs +++ b/ledger/src/util/mod.rs @@ -1,8 +1,7 @@ use std::ops::Neg; use ark_ff::{BigInteger, PrimeField}; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_signer::{CompressedPubKey, CurvePoint, Keypair, PubKey}; mod backtrace; diff --git a/ledger/src/verifier/mod.rs b/ledger/src/verifier/mod.rs index 7969c00a90..b8cad2f9ed 100644 --- a/ledger/src/verifier/mod.rs +++ b/ledger/src/verifier/mod.rs @@ -17,8 +17,7 @@ use self::common::CheckResult; #[derive(Debug, Clone)] pub struct Verifier; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::v2::{ PicklesProofProofsVerified2ReprStableV2, PicklesProofProofsVerifiedMaxStableV2, }; diff --git a/tools/fuzzing/src/transaction_fuzzer/context.rs b/tools/fuzzing/src/transaction_fuzzer/context.rs index 05a29b5be2..6bffd54118 100644 --- a/tools/fuzzing/src/transaction_fuzzer/context.rs +++ b/tools/fuzzing/src/transaction_fuzzer/context.rs @@ -24,8 +24,7 @@ use ledger::{ transaction_pool::TransactionPool, Account, AccountId, Database, Mask, Timing, TokenId, }; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::{ bigint, binprot, binprot::SmallString1k, diff --git a/tools/fuzzing/src/transaction_fuzzer/generator.rs b/tools/fuzzing/src/transaction_fuzzer/generator.rs index 17b6f48844..592e338cb4 100644 --- a/tools/fuzzing/src/transaction_fuzzer/generator.rs +++ b/tools/fuzzing/src/transaction_fuzzer/generator.rs @@ -27,8 +27,7 @@ use ledger::{ Account, AuthRequired, MutableFp, Permissions, ProofVerified, SetVerificationKey, TokenId, TokenSymbol, VerificationKey, VerificationKeyWire, VotingFor, ZkAppUri, TXN_VERSION_CURRENT, }; -use mina_curves::pasta::Fq; -use mina_curves::pasta::Fp; +use mina_curves::pasta::{Fp, Fq}; use mina_p2p_messages::{ array::ArrayN, list::List, From 0e4d0c514577b89346d2330a5fd26405bba9e712 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Fri, 25 Jul 2025 23:10:28 +0200 Subject: [PATCH 5/5] CHANGELOG: add patch for 1269 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cde9e4041..3d65e0ec0a 100644 --- a/CHANGELOG.md +++ b/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