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: check withdrawals in op builder (#12832)

Browse Source
This commit is contained in:
Matthias Seitz
2024-11-24 12:03:56 +01:00
committed by GitHub
parent 8958e9f4df
commit 736edf70ad
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/optimism/payload/src/builder.rs
View File

@ -3,13 +3,13 @@
use std::{fmt::Display, sync::Arc};
use alloy_consensus::{Header, Transaction, EMPTY_OMMER_ROOT_HASH};
use alloy_eips::merge::BEACON_NONCE;
use alloy_eips::{eip4895::Withdrawals, merge::BEACON_NONCE};
use alloy_primitives::{Address, Bytes, B256, U256};
use alloy_rpc_types_debug::ExecutionWitness;
use alloy_rpc_types_engine::PayloadId;
use reth_basic_payload_builder::*;
use reth_chain_state::ExecutedBlock;
use reth_chainspec::ChainSpecProvider;
use reth_chainspec::{ChainSpecProvider, EthereumHardforks};
use reth_evm::{system_calls::SystemCaller, ConfigureEvm, NextBlockEnvAttributes};
use reth_execution_types::ExecutionOutcome;
use reth_optimism_chainspec::OpChainSpec;
@ -416,7 +416,7 @@ where
body: BlockBody {
transactions: info.executed_transactions,
ommers: vec![],
withdrawals: Some(ctx.attributes().payload_attributes.withdrawals.clone()),
withdrawals: ctx.withdrawals().cloned(),
},
};
@ -560,6 +560,13 @@ impl<EvmConfig> OpPayloadBuilderCtx<EvmConfig> {
&self.config.attributes
}
/// Returns the withdrawals if shanghai is active.
pub fn withdrawals(&self) -> Option<&Withdrawals> {
self.chain_spec
.is_shanghai_active_at_timestamp(self.attributes().timestamp())
.then(|| &self.attributes().payload_attributes.withdrawals)
}
/// Returns the block gas limit to target.
pub fn block_gas_limit(&self) -> u64 {
self.attributes()