chore(deps): use tikv-jemallocator instead of jemallocator (#7232)

Cargo.lock

@@ -827,7 +827,7 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -870,9 +870,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 dependencies = [
  "arbitrary",
  "serde",
@@ -945,7 +945,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b6fb81ca0f301f33aff7401e2ffab37dc9e0e4a1cf0ccf6b34f4d9e60aa0682"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "boa_interner",
  "boa_macros",
  "indexmap 2.2.5",
@@ -960,7 +960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "600e4e4a65b26efcef08a7b1cf2899d3845a32e82e067ee3b75eaf7e413ff31c"
 dependencies = [
  "arrayvec",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "boa_ast",
  "boa_gc",
  "boa_interner",
@@ -1044,7 +1044,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e8592556849f0619ed142ce2b3a19086769314a8d657f93a5765d06dbce4818"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "boa_ast",
  "boa_interner",
  "boa_macros",
@@ -1074,9 +1074,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
+checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -1590,7 +1590,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "crossterm_winapi",
  "libc",
  "mio",
@@ -2521,7 +2521,6 @@ dependencies = [
  "async-trait",
  "eyre",
  "futures",
- "jemallocator",
  "reth-beacon-consensus",
  "reth-blockchain-tree",
  "reth-db",
@@ -3616,37 +3615,6 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
-[[package]]
-name = "jemalloc-ctl"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cffc705424a344c054e135d12ee591402f4539245e8bbd64e6c9eaa9458b63c"
-dependencies = [
- "jemalloc-sys",
- "libc",
- "paste",
-]
-
-[[package]]
-name = "jemalloc-sys"
-version = "0.5.4+5.3.0-patched"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "jemallocator"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc"
-dependencies = [
- "jemalloc-sys",
- "libc",
-]
-
 [[package]]
 name = "jobserver"
 version = "0.1.28"
@@ -3946,7 +3914,7 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "libc",
  "redox_syscall 0.4.1",
 ]
@@ -5051,7 +5019,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "chrono",
  "flate2",
  "hex",
@@ -5066,7 +5034,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "chrono",
  "hex",
 ]
@@ -5079,7 +5047,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
@@ -5265,7 +5233,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cassowary",
  "crossterm",
  "indoc",
@@ -5462,7 +5430,6 @@ dependencies = [
  "futures",
  "human_bytes",
  "itertools 0.12.1",
- "jemallocator",
  "jsonrpsee",
  "libc",
  "metrics-process",
@@ -5512,6 +5479,7 @@ dependencies = [
  "serde_json",
  "similar-asserts",
  "tempfile",
+ "tikv-jemallocator",
  "tokio",
  "toml",
  "tracing",
@@ -5936,7 +5904,7 @@ dependencies = [
 name = "reth-libmdbx"
 version = "0.2.0-beta.3"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "byteorder",
  "criterion",
  "dashmap",
@@ -6158,7 +6126,6 @@ dependencies = [
  "futures",
  "humantime",
  "hyper",
- "jemalloc-ctl",
  "jsonrpsee",
  "metrics",
  "metrics-exporter-prometheus",
@@ -6204,6 +6171,7 @@ dependencies = [
  "shellexpand",
  "tempfile",
  "thiserror",
+ "tikv-jemalloc-ctl",
  "tokio",
  "tracing",
  "vergen",
@@ -6712,7 +6680,7 @@ dependencies = [
  "aquamarine",
  "assert_matches",
  "auto_impl",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "criterion",
  "fnv",
  "futures-util",
@@ -6860,7 +6828,7 @@ checksum = "2a4d7d3e793e907dc0797a9d3b43abfdf5226d133855214db9bd27d4cee33ebd"
 dependencies = [
  "alloy-primitives",
  "auto_impl",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "bitvec",
  "c-kzg",
  "cfg-if",
@@ -7074,7 +7042,7 @@ version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -8060,6 +8028,37 @@ dependencies = [
  "num_cpus",
 ]
 
+[[package]]
+name = "tikv-jemalloc-ctl"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "619bfed27d807b54f7f776b9430d4f8060e66ee138a28632ca898584d462c31c"
+dependencies = [
+ "libc",
+ "paste",
+ "tikv-jemalloc-sys",
+]
+
+[[package]]
+name = "tikv-jemalloc-sys"
+version = "0.5.4+5.3.0-patched"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "tikv-jemallocator"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca"
+dependencies = [
+ "libc",
+ "tikv-jemalloc-sys",
+]
+
 [[package]]
 name = "time"
 version = "0.3.34"
@@ -8220,14 +8219,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.7",
+ "toml_edit 0.22.8",
 ]
 
 [[package]]
@@ -8274,9 +8273,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.7"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992"
+checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd"
 dependencies = [
  "indexmap 2.2.5",
  "serde",
@@ -8314,7 +8313,7 @@ checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
  "async-compression",
  "base64 0.21.7",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "bytes",
  "futures-core",
  "futures-util",
@@ -8760,9 +8759,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
  "getrandom 0.2.12",
 ]

Cargo.toml

@@ -195,13 +195,8 @@ reth-trie = { path = "crates/trie" }
 reth-trie-parallel = { path = "crates/trie-parallel" }
 
 # revm
-revm = { version = "7.1.0", features = [
+revm = { version = "7.1.0", features = ["std", "secp256k1"], default-features = false }
-    "std",
+revm-primitives = { version = "3.0.0", features = ["std"], default-features = false }
-    "secp256k1",
-], default-features = false }
-revm-primitives = { version = "3.0.0", features = [
-    "std",
-], default-features = false }
 revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "f96bc1f" }
 
 # eth
@@ -277,9 +272,9 @@ discv5 = "0.4"
 igd-next = "0.14.3"
 
 # rpc
-jsonrpsee = { version = "0.20" }
+jsonrpsee = "0.20"
-jsonrpsee-core = { version = "0.20" }
+jsonrpsee-core = "0.20"
-jsonrpsee-types = { version = "0.20" }
+jsonrpsee-types = "0.20"
 
 # crypto
 secp256k1 = { version = "0.27.0", default-features = false, features = [

bin/reth/Cargo.toml

@@ -95,10 +95,8 @@ itertools.workspace = true
 rayon.workspace = true
 boyer-moore-magiclen = "0.2.16"
 
-[target.'cfg(not(windows))'.dependencies]
-jemallocator = { version = "0.5.0", optional = true }
-
 [target.'cfg(unix)'.dependencies]
+tikv-jemallocator = { version = "0.5.0", optional = true }
 libc = "0.2"
 
 [dev-dependencies]
@@ -110,8 +108,8 @@ default = ["jemalloc"]
 
 asm-keccak = ["reth-primitives/asm-keccak"]
 
-jemalloc = ["dep:jemallocator", "reth-node-core/jemalloc"]
+jemalloc = ["dep:tikv-jemallocator", "reth-node-core/jemalloc"]
-jemalloc-prof = ["jemalloc", "jemallocator?/profiling"]
+jemalloc-prof = ["jemalloc", "tikv-jemallocator?/profiling"]
 
 min-error-logs = ["tracing/release_max_level_error"]
 min-warn-logs = ["tracing/release_max_level_warn"]

bin/reth/src/lib.rs

@@ -163,7 +163,7 @@ pub mod sigsegv_handler {
 }
 
 #[cfg(all(feature = "jemalloc", unix))]
-use jemallocator as _;
+use tikv_jemallocator as _;
 
 // for rendering diagrams
 use aquamarine as _;

bin/reth/src/main.rs

@@ -3,7 +3,7 @@
 // We use jemalloc for performance reasons.
 #[cfg(all(feature = "jemalloc", unix))]
 #[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 #[cfg(all(feature = "optimism", not(test)))]
 compile_error!("Cannot build the `reth` binary with the `optimism` feature flag enabled. Did you mean to build `op-reth`?");

bin/reth/src/optimism.rs

@@ -9,7 +9,7 @@ use reth_provider::BlockReaderIdExt;
 // We use jemalloc for performance reasons
 #[cfg(all(feature = "jemalloc", unix))]
 #[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 #[cfg(not(feature = "optimism"))]
 compile_error!("Cannot build the `op-reth` binary with the `optimism` feature flag disabled. Did you mean to build `reth`?");

crates/net/ecies/Cargo.toml

@@ -35,7 +35,7 @@ rand.workspace = true
 ctr = "0.9.2"
 digest = "0.10.5"
 secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
-concat-kdf = { version = "0.1.0" }
+concat-kdf = "0.1.0"
 sha2 = "0.10.6"
 sha3 = "0.10.5"
 aes = "0.8.1"

crates/node-core/Cargo.toml

@@ -7,11 +7,9 @@ license.workspace = true
 homepage.workspace = true
 repository.workspace = true
 
-
 [lints]
 workspace = true
 
-
 [dependencies]
 # reth
 reth-primitives.workspace = true
@@ -78,27 +76,23 @@ tracing.workspace = true
 
 # crypto
 alloy-rlp.workspace = true
-secp256k1 = { workspace = true, features = [
+secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
-    "global-context",
-    "rand-std",
-    "recovery",
-] }
 
 # async
 futures.workspace = true
 
-[target.'cfg(not(windows))'.dependencies]
+[target.'cfg(unix)'.dependencies]
-jemalloc-ctl = { version = "0.5.0", optional = true }
+tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-procfs = { version = "0.16.0" }
+procfs = "0.16.0"
 
 [dev-dependencies]
 # test vectors generation
 proptest.workspace = true
 tempfile.workspace = true
 jsonrpsee.workspace = true
-assert_matches.version = "1.5.0"
+assert_matches = "1.5.0"
 
 [features]
 optimism = [
@@ -114,10 +108,10 @@ optimism = [
     "reth-auto-seal-consensus/optimism",
     "reth-consensus-common/optimism",
     "reth-blockchain-tree/optimism",
-    "reth-beacon-consensus/optimism"
+    "reth-beacon-consensus/optimism",
 ]
 
-jemalloc = ["dep:jemalloc-ctl"]
+jemalloc = ["dep:tikv-jemalloc-ctl"]
 
 [build-dependencies]
 vergen = { version = "8.0.0", features = ["build", "cargo", "git", "gitcl"] }

crates/node-core/src/metrics/prometheus_exporter.rs

@@ -132,8 +132,8 @@ where
 
 #[cfg(all(feature = "jemalloc", unix))]
 fn collect_memory_stats() {
-    use jemalloc_ctl::{epoch, stats};
     use metrics::gauge;
+    use tikv_jemalloc_ctl::{epoch, stats};
     use tracing::error;
 
     if epoch::advance().map_err(|error| error!(%error, "Failed to advance jemalloc epoch")).is_err()

examples/Cargo.toml

@@ -27,8 +27,6 @@ futures.workspace = true
 async-trait.workspace = true
 tokio.workspace = true
 
-jemallocator = { version = "0.5.0", features = ["profiling"] }
-
 [[example]]
 name = "db-access"
 path = "db-access.rs"
@@ -40,4 +38,3 @@ path = "network.rs"
 [[example]]
 name = "network-txpool"
 path = "network-txpool.rs"
-