starknet_committer: add mdbx storage

Author: yoavGrs

Cargo.lock

@@ -153,16 +153,10 @@ pub async fn run_storage_benchmark() {
         );
         serialized_filled_forest.0.write_to_storage(&mut storage);
 
-        let n_new_facts = serialized_filled_forest
-            .0
-            .storage_tries
-            .get(&contract_leaf)
-            .unwrap()
-            .tree_map
-            .len();
+        let n_new_facts =
+            serialized_filled_forest.0.storage_tries.get(&contract_leaf).unwrap().tree_map.len();
         time_measurement.stop_measurement(n_new_facts);
 
-
         contracts_trie_root_hash = serialized_filled_forest.0.get_contract_root_hash();
         classes_trie_root_hash = serialized_filled_forest.0.get_compiled_class_root_hash();
     }

crates/starknet_committer_and_os_cli/src/committer_cli/commands.rs

@@ -13,7 +13,10 @@ testing = []
 workspace = true
 
 [dependencies]
+apollo_storage.workspace = true
 hex.workspace = true
+libmdbx.workspace = true
+lru.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 starknet-types-core.workspace = true

crates/starknet_patricia_storage/Cargo.toml

@@ -1,4 +1,5 @@
 pub mod db_object;
 pub mod errors;
 pub mod map_storage;
+pub mod mdbx_storage;
 pub mod storage_trait;

crates/starknet_patricia_storage/src/lib.rs

@@ -0,0 +1,68 @@
+use std::path::Path;
+
+use libmdbx::{Database as MdbxDb, TableFlags, WriteFlags, WriteMap};
+
+use crate::map_storage::MapStorage;
+use crate::storage_trait::{DbKey, DbValue, PatriciaStorageResult, Storage};
+
+pub struct MdbxStorage {
+    db: MdbxDb<WriteMap>,
+}
+
+impl MdbxStorage {
+    pub fn open(path: &Path) -> PatriciaStorageResult<Self> {
+        let db = MdbxDb::<WriteMap>::new().open(path)?;
+        let txn = db.begin_rw_txn()?;
+        txn.create_table(None, TableFlags::empty())?;
+        txn.commit()?;
+        Ok(Self { db })
+    }
+}
+
+impl Storage for MdbxStorage {
+    fn get(&self, key: &DbKey) -> PatriciaStorageResult<Option<DbValue>> {
+        let txn = self.db.begin_ro_txn()?;
+        let table = txn.open_table(None)?;
+        Ok(txn.get(&table, &key.0)?.map(DbValue))
+    }
+
+    fn set(&mut self, key: DbKey, value: DbValue) -> PatriciaStorageResult<Option<DbValue>> {
+        let txn = self.db.begin_rw_txn()?;
+        let table = txn.open_table(None)?;
+        let prev_val = txn.get(&table, &key.0)?.map(DbValue);
+        txn.put(&table, key.0, value.0, WriteFlags::UPSERT)?;
+        txn.commit()?;
+        Ok(prev_val)
+    }
+
+    fn mget(&self, keys: &[DbKey]) -> PatriciaStorageResult<Vec<Option<DbValue>>> {
+        let txn = self.db.begin_ro_txn()?;
+        let table = txn.open_table(None)?;
+        let mut res = Vec::with_capacity(keys.len());
+        for key in keys {
+            res.push(txn.get(&table, &key.0)?.map(DbValue));
+        }
+        Ok(res)
+    }
+
+    fn mset(&mut self, key_to_value: MapStorage) -> PatriciaStorageResult<()> {
+        let txn = self.db.begin_rw_txn()?;
+        let table = txn.open_table(None)?;
+        for (key, value) in key_to_value {
+            txn.put(&table, key.0, value.0, WriteFlags::UPSERT)?;
+        }
+        txn.commit()?;
+        Ok(())
+    }
+
+    fn delete(&mut self, key: &DbKey) -> PatriciaStorageResult<Option<DbValue>> {
+        let txn = self.db.begin_rw_txn()?;
+        let table = txn.open_table(None)?;
+        let prev_val = txn.get(&table, &key.0)?.map(DbValue);
+        if prev_val.is_some() {
+            txn.del(&table, &key.0, None)?;
+        }
+        txn.commit()?;
+        Ok(prev_val)
+    }
+}

crates/starknet_patricia_storage/src/mdbx_storage.rs

@@ -12,7 +12,11 @@ pub struct DbValue(pub Vec<u8>);
 
 /// An error that can occur when interacting with the database.
 #[derive(thiserror::Error, Debug)]
-pub enum PatriciaStorageError {}
+pub enum PatriciaStorageError {
+    /// An error that occurred in the database library.
+    #[error(transparent)]
+    Mdbx(#[from] libmdbx::Error),
+}
 
 pub type PatriciaStorageResult<T> = Result<T, PatriciaStorageError>;