Check compressed sequencer commitments (#1349)

bin/citrea/tests/bitcoin_e2e/prover_test.rs

@@ -99,7 +99,7 @@ impl TestCase for BasicProverTest {
                 .sum();
             let borshed_state_diff = borsh::to_vec(state_diff).unwrap();
             let compressed_state_diff =
-                bitcoin_da::helpers::compression::compress_blob(&borshed_state_diff);
+                citrea_primitives::compression::compress_blob(&borshed_state_diff);
             println!(
                 "StateDiff: size {}, compressed {}",
                 state_diff_size,

bin/citrea/tests/e2e/sequencer_behaviour.rs

@@ -162,8 +162,8 @@ async fn test_sequencer_commitment_threshold() {
 
     seq_test_client.send_publish_batch_request().await;
 
-    for i in 1..17 {
-        for _ in 0..300 {
+    for i in 1..35 {
+        for _ in 0..600 {
             let address = Address::random();
             let _pending = seq_test_client
                 .send_eth(address, None, None, None, 1u128)
@@ -176,14 +176,14 @@ async fn test_sequencer_commitment_threshold() {
         wait_for_l2_block(&seq_test_client, i, None).await;
     }
 
-    wait_for_l2_block(&seq_test_client, 16, Some(Duration::from_secs(60))).await;
+    wait_for_l2_block(&seq_test_client, 35, Some(Duration::from_secs(60))).await;
 
-    // After block 9/10, the state diff should be large enough to trigger a commitment.
+    // After block 35, the state diff should be large enough to trigger a commitment.
     let commitments = wait_for_commitment(&da_service, 2, Some(Duration::from_secs(60))).await;
     assert_eq!(commitments.len(), 1);
 
-    for i in 17..30 {
-        for _ in 0..300 {
+    for i in 35..70 {
+        for _ in 0..600 {
             let address = Address::random();
             let _pending = seq_test_client
                 .send_eth(address, None, None, None, 1u128)
@@ -196,9 +196,9 @@ async fn test_sequencer_commitment_threshold() {
         wait_for_l2_block(&seq_test_client, i, None).await;
     }
 
-    wait_for_l2_block(&seq_test_client, 29, Some(Duration::from_secs(60))).await;
+    wait_for_l2_block(&seq_test_client, 70, Some(Duration::from_secs(60))).await;
 
-    // After block 17/18, the state diff should be large enough to trigger a commitment.
+    // After block 70, the state diff should be large enough to trigger a commitment.
     // But the remaining blocks state diff should NOT trigger a third.
     let commitments = wait_for_commitment(&da_service, 3, Some(Duration::from_secs(60))).await;
     assert_eq!(commitments.len(), 1);

crates/bitcoin-da/Cargo.toml

@@ -31,7 +31,6 @@ thiserror = { workspace = true }
 tracing = { workspace = true, optional = true }
 
 bitcoin = { workspace = true }
-brotli = { workspace = true, optional = true }
 futures.workspace = true
 sha2 = { workspace = true }
 
@@ -41,7 +40,6 @@ bitcoincore-rpc = { workspace = true, optional = true }
 default = []
 native = [
   "dep:backoff",
-  "dep:brotli",
   "dep:tokio",
   "dep:pin-project",
   "dep:tracing",

crates/bitcoin-da/src/helpers/builders/tests.rs

@@ -6,10 +6,10 @@ use bitcoin::secp256k1::schnorr::Signature;
 use bitcoin::secp256k1::SecretKey;
 use bitcoin::taproot::ControlBlock;
 use bitcoin::{Address, Amount, ScriptBuf, TxOut, Txid};
+use citrea_primitives::compression::{compress_blob, decompress_blob};
 
 use super::light_client_proof_namespace::LightClientTxs;
 use crate::helpers::builders::sign_blob_with_private_key;
-use crate::helpers::compression::{compress_blob, decompress_blob};
 use crate::helpers::parsers::{parse_light_client_transaction, ParsedLightClientTransaction};
 use crate::spec::utxo::UTXO;
 use crate::REVEAL_OUTPUT_AMOUNT;

crates/bitcoin-da/src/helpers/mod.rs

@@ -4,8 +4,6 @@ use sha2::{Digest, Sha256};
 
 #[cfg(feature = "native")]
 pub mod builders;
-#[cfg(feature = "native")]
-pub mod compression;
 pub mod merkle_tree;
 pub mod parsers;
 #[cfg(test)]

crates/bitcoin-da/src/service.rs

@@ -20,6 +20,7 @@ use bitcoin::{Amount, BlockHash, CompactTarget, Transaction, Txid, Wtxid};
 use bitcoincore_rpc::json::TestMempoolAcceptResult;
 use bitcoincore_rpc::{Auth, Client, Error, RpcApi, RpcError};
 use borsh::BorshDeserialize;
+use citrea_primitives::compression::{compress_blob, decompress_blob};
 use serde::{Deserialize, Serialize};
 use sov_rollup_interface::da::{DaData, DaDataBatchProof, DaDataLightClient, DaSpec};
 use sov_rollup_interface::services::da::{DaService, SenderWithNotifier};
@@ -35,7 +36,6 @@ use crate::helpers::builders::light_client_proof_namespace::{
     create_zkproof_transactions, LightClientTxs,
 };
 use crate::helpers::builders::{TxListWithReveal, TxWithId};
-use crate::helpers::compression::{compress_blob, decompress_blob};
 use crate::helpers::merkle_tree;
 use crate::helpers::merkle_tree::BitcoinMerkleTree;
 use crate::helpers::parsers::{

crates/common/src/lib.rs

@@ -8,4 +8,5 @@ pub mod error;
 pub mod rpc;
 pub mod tasks;
 pub mod utils;
+
 pub use config::*;

crates/primitives/Cargo.toml

@@ -13,6 +13,7 @@ sov-rollup-interface = { path = "../sovereign-sdk/rollup-interface" }
 # 3rd-party deps
 alloy-eips = { workspace = true }
 anyhow = { workspace = true }
+brotli = { workspace = true, optional = true }
 reth-primitives = { workspace = true }
 serde = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
@@ -25,6 +26,7 @@ sov-rollup-interface = { path = "../sovereign-sdk/rollup-interface", features =
 [features]
 native = [
   "dep:serde",
+  "dep:brotli",
   "dep:tokio",
   "dep:tracing",
   "sov-rollup-interface/native",

crates/primitives/src/constants.rs

@@ -28,8 +28,6 @@ pub const REVEAL_LIGHT_CLIENT_PREFIX: &[u8] = get_reveal_light_client_prefix();
 pub const TEST_PRIVATE_KEY: &str =
     "1212121212121212121212121212121212121212121212121212121212121212";
 
-pub const MAX_STATEDIFF_SIZE_COMMITMENT_THRESHOLD: u64 = 300 * 1024;
-
 pub const MIN_BASE_FEE_PER_GAS: u128 = 10_000_000; // 0.01 gwei
 
 /// Maximum size of a bitcoin transaction body in bytes

crates/primitives/src/lib.rs

@@ -1,4 +1,6 @@
 pub mod basefee;
+#[cfg(feature = "native")]
+pub mod compression;
 mod constants;
 pub mod forks;
 pub mod types;

crates/prover/Cargo.toml

@@ -10,7 +10,6 @@ repository.workspace = true
 
 [dependencies]
 # Citrea Deps
-bitcoin-da = { path = "../bitcoin-da" }
 citrea-common = { path = "../common" }
 citrea-primitives = { path = "../primitives", features = ["native"] }
 citrea-stf = { path = "../citrea-stf" }

crates/prover/src/da_block_handler.rs

@@ -5,12 +5,12 @@ use std::ops::RangeInclusive;
 use std::sync::Arc;
 
 use anyhow::anyhow;
-use bitcoin_da::helpers::compression::compress_blob;
 use borsh::{BorshDeserialize, BorshSerialize};
 use citrea_common::cache::L1BlockCache;
 use citrea_common::da::get_da_block_at_height;
 use citrea_common::utils::merge_state_diffs;
 use citrea_common::ProverConfig;
+use citrea_primitives::compression::compress_blob;
 use citrea_primitives::MAX_TXBODY_SIZE;
 use rand::Rng;
 use serde::de::DeserializeOwned;