switch journal bytes to be serialized more compact (#16)

* switch journal bytes to be serialized more compact * sort deps
risc0 · Jul 15, 2024 · 411c5dc · 411c5dc
1 parent 0c705b5
commit 411c5dc
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/batch-guest/guest/Cargo.lock b/batch-guest/guest/Cargo.lock
diff --git a/batch-guest/guest/Cargo.toml b/batch-guest/guest/Cargo.toml
@@ -11,6 +11,7 @@ light-client-guest = { path = "../../light-client-guest" }
 blobstream0-primitives = { path = "../../primitives" }
 alloy-sol-types = "0.7"
 alloy-primitives = "0.7"
+serde_bytes = "0.11"
 
 [patch.crates-io]
 sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
diff --git a/batch-guest/guest/src/main.rs b/batch-guest/guest/src/main.rs
@@ -14,15 +14,16 @@
 
 use alloy_primitives::U256;
 use alloy_sol_types::SolValue;
-use light_client_guest::TM_LIGHT_CLIENT_ID;
 use blobstream0_primitives::{
     IBlobstream::{DataRootTuple, RangeCommitment},
     LightClientCommit, MerkleTree,
 };
+use light_client_guest::TM_LIGHT_CLIENT_ID;
 use risc0_zkvm::{guest::env, serde::from_slice};
+use serde_bytes::ByteBuf;
 
-// TODO by default this will serialize poorly, optimize
-type JournalBytes = Vec<u8>;
+/// Alias to represent the bytes from the journals being recursively proven.
+type JournalBytes = ByteBuf;
 
 fn main() {
     // Input the vector of proofs to batch.

diff --git a/contracts/artifacts/Blobstream0.json b/contracts/artifacts/Blobstream0.json
diff --git a/contracts/src/ImageID.sol b/contracts/src/ImageID.sol
@@ -19,5 +19,5 @@
 pragma solidity ^0.8.20;
 
 library ImageID {
-    bytes32 public constant BATCH_GUEST_ID = bytes32(0xf75fe9a787f9010e6a60a35271fbf7901d0afd27faff3c3dfe708582afae9af2);
+    bytes32 public constant BATCH_GUEST_ID = bytes32(0x54c5a4b5dcef9cc6febc08d59d9892b0b36be5fd15ef365c7a9c126a8864e494);
 }
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -13,6 +13,7 @@ ciborium = { workspace = true }
 light-client-guest = { path = "../light-client-guest" }
 risc0-ethereum-contracts = { git = "https://github.com/risc0/risc0-ethereum", tag = "v1.0.0" }
 risc0-zkvm = { version = "=1.0.1" }
+serde_bytes = "0.11"
 tendermint = { workspace = true }
 tendermint-light-client-verifier = { workspace = true }
 tendermint-rpc = { workspace = true, features = ["http-client"] }

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -24,6 +24,7 @@ use risc0_ethereum_contracts::groth16;
 use risc0_zkvm::{
     default_prover, is_dev_mode, sha::Digestible, ExecutorEnv, Prover, ProverOpts, Receipt,
 };
+use serde_bytes::ByteBuf;
 use std::ops::Range;
 use tendermint::{block::Height, node::Id, validator::Set};
 use tendermint_light_client_verifier::types::LightBlock;
@@ -124,7 +125,7 @@ pub async fn prove_block_range(client: &HttpClient, range: Range<u64>) -> anyhow
             light_block,
         } = prove_block(prover.as_ref(), client, &previous_block, height).await?;
 
-        batch_receipts.push(receipt.journal.bytes.clone());
+        batch_receipts.push(ByteBuf::from(receipt.journal.bytes.clone()));
         batch_env_builder.add_assumption(receipt);
         previous_block = light_block;
     }