From 57da4916614a0d65bd10a1edeadce8e656cbf08c Mon Sep 17 00:00:00 2001 From: Skylar Ray <137945430+sky-coderay@users.noreply.github.com> Date: Wed, 25 Dec 2024 19:43:12 +0200 Subject: [PATCH 1/5] Update error.rs --- crates/consensus/beacon/src/engine/error.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/consensus/beacon/src/engine/error.rs b/crates/consensus/beacon/src/engine/error.rs index 2092ea49f779..0eef90ea7e97 100644 --- a/crates/consensus/beacon/src/engine/error.rs +++ b/crates/consensus/beacon/src/engine/error.rs @@ -45,7 +45,7 @@ impl From for BeaconConsensusEngineError { /// Represents error cases for an applied forkchoice update. /// -/// This represents all possible error cases, that must be returned as JSON RCP errors back to the +/// This represents all possible error cases, that must be returned as JSON RPC errors back to the /// beacon node. #[derive(Debug, thiserror::Error)] pub enum BeaconForkChoiceUpdateError { From 47e74454ed948442994f56b6b49398ca4e7ecac6 Mon Sep 17 00:00:00 2001 From: Skylar Ray <137945430+sky-coderay@users.noreply.github.com> Date: Wed, 25 Dec 2024 19:43:29 +0200 Subject: [PATCH 2/5] Update lib.rs --- crates/engine/tree/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/engine/tree/src/lib.rs b/crates/engine/tree/src/lib.rs index 100b71604f53..19eecf8d6c88 100644 --- a/crates/engine/tree/src/lib.rs +++ b/crates/engine/tree/src/lib.rs @@ -47,7 +47,7 @@ //! ## Handling consensus messages //! //! Consensus message handling is performed by three main components: -//! 1. The [`EngineHandler`](engine::EngineHandler), which takes incoming consensus mesesages and +//! 1. The [`EngineHandler`](engine::EngineHandler), which takes incoming consensus messages and //! manages any requested backfill or download work. //! 2. The [`EngineApiRequestHandler`](engine::EngineApiRequestHandler), which processes messages //! from the [`EngineHandler`](engine::EngineHandler) and delegates them to the From 7be714a605b3e684aa363aeb49a13d89cf01783a Mon Sep 17 00:00:00 2001 From: Skylar Ray <137945430+sky-coderay@users.noreply.github.com> Date: Wed, 25 Dec 2024 19:43:53 +0200 Subject: [PATCH 3/5] Update dao_fork.rs --- crates/ethereum/evm/src/dao_fork.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ethereum/evm/src/dao_fork.rs b/crates/ethereum/evm/src/dao_fork.rs index aed10d324c4f..8f10f052492d 100644 --- a/crates/ethereum/evm/src/dao_fork.rs +++ b/crates/ethereum/evm/src/dao_fork.rs @@ -7,7 +7,7 @@ use alloy_primitives::{address, Address}; pub static DAO_HARDFORK_BENEFICIARY: Address = address!("bf4ed7b27f1d666546e30d74d50d173d20bca754"); /// DAO hardfork account that ether was taken and added to beneficiary -pub static DAO_HARDKFORK_ACCOUNTS: [Address; 116] = [ +pub static DAO_HARDFORK_ACCOUNTS: [Address; 116] = [ address!("d4fe7bc31cedb7bfb8a345f31e668033056b2728"), address!("b3fb0e5aba0e20e5c49d252dfd30e102b171a425"), address!("2c19c7f9ae8b751e37aeb2d93a699722395ae18f"), From 921c91e6b9fde3d69e3c87de981ecd63c8b9daed Mon Sep 17 00:00:00 2001 From: Skylar Ray <137945430+sky-coderay@users.noreply.github.com> Date: Sat, 28 Dec 2024 13:22:43 +0200 Subject: [PATCH 4/5] Update execute.rs --- crates/ethereum/evm/src/execute.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/ethereum/evm/src/execute.rs b/crates/ethereum/evm/src/execute.rs index 116dd2c00ecd..6896d683477c 100644 --- a/crates/ethereum/evm/src/execute.rs +++ b/crates/ethereum/evm/src/execute.rs @@ -1,7 +1,7 @@ //! Ethereum block execution strategy. use crate::{ - dao_fork::{DAO_HARDFORK_BENEFICIARY, DAO_HARDKFORK_ACCOUNTS}, + dao_fork::{DAO_HARDFORK_BENEFICIARY, DAO_HARDFORK_ACCOUNTS}, EthEvmConfig, }; use alloc::{boxed::Box, sync::Arc, vec::Vec}; @@ -255,7 +255,7 @@ where // drain balances from hardcoded addresses. let drained_balance: u128 = self .state - .drain_balances(DAO_HARDKFORK_ACCOUNTS) + .drain_balances(DAO_HARDFORK_ACCOUNTS) .map_err(|_| BlockValidationError::IncrementBalanceFailed)? .into_iter() .sum(); From 074d28da2549a1dadd11bb693ff02a7c5ec9ee74 Mon Sep 17 00:00:00 2001 From: futreall Date: Sun, 29 Dec 2024 11:31:24 +0200 Subject: [PATCH 5/5] Applied changes and formatting --- crates/ethereum/evm/src/execute.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ethereum/evm/src/execute.rs b/crates/ethereum/evm/src/execute.rs index 6896d683477c..d49fa57e52bd 100644 --- a/crates/ethereum/evm/src/execute.rs +++ b/crates/ethereum/evm/src/execute.rs @@ -1,7 +1,7 @@ //! Ethereum block execution strategy. use crate::{ - dao_fork::{DAO_HARDFORK_BENEFICIARY, DAO_HARDFORK_ACCOUNTS}, + dao_fork::{DAO_HARDFORK_ACCOUNTS, DAO_HARDFORK_BENEFICIARY}, EthEvmConfig, }; use alloc::{boxed::Box, sync::Arc, vec::Vec};