feat(l1): fix EIP-8025 compliance #6516
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,33 +4,38 @@ | |
| //! `NewPayloadRequest` and producing the `PublicInput` committed to by | ||
| //! execution proofs. | ||
|
|
||
| use bytes::Bytes; | ||
| use libssz::{SszDecode, SszEncode}; | ||
| use libssz_derive::{HashTreeRoot, SszDecode, SszEncode}; | ||
| use libssz_merkle::{HashTreeRoot, Sha256Hasher}; | ||
| use libssz_types::{SszList, SszVector}; | ||
|
|
||
| use super::requests::EncodedRequests; | ||
|
|
||
| // ── Spec limits (Electra) ────────────────────────────────────────── | ||
|
|
||
| /// `MAX_TRANSACTIONS_PER_PAYLOAD` (Electra). | ||
| const MAX_TRANSACTIONS_PER_PAYLOAD: usize = 1_048_576; | ||
| /// `MAX_WITHDRAWALS_PER_PAYLOAD` (Electra). | ||
| const MAX_WITHDRAWALS_PER_PAYLOAD: usize = 16; | ||
| /// `MAX_BYTES_PER_TRANSACTION`. | ||
| const MAX_BYTES_PER_TRANSACTION: usize = 1_073_741_824; | ||
| /// `MAX_EXTRA_DATA_BYTES`. | ||
| const MAX_EXTRA_DATA_BYTES: usize = 32; | ||
|
Comment on lines
-26
to
-27
Contributor
Author
There was a problem hiding this comment. Note that the previous |
||
| /// `MAX_DEPOSIT_REQUESTS_PER_PAYLOAD` (Electra). | ||
| const MAX_DEPOSIT_REQUESTS_PER_PAYLOAD: usize = 8192; | ||
| /// `MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD` (Electra). | ||
| const MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: usize = 16; | ||
| /// `MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD` (Electra). | ||
| const MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: usize = 2; | ||
| /// `MAX_BLOB_COMMITMENTS_PER_BLOCK` (Electra). | ||
| const MAX_BLOB_COMMITMENTS_PER_BLOCK: usize = 4096; | ||
|
|
||
| // ── EIP-7685 request type prefixes ───────────────────────────────── | ||
|
|
||
| const DEPOSIT_REQUEST_TYPE: u8 = 0x00; | ||
| const WITHDRAWAL_REQUEST_TYPE: u8 = 0x01; | ||
| const CONSOLIDATION_REQUEST_TYPE: u8 = 0x02; | ||
|
|
||
| // ── Bytes20 wrapper (address) ────────────────────────────────────── | ||
| // | ||
|
|
@@ -95,7 +100,7 @@ impl From<Bytes20> for [u8; 20] { | |
| // `logs_bloom` is `ByteVector[BYTES_PER_LOGS_BLOOM]` in the CL spec — | ||
| // a fixed-length SSZ vector of 256 bytes. | ||
|
|
||
| /// `BYTES_PER_LOGS_BLOOM` from the CL spec. | ||
| pub const BYTES_PER_LOGS_BLOOM: usize = 256; | ||
|
|
||
| /// `ByteVector[256]` — the logs bloom as a fixed-size SSZ vector. | ||
|
|
@@ -158,41 +163,52 @@ pub struct ExecutionPayload { | |
| /// `base_fee_per_gas` encoded as a 256-bit unsigned integer (little-endian). | ||
| pub base_fee_per_gas: [u8; 32], | ||
| pub block_hash: [u8; 32], | ||
| pub transactions: SszList<SszList<u8, MAX_BYTES_PER_TRANSACTION>, MAX_TRANSACTIONS_PER_PAYLOAD>, | ||
| pub withdrawals: SszList<Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD>, | ||
| pub blob_gas_used: u64, | ||
| pub excess_blob_gas: u64, | ||
|
Comment on lines
-165
to
-167
Contributor
Author
There was a problem hiding this comment. In the specs, |
||
| } | ||
|
|
||
| // ── ExecutionRequests ────────────────────────────────────────────── | ||
|
|
||
| /// SSZ `ExecutionRequests` container (Electra) — the typed EIP-7685 bundle | ||
| /// that the CL commits to alongside `ExecutionPayload`. | ||
| #[derive(Debug, Clone, PartialEq, Eq, SszEncode, SszDecode, HashTreeRoot)] | ||
|
Contributor
Author
There was a problem hiding this comment. This isn't strictly required so we can remove. |
||
| pub struct ExecutionRequests { | ||
|
Contributor
Author
There was a problem hiding this comment. See my next comment to understand this. |
||
| pub deposits: SszList<DepositRequest, MAX_DEPOSIT_REQUESTS_PER_PAYLOAD>, | ||
| pub withdrawals: SszList<WithdrawalRequest, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD>, | ||
| pub consolidations: SszList<ConsolidationRequest, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD>, | ||
| } | ||
|
|
||
| impl ExecutionRequests { | ||
| /// Produce the EIP-7685 encoded form: three `EncodedRequests` entries, | ||
| /// one per request type, each `[type_byte] ++ concat(ssz_encode(item))`. | ||
| /// | ||
| /// The three request types are all fixed-size SSZ containers, so their | ||
| /// SSZ encoding is byte-for-byte the EL wire concatenation that | ||
| /// `compute_requests_hash` expects. | ||
| pub fn to_encoded_requests(&self) -> Vec<EncodedRequests> { | ||
| fn encode<T: SszEncode>( | ||
| type_byte: u8, | ||
| items: impl IntoIterator<Item = T>, | ||
| ) -> EncodedRequests { | ||
| let mut buf = Vec::new(); | ||
| buf.push(type_byte); | ||
| for item in items { | ||
| item.ssz_append(&mut buf); | ||
| } | ||
| EncodedRequests(Bytes::from(buf)) | ||
| } | ||
|
|
||
| vec![ | ||
| encode(DEPOSIT_REQUEST_TYPE, self.deposits.iter().cloned()), | ||
| encode(WITHDRAWAL_REQUEST_TYPE, self.withdrawals.iter().cloned()), | ||
| encode( | ||
| CONSOLIDATION_REQUEST_TYPE, | ||
| self.consolidations.iter().cloned(), | ||
| ), | ||
| ] | ||
| } | ||
|
Comment on lines
+183
to
+211
There was a problem hiding this comment.
|
||
| } | ||
|
|
||
| // ── NewPayloadRequest ────────────────────────────────────────────── | ||
|
|
@@ -202,20 +218,9 @@ pub struct ExecutionPayloadHeader { | |
| #[derive(Debug, Clone, PartialEq, Eq, SszEncode, SszDecode, HashTreeRoot)] | ||
| pub struct NewPayloadRequest { | ||
| pub execution_payload: ExecutionPayload, | ||
| pub versioned_hashes: SszList<[u8; 32], MAX_BLOB_COMMITMENTS_PER_BLOCK>, | ||
| pub parent_beacon_block_root: [u8; 32], | ||
| pub execution_requests: ExecutionRequests, | ||
|
Comment on lines
-217
to
+223
Contributor
Author
There was a problem hiding this comment. The consensus-specs don't define Fixing it here. |
||
| } | ||
|
|
||
| // ── PublicInput ──────────────────────────────────────────────────── | ||
|
|
@@ -227,37 +232,6 @@ pub struct PublicInput { | |
| pub new_payload_request_root: [u8; 32], | ||
| } | ||
|
|
||
| impl NewPayloadRequest { | ||
| /// Compute the `hash_tree_root` of this request — the value that | ||
| /// becomes the execution proof's public input. | ||
|
|
@@ -266,16 +240,6 @@ impl NewPayloadRequest { | |
| new_payload_request_root: self.hash_tree_root(hasher), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
|
|
@@ -291,61 +255,56 @@ mod tests { | |
| fee_recipient: Bytes20([2u8; 20]), | ||
| state_root: [3u8; 32], | ||
| receipts_root: [4u8; 32], | ||
| logs_bloom: vec![0u8; 256].try_into().expect("logs_bloom length"), | ||
| prev_randao: [5u8; 32], | ||
| block_number: 42, | ||
| gas_limit: 30_000_000, | ||
| gas_used: 21_000, | ||
| timestamp: 1_700_000_000, | ||
| extra_data: vec![0xAB, 0xCD].try_into().expect("extra_data fits"), | ||
| base_fee_per_gas: { | ||
| let mut b = [0u8; 32]; | ||
| b[0] = 7; // 7 in LE | ||
| b | ||
| }, | ||
| block_hash: [6u8; 32], | ||
| transactions: vec![ | ||
| vec![0xDE, 0xAD, 0xBE, 0xEF] | ||
| .try_into() | ||
| .expect("tx bytes fit"), | ||
| ] | ||
| .try_into() | ||
| .expect("txs fit"), | ||
| withdrawals: vec![Withdrawal { | ||
| index: 0, | ||
| validator_index: 1, | ||
| address: Bytes20([7u8; 20]), | ||
| amount: 1_000_000, | ||
| }] | ||
| .try_into() | ||
| .expect("withdrawals fit"), | ||
| blob_gas_used: 0, | ||
| excess_blob_gas: 0, | ||
| } | ||
| } | ||
|
|
||
| fn empty_requests() -> ExecutionRequests { | ||
| ExecutionRequests { | ||
| deposits: vec![].try_into().expect("empty deposits"), | ||
| withdrawals: vec![].try_into().expect("empty withdrawals"), | ||
| consolidations: vec![].try_into().expect("empty consolidations"), | ||
| } | ||
| } | ||
|
|
||
| fn sample_request() -> NewPayloadRequest { | ||
| NewPayloadRequest { | ||
| execution_payload: sample_payload(), | ||
| versioned_hashes: vec![].try_into().expect("empty versioned_hashes"), | ||
| parent_beacon_block_root: [8u8; 32], | ||
| execution_requests: empty_requests(), | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_ssz_root_changes_with_different_data() { | ||
| let request1 = sample_request(); | ||
|
|
@@ -359,44 +318,55 @@ mod tests { | |
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_ssz_root_is_deterministic() { | ||
| let request = sample_request(); | ||
| let root1 = request.hash_tree_root(&HASHER); | ||
| let root2 = request.hash_tree_root(&HASHER); | ||
| assert_eq!(root1, root2, "Same request must produce same root"); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_execution_requests_to_encoded_bytes() { | ||
| let requests = ExecutionRequests { | ||
| deposits: vec![DepositRequest { | ||
| pubkey: [0x11; 48], | ||
| withdrawal_credentials: [0x22; 32], | ||
| amount: 32_000_000_000, | ||
| signature: [0x33; 96], | ||
| index: 7, | ||
| }] | ||
| .try_into() | ||
| .expect("one deposit fits"), | ||
| withdrawals: vec![WithdrawalRequest { | ||
| source_address: Bytes20([0x44; 20]), | ||
| validator_pubkey: [0x55; 48], | ||
| amount: 1_000_000, | ||
| }] | ||
| .try_into() | ||
| .expect("one withdrawal fits"), | ||
| consolidations: vec![ConsolidationRequest { | ||
| source_address: Bytes20([0x66; 20]), | ||
| source_pubkey: [0x77; 48], | ||
| target_pubkey: [0x88; 48], | ||
| }] | ||
| .try_into() | ||
| .expect("one consolidation fits"), | ||
| }; | ||
|
|
||
| let encoded = requests.to_encoded_requests(); | ||
| assert_eq!(encoded.len(), 3, "must emit 3 EIP-7685 entries"); | ||
|
|
||
| // Deposit: [0x00] ++ 192 bytes | ||
| assert_eq!(encoded[0].0[0], DEPOSIT_REQUEST_TYPE); | ||
| assert_eq!(encoded[0].0.len(), 1 + 192); | ||
|
|
||
| // Withdrawal: [0x01] ++ 76 bytes | ||
| assert_eq!(encoded[1].0[0], WITHDRAWAL_REQUEST_TYPE); | ||
| assert_eq!(encoded[1].0.len(), 1 + 76); | ||
|
|
||
| // Consolidation: [0x02] ++ 116 bytes | ||
| assert_eq!(encoded[2].0[0], CONSOLIDATION_REQUEST_TYPE); | ||
| assert_eq!(encoded[2].0.len(), 1 + 116); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some renamings to conform to the consensus-spec names, but also some fixes that I'll comment in particular.