Ledger/scan_state: use mina_curves::pasta::Fp instead of mina_hasher

Author: dannywillems

ledger/src/scan_state/transaction_logic/local_state.rs

@@ -1,42 +1,7 @@
-use std::{
-    collections::{BTreeMap, HashMap, HashSet},
-    fmt::Display,
-};
-
-use itertools::FoldWhile;
-use mina_core::constants::ConstraintConstants;
-use mina_hasher::Fp;
-use mina_macros::SerdeYojsonEnum;
-use mina_p2p_messages::{
-    bigint::InvalidBigInt,
-    binprot,
-    v2::{MinaBaseUserCommandStableV2, MinaTransactionTransactionStableV2},
-};
-use mina_signer::CompressedPubKey;
-use poseidon::hash::{
-    hash_with_kimchi,
-    params::{CODA_RECEIPT_UC, MINA_ZKAPP_MEMO},
-    Inputs,
-};
-
-use crate::{
-    proofs::witness::Witness,
-    scan_state::transaction_logic::{
-        transaction_applied::{CommandApplied, Varying},
-        transaction_partially_applied::FullyApplied,
-        zkapp_command::MaybeWithStatus,
-    },
-    sparse_ledger::{LedgerIntf, SparseLedger},
-    zkapps,
-    zkapps::non_snark::{LedgerNonSnark, ZkappNonSnark},
-    Account, AccountId, AccountIdOrderable, AppendToInputs, BaseLedger, ControlTag,
-    ReceiptChainHash, Timing, TokenId, VerificationKeyWire,
-};
-
 use self::{
     local_state::{
-        apply_zkapp_command_first_pass, apply_zkapp_command_second_pass, CallStack,
-        LocalStateEnv, StackFrame,
+        apply_zkapp_command_first_pass, apply_zkapp_command_second_pass, CallStack, LocalStateEnv,
+        StackFrame,
     },
     protocol_state::{GlobalState, ProtocolStateView},
     signed_command::{SignedCommand, SignedCommandPayload},
@@ -46,14 +11,47 @@ use self::{
     },
     zkapp_command::{AccessedOrNot, AccountUpdate, WithHash, ZkAppCommand},
 };
-
 use super::{
     currency::{Amount, Balance, Fee, Index, Length, Magnitude, Nonce, Signed, Slot},
     fee_excess::FeeExcess,
     fee_rate::FeeRate,
     scan_state::transaction_snark::OneOrTwo,
 };
-use crate::zkapps::zkapp_logic::ZkAppCommandElt;
+use crate::{
+    proofs::witness::Witness,
+    scan_state::transaction_logic::{
+        transaction_applied::{CommandApplied, Varying},
+        transaction_partially_applied::FullyApplied,
+        zkapp_command::MaybeWithStatus,
+    },
+    sparse_ledger::{LedgerIntf, SparseLedger},
+    zkapps,
+    zkapps::{
+        non_snark::{LedgerNonSnark, ZkappNonSnark},
+        zkapp_logic::ZkAppCommandElt,
+    },
+    Account, AccountId, AccountIdOrderable, AppendToInputs, BaseLedger, ControlTag,
+    ReceiptChainHash, Timing, TokenId, VerificationKeyWire,
+};
+use itertools::FoldWhile;
+use mina_core::constants::ConstraintConstants;
+use mina_curves::pasta::Fp;
+use mina_macros::SerdeYojsonEnum;
+use mina_p2p_messages::{
+    bigint::InvalidBigInt,
+    binprot,
+    v2::{MinaBaseUserCommandStableV2, MinaTransactionTransactionStableV2},
+};
+use mina_signer::CompressedPubKey;
+use poseidon::hash::{
+    hash_with_kimchi,
+    params::{CODA_RECEIPT_UC, MINA_ZKAPP_MEMO},
+    Inputs,
+};
+use std::{
+    collections::{BTreeMap, HashMap, HashSet},
+    fmt::Display,
+};
 
 /// <https://github.com/MinaProtocol/mina/blob/2ee6e004ba8c6a0541056076aab22ea162f7eb3a/src/lib/mina_base/transaction_status.ml#L9>
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]
@@ -1034,11 +1032,11 @@ impl From<&Transaction> for MinaTransactionTransactionStableV2 {
     }
 }
 
-pub mod transaction_applied;
-pub mod transaction_witness;
-pub mod protocol_state;
 pub mod local_state;
+pub mod protocol_state;
+pub mod transaction_applied;
 pub mod transaction_partially_applied;
+pub mod transaction_witness;
 pub use transaction_partially_applied::{
     apply_transaction_first_pass, apply_transaction_second_pass, apply_transactions,
     apply_user_command, set_with_location, AccountState,

ledger/src/scan_state/transaction_logic/mod.rs

@@ -1,14 +1,13 @@
-use mina_hasher::Fp;
-use mina_p2p_messages::{
-    bigint::InvalidBigInt,
-    v2::{self, MinaStateProtocolStateValueStableV2},
-};
-
 use crate::{
     proofs::field::FieldWitness,
     scan_state::currency::{Amount, Length, Signed, Slot},
     sparse_ledger::LedgerIntf,
 };
+use mina_curves::pasta::Fp;
+use mina_p2p_messages::{
+    bigint::InvalidBigInt,
+    v2::{self, MinaStateProtocolStateValueStableV2},
+};
 
 #[derive(Debug, Clone)]
 pub struct EpochLedger<F: FieldWitness> {

ledger/src/scan_state/transaction_logic/protocol_state.rs

@@ -1,5 +1,5 @@
 use mina_core::constants::ConstraintConstants;
-use mina_hasher::Fp;
+use mina_curves::pasta::Fp;
 
 use crate::{Account, AccountId};