From 19b9748dca4314d7d5c08e4f60cafd42912ac659 Mon Sep 17 00:00:00 2001
From: Evgeniy Zdanovich <zdanovichevgeny@gmail.com>
Date: Wed, 22 Jan 2025 16:17:49 +0100
Subject: [PATCH] Rebase fixes.

---
 Cargo.lock                                    | 24 ++++---------------
 Cargo.toml                                    |  3 ++-
 crates/proof-impl/evm-ee-stf/Cargo.toml       |  4 ----
 crates/proof-impl/evm-ee-stf/src/lib.rs       |  2 +-
 .../proof-impl/evm-ee-stf/src/primitives.rs   |  6 ++---
 crates/reth/exex/src/prover_exex.rs           |  9 +------
 6 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0abc0f26f0..156c091671 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1301,15 +1301,15 @@ dependencies = [
 
 [[package]]
 name = "alloy-trie"
-version = "0.7.8"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6917c79e837aa7b77b7a6dae9f89cbe15313ac161c4d3cfaf8909ef21f3d22d8"
+checksum = "3a5fd8fea044cc9a8c8a50bb6f28e31f0385d820f116c5b98f6f4e55d6e5590b"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "arrayvec",
  "derive_more",
- "nybbles 0.3.4",
+ "nybbles",
  "serde",
  "smallvec",
  "tracing",
@@ -6801,19 +6801,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "nybbles"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307"
-dependencies = [
- "alloy-rlp",
- "const-hex",
- "proptest",
- "serde",
- "smallvec",
-]
-
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -9425,7 +9412,7 @@ dependencies = [
  "alloy-eips 0.7.3",
  "alloy-primitives",
  "alloy-rlp",
- "nybbles 0.2.1",
+ "nybbles",
  "reth-consensus",
  "reth-prune-types",
  "reth-storage-errors",
@@ -10785,7 +10772,7 @@ dependencies = [
  "bytes",
  "derive_more",
  "itertools 0.13.0",
- "nybbles 0.2.1",
+ "nybbles",
  "reth-codecs",
  "reth-primitives-traits",
  "revm-primitives",
@@ -13306,7 +13293,6 @@ dependencies = [
  "k256",
  "reth-primitives",
  "reth-primitives-traits",
- "reth-trie-common",
  "revm",
  "revm-primitives",
  "rlp",
diff --git a/Cargo.toml b/Cargo.toml
index 822fbc59af..b79e71895e 100644
--- a/Cargo.toml
+++ b/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",
diff --git a/crates/proof-impl/evm-ee-stf/Cargo.toml b/crates/proof-impl/evm-ee-stf/Cargo.toml
index c31363381d..63438dfe72 100644
--- a/crates/proof-impl/evm-ee-stf/Cargo.toml
+++ b/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"
diff --git a/crates/proof-impl/evm-ee-stf/src/lib.rs b/crates/proof-impl/evm-ee-stf/src/lib.rs
index e904b16dc7..520b7fb7b4 100644
--- a/crates/proof-impl/evm-ee-stf/src/lib.rs
+++ b/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;
diff --git a/crates/proof-impl/evm-ee-stf/src/primitives.rs b/crates/proof-impl/evm-ee-stf/src/primitives.rs
index 32296cccb8..bdcb60f324 100644
--- a/crates/proof-impl/evm-ee-stf/src/primitives.rs
+++ b/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;
diff --git a/crates/reth/exex/src/prover_exex.rs b/crates/reth/exex/src/prover_exex.rs
index 0ad2717045..75a49426f5 100644
--- a/crates/reth/exex/src/prover_exex.rs
+++ b/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,