lambdaclass · tomip01 · Aug 7, 2025 · Aug 7, 2025 · Aug 7, 2025 · Aug 7, 2025
diff --git a/.github/workflows/tag_release.yaml b/.github/workflows/tag_release.yaml
@@ -22,18 +22,29 @@ jobs:
           - ubuntu-22.04
           - ubuntu-24.04-arm
           - macos-latest
+        gpu:
+          - true
+          - false
         include:
           - platform: ubuntu-22.04
             os: linux
             arch: x86_64
-            prover_features: sp1,risc0,gpu
+            prover_features: sp1,risc0
+            cpu_flags: RUSTFLAGS='-C target-cpu=x86-64-v2'
           - platform: ubuntu-24.04-arm
             os: linux
             arch: aarch64
-            prover_features: sp1,gpu
+            prover_features: sp1
           - platform: macos-latest
             os: macos
             arch: aarch64
+          - gpu: true
+            gpu_flags: NVCC_PREPEND_FLAGS='-arch=sm_70'
+            gpu_feature: ",gpu"
+            gpu_suffix: "-gpu"
+        exclude:
+          - platform: macos-latest
+            gpu: true
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Free Disk Space (Ubuntu)
@@ -51,7 +62,7 @@ jobs:
         with:
           toolchain: ${{ vars.RUST_VERSION }}
 
-      - name: Install SP1
+      - name: Install SP1 (only Linux)
         if: ${{ matrix.os == 'linux' }}
         env:
           SHELL: /bin/bash
@@ -60,13 +71,13 @@ jobs:
           curl -L https://sp1up.succinct.xyz | bash
           ~/.sp1/bin/sp1up --version 5.0.8
 
-      - name: Set up QEMU
+      - name: Set up QEMU (only Linux ARM)
         if: ${{ matrix.platform == 'ubuntu-24.04-arm' }}
         uses: docker/setup-qemu-action@v3
         with:
           platforms: amd64
 
-      - name: Install RISC0
+      - name: Install RISC0 (only Linux x86)
         if: ${{ matrix.platform == 'ubuntu-22.04' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -75,8 +86,9 @@ jobs:
           ~/.risc0/bin/rzup install cargo-risczero 2.3.1
           ~/.risc0/bin/rzup install rust
 
-      - uses: Jimver/cuda-toolkit@v0.2.24
-        if: ${{ matrix.platform == 'ubuntu-22.04' }}
+      - name: Install CUDA (only Linux x86 GPU)
+        uses: Jimver/cuda-toolkit@v0.2.24
+        if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.gpu }}
         id: cuda-toolkit
         with:
           cuda: "12.9.0"
@@ -96,18 +108,13 @@ jobs:
           sudo curl -L -o /usr/local/bin/solc https://github.com/nikitastupin/solc/raw/refs/heads/main/linux/aarch64/solc-v0.8.29
           sudo chmod +x /usr/local/bin/solc
 
-      - name: Set compiler envs
-        if: ${{ matrix.os == 'linux' }}
-        run: |
-          echo COMPILE_FLAGS="RUSTFLAGS='-C target-cpu=native' NVCC_PREPEND_FLAGS='-arch=sm_70'" >> $GITHUB_ENV
-
       - name: Build ethrex
         run: |
-          COMPILE_CONTRACTS=true ${{ env.COMPILE_FLAGS }} cargo build --release --features "${{ matrix.prover_features }}" --bin ethrex
-          mv target/release/ethrex ethrex-${{ matrix.os }}_${{ matrix.arch }}
+          COMPILE_CONTRACTS=true ${{ matrix.cpu_flags }} ${{ matrix.gpu_flags }} cargo build --release --features "${{ matrix.prover_features }}${{ matrix.gpu_feature }}" --bin ethrex
+          mv target/release/ethrex ethrex-${{ matrix.os }}_${{ matrix.arch }}${{ matrix.gpu_suffix }}
 
       - name: Copy verification keys
-        if: ${{ matrix.platform == 'ubuntu-22.04' }} # Run only once
+        if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.gpu }} # Run only once
         run: |
           mkdir -p ./verification_keys
           mv crates/l2/prover/zkvm/interface/risc0/out/riscv32im-risc0-vk verification_keys/ethrex-riscv32im-risc0-vk
@@ -116,11 +123,11 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ethrex-${{ matrix.os }}_${{ matrix.arch }}
-          path: ethrex-${{ matrix.os }}_${{ matrix.arch }}
+          name: ethrex-${{ matrix.os }}_${{ matrix.arch }}${{ matrix.gpu_suffix }}
+          path: ethrex-${{ matrix.os }}_${{ matrix.arch }}${{ matrix.gpu_suffix }}
 
       - name: Upload verification keys
-        if: ${{ matrix.platform == 'ubuntu-22.04' }} # Run only once
+        if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.gpu }} # Run only once
         uses: actions/upload-artifact@v4
         with:
           name: verification_keys
@@ -229,4 +236,7 @@ jobs:
           prerelease: false
           tag_name: ${{ github.ref_name }}
           name: "ethrex: ${{ github.ref_name }}"
-          body: ${{ steps.changelog.outputs.changes }}
+          body: >
+            Installation and running instructions can be found in [our docs](https://docs.ethrex.xyz/)
+
+            ${{ steps.changelog.outputs.changes }}
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 # Generated by Cargo
 # will have compiled files and executables
-debug/
 **/target/
 
 # These are backup files generated by rustfmt
@@ -49,7 +48,6 @@ loc_report.md
 loc_report_slack.txt
 loc_report_github.txt
 loc_report.json
-ethrex.redb
 
 # used by Flamegraph and Samply
 cmd/ef_tests/state/levm_perfgraphs

@@ -31,6 +31,7 @@ members = [
   "tooling/load_test",
   "tooling/loc",
   "tooling/archive_sync",
+  "crates/common/config",
 ]
 resolver = "2"
 
@@ -52,6 +53,7 @@ debug = 2
 [workspace.dependencies]
 ethrex-blockchain = { path = "./crates/blockchain" }
 ethrex-common = { path = "./crates/common" }
+ethrex-config = { path = "./crates/common/config" }
 ethrex-p2p = { path = "./crates/networking/p2p" }
 ethrex-rpc = { path = "./crates/networking/rpc" }
 ethrex-storage = { path = "./crates/storage" }
@@ -91,7 +93,6 @@ jsonwebtoken = "9.3.0"
 rand = "0.8.5"
 cfg-if = "1.0.0"
 reqwest = { version = "0.12.7", features = ["json"] }
-redb = "=2.4.0"
 snap = "1.1.1"
 secp256k1 = { version = "0.29.1", default-features = false, features = [
   "global-context",

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ build: ## 🔨 Build the client
 lint: ## 🧹 Linter check
 	# Note that we are compiling without the "gpu" feature (see #4048 for why)
 	# To compile with it you can replace '-F' with '--all-features', but you need to have nvcc installed
-	cargo clippy --all-targets -F debug,redb,risc0,sp1,sync-test \
+	cargo clippy --all-targets -F debug,risc0,sp1,sync-test \
 		--workspace --exclude ethrex-replay --exclude ethrex-prover --exclude zkvm_interface --exclude ef_tests-blockchain \
 		--release -- -D warnings
 

diff --git a/cmd/ef_tests/blockchain/test_runner.rs b/cmd/ef_tests/blockchain/test_runner.rs
@@ -409,11 +409,7 @@ async fn re_run_stateless(
     let mut witness = blockchain.generate_witness_for_blocks(&blocks).await;
     // Set a default witness if execution should fail as db will not have the required data to generate the witness
     if test_should_fail && witness.is_err() {
-        witness = Ok(ExecutionWitnessResult {
-            state_trie_nodes: Some(Vec::new()),
-            storage_trie_nodes: Some(HashMap::new()),
-            ..Default::default()
-        })
+        witness = Ok(ExecutionWitnessResult::default())
     } else if !test_should_fail && witness.is_err() {
         return Err("Failed to create witness for a test that should not fail".into());
     }

diff --git a/cmd/ethrex/Cargo.toml b/cmd/ethrex/Cargo.toml
@@ -7,6 +7,7 @@ build = "build.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+ethrex-config.workspace = true
 ethrex-blockchain.workspace = true
 ethrex-rpc.workspace = true
 ethrex-common.workspace = true
@@ -35,7 +36,6 @@ anyhow = "1.0.86"
 rand = "0.8.5"
 local-ip-address = "0.6"
 tokio-util.workspace = true
-redb = { workspace = true, optional = true }
 lazy_static.workspace = true
 secp256k1.workspace = true
 keccak-hash.workspace = true
@@ -71,7 +71,6 @@ c-kzg = [
 ]
 metrics = ["ethrex-blockchain/metrics", "ethrex-l2/metrics"]
 libmdbx = ["ethrex-storage/libmdbx"]
-redb = ["dep:redb", "ethrex-storage/redb"]
 blst = ["ethrex-vm/blst"]
 rollup_storage_sql = ["ethrex-storage-rollup/sql"]
 sync-test = ["ethrex-p2p/sync-test"]

diff --git a/cmd/ethrex/bench/import_blocks_benchmark.rs b/cmd/ethrex/bench/import_blocks_benchmark.rs
@@ -1,10 +1,10 @@
 use criterion::{Criterion, criterion_group, criterion_main};
 use ethrex::{
     cli::{import_blocks, remove_db},
-    networks::Network,
     utils::{default_datadir, init_datadir},
 };
 use ethrex_blockchain::BlockchainType;
+use ethrex_config::networks::Network;
 use ethrex_vm::EvmEngine;
 
 #[inline]

diff --git a/cmd/ethrex/cli.rs b/cmd/ethrex/cli.rs
@@ -20,9 +20,9 @@ use crate::{
         self,
         command::{DB_ETHREX_DEV_L1, DB_ETHREX_DEV_L2},
     },
-    networks::Network,
     utils::{self, default_datadir, get_client_version, init_datadir},
 };
+use ethrex_config::networks::Network;
 
 #[allow(clippy::upper_case_acronyms)]
 #[derive(ClapParser)]

diff --git a/cmd/ethrex/ethrex.rs b/cmd/ethrex/ethrex.rs
@@ -4,7 +4,8 @@ use ethrex::{
     initializers::{init_l1, init_tracing},
     utils::{NodeConfigFile, store_node_config_file},
 };
-use ethrex_p2p::{kademlia::KademliaTable, types::NodeRecord};
+use ethrex_p2p::kademlia::KademliaTable;
+use ethrex_p2p::types::NodeRecord;
 use std::{path::PathBuf, sync::Arc, time::Duration};
 use tokio::{
     signal::unix::{SignalKind, signal},

diff --git a/cmd/ethrex/initializers.rs b/cmd/ethrex/initializers.rs
@@ -1,13 +1,13 @@
 use crate::{
     cli::Options,
-    networks::Network,
     utils::{
         get_client_version, init_datadir, parse_socket_addr, read_jwtsecret_file,
         read_node_config_file,
     },
 };
 use ethrex_blockchain::{Blockchain, BlockchainType};
 use ethrex_common::types::Genesis;
+use ethrex_config::networks::Network;
 
 use ethrex_metrics::profiling::{FunctionProfilingLayer, initialize_block_processing_profile};
 
@@ -102,10 +102,8 @@ pub fn open_store(data_dir: &str) -> Store {
         cfg_if::cfg_if! {
             if #[cfg(feature = "libmdbx")] {
                 let engine_type = EngineType::Libmdbx;
-            } else if #[cfg(feature = "redb")] {
-                let engine_type = EngineType::RedB;
             } else {
-                error!("No database specified. The feature flag `redb` or `libmdbx` should've been set while building.");
+                error!("No database specified. The feature flag `libmdbx` should've been set while building.");
                 panic!("Specify the desired database engine.");
             }
         }

diff --git a/cmd/ethrex/l2/command.rs b/cmd/ethrex/l2/command.rs
@@ -6,14 +6,14 @@ use crate::{
         deployer::{DeployerOptions, deploy_l1_contracts},
         options::{Options, ProverClientOptions},
     },
-    networks::Network,
     utils::{default_datadir, init_datadir, parse_private_key},
 };
 use clap::{FromArgMatches, Parser, Subcommand};
 use ethrex_common::{
     Address, H256, U256,
     types::{BYTES_PER_BLOB, BlobsBundle, BlockHeader, batch::Batch, bytes_from_blob},
 };
+use ethrex_config::networks::Network;
 use ethrex_l2_common::{calldata::Value, l1_messages::get_l1_message_hash, state_diff::StateDiff};
 use ethrex_l2_sdk::call_contract;
 use ethrex_rpc::{
@@ -284,10 +284,8 @@ impl Command {
                 cfg_if::cfg_if! {
                     if #[cfg(feature = "libmdbx")] {
                         let store_type = EngineType::Libmdbx;
-                    } else if #[cfg(feature = "redb")] {
-                        let store_type = EngineType::RedB;
                     } else {
-                        eyre::bail!("Expected one of libmdbx or redb store engine");
+                        eyre::bail!("Expected libmdbx store engine");
                     }
                 };
                 cfg_if::cfg_if! {

diff --git a/cmd/ethrex/l2/deployer.rs b/cmd/ethrex/l2/deployer.rs
@@ -38,7 +38,7 @@ use ethrex_common::H160;
 use hex::FromHexError;
 use secp256k1::SecretKey;
 
-use crate::networks::{LOCAL_DEVNET_GENESIS_CONTENTS, LOCAL_DEVNETL2_GENESIS_CONTENTS};
+use ethrex_config::networks::{LOCAL_DEVNET_GENESIS_CONTENTS, LOCAL_DEVNETL2_GENESIS_CONTENTS};
 
 #[derive(Parser)]
 pub struct DeployerOptions {

diff --git a/cmd/ethrex/lib.rs b/cmd/ethrex/lib.rs
@@ -4,4 +4,3 @@ pub mod l2;
 pub mod utils;
 
 mod decode;
-pub mod networks;
@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+ethrex-config.workspace = true
 ethrex-common.workspace = true
 ethrex-vm.workspace = true
 ethrex-levm.workspace = true
@@ -23,7 +24,7 @@ eyre.workspace = true
 tokio = { version = "1.21", default-features = false, features = ["full"] }
 clap.workspace = true
 charming = { version = "0.4.0", features = ["ssr"] }
-
+futures.workspace = true
 
 [features]
 risc0 = ["zkvm_interface/risc0", "ethrex-prover/risc0"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ pub mod l2;
		pub mod utils;

		mod decode;
		pub mod networks;