From 5859f93c56352a619aaae6598ee91dfcc11cd38d Mon Sep 17 00:00:00 2001
From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com>
Date: Fri, 18 Oct 2024 10:53:21 +0200
Subject: [PATCH] primitives: use alloy `EMPTY_` constants (#11852)

---
 Cargo.lock                                    |  1 +
 crates/chainspec/src/spec.rs                  |  5 +++--
 crates/payload/basic/Cargo.toml               |  1 +
 crates/payload/basic/src/lib.rs               |  3 ++-
 crates/primitives-traits/src/constants/mod.rs | 10 ----------
 crates/primitives/src/alloy_compat.rs         |  8 +++++---
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2aa5675cd..2f8a10571 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6340,6 +6340,7 @@ dependencies = [
 name = "reth-basic-payload-builder"
 version = "1.1.0"
 dependencies = [
+ "alloy-consensus",
  "alloy-primitives",
  "alloy-rlp",
  "futures-core",
diff --git a/crates/chainspec/src/spec.rs b/crates/chainspec/src/spec.rs
index adfee564d..59e1a5ce1 100644
--- a/crates/chainspec/src/spec.rs
+++ b/crates/chainspec/src/spec.rs
@@ -2,6 +2,7 @@ pub use alloy_eips::eip1559::BaseFeeParams;
 
 use alloc::{boxed::Box, sync::Arc, vec::Vec};
 use alloy_chains::{Chain, NamedChain};
+use alloy_consensus::constants::EMPTY_WITHDRAWALS;
 use alloy_genesis::Genesis;
 use alloy_primitives::{address, b256, Address, BlockNumber, B256, U256};
 use alloy_trie::EMPTY_ROOT_HASH;
@@ -18,8 +19,8 @@ use reth_network_peers::{
 };
 use reth_primitives_traits::{
     constants::{
-        EIP1559_INITIAL_BASE_FEE, EMPTY_WITHDRAWALS, ETHEREUM_BLOCK_GAS_LIMIT,
-        HOLESKY_GENESIS_HASH, SEPOLIA_GENESIS_HASH,
+        EIP1559_INITIAL_BASE_FEE, ETHEREUM_BLOCK_GAS_LIMIT, HOLESKY_GENESIS_HASH,
+        SEPOLIA_GENESIS_HASH,
     },
     Header, SealedHeader,
 };
diff --git a/crates/payload/basic/Cargo.toml b/crates/payload/basic/Cargo.toml
index 939eb5b54..f201df0c1 100644
--- a/crates/payload/basic/Cargo.toml
+++ b/crates/payload/basic/Cargo.toml
@@ -26,6 +26,7 @@ reth-tasks.workspace = true
 alloy-rlp.workspace = true
 alloy-primitives.workspace = true
 revm.workspace = true
+alloy-consensus.workspace = true
 
 # async
 tokio = { workspace = true, features = ["sync", "time"] }
diff --git a/crates/payload/basic/src/lib.rs b/crates/payload/basic/src/lib.rs
index f9487ec78..835f20f3e 100644
--- a/crates/payload/basic/src/lib.rs
+++ b/crates/payload/basic/src/lib.rs
@@ -9,6 +9,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 use crate::metrics::PayloadBuilderMetrics;
+use alloy_consensus::constants::EMPTY_WITHDRAWALS;
 use alloy_primitives::{Bytes, B256, U256};
 use futures_core::ready;
 use futures_util::FutureExt;
@@ -18,7 +19,7 @@ use reth_payload_builder::{
 };
 use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes, PayloadBuilderError};
 use reth_primitives::{
-    constants::{EMPTY_WITHDRAWALS, RETH_CLIENT_VERSION, SLOT_DURATION},
+    constants::{RETH_CLIENT_VERSION, SLOT_DURATION},
     proofs, BlockNumberOrTag, SealedBlock, Withdrawals,
 };
 use reth_provider::{
diff --git a/crates/primitives-traits/src/constants/mod.rs b/crates/primitives-traits/src/constants/mod.rs
index 33101b2c0..a4918137e 100644
--- a/crates/primitives-traits/src/constants/mod.rs
+++ b/crates/primitives-traits/src/constants/mod.rs
@@ -1,6 +1,5 @@
 //! Ethereum protocol-related constants
 
-use alloy_consensus::EMPTY_ROOT_HASH;
 use alloy_primitives::{address, b256, Address, B256, U256};
 use core::time::Duration;
 
@@ -112,15 +111,6 @@ pub const OP_SYSTEM_TX_FROM_ADDR: Address = address!("deaddeaddeaddeaddeaddeadde
 /// To address from Optimism system txs: `0x4200000000000000000000000000000000000015`
 pub const OP_SYSTEM_TX_TO_ADDR: Address = address!("4200000000000000000000000000000000000015");
 
-/// Transactions root of empty receipts set.
-pub const EMPTY_RECEIPTS: B256 = EMPTY_ROOT_HASH;
-
-/// Transactions root of empty transactions set.
-pub const EMPTY_TRANSACTIONS: B256 = EMPTY_ROOT_HASH;
-
-/// Withdrawals root of empty withdrawals set.
-pub const EMPTY_WITHDRAWALS: B256 = EMPTY_ROOT_HASH;
-
 /// The number of blocks to unwind during a reorg that already became a part of canonical chain.
 ///
 /// In reality, the node can end up in this particular situation very rarely. It would happen only
diff --git a/crates/primitives/src/alloy_compat.rs b/crates/primitives/src/alloy_compat.rs
index c9bdfad89..0ac1458c5 100644
--- a/crates/primitives/src/alloy_compat.rs
+++ b/crates/primitives/src/alloy_compat.rs
@@ -1,11 +1,13 @@
 //! Common conversions from alloy types.
 
 use crate::{
-    constants::EMPTY_TRANSACTIONS, transaction::extract_chain_id, Block, BlockBody, Signature,
-    Transaction, TransactionSigned, TransactionSignedEcRecovered, TransactionSignedNoHash, TxType,
+    transaction::extract_chain_id, Block, BlockBody, Signature, Transaction, TransactionSigned,
+    TransactionSignedEcRecovered, TransactionSignedNoHash, TxType,
 };
 use alloc::{string::ToString, vec::Vec};
-use alloy_consensus::{Transaction as _, TxEip1559, TxEip2930, TxEip4844, TxLegacy};
+use alloy_consensus::{
+    constants::EMPTY_TRANSACTIONS, Transaction as _, TxEip1559, TxEip2930, TxEip4844, TxLegacy,
+};
 use alloy_primitives::{Parity, TxKind};
 use alloy_rlp::Error as RlpError;
 use alloy_serde::WithOtherFields;