harald/teepot
1
0
Fork 0
mirror of https://github.com/matter-labs/teepot.git synced 2025-07-22 15:34:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #225 from matter-labs/handle_old_proof_response

Browse source 
fix(proof-validation): handle optional proof status
This commit is contained in:
Patrick 2024-11-28 17:45:21 +01:00 • committed by GitHub
commit e4629aee55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bin/verify-era-proof-attestation/src/main.rs
View file

@ -159,7 +159,10 @@ async fn verify_batch_proofs(
total_proofs_count += 1; total_proofs_count += 1;
let tee_type = proof.tee_type.to_uppercase(); let tee_type = proof.tee_type.to_uppercase();
if proof.status.eq_ignore_ascii_case("permanently_ignored") { if proof
.status
.map_or(false, |s| s.eq_ignore_ascii_case("permanently_ignored"))
{
trace!( trace!(
batch_no, batch_no,
tee_type, tee_type,

7
bin/verify-era-proof-attestation/src/proof.rs
View file

@ -39,8 +39,9 @@ pub async fn get_proofs(
if !proofs.is_empty() if !proofs.is_empty()
&& proofs.iter().all(|proof| { && proofs.iter().all(|proof| {
!proof.status.eq_ignore_ascii_case("failed") !proof.status.as_ref().map_or(false, |s| {
&& !proof.status.eq_ignore_ascii_case("picked_by_prover") s.eq_ignore_ascii_case("failed") | s.eq_ignore_ascii_case("picked_by_prover")
})
}) })
{ {
return Ok(proofs); return Ok(proofs);
@ -165,7 +166,7 @@ pub struct Proof {
#[serde_as(as = "Option<Hex>")] #[serde_as(as = "Option<Hex>")]
pub proof: Option<Vec<u8>>, pub proof: Option<Vec<u8>>,
pub proved_at: String, pub proved_at: String,
pub status: String, pub status: Option<String>,
#[serde_as(as = "Option<Hex>")] #[serde_as(as = "Option<Hex>")]
pub attestation: Option<Vec<u8>>, pub attestation: Option<Vec<u8>>,
} }