fix(eth-proof-manager): don't fail component if proof was incorrect (#4444)

## What ❔

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- The `Why` has to be clear to non-Matter Labs entities running their
own ZK Chain -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Is this a breaking change?
- [ ] Yes
- [ ] No

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zkstack dev fmt` and `zkstack dev
lint`.

Author: Artemka374

core/node/eth_proof_manager/src/lib.rs

@@ -51,11 +51,11 @@ impl EthProofManager {
 
     pub async fn run(&self, stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
         tokio::select! {
-            _ = self.watcher.run(stop_receiver.clone()) => {
-                tracing::info!("Watcher stopped");
+            result = self.watcher.run(stop_receiver.clone()) => {
+                tracing::info!("Watcher stopped: {:?}", result);
             },
-            _ = self.sender.run(stop_receiver) => {
-                tracing::info!("Sender stopped");
+            result = self.sender.run(stop_receiver) => {
+                tracing::info!("Sender stopped: {:?}", result);
             },
         }
         Ok(())

core/node/eth_proof_manager/src/sender/mod.rs

@@ -64,11 +64,11 @@ impl EthProofSender {
         );
 
         tokio::select! {
-            _ = proof_request_submitter.run(stop_receiver.clone()) => {
-                tracing::error!("Proof request submitter stopped");
+            result = proof_request_submitter.run(stop_receiver.clone()) => {
+                tracing::error!("Proof request submitter stopped: {:?}", result);
             }
-            _ = proof_validation_submitter.run(stop_receiver) => {
-                tracing::error!("Proof validation result submitter stopped");
+            result = proof_validation_submitter.run(stop_receiver) => {
+                tracing::error!("Proof validation result submitter stopped: {:?}", result);
             }
         }
 

core/node/eth_proof_manager/src/watcher/events/proof_request_proven.rs

@@ -116,9 +116,6 @@ impl EventHandler for ProofRequestProvenHandler {
             event.assigned_to,
         );
 
-        let proof = <L1BatchProofForL1 as StoredObject>::deserialize(proof)
-            .map_err(|e| anyhow::anyhow!("Failed to deserialize proof: {}", e))?;
-
         let batch_number = L1BatchNumber(event.block_number.as_u32());
 
         let verification_result = match verify_proof(
@@ -129,38 +126,35 @@ impl EventHandler for ProofRequestProvenHandler {
         )
         .await
         {
-            Ok(_) => {
+            Ok(proof) => {
                 tracing::info!("Proof for batch {} verified successfully", batch_number);
+
+                let proof_blob_url = self
+                    .blob_store
+                    .put(
+                        L1BatchProofForL1Key::Core((batch_number, proof.protocol_version())),
+                        &proof,
+                    )
+                    .await?;
+
+                self.connection_pool
+                    .connection()
+                    .await?
+                    .proof_generation_dal()
+                    .save_proof_artifacts_metadata(batch_number, &proof_blob_url)
+                    .await?;
+
+                METRICS.validated_batches[&ValidationResult::Success].inc();
+                METRICS.proven_batches[&event.assigned_to].inc();
                 true
             }
             Err(e) => {
                 tracing::error!("Failed to verify proof for batch {}: {}", batch_number, e);
+                METRICS.validated_batches[&ValidationResult::Failed].inc();
                 false
             }
         };
 
-        if verification_result {
-            let proof_blob_url = self
-                .blob_store
-                .put(
-                    L1BatchProofForL1Key::Core((batch_number, proof.protocol_version())),
-                    &proof,
-                )
-                .await?;
-
-            self.connection_pool
-                .connection()
-                .await?
-                .proof_generation_dal()
-                .save_proof_artifacts_metadata(batch_number, &proof_blob_url)
-                .await?;
-
-            METRICS.validated_batches[&ValidationResult::Success].inc();
-            METRICS.proven_batches[&event.assigned_to].inc();
-        } else {
-            METRICS.validated_batches[&ValidationResult::Failed].inc();
-        }
-
         tracing::info!(
             "Batch {}, chain_id: {}, assigned_to: {:?}, verification_result: {:?}",
             batch_number,
@@ -183,9 +177,12 @@ impl EventHandler for ProofRequestProvenHandler {
 async fn verify_proof(
     connection_pool: ConnectionPool<Core>,
     batch_number: L1BatchNumber,
-    proof: L1BatchProofForL1,
+    proof_bytes: Vec<u8>,
     verification_key: FflonkFinalVerificationKey,
-) -> anyhow::Result<()> {
+) -> anyhow::Result<L1BatchProofForL1> {
+    let proof = <L1BatchProofForL1 as StoredObject>::deserialize(proof_bytes)
+        .map_err(|e| anyhow::anyhow!("Failed to deserialize proof: {}", e))?;
+
     let verification_result = match proof.inner() {
         TypedL1BatchProofForL1::Fflonk(proof) => {
             let proof = proof.scheduler_proof;
@@ -281,5 +278,5 @@ async fn verify_proof(
         ));
     }
 
-    Ok(())
+    Ok(proof)
 }