fix(raiko): fix r0 aggregation proof format

provers/risc0/driver/src/lib.rs

@@ -180,13 +180,18 @@ impl Prover for Risc0Prover {
             "Generate aggregatino receipt journal: {:?}",
             receipt.journal
         );
+        let block_proof_image_id = compute_image_id(RISC0_GUEST_ELF).unwrap();
         let aggregation_image_id = compute_image_id(RISC0_AGGREGATION_ELF).unwrap();
-        let enc_proof =
-            snarks::verify_groth16_snark_from_receipt(aggregation_image_id, receipt.clone())
-                .await
-                .map_err(|err| format!("Failed to verify SNARK: {err:?}"))?;
-        let snark_proof = format!("0x{}", hex::encode(enc_proof));
+        let proof_data = snarks::verify_aggregation_groth16_proof(
+            block_proof_image_id,
+            aggregation_image_id,
+            receipt.clone(),
+        )
+        .await
+        .map_err(|err| format!("Failed to verify SNARK: {err:?}"))?;
+        let snark_proof = alloy_primitives::hex::encode_prefixed(proof_data);
 
+        info!("Aggregation proof: {:?}", snark_proof);
         let proof_gen_result = Ok(Risc0Response {
             proof: snark_proof,
             receipt: serde_json::to_string(&receipt).unwrap(),

provers/risc0/driver/src/methods/risc0_aggregation.rs

@@ -1,5 +1,5 @@
 pub const RISC0_AGGREGATION_ELF: &[u8] =
     include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation");
 pub const RISC0_AGGREGATION_ID: [u32; 8] = [
-    440526723, 3767976668, 67051936, 881100330, 2605787818, 1152192925, 943988177, 1141581874,
+    3593026424, 359928015, 3488866833, 2676323972, 1129344711, 55769507, 233041442, 3293280986,
 ];

provers/risc0/driver/src/methods/risc0_guest.rs

@@ -1,5 +1,5 @@
 pub const RISC0_GUEST_ELF: &[u8] =
     include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-guest");
 pub const RISC0_GUEST_ID: [u32; 8] = [
-    2426111784, 2252773481, 4093155148, 2853313326, 836865213, 1159934005, 790932950, 229907112,
+    2522428380, 1790994278, 397707036, 244564411, 3780865207, 1282154214, 1673205005, 3172292887,
 ];

provers/risc0/driver/src/snarks.rs

@@ -157,17 +157,43 @@ pub async fn verify_groth16_from_snark_receipt(
     let seal = encode(snark_receipt.snark.to_vec())?;
     let journal_digest = snark_receipt.journal.digest();
     let post_state_digest = snark_receipt.post_state_digest.digest();
-    verify_groth16_snark_impl(image_id, seal, journal_digest, post_state_digest).await
+    let encoded_proof =
+        verify_groth16_snark_impl(image_id, seal, journal_digest, post_state_digest).await?;
+    let proof = (encoded_proof, B256::from_slice(image_id.as_bytes()))
+        .abi_encode()
+        .iter()
+        .skip(32)
+        .copied()
+        .collect();
+    Ok(proof)
 }
 
-pub async fn verify_groth16_snark_from_receipt(
-    image_id: Digest,
+pub async fn verify_aggregation_groth16_proof(
+    block_proof_image_id: Digest,
+    aggregation_image_id: Digest,
     receipt: Receipt,
 ) -> Result<Vec<u8>> {
     let seal = receipt.inner.groth16().unwrap().seal.clone();
     let journal_digest = receipt.journal.digest();
     let post_state_digest = receipt.claim()?.as_value().unwrap().post.digest();
-    verify_groth16_snark_impl(image_id, seal, journal_digest, post_state_digest).await
+    let encoded_proof = verify_groth16_snark_impl(
+        aggregation_image_id,
+        seal,
+        journal_digest,
+        post_state_digest,
+    )
+    .await?;
+    let proof = (
+        encoded_proof,
+        B256::from_slice(block_proof_image_id.as_bytes()),
+        B256::from_slice(aggregation_image_id.as_bytes()),
+    )
+        .abi_encode()
+        .iter()
+        .skip(32)
+        .copied()
+        .collect();
+    Ok(proof)
 }
 
 pub async fn verify_groth16_snark_impl(
@@ -209,14 +235,5 @@ pub async fn verify_groth16_snark_impl(
         tracing_err!("SNARK verification failed: {verify_call_res:?}!");
     }
 
-    Ok(make_risc0_groth16_proof(enc_seal, image_id))
-}
-
-pub fn make_risc0_groth16_proof(seal: Vec<u8>, image_id: Digest) -> Vec<u8> {
-    (seal, B256::from_slice(image_id.as_bytes()))
-        .abi_encode()
-        .iter()
-        .skip(32)
-        .copied()
-        .collect()
+    Ok(enc_seal)
 }