diff --git a/nodes/nomos-node/Cargo.toml b/nodes/nomos-node/Cargo.toml index 2c58db76..e05c484c 100644 --- a/nodes/nomos-node/Cargo.toml +++ b/nodes/nomos-node/Cargo.toml @@ -30,10 +30,12 @@ nomos-mempool = { path = "../../nomos-services/mempool", features = [ ] } nomos-metrics = { path = "../../nomos-metrics" } nomos-http = { path = "../../nomos-services/http", features = ["http"] } +nomos-storage = { path = "../../nomos-services/storage", features = ["rocksdb"] } + carnot-consensus = { path = "../../nomos-services/carnot-consensus", features = [ "libp2p", ] } -nomos-storage = { path = "../../nomos-services/storage", features = ["sled"] } + nomos-libp2p = { path = "../../nomos-libp2p" } nomos-da = { path = "../../nomos-services/data-availability", features = [ "libp2p", diff --git a/nodes/nomos-node/src/lib.rs b/nodes/nomos-node/src/lib.rs index 829020e7..ea5d6a75 100644 --- a/nodes/nomos-node/src/lib.rs +++ b/nodes/nomos-node/src/lib.rs @@ -34,7 +34,7 @@ use nomos_mempool::{ use nomos_metrics::Metrics; use nomos_network::backends::libp2p::Libp2p as NetworkBackend; use nomos_storage::{ - backends::{sled::SledBackend, StorageSerde}, + backends::{rocksdb::RocksBackend, StorageSerde}, StorageService, }; @@ -73,7 +73,7 @@ pub type Carnot = CarnotConsensus< TreeOverlay, FillSizeWithTx, FillSizeWithBlobsCertificate, - SledBackend, + RocksBackend, >; pub type DataAvailability = DataAvailabilityService< @@ -99,7 +99,7 @@ pub struct Nomos { consensus: ServiceHandle, http: ServiceHandle>>, da: ServiceHandle, - storage: ServiceHandle>>, + storage: ServiceHandle>>, #[cfg(feature = "metrics")] metrics: ServiceHandle, system_sig: ServiceHandle, diff --git a/nodes/nomos-node/src/main.rs b/nodes/nomos-node/src/main.rs index 25bc5787..6ffaa517 100644 --- a/nodes/nomos-node/src/main.rs +++ b/nodes/nomos-node/src/main.rs @@ -99,8 +99,10 @@ fn main() -> Result<()> { #[cfg(feature = "metrics")] metrics: MetricsSettings { registry }, da: config.da, - storage: nomos_storage::backends::sled::SledBackendSettings { + storage: nomos_storage::backends::rocksdb::RocksBackendSettings { db_path: std::path::PathBuf::from(DEFAULT_DB_PATH), + read_only: false, + column_family: Some("blocks".into()), }, system_sig: (), }, diff --git a/nomos-services/api/Cargo.toml b/nomos-services/api/Cargo.toml index cddac679..9eafe3fc 100644 --- a/nomos-services/api/Cargo.toml +++ b/nomos-services/api/Cargo.toml @@ -24,7 +24,7 @@ nomos-mempool = { path = "../../nomos-services/mempool", features = [ "openapi", ] } nomos-metrics = { path = "../../nomos-metrics" } -nomos-storage = { path = "../../nomos-services/storage", features = ["sled"] } +nomos-storage = { path = "../../nomos-services/storage", features = ["rocksdb"] } nomos-libp2p = { path = "../../nomos-libp2p" } full-replication = { path = "../../nomos-da/full-replication" } serde = { version = "1", features = ["derive"] } diff --git a/nomos-services/api/src/http/consensus.rs b/nomos-services/api/src/http/consensus.rs index 02001741..49734232 100644 --- a/nomos-services/api/src/http/consensus.rs +++ b/nomos-services/api/src/http/consensus.rs @@ -24,7 +24,7 @@ use nomos_core::{ use nomos_mempool::{ backend::mockpool::MockPool, network::adapters::libp2p::Libp2pAdapter as MempoolNetworkAdapter, }; -use nomos_storage::backends::{sled::SledBackend, StorageSerde}; +use nomos_storage::backends::{rocksdb::RocksBackend, StorageSerde}; pub type Carnot = CarnotConsensus< ConsensusNetworkAdapter, @@ -42,7 +42,7 @@ pub type Carnot = CarnotConsensus< TreeOverlay, FillSizeWithTx, FillSizeWithBlobsCertificate, - SledBackend, + RocksBackend, >; pub async fn carnot_info( diff --git a/nomos-services/api/src/http/storage.rs b/nomos-services/api/src/http/storage.rs index 8a408fe3..525c8803 100644 --- a/nomos-services/api/src/http/storage.rs +++ b/nomos-services/api/src/http/storage.rs @@ -1,7 +1,7 @@ use nomos_core::block::Block; use nomos_core::header::HeaderId; use nomos_storage::{ - backends::{sled::SledBackend, StorageSerde}, + backends::{rocksdb::RocksBackend, StorageSerde}, StorageMsg, StorageService, }; @@ -14,7 +14,7 @@ where S: StorageSerde + Send + Sync + 'static, { let relay = handle - .relay::>>() + .relay::>>() .connect() .await?; let (msg, receiver) = StorageMsg::new_load_message(id);