From 624bba9848767d4b4e527ad9d863f60dc7c0d49b Mon Sep 17 00:00:00 2001 From: Francisco Xavier Gauna Date: Fri, 14 Nov 2025 16:41:58 -0300 Subject: [PATCH 1/2] feat(l1,l2): make dev mode always use in memory db --- Cargo.lock | 80 ++++++++------------------------------ cmd/ethrex/initializers.rs | 6 ++- 2 files changed, 21 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3bfe9bb938..65fa7f81ab5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,7 +129,7 @@ dependencies = [ "hashbrown 0.16.0", "indexmap 2.12.0", "itoa", - "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", + "k256", "paste", "rand 0.9.2", "ruint", @@ -1634,7 +1634,7 @@ dependencies = [ "coins-core", "digest 0.10.7", "hmac", - "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", + "k256", "serde", "sha2", "thiserror 1.0.69", @@ -2703,25 +2703,12 @@ dependencies = [ "der", "digest 0.10.7", "elliptic-curve", - "rfc6979 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rfc6979", "serdect", "signature", "spki", ] -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "git+https://github.com/sp1-patches/signatures.git?tag=patch-16.9-sp1-4.1.0#1880299a48fe7ef249edaa616fd411239fb5daf1" -dependencies = [ - "der", - "digest 0.10.7", - "elliptic-curve", - "rfc6979 0.4.0 (git+https://github.com/sp1-patches/signatures.git?tag=patch-16.9-sp1-4.1.0)", - "signature", - "spki", -] - [[package]] name = "educe" version = "0.6.0" @@ -2758,7 +2745,6 @@ dependencies = [ "ff 0.13.1", "generic-array 0.14.9", "group 0.13.0", - "hkdf", "pem-rfc7468", "pkcs8", "rand_core 0.6.4", @@ -2813,7 +2799,7 @@ dependencies = [ "base64 0.21.7", "bytes", "hex", - "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", + "k256", "log", "rand 0.8.5", "rlp 0.5.2", @@ -3126,7 +3112,7 @@ dependencies = [ "elliptic-curve", "ethabi", "generic-array 0.14.9", - "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", + "k256", "num_enum 0.7.5", "once_cell", "open-fastrlp", @@ -3558,7 +3544,7 @@ dependencies = [ "ethrex-crypto", "ethrex-rlp", "hex", - "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", + "k256", "lambdaworks-math 0.13.0", "lazy_static", "malachite 0.6.1", @@ -4681,15 +4667,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - [[package]] name = "hmac" version = "0.12.1" @@ -5468,7 +5445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if 1.0.4", - "ecdsa 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)", + "ecdsa", "elliptic-curve", "once_cell", "serdect", @@ -5476,21 +5453,6 @@ dependencies = [ "signature", ] -[[package]] -name = "k256" -version = "0.13.4" -source = "git+https://github.com/sp1-patches/elliptic-curves?tag=patch-k256-13.4-sp1-5.0.0#f7d8998e05d8cbcbd8e543eba1030a7385011fa8" -dependencies = [ - "cfg-if 1.0.4", - "ecdsa 0.16.9 (git+https://github.com/sp1-patches/signatures.git?tag=patch-16.9-sp1-4.1.0)", - "elliptic-curve", - "hex", - "once_cell", - "sha2", - "signature", - "sp1-lib", -] - [[package]] name = "keccak" version = "0.1.5" @@ -6733,7 +6695,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)", + "ecdsa", "elliptic-curve", "primeorder", "sha2", @@ -8221,15 +8183,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "git+https://github.com/sp1-patches/signatures.git?tag=patch-16.9-sp1-4.1.0#1880299a48fe7ef249edaa616fd411239fb5daf1" -dependencies = [ - "hmac", - "subtle", -] - [[package]] name = "rgb" version = "0.8.52" @@ -9257,19 +9210,19 @@ dependencies = [ [[package]] name = "secp256k1" version = "0.30.0" -source = "git+https://github.com/sp1-patches/rust-secp256k1?tag=patch-0.30.0-sp1-5.0.0#04d87db04bcc2dc5dd8e1ab3f046cc655440d07a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", - "cfg-if 1.0.4", - "k256 0.13.4 (git+https://github.com/sp1-patches/elliptic-curves?tag=patch-k256-13.4-sp1-5.0.0)", "rand 0.8.5", "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.10.0" -source = "git+https://github.com/sp1-patches/rust-secp256k1?tag=patch-0.30.0-sp1-5.0.0#04d87db04bcc2dc5dd8e1ab3f046cc655440d07a" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] @@ -9785,7 +9738,7 @@ dependencies = [ "hashbrown 0.14.5", "hex", "itertools 0.13.0", - "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", + "k256", "num", "num_cpus", "p256", @@ -9853,7 +9806,7 @@ dependencies = [ "elliptic-curve", "generic-array 1.1.0", "itertools 0.13.0", - "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", + "k256", "num", "p256", "p3-field", @@ -9881,7 +9834,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce8ad0f153443d09d398eccb650a0b2dcbf829470e394e4bf60ec4379c7af93" dependencies = [ "bincode", - "elliptic-curve", "serde", "sp1-primitives", ] @@ -10106,7 +10058,7 @@ dependencies = [ "hex", "indicatif", "itertools 0.13.0", - "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", + "k256", "p3-baby-bear", "p3-field", "p3-fri", diff --git a/cmd/ethrex/initializers.rs b/cmd/ethrex/initializers.rs index b70b90c8ce8..03462ac5109 100644 --- a/cmd/ethrex/initializers.rs +++ b/cmd/ethrex/initializers.rs @@ -382,7 +382,11 @@ pub async fn init_l1( opts: Options, log_filter_handler: Option>, ) -> eyre::Result<(PathBuf, CancellationToken, PeerTable, NodeRecord)> { - let datadir = &opts.datadir; + let datadir: &PathBuf = if opts.dev && cfg!(feature = "dev") { + &Path::new("/tmp/memory").to_path_buf() + } else { + &opts.datadir + }; init_datadir(datadir); let network = get_network(&opts); From 859754484e62628a92452ada1dde51ce44904311 Mon Sep 17 00:00:00 2001 From: Francisco Xavier Gauna Date: Fri, 14 Nov 2025 17:38:18 -0300 Subject: [PATCH 2/2] Update initializers.rs --- cmd/ethrex/initializers.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/ethrex/initializers.rs b/cmd/ethrex/initializers.rs index 03462ac5109..39f353a5808 100644 --- a/cmd/ethrex/initializers.rs +++ b/cmd/ethrex/initializers.rs @@ -383,7 +383,7 @@ pub async fn init_l1( log_filter_handler: Option>, ) -> eyre::Result<(PathBuf, CancellationToken, PeerTable, NodeRecord)> { let datadir: &PathBuf = if opts.dev && cfg!(feature = "dev") { - &Path::new("/tmp/memory").to_path_buf() + &opts.datadir.join("dev") } else { &opts.datadir };