L2Block

bin/citrea/src/test_rpc.rs

@@ -1,3 +1,4 @@
+use citrea_common::utils::compute_tx_merkle_root;
 #[cfg(test)]
 use citrea_common::RpcConfig;
 use hex::ToHex;
@@ -6,10 +7,10 @@ use sha2::Digest;
 use sov_db::ledger_db::{LedgerDB, SharedLedgerOps};
 use sov_db::rocks_db_config::RocksdbConfig;
 use sov_db::schema::types::StoredTransaction;
-use sov_mock_da::MockDaSpec;
-#[cfg(test)]
-use sov_modules_api::DaSpec;
-use sov_rollup_interface::stf::SoftConfirmationReceipt;
+use sov_modules_api::L2Block;
+use sov_rollup_interface::soft_confirmation::{
+    SignedSoftConfirmationHeader, SoftConfirmationHeader,
+};
 
 struct TestExpect {
     payload: serde_json::Value,
@@ -40,26 +41,14 @@ async fn queries_test_runner(test_queries: Vec<TestExpect>, rpc_config: RpcConfi
     }
 }
 
-fn populate_ledger(
-    ledger_db: &mut LedgerDB,
-    state_root: &[u8],
-    soft_confirmation_receipts: Vec<SoftConfirmationReceipt<MockDaSpec>>,
-    tx_bodies: Vec<Vec<Vec<u8>>>,
-) {
-    for (soft_confirmation_receipt, tx_bodies) in
-        soft_confirmation_receipts.into_iter().zip(tx_bodies)
-    {
-        ledger_db
-            .commit_soft_confirmation(state_root, soft_confirmation_receipt, Some(tx_bodies))
-            .unwrap();
+fn populate_ledger(ledger_db: &mut LedgerDB, l2_blocks: Vec<L2Block<'_, [u8; 32]>>) {
+    for block in l2_blocks {
+        let tx_hashes = block.txs.to_vec();
+        ledger_db.commit_l2_block(block, tx_hashes, true).unwrap();
     }
 }
 
-fn test_helper(
-    test_queries: Vec<TestExpect>,
-    soft_confirmation_receipts: Vec<SoftConfirmationReceipt<MockDaSpec>>,
-    tx_bodies: Vec<Vec<Vec<u8>>>,
-) {
+fn test_helper(test_queries: Vec<TestExpect>, l2_blocks: Vec<L2Block<'_, [u8; 32]>>) {
     let rt = tokio::runtime::Builder::new_multi_thread()
         .enable_io()
         .enable_time()
@@ -71,12 +60,7 @@ fn test_helper(
         let tmpdir = tempfile::tempdir().unwrap();
         let mut ledger_db =
             LedgerDB::with_config(&RocksdbConfig::new(tmpdir.path(), None, None)).unwrap();
-        populate_ledger(
-            &mut ledger_db,
-            &[1; 32],
-            soft_confirmation_receipts,
-            tx_bodies,
-        );
+        populate_ledger(&mut ledger_db, l2_blocks);
         let server = jsonrpsee::server::ServerBuilder::default()
             .build("127.0.0.1:0")
             .await
@@ -114,52 +98,79 @@ fn batch2_tx_receipts() -> (Vec<StoredTransaction>, Vec<Vec<u8>>) {
 fn regular_test_helper(payload: serde_json::Value, expected: &serde_json::Value) {
     let tx_bodies_1 = vec![b"tx1 body".to_vec(), b"tx2 body".to_vec()];
     let (batch_2_receipts, tx_bodies_2) = batch2_tx_receipts();
-    let soft_confirmation_receipts = vec![
-        SoftConfirmationReceipt {
-            l2_height: 1,
-            da_slot_height: 0,
-            da_slot_hash: <MockDaSpec as DaSpec>::SlotHash::from([0u8; 32]),
-            da_slot_txs_commitment: <MockDaSpec as DaSpec>::SlotHash::from([1u8; 32]),
-            soft_confirmation_signature: vec![],
-            hash: ::sha2::Sha256::digest(b"batch_receipt").into(),
-            prev_hash: ::sha2::Sha256::digest(b"prev_batch_receipt").into(),
-            tx_hashes: vec![
-                ::sha2::Sha256::digest(b"tx1").into(),
-                ::sha2::Sha256::digest(b"tx2").into(),
-            ],
-            pub_key: vec![],
-            deposit_data: vec![
-                "aaaaab".as_bytes().to_vec(),
-                "eeeeeeeeee".as_bytes().to_vec(),
-            ],
-            l1_fee_rate: 0,
-            timestamp: 0,
-        },
-        SoftConfirmationReceipt {
-            l2_height: 2,
-            da_slot_height: 1,
-            da_slot_hash: <MockDaSpec as DaSpec>::SlotHash::from([2; 32]),
-            da_slot_txs_commitment: <MockDaSpec as DaSpec>::SlotHash::from([3; 32]),
-            soft_confirmation_signature: vec![],
-            hash: ::sha2::Sha256::digest(b"batch_receipt2").into(),
-            prev_hash: ::sha2::Sha256::digest(b"prev_batch_receipt2").into(),
-            tx_hashes: batch_2_receipts.iter().map(|r| r.hash).collect(),
-            pub_key: vec![],
-            deposit_data: vec!["c44444".as_bytes().to_vec()],
-            l1_fee_rate: 0,
-            timestamp: 0,
-        },
+
+    let tx_hashes_1 = vec![
+        ::sha2::Sha256::digest(b"tx1").into(),
+        ::sha2::Sha256::digest(b"tx2").into(),
     ];
 
-    let tx_bodies = vec![tx_bodies_1, tx_bodies_2];
+    let header1 = SoftConfirmationHeader::new(
+        1,
+        0,
+        [0u8; 32],
+        [1u8; 32],
+        ::sha2::Sha256::digest(b"prev_batch_receipt").into(),
+        [1; 32],
+        0,
+        compute_tx_merkle_root(&tx_hashes_1).unwrap(),
+        vec![
+            "aaaaab".as_bytes().to_vec(),
+            "eeeeeeeeee".as_bytes().to_vec(),
+        ],
+        0,
+    );
+
+    let header2 = SoftConfirmationHeader::new(
+        2,
+        1,
+        [2; 32],
+        [3; 32],
+        ::sha2::Sha256::digest(b"prev_batch_receipt2").into(),
+        [1; 32],
+        0,
+        compute_tx_merkle_root(&batch_2_receipts.iter().map(|r| r.hash).collect::<Vec<_>>())
+            .unwrap(),
+        vec!["c44444".as_bytes().to_vec()],
+        0,
+    );
+
+    let signed_header1 = SignedSoftConfirmationHeader::new(
+        header1,
+        ::sha2::Sha256::digest(b"batch_receipt").into(),
+        vec![],
+        vec![],
+    );
+
+    let signed_header2 = SignedSoftConfirmationHeader::new(
+        header2,
+        ::sha2::Sha256::digest(b"batch_receipt2").into(),
+        vec![],
+        vec![],
+    );
+
+    let l2_blocks = vec![
+        L2Block::<[u8; 32]>::new(
+            signed_header1,
+            tx_bodies_1.clone().into(),
+            tx_hashes_1.into(),
+        ),
+        L2Block::<[u8; 32]>::new(
+            signed_header2,
+            tx_bodies_2.clone().into(),
+            batch_2_receipts
+                .iter()
+                .map(|r| r.hash)
+                .collect::<Vec<_>>()
+                .into(),
+        ),
+    ];
 
     test_helper(
         vec![TestExpect {
             payload,
             expected: expected.clone(),
         }],
-        soft_confirmation_receipts,
-        tx_bodies,
+        l2_blocks,
     )
 }
 
@@ -196,7 +207,13 @@ macro_rules! jsonrpc_result {
 fn test_get_soft_confirmation() {
     // Get the first soft confirmation by number
     let payload = jsonrpc_req!("ledger_getSoftConfirmationByNumber", [1]);
-    let expected = jsonrpc_result!({"daSlotHeight":0,"daSlotHash":"0000000000000000000000000000000000000000000000000000000000000000","daSlotTxsCommitment":"0101010101010101010101010101010101010101010101010101010101010101","depositData": ["616161616162", "65656565656565656565"],"hash":"b5515a80204963f7db40e98af11aedb49a394b1c7e3d8b5b7a33346b8627444f","l2Height":1, "txs":["74783120626f6479", "74783220626f6479"],"prevHash":"0209d4aa08c40ed0fcb2bb6eb276481f2ad045914c3065e13e4f1657e97638b1","stateRoot":"0101010101010101010101010101010101010101010101010101010101010101","softConfirmationSignature":"","pubKey":"", "l1FeeRate":0, "timestamp": 0});
+
+    let tx_hashes = vec![
+        ::sha2::Sha256::digest(b"tx1").into(),
+        ::sha2::Sha256::digest(b"tx2").into(),
+    ];
+    let empty_tx_merkle_root = compute_tx_merkle_root(&tx_hashes).unwrap();
+    let expected = jsonrpc_result!({"daSlotHeight":0,"daSlotHash":"0000000000000000000000000000000000000000000000000000000000000000","daSlotTxsCommitment":"0101010101010101010101010101010101010101010101010101010101010101","depositData": ["616161616162", "65656565656565656565"],"hash":"b5515a80204963f7db40e98af11aedb49a394b1c7e3d8b5b7a33346b8627444f","l2Height":1, "txs":["74783120626f6479", "74783220626f6479"],"prevHash":"0209d4aa08c40ed0fcb2bb6eb276481f2ad045914c3065e13e4f1657e97638b1","stateRoot":"0101010101010101010101010101010101010101010101010101010101010101","softConfirmationSignature":"","pubKey":"", "l1FeeRate":0, "timestamp": 0, "txMerkleRoot": empty_tx_merkle_root});
     regular_test_helper(payload, &expected);
 
     // Get the first soft confirmation by hash
@@ -213,8 +230,15 @@ fn test_get_soft_confirmation() {
         .into_iter()
         .map(|body| body.encode_hex::<String>())
         .collect::<Vec<String>>();
+
+    let tx_hashes = batch2_tx_receipts()
+        .0
+        .iter()
+        .map(|r| r.hash)
+        .collect::<Vec<_>>();
+    let tx_merkle_root = compute_tx_merkle_root(&tx_hashes).unwrap();
     let expected = jsonrpc_result!(
-        {"daSlotHeight":1,"daSlotHash":"0202020202020202020202020202020202020202020202020202020202020202","daSlotTxsCommitment":"0303030303030303030303030303030303030303030303030303030303030303","depositData": ["633434343434"],"hash":"f85fe0cb36fdaeca571c896ed476b49bb3c8eff00d935293a8967e1e9a62071e","l2Height":2, "txs": txs, "prevHash":"11ec8b9896aa1f400cc1dbd1b0ab3dcc97f2025b3d309b70ec249f687a807d1d","stateRoot":"0101010101010101010101010101010101010101010101010101010101010101","softConfirmationSignature":"","pubKey":"","l1FeeRate":0, "timestamp": 0}
+        {"daSlotHeight":1,"daSlotHash":"0202020202020202020202020202020202020202020202020202020202020202","daSlotTxsCommitment":"0303030303030303030303030303030303030303030303030303030303030303","depositData": ["633434343434"],"hash":"f85fe0cb36fdaeca571c896ed476b49bb3c8eff00d935293a8967e1e9a62071e","l2Height":2, "txs": txs, "prevHash":"11ec8b9896aa1f400cc1dbd1b0ab3dcc97f2025b3d309b70ec249f687a807d1d","stateRoot":"0101010101010101010101010101010101010101010101010101010101010101","softConfirmationSignature":"","pubKey":"","l1FeeRate":0, "timestamp": 0, "txMerkleRoot": tx_merkle_root}
     );
     regular_test_helper(payload, &expected);
 
@@ -233,10 +257,17 @@ fn test_get_soft_confirmation() {
         .into_iter()
         .map(|body| body.encode_hex::<String>())
         .collect::<Vec<String>>();
+
+    let tx_hashes = batch2_tx_receipts()
+        .0
+        .iter()
+        .map(|r| r.hash)
+        .collect::<Vec<_>>();
+    let tx_merkle_root = compute_tx_merkle_root(&tx_hashes).unwrap();
     let expected = jsonrpc_result!(
         [
-            {"daSlotHeight":0,"daSlotHash":"0000000000000000000000000000000000000000000000000000000000000000","daSlotTxsCommitment":"0101010101010101010101010101010101010101010101010101010101010101","depositData": ["616161616162", "65656565656565656565"],"hash":"b5515a80204963f7db40e98af11aedb49a394b1c7e3d8b5b7a33346b8627444f","l2Height":1,"txs":["74783120626f6479", "74783220626f6479"],"prevHash":"0209d4aa08c40ed0fcb2bb6eb276481f2ad045914c3065e13e4f1657e97638b1", "stateRoot":"0101010101010101010101010101010101010101010101010101010101010101","softConfirmationSignature":"","pubKey":"","l1FeeRate":0, "timestamp": 0},
-            {"daSlotHeight":1,"daSlotHash":"0202020202020202020202020202020202020202020202020202020202020202","daSlotTxsCommitment":"0303030303030303030303030303030303030303030303030303030303030303","depositData": ["633434343434"],"hash":"f85fe0cb36fdaeca571c896ed476b49bb3c8eff00d935293a8967e1e9a62071e","l2Height":2,"txs": txs, "prevHash": "11ec8b9896aa1f400cc1dbd1b0ab3dcc97f2025b3d309b70ec249f687a807d1d", "stateRoot":"0101010101010101010101010101010101010101010101010101010101010101","softConfirmationSignature":"","pubKey":"","l1FeeRate":0, "timestamp": 0}
+            {"daSlotHeight":0,"daSlotHash":"0000000000000000000000000000000000000000000000000000000000000000","daSlotTxsCommitment":"0101010101010101010101010101010101010101010101010101010101010101","depositData": ["616161616162", "65656565656565656565"],"hash":"b5515a80204963f7db40e98af11aedb49a394b1c7e3d8b5b7a33346b8627444f","l2Height":1,"txs":["74783120626f6479", "74783220626f6479"],"prevHash":"0209d4aa08c40ed0fcb2bb6eb276481f2ad045914c3065e13e4f1657e97638b1", "stateRoot":"0101010101010101010101010101010101010101010101010101010101010101","softConfirmationSignature":"","pubKey":"","l1FeeRate":0, "timestamp": 0, "txMerkleRoot": empty_tx_merkle_root},
+            {"daSlotHeight":1,"daSlotHash":"0202020202020202020202020202020202020202020202020202020202020202","daSlotTxsCommitment":"0303030303030303030303030303030303030303030303030303030303030303","depositData": ["633434343434"],"hash":"f85fe0cb36fdaeca571c896ed476b49bb3c8eff00d935293a8967e1e9a62071e","l2Height":2,"txs": txs, "prevHash": "11ec8b9896aa1f400cc1dbd1b0ab3dcc97f2025b3d309b70ec249f687a807d1d", "stateRoot":"0101010101010101010101010101010101010101010101010101010101010101","softConfirmationSignature":"","pubKey":"","l1FeeRate":0, "timestamp": 0, "txMerkleRoot": tx_merkle_root}
         ]
     );
     regular_test_helper(payload, &expected);

crates/batch-prover/src/da_block_handler.rs

@@ -21,7 +21,7 @@ use sov_db::schema::types::{SlotNumber, SoftConfirmationNumber};
 use sov_modules_api::{DaSpec, StateDiff, Zkvm};
 use sov_rollup_interface::da::{BlockHeaderTrait, SequencerCommitment};
 use sov_rollup_interface::services::da::{DaService, SlotData};
-use sov_rollup_interface::soft_confirmation::SignedSoftConfirmation;
+use sov_rollup_interface::soft_confirmation::L2Block;
 use sov_rollup_interface::spec::SpecId;
 use sov_rollup_interface::zk::ZkvmHost;
 use tokio::select;
@@ -36,7 +36,7 @@ use crate::proving::{data_to_prove, extract_and_store_proof, prove_l1, GroupComm
 
 type CommitmentStateTransitionData<'txs, Witness, Da, Tx> = (
     VecDeque<Vec<(Witness, Witness)>>,
-    VecDeque<Vec<SignedSoftConfirmation<'txs, Tx>>>,
+    VecDeque<Vec<L2Block<'txs, Tx>>>,
     VecDeque<Vec<<<Da as DaService>::Spec as DaSpec>::BlockHeader>>,
 );
 
@@ -313,7 +313,7 @@ pub(crate) async fn get_batch_proof_circuit_input_from_commitments<
 ) -> Result<CommitmentStateTransitionData<'txs, Witness, Da, Tx>, anyhow::Error> {
     let mut state_transition_witnesses: VecDeque<Vec<(Witness, Witness)>> =
         VecDeque::with_capacity(sequencer_commitments.len());
-    let mut soft_confirmations: VecDeque<Vec<SignedSoftConfirmation<Tx>>> =
+    let mut committed_l2_blocks: VecDeque<Vec<L2Block<Tx>>> =
         VecDeque::with_capacity(sequencer_commitments.len());
     let mut da_block_headers_of_soft_confirmations: VecDeque<
         Vec<<<Da as DaService>::Spec as DaSpec>::BlockHeader>,
@@ -337,8 +337,7 @@ pub(crate) async fn get_batch_proof_circuit_input_from_commitments<
                 ));
             }
         };
-        let mut commitment_soft_confirmations =
-            Vec::with_capacity(soft_confirmations_in_commitment.len());
+        let mut l2_blocks = Vec::with_capacity(soft_confirmations_in_commitment.len());
         let mut da_block_headers_to_push: Vec<<<Da as DaService>::Spec as DaSpec>::BlockHeader> =
             vec![];
         for soft_confirmation in soft_confirmations_in_commitment {
@@ -363,12 +362,12 @@ pub(crate) async fn get_batch_proof_circuit_input_from_commitments<
                 };
                 da_block_headers_to_push.push(filtered_block.header().clone());
             }
-            let signed_soft_confirmation: SignedSoftConfirmation<Tx> = soft_confirmation
+            let l2_block: L2Block<Tx> = soft_confirmation
                 .try_into()
                 .context("Failed to parse transactions")?;
-            commitment_soft_confirmations.push(signed_soft_confirmation);
+            l2_blocks.push(l2_block);
         }
-        soft_confirmations.push_back(commitment_soft_confirmations);
+        committed_l2_blocks.push_back(l2_blocks);
 
         da_block_headers_of_soft_confirmations.push_back(da_block_headers_to_push);
         for l2_height in
@@ -387,7 +386,7 @@ pub(crate) async fn get_batch_proof_circuit_input_from_commitments<
     }
     Ok((
         state_transition_witnesses,
-        soft_confirmations,
+        committed_l2_blocks,
         da_block_headers_of_soft_confirmations,
     ))
 }

crates/batch-prover/src/db_migrations/mod.rs

@@ -1,7 +1,8 @@
 use std::sync::OnceLock;
 
 use citrea_common::db_migrations::{
-    MigrateBatchAndSlotByNumber, MigrateVerifiedProofsBySlotNumber, RemoveUnusedTables,
+    MigrateBatchAndSlotByNumber, MigrateSoftConfirmationTxMerkleRoot,
+    MigrateVerifiedProofsBySlotNumber, RemoveUnusedTables,
 };
 use sov_db::ledger_db::migrations::LedgerMigration;
 use sov_db::schema::tables::BATCH_PROVER_LEDGER_TABLES;
@@ -16,6 +17,7 @@ pub fn migrations() -> &'static Vec<Box<dyn LedgerMigration + Send + Sync + 'sta
             Box::new(RemoveUnusedTables {
                 tables: BATCH_PROVER_LEDGER_TABLES,
             }),
+            Box::new(MigrateSoftConfirmationTxMerkleRoot),
         ]
     })
 }

crates/batch-prover/src/proving.rs

@@ -414,10 +414,7 @@ pub(crate) fn save_commitments<DB>(
         let l2_end_height = sequencer_commitment.l2_end_block_number;
         for i in l2_start_height..=l2_end_height {
             ledger_db
-                .put_soft_confirmation_status(
-                    SoftConfirmationNumber(i),
-                    SoftConfirmationStatus::Proven,
-                )
+                .put_l2_block_status(SoftConfirmationNumber(i), SoftConfirmationStatus::Proven)
                 .unwrap_or_else(|_| {
                     panic!(
                         "Failed to put soft confirmation status in the ledger db {}",