chore: update RSP rev (#55)

Author: leruaa

Cargo.lock

@@ -50,11 +50,11 @@ sp1-zkvm = "5.0.0"
 sp1-build = "5.0.0"
 
 # rsp
-rsp-rpc-db = { git = "https://github.com/succinctlabs/rsp", rev = "57fd82b40de3fe816db309f29bca8ecc0d8821f1" }
-rsp-witness-db = { git = "https://github.com/succinctlabs/rsp", rev = "57fd82b40de3fe816db309f29bca8ecc0d8821f1" }
-rsp-primitives = { git = "https://github.com/succinctlabs/rsp", rev = "57fd82b40de3fe816db309f29bca8ecc0d8821f1" }
-rsp-client-executor = { git = "https://github.com/succinctlabs/rsp", rev = "57fd82b40de3fe816db309f29bca8ecc0d8821f1" }
-rsp-mpt = { git = "https://github.com/succinctlabs/rsp", rev = "57fd82b40de3fe816db309f29bca8ecc0d8821f1" }
+rsp-rpc-db = { git = "https://github.com/succinctlabs/rsp", rev = "0cd586a95d1462a6ff69772a9e4491620db10eb1" }
+rsp-witness-db = { git = "https://github.com/succinctlabs/rsp", rev = "0cd586a95d1462a6ff69772a9e4491620db10eb1" }
+rsp-primitives = { git = "https://github.com/succinctlabs/rsp", rev = "0cd586a95d1462a6ff69772a9e4491620db10eb1" }
+rsp-client-executor = { git = "https://github.com/succinctlabs/rsp", rev = "0cd586a95d1462a6ff69772a9e4491620db10eb1" }
+rsp-mpt = { git = "https://github.com/succinctlabs/rsp", rev = "0cd586a95d1462a6ff69772a9e4491620db10eb1" }
 
 # rsp-rpc-db = { path = "../rsp/crates/storage/rpc-db" }
 # rsp-witness-db = { path = "../rsp/crates/storage/witness-db" }

Cargo.toml

@@ -72,8 +72,9 @@ impl WitnessInput for EvmSketchInput {
     }
 
     #[inline(always)]
-    fn headers(&self) -> impl Iterator<Item = &Header> {
-        once(self.anchor.header()).chain(self.ancestor_headers.iter())
+    fn sealed_headers(&self) -> impl Iterator<Item = SealedHeader> {
+        once(SealedHeader::seal_slow(self.anchor.header().clone()))
+            .chain(self.ancestor_headers.iter().map(|h| SealedHeader::seal_slow(h.clone())))
     }
 }
 

crates/client-executor/src/io.rs

@@ -12,7 +12,7 @@ use alloy_sol_types::{sol, SolCall, SolEvent};
 use alloy_trie::root::ordered_trie_root_with_encoder;
 use eyre::OptionExt;
 use io::EvmSketchInput;
-use reth_primitives::{EthPrimitives, SealedHeader};
+use reth_primitives::EthPrimitives;
 use revm::{context::TxEnv, database::CacheDB};
 use revm_primitives::{Address, Bytes, TxKind, B256, U256};
 use rsp_client_executor::io::{TrieDB, WitnessInput};
@@ -196,19 +196,20 @@ impl<'a, P: Primitives> ClientExecutor<'a, P> {
         let chain_spec = P::build_spec(&state_sketch.genesis)?;
         let genesis_hash = hash_genesis(&state_sketch.genesis);
         let header = state_sketch.anchor.header();
+        let sealed_headers = state_sketch.sealed_headers().collect::<Vec<_>>();
 
-        P::validate_header(&SealedHeader::new_unhashed(header.clone()), chain_spec.clone())
+        P::validate_header(&sealed_headers[0], chain_spec.clone())
             .expect("the header in not valid");
 
         // Verify the state root
         assert_eq!(header.state_root, state_sketch.state.state_root(), "State root mismatch");
 
         // Verify that ancestors form a valid chain
         let mut previous_header = header;
-        for ancestor in &state_sketch.ancestor_headers {
-            let ancestor_hash = ancestor.hash_slow();
+        for ancestor in sealed_headers.iter().skip(1) {
+            let ancestor_hash = ancestor.hash();
 
-            P::validate_header(&SealedHeader::new_unhashed(ancestor.clone()), chain_spec.clone())
+            P::validate_header(ancestor, chain_spec.clone())
                 .unwrap_or_else(|_| panic!("the ancestor {} header in not valid", ancestor.number));
             assert_eq!(
                 previous_header.parent_hash, ancestor_hash,
@@ -235,7 +236,7 @@ impl<'a, P: Primitives> ClientExecutor<'a, P> {
         Ok(Self {
             anchor: &state_sketch.anchor,
             chain_spec,
-            witness_db: state_sketch.witness_db()?,
+            witness_db: state_sketch.witness_db(&sealed_headers)?,
             logs,
             genesis_hash,
         })