refactor: adapt range execution program outputs

Author: damiannolan

crates/sp1/evm-exec-types/src/lib.rs

@@ -15,22 +15,22 @@ pub struct EvmBlockExecOutput {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct EvmRangeExecOutput {
-    // newest_header_hash is the last block's hash on the EVM roll-up.
-    // TODO: this may be removable.
-    pub newest_header_hash: [u8; 32],
-    // oldest_header_hash is the earliest block's hash on the EVM roll-up.
-    // TODO: this may be removable.
-    pub oldest_header_hash: [u8; 32],
+    // TODO: remove in favour of celestia_header_hash (latest)
     // celestia_header_hashes is the range of Celestia blocks that include all
     // of the blob data the EVM roll-up has posted from oldest_header_hash to
     // newest_header_hash.
     pub celestia_header_hashes: Vec<[u8; 32]>, // provided by Celestia state machine (eventually x/header)
-    // newest_state_root is the computed state root of the EVM roll-up after
-    // processing blocks from oldest_header_hash to newest_header_hash.
-    pub newest_state_root: [u8; 32],
-    // newest_height is the most recent block number of the EVM roll-up.
-    // TODO: this may be removable.
-    pub newest_height: u64,
+    // celestia_header_hash is the hash of the celestia header at which new_height is available.
+    pub celestia_header_hash: [u8; 32],
+    // trusted_height is the trusted height of the EVM application.
+    pub trusted_height: u64,
+    // trusted_state_root is the state commitment root of the EVM application at trusted_height.
+    pub trusted_state_root: [u8; 32],
+    // new_height is the EVM application block number after N state transitions.
+    pub new_height: u64,
+    // new_state_root is the computed state root of the EVM application after
+    // executing N blocks from trusted_height to new_height.
+    pub new_state_root: [u8; 32],
 }
 
 /// A buffer of serializable/deserializable objects.

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

@@ -45,7 +45,7 @@ pub fn main() {
     println!("cycle-tracker-start: assert trusted state root");
 
     assert_eq!(
-        client_executor_input.current_block.state_root.as_slice(),
+        client_executor_input.parent_state.state_root().as_slice(),
         trusted_state_root,
         "Current block state root does not match trusted root"
     );

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

@@ -31,7 +31,7 @@ pub fn main() {
     assert_eq!(
         vkeys.len(),
         public_values.len(),
-        "Mismatch between number of verification keys and public value blobs"
+        "mismatch between number of verification keys and public value blobs"
     );
 
     let proof_count = vkeys.len();
@@ -67,7 +67,7 @@ pub fn main() {
         assert_eq!(
             curr.prev_header_hash,
             prev.header_hash,
-            "Header linkage failed at index {}: expected {:?}, got {:?}",
+            "verify sequential headers failed at index {}: expected {:?}, got {:?}",
             i + 1,
             prev.header_hash,
             curr.prev_header_hash
@@ -84,11 +84,12 @@ pub fn main() {
     let celestia_header_hashes: Vec<_> = outputs.iter().map(|o| o.celestia_header_hash).collect();
 
     let range_output = EvmRangeExecOutput {
-        oldest_header_hash: first.header_hash,
-        newest_header_hash: last.header_hash,
-        newest_state_root: last.state_root,
-        newest_height: last.height,
-        celestia_header_hashes,
+        celestia_header_hashes: celestia_header_hashes,
+        celestia_header_hash: [0u8; 32], // TODO: assign this correctly
+        trusted_height: first.height,    // should be first.trusted_height
+        trusted_state_root: first.trusted_state_root,
+        new_state_root: last.state_root,
+        new_height: last.height,
     };
 
     sp1_zkvm::io::commit(&range_output);