cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

stub out tx root check, fix block hash calculation

Browse Source
This commit is contained in:
realbigsean 2023-01-27 11:39:26 +01:00
parent 1dd9812f62
commit dd512cd82a
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@ -1037,14 +1037,20 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
); );
} }
return Err(Error::InconsistentPayloadReconstructed { if execution_payload_header.transactions_root()
slot: blinded_block.slot(), != header_from_payload.transactions_root()
exec_block_hash, {
canonical_payload_root: execution_payload_header.tree_hash_root(), //FIXME(sean) we're not decoding blobs txs correctly yet
reconstructed_payload_root: header_from_payload.tree_hash_root(), } else {
canonical_transactions_root: execution_payload_header.transactions_root(), return Err(Error::InconsistentPayloadReconstructed {
reconstructed_transactions_root: header_from_payload.transactions_root(), slot: blinded_block.slot(),
}); exec_block_hash,
canonical_payload_root: execution_payload_header.tree_hash_root(),
reconstructed_payload_root: header_from_payload.tree_hash_root(),
canonical_transactions_root: execution_payload_header.transactions_root(),
reconstructed_transactions_root: header_from_payload.transactions_root(),
});
}
} }
// Add the payload to the block to form a full block. // Add the payload to the block to form a full block.

8
beacon_node/execution_layer/src/block_hash.rs
View File

@ -36,12 +36,15 @@ impl<T: EthSpec> ExecutionLayer<T> {
None None
}; };
let rlp_excess_data_gas = payload.excess_data_gas().ok();
// Construct the block header. // Construct the block header.
let exec_block_header = ExecutionBlockHeader::from_payload( let exec_block_header = ExecutionBlockHeader::from_payload(
payload, payload,
KECCAK_EMPTY_LIST_RLP.as_fixed_bytes().into(), KECCAK_EMPTY_LIST_RLP.as_fixed_bytes().into(),
rlp_transactions_root, rlp_transactions_root,
rlp_withdrawals_root, rlp_withdrawals_root,
rlp_excess_data_gas,
); );
// Hash the RLP encoding of the block header. // Hash the RLP encoding of the block header.
@ -75,12 +78,15 @@ pub fn rlp_encode_withdrawal(withdrawal: &JsonWithdrawal) -> Vec<u8> {
pub fn rlp_encode_block_header(header: &ExecutionBlockHeader) -> Vec<u8> { pub fn rlp_encode_block_header(header: &ExecutionBlockHeader) -> Vec<u8> {
let mut rlp_header_stream = RlpStream::new(); let mut rlp_header_stream = RlpStream::new();
rlp_header_stream.begin_unbounded_list(); rlp_header_stream.begin_unbounded_list();
map_execution_block_header_fields_except_withdrawals!(&header, |_, field| { map_execution_block_header_fields_except_withdrawals_excess_data_gas!(&header, |_, field| {
rlp_header_stream.append(field); rlp_header_stream.append(field);
}); });
if let Some(withdrawals_root) = &header.withdrawals_root { if let Some(withdrawals_root) = &header.withdrawals_root {
rlp_header_stream.append(withdrawals_root); rlp_header_stream.append(withdrawals_root);
} }
if let Some(excess_data_gas) = &header.excess_data_gas {
rlp_header_stream.append(excess_data_gas);
}
rlp_header_stream.finalize_unbounded_list(); rlp_header_stream.finalize_unbounded_list();
rlp_header_stream.out().into() rlp_header_stream.out().into()
} }

13
consensus/types/src/execution_block_header.rs
View File

@ -24,9 +24,13 @@ use metastruct::metastruct;
/// ///
/// Credit to Reth for the type definition. /// Credit to Reth for the type definition.
#[derive(Debug, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Clone, PartialEq, Eq, Hash)]
#[metastruct(mappings(map_execution_block_header_fields_except_withdrawals(exclude( #[metastruct(mappings(
withdrawals_root map_execution_block_header_fields_except_withdrawals(exclude(withdrawals_root)),
))))] map_execution_block_header_fields_except_withdrawals_excess_data_gas(exclude(
withdrawals_root,
excess_data_gas
))
))]
pub struct ExecutionBlockHeader { pub struct ExecutionBlockHeader {
pub parent_hash: Hash256, pub parent_hash: Hash256,
pub ommers_hash: Hash256, pub ommers_hash: Hash256,
@ -45,6 +49,7 @@ pub struct ExecutionBlockHeader {
pub nonce: Hash64, pub nonce: Hash64,
pub base_fee_per_gas: Uint256, pub base_fee_per_gas: Uint256,
pub withdrawals_root: Option<Hash256>, pub withdrawals_root: Option<Hash256>,
pub excess_data_gas: Option<Uint256>,
} }
impl ExecutionBlockHeader { impl ExecutionBlockHeader {
@ -53,6 +58,7 @@ impl ExecutionBlockHeader {
rlp_empty_list_root: Hash256, rlp_empty_list_root: Hash256,
rlp_transactions_root: Hash256, rlp_transactions_root: Hash256,
rlp_withdrawals_root: Option<Hash256>, rlp_withdrawals_root: Option<Hash256>,
rlp_excess_data_gas: Option<Uint256>,
) -> Self { ) -> Self {
// Most of these field mappings are defined in EIP-3675 except for `mixHash`, which is // Most of these field mappings are defined in EIP-3675 except for `mixHash`, which is
// defined in EIP-4399. // defined in EIP-4399.
@ -74,6 +80,7 @@ impl ExecutionBlockHeader {
nonce: Hash64::zero(), nonce: Hash64::zero(),
base_fee_per_gas: payload.base_fee_per_gas(), base_fee_per_gas: payload.base_fee_per_gas(),
withdrawals_root: rlp_withdrawals_root, withdrawals_root: rlp_withdrawals_root,
excess_data_gas: rlp_excess_data_gas,
} }
} }
} }