foo

Cargo.toml

@@ -54,7 +54,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.4.0-rc.3"
+version = "0.5.0-rc.1"
 edition = "2021"
 license = "GPL-3.0"
 authors = ["Chainway Labs <[email protected]>"]
@@ -185,4 +185,4 @@ ed25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curv
 crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
 secp256k1 = { git = "https://github.com/Sovereign-Labs/rust-secp256k1.git", branch = "risc0-compatible-0-29-0" }
 k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" }
-bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", branch = "master" }
+bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "1aae7cc" }

Makefile

@@ -21,8 +21,15 @@ clean-node: ## Cleans local dbs needed for sequencer and nodes
 	rm -rf resources/dbs/sequencer-db
 	rm -rf resources/dbs/prover-db
 	rm -rf resources/dbs/full-node-db
+
+clean-txs:
+	rm -rf resources/bitcoin/inscription_txs/*
+
+clean-docker:
 	rm -rf resources/dbs/citrea-bitcoin-regtest-data
 
+clean-all: clean clean-node clean-txs
+
 test-legacy: ## Runs test suite with output from tests printed
 	@cargo test -- --nocapture -Zunstable-options --report-time
 
@@ -37,8 +44,8 @@ install-dev-tools:  ## Installs all necessary cargo helpers
 	cargo install flaky-finder
 	cargo install cargo-nextest --locked
 	cargo install --version 1.7.0 cargo-binstall
-	curl -L https://risczero.com/install | bash
-	~/.risc0/bin/rzup -v 1.0.5
+	cargo binstall cargo-risczero@1.0.5 --no-confirm
+	cargo risczero install --version r0.1.79.0-2
 	rustup target add thumbv6m-none-eabi
 	rustup component add llvm-tools-preview
 	cargo install cargo-llvm-cov

bin/citrea/provers/risc0/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "risc0"
-version = "0.4.0-rc.3"
+version = "0.5.0-rc.1"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false

bin/citrea/provers/risc0/guest-bitcoin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "citrea-bitcoin-prover"
-version = "0.3.0"
+version = "0.5.0-rc.1"
 edition = "2021"
 resolver = "2"
 

bin/citrea/provers/risc0/guest-mock/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sov-demo-prover-guest-mock"
-version = "0.3.0"
+version = "0.5.0-rc.1"
 edition = "2021"
 resolver = "2"
 

bin/citrea/src/rollup/bitcoin.rs

@@ -117,10 +117,11 @@ impl RollupBlueprint for BitcoinRollup {
     async fn create_da_service(
         &self,
         rollup_config: &FullNodeConfig<Self::DaConfig>,
+        require_wallet_check: bool,
     ) -> Result<Arc<Self::DaService>, anyhow::Error> {
         let (tx, rx) = unbounded_channel::<SenderWithNotifier<TxidWrapper>>();
 
-        let service = Arc::new(
+        let bitcoin_service = if require_wallet_check {
             BitcoinService::new_with_wallet_check(
                 rollup_config.da.clone(),
                 RollupParams {
@@ -129,8 +130,19 @@ impl RollupBlueprint for BitcoinRollup {
                 },
                 tx,
             )
-            .await?,
-        );
+            .await?
+        } else {
+            BitcoinService::new_without_wallet_check(
+                rollup_config.da.clone(),
+                RollupParams {
+                    reveal_light_client_prefix: REVEAL_LIGHT_CLIENT_PREFIX.to_vec(),
+                    reveal_batch_prover_prefix: REVEAL_BATCH_PROOF_PREFIX.to_vec(),
+                },
+                tx,
+            )
+            .await?
+        };
+        let service = Arc::new(bitcoin_service);
 
         Arc::clone(&service).spawn_da_queue(rx);
 

bin/citrea/src/rollup/mock.rs

@@ -94,6 +94,7 @@ impl RollupBlueprint for MockDemoRollup {
     async fn create_da_service(
         &self,
         rollup_config: &FullNodeConfig<Self::DaConfig>,
+        _require_wallet_check: bool,
     ) -> Result<Arc<Self::DaService>, anyhow::Error> {
         Ok(Arc::new(MockDaService::new(
             rollup_config.da.sender_address,