refactor(l1,l2): separate binaries #4829

ManuelBilbao · 2025-10-09T18:27:27Z

Motivation

We aim to reintroduce the L2 feature flag making so that ethrex has 3 available binaries, the L1 execution client, the L2 client and the L2+GPU client. This is done for the following advantages:

Less crates needed for the L1 as the UI, L2, zkVMs crates are excluded.
L1, L2, y zkVMs are compiled with the optimum crates for performance and their needs.
The L1 user only downloads a client without unneeded functionality.

Description

Added feature flag l2 to ethrex to compile l2 dependencies separately
Added feature flag l2-sql to ethrex to launch l2 with the SQL database for the rollup
Modified CI to create 2 tar images of ethrex for testing, ethrex:main and ethrex:main-l2
Modified lint commands in makefile to lint l1 and l2 separately. L1 can't handle the workspace flag, due to some l2 crates in the workspace.

- Separated make lint into lint-l1 and lint-l2 for it to cover both scenarios. - Made it so that make tests runs with l2 (not necesary for the test itself, but the benches are a dev dependency and break without that feature flag)

github-actions · 2025-10-09T18:31:57Z

Lines of code report

Total lines added: 421
Total lines removed: 364
Total lines changed: 785

Detailed view

+-----------------------------------------------------------+-------+------+
| File                                                      | Lines | Diff |
+-----------------------------------------------------------+-------+------+
| ethrex/cmd/ethrex/build.rs                                | 31    | -364 |
+-----------------------------------------------------------+-------+------+
| ethrex/cmd/ethrex/build_l2.rs                             | 374   | +374 |
+-----------------------------------------------------------+-------+------+
| ethrex/cmd/ethrex/cli.rs                                  | 570   | +3   |
+-----------------------------------------------------------+-------+------+
| ethrex/cmd/ethrex/initializers.rs                         | 458   | +3   |
+-----------------------------------------------------------+-------+------+
| ethrex/cmd/ethrex/lib.rs                                  | 6     | +1   |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/l2/prover/src/backend/sp1.rs                | 136   | +1   |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/l2/sequencer/block_producer.rs              | 235   | +3   |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/l2/sequencer/l1_committer.rs                | 722   | +1   |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/metrics.rs                   | 589   | +1   |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/network.rs                   | 363   | +3   |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/rlpx/connection/handshake.rs | 528   | +2   |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/rlpx/connection/server.rs    | 985   | +6   |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/rlpx/error.rs                | 119   | +2   |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/rlpx/l2/l2_connection.rs     | 457   | +10  |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/rlpx/message.rs              | 336   | +10  |
+-----------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/rlpx/mod.rs                  | 11    | +1   |
+-----------------------------------------------------------+-------+------+

…naries

Copilot

Pull Request Overview

This PR refactors ethrex to separate L1 and L2 functionality into distinct binaries through feature flags. The main goal is to create optimized builds where the L1 client excludes unnecessary L2 dependencies, while L2 builds include additional database options.

Key changes include:

Introduction of l2 and l2-sql feature flags to conditionally compile L2 functionality
Separation of build processes to create ethrex:main (L1) and ethrex:main-l2 (L2) Docker images
Updated CI/CD workflows to handle both L1 and L2 builds independently

Reviewed Changes

Copilot reviewed 33 out of 33 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
cmd/ethrex/Cargo.toml	Restructured dependencies to be conditional on l2 feature flags
crates/networking/p2p/rlpx/message.rs	Added feature guards around L2 message handling
crates/networking/p2p/rlpx/connection/server.rs	Moved imports and added conditional compilation for L2 features
cmd/ethrex/build.rs	Extracted L2-specific build logic into separate module
.github/workflows/	Updated CI workflows to build separate L1 and L2 artifacts
Makefile	Split linting commands to handle L1 and L2 separately

Comments suppressed due to low confidence (1)

crates/l2/prover/src/backend/sp1.rs:1

Missing space in error message. Should be 'Failed to read bytecode file'.

use std::{fmt::Debug, sync::OnceLock};

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-10-14T21:33:33Z

tooling/ef_tests/blockchain/tests/all.rs

 datatest_stable::harness!(blockchain_runner, TEST_FOLDER, r".*");

-#[cfg(any(all(feature = "sp1", feature = "stateless"),))]
+#[cfg(all(feature = "sp1", feature = "stateless"))]


The cfg attribute syntax is incorrect. The trailing comma inside the any() macro was removed but the outer structure should use any() for mutually exclusive features, not all().

Copilot · 2025-10-14T21:33:34Z

crates/l2/prover/src/backend/sp1.rs

+                    endpoint
                        .join("/twirp/")
                        .expect("Failed to parse moongate server url")
-                        .to_string(),
+                        .as_ref(),


The method call chain is incorrect. join() returns a Result<Url, url::ParseError>, but as_ref() is being called on the Url result. The original code passed &endpoint to preserve the reference, but now endpoint is moved and as_ref() is called on the wrong type.

Copilot · 2025-10-14T21:33:34Z

crates/l2/sequencer/l1_committer.rs

        let mut batch_gas_used = 0_u64;

-        info!("Preparing state diff from block {first_block_of_batch}");
+        info!("Preparing state diff from block {first_block_of_batch}, {batch_number}");


[nitpick] The log message format is unclear. Consider using named parameters or a clearer format like 'Preparing state diff from block {} for batch {}'.

Suggested change

info!("Preparing state diff from block {first_block_of_batch}, {batch_number}");

info!("Preparing state diff from block {} for batch {}", first_block_of_batch, batch_number);

Copilot · 2025-10-14T21:33:35Z

crates/networking/p2p/rlpx/connection/server.rs

 where
    S: Unpin + Stream<Item = Result<Message, PeerConnectionError>>,
 {
+    // This allow is because in l2 we mut the capabilities


Grammar error in comment. Should be 'we mutate the capabilities' instead of 'we mut the capabilities'.

Suggested change

// This allow is because in l2 we mut the capabilities

// This allow is because in l2 we mutate the capabilities

ilitteri · 2025-10-14T21:47:56Z

cmd/ethrex/initializers.rs

    tracker: TaskTracker,
    blockchain: Arc<Blockchain>,
-    based_context: Option<P2PBasedContext>,
+    #[cfg(feature = "l2")] based_context: Option<P2PBasedContext>,


This is not optimal and we should fix this in another PR.

ilitteri · 2025-10-14T21:50:27Z

crates/networking/p2p/rlpx/connection/server.rs

 {
+    // This allow is because in l2 we mut the capabilities
+    // to include the l2 cap
+    #[allow(unused_mut)]


Suggested change

#[allow(unused_mut)]

#[expect(unused_mut)]

ilitteri

Block it until next version release

…naries

ilitteri and others added 21 commits October 7, 2025 16:26

Start grouping l2 deps under an l2 feature flag

cd8736f

Added missing constant

1086d93

L1 compiles without sdk

df1697b

Fixed build dependency

1dea512

fixed linter

a157af1

separated build rs files

8e5d50c

Compiles l2

d60dfdc

Fixed defaults

17e1029

Update server.rs

0fd5a7a

Lint temporary change

8f5de90

made make test and lint work

ca3bf67

- Separated make lint into lint-l1 and lint-l2 for it to cover both scenarios. - Made it so that make tests runs with l2 (not necesary for the test itself, but the benches are a dev dependency and break without that feature flag)

Added sql to lint

343b368

minor fix

ef27d43

Clippy for expect

40864eb

Update sp1.rs

48498dc

Merge remote-tracking branch 'origin/main' into separate_binaries

d91e7e8

Update Cargo.toml

0f47a2f

simplified build.rs

a7dc856

Update Makefile

e1ccbaa

Merge branch 'main' into separate_binaries

7e33114

Merge branch 'main' into separate_binaries

c19180f

ManuelBilbao and others added 3 commits October 9, 2025 15:39

Add dev as default feature

8dee125

Update release workflow

589a1a5

fix(l1,l2): include proper l2 flags

f2ebcf4

fedacking force-pushed the separate_binaries branch from b2e5f9f to f2ebcf4 Compare October 9, 2025 20:33

ManuelBilbao and others added 4 commits October 9, 2025 23:01

Set feature flags in L2 docker compose and Makefile

a2ef5e1

Format + lint ci fix

8b727d4

reorg test fixed

bd5fb56

Merge remote-tracking branch 'origin/main' into separate_binaries

ada9ce1

fedacking added 2 commits October 14, 2025 12:24

Merge remote-tracking branch 'origin/main' into separate_binaries

19f44da

Compiles + Lint

2c46cc2

fedacking marked this pull request as ready for review October 14, 2025 15:41

fedacking requested a review from a team as a code owner October 14, 2025 15:41

ethrex-project-sync bot moved this to In Review in ethrex_l1 Oct 14, 2025

Merge branch 'main' of github.com:lambdaclass/ethrex into separate_bi…

0d65640

…naries

Copilot AI review requested due to automatic review settings October 14, 2025 21:32

Copilot AI reviewed Oct 14, 2025

View reviewed changes

pablodeymo approved these changes Oct 14, 2025

View reviewed changes

ilitteri reviewed Oct 14, 2025

View reviewed changes

ilitteri approved these changes Oct 14, 2025

View reviewed changes

ilitteri requested changes Oct 14, 2025

View reviewed changes

github-project-automation bot moved this from In Review to In Progress in ethrex_l1 Oct 14, 2025

github-project-automation bot moved this to Requires Changes in ethrex_l2 Oct 14, 2025

ManuelBilbao added 3 commits October 14, 2025 19:11

Add build args

1b411d8

Rename binaries

7a1fc08

Merge branch 'main' into separate_binaries

f58e350

ilitteri approved these changes Oct 16, 2025

View reviewed changes

github-project-automation bot moved this from In Progress to In Review in ethrex_l1 Oct 16, 2025

ilitteri and others added 3 commits October 16, 2025 13:30

Merge branch 'main' of github.com:lambdaclass/ethrex into separate_bi…

26bc4db

…naries

Use draft and prerelease on release candidate

7274c98

Merge branch 'main' into separate_binaries

b4fbbff

ManuelBilbao enabled auto-merge October 16, 2025 19:04

ManuelBilbao added this pull request to the merge queue Oct 16, 2025

Merged via the queue into main with commit cdb952e Oct 16, 2025
37 of 45 checks passed

ManuelBilbao deleted the separate_binaries branch October 16, 2025 20:18

github-project-automation bot moved this from In Review to Done in ethrex_l1 Oct 16, 2025

github-project-automation bot moved this from Requires Changes to Done in ethrex_l2 Oct 16, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

refactor(l1,l2): separate binaries #4829

refactor(l1,l2): separate binaries #4829

Uh oh!

ManuelBilbao commented Oct 9, 2025 •

edited by fedacking

Loading

Uh oh!

github-actions bot commented Oct 9, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Oct 14, 2025

Uh oh!

Copilot AI Oct 14, 2025

Uh oh!

Copilot AI Oct 14, 2025

Uh oh!

Copilot AI Oct 14, 2025

Uh oh!

ilitteri Oct 14, 2025

Uh oh!

ilitteri Oct 14, 2025

Uh oh!

ilitteri left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	info!("Preparing state diff from block {first_block_of_batch}, {batch_number}");
	info!("Preparing state diff from block {} for batch {}", first_block_of_batch, batch_number);

	// This allow is because in l2 we mut the capabilities
	// This allow is because in l2 we mutate the capabilities

Uh oh!

refactor(l1,l2): separate binaries #4829

refactor(l1,l2): separate binaries #4829

Uh oh!

Conversation

ManuelBilbao commented Oct 9, 2025 • edited by fedacking Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Lines of code report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Oct 14, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 14, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 14, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 14, 2025

Choose a reason for hiding this comment

Uh oh!

ilitteri Oct 14, 2025

Choose a reason for hiding this comment

Uh oh!

ilitteri Oct 14, 2025

Choose a reason for hiding this comment

Uh oh!

ilitteri left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ManuelBilbao commented Oct 9, 2025 •

edited by fedacking

Loading

github-actions bot commented Oct 9, 2025 •

edited

Loading