feat(l2): embed contracts in deployer and system_contracts_updater #3604

avilagaston9 · 2025-07-11T15:12:39Z

Motivation

This PR embeds the bytecode of the contracts used in the deployer and system_contracts_updater as constants within the resulting binaries.

Description

Adds a build.rs script under crates/l2/contracts/bin/build.rs that downloads all necessary dependencies and compiles all required contracts.
Modifies deployer and system_contracts_updater to import the resulting bytecodes as constants using include_bytes!, instead of compiling them at runtime.
Removes the download_contract_deps function from the SDK, as it was only cloning the same two repositories and was used even when only one was needed.
Updates the compile_contract function in the SDK to accept a list of remappings.
Adds deploy_contract_from_bytecode and deploy_with_proxy_from_bytecode functions to the SDK.
Updates tests to work with the new SDK API.

Note

The new build.rs script checks if COMPILE_CONTRACTS is set to decide whether to compile the contracts.
This prevents cargo check --workspace from requiring solc as a dependency.

Closes #3380

github-actions · 2025-07-11T21:32:58Z

Lines of code report

Total lines added: 192
Total lines removed: 104
Total lines changed: 296

Detailed view

+------------------------------------------------------------------+-------+------+
| File                                                             | Lines | Diff |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/contracts/bin/deployer/cli.rs                   | 367   | -9   |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/contracts/bin/deployer/main.rs                  | 568   | -58  |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/contracts/bin/system_contracts_updater/cli.rs   | 13    | -8   |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/contracts/bin/system_contracts_updater/error.rs | 16    | -1   |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/contracts/bin/system_contracts_updater/main.rs  | 97    | +10  |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/contracts/build.rs                              | 146   | +146 |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/sdk/build.rs                                    | 41    | +10  |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/sdk/contract_utils/src/compile.rs               | 76    | -2   |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/sdk/contract_utils/src/deps.rs                  | 144   | -26  |
+------------------------------------------------------------------+-------+------+
| ethrex/crates/l2/sdk/src/sdk.rs                                  | 510   | +26  |
+------------------------------------------------------------------+-------+------+

xqft

nice!!

crates/l2/sdk/src/sdk.rs

crates/l2/tests/tests.rs

crates/l2/contracts/bin/build.rs

crates/l2/contracts/Cargo.toml

crates/l2/contracts/bin/build.rs

crates/l2/contracts/bin/deployer/main.rs

fixtures/genesis/l2.json

MegaRedHand · 2025-07-21T16:34:42Z

crates/l2/contracts/build.rs

+    for entry in fs::read_dir(dir).expect("Failed to read directory") {
+        let entry = entry.expect("Failed to get entry");
+        let path = entry.path();
+        if path.is_dir() {
+            watch_solidity_files(&path);
+        } else if path.extension().is_some_and(|ext| ext == "sol") {
+            println!("cargo::rerun-if-changed={}", path.display());
+        }
+    }


I think we can just do cargo::rerun-if-changed=crates/l2/contracts/src here.

I found this about it.

haha my bad. I hadn't read the "Note from the future" comment. Done in f1d793f!

avilagaston9 changed the base branch from main to l2/embed-contracts July 11, 2025 15:12

avilagaston9 changed the title ~~Feat/l2/embed remaining contracts~~ feat(l2): embed contracts in the deployer Jul 11, 2025

github-actions bot added the L2 Rollup client label Jul 11, 2025

github-project-automation bot added this to ethrex_l2 Jul 11, 2025

avilagaston9 self-assigned this Jul 11, 2025

avilagaston9 moved this to In Progress in ethrex_l2 Jul 11, 2025

avilagaston9 marked this pull request as ready for review July 14, 2025 16:04

avilagaston9 requested a review from a team as a code owner July 14, 2025 16:04

avilagaston9 changed the title ~~feat(l2): embed contracts in the deployer~~ feat(l2): embed contracts in deployer and system_contracts_updater Jul 14, 2025

Base automatically changed from l2/embed-contracts to main July 15, 2025 18:50

xqft reviewed Jul 15, 2025

View reviewed changes

crates/l2/sdk/src/sdk.rs Show resolved Hide resolved

crates/l2/tests/tests.rs Outdated Show resolved Hide resolved

avilagaston9 added 9 commits July 15, 2025 16:36

Fix merge

6b8bea9

Fix tests

69f5f38

Fix clippy

8d28b4b

refactor build script

c96d35c

minor improvements

044a7b6

fix build script

06e11d0

Remove unused error

5bf5593

Remove unused

32620b0

Fix clippy

e724c86

avilagaston9 force-pushed the feat/l2/embed_remaining_contracts branch from c513224 to e724c86 Compare July 15, 2025 19:47

avilagaston9 added 6 commits July 15, 2025 17:32

Try fix merge

805545d

Fix clippy

0834acf

Update sdk build

31b183e

Update genesis

c1c9289

Refactor building l2 contracts

aac6c0e

Merge branch 'main' into feat/l2/embed_remaining_contracts

eeebcf3

avilagaston9 marked this pull request as draft July 16, 2025 21:40

Improve remappings

aa18d84

avilagaston9 added 5 commits July 16, 2025 18:58

Remove dynamic vec

923a0e1

Merge branch 'main' into feat/l2/embed_remaining_contracts

7d6f4e9

Merge branch 'main' into feat/l2/embed_remaining_contracts

6a74041

Fix tests

24c3541

Conditional compilation in deployer

c8c6db4

avilagaston9 marked this pull request as ready for review July 17, 2025 17:57

avilagaston9 moved this from In Progress to In Review in ethrex_l2 Jul 17, 2025

MegaRedHand reviewed Jul 17, 2025

View reviewed changes

avilagaston9 and others added 9 commits July 18, 2025 17:53

Move build script to crate root

4b20491

remove contracts path from cli

ee62c58

Watch contracts changes when compiling

b90a773

rename compile_contract function in build.rs

a6ec629

Fix expects in build.rs

e8b2e82

reuse decode_to_bytecode

b77ad7b

Merge branch 'main' into feat/l2/embed_remaining_contracts

6a5d8e9

Fix clippy

6b02ed4

Merge branch 'main' into feat/l2/embed_remaining_contracts

a6983ce

MegaRedHand approved these changes Jul 21, 2025

View reviewed changes

avilagaston9 and others added 5 commits July 21, 2025 14:34

refactor: use directory path

f1d793f

Merge branch 'main' into feat/l2/embed_remaining_contracts

66d92d8

Merge branch 'main' into feat/l2/embed_remaining_contracts

f659b55

Fix makefile target

9122ccb

Merge branch 'main' into feat/l2/embed_remaining_contracts

a6b4077

xqft approved these changes Jul 23, 2025

View reviewed changes

Fix tests

bad4ca7

avilagaston9 added this pull request to the merge queue Jul 24, 2025

Merged via the queue into main with commit 67cd8be Jul 24, 2025
40 checks passed

avilagaston9 deleted the feat/l2/embed_remaining_contracts branch July 24, 2025 13:03

github-project-automation bot moved this from In Review to Done in ethrex_l2 Jul 24, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(l2): embed contracts in deployer and system_contracts_updater #3604

feat(l2): embed contracts in deployer and system_contracts_updater #3604

Uh oh!

avilagaston9 commented Jul 11, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jul 11, 2025 •

edited

Loading

Uh oh!

xqft left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MegaRedHand Jul 21, 2025

Uh oh!

avilagaston9 Jul 21, 2025

Uh oh!

avilagaston9 Jul 21, 2025

Uh oh!

Uh oh!

Uh oh!

feat(l2): embed contracts in deployer and system_contracts_updater #3604

feat(l2): embed contracts in deployer and system_contracts_updater #3604

Uh oh!

Conversation

avilagaston9 commented Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Lines of code report

Uh oh!

xqft left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MegaRedHand Jul 21, 2025

Choose a reason for hiding this comment

Uh oh!

avilagaston9 Jul 21, 2025

Choose a reason for hiding this comment

Uh oh!

avilagaston9 Jul 21, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

avilagaston9 commented Jul 11, 2025 •

edited

Loading

github-actions bot commented Jul 11, 2025 •

edited

Loading