jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: pop consolidation requests in payload builder (#10591)

Browse Source
This commit is contained in:
Oliver
2024-08-28 11:43:45 +02:00
committed by GitHub
parent f600ff07d9
commit 8987b4fe56
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ethereum/payload/src/lib.rs
View File

@ -16,6 +16,7 @@ use reth_basic_payload_builder::{
use reth_errors::RethError; use reth_errors::RethError;
use reth_evm::{ use reth_evm::{
system_calls::{ system_calls::{
post_block_consolidation_requests_contract_call,
post_block_withdrawal_requests_contract_call, pre_block_beacon_root_contract_call, post_block_withdrawal_requests_contract_call, pre_block_beacon_root_contract_call,
pre_block_blockhashes_contract_call, pre_block_blockhashes_contract_call,
}, },
@ -207,8 +208,15 @@ where
&initialized_block_env, &initialized_block_env,
) )
.map_err(|err| PayloadBuilderError::Internal(err.into()))?; .map_err(|err| PayloadBuilderError::Internal(err.into()))?;
let consolidation_requests = post_block_consolidation_requests_contract_call(
&self.evm_config,
&mut db,
&initialized_cfg,
&initialized_block_env,
)
.map_err(|err| PayloadBuilderError::Internal(err.into()))?;
let requests = withdrawal_requests; let requests = [withdrawal_requests, consolidation_requests].concat();
let requests_root = calculate_requests_root(&requests); let requests_root = calculate_requests_root(&requests);
(Some(requests.into()), Some(requests_root)) (Some(requests.into()), Some(requests_root))
} else { } else {
@ -454,8 +462,15 @@ where
&initialized_block_env, &initialized_block_env,
) )
.map_err(|err| PayloadBuilderError::Internal(err.into()))?; .map_err(|err| PayloadBuilderError::Internal(err.into()))?;
let consolidation_requests = post_block_consolidation_requests_contract_call(
&evm_config,
&mut db,
&initialized_cfg,
&initialized_block_env,
)
.map_err(|err| PayloadBuilderError::Internal(err.into()))?;
let requests = [deposit_requests, withdrawal_requests].concat(); let requests = [deposit_requests, withdrawal_requests, consolidation_requests].concat();
let requests_root = calculate_requests_root(&requests); let requests_root = calculate_requests_root(&requests);
(Some(requests.into()), Some(requests_root)) (Some(requests.into()), Some(requests_root))
} else { } else {