Get rid of anyhow in receipt_from_proof

Cargo.toml

@@ -103,7 +103,7 @@ serde_json = { version = "1", default-features = false, features = ["alloc"] }
 sha2 = { version = "0.10.8", default-features = false, features = ["asm"] }
 schemars = { version = "0.8.16", features = ["derive"] }
 secp256k1 = { version = "0.29.0", default-features = false, features = ["global-context", "recovery"] }
-thiserror = "1.0.50"
+thiserror = { version = "1.0.50", default-features = false }
 tracing = { version = "0.1.41", default-features = false, features = ["attributes"] }
 tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json", "fmt"] }
 toml = "0.8.0"

crates/risc0/Cargo.toml

@@ -17,11 +17,12 @@ bincode = { workspace = true }
 borsh = { workspace = true }
 hex = { workspace = true }
 metrics = { workspace = true, optional = true }
-risc0-zkp = { workspace = true, optional = true }
+risc0-zkp = { workspace = true }
 risc0-zkvm = { workspace = true, default-features = false, features = ["std"] }
 serde = { workspace = true }
 sov-db = { path = "../sovereign-sdk/full-node/db/sov-db", optional = true }
 sov-rollup-interface = { path = "../sovereign-sdk/rollup-interface" }
+thiserror = { workspace = true }
 tracing = { workspace = true }
 
 [features]
@@ -32,7 +33,6 @@ native = [
   "dep:metrics",
   "risc0-zkvm/bonsai",
   "risc0-zkvm/client",
-  "risc0-zkp",
   "sov-rollup-interface/native",
 ]
 bench = ["native"]

crates/risc0/src/lib.rs

@@ -3,11 +3,12 @@
 //!
 //! This crate contains an adapter allowing the Risc0 to be used as a proof system for
 //! Sovereign SDK rollups.
-use anyhow::bail;
+use risc0_zkp::verify::VerificationError;
 pub use risc0_zkvm::sha::Digest;
-use risc0_zkvm::{InnerReceipt, Receipt};
+use risc0_zkvm::{InnerReceipt, PrunedValueError, Receipt};
 use serde::{Deserialize, Serialize};
 use sov_rollup_interface::zk::Matches;
+use thiserror::Error;
 
 pub mod guest;
 #[cfg(feature = "native")]
@@ -60,30 +61,44 @@ impl From<[u32; 8]> for Risc0MethodId {
     }
 }
 
+#[derive(Error, Debug)]
+enum RestoreReceiptErr {
+    #[error("Failed deserialize output")]
+    Deserialize(#[from] bincode::Error),
+    #[error("Failed to extract claim")]
+    ClaimError(#[source] VerificationError),
+    #[error("Claim is pruned")]
+    ClaimPruned(#[source] PrunedValueError),
+    #[error("Output is pruned")]
+    OutputPruned(#[source] PrunedValueError),
+    #[error("Output is empty")]
+    OutputEmpty,
+    #[error("Journal is pruned")]
+    JournalPruned(#[source] PrunedValueError),
+}
+
 /// Try to restore Receipt from InnerReceipt from attached journal
-fn receipt_from_inner(inner: InnerReceipt) -> anyhow::Result<Receipt> {
-    let mb_claim = inner.claim().or_else(|_| bail!("Claim is empty"))?;
-    let claim = mb_claim
-        .value()
-        .or_else(|_| bail!("Claim content is empty"))?;
+fn receipt_from_inner(inner: InnerReceipt) -> Result<Receipt, RestoreReceiptErr> {
+    let mb_claim = inner.claim().map_err(RestoreReceiptErr::ClaimError)?;
+    let claim = mb_claim.value().map_err(RestoreReceiptErr::ClaimPruned)?;
     let output = claim
         .output
         .value()
-        .or_else(|_| bail!("Output content is empty"))?;
+        .map_err(RestoreReceiptErr::OutputPruned)?;
     let Some(output) = output else {
-        bail!("Output body is empty");
+        return Err(RestoreReceiptErr::OutputEmpty)?;
     };
     let journal = output
         .journal
         .value()
-        .or_else(|_| bail!("Journal content is empty"))?;
+        .map_err(RestoreReceiptErr::JournalPruned)?;
     Ok(Receipt::new(inner, journal))
 }
 
 /// Parse Receipt from serialized proof (based on proof format)
 /// 1. Try to parse proof as InnerReceipt and restore Receipt from it
 /// 2. Otherwise try to parse proof as Receipt
-pub(crate) fn receipt_from_proof(serialized_proof: &[u8]) -> anyhow::Result<Receipt> {
+pub(crate) fn receipt_from_proof(serialized_proof: &[u8]) -> Result<Receipt, RestoreReceiptErr> {
     match bincode::deserialize::<InnerReceipt>(serialized_proof) {
         Ok(inner) => {
             // PostFork2 uses InnerReceipt