mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-10 04:01:51 +00:00
d74b2d96f5
* Fix partial withdrawals count * Remove get_active_balance * Remove queue_entire_balance_and_reset_validator * Switch to compounding when consolidating with source==target * Queue deposit requests and apply them during epoch processing * Fix ef tests * Clear todos * Fix engine api formatting issues * Merge branch 'unstable' into electra-alpha7 * Make add_validator_to_registry more in line with the spec * Address some review comments * Cleanup * Update initialize_beacon_state_from_eth1 * Merge branch 'unstable' into electra-alpha7 * Fix rpc decoding for blobs by range/root * Fix block hash computation * Fix process_deposits bug * Merge branch 'unstable' into electra-alpha7 * Fix topup deposit processing bug * Update builder api for electra * Refactor mock builder to separate functionality * Merge branch 'unstable' into electra-alpha7 * Address review comments * Use copied for reference rather than cloned * Optimise and simplify PendingDepositsContext::new * Merge remote-tracking branch 'origin/unstable' into electra-alpha7 * Fix processing of deposits with invalid signatures * Remove redundant code in genesis init * Revert "Refactor mock builder to separate functionality" This reverts commit6d10456912. * Revert "Update builder api for electra" This reverts commitc5c9aca6db. * Simplify pre-activation sorting * Fix stale validators used in upgrade_to_electra * Merge branch 'unstable' into electra-alpha7
259 lines
17 KiB
Rust
259 lines
17 KiB
Rust
use crate::{
|
|
json_structures::{EncodableJsonWithdrawal, JsonWithdrawal},
|
|
keccak::{keccak256, KeccakHasher},
|
|
};
|
|
use alloy_rlp::Encodable;
|
|
use keccak_hash::KECCAK_EMPTY_LIST_RLP;
|
|
use triehash::ordered_trie_root;
|
|
use types::{
|
|
EncodableExecutionBlockHeader, EthSpec, ExecutionBlockHash, ExecutionBlockHeader,
|
|
ExecutionPayloadRef, ExecutionRequests, Hash256,
|
|
};
|
|
|
|
/// Calculate the block hash of an execution block.
|
|
///
|
|
/// Return `(block_hash, transactions_root)`, where `transactions_root` is the root of the RLP
|
|
/// transactions.
|
|
pub fn calculate_execution_block_hash<E: EthSpec>(
|
|
payload: ExecutionPayloadRef<E>,
|
|
parent_beacon_block_root: Option<Hash256>,
|
|
execution_requests: Option<&ExecutionRequests<E>>,
|
|
) -> (ExecutionBlockHash, Hash256) {
|
|
// Calculate the transactions root.
|
|
// We're currently using a deprecated Parity library for this. We should move to a
|
|
// better alternative when one appears, possibly following Reth.
|
|
let rlp_transactions_root = ordered_trie_root::<KeccakHasher, _>(
|
|
payload.transactions().iter().map(|txn_bytes| &**txn_bytes),
|
|
);
|
|
|
|
// Calculate withdrawals root (post-Capella).
|
|
let rlp_withdrawals_root = if let Ok(withdrawals) = payload.withdrawals() {
|
|
Some(ordered_trie_root::<KeccakHasher, _>(
|
|
withdrawals
|
|
.iter()
|
|
.map(|withdrawal| rlp_encode_withdrawal(&JsonWithdrawal::from(withdrawal.clone()))),
|
|
))
|
|
} else {
|
|
None
|
|
};
|
|
|
|
let rlp_blob_gas_used = payload.blob_gas_used().ok();
|
|
let rlp_excess_blob_gas = payload.excess_blob_gas().ok();
|
|
let requests_root = execution_requests.map(|requests| requests.requests_hash());
|
|
|
|
// Construct the block header.
|
|
let exec_block_header = ExecutionBlockHeader::from_payload(
|
|
payload,
|
|
KECCAK_EMPTY_LIST_RLP.as_fixed_bytes().into(),
|
|
rlp_transactions_root,
|
|
rlp_withdrawals_root,
|
|
rlp_blob_gas_used,
|
|
rlp_excess_blob_gas,
|
|
parent_beacon_block_root,
|
|
requests_root,
|
|
);
|
|
|
|
// Hash the RLP encoding of the block header.
|
|
let rlp_block_header = rlp_encode_block_header(&exec_block_header);
|
|
(
|
|
ExecutionBlockHash::from_root(keccak256(&rlp_block_header)),
|
|
rlp_transactions_root,
|
|
)
|
|
}
|
|
|
|
/// RLP encode a withdrawal.
|
|
pub fn rlp_encode_withdrawal(withdrawal: &JsonWithdrawal) -> Vec<u8> {
|
|
let mut out: Vec<u8> = vec![];
|
|
EncodableJsonWithdrawal::from(withdrawal).encode(&mut out);
|
|
out
|
|
}
|
|
|
|
/// RLP encode an execution block header.
|
|
pub fn rlp_encode_block_header(header: &ExecutionBlockHeader) -> Vec<u8> {
|
|
let mut out: Vec<u8> = vec![];
|
|
EncodableExecutionBlockHeader::from(header).encode(&mut out);
|
|
out
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
use hex::FromHex;
|
|
use std::str::FromStr;
|
|
use types::{Address, Hash256, Hash64, Uint256};
|
|
|
|
fn test_rlp_encoding(
|
|
header: &ExecutionBlockHeader,
|
|
expected_rlp: Option<&str>,
|
|
expected_hash: Hash256,
|
|
) {
|
|
let rlp_encoding = rlp_encode_block_header(header);
|
|
|
|
if let Some(expected_rlp) = expected_rlp {
|
|
let computed_rlp = hex::encode(&rlp_encoding);
|
|
assert_eq!(expected_rlp, computed_rlp);
|
|
}
|
|
|
|
let computed_hash = keccak256(&rlp_encoding);
|
|
assert_eq!(expected_hash, computed_hash);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rlp_encode_eip1559_block() {
|
|
let header = ExecutionBlockHeader {
|
|
parent_hash: Hash256::from_str("e0a94a7a3c9617401586b1a27025d2d9671332d22d540e0af72b069170380f2a").unwrap(),
|
|
ommers_hash: Hash256::from_str("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347").unwrap(),
|
|
beneficiary: Address::from_str("ba5e000000000000000000000000000000000000").unwrap(),
|
|
state_root: Hash256::from_str("ec3c94b18b8a1cff7d60f8d258ec723312932928626b4c9355eb4ab3568ec7f7").unwrap(),
|
|
transactions_root: Hash256::from_str("50f738580ed699f0469702c7ccc63ed2e51bc034be9479b7bff4e68dee84accf").unwrap(),
|
|
receipts_root: Hash256::from_str("29b0562f7140574dd0d50dee8a271b22e1a0a7b78fca58f7c60370d8317ba2a9").unwrap(),
|
|
logs_bloom: <[u8; 256]>::from_hex("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").unwrap().into(),
|
|
difficulty: Uint256::from(0x020000),
|
|
number: Uint256::from(0x01_u64),
|
|
gas_limit: Uint256::from(0x016345785d8a0000_u64),
|
|
gas_used: Uint256::from(0x015534_u64),
|
|
timestamp: 0x079e,
|
|
extra_data: vec![0x42],
|
|
mix_hash: Hash256::from_str("0000000000000000000000000000000000000000000000000000000000000000").unwrap(),
|
|
nonce: Hash64::ZERO,
|
|
base_fee_per_gas: Uint256::from(0x036b_u64),
|
|
withdrawals_root: None,
|
|
blob_gas_used: None,
|
|
excess_blob_gas: None,
|
|
parent_beacon_block_root: None,
|
|
requests_root: None,
|
|
};
|
|
let expected_rlp = "f90200a0e0a94a7a3c9617401586b1a27025d2d9671332d22d540e0af72b069170380f2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a0ec3c94b18b8a1cff7d60f8d258ec723312932928626b4c9355eb4ab3568ec7f7a050f738580ed699f0469702c7ccc63ed2e51bc034be9479b7bff4e68dee84accfa029b0562f7140574dd0d50dee8a271b22e1a0a7b78fca58f7c60370d8317ba2a9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000188016345785d8a00008301553482079e42a0000000000000000000000000000000000000000000000000000000000000000088000000000000000082036b";
|
|
let expected_hash =
|
|
Hash256::from_str("6a251c7c3c5dca7b42407a3752ff48f3bbca1fab7f9868371d9918daf1988d1f")
|
|
.unwrap();
|
|
test_rlp_encoding(&header, Some(expected_rlp), expected_hash);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rlp_encode_bellatrix_block() {
|
|
let header = ExecutionBlockHeader {
|
|
parent_hash: Hash256::from_str("927ca537f06c783a3a2635b8805eef1c8c2124f7444ad4a3389898dd832f2dbe").unwrap(),
|
|
ommers_hash: Hash256::from_str("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347").unwrap(),
|
|
beneficiary: Address::from_str("ba5e000000000000000000000000000000000000").unwrap(),
|
|
state_root: Hash256::from_str("0xe97859b065bd8dbbb4519c7cb935024de2484c2b7f881181b4360492f0b06b82").unwrap(),
|
|
transactions_root: Hash256::from_str("50f738580ed699f0469702c7ccc63ed2e51bc034be9479b7bff4e68dee84accf").unwrap(),
|
|
receipts_root: Hash256::from_str("29b0562f7140574dd0d50dee8a271b22e1a0a7b78fca58f7c60370d8317ba2a9").unwrap(),
|
|
logs_bloom: <[u8; 256]>::from_hex("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").unwrap().into(),
|
|
difficulty: Uint256::from(0x00),
|
|
number: Uint256::from(0x01_u64),
|
|
gas_limit: Uint256::from(0x016345785d8a0000_u64),
|
|
gas_used: Uint256::from(0x015534_u64),
|
|
timestamp: 0x079e,
|
|
extra_data: vec![0x42],
|
|
mix_hash: Hash256::from_str("0000000000000000000000000000000000000000000000000000000000020000").unwrap(),
|
|
nonce: Hash64::ZERO,
|
|
base_fee_per_gas: Uint256::from(0x036b_u64),
|
|
withdrawals_root: None,
|
|
blob_gas_used: None,
|
|
excess_blob_gas: None,
|
|
parent_beacon_block_root: None,
|
|
requests_root: None,
|
|
};
|
|
let expected_rlp = "f901fda0927ca537f06c783a3a2635b8805eef1c8c2124f7444ad4a3389898dd832f2dbea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a0e97859b065bd8dbbb4519c7cb935024de2484c2b7f881181b4360492f0b06b82a050f738580ed699f0469702c7ccc63ed2e51bc034be9479b7bff4e68dee84accfa029b0562f7140574dd0d50dee8a271b22e1a0a7b78fca58f7c60370d8317ba2a9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800188016345785d8a00008301553482079e42a0000000000000000000000000000000000000000000000000000000000002000088000000000000000082036b";
|
|
let expected_hash =
|
|
Hash256::from_str("0x5b1f0f2efdaa19e996b4aea59eeb67620259f09732732a339a10dac311333684")
|
|
.unwrap();
|
|
test_rlp_encoding(&header, Some(expected_rlp), expected_hash);
|
|
}
|
|
|
|
// Test a real payload from mainnet.
|
|
#[test]
|
|
fn test_rlp_encode_block_16182891() {
|
|
let header = ExecutionBlockHeader {
|
|
parent_hash: Hash256::from_str("3e9c7b3f403947f110f68c4564a004b73dd8ebf73b143e46cc637926eec01a6d").unwrap(),
|
|
ommers_hash: Hash256::from_str("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347").unwrap(),
|
|
beneficiary: Address::from_str("dafea492d9c6733ae3d56b7ed1adb60692c98bc5").unwrap(),
|
|
state_root: Hash256::from_str("5a8183d230818a167477420ce3a393ca3ef8706a7d596694ab6059894ed6fda9").unwrap(),
|
|
transactions_root: Hash256::from_str("0223f0cb35f184d2ac409e89dc0768ad738f777bd1c85d3302ca50f307180c94").unwrap(),
|
|
receipts_root: Hash256::from_str("371c76821b1cc21232574604eac5349d51647eb530e2a45d4f6fe2c501351aa5").unwrap(),
|
|
logs_bloom: <[u8; 256]>::from_hex("1a2c559955848d2662a0634cb40c7a6192a1524f11061203689bcbcdec901b054084d4f4d688009d24c10918e0089b48e72fe2d7abafb903889d10c3827c6901096612d259801b1b7ba1663a4201f5f88f416a9997c55bcc2c54785280143b057a008764c606182e324216822a2d5913e797a05c16cc1468d001acf3783b18e00e0203033e43106178db554029e83ca46402dc49d929d7882a04a0e7215041bdabf7430bd10ef4bb658a40f064c63c4816660241c2480862f26742fdf9ca41637731350301c344e439428182a03e384484e6d65d0c8a10117c6739ca201b60974519a1ae6b0c3966c0f650b449d10eae065dab2c83ab4edbab5efdea50bbc801").unwrap().into(),
|
|
difficulty: Uint256::ZERO,
|
|
number: Uint256::from(16182891),
|
|
gas_limit: Uint256::from(0x1c9c380),
|
|
gas_used: Uint256::from(0xe9b752),
|
|
timestamp: 0x6399bf63,
|
|
extra_data: hex::decode("496c6c756d696e61746520446d6f63726174697a6520447374726962757465").unwrap(),
|
|
mix_hash: Hash256::from_str("bf5289894b2ceab3549f92f063febbac896b280ddb18129a57cff13113c11b13").unwrap(),
|
|
nonce: Hash64::ZERO,
|
|
base_fee_per_gas: Uint256::from(0x34187b238_u64),
|
|
withdrawals_root: None,
|
|
blob_gas_used: None,
|
|
excess_blob_gas: None,
|
|
parent_beacon_block_root: None,
|
|
requests_root: None,
|
|
};
|
|
let expected_hash =
|
|
Hash256::from_str("6da69709cd5a34079b6604d29cd78fc01dacd7c6268980057ad92a2bede87351")
|
|
.unwrap();
|
|
test_rlp_encoding(&header, None, expected_hash);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rlp_encode_block_deneb() {
|
|
let header = ExecutionBlockHeader {
|
|
parent_hash: Hash256::from_str("172864416698b842f4c92f7b476be294b4ef720202779df194cd225f531053ab").unwrap(),
|
|
ommers_hash: Hash256::from_str("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347").unwrap(),
|
|
beneficiary: Address::from_str("878705ba3f8bc32fcf7f4caa1a35e72af65cf766").unwrap(),
|
|
state_root: Hash256::from_str("c6457d0df85c84c62d1c68f68138b6e796e8a44fb44de221386fb2d5611c41e0").unwrap(),
|
|
transactions_root: Hash256::from_str("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").unwrap(),
|
|
receipts_root: Hash256::from_str("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").unwrap(),
|
|
logs_bloom:<[u8; 256]>::from_hex("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").unwrap().into(),
|
|
difficulty: Uint256::ZERO,
|
|
number: Uint256::from(97),
|
|
gas_limit: Uint256::from(27482534),
|
|
gas_used: Uint256::ZERO,
|
|
timestamp: 1692132829u64,
|
|
extra_data: hex::decode("d883010d00846765746888676f312e32302e37856c696e7578").unwrap(),
|
|
mix_hash: Hash256::from_str("0b493c22d2ad4ca76c77ae6ad916af429b42b1dc98fdcb8e5ddbd049bbc5d623").unwrap(),
|
|
nonce: Hash64::ZERO,
|
|
base_fee_per_gas: Uint256::from(2374u64),
|
|
withdrawals_root: Some(Hash256::from_str("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").unwrap()),
|
|
blob_gas_used: Some(0x0u64),
|
|
excess_blob_gas: Some(0x0u64),
|
|
parent_beacon_block_root: Some(Hash256::from_str("f7d327d2c04e4f12e9cdd492e53d39a1d390f8b1571e3b2a22ac6e1e170e5b1a").unwrap()),
|
|
requests_root: None,
|
|
};
|
|
let expected_hash =
|
|
Hash256::from_str("a7448e600ead0a23d16f96aa46e8dea9eef8a7c5669a5f0a5ff32709afe9c408")
|
|
.unwrap();
|
|
test_rlp_encoding(&header, None, expected_hash);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rlp_encode_block_electra() {
|
|
let header = ExecutionBlockHeader {
|
|
parent_hash: Hash256::from_str("a628f146df398a339768bd101f7dc41d828be79aca5dd02cc878a51bdbadd761").unwrap(),
|
|
ommers_hash: Hash256::from_str("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347").unwrap(),
|
|
beneficiary: Address::from_str("f97e180c050e5ab072211ad2c213eb5aee4df134").unwrap(),
|
|
state_root: Hash256::from_str("fdff009f8280bd113ebb4df8ce4e2dcc9322d43184a0b506e70b7f4823ca1253").unwrap(),
|
|
transactions_root: Hash256::from_str("452806578b4fa881cafb019c47e767e37e2249accf859159f00cddefb2579bb5").unwrap(),
|
|
receipts_root: Hash256::from_str("72ceac0f16a32041c881b3220d39ca506a286bef163c01a4d0821cd4027d31c7").unwrap(),
|
|
logs_bloom:<[u8; 256]>::from_hex("10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000").unwrap().into(),
|
|
difficulty: Uint256::ZERO,
|
|
number: Uint256::from(8230),
|
|
gas_limit: Uint256::from(30000000),
|
|
gas_used: Uint256::from(3716848),
|
|
timestamp: 1730921268,
|
|
extra_data: hex::decode("d883010e0c846765746888676f312e32332e32856c696e7578").unwrap(),
|
|
mix_hash: Hash256::from_str("e87ca9a45b2e61bbe9080d897db1d584b5d2367d22e898af901091883b7b96ec").unwrap(),
|
|
nonce: Hash64::ZERO,
|
|
base_fee_per_gas: Uint256::from(7u64),
|
|
withdrawals_root: Some(Hash256::from_str("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").unwrap()),
|
|
blob_gas_used: Some(786432),
|
|
excess_blob_gas: Some(44695552),
|
|
parent_beacon_block_root: Some(Hash256::from_str("f3a888fee010ebb1ae083547004e96c254b240437823326fdff8354b1fc25629").unwrap()),
|
|
requests_root: Some(Hash256::from_str("9440d3365f07573919e1e9ac5178c20ec6fe267357ee4baf8b6409901f331b62").unwrap()),
|
|
};
|
|
let expected_hash =
|
|
Hash256::from_str("61e67afc96bf21be6aab52c1ace1db48de7b83f03119b0644deb4b69e87e09e1")
|
|
.unwrap();
|
|
test_rlp_encoding(&header, None, expected_hash);
|
|
}
|
|
}
|