Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add risc0 feature to celestia adapter #1021

Merged
merged 1 commit into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ lint-fix: ## cargo fmt, fix and clippy. Skip clippy on guest code since it's no
cargo fix --allow-dirty
CI_SKIP_GUEST_BUILD=1 cargo clippy --fix --allow-dirty

check-features: ## Checks that project compiles with all combinations of features. default is not needed because we never check `cfg(default)`, we only use it as an alias.
cargo hack check --workspace --feature-powerset --exclude-features default
check-features: ## Checks that project compiles with all combinations of features.
cargo hack check --workspace --feature-powerset --exclude-features --all-targets

check-fuzz: ## Checks that fuzz member compiles
$(MAKE) -C fuzz check
Expand Down
13 changes: 9 additions & 4 deletions adapters/celestia/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ tokio = { workspace = true, optional = true }
thiserror = { workspace = true }
tracing = { workspace = true }
sov-zk-cycle-macros = { path = "../../utils/zk-cycle-macros", version = "0.2", optional = true }
risc0-zkvm = { workspace = true, default-features = false, features = [
"std",
], optional = true }
risc0-zkvm = { workspace = true, default-features = false, features = ["std"], optional = true }
risc0-zkvm-platform = { workspace = true, optional = true }

sov-rollup-interface = { path = "../../rollup-interface", version = "0.2" }
Expand All @@ -61,5 +59,12 @@ native = [
"tendermint/default",
"sov-rollup-interface/native",
]
bench = ["sov-zk-cycle-macros/bench", "risc0-zkvm", "risc0-zkvm-platform"]
risc0 = [
"dep:risc0-zkvm",
"dep:risc0-zkvm-platform"
]
bench = [
"sov-zk-cycle-macros/bench",
"risc0"
]
verifier = []
1 change: 1 addition & 0 deletions adapters/celestia/src/celestia.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ mod tests {
}

#[test]
#[cfg(feature = "risc0")]
fn test_zkvm_serde_celestia_header() {
// regression https://github.com/eigerco/celestia-tendermint-rs/pull/12
for header_json in HEADER_JSON_RESPONSES {
Expand Down
13 changes: 11 additions & 2 deletions examples/demo-rollup/provers/risc0/guest-celestia/Cargo.lock

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

Loading