Chunked DA txs (#925)

* Bitcoin DA versions * Fix parser tests, review comments * Init chunked txs * Chain chunked parts with utxos * Actually construct Type0/Type1 based on body size * fix script for type 0 * Fix scripts with checksigverify * Add vout index for prev tx (#961) * Add vout index for prev tx * replace prev_tx logic with prev_utxo logic * remove RawUTXO --------- Co-authored-by: eyusufatik <[email protected]> * Esad/better inclusion proof (#991) * depend only on wtxid * verify merkle root of coinbase tx, use zkvm efficient sh256 and bitcoin merkle tree * remove unused asserts * pr fixes * pr fixes * Add batchproof/lightclient namespaces. Add SequencerCommitment tx type * Apply #961 again * Esad get_service * Sign list of tx of aggregates tx instead of body (#1003) * fix bitcoin da test suite (#1009) * get ready for test fixes * fix tests * reactivate some of the verifier tests * fix remaning bitcoin-da tests * cleanup * clippy * Kpp/merkle tests (#1017) * Add merkle tree tests (#995) * Add merkle tree tests * Add 1 tx test to bitcoin compare --------- Co-authored-by: yaziciahmet <yaziciahmetcleargmail.com> * Fix errors/lints --------- Co-authored-by: Ahmet Yazıcı <[email protected]> * Allow dead code * Fix tx prefixes in guest-bitcoin * Review fixes * Review fix * Revert test non_parseable_tx * Rename parse_transaction -> parse_light_client_transaction * fix confusion on BitcoinService::new (#1025) --------- Co-authored-by: eyusufatik <[email protected]> Co-authored-by: Erce Can Bektüre <[email protected]> Co-authored-by: Esad Yusuf Atik <[email protected]> Co-authored-by: Ahmet Yazıcı <[email protected]>
chainwayxyz · Aug 20, 2024 · 5dea363 · 5dea363
1 parent dcf4b3a
commit 5dea363
Show file tree

Hide file tree

Showing 21 changed files with 2,553 additions and 1,013 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock b/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock
diff --git a/bin/citrea/provers/risc0/guest-bitcoin/src/bin/bitcoin_da.rs b/bin/citrea/provers/risc0/guest-bitcoin/src/bin/bitcoin_da.rs
@@ -1,7 +1,7 @@
 #![no_main]
 use bitcoin_da::spec::RollupParams;
 use bitcoin_da::verifier::BitcoinVerifier;
-use citrea_primitives::{DA_TX_ID_LEADING_ZEROS, ROLLUP_NAME};
+use citrea_primitives::{REVEAL_BATCH_PROOF_PREFIX, REVEAL_LIGHT_CLIENT_PREFIX, ROLLUP_NAME};
 use citrea_stf::runtime::Runtime;
 use citrea_stf::StfVerifier;
 #[cfg(feature = "bench")]
@@ -43,7 +43,8 @@ pub fn main() {
         stf,
         BitcoinVerifier::new(RollupParams {
             rollup_name: ROLLUP_NAME.to_string(),
-            reveal_tx_id_prefix: DA_TX_ID_LEADING_ZEROS.to_vec(),
+            reveal_batch_prover_prefix: REVEAL_BATCH_PROOF_PREFIX.to_vec(),
+            reveal_light_client_prefix: REVEAL_LIGHT_CLIENT_PREFIX.to_vec(),
         }),
     );
 

diff --git a/bin/citrea/src/rollup/bitcoin.rs b/bin/citrea/src/rollup/bitcoin.rs
@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use bitcoin_da::service::{BitcoinService, DaServiceConfig, TxidWrapper};
 use bitcoin_da::spec::{BitcoinSpec, RollupParams};
 use bitcoin_da::verifier::BitcoinVerifier;
-use citrea_primitives::{DA_TX_ID_LEADING_ZEROS, ROLLUP_NAME};
+use citrea_primitives::{REVEAL_BATCH_PROOF_PREFIX, REVEAL_LIGHT_CLIENT_PREFIX, ROLLUP_NAME};
 use citrea_prover::prover_service::ParallelProverService;
 use citrea_risc0_bonsai_adapter::host::Risc0BonsaiHost;
 use citrea_risc0_bonsai_adapter::Digest;
@@ -113,11 +113,12 @@ impl RollupBlueprint for BitcoinRollup {
         let (tx, rx) = unbounded_channel::<SenderWithNotifier<TxidWrapper>>();
 
         let service = Arc::new(
-            BitcoinService::new(
+            BitcoinService::new_with_wallet_check(
                 rollup_config.da.clone(),
                 RollupParams {
                     rollup_name: ROLLUP_NAME.to_string(),
-                    reveal_tx_id_prefix: DA_TX_ID_LEADING_ZEROS.to_vec(),
+                    reveal_light_client_prefix: REVEAL_LIGHT_CLIENT_PREFIX.to_vec(),
+                    reveal_batch_prover_prefix: REVEAL_BATCH_PROOF_PREFIX.to_vec(),
                 },
                 tx,
             )
@@ -148,7 +149,8 @@ impl RollupBlueprint for BitcoinRollup {
 
         let da_verifier = BitcoinVerifier::new(RollupParams {
             rollup_name: ROLLUP_NAME.to_string(),
-            reveal_tx_id_prefix: DA_TX_ID_LEADING_ZEROS.to_vec(),
+            reveal_light_client_prefix: REVEAL_LIGHT_CLIENT_PREFIX.to_vec(),
+            reveal_batch_prover_prefix: REVEAL_BATCH_PROOF_PREFIX.to_vec(),
         });
 
         ParallelProverService::new_with_default_workers(

diff --git a/crates/bitcoin-da/Cargo.toml b/crates/bitcoin-da/Cargo.toml
@@ -7,7 +7,6 @@ homepage = { workspace = true }
 license = "MIT OR Apache-2.0"
 publish = false
 repository = { workspace = true }
-rust-version = "1.66"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -30,6 +29,7 @@ tracing = { workspace = true, optional = true }
 bitcoin = { workspace = true }
 brotli = { workspace = true }
 futures.workspace = true
+sha2 = { workspace = true }
 
 bitcoincore-rpc = { workspace = true, optional = true }