Make code wasm-compatible

Cargo.toml

@@ -17,15 +17,13 @@ smallvec = "1.11.2"
 rustc-hex = "2.1.0"
 env_logger = "0.10.1"
 lru = "0.12.1"
-parking_lot = "0.12.1"
-
-bitvec = { version = "1", default-features = false }
+bitvec = { version = "1" }
 derive_more = { version = "0.99.17", features = ["constructor"] }
-mp-felt = { git = "https://github.com/keep-starknet-strange/madara.git", rev = "f30acea8af7e28e956e771928130e12bfc084832", package = "mp-felt", features = ["parity-scale-codec", "serde"]}
-mp-hashers = { git = "https://github.com/keep-starknet-strange/madara.git", rev = "f30acea8af7e28e956e771928130e12bfc084832", package = "mp-hashers" }
-mp-transactions = { git = "https://github.com/keep-starknet-strange/madara.git", rev = "f30acea8af7e28e956e771928130e12bfc084832", package = "mp-transactions", features = ["parity-scale-codec", "serde"] }
+starknet-types-core = { version = "0.0.5", features=["hash", "parity-scale-codec"] }
 
 [dev-dependencies]
 tempfile = "3.8.0"
 mp-commitments = { git = "https://github.com/keep-starknet-strange/madara.git", rev = "f30acea8af7e28e956e771928130e12bfc084832", package = "mp-commitments" }
+mp-hashers = { git = "https://github.com/keep-starknet-strange/madara.git", rev = "f30acea8af7e28e956e771928130e12bfc084832", package = "mp-hashers" }
+mp-felt = { git = "https://github.com/keep-starknet-strange/madara.git", rev = "f30acea8af7e28e956e771928130e12bfc084832", package = "mp-felt", features = ["parity-scale-codec", "serde"]}
 rand = "0.8.5"

README.md

@@ -38,7 +38,8 @@ use bonsai_trie::{
     id::{BasicIdBuilder, BasicId},
     BonsaiStorage, BonsaiStorageConfig, BonsaiTrieHash,
 };
-use mp_felt::Felt252Wrapper;
+use starknet_types_core::felt::Felt;
+use starknet_types_core::hash::Pedersen;
 use bitvec::prelude::*;
 
 fn main() {
@@ -47,19 +48,19 @@ fn main() {
 
     // Create a BonsaiStorage with default parameters.
     let config = BonsaiStorageConfig::default();
-    let mut bonsai_storage = BonsaiStorage::new(RocksDB::new(&db, RocksDBConfig::default()), config).unwrap();
+    let mut bonsai_storage: BonsaiStorage<_, _, Pedersen> = BonsaiStorage::new(RocksDB::new(&db, RocksDBConfig::default()), config).unwrap();
 
     // Create a simple incremental ID builder for commit IDs.
     // This is not necessary, you can use any kind of strictly monotonically increasing value to tag your commits. 
     let mut id_builder = BasicIdBuilder::new();
 
     // Insert an item `pair1`.
-    let pair1 = (vec![1, 2, 1], Felt252Wrapper::from_hex_be("0x66342762FDD54D033c195fec3ce2568b62052e").unwrap());
+    let pair1 = (vec![1, 2, 1], Felt::from_hex("0x66342762FDD54D033c195fec3ce2568b62052e").unwrap());
     let bitvec_1 = BitVec::from_vec(pair1.0.clone());
     bonsai_storage.insert(&bitvec_1, &pair1.1).unwrap();
 
     // Insert a second item `pair2`.
-    let pair2 = (vec![1, 2, 2], Felt252Wrapper::from_hex_be("0x66342762FD54D033c195fec3ce2568b62052e").unwrap());
+    let pair2 = (vec![1, 2, 2], Felt::from_hex("0x66342762FD54D033c195fec3ce2568b62052e").unwrap());
     let bitvec = BitVec::from_vec(pair2.0.clone());
     bonsai_storage.insert(&bitvec, &pair2.1).unwrap();
 
@@ -68,7 +69,7 @@ fn main() {
     bonsai_storage.commit(id1);
 
     // Insert a new item `pair3`.
-    let pair3 = (vec![1, 2, 2], Felt252Wrapper::from_hex_be("0x664D033c195fec3ce2568b62052e").unwrap());
+    let pair3 = (vec![1, 2, 2], Felt::from_hex("0x664D033c195fec3ce2568b62052e").unwrap());
     let bitvec = BitVec::from_vec(pair3.0.clone());
     bonsai_storage.insert(&bitvec, &pair3.1).unwrap();
 
@@ -100,7 +101,7 @@ fn main() {
     // asserting in both of them that the item `pair1` is present and has the right value.
     std::thread::scope(|s| {
         s.spawn(|| {
-            let bonsai_at_txn = bonsai_storage
+            let bonsai_at_txn: BonsaiStorage<_, _, Pedersen> = bonsai_storage
                 .get_transactional_state(id1, bonsai_storage.get_config())
                 .unwrap()
                 .unwrap();
@@ -109,7 +110,7 @@ fn main() {
         });
 
         s.spawn(|| {
-            let bonsai_at_txn = bonsai_storage
+            let bonsai_at_txn: BonsaiStorage<_, _, Pedersen> = bonsai_storage
                 .get_transactional_state(id1, bonsai_storage.get_config())
                 .unwrap()
                 .unwrap();
@@ -126,7 +127,7 @@ fn main() {
     // Insert a new item and commit.
     let pair4 = (
         vec![1, 2, 3],
-        Felt252Wrapper::from_hex_be("0x66342762FDD54D033c195fec3ce2568b62052e").unwrap(),
+        Felt::from_hex("0x66342762FDD54D033c195fec3ce2568b62052e").unwrap(),
     );
     bonsai_storage
         .insert(&BitVec::from_vec(pair4.0.clone()), &pair4.1)

src/databases/hashmap_db.rs

@@ -25,7 +25,7 @@
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub struct HashMapDbConfig {}
 
 #[derive(Clone)]

src/databases/mod.rs

@@ -1,6 +1,9 @@
 #![allow(dead_code)]
 mod hashmap_db;
+pub use hashmap_db::{HashMapDb, HashMapDbConfig};
 
+#[cfg(feature = "rocksdb")]
 mod rocks_db;
 
+#[cfg(feature = "rocksdb")]
 pub use rocks_db::{create_rocks_db, RocksDB, RocksDBBatch, RocksDBConfig};