Merge branch 'main' into refactor/da/index

rooch-network · Jan 13, 2025 · 93471bd · 93471bd
2 parents aa74dff + 0774700
commit 93471bd
Show file tree

Hide file tree

Showing 17 changed files with 701 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -312,7 +312,7 @@ revm-primitives = "4.0.0"
 scopeguard = "1.1"
 uuid = { version = "1.11.0", features = ["v4", "fast-rng"] }
 protobuf = { version = "2.28", features = ["with-bytes"] }
-rocksdb = { git = "https://github.com/rooch-network/rust-rocksdb.git", rev = "41d102327ba3cf9a2335d1192e8312c92bc3d6f9", features = ["lz4", "mt_static"] }
+rocksdb = { version = "0.23.0", features = ["lz4", "mt_static", "jemalloc"] }
 lz4 = { version = "1.28.1" }
 ripemd = { version = "0.1.3" }
 fastcrypto-zkp = { version = "0.1.3" }
@@ -325,6 +325,8 @@ crossbeam-channel = "0.5.14"
 inferno = "0.11.21"
 handlebars = "4.2.2"
 indexmap = "2.7.0"
+tikv-jemallocator = { version = "0.6.0", features = ["unprefixed_malloc_on_supported_platforms", "profiling"] }
+mimalloc = { version = "0.1.39" }
 
 # Note: the BEGIN and END comments below are required for external tooling. Do not remove.
 # BEGIN MOVE DEPENDENCIES