simplify risc0 host (#1411)

Co-authored-by: yaziciahmet <[email protected]>
Co-authored-by: Ahmet Yazıcı <[email protected]>

.github/workflows/checks.yml

@@ -374,8 +374,6 @@ jobs:
         run: make test
         env:
           RUST_BACKTRACE: 1
-          BONSAI_API_URL: ${{ secrets.BONSAI_API_URL }} # TODO: remove this once we don't use the client on tests
-          BONSAI_API_KEY: ${{ secrets.BONSAI_API_KEY }} # TODO: remove this once we don't use the client on tests
           RISC0_DEV_MODE: 1                             # This is needed to generate mock proofs and verify them
           TEST_BITCOIN_DOCKER: 1
           CI_TEST_MODE: 1

Cargo.toml

@@ -14,14 +14,13 @@ members = [
   "crates/primitives",
   "crates/prover-services",
   "crates/pruning",
-  "crates/risc0-bonsai",
+  "crates/risc0",
   "crates/sequencer",
   "crates/sequencer-client",
   "crates/soft-confirmation-rule-enforcer",
   # "crates/sp1",
   # Sovereign sdk
   "crates/sovereign-sdk/rollup-interface",
-  "crates/sovereign-sdk/adapters/risc0",
   "crates/sovereign-sdk/adapters/mock-da",
   "crates/sovereign-sdk/adapters/mock-zkvm",
   # Full Node

Makefile

@@ -1,6 +1,7 @@
 # The release tag of https://github.com/ethereum/tests to use for EF tests
 EF_TESTS_URL := https://github.com/chainwayxyz/ef-tests/archive/develop.tar.gz
 EF_TESTS_DIR := crates/evm/ethereum-tests
+CITREA_E2E_TEST_BINARY := $(CURDIR)/target/debug/citrea
 PARALLEL_PROOF_LIMIT := 1
 
 .PHONY: help

bin/citrea/Cargo.toml

@@ -20,7 +20,7 @@ citrea-fullnode = { path = "../../crates/fullnode" }
 citrea-light-client-prover = { path = "../../crates/light-client-prover", features = ["native"] }
 citrea-primitives = { path = "../../crates/primitives" }
 citrea-risc0 = { package = "risc0", path = "./provers/risc0" }
-citrea-risc0-bonsai-adapter = { path = "../../crates/risc0-bonsai", features = ["native"] }
+citrea-risc0-adapter = { path = "../../crates/risc0", features = ["native"] }
 citrea-sequencer = { path = "../../crates/sequencer" }
 # citrea-sp1 = { path = "../../crates/sp1", features = ["native"] }
 citrea-stf = { path = "../../crates/citrea-stf", features = ["native"] }

bin/citrea/provers/risc0/batch-proof-bitcoin/Cargo.toml

@@ -13,10 +13,10 @@ risc0-zkvm-platform = { version = "1.1.2" }
 anyhow = "1.0.68"
 bitcoin-da = { path = "../../../../../crates/bitcoin-da", default-features = false }
 citrea-primitives = { path = "../../../../../crates/primitives" }
+citrea-risc0-adapter = { path = "../../../../../crates/risc0" }
 citrea-stf = { path = "../../../../../crates/citrea-stf" }
 sov-modules-api = { path = "../../../../../crates/sovereign-sdk/module-system/sov-modules-api", default-features = false }
 sov-modules-stf-blueprint = { path = "../../../../../crates/sovereign-sdk/module-system/sov-modules-stf-blueprint" }
-sov-risc0-adapter = { path = "../../../../../crates/sovereign-sdk/adapters/risc0" }
 sov-rollup-interface = { path = "../../../../../crates/sovereign-sdk/rollup-interface" }
 sov-state = { path = "../../../../../crates/sovereign-sdk/module-system/sov-state" }
 

bin/citrea/provers/risc0/batch-proof-bitcoin/src/bin/batch_proof_bitcoin.rs

@@ -2,11 +2,11 @@
 use bitcoin_da::spec::RollupParams;
 use bitcoin_da::verifier::BitcoinVerifier;
 use citrea_primitives::{TO_BATCH_PROOF_PREFIX, TO_LIGHT_CLIENT_PREFIX};
+use citrea_risc0_adapter::guest::Risc0Guest;
 use citrea_stf::runtime::Runtime;
 use citrea_stf::StfVerifier;
 use sov_modules_api::default_context::ZkDefaultContext;
 use sov_modules_stf_blueprint::StfBlueprint;
-use sov_risc0_adapter::guest::Risc0Guest;
 use sov_rollup_interface::da::DaVerifier;
 use sov_state::ZkStorage;
 

bin/citrea/provers/risc0/batch-proof-mock/Cargo.toml

@@ -11,11 +11,11 @@ risc0-zkvm = { version = "1.1.2", default-features = false }
 risc0-zkvm-platform = { version = "1.1.2" }
 
 anyhow = "1.0"
+citrea-risc0-adapter = { path = "../../../../../crates/risc0" }
 citrea-stf = { path = "../../../../../crates/citrea-stf" }
 sov-mock-da = { path = "../../../../../crates/sovereign-sdk/adapters/mock-da", default-features = false }
 sov-modules-api = { path = "../../../../../crates/sovereign-sdk/module-system/sov-modules-api", default-features = false }
 sov-modules-stf-blueprint = { path = "../../../../../crates/sovereign-sdk/module-system/sov-modules-stf-blueprint" }
-sov-risc0-adapter = { path = "../../../../../crates/sovereign-sdk/adapters/risc0" }
 sov-state = { path = "../../../../../crates/sovereign-sdk/module-system/sov-state" }
 
 [patch.crates-io]

bin/citrea/provers/risc0/batch-proof-mock/src/bin/batch_proof_mock.rs

@@ -4,7 +4,7 @@ use citrea_stf::StfVerifier;
 use sov_mock_da::MockDaVerifier;
 use sov_modules_api::default_context::ZkDefaultContext;
 use sov_modules_stf_blueprint::StfBlueprint;
-use sov_risc0_adapter::guest::Risc0Guest;
+use citrea_risc0_adapter::guest::Risc0Guest;
 use sov_state::ZkStorage;
 
 risc0_zkvm::guest::entry!(main);

bin/citrea/provers/risc0/light-client-proof-bitcoin/Cargo.toml

@@ -14,9 +14,9 @@ anyhow = "1.0.68"
 bitcoin-da = { path = "../../../../../crates/bitcoin-da", default-features = false }
 citrea-light-client-prover = { path = "../../../../../crates/light-client-prover", default-features = false }
 citrea-primitives = { path = "../../../../../crates/primitives" }
+citrea-risc0-adapter = { path = "../../../../../crates/risc0" }
 sov-modules-api = { path = "../../../../../crates/sovereign-sdk/module-system/sov-modules-api", default-features = false }
 sov-modules-stf-blueprint = { path = "../../../../../crates/sovereign-sdk/module-system/sov-modules-stf-blueprint" }
-sov-risc0-adapter = { path = "../../../../../crates/sovereign-sdk/adapters/risc0" }
 sov-rollup-interface = { path = "../../../../../crates/sovereign-sdk/rollup-interface" }
 sov-state = { path = "../../../../../crates/sovereign-sdk/module-system/sov-state" }
 

bin/citrea/provers/risc0/light-client-proof-bitcoin/src/bin/light_client_proof_bitcoin.rs

@@ -3,7 +3,7 @@ use bitcoin_da::spec::RollupParams;
 use bitcoin_da::verifier::BitcoinVerifier;
 use citrea_light_client_prover::circuit::run_circuit;
 use citrea_primitives::{TO_BATCH_PROOF_PREFIX, TO_LIGHT_CLIENT_PREFIX};
-use sov_risc0_adapter::guest::Risc0Guest;
+use citrea_risc0_adapter::guest::Risc0Guest;
 use sov_rollup_interface::da::DaVerifier;
 use sov_rollup_interface::zk::ZkvmGuest;