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

fix(payload): use latest block for genesis block (#2282)

Browse Source
This commit is contained in:
Matthias Seitz
2023-04-17 15:56:07 +02:00
committed by GitHub
parent 6f15f844a5
commit a38bbbfd4a
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,8 @@ use reth_payload_builder::{
use reth_primitives::{ use reth_primitives::{
bytes::{Bytes, BytesMut}, bytes::{Bytes, BytesMut},
constants::{RETH_CLIENT_VERSION, SLOT_DURATION}, constants::{RETH_CLIENT_VERSION, SLOT_DURATION},
proofs, Block, ChainSpec, Header, IntoRecoveredTransaction, Receipt, EMPTY_OMMER_ROOT, U256, proofs, Block, BlockId, BlockNumberOrTag, ChainSpec, Header, IntoRecoveredTransaction, Receipt,
SealedBlock, EMPTY_OMMER_ROOT, U256,
}; };
use reth_provider::{BlockProvider, PostState, StateProviderFactory}; use reth_provider::{BlockProvider, PostState, StateProviderFactory};
use reth_revm::{ use reth_revm::{
@ -99,9 +100,17 @@ where
attributes: PayloadBuilderAttributes, attributes: PayloadBuilderAttributes,
) -> Result<Self::Job, PayloadBuilderError> { ) -> Result<Self::Job, PayloadBuilderError> {
// TODO this needs to access the _pending_ state of the parent block hash // TODO this needs to access the _pending_ state of the parent block hash
let block_id: BlockId = if attributes.parent.is_zero() {
// use latest block if parent is zero: genesis block
BlockNumberOrTag::Latest.into()
} else {
attributes.parent.into()
};
let parent_block = self let parent_block = self
.client .client
.block_by_hash(attributes.parent)? .block(block_id)?
.ok_or_else(|| PayloadBuilderError::MissingParentBlock(attributes.parent))?; .ok_or_else(|| PayloadBuilderError::MissingParentBlock(attributes.parent))?;
// configure evm env based on parent block // configure evm env based on parent block
@ -111,7 +120,7 @@ where
let config = PayloadConfig { let config = PayloadConfig {
initialized_block_env, initialized_block_env,
initialized_cfg, initialized_cfg,
parent_block: Arc::new(parent_block), parent_block: Arc::new(parent_block.seal_slow()),
extra_data: self.config.extradata.clone(), extra_data: self.config.extradata.clone(),
attributes, attributes,
chain_spec: Arc::clone(&self.chain_spec), chain_spec: Arc::clone(&self.chain_spec),
@ -374,7 +383,7 @@ struct PayloadConfig {
/// Configuration for the environment. /// Configuration for the environment.
initialized_cfg: CfgEnv, initialized_cfg: CfgEnv,
/// The parent block. /// The parent block.
parent_block: Arc<Block>, parent_block: Arc<SealedBlock>,
/// Block extra data. /// Block extra data.
extra_data: Bytes, extra_data: Bytes,
/// Requested attributes for the payload. /// Requested attributes for the payload.
@ -526,7 +535,7 @@ fn build_payload<Pool, Client>(
let logs_bloom = post_state.logs_bloom(); let logs_bloom = post_state.logs_bloom();
let header = Header { let header = Header {
parent_hash: attributes.parent, parent_hash: parent_block.hash,
ommers_hash: EMPTY_OMMER_ROOT, ommers_hash: EMPTY_OMMER_ROOT,
beneficiary: initialized_block_env.coinbase, beneficiary: initialized_block_env.coinbase,
// TODO compute state root // TODO compute state root