Skip to content

Commit

Permalink
fix(l2): fix zkVM programs (#1901)
Browse files Browse the repository at this point in the history
**Motivation**

<!-- Why does this pull request exist? What are its goals? -->

zkVM programs fail to compile after #1861 was merged to main. This PR
fixes the problem and bumps provers' versions.

L2 breaking changes keep being merged because the prover compilation job
isn't run in pushes that don't modify the L2 code, but the L2 is
strongly dependent on L1 code. This PR enables the job for all pushes.
The job takes ~13 minutes to complete, which is comparable to other jobs
which run on all pushes.

<!-- A clear and concise general description of the changes this PR
introduces -->

- fixes `ethrex-levm` adding c-kzg into the zkVMs programs dependency
tree
- bumps SP1 and Risc0 versions
- enables prover CI job for all pushes
  • Loading branch information
xqft authored Feb 10, 2025
1 parent ff6d92b commit d874830
Show file tree
Hide file tree
Showing 11 changed files with 114 additions and 69 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci_l2_prover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
branches: ["main"]
pull_request:
branches: ["**"]
paths:
- "crates/l2/prover/**"

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
146 changes: 94 additions & 52 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/blockchain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
ethrex-levm = { path = "../vm/levm" }
ethrex-levm = { path = "../vm/levm", default-features = false }
thiserror.workspace = true
sha3.workspace = true
tracing.workspace = true
Expand All @@ -32,5 +32,5 @@ path = "./blockchain.rs"
[features]
default = ["c-kzg"]
libmdbx = ["ethrex-core/libmdbx", "ethrex-storage/default", "ethrex-vm/libmdbx"]
c-kzg = ["ethrex-core/c-kzg"]
c-kzg = ["ethrex-core/c-kzg", "ethrex-levm/c-kzg"]
metrics = ["ethrex-metrics/transactions"]
2 changes: 1 addition & 1 deletion crates/l2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ directories = "5.0.1"
zkvm_interface = { path = "./prover/zkvm/interface/", default-features = false }

# risc0
risc0-zkvm = { version = "1.2.0" }
risc0-zkvm = { version = "1.2.2" }
# sp1
sp1-sdk = { version = "3.4.0" }
ethrex-sdk = { path = "./sdk" }
Expand Down
2 changes: 1 addition & 1 deletion crates/l2/prover/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ethrex-l2.workspace = true
zkvm_interface = { path = "./zkvm/interface", default-features = false }

# risc0
risc0-zkvm = { version = "1.2.0" }
risc0-zkvm = { version = "1.2.2" }

# sp1
sp1-sdk = "3.4.0"
Expand Down
3 changes: 1 addition & 2 deletions crates/l2/prover/zkvm/interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ethrex-storage = { path = "../../../../storage/store", default-features = false
ethrex-trie = { path = "../../../../storage/trie", default-features = false }

[build-dependencies]
risc0-build = { version = "1.2.0" }
risc0-build = { version = "1.2.2" }
sp1-build = "3.4.0"

[package.metadata.risc0]
Expand All @@ -26,6 +26,5 @@ default = []
build_risc0 = []
build_sp1 = []


[lib]
path = "./src/lib.rs"
Loading

0 comments on commit d874830

Please sign in to comment.