diff --git a/beacon_node/execution_layer/src/block_hash.rs b/beacon_node/execution_layer/src/block_hash.rs index 00bf4a7e8..14993acac 100644 --- a/beacon_node/execution_layer/src/block_hash.rs +++ b/beacon_node/execution_layer/src/block_hash.rs @@ -44,7 +44,7 @@ impl ExecutionLayer { KECCAK_EMPTY_LIST_RLP.as_fixed_bytes().into(), rlp_transactions_root, rlp_withdrawals_root, - rlp_excess_data_gas, + rlp_excess_data_gas.copied(), ); // Hash the RLP encoding of the block header. @@ -78,7 +78,7 @@ pub fn rlp_encode_withdrawal(withdrawal: &JsonWithdrawal) -> Vec { pub fn rlp_encode_block_header(header: &ExecutionBlockHeader) -> Vec { let mut rlp_header_stream = RlpStream::new(); rlp_header_stream.begin_unbounded_list(); - map_execution_block_header_fields_except_withdrawals_excess_data_gas!(&header, |_, field| { + map_execution_block_header_fields_except_withdrawals!(&header, |_, field| { rlp_header_stream.append(field); }); if let Some(withdrawals_root) = &header.withdrawals_root { diff --git a/consensus/types/src/execution_block_header.rs b/consensus/types/src/execution_block_header.rs index 6dca1f57a..9c01d9a59 100644 --- a/consensus/types/src/execution_block_header.rs +++ b/consensus/types/src/execution_block_header.rs @@ -25,11 +25,7 @@ use metastruct::metastruct; /// Credit to Reth for the type definition. #[derive(Debug, Clone, PartialEq, Eq, Hash)] #[metastruct(mappings( - 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 - )) + map_execution_block_header_fields_except_withdrawals(exclude(withdrawals_root, excess_data_gas)), ))] pub struct ExecutionBlockHeader { pub parent_hash: Hash256,