From e63d0901fad5c622cc04191d9b0cb1d516f7caff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20B=C4=99za?= <patryk.beza@gmail.com>
Date: Tue, 26 Nov 2024 16:16:40 +0100
Subject: [PATCH] feat(verifier): don't retry verifying permanently ignored
 batches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, the [TEE verifier][1] – the tool for continuous SGX
attestation and batch signature verification – is [stuck][2] on batches
that failed to be proven and are marked as `permanently_ignored`. The
tool should be able to distinguish between batches that are permanently
ignored (and should be skipped) and batches that have failed but will be
retried. This PR enables that distinction.

This commit goes hand in hand with the following PR:
https://github.com/matter-labs/zksync-era/pull/3321

[1]: https://github.com/matter-labs/teepot/blob/main/bin/verify-era-proof-attestation/src/main.rs
[2]: https://grafana.matterlabs.dev/goto/unFqf57Hg?orgId=1
---
 bin/verify-era-proof-attestation/src/main.rs  | 19 +++++++++------
 bin/verify-era-proof-attestation/src/proof.rs | 24 ++++++++++++-------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/bin/verify-era-proof-attestation/src/main.rs b/bin/verify-era-proof-attestation/src/main.rs
index affdc0a..9ee0b1b 100644
--- a/bin/verify-era-proof-attestation/src/main.rs
+++ b/bin/verify-era-proof-attestation/src/main.rs
@@ -155,19 +155,24 @@ async fn verify_batch_proofs(
         total_proofs_count += 1;
         let tee_type = proof.tee_type.to_uppercase();
 
+        if proof.status.eq_ignore_ascii_case("permanently_ignored") {
+            trace!(
+                batch_no,
+                tee_type,
+                "Proof is marked as permanently ignored. Skipping."
+            );
+            continue;
+        }
         trace!(batch_no, tee_type, proof.proved_at, "Verifying proof.");
 
-        debug!(
-            batch_no,
-            "Verifying quote ({} bytes)...",
-            proof.attestation.len()
-        );
-        let quote_verification_result = verify_attestation_quote(&proof.attestation)?;
+        let attestation = proof.attestation.unwrap_or_default();
+        debug!(batch_no, "Verifying quote ({} bytes)...", attestation.len());
+        let quote_verification_result = verify_attestation_quote(&attestation)?;
         let verified_successfully = verify_batch_proof(
             &quote_verification_result,
             attestation_policy,
             node_client,
-            &proof.signature,
+            &proof.signature.unwrap_or_default(),
             L1BatchNumber(proof.l1_batch_number),
         )
         .await?;
diff --git a/bin/verify-era-proof-attestation/src/proof.rs b/bin/verify-era-proof-attestation/src/proof.rs
index 3cd0ec1..9da43ea 100644
--- a/bin/verify-era-proof-attestation/src/proof.rs
+++ b/bin/verify-era-proof-attestation/src/proof.rs
@@ -37,7 +37,12 @@ pub async fn get_proofs(
             .send(stop_receiver, http_client, rpc_url)
             .await?;
 
-        if !proofs.is_empty() {
+        if !proofs.is_empty()
+            && proofs.iter().all(|proof| {
+                !proof.status.eq_ignore_ascii_case("failed")
+                    && !proof.status.eq_ignore_ascii_case("picked_by_prover")
+            })
+        {
             return Ok(proofs);
         }
 
@@ -153,13 +158,14 @@ pub struct GetProofsResponse {
 pub struct Proof {
     pub l1_batch_number: u32,
     pub tee_type: String,
-    #[serde_as(as = "Hex")]
-    pub pubkey: Vec<u8>,
-    #[serde_as(as = "Hex")]
-    pub signature: Vec<u8>,
-    #[serde_as(as = "Hex")]
-    pub proof: Vec<u8>,
+    #[serde_as(as = "Option<Hex>")]
+    pub pubkey: Option<Vec<u8>>,
+    #[serde_as(as = "Option<Hex>")]
+    pub signature: Option<Vec<u8>>,
+    #[serde_as(as = "Option<Hex>")]
+    pub proof: Option<Vec<u8>>,
     pub proved_at: String,
-    #[serde_as(as = "Hex")]
-    pub attestation: Vec<u8>,
+    pub status: String,
+    #[serde_as(as = "Option<Hex>")]
+    pub attestation: Option<Vec<u8>>,
 }