Sdk::verify_evm_proof fallible

crates/cli/src/commands/verify.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use clap::Parser;
-use eyre::{eyre, Result};
+use eyre::Result;
 use openvm_sdk::{
     fs::{
         read_app_proof_from_file, read_app_vk_from_file, read_evm_proof_from_file,
@@ -49,9 +49,7 @@ impl VerifyCmd {
                     eyre::eyre!("Failed to read EVM verifier: {}\nPlease run 'cargo openvm evm-proving-setup' first", e)
                 })?;
                 let evm_proof = read_evm_proof_from_file(proof)?;
-                if !Sdk.verify_evm_proof(&evm_verifier, &evm_proof) {
-                    return Err(eyre!("EVM proof verification failed"));
-                }
+                Sdk.verify_evm_proof(&evm_verifier, &evm_proof)?;
             }
         }
         Ok(())

crates/sdk/examples/sdk_evm.rs

@@ -109,8 +109,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     )?;
 
     // 11. Verify the EVM proof
-    let success = sdk.verify_evm_proof(&verifier, &proof);
-    assert!(success);
+    sdk.verify_evm_proof(&verifier, &proof)?;
     // ANCHOR_END: evm_verification
 
     Ok(())

crates/sdk/src/lib.rs

@@ -1,6 +1,6 @@
 extern crate core;
 
-use std::{fs::read, panic::catch_unwind, path::Path, sync::Arc};
+use std::{fs::read, path::Path, sync::Arc};
 
 use commit::commit_app_exe;
 use config::AppConfig;
@@ -228,11 +228,13 @@ impl Sdk {
         Ok(evm_verifier)
     }
 
-    pub fn verify_evm_proof(&self, evm_verifier: &EvmVerifier, evm_proof: &EvmProof) -> bool {
-        // FIXME: we should return the concrete error.
-        catch_unwind(|| {
-            Halo2WrapperProvingKey::evm_verify(evm_verifier, evm_proof);
-        })
-        .is_ok()
+    pub fn verify_evm_proof(
+        &self,
+        evm_verifier: &EvmVerifier,
+        evm_proof: &EvmProof,
+    ) -> Result<u64> {
+        let gas_cost = Halo2WrapperProvingKey::evm_verify(evm_verifier, evm_proof)
+            .map_err(|reason| eyre::eyre!("Sdk::verify_evm_proof: {reason:?}"))?;
+        Ok(gas_cost)
     }
 }

crates/sdk/tests/integration_test.rs

@@ -353,7 +353,7 @@ fn test_static_verifier_custom_pv_handler() {
             StdIn::default(),
         )
         .unwrap();
-    assert!(Sdk.verify_evm_proof(&evm_verifier, &evm_proof));
+    assert!(Sdk.verify_evm_proof(&evm_verifier, &evm_proof).is_ok());
 }
 
 #[test]
@@ -382,7 +382,7 @@ fn test_e2e_proof_generation_and_verification() {
             StdIn::default(),
         )
         .unwrap();
-    assert!(Sdk.verify_evm_proof(&evm_verifier, &evm_proof));
+    assert!(Sdk.verify_evm_proof(&evm_verifier, &evm_proof).is_ok());
 }
 
 #[test]

extensions/native/recursion/src/halo2/wrapper.rs

@@ -78,13 +78,12 @@ impl Halo2WrapperProvingKey {
         }
     }
     /// A helper function for testing to verify the proof of this circuit with evm verifier.
-    // FIXME: the signature is not ideal. It should return an Error instead of panicking when the verification fails.
-    pub fn evm_verify(evm_verifier: &EvmVerifier, evm_proof: &EvmProof) {
+    pub fn evm_verify(evm_verifier: &EvmVerifier, evm_proof: &EvmProof) -> Result<u64, String> {
         evm_verify(
             evm_verifier.0.clone(),
             evm_proof.instances.clone(),
             evm_proof.proof.clone(),
-        );
+        )
     }
     /// Return deployment code for EVM verifier which can verify the snark of this circuit.
     pub fn generate_evm_verifier(&self, params: &Halo2Params) -> EvmVerifier {