chored(build): improve dependencies

- reverse core -> ledger dep
- remove ledger dep from p2p

Author: akoptelov

Cargo.lock

@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-serde = "1.0.147"
+serde = { version = "1.0.147", features = ["rc"] }
 slab = { version = "0.4.7", features = ["serde"] }
 tracing = { version = "0.1", features = ["std"] }
 sha2 = "0.10.6"
@@ -14,4 +14,3 @@ tokio = { version = "1.26", features = ["sync"] }
 
 mina-hasher = { workspace = true }
 mina-p2p-messages = { workspace = true }
-ledger = { workspace = true }

core/Cargo.toml

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use ledger::scan_state::scan_state::transaction_snark::work::Work;
 use mina_p2p_messages::binprot::{
     self,
     macros::{BinProtRead, BinProtWrite},
@@ -102,12 +101,3 @@ impl From<&Snark> for NetworkPoolSnarkPoolDiffVersionedStableV2AddSolvedWork1 {
     }
 }
 
-impl From<&Snark> for Work {
-    fn from(value: &Snark) -> Self {
-        Self {
-            prover: (&value.snarker).into(),
-            fee: (&value.fee).into(),
-            proofs: (&*value.proofs).into(),
-        }
-    }
-}

core/src/snark/snark.rs

@@ -1,9 +1,5 @@
 use std::str::FromStr;
 
-use ledger::scan_state::scan_state::{
-    transaction_snark::{OneOrTwo, Statement},
-    AvailableJobMessage,
-};
 use mina_p2p_messages::binprot::{
     self,
     macros::{BinProtRead, BinProtWrite},
@@ -110,39 +106,6 @@ impl<'de> Deserialize<'de> for LedgerHashTransition {
     }
 }
 
-impl From<&OneOrTwo<AvailableJobMessage>> for SnarkJobId {
-    fn from(value: &OneOrTwo<AvailableJobMessage>) -> Self {
-        let (first, second) = match value {
-            OneOrTwo::One(j) => (j, j),
-            OneOrTwo::Two((j1, j2)) => (j1, j2),
-        };
-
-        let source = match first {
-            AvailableJobMessage::Base(base) => &base.statement.0.source,
-            AvailableJobMessage::Merge { left, .. } => &left.0 .0.statement.source,
-        };
-        let target = match second {
-            AvailableJobMessage::Base(base) => &base.statement.0.target,
-            AvailableJobMessage::Merge { right, .. } => &right.0 .0.statement.target,
-        };
-
-        (source, target).into()
-    }
-}
-
-impl From<&OneOrTwo<Statement<()>>> for SnarkJobId {
-    fn from(value: &OneOrTwo<Statement<()>>) -> Self {
-        let (source, target): (
-            MinaStateBlockchainStateValueStableV2LedgerProofStatementSource,
-            MinaStateBlockchainStateValueStableV2LedgerProofStatementSource,
-        ) = match value {
-            OneOrTwo::One(stmt) => ((&stmt.source).into(), (&stmt.target).into()),
-            OneOrTwo::Two((stmt1, stmt2)) => ((&stmt1.source).into(), (&stmt2.target).into()),
-        };
-        (&source, &target).into()
-    }
-}
-
 impl From<&TransactionSnarkWorkTStableV2Proofs> for SnarkJobId {
     fn from(value: &TransactionSnarkWorkTStableV2Proofs) -> Self {
         let (first, second) = match value {

core/src/snark/snark_job_id.rs

@@ -16,6 +16,7 @@ crate-type = ["staticlib", "cdylib", "lib"]
 # https://stackoverflow.com/a/73023306
 
 [dependencies]
+openmina-core = { path = "../core" }
 mina-hasher = { workspace = true }
 mina-signer = { workspace = true }
 mina-curves = { workspace = true }

ledger/Cargo.toml

@@ -15,6 +15,7 @@ use mina_p2p_messages::{
     },
 };
 use mina_signer::CompressedPubKey;
+use openmina_core::snark::SnarkJobId;
 use sha2::Sha256;
 
 use crate::{
@@ -529,6 +530,16 @@ pub mod transaction_snark {
 
         pub type Checked = Work;
 
+        impl From<&openmina_core::snark::Snark> for Work {
+            fn from(value: &openmina_core::snark::Snark) -> Self {
+                Self {
+                    prover: (&value.snarker).into(),
+                    fee: (&value.fee).into(),
+                    proofs: (&*value.proofs).into(),
+                }
+            }
+}
+
         impl Work {
             pub fn statement(&self) -> Statement {
                 self.proofs.map(|p| {
@@ -2604,3 +2615,36 @@ impl TransactionsOrdered<Arc<TransactionWithWitness>> {
 pub enum Pass {
     FirstPassLedgerHash(Fp),
 }
+
+impl From<&OneOrTwo<AvailableJobMessage>> for SnarkJobId {
+    fn from(value: &OneOrTwo<AvailableJobMessage>) -> Self {
+        let (first, second) = match value {
+            OneOrTwo::One(j) => (j, j),
+            OneOrTwo::Two((j1, j2)) => (j1, j2),
+        };
+
+        let source = match first {
+            AvailableJobMessage::Base(base) => &base.statement.0.source,
+            AvailableJobMessage::Merge { left, .. } => &left.0 .0.statement.source,
+        };
+        let target = match second {
+            AvailableJobMessage::Base(base) => &base.statement.0.target,
+            AvailableJobMessage::Merge { right, .. } => &right.0 .0.statement.target,
+        };
+
+        (source, target).into()
+    }
+}
+
+impl From<&OneOrTwo<Statement<()>>> for SnarkJobId {
+    fn from(value: &OneOrTwo<Statement<()>>) -> Self {
+        let (source, target): (
+            mina_p2p_messages::v2::MinaStateBlockchainStateValueStableV2LedgerProofStatementSource,
+            mina_p2p_messages::v2::MinaStateBlockchainStateValueStableV2LedgerProofStatementSource,
+        ) = match value {
+            OneOrTwo::One(stmt) => ((&stmt.source).into(), (&stmt.target).into()),
+            OneOrTwo::Two((stmt1, stmt2)) => ((&stmt1.source).into(), (&stmt2.target).into()),
+        };
+        (&source, &target).into()
+    }
+}

ledger/src/scan_state/scan_state.rs

@@ -29,10 +29,8 @@ reqwest = { version = "0.11.22" }
 
 redux = { git = "https://github.com/openmina/redux-rs.git", branch="feat/global-time", features = ["serde"] }
 mina-p2p-messages = { workspace = true }
-ledger = { workspace = true }
 
 openmina-core = { path = "../core" }
-snark = { path = "../snark" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tokio = { version = "1.26", features = ["rt"] }

p2p/Cargo.toml

@@ -14,9 +14,10 @@ use std::{sync::Arc, time::Duration};
 
 use binprot_derive::{BinProtRead, BinProtWrite};
 use mina_p2p_messages::v2::{
-    LedgerHash, MinaBasePendingCoinbaseStableV2, MinaBaseStateBodyHashStableV1,
-    MinaLedgerSyncLedgerAnswerStableV2, MinaLedgerSyncLedgerQueryStableV1,
-    MinaStateProtocolStateValueStableV2, StateHash, TransactionSnarkScanStateStableV2,
+    LedgerHash, MerkleAddressBinableArgStableV1, MinaBasePendingCoinbaseStableV2,
+    MinaBaseStateBodyHashStableV1, MinaLedgerSyncLedgerAnswerStableV2,
+    MinaLedgerSyncLedgerQueryStableV1, MinaStateProtocolStateValueStableV2, StateHash,
+    TransactionSnarkScanStateStableV2,
 };
 use openmina_core::{
     block::ArcBlock,
@@ -108,15 +109,30 @@ impl Default for P2pRpcRequest {
     }
 }
 
+fn to_binary(bytes: &[u8]) -> String {
+    bytes
+        .into_iter()
+        .copied()
+        .map(|byte| {
+            (0..8)
+                .into_iter()
+                .map(|b| byte & (1 << (7 - b)) != 0)
+                .map(|b| if b { '1' } else { '0' })
+                .collect::<String>()
+        })
+        .collect()
+}
+
 impl std::fmt::Display for P2pRpcRequest {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{:?}", self.kind())?;
         match self {
             Self::BestTipWithProof => Ok(()),
             Self::LedgerQuery(ledger_hash, query) => {
-                let addr_to_str = |addr| {
-                    let addr = ledger::Address::from(addr);
-                    format!("depth: {}, addr: {}", addr.length(), addr.to_string())
+                let addr_to_str = |addr: &MerkleAddressBinableArgStableV1| {
+                    let depth = &addr.0 .0;
+                    let bits = to_binary(&addr.1[..(*depth as usize)]);
+                    format!("depth: {depth}, addr: {bits}")
                 };
 
                 match query {