refactor(l1,l2): separate binaries

.github/actions/build-docker/action.yml

@@ -19,6 +19,14 @@ inputs:
     description: "Whether to push the built image to the registry"
     required: false
     default: "false"
+  artifact_path:
+    description: "The name of the artifact that is going to be pushed"
+    required: false
+    default: "ethrex_image.tar"
+  build_args:
+    description: "The feature flags to be build"
+    required: false
+    default: ""
 
 outputs:
   artifact_path:
@@ -31,7 +39,7 @@ runs:
     - id: vars
       shell: bash
       run: |
-        echo "artifact_path=/tmp/ethrex_image.tar" >> $GITHUB_OUTPUT
+        echo "artifact_path=/tmp/${{ inputs.artifact_path }}" >> $GITHUB_OUTPUT
 
     - name: Login to Docker registry
       if: inputs.username != '' && inputs.password != ''
@@ -54,6 +62,7 @@ runs:
         outputs: ${{ inputs.push == 'false' && format('type=docker,dest={0}', steps.vars.outputs.artifact_path) || '' }}
         cache-from: type=gha
         cache-to: type=gha,mode=max
+        build-args: ${{ inputs.build_args }}
 
     # Since we're exporting the image as a tar, we need to load it manually as well
     - name: Load image locally

.github/workflows/main_docker_publish.yaml

@@ -35,3 +35,4 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main
+          artifact_path: ethrex_image.tar

.github/workflows/main_prover.yaml

@@ -56,7 +56,7 @@ jobs:
       - name: Build test
         # if: ${{ always() && github.event_name == 'merge_group' }}
         run: |
-          cargo test l2 --no-run --release
+          cargo test l2 --features l2 --no-run --release
 
       - name: Start L1 & Deploy contracts
         # if: ${{ always() && github.event_name == 'merge_group' }}

.github/workflows/manual_docker_performance_publish.yaml

@@ -40,3 +40,4 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:performance
+          artifact_path: ethrex_image.tar

.github/workflows/pr-main_l1.yaml

@@ -31,12 +31,13 @@ jobs:
         with:
           components: rustfmt, clippy
 
+      # We don't run with workspace, as members of the workspace require l2. We run it with workspace
+      # om the l2 lint
       - name: Run cargo check
-        run: cargo check --workspace
+        run: cargo check
 
       - name: Run cargo clippy
         run: |
-          cargo clippy --workspace -- -D warnings
           cargo clippy -- -D warnings
 
       - name: Run cargo fmt
@@ -84,6 +85,7 @@ jobs:
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+          artifact_path: ethrex_image.tar
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:

.github/workflows/pr-main_l2.yaml

@@ -51,11 +51,11 @@
           touch crates/l2/prover/src/guest_program/src/sp1/out/riscv32im-succinct-zkvm-elf
 
       - name: Run cargo check
-        run: cargo check --workspace
+        run: cargo check --workspace --features l2,l2-sql
 
       - name: Run cargo clippy
         run: |
-          cargo clippy --workspace -- -D warnings
+          cargo clippy --workspace --features l2,l2-sql -- -D warnings
           make lint
 
       - name: Run cargo fmt
@@ -78,17 +78,44 @@
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           tags: ethrex:main
+          artifact_path: ethrex_image.tar
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: ethrex_image
           path: /tmp/ethrex_image.tar
 
+  build-docker-l2:
+    name: Build docker image L2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build L2 docker image
+        uses: ./.github/actions/build-docker
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          tags: ethrex:main_l2
+          artifact_path: ethrex_image_l2.tar
+          build_args: BUILD_FLAGS=--features l2
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ethrex_image_l2
+          path: /tmp/ethrex_image_l2.tar
+
+
   integration-test:
     name: Integration Test - ${{ matrix.name }}
     runs-on: ubuntu-latest
-    needs: build-docker
+    needs: [build-docker, build-docker-l2]
     strategy:
       matrix:
         include:
@@ -134,7 +161,7 @@
 
       - name: Build test
         run: |
-          cargo test l2 --no-run --release
+          cargo test l2 --features l2 --no-run --release
 
       - name: Start Web3Signer
         if: matrix.web3signer
@@ -152,6 +179,16 @@
         run: |
           docker load --input /tmp/ethrex_image.tar
 
+      - name: Download ethrex L2 image artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ethrex_image_l2
+          path: /tmp
+
+      - name: Load ethrex L2 image
+        run: |
+          docker load --input /tmp/ethrex_image_l2.tar
+
       - name: Start L1
         run: |
           cd crates/l2
@@ -218,7 +255,7 @@
   integration-test-based:
     name: Integration Test - Based
     runs-on: ubuntu-latest
-    needs: build-docker
+    needs: [build-docker, build-docker-l2]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -241,6 +278,16 @@
         run: |
           docker load --input /tmp/ethrex_image.tar
 
+      - name: Download ethrex L2 image artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ethrex_image_l2
+          path: /tmp
+
+      - name: Load ethrex L2 image
+        run: |
+          docker load --input /tmp/ethrex_image_l2.tar
+
       # also creates empty verification keys (as workflow runs with exec backend)
       - name: Build prover
         run: |
@@ -316,7 +363,7 @@
   integration-test-tdx:
     name: Integration Test - TDX
     runs-on: ubuntu-latest
-    needs: build-docker
+    needs: [build-docker, build-docker-l2]
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@v1.3.1
@@ -346,6 +393,16 @@
         run: |
           docker load --input /tmp/ethrex_image.tar
 
+      - name: Download ethrex L2 image artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ethrex_image_l2
+          path: /tmp
+
+      - name: Load ethrex L2 image
+        run: |
+          docker load --input /tmp/ethrex_image_l2.tar
+
       - name: Set up Nix
         uses: cachix/install-nix-action@v31
 
@@ -412,7 +469,7 @@
   state-diff-test:
     name: State Reconstruction Tests
     runs-on: ubuntu-latest
-    needs: build-docker
+    needs: [build-docker, build-docker-l2]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -429,6 +486,16 @@
         run: |
           docker load --input /tmp/ethrex_image.tar
 
+      - name: Download ethrex L2 image artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ethrex_image_l2
+          path: /tmp
+
+      - name: Load ethrex L2 image
+        run: |
+          docker load --input /tmp/ethrex_image_l2.tar
+
       - name: Install solc
         uses: lambdaclass/get-solc@master
         with:

.github/workflows/tag_release.yaml

@@ -22,29 +22,44 @@ jobs:
           - ubuntu-22.04
           - ubuntu-24.04-arm
           - macos-latest
-        gpu:
-          - true
-          - false
+        stack:
+          - l1
+          - l2
+          - l2_gpu
+        exclude:
+          - platform: macos-latest
+            stack: l2_gpu
         include:
           - platform: ubuntu-22.04
             os: linux
             arch: x86_64
-            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
           - 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
+            stack: l2
+            features: l2,l2-sql
+          - platform: ubuntu-22.04
+            stack: l2
+            features: l2,l2-sql,sp1,risc0
+          - platform: ubuntu-22.04
+            stack: l2_gpu
+            features: l2,l2-sql,sp1,risc0,gpu
+          - platform: ubuntu-24.04-arm
+            stack: l2
+            features: l2,l2-sql,sp1
+          - platform: ubuntu-24.04-arm
+            stack: l2_gpu
+            features: l2,l2-sql,sp1,gpu
+          - stack: l2_gpu
+            gpu_flags: NVCC_PREPEND_FLAGS='-arch=sm_70'
+            suffix: "-l2-gpu"
+          - stack: l2
+            suffix: "-l2"
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Free Disk Space (Ubuntu)
@@ -57,10 +72,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Rustup toolchain install
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ vars.RUST_VERSION }}
+      - name: Setup Rust Environment
+        uses: ./.github/actions/setup-rust
 
       - name: Install SP1 (only Linux)
         if: ${{ matrix.os == 'linux' }}
@@ -89,7 +102,7 @@ jobs:
 
       - name: Install CUDA (only Linux x86 GPU)
         uses: Jimver/cuda-toolkit@v0.2.24
-        if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.gpu }}
+        if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.stack == 'l2_gpu' }}
         id: cuda-toolkit
         with:
           cuda: "12.9.0"
@@ -116,11 +129,12 @@ jobs:
 
       - name: Build ethrex
         run: |
-          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 }}
+          COMPILE_CONTRACTS=true ${{ matrix.cpu_flags }} ${{ matrix.gpu_flags }} cargo build --release --features "${{ matrix.features }}" --bin ethrex
+          chmod +x target/release/ethrex
+          mv target/release/ethrex ethrex-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.suffix }}
 
       - name: Copy verification keys
-        if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.gpu }} # Run only once
+        if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.stack == 'l2_gpu' }} # Run only once
         run: |
           mkdir -p ./verification_keys
           mv crates/l2/prover/src/guest_program/src/risc0/out/riscv32im-risc0-vk verification_keys/ethrex-riscv32im-risc0-vk
@@ -129,11 +143,11 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ethrex-${{ matrix.os }}_${{ matrix.arch }}${{ matrix.gpu_suffix }}
-          path: ethrex-${{ matrix.os }}_${{ matrix.arch }}${{ matrix.gpu_suffix }}
+          name: ethrex-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.suffix }}
+          path: ethrex-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.suffix }}
 
       - name: Upload verification keys
-        if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.gpu }} # Run only once
+        if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.stack == 'l2_gpu' }} # Run only once
         uses: actions/upload-artifact@v4
         with:
           name: verification_keys
@@ -192,6 +206,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_VERSION }}
+          artifact_path: ethrex_image.tar
 
   # Creates a draft release on GitHub with the binaries
   finalize-release:

Makefile

@@ -8,16 +8,25 @@ help: ## 📚 Show help for each of the Makefile recipes
 build: ## 🔨 Build the client
 	cargo build --workspace
 
-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,risc0,sp1,sync-test \
+lint-l1:
+	cargo clippy --lib --bins -F debug,sync-test \
+		--release -- -D warnings
+
+lint-l2:
+	cargo clippy --all-targets -F debug,sync-test,l2,l2-sql \
+		--workspace --exclude ethrex-prover --exclude guest_program --exclude ef_tests-blockchain \
+		--release -- -D warnings
+
+lint-gpu:
+	cargo clippy --all-targets -F debug,sync-test,l2,l2-sql,,sp1,risc0,gpu \
 		--workspace --exclude ethrex-prover --exclude guest_program --exclude ef_tests-blockchain \
 		--release -- -D warnings
 
+lint: lint-l1 lint-l2 ## 🧹 Linter check
+
 CRATE ?= *
 test: ## 🧪 Run each crate's tests
-	cargo test -p '$(CRATE)' --workspace --exclude ethrex-levm --exclude ef_tests-blockchain --exclude ethrex-l2 -- --skip test_contract_compilation
+	cargo test -p '$(CRATE)' --workspace --exclude ethrex-levm --exclude ef_tests-blockchain --exclude ethrex-l2 -F l2 -- --skip test_contract_compilation
 
 clean: clean-vectors ## 🧹 Remove build artifacts
 	cargo clean