From 719ca3a68280947dce04de3fea6a58bf246e923a Mon Sep 17 00:00:00 2001
From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com>
Date: Mon, 28 Oct 2024 12:56:28 +0100
Subject: [PATCH] chain-spec: use alloy `MAINNET_DEPOSIT_CONTRACT_ADDRESS`
constant (#12113)
---
crates/chainspec/src/constants.rs | 5 +++--
crates/chainspec/src/spec.rs | 7 +++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/crates/chainspec/src/constants.rs b/crates/chainspec/src/constants.rs
index 2e22b2299a4b..3f46fb6b746a 100644
--- a/crates/chainspec/src/constants.rs
+++ b/crates/chainspec/src/constants.rs
@@ -1,11 +1,12 @@
use crate::spec::DepositContract;
-use alloy_primitives::{address, b256};
+use alloy_eips::eip6110::MAINNET_DEPOSIT_CONTRACT_ADDRESS;
+use alloy_primitives::b256;
/// Gas per transaction not creating a contract.
pub const MIN_TRANSACTION_GAS: u64 = 21_000u64;
/// Deposit contract address: `0x00000000219ab540356cbb839cbe05303d7705fa`
pub(crate) const MAINNET_DEPOSIT_CONTRACT: DepositContract = DepositContract::new(
- address!("00000000219ab540356cbb839cbe05303d7705fa"),
+ MAINNET_DEPOSIT_CONTRACT_ADDRESS,
11052984,
b256!("649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"),
);
diff --git a/crates/chainspec/src/spec.rs b/crates/chainspec/src/spec.rs
index 02f4b5ca983e..b0958d4fbb57 100644
--- a/crates/chainspec/src/spec.rs
+++ b/crates/chainspec/src/spec.rs
@@ -3,7 +3,10 @@ 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_eips::{eip1559::INITIAL_BASE_FEE, eip7685::EMPTY_REQUESTS_HASH};
+use alloy_eips::{
+ eip1559::INITIAL_BASE_FEE, eip6110::MAINNET_DEPOSIT_CONTRACT_ADDRESS,
+ eip7685::EMPTY_REQUESTS_HASH,
+};
use alloy_genesis::Genesis;
use alloy_primitives::{address, b256, Address, BlockNumber, B256, U256};
use derive_more::From;
@@ -39,7 +42,7 @@ pub static MAINNET: LazyLock<Arc<ChainSpec>> = LazyLock::new(|| {
hardforks: EthereumHardfork::mainnet().into(),
// https://etherscan.io/tx/0xe75fb554e433e03763a1560646ee22dcb74e5274b34c5ad644e7c0f619a7e1d0
deposit_contract: Some(DepositContract::new(
- address!("00000000219ab540356cbb839cbe05303d7705fa"),
+ MAINNET_DEPOSIT_CONTRACT_ADDRESS,
11052984,
b256!("649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"),
)),