refactor: testing blob compression

Cargo.toml

@@ -29,7 +29,7 @@ celestia-types = "=0.11.2"
 ed25519-dalek = { version = "2.1.0", features = ["alloc", "serde"] }
 eq-common = "0.1.4"
 ethers = { version = "2.0", features = ["ws", "rustls"] }
-ev-types = { version = "0.0.1", default-features = false }
+ev-types = { git = "https://github.com/evstack/ev-node.git", rev = "677ed6d33f36233544acbe00c3dad2c29af11af5", package = "ev-types", default-features = false }
 hex = "0.4.3"
 nmt-rs = "*"
 prost = "0.12"

crates/sp1/evm-exec/program/src/main.rs

@@ -41,12 +41,12 @@ use std::sync::Arc;
 use alloy_consensus::{proofs, BlockHeader};
 use alloy_primitives::B256;
 use alloy_rlp::Decodable;
-use bytes::Bytes;
 use celestia_types::nmt::{Namespace, NamespaceProof, NamespacedHash};
 use celestia_types::Blob;
 use celestia_types::DataAvailabilityHeader;
 use ed25519_dalek::{Signature, Verifier, VerifyingKey};
 use ev_types::v1::{Data, SignedData};
+use ev_types::BlobCompressor;
 use evm_exec_types::BlockExecOutput;
 use nmt_rs::NamespacedSha2Hasher;
 use prost::Message;
@@ -170,9 +170,13 @@ pub fn main() {
     // -----------------------------
     println!("cycle-tracker-report-start: filter signed data blobs and verify signatures");
 
+    let blob_compressor = BlobCompressor::new();
     let signed_data: Vec<SignedData> = blobs
         .into_iter()
-        .filter_map(|blob| SignedData::decode(Bytes::from(blob.data)).ok())
+        .filter_map(|blob| {
+            let decompressed = blob_compressor.decompress(blob.data.as_slice()).ok()?;
+            SignedData::decode(decompressed).ok()
+        })
         .collect();
 
     let mut tx_data: Vec<Data> = Vec::new();

crates/sp1/evm-exec/script/Cargo.toml

@@ -56,6 +56,7 @@ tendermint-proto = { workspace = true }
 tokio = { version = "1.44", features = ["full"] }
 tokio-retry = "0.3"
 tracing = "0.1.40"
+zstd = "0.13"
 
 [build-dependencies]
 sp1-build = { workspace = true }

crates/sp1/evm-exec/script/src/bin/datagen.rs

@@ -28,6 +28,7 @@ use clap::Parser;
 use ev_types::v1::get_block_request::Identifier;
 use ev_types::v1::store_service_client::StoreServiceClient;
 use ev_types::v1::{GetBlockRequest, SignedData};
+use ev_types::BlobCompressor;
 use eyre::Context;
 use prost::Message;
 use reth_chainspec::ChainSpec;
@@ -143,13 +144,18 @@ async fn main() -> Result<(), Box<dyn Error>> {
         println!("Got NamespaceProofs, total: {}", proofs.len());
 
         let mut executor_inputs: Vec<EthClientExecutorInput> = Vec::new();
-        for blob in blobs.as_slice() {
-            let data = match SignedData::decode(blob.data.as_slice()) {
-                Ok(data) => data.data.unwrap(),
-                Err(_) => continue,
-            };
 
-            let height = data.metadata.unwrap().height;
+        let blob_compressor = BlobCompressor::new();
+        let signed_data: Vec<SignedData> = blobs
+            .into_iter()
+            .filter_map(|blob| {
+                let decompressed = blob_compressor.decompress(blob.data.as_slice()).ok()?;
+                SignedData::decode(decompressed).ok()
+            })
+            .collect();
+
+        for data in signed_data {
+            let height = data.data.unwrap().metadata.unwrap().height;
             println!("Got SignedData for EVM block {}", height);
 
             let client_executor_input =
@@ -159,6 +165,24 @@ async fn main() -> Result<(), Box<dyn Error>> {
             executor_inputs.push(client_executor_input);
         }
 
+        // let compressor = ev_client::BlobCompressor::new();
+        // for blob in blobs.as_slice() {
+        //     let decompressed = compressor.decompress(&blob.data[..]).unwrap();
+        //     let data = match SignedData::decode(decompressed) {
+        //         Ok(data) => data.data.unwrap(),
+        //         Err(_) => continue,
+        //     };
+
+        //     let height = data.metadata.unwrap().height;
+        //     println!("Got SignedData for EVM block {}", height);
+
+        //     let client_executor_input =
+        //         generate_client_executor_input(config::EVM_RPC_URL, height, chain_spec.clone(), genesis.clone())
+        //             .await?;
+
+        //     executor_inputs.push(client_executor_input);
+        // }
+
         println!("Got EthClientExecutorInputs, total: {}", executor_inputs.len());
 
         // Create output dir: testdata/inputs/block-{celestia_block_number}/

docker-compose.yml

@@ -58,7 +58,7 @@ services:
       - celestia-zkevm-net
 
   ev-node-evm-single:
-    image: ghcr.io/evstack/ev-node-evm-single:main
+    image: ghcr.io/evstack/ev-node-evm-single:pr-2547
     container_name: ev-node-evm-single
     entrypoint: /scripts/entrypoint.sh
     ports: