Merge branch 'master' into reestablish-conn

mixnet/client/Cargo.toml

@@ -16,3 +16,6 @@ mixnet-topology = { path = "../topology" }
 mixnet-util = { path = "../util" }
 futures = "0.3.28"
 thiserror = "1"
+
+[dev-dependencies]
+serde_yaml = "0.9.25"

mixnet/client/src/config.rs

@@ -6,10 +6,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{receiver::Receiver, MessageStream, MixnetClientError};
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct MixnetClientConfig {
     pub mode: MixnetClientMode,
     pub topology: MixnetTopology,
+    #[serde(default = "MixnetClientConfig::default_connection_pool_size")]
     pub connection_pool_size: usize,
     #[serde(default = "MixnetClientConfig::default_max_retries")]
     pub max_retries: usize,
@@ -23,14 +24,26 @@ impl MixnetClientConfig {
         Self {
             mode,
             topology,
-            connection_pool_size: 256,
-            max_retries: 3,
-            retry_delay: std::time::Duration::from_secs(5),
+            connection_pool_size: Self::default_connection_pool_size(),
+            max_retries: Self::default_max_retries(),
+            retry_delay: Self::default_retry_delay(),
         }
     }
+
+    const fn default_connection_pool_size() -> usize {
+        256
+    }
+
+    const fn default_max_retries() -> usize {
+        3
+    }
+
+    const fn default_retry_delay() -> Duration {
+        Duration::from_secs(5)
+    }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub enum MixnetClientMode {
     Sender,
     SenderReceiver(SocketAddr),
@@ -47,12 +60,26 @@ impl MixnetClientMode {
     }
 }
 
-impl MixnetClientConfig {
-    const fn default_max_retries() -> usize {
-        3
-    }
+#[cfg(test)]
+mod tests {
+    use mixnet_topology::MixnetTopology;
 
-    const fn default_retry_delay() -> Duration {
-        Duration::from_secs(5)
+    use crate::{MixnetClientConfig, MixnetClientMode};
+
+    #[test]
+    fn default_config_serde() {
+        let yaml = "
+            mode: Sender
+            topology:
+              layers: []
+        ";
+        let conf: MixnetClientConfig = serde_yaml::from_str(yaml).unwrap();
+        assert_eq!(
+            conf,
+            MixnetClientConfig::new(
+                MixnetClientMode::Sender,
+                MixnetTopology { layers: Vec::new() }
+            )
+        );
     }
 }

mixnet/topology/src/lib.rs

@@ -9,17 +9,17 @@ pub type MixnetNodeId = [u8; PUBLIC_KEY_SIZE];
 
 pub type Result<T> = core::result::Result<T, NymNodeRoutingAddressError>;
 
-#[derive(Serialize, Deserialize, Clone, Debug, Default)]
+#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
 pub struct MixnetTopology {
     pub layers: Vec<Layer>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct Layer {
     pub nodes: Vec<Node>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct Node {
     #[serde(with = "addr_serde")]
     pub address: SocketAddr,

nodes/nomos-node/Cargo.toml

@@ -24,6 +24,7 @@ nomos-log = { path = "../../nomos-services/log" }
 nomos-mempool = { path = "../../nomos-services/mempool", features = ["mock", "libp2p"] }
 nomos-http = { path = "../../nomos-services/http", features = ["http"] }
 nomos-consensus = { path = "../../nomos-services/consensus", features = ["libp2p"] }
+nomos-storage = { path = "../../nomos-services/storage", features = ["sled"] }
 nomos-libp2p = { path = "../../nomos-libp2p" }
 nomos-da = { path = "../../nomos-services/data-availability" }
 metrics = { path = "../../nomos-services/metrics", optional = true }

nodes/nomos-node/src/lib.rs

@@ -9,10 +9,12 @@ use full_replication::{AbsoluteNumber, Attestation, Blob, FullReplication};
 use metrics::{backend::map::MapMetricsBackend, types::MetricsData, MetricsService};
 use nomos_consensus::network::adapters::libp2p::Libp2pAdapter as ConsensusLibp2pAdapter;
 
+use bytes::Bytes;
 use nomos_consensus::CarnotConsensus;
 use nomos_core::{
     da::{blob, certificate},
     tx::Transaction,
+    wire,
 };
 use nomos_da::{
     backend::memory_cache::BlobCache, network::adapters::libp2p::Libp2pAdapter as DaLibp2pAdapter,
@@ -28,6 +30,10 @@ use nomos_mempool::{
     Transaction as TxDiscriminant,
 };
 use nomos_network::backends::libp2p::Libp2p;
+use nomos_storage::{
+    backends::{sled::SledBackend, StorageSerde},
+    StorageService,
+};
 
 use nomos_network::NetworkService;
 use overwatch_derive::*;
@@ -38,6 +44,7 @@ use nomos_core::{
     da::certificate::select::FillSize as FillSizeWithBlobsCertificate,
     tx::select::FillSize as FillSizeWithTx,
 };
+use serde::{de::DeserializeOwned, Serialize};
 pub use tx::Tx;
 
 pub const CL_TOPIC: &str = "cl";
@@ -56,6 +63,7 @@ pub type Carnot = CarnotConsensus<
     TreeOverlay<RoundRobin, RandomBeaconState>,
     FillSizeWithTx<MB16, Tx>,
     FillSizeWithBlobsCertificate<MB16, Certificate>,
+    SledBackend<Wire>,
 >;
 
 type DataAvailability = DataAvailabilityService<
@@ -84,4 +92,19 @@ pub struct Nomos {
     #[cfg(feature = "metrics")]
     metrics: ServiceHandle<MetricsService<MapMetricsBackend<MetricsData>>>,
     da: ServiceHandle<DataAvailability>,
+    storage: ServiceHandle<StorageService<SledBackend<Wire>>>,
+}
+
+pub struct Wire;
+
+impl StorageSerde for Wire {
+    type Error = wire::Error;
+
+    fn serialize<T: Serialize>(value: T) -> Bytes {
+        wire::serialize(&value).unwrap().into()
+    }
+
+    fn deserialize<T: DeserializeOwned>(buff: Bytes) -> Result<T, Self::Error> {
+        wire::deserialize(&buff)
+    }
 }

nodes/nomos-node/src/main.rs

@@ -18,6 +18,8 @@ use nomos_network::backends::libp2p::Libp2p;
 use overwatch_rs::overwatch::*;
 use std::sync::Arc;
 
+const DEFAULT_DB_PATH: &str = "./db";
+
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
 struct Args {
@@ -99,6 +101,9 @@ fn main() -> Result<()> {
             #[cfg(feature = "metrics")]
             metrics: config.metrics,
             da: config.da,
+            storage: nomos_storage::backends::sled::SledBackendSettings {
+                db_path: std::path::PathBuf::from(DEFAULT_DB_PATH),
+            },
         },
         None,
     )

nomos-libp2p/src/config.rs

@@ -13,7 +13,7 @@ pub struct SwarmConfig {
     #[serde(with = "secret_key_serde", default = "secp256k1::SecretKey::generate")]
     pub node_key: secp256k1::SecretKey,
     // Gossipsub config
-    #[serde(with = "GossipsubConfigDef")]
+    #[serde(with = "GossipsubConfigDef", default = "gossipsub::Config::default")]
     pub gossipsub_config: gossipsub::Config,
 }
 

nomos-services/consensus/Cargo.toml

@@ -15,6 +15,7 @@ nomos-network = { path = "../network" }
 nomos-mempool = { path = "../mempool" }
 nomos-core = { path = "../../nomos-core" }
 overwatch-rs = { git = "https://github.com/logos-co/Overwatch",rev = "6e6678b" }
+nomos-storage = { path = "../storage" }
 rand_chacha = "0.3"
 rand = "0.8"
 serde = { version = "1", features = ["derive"] }

nomos-services/consensus/src/lib.rs

@@ -45,6 +45,7 @@ use nomos_mempool::{
     MempoolMsg, MempoolService, Transaction as TxDiscriminant,
 };
 use nomos_network::NetworkService;
+use nomos_storage::{backends::StorageBackend, StorageMsg, StorageService};
 use overwatch_rs::services::relay::{OutboundRelay, Relay, RelayMessage};
 use overwatch_rs::services::{
     handle::ServiceStateHandle,
@@ -104,7 +105,7 @@ impl<O: Overlay, Ts, Bs> CarnotSettings<O, Ts, Bs> {
     }
 }
 
-pub struct CarnotConsensus<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS>
+pub struct CarnotConsensus<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS, Storage>
 where
     A: NetworkAdapter,
     ClPoolAdapter: MempoolAdapter<Item = ClPool::Item, Key = ClPool::Key>,
@@ -119,6 +120,7 @@ where
     A::Backend: 'static,
     TxS: TxSelect<Tx = ClPool::Item>,
     BS: BlobCertificateSelect<Certificate = DaPool::Item>,
+    Storage: StorageBackend + Send + Sync + 'static,
 {
     service_state: ServiceStateHandle<Self>,
     // underlying networking backend. We need this so we can relay and check the types properly
@@ -126,11 +128,12 @@ where
     network_relay: Relay<NetworkService<A::Backend>>,
     cl_mempool_relay: Relay<MempoolService<ClPoolAdapter, ClPool, TxDiscriminant>>,
     da_mempool_relay: Relay<MempoolService<DaPoolAdapter, DaPool, CertDiscriminant>>,
+    storage_relay: Relay<StorageService<Storage>>,
     _overlay: std::marker::PhantomData<O>,
 }
 
-impl<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS> ServiceData
-    for CarnotConsensus<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS>
+impl<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS, Storage> ServiceData
+    for CarnotConsensus<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS, Storage>
 where
     A: NetworkAdapter,
     ClPool: MemPool,
@@ -144,6 +147,7 @@ where
     O: Overlay + Debug,
     TxS: TxSelect<Tx = ClPool::Item>,
     BS: BlobCertificateSelect<Certificate = DaPool::Item>,
+    Storage: StorageBackend + Send + Sync + 'static,
 {
     const SERVICE_ID: ServiceId = "Carnot";
     type Settings = CarnotSettings<O, TxS::Settings, BS::Settings>;
@@ -153,8 +157,8 @@ where
 }
 
 #[async_trait::async_trait]
-impl<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS> ServiceCore
-    for CarnotConsensus<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS>
+impl<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS, Storage> ServiceCore
+    for CarnotConsensus<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS, Storage>
 where
     A: NetworkAdapter + Clone + Send + Sync + 'static,
     ClPool: MemPool + Send + Sync + 'static,
@@ -192,17 +196,20 @@ where
     TxS::Settings: Send + Sync + 'static,
     BS: BlobCertificateSelect<Certificate = DaPool::Item> + Clone + Send + Sync + 'static,
     BS::Settings: Send + Sync + 'static,
+    Storage: StorageBackend + Send + Sync + 'static,
 {
     fn init(service_state: ServiceStateHandle<Self>) -> Result<Self, overwatch_rs::DynError> {
         let network_relay = service_state.overwatch_handle.relay();
         let cl_mempool_relay = service_state.overwatch_handle.relay();
         let da_mempool_relay = service_state.overwatch_handle.relay();
+        let storage_relay = service_state.overwatch_handle.relay();
         Ok(Self {
             service_state,
             network_relay,
             _overlay: Default::default(),
             cl_mempool_relay,
             da_mempool_relay,
+            storage_relay,
         })
     }
 
@@ -225,6 +232,12 @@ where
             .await
             .expect("Relay connection with MemPoolService should succeed");
 
+        let storage_relay: OutboundRelay<_> = self
+            .storage_relay
+            .connect()
+            .await
+            .expect("Relay connection with StorageService should succeed");
+
         let CarnotSettings {
             private_key,
             overlay_settings,
@@ -310,6 +323,7 @@ where
                             private_key,
                             cl_mempool_relay.clone(),
                             da_mempool_relay.clone(),
+                            storage_relay.clone(),
                             tx_selector.clone(),
                             blob_selector.clone(),
                             timeout,
@@ -336,8 +350,8 @@ enum Output<Tx: Clone + Eq + Hash, BlobCertificate: Clone + Eq + Hash> {
     },
 }
 
-impl<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS>
-    CarnotConsensus<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS>
+impl<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS, Storage>
+    CarnotConsensus<A, ClPool, ClPoolAdapter, DaPool, DaPoolAdapter, O, TxS, BS, Storage>
 where
     A: NetworkAdapter + Clone + Send + Sync + 'static,
     ClPool: MemPool + Send + Sync + 'static,
@@ -373,6 +387,7 @@ where
     DaPool::Key: Debug + Send + Sync,
     ClPoolAdapter: MempoolAdapter<Item = ClPool::Item, Key = ClPool::Key> + Send + Sync + 'static,
     DaPoolAdapter: MempoolAdapter<Item = DaPool::Item, Key = DaPool::Key> + Send + Sync + 'static,
+    Storage: StorageBackend + Send + Sync + 'static,
 {
     fn process_message(carnot: &Carnot<O>, msg: ConsensusMsg) {
         match msg {
@@ -402,6 +417,7 @@ where
         private_key: PrivateKey,
         cl_mempool_relay: OutboundRelay<MempoolMsg<ClPool::Item, ClPool::Key>>,
         da_mempool_relay: OutboundRelay<MempoolMsg<DaPool::Item, DaPool::Key>>,
+        storage_relay: OutboundRelay<StorageMsg<Storage>>,
         tx_selector: TxS,
         blobl_selector: BS,
         timeout: Duration,
@@ -410,8 +426,15 @@ where
         let prev_view = carnot.current_view();
         match event {
             Event::Proposal { block, stream } => {
-                (carnot, output) =
-                    Self::process_block(carnot, block, stream, task_manager, adapter.clone()).await;
+                (carnot, output) = Self::process_block(
+                    carnot,
+                    block,
+                    stream,
+                    task_manager,
+                    adapter.clone(),
+                    storage_relay,
+                )
+                .await;
             }
             Event::Approve { block, .. } => {
                 tracing::debug!("approving proposal {:?}", block);
@@ -486,13 +509,14 @@ where
     }
 
     #[allow(clippy::type_complexity)]
-    #[instrument(level = "debug", skip(adapter, task_manager, stream))]
+    #[instrument(level = "debug", skip(adapter, task_manager, stream, storage_relay))]
     async fn process_block(
         mut carnot: Carnot<O>,
         block: Block<ClPool::Item, DaPool::Item>,
         mut stream: Pin<Box<dyn Stream<Item = Block<ClPool::Item, DaPool::Item>> + Send>>,
         task_manager: &mut TaskManager<View, Event<ClPool::Item, DaPool::Item>>,
         adapter: A,
+        storage_relay: OutboundRelay<StorageMsg<Storage>>,
     ) -> (Carnot<O>, Option<Output<ClPool::Item, DaPool::Item>>) {
         tracing::debug!("received proposal {:?}", block);
         if carnot.highest_voted_view() >= block.header().view {
@@ -502,6 +526,7 @@ where
 
         let original_block = block;
         let block = original_block.header().clone();
+
         let self_committee = carnot.self_committee();
         let leader_committee = [carnot.id()].into_iter().collect();
 
@@ -518,6 +543,10 @@ where
         match carnot.receive_block(block.clone()) {
             Ok(mut new_state) => {
                 let new_view = new_state.current_view();
+                let msg = <StorageMsg<_>>::new_store_message(block.id, original_block.clone());
+                if let Err((e, _msg)) = storage_relay.send(msg).await {
+                    tracing::error!("Could not send block to storage: {e}");
+                }
                 if new_view != carnot.current_view() {
                     task_manager.push(
                         block.view,

nomos-services/storage/src/backends/sled.rs

@@ -19,10 +19,10 @@ pub enum Error {
 }
 
 /// Sled backend setting
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct SledBackendSettings {
     /// File path to the db file
-    db_path: PathBuf,
+    pub db_path: PathBuf,
 }
 
 /// Sled transaction type