feat: preserve opaque SP1 proof payloads in interop

Cargo.toml

@@ -25,12 +25,7 @@ agglayer-tries = { path = "crates/agglayer-tries", version = "0.14.0" }
 unified-bridge = { path = "crates/unified-bridge", version = "0.14.0" }
 
 sp1-build = "=6.0.2"
-sp1-core-executor = "=6.0.2"
-sp1-core-machine = "=6.0.2"
-sp1-hypercube = "=6.0.2"
 sp1-sdk = "=6.0.2"
-sp1-primitives = "=6.0.2"
-sp1-prover = "=6.0.2"
 sp1-zkvm = { version = "=6.0.2", default-features = false }
 
 alloy = { version = "1.7.3", features = ["full"] }

crates/agglayer-interop-grpc-types/src/compat/v1/aggchain_data.rs

@@ -1,13 +1,4 @@
-use bincode::Options as _;
-
 use super::Error;
 
 mod types_to_v1;
 mod v1_to_types;
-
-#[inline]
-fn sp1v4_bincode_options() -> impl bincode::Options {
-    bincode::DefaultOptions::new()
-        .with_big_endian()
-        .with_fixint_encoding()
-}

crates/agglayer-interop-grpc-types/src/compat/v1/aggchain_data/types_to_v1.rs

@@ -3,12 +3,32 @@ use std::collections::HashMap;
 use agglayer_interop_types::aggchain_proof::{
     AggchainData, AggchainProof, MultisigPayload, Proof, SP1StarkWithContext,
 };
-use bincode::Options as _;
 use prost::bytes::Bytes;
 
-use super::{sp1v4_bincode_options, Error};
+use super::Error;
 use crate::v1::{self};
 
+fn serialize_public_values<T>(public_values: &T) -> Result<Bytes, Error>
+where
+    T: serde::Serialize + std::panic::RefUnwindSafe,
+{
+    Ok(Bytes::from(
+        std::panic::catch_unwind(|| bincode::serialize(public_values))
+            .map_err(|_| {
+                Error::serializing_aggchain_proof_public_values(Box::new(
+                    bincode::ErrorKind::Custom(String::from("panic")),
+                ))
+            })?
+            .map_err(Error::serializing_context)?,
+    ))
+}
+
+fn serialize_generic_public_values(
+    public_values: &Option<Box<agglayer_interop_types::aggchain_proof::AggchainProofPublicValues>>,
+) -> Result<Bytes, Error> {
+    serialize_public_values(public_values)
+}
+
 impl TryFrom<AggchainProof> for v1::AggchainProof {
     type Error = Error;
 
@@ -20,15 +40,7 @@ impl TryFrom<AggchainProof> for v1::AggchainProof {
             context: match value.public_values {
                 Some(public_values) => HashMap::from([(
                     "public_values".to_owned(),
-                    Bytes::from(
-                        std::panic::catch_unwind(|| bincode::serialize(&*public_values))
-                            .map_err(|_| {
-                                Error::serializing_aggchain_proof_public_values(Box::new(
-                                    bincode::ErrorKind::Custom(String::from("panic")),
-                                ))
-                            })?
-                            .map_err(Error::serializing_context)?,
-                    ),
+                    serialize_public_values(&public_values)?,
                 )]),
                 None => HashMap::new(),
             },
@@ -46,22 +58,8 @@ impl TryFrom<Proof> for v1::aggchain_proof::Proof {
                 vkey,
                 version,
             }) => Ok(v1::aggchain_proof::Proof::Sp1Stark(v1::Sp1StarkProof {
-                proof: std::panic::catch_unwind(|| sp1v4_bincode_options().serialize(&proof))
-                    .map_err(|_| {
-                        Error::serializing_proof(Box::new(bincode::ErrorKind::Custom(
-                            String::from("panic"),
-                        )))
-                    })?
-                    .map_err(Error::serializing_context)?
-                    .into(),
-                vkey: std::panic::catch_unwind(|| sp1v4_bincode_options().serialize(&vkey))
-                    .map_err(|_| {
-                        Error::serializing_vkey(Box::new(bincode::ErrorKind::Custom(String::from(
-                            "panic",
-                        ))))
-                    })?
-                    .map_err(Error::serializing_context)?
-                    .into(),
+                proof: proof.into(),
+                vkey: vkey.into(),
                 version,
             })),
         }
@@ -87,42 +85,16 @@ impl TryFrom<AggchainData> for v1::AggchainData {
                 } => v1::aggchain_data::Data::Generic(v1::AggchainProof {
                     context: HashMap::from([(
                         "public_values".to_owned(),
-                        Bytes::from(
-                            std::panic::catch_unwind(|| bincode::serialize(&public_values))
-                                .map_err(|_| {
-                                    Error::serializing_aggchain_proof_public_values(Box::new(
-                                        bincode::ErrorKind::Custom(String::from("panic")),
-                                    ))
-                                })?
-                                .map_err(Error::serializing_context)?,
-                        ),
+                        serialize_generic_public_values(&public_values)?,
                     )]),
                     aggchain_params: Some(aggchain_params.into()),
                     signature: signature.map(|signature| v1::FixedBytes65 {
                         value: Bytes::copy_from_slice(&signature.as_bytes()),
                     }),
                     proof: Some(v1::aggchain_proof::Proof::Sp1Stark(v1::Sp1StarkProof {
                         version: proof.version,
-                        proof: std::panic::catch_unwind(|| {
-                            sp1v4_bincode_options().serialize(&proof.proof)
-                        })
-                        .map_err(|_| {
-                            Error::serializing_proof(Box::new(bincode::ErrorKind::Custom(
-                                String::from("panic"),
-                            )))
-                        })?
-                        .map_err(Error::serializing_proof)?
-                        .into(),
-                        vkey: std::panic::catch_unwind(|| {
-                            sp1v4_bincode_options().serialize(&proof.vkey)
-                        })
-                        .map_err(|_| {
-                            Error::serializing_vkey(Box::new(bincode::ErrorKind::Custom(
-                                String::from("panic"),
-                            )))
-                        })?
-                        .map_err(Error::serializing_vkey)?
-                        .into(),
+                        proof: proof.proof.into(),
+                        vkey: proof.vkey.into(),
                     })),
                 }),
                 AggchainData::MultisigOnly { multisig } => {

crates/agglayer-interop-grpc-types/src/compat/v1/aggchain_data/v1_to_types.rs

@@ -1,14 +1,32 @@
 use agglayer_interop_types::aggchain_proof::{
     AggchainData, AggchainProof, MultisigPayload, Proof, SP1StarkWithContext,
 };
-use bincode::Options as _;
 
-use super::{sp1v4_bincode_options, Error};
+use super::Error;
 use crate::v1::{self};
 
 /// Maximum number of signers allowed in a multisig payload.
 const MAX_SIGNERS: usize = 1024;
 
+fn deserialize_public_values<T>(bytes: &[u8]) -> Result<T, Error>
+where
+    T: serde::de::DeserializeOwned,
+{
+    std::panic::catch_unwind(|| bincode::deserialize(bytes))
+        .map_err(|_| {
+            Error::deserializing_aggchain_proof_public_values(Box::new(bincode::ErrorKind::Custom(
+                String::from("panic"),
+            )))
+        })?
+        .map_err(Error::deserializing_aggchain_proof_public_values)
+}
+
+fn deserialize_generic_public_values(
+    bytes: &[u8],
+) -> Result<Option<Box<agglayer_interop_types::aggchain_proof::AggchainProofPublicValues>>, Error> {
+    deserialize_public_values(bytes)
+}
+
 impl TryFrom<v1::AggchainProof> for AggchainProof {
     type Error = Error;
 
@@ -19,16 +37,7 @@ impl TryFrom<v1::AggchainProof> for AggchainProof {
             public_values: value
                 .context
                 .get("public_values")
-                .map(|b| {
-                    std::panic::catch_unwind(|| bincode::deserialize(b))
-                        .map_err(|_| {
-                            Error::deserializing_aggchain_proof_public_values(Box::new(
-                                bincode::ErrorKind::Custom(String::from("panic")),
-                            ))
-                        })?
-                        .map_err(Error::deserializing_aggchain_proof_public_values)
-                        .map(Box::new)
-                })
+                .map(|b| deserialize_public_values(b).map(Box::new))
                 .transpose()?,
         })
     }
@@ -55,22 +64,8 @@ impl TryFrom<v1::Sp1StarkProof> for Proof {
         } = value;
 
         Ok(Proof::SP1Stark(SP1StarkWithContext {
-            proof: Box::new(
-                std::panic::catch_unwind(|| sp1v4_bincode_options().deserialize(&proof))
-                    .map_err(|_| {
-                        Error::deserializing_proof(Box::new(bincode::ErrorKind::Custom(
-                            String::from("panic"),
-                        )))
-                    })?
-                    .map_err(Error::deserializing_proof)?,
-            ),
-            vkey: std::panic::catch_unwind(|| sp1v4_bincode_options().deserialize(&vkey))
-                .map_err(|_| {
-                    Error::deserializing_vkey(Box::new(bincode::ErrorKind::Custom(String::from(
-                        "panic",
-                    ))))
-                })?
-                .map_err(Error::deserializing_vkey)?,
+            proof: proof.to_vec(),
+            vkey: vkey.to_vec(),
             version,
         }))
     }
@@ -98,11 +93,15 @@ impl TryFrom<v1::AggchainData> for AggchainData {
                     .transpose()?
                     .map(Box::new);
 
-                let AggchainProof {
-                    public_values,
-                    aggchain_params,
-                    proof,
-                } = aggchain_proof.try_into()?;
+                let public_values = aggchain_proof
+                    .context
+                    .get("public_values")
+                    .map(|b| deserialize_generic_public_values(b))
+                    .transpose()?
+                    .unwrap_or(None);
+
+                let proof = required_field!(aggchain_proof, proof);
+                let aggchain_params = required_field!(aggchain_proof, aggchain_params);
 
                 AggchainData::Generic {
                     public_values,

crates/agglayer-interop-grpc-types/src/compat/v1/snapshots/agglayer_interop_grpc_types__compat__v1__tests__bad_data__debug.snap

@@ -5,4 +5,4 @@ expression: "format!(\"{:?}\", eyre::Error::from(error))"
 invalid value
 
 Location:
-    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:25:25
+    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:30:25

crates/agglayer-interop-grpc-types/src/compat/v1/snapshots/agglayer_interop_grpc_types__compat__v1__tests__bad_data_in_field__debug.snap

@@ -5,4 +5,4 @@ expression: "format!(\"{:?}\", eyre::Error::from(error))"
 value: invalid value
 
 Location:
-    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:25:25
+    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:30:25

crates/agglayer-interop-grpc-types/src/compat/v1/snapshots/agglayer_interop_grpc_types__compat__v1__tests__bad_data_in_nested__debug.snap

@@ -5,4 +5,4 @@ expression: "format!(\"{:?}\", eyre::Error::from(error))"
 data.value: invalid value
 
 Location:
-    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:25:25
+    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:30:25

crates/agglayer-interop-grpc-types/src/compat/v1/snapshots/agglayer_interop_grpc_types__compat__v1__tests__bad_sig__debug.snap

@@ -8,4 +8,4 @@ Caused by:
     invalid parity: 5
 
 Location:
-    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:25:25
+    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:30:25

crates/agglayer-interop-grpc-types/src/compat/v1/snapshots/agglayer_interop_grpc_types__compat__v1__tests__bad_sig_in_nested__debug.snap

@@ -8,4 +8,4 @@ Caused by:
     invalid parity: 5
 
 Location:
-    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:25:25
+    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:30:25

crates/agglayer-interop-grpc-types/src/compat/v1/snapshots/agglayer_interop_grpc_types__compat__v1__tests__failed_deser__debug.snap

@@ -8,4 +8,4 @@ Caused by:
     failed
 
 Location:
-    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:25:25
+    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:30:25

crates/agglayer-interop-grpc-types/src/compat/v1/snapshots/agglayer_interop_grpc_types__compat__v1__tests__failed_ser__debug.snap

@@ -8,4 +8,4 @@ Caused by:
     failed
 
 Location:
-    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:25:25
+    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:30:25

crates/agglayer-interop-grpc-types/src/compat/v1/snapshots/agglayer_interop_grpc_types__compat__v1__tests__no_proof__debug.snap

@@ -5,4 +5,4 @@ expression: "format!(\"{:?}\", eyre::Error::from(error))"
 proof: required field is missing
 
 Location:
-    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:25:25
+    crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs:30:25