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

feat: compute state root for payload (#2398)

Browse Source
This commit is contained in:
Matthias Seitz
2023-04-25 21:16:34 +02:00
committed by GitHub
parent df3274892f
commit 8ac1aaf5e5
1 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,9 +16,7 @@ use reth_payload_builder::{
};
use reth_primitives::{
bytes::{Bytes, BytesMut},
constants::{
EMPTY_RECEIPTS, EMPTY_TRANSACTIONS, EMPTY_WITHDRAWALS, RETH_CLIENT_VERSION, SLOT_DURATION,
},
constants::{EMPTY_RECEIPTS, EMPTY_TRANSACTIONS, RETH_CLIENT_VERSION, SLOT_DURATION},
proofs, Block, BlockId, BlockNumberOrTag, ChainSpec, Header, IntoRecoveredTransaction, Receipt,
SealedBlock, EMPTY_OMMER_ROOT, U256,
};
@ -457,7 +455,6 @@ fn build_payload<Pool, Client>(
// TODO this needs to access the _pending_ state of the parent block hash
let state = client.latest()?;
let mut db = SubState::new(State::new(state));
let mut post_state = PostState::default();
@ -560,18 +557,20 @@ fn build_payload<Pool, Client>(
withdrawals = Some(attributes.withdrawals);
}
// create the block header
let transactions_root = proofs::calculate_transaction_root(executed_txs.iter());
let receipts_root = post_state.receipts_root();
let logs_bloom = post_state.logs_bloom();
// calculate the state root
let state_root = db.db.0.state_root(post_state)?;
// create the block header
let transactions_root = proofs::calculate_transaction_root(executed_txs.iter());
let header = Header {
parent_hash: parent_block.hash,
ommers_hash: EMPTY_OMMER_ROOT,
beneficiary: initialized_block_env.coinbase,
// TODO compute state root
state_root: Default::default(),
state_root,
transactions_root,
receipts_root,
withdrawals_root,
@ -605,7 +604,9 @@ where
Client: StateProviderFactory,
{
// TODO this needs to access the _pending_ state of the parent block hash
let _state = client.latest()?;
let state = client.latest()?;
let mut db = SubState::new(State::new(state));
let mut post_state = PostState::default();
let PayloadConfig {
initialized_block_env,
@ -613,27 +614,43 @@ where
extra_data,
attributes,
initialized_cfg,
..
chain_spec,
} = config;
let base_fee = initialized_block_env.basefee.to::<u64>();
let block_number = initialized_block_env.number.to::<u64>();
let block_gas_limit: u64 = initialized_block_env.gas_limit.try_into().unwrap_or(u64::MAX);
let mut withdrawals_root = None;
let mut withdrawals = None;
// perform at least all the withdrawals
if initialized_cfg.spec_id >= SpecId::SHANGHAI {
withdrawals_root = Some(EMPTY_WITHDRAWALS);
let balance_increments = post_block_withdrawals_balance_increments(
&chain_spec,
attributes.timestamp,
&attributes.withdrawals,
);
for (address, increment) in balance_increments {
increment_account_balance(&mut db, &mut post_state, block_number, address, increment)?;
}
// calculate withdrawals root
withdrawals_root = Some(proofs::calculate_withdrawals_root(attributes.withdrawals.iter()));
// set withdrawals
withdrawals = Some(attributes.withdrawals);
}
// calculate the state root
let state_root = db.db.0.state_root(post_state)?;
let header = Header {
parent_hash: parent_block.hash,
ommers_hash: EMPTY_OMMER_ROOT,
beneficiary: initialized_block_env.coinbase,
// TODO compute state root
state_root: Default::default(),
state_root,
transactions_root: EMPTY_TRANSACTIONS,
withdrawals_root,
receipts_root: EMPTY_RECEIPTS,