Use verifier in citrea-stf (#860)

crates/citrea-stf/src/lib.rs

@@ -5,9 +5,10 @@
 pub mod genesis_config;
 mod hooks_impl;
 pub mod runtime;
+mod verifier;
 use sov_modules_stf_blueprint::StfBlueprint;
 use sov_rollup_interface::da::DaVerifier;
-use sov_stf_runner::verifier::StateTransitionVerifier;
+use verifier::StateTransitionVerifier;
 
 /// Alias for StateTransitionVerifier.
 pub type StfVerifier<DA, Vm, ZkContext, RT> =

crates/citrea-stf/src/verifier.rs

@@ -0,0 +1,96 @@
+use std::marker::PhantomData;
+
+use sov_rollup_interface::da::{BlockHeaderTrait, DaVerifier};
+use sov_rollup_interface::stf::StateTransitionFunction;
+use sov_rollup_interface::zk::{StateTransition, StateTransitionData, Zkvm, ZkvmGuest};
+
+/// Verifies a state transition
+pub struct StateTransitionVerifier<ST, Da, Zk>
+where
+    Da: DaVerifier,
+    Zk: Zkvm,
+    ST: StateTransitionFunction<Zk, Da::Spec>,
+{
+    app: ST,
+    da_verifier: Da,
+    phantom: PhantomData<Zk>,
+}
+
+impl<Stf, Da, Zk> StateTransitionVerifier<Stf, Da, Zk>
+where
+    Da: DaVerifier,
+    Zk: ZkvmGuest,
+    Stf: StateTransitionFunction<Zk, Da::Spec>,
+{
+    /// Create a [`StateTransitionVerifier`]
+    pub fn new(app: Stf, da_verifier: Da) -> Self {
+        Self {
+            app,
+            da_verifier,
+            phantom: Default::default(),
+        }
+    }
+
+    /// Verify the next block
+    pub fn run_sequencer_commitments_in_da_slot(
+        &self,
+        zkvm: Zk,
+        pre_state: Stf::PreState,
+    ) -> Result<(), Da::Error> {
+        println!("Running sequencer commitments in DA slot");
+        let data: StateTransitionData<Stf::StateRoot, _, Da::Spec> = zkvm.read_from_host();
+        let validity_condition = self.da_verifier.verify_relevant_tx_list(
+            &data.da_block_header_of_commitments,
+            &data.da_data,
+            data.inclusion_proof,
+            data.completeness_proof,
+        )?;
+
+        assert_eq!(
+            data.initial_state_root.as_ref(),
+            data.soft_confirmations
+                .front()
+                .expect("At least one set of soft confirmations")
+                .first()
+                .expect("At least one soft confirmation")
+                .pre_state_root()
+                .as_slice(),
+            "Invalid initial state root"
+        );
+
+        println!("going into apply_soft_confirmations_from_sequencer_commitments");
+        let (final_state_root, state_diff) = self
+            .app
+            .apply_soft_confirmations_from_sequencer_commitments(
+                data.sequencer_public_key.as_ref(),
+                data.sequencer_da_public_key.as_ref(),
+                &data.initial_state_root,
+                pre_state,
+                data.da_data,
+                data.state_transition_witnesses,
+                data.da_block_headers_of_soft_confirmations,
+                &validity_condition,
+                data.soft_confirmations,
+            );
+
+        println!("out of apply_soft_confirmations_from_sequencer_commitments");
+        assert_eq!(
+            final_state_root.as_ref(),
+            data.final_state_root.as_ref(),
+            "Invalid final state root"
+        );
+
+        let out: StateTransition<Da::Spec, _> = StateTransition {
+            initial_state_root: data.initial_state_root,
+            final_state_root,
+            validity_condition, // TODO: not sure about what to do with this yet
+            state_diff,
+            da_slot_hash: data.da_block_header_of_commitments.hash(),
+            sequencer_public_key: data.sequencer_public_key,
+            sequencer_da_public_key: data.sequencer_da_public_key,
+        };
+
+        zkvm.commit(&out);
+        Ok(())
+    }
+}