feat(l2): prove deposits

crates/l2/contracts/src/l1/OnChainProposer.sol

@@ -197,7 +197,7 @@ contract OnChainProposer is IOnChainProposer, ReentrancyGuard {
         //risc0
         bytes calldata risc0BlockProof,
         bytes32 risc0ImageId,
-        bytes32 risc0JournalDigest,
+        bytes calldata risc0Journal,
         //sp1
         bytes32 sp1ProgramVKey,
         bytes calldata sp1PublicValues,
@@ -219,7 +219,16 @@ contract OnChainProposer is IOnChainProposer, ReentrancyGuard {
             "OnChainProposer: block not committed"
         );
 
+        // TODO: unify public inputs in single parameter
+
         if (PICOVERIFIER != DEV_MODE) {
+            bytes32 picoDepositsLogHash = bytes32(picoPublicValues[64:96]);
+            require(
+                blockCommitments[blockNumber].depositLogs ==
+                    picoDepositsLogHash,
+                "OnChainProposer: wrong deposits log hash for pico public inputs"
+            );
+
             // If the verification fails, it will revert.
             IPicoVerifier(PICOVERIFIER).verifyPicoProof(
                 picoRiscvVkey,
@@ -229,15 +238,26 @@ contract OnChainProposer is IOnChainProposer, ReentrancyGuard {
         }
 
         if (R0VERIFIER != DEV_MODE) {
+            bytes32 risc0DepositsLogHash = bytes32(risc0Journal[64:96]);
+            require(
+                blockCommitments[blockNumber].depositLogs ==
+                    risc0DepositsLogHash,
+                "OnChainProposer: wrong deposits log hash for risc0 public inputs"
+            );
             // If the verification fails, it will revert.
             IRiscZeroVerifier(R0VERIFIER).verify(
                 risc0BlockProof,
                 risc0ImageId,
-                risc0JournalDigest
+                sha256(risc0Journal)
             );
         }
 
         if (SP1VERIFIER != DEV_MODE) {
+            bytes32 sp1DepositsLogHash = bytes32(sp1PublicValues[64:96]);
+            require(
+                blockCommitments[blockNumber].depositLogs == sp1DepositsLogHash,
+                "OnChainProposer: wrong deposits log hash for sp1 public inputs"
+            );
             // If the verification fails, it will revert.
             ISP1Verifier(SP1VERIFIER).verifyProof(
                 sp1ProgramVKey,

crates/l2/contracts/src/l1/interfaces/IOnChainProposer.sol

@@ -65,7 +65,7 @@ interface IOnChainProposer {
     /// ----------------------------------------------------------------------
     /// @param risc0BlockProof is the proof of the block to be verified.
     /// @param risc0ImageId Digest of the zkVM imageid.
-    /// @param risc0JournalDigest Digest of the public_inputs aka journal
+    /// @param risc0Journal public_inputs aka journal
     /// ----------------------------------------------------------------------
     /// @param sp1ProgramVKey Public verifying key
     /// @param sp1PublicValues Values used to perform the execution
@@ -81,7 +81,7 @@ interface IOnChainProposer {
         //risc0
         bytes calldata risc0BlockProof,
         bytes32 risc0ImageId,
-        bytes32 risc0JournalDigest,
+        bytes calldata risc0Journal,
         //sp1
         bytes32 sp1ProgramVKey,
         bytes calldata sp1PublicValues,

crates/l2/prover/src/backends/risc0.rs

@@ -46,7 +46,7 @@ pub fn verify(receipt: &Receipt) -> Result<(), Box<dyn std::error::Error>> {
 pub fn to_calldata(receipt: Receipt) -> Result<ProofCalldata, Box<dyn std::error::Error>> {
     let seal = encode_seal(&receipt)?;
     let image_id = ZKVM_RISC0_PROGRAM_ID;
-    let journal_digest = receipt.journal.digest().as_bytes().to_vec();
+    let journal = receipt.journal.bytes;
 
     // convert image_id into bytes
     let image_id = {
@@ -59,11 +59,11 @@ pub fn to_calldata(receipt: Receipt) -> Result<ProofCalldata, Box<dyn std::error
 
     // bytes calldata seal,
     // bytes32 imageId,
-    // bytes32 journalDigest
+    // bytes journal
     let calldata = vec![
         Value::Bytes(seal.into()),
         Value::FixedBytes(image_id.into()),
-        Value::FixedBytes(journal_digest.into()),
+        Value::Bytes(journal.into()),
     ];
 
     Ok(ProofCalldata {

crates/l2/prover/zkvm/interface/Cargo.toml

@@ -14,6 +14,10 @@ ethrex-vm = { path = "../../../../vm", default-features = false }
 ethrex-rlp = { path = "../../../../common/rlp", default-features = false }
 ethrex-storage = { path = "../../../../storage", default-features = false }
 ethrex-trie = { path = "../../../../common/trie", default-features = false }
+keccak-hash = "0.11.0"
+
+# Temporarily pin version because 0.11.1 breaks compilation
+# alloy-rpc-types-engine = "=0.11.0"
 
 # Temporarily pin version because 0.11.1 breaks compilation
 # alloy-rpc-types-engine = "=0.11.0"

crates/l2/prover/zkvm/interface/pico/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2024"
 [dependencies]
 pico-sdk = { git = "https://github.com/brevis-network/pico" }
 zkvm_interface = { path = "../" }
-
+cfg-if = "1.0.0"
 ethrex-common = { path = "../../../../../common", default-features = false }
 ethrex-rlp = { path = "../../../../../common/rlp" }
 ethrex-vm = { path = "../../../../../vm", default-features = false }

crates/l2/prover/zkvm/interface/pico/src/main.rs

@@ -3,7 +3,7 @@
 use pico_sdk::io::{commit, read_as};
 
 use ethrex_blockchain::{validate_block, validate_gas_used};
-use ethrex_vm::backends::revm::{REVM, db::EvmState};
+use ethrex_vm::backends::revm::{db::EvmState, REVM};
 use zkvm_interface::{
     io::{ProgramInput, ProgramOutput},
     trie::{update_tries, verify_db},
@@ -61,8 +61,26 @@ pub fn main() {
         panic!("invalid final state trie");
     }
 
-    commit(&ProgramOutput {
-        initial_state_hash,
-        final_state_hash,
-    });
+    cfg_if::cfg_if! {
+        if #[cfg(feature = "l2")] {
+            let deposits = get_block_deposits(&block);
+            let deposit_logs_hash = get_deposit_hash(
+                deposits
+                    .iter()
+                    .filter_map(|tx| tx.get_deposit_hash())
+                    .collect(),
+            ).expect("failed to calculate deposit logs hash");
+
+            commit(&ProgramOutput {
+                initial_state_hash,
+                final_state_hash,
+                deposit_logs_hash
+            });
+        } else {
+            commit(&ProgramOutput {
+                initial_state_hash,
+                final_state_hash,
+            });
+        }
+    }
 }

crates/l2/prover/zkvm/interface/risc0/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2021"
 [dependencies]
 risc0-zkvm = { version = "1.2.2", default-features = false, features = ["std"] }
 zkvm_interface = { path = "../" }
+cfg-if = "1.0.0"
 
 ethrex-common = { path = "../../../../../common", default-features = false }
 ethrex-rlp = { path = "../../../../../common/rlp" }

crates/l2/prover/zkvm/interface/risc0/src/main.rs

@@ -1,13 +1,16 @@
 use risc0_zkvm::guest::env;
 
 use ethrex_blockchain::{validate_block, validate_gas_used};
-use ethrex_vm::{backends::revm::db::EvmState, backends::revm::REVM};
+use ethrex_vm::{backends::revm::REVM, backends::revm::db::EvmState};
 
 use zkvm_interface::{
     io::{ProgramInput, ProgramOutput},
     trie::{update_tries, verify_db},
 };
 
+#[cfg(feature = "l2")]
+use zkvm_interface::deposits::{get_block_deposits, get_deposit_hash};
+
 fn main() {
     let ProgramInput {
         block,
@@ -58,8 +61,26 @@ fn main() {
         panic!("invalid final state trie");
     }
 
-    env::commit(&ProgramOutput {
-        initial_state_hash,
-        final_state_hash,
-    });
+    cfg_if::cfg_if! {
+        if #[cfg(feature = "l2")] {
+            let deposits = get_block_deposits(&block);
+            let deposit_logs_hash = get_deposit_hash(
+                deposits
+                    .iter()
+                    .filter_map(|tx| tx.get_deposit_hash())
+                    .collect(),
+            ).expect("failed to calculate deposit logs hash");
+
+            env::commit(&ProgramOutput {
+                initial_state_hash,
+                final_state_hash,
+                deposit_logs_hash
+            });
+        } else {
+            env::commit(&ProgramOutput {
+                initial_state_hash,
+                final_state_hash,
+            });
+        }
+    }
 }