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

chore: move cfg block env init to PayloadAttributes (#2222)

Browse Source
This commit is contained in:
Matthias Seitz
2023-04-13 16:08:32 +02:00
committed by GitHub
parent 35f7c6d8cf
commit 5e64f0e079
5 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/payload/basic/Cargo.toml
View File

@ -10,7 +10,6 @@ description = "A basic payload builder for reth that uses the txpool API to buil
[dependencies]
## reth
reth-primitives = { path = "../../primitives" }
reth-consensus-common = { path = "../../consensus/common" }
reth-revm = { path = "../../revm" }
reth-transaction-pool = { path = "../../transaction-pool" }
reth-rlp = { path = "../../rlp" }

24
crates/payload/basic/src/lib.rs
View File

@ -11,7 +11,6 @@
use futures_core::{ready, Stream};
use futures_util::FutureExt;
use reth_consensus_common::validation::calculate_next_block_base_fee;
use reth_payload_builder::{
error::PayloadBuilderError, BuiltPayload, PayloadBuilderAttributes, PayloadJob,
PayloadJobGenerator,
@ -122,27 +121,8 @@ where
.ok_or_else(|| PayloadBuilderError::MissingParentBlock(attributes.parent))?;
// configure evm env based on parent block
let initialized_cfg = CfgEnv {
chain_id: U256::from(self.chain_spec.chain().id()),
// ensure we're not missing any timestamp based hardforks
spec_id: revm_spec_by_timestamp_after_merge(&self.chain_spec, attributes.timestamp),
..Default::default()
};
let initialized_block_env = BlockEnv {
number: U256::from(parent_block.number + 1),
coinbase: attributes.suggested_fee_recipient,
timestamp: U256::from(attributes.timestamp),
difficulty: U256::ZERO,
prevrandao: Some(attributes.prev_randao),
gas_limit: U256::from(parent_block.gas_limit),
// calculate basefee based on parent block's gas usage
basefee: U256::from(calculate_next_block_base_fee(
parent_block.gas_used,
parent_block.gas_limit,
parent_block.base_fee_per_gas.unwrap_or_default(),
)),
};
let (initialized_cfg, initialized_block_env) =
attributes.cfg_and_block_env(&self.chain_spec, &parent_block);
let config = PayloadConfig {
initialized_block_env,