Merge branch 'main' into crane

matter-labs · Sep 18, 2024 · b7f4828 · b7f4828
2 parents 21a9ecd + 7c61f81
commit b7f4828
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -29,8 +29,6 @@ jobs:
           endpoint: https://attic.teepot.org/
           cache: tee-pot
           token: ${{ secrets.ATTIC_TOKEN }}
-      - name: Enable magic Nix cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
 
       - run: nix flake check -L --show-trace --keep-going
 
@@ -52,8 +50,6 @@ jobs:
           endpoint: https://attic.teepot.org/
           cache: tee-pot
           token: ${{ secrets.ATTIC_TOKEN }}
-      - name: Enable magic Nix cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: nix build
         run: nix run github:nixos/nixpkgs/nixos-23.11#nixci
@@ -92,8 +88,6 @@ jobs:
           endpoint: https://attic.teepot.org/
           cache: tee-pot
           token: ${{ secrets.ATTIC_TOKEN }}
-      - name: Enable magic Nix cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/verify-era-proof-attestation/Cargo.toml b/bin/verify-era-proof-attestation/Cargo.toml
@@ -16,6 +16,7 @@ jsonrpsee-types.workspace = true
 reqwest.workspace = true
 secp256k1.workspace = true
 serde.workspace = true
+serde_with = { workspace = true, features = ["hex"] }
 teepot.workspace = true
 tokio.workspace = true
 tracing.workspace = true

diff --git a/bin/verify-era-proof-attestation/src/proof.rs b/bin/verify-era-proof-attestation/src/proof.rs
@@ -5,6 +5,7 @@ use anyhow::{bail, Result};
 use jsonrpsee_types::error::ErrorObject;
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
+use serde_with::{hex::Hex, serde_as};
 use std::time::Duration;
 use tokio::sync::watch;
 use tracing::{error, warn};
@@ -146,14 +147,19 @@ pub struct GetProofsResponse {
     pub error: Option<ErrorObject<'static>>,
 }
 
+#[serde_as]
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 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>,
     pub proved_at: String,
+    #[serde_as(as = "Hex")]
     pub attestation: Vec<u8>,
 }