Rebase fixes.

Cargo.toml

@@ -139,7 +139,8 @@ alloy-rpc-types-eth = { version = "0.7.3", default-features = false, features =
 ] }
 alloy-serde = { version = "0.7.3", default-features = false }
 alloy-sol-types = "0.8.11"
-alloy-trie = { version = "0.7", default-features = false }
+# TODO: fix exact version during the next reth bump.
+alloy-trie = { version = "=0.7.6", default-features = false }
 revm = { version = "18.0.0", features = ["std"], default-features = false }
 revm-primitives = { version = "14.0.0", features = [
   "std",

crates/proof-impl/evm-ee-stf/Cargo.toml

@@ -26,10 +26,6 @@ k256 = { version = "=0.13.3", features = [
 ], default-features = false }
 reth-primitives = { workspace = true, features = ["serde-bincode-compat"] }
 reth-primitives-traits.workspace = true
-reth-trie-common = { workspace = true, features = [
-  "serde-bincode-compat",
-  "eip1186",
-] }
 revm.workspace = true
 revm-primitives.workspace = true
 rlp = "0.5.2"

crates/proof-impl/evm-ee-stf/src/lib.rs

@@ -25,8 +25,8 @@ use db::InMemoryDBHelper;
 use mpt::keccak;
 pub use primitives::{EvmBlockStfInput, EvmBlockStfOutput};
 use processor::{EvmConfig, EvmProcessor};
-use reth_primitives::revm_primitives::alloy_primitives::B256;
 use revm::{primitives::SpecId, InMemoryDB};
+use revm_primitives::alloy_primitives::B256;
 use strata_reth_evm::collect_withdrawal_intents;
 use strata_zkvm::ZkVmEnv;
 use utils::generate_exec_update;

crates/proof-impl/evm-ee-stf/src/primitives.rs

@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 
 use alloy_consensus::{serde_bincode_compat as serde_bincode_compat_header, Header};
+use alloy_eips::eip4895::Withdrawal;
 use reth_primitives::{
-    revm_primitives::alloy_primitives::{Address, Bytes, FixedBytes, B256},
-    transaction::serde_bincode_compat as serde_bincode_compat_tx,
-    TransactionSigned, Withdrawal,
+    transaction::serde_bincode_compat as serde_bincode_compat_tx, TransactionSigned,
 };
+use revm_primitives::alloy_primitives::{Address, Bytes, FixedBytes, B256};
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 use strata_reth_primitives::WithdrawalIntent;

crates/reth/exex/src/prover_exex.rs

@@ -140,13 +140,6 @@ fn extract_zkvm_input<Node: FullNodeComponents<Types: NodeTypes<Primitives = Eth
         .ok_or(eyre!("failed to recover senders"))?;
 
     let accessed_states = get_accessed_states(ctx, &block_execution_input, prev_block_idx)?;
-
-    let current_block_txns = current_block
-        .body
-        .transactions()
-        .cloned()
-        .collect::<Vec<TransactionSigned>>();
-
     let prev_state_root = prev_block.state_root;
 
     let mut parent_proofs: HashMap<Address, EIP1186AccountProofResponse> = HashMap::new();
@@ -203,7 +196,7 @@ fn extract_zkvm_input<Node: FullNodeComponents<Types: NodeTypes<Primitives = Eth
         timestamp: current_block.header.timestamp,
         extra_data: current_block.header.extra_data,
         mix_hash: current_block.header.mix_hash,
-        transactions: current_block_txns,
+        transactions: current_block.body.transactions,
         withdrawals,
         pre_state_trie: state_trie,
         pre_state_storage: storage,