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;
@@ -50,7 +51,12 @@ fn populate_ledger(
         soft_confirmation_receipts.into_iter().zip(tx_bodies)
     {
         ledger_db
-            .commit_soft_confirmation(state_root, soft_confirmation_receipt, Some(tx_bodies))
+            .commit_soft_confirmation(
+                state_root,
+                soft_confirmation_receipt,
+                Some(tx_bodies),
+                [0u8; 32],
+            )
             .unwrap();
     }
 }
@@ -196,7 +202,9 @@ 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 empty_tx_merkle_root = compute_tx_merkle_root(&[]).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 +221,15 @@ fn test_get_soft_confirmation() {
         .into_iter()
         .map(|body| body.encode_hex::<String>())
         .collect::<Vec<String>>();
+
+    let tx_hashes = batch2_tx_receipts()
+        .1
+        .into_iter()
+        .flat_map(|tx| tx.try_into().ok())
+        .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 +248,17 @@ fn test_get_soft_confirmation() {
         .into_iter()
         .map(|body| body.encode_hex::<String>())
         .collect::<Vec<String>>();
+
+    let tx_hashes = batch2_tx_receipts()
+        .1
+        .into_iter()
+        .flat_map(|tx| tx.try_into().ok())
+        .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>>,
 );
 
@@ -312,7 +312,7 @@ pub(crate) async fn get_batch_proof_circuit_input_from_commitments<
     l1_block_cache: &Arc<Mutex<L1BlockCache<Da>>>,
 ) -> Result<CommitmentStateTransitionData<'txs, Witness, Da, Tx>, anyhow::Error> {
     let mut state_transition_witnesses: VecDeque<Vec<(Witness, Witness)>> = VecDeque::new();
-    let mut soft_confirmations: VecDeque<Vec<SignedSoftConfirmation<Tx>>> = VecDeque::new();
+    let mut soft_confirmations: VecDeque<Vec<L2Block<'txs, Tx>>> = VecDeque::new();
     let mut da_block_headers_of_soft_confirmations: VecDeque<
         Vec<<<Da as DaService>::Spec as DaSpec>::BlockHeader>,
     > = VecDeque::new();
@@ -357,7 +357,7 @@ 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 signed_soft_confirmation: L2Block<Tx> = soft_confirmation
                 .try_into()
                 .context("Failed to parse transactions")?;
             commitment_soft_confirmations.push(signed_soft_confirmation);

crates/batch-prover/src/runner.rs

@@ -9,15 +9,15 @@ use backoff::exponential::ExponentialBackoffBuilder;
 use backoff::future::retry as retry_backoff;
 use citrea_common::cache::L1BlockCache;
 use citrea_common::da::get_da_block_at_height;
-use citrea_common::utils::soft_confirmation_to_receipt;
+use citrea_common::utils::{compute_tx_hashes, soft_confirmation_to_receipt};
 use citrea_common::{InitParams, RollupPublicKeys, RunnerConfig};
 use citrea_primitives::types::SoftConfirmationHash;
 use jsonrpsee::core::client::Error as JsonrpseeError;
 use jsonrpsee::http_client::{HttpClient, HttpClientBuilder};
 use sov_db::ledger_db::BatchProverLedgerOps;
 use sov_db::schema::types::{SlotNumber, SoftConfirmationNumber};
 use sov_ledger_rpc::LedgerRpcClient;
-use sov_modules_api::{Context, SignedSoftConfirmation, SlotData, Spec};
+use sov_modules_api::{Context, L2Block, SlotData, Spec};
 use sov_modules_stf_blueprint::{Runtime, StfBlueprint};
 use sov_prover_storage_manager::{ProverStorage, ProverStorageManager, SnapshotManager};
 use sov_rollup_interface::da::BlockHeaderTrait;
@@ -208,11 +208,10 @@ where
             .storage_manager
             .create_storage_on_l2_height(l2_height)?;
 
-        let mut signed_soft_confirmation: SignedSoftConfirmation<StfTransaction<C, Da::Spec, RT>> =
-            soft_confirmation
-                .clone()
-                .try_into()
-                .context("Failed to parse transactions")?;
+        let mut l2_block: L2Block<StfTransaction<C, Da::Spec, RT>> = soft_confirmation
+            .clone()
+            .try_into()
+            .context("Failed to parse transactions")?;
         // Register this new block with the fork manager to active
         // the new fork on the next block
         self.fork_manager.register_block(l2_height)?;
@@ -226,9 +225,9 @@ where
             Default::default(),
             Default::default(),
             current_l1_block.header(),
-            &mut signed_soft_confirmation,
+            &mut l2_block,
         )?;
-        let txs_bodies = signed_soft_confirmation.blobs().to_owned();
+        let txs_bodies = l2_block.blobs().to_owned();
 
         let next_state_root = soft_confirmation_result.state_root_transition.final_root;
         // Check if post state root is the same as the one in the soft confirmation
@@ -254,13 +253,17 @@ where
 
         self.storage_manager.finalize_l2(l2_height)?;
 
-        let receipt =
-            soft_confirmation_to_receipt::<C, _, Da::Spec>(signed_soft_confirmation, current_spec);
+        let tx_hashes =
+            compute_tx_hashes::<C, _, Da::Spec>(l2_block.txs(), l2_block.blobs(), current_spec);
+
+        let merkle_root = l2_block.tx_merkle_root();
+        let receipt = soft_confirmation_to_receipt::<C, _, Da::Spec>(l2_block, tx_hashes);
 
         self.ledger_db.commit_soft_confirmation(
             next_state_root.as_ref(),
             receipt,
             Some(txs_bodies),
+            merkle_root,
         )?;
 
         self.ledger_db.extend_l2_range_of_l1_slot(

crates/common/Cargo.toml

@@ -21,6 +21,7 @@ hyper = { workspace = true }
 jsonrpsee = { workspace = true, features = ["http-client", "server"] }
 lru = { workspace = true }
 metrics = { workspace = true }
+rs_merkle = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true }

crates/common/src/utils.rs

@@ -1,12 +1,15 @@
 use std::collections::{HashMap, HashSet};
 
+use anyhow::Context as _;
+use rs_merkle::algorithms::Sha256;
+use rs_merkle::MerkleTree;
 use sov_db::ledger_db::SharedLedgerOps;
 use sov_db::schema::types::SoftConfirmationNumber;
 use sov_modules_api::{Context, Spec};
 use sov_rollup_interface::da::{DaSpec, SequencerCommitment};
 use sov_rollup_interface::digest::Digest;
 use sov_rollup_interface::rpc::SoftConfirmationStatus;
-use sov_rollup_interface::soft_confirmation::SignedSoftConfirmation;
+use sov_rollup_interface::soft_confirmation::L2Block;
 use sov_rollup_interface::spec::SpecId;
 use sov_rollup_interface::stf::{SoftConfirmationReceipt, StateDiff, TransactionDigest};
 
@@ -84,24 +87,27 @@ pub fn check_l2_range_exists<DB: SharedLedgerOps>(
     false
 }
 
-pub fn soft_confirmation_to_receipt<C: Context, Tx: TransactionDigest + Clone, DS: DaSpec>(
-    soft_confirmation: SignedSoftConfirmation<'_, Tx>,
+pub fn compute_tx_hashes<C: Context, Tx: TransactionDigest + Clone, DS: DaSpec>(
+    txs: &[Tx],
+    blobs: &[Vec<u8>],
     current_spec: SpecId,
-) -> SoftConfirmationReceipt<DS> {
-    let tx_hashes = if current_spec >= SpecId::Kumquat {
-        soft_confirmation
-            .txs()
-            .iter()
+) -> Vec<[u8; 32]> {
+    if current_spec >= SpecId::Kumquat {
+        txs.iter()
             .map(|tx| tx.compute_digest::<<C as Spec>::Hasher>().into())
             .collect()
     } else {
-        soft_confirmation
-            .blobs()
+        blobs
             .iter()
             .map(|raw_tx| <C as Spec>::Hasher::digest(raw_tx).into())
             .collect()
-    };
+    }
+}
 
+pub fn soft_confirmation_to_receipt<C: Context, Tx: TransactionDigest + Clone, DS: DaSpec>(
+    soft_confirmation: L2Block<Tx>,
+    tx_hashes: Vec<[u8; 32]>,
+) -> SoftConfirmationReceipt<DS> {
     SoftConfirmationReceipt {
         l2_height: soft_confirmation.l2_height(),
         hash: soft_confirmation.hash(),
@@ -117,3 +123,13 @@ pub fn soft_confirmation_to_receipt<C: Context, Tx: TransactionDigest + Clone, D
         pub_key: soft_confirmation.pub_key().to_vec(),
     }
 }
+
+pub fn compute_tx_merkle_root(tx_hashes: &[[u8; 32]]) -> anyhow::Result<[u8; 32]> {
+    if tx_hashes.is_empty() {
+        return Ok([0u8; 32]);
+    }
+
+    MerkleTree::<Sha256>::from_leaves(tx_hashes)
+        .root()
+        .context("Couldn't compute merkle root")
+}

crates/fullnode/Cargo.toml

@@ -34,6 +34,7 @@ jsonrpsee = { workspace = true }
 metrics = { workspace = true }
 metrics-derive = { workspace = true }
 once_cell = { workspace = true, default-features = true }
+rocksdb = { workspace = true }
 rs_merkle = { workspace = true }
 tokio = { workspace = true }
 tokio-util = { workspace = true }

crates/fullnode/src/db_migrations/mod.rs

@@ -1,5 +1,6 @@
 use std::sync::OnceLock;
 
+use soft_confirmation_tx_merkle_root::MigrateSoftConfirmationTxMerkleRoot;
 use sov_db::ledger_db::migrations::LedgerMigration;
 
 use crate::db_migrations::batch_and_slot_by_number::MigrateBatchAndSlotByNumber;
@@ -9,6 +10,7 @@ use crate::db_migrations::verified_proofs::MigrateVerifiedProofsBySlotNumber;
 
 mod batch_and_slot_by_number;
 mod remove_unused_common_tables;
+mod soft_confirmation_tx_merkle_root;
 mod verified_batch_proof_encoding;
 mod verified_proofs;
 
@@ -21,6 +23,7 @@ pub fn migrations() -> &'static Vec<Box<dyn LedgerMigration + Send + Sync + 'sta
             Box::new(MigrateBatchAndSlotByNumber {}),
             Box::new(RemoveUnusedTables {}),
             Box::new(FixVerifiedBatchProofsEncoding {}),
+            Box::new(MigrateSoftConfirmationTxMerkleRoot),
         ]
     })
 }