Merge pull request #391 from jacobkaufmann/feat-electra-block-processing

feat: electra block processing
ralexstokes · Apr 26, 2024 · 43ca5e0 · 43ca5e0
2 parents 6c73053 + 149a0a5
commit 43ca5e0
Show file tree

Hide file tree

Showing 8 changed files with 1,144 additions and 444 deletions.
diff --git a/ethereum-consensus/src/electra/block_processing.rs b/ethereum-consensus/src/electra/block_processing.rs
diff --git a/ethereum-consensus/src/electra/execution_engine.rs b/ethereum-consensus/src/electra/execution_engine.rs
@@ -0,0 +1,47 @@
+use crate::{
+    deneb::polynomial_commitments::VersionedHash, electra::ExecutionPayload,
+    execution_engine::PayloadRequest, primitives::Root,
+};
+
+pub struct NewPayloadRequest<
+    const BYTES_PER_LOGS_BLOOM: usize,
+    const MAX_EXTRA_DATA_BYTES: usize,
+    const MAX_BYTES_PER_TRANSACTION: usize,
+    const MAX_TRANSACTIONS_PER_PAYLOAD: usize,
+    const MAX_WITHDRAWALS_PER_PAYLOAD: usize,
+    const MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: usize,
+    const MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: usize,
+> {
+    pub execution_payload: ExecutionPayload<
+        BYTES_PER_LOGS_BLOOM,
+        MAX_EXTRA_DATA_BYTES,
+        MAX_BYTES_PER_TRANSACTION,
+        MAX_TRANSACTIONS_PER_PAYLOAD,
+        MAX_WITHDRAWALS_PER_PAYLOAD,
+        MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD,
+        MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD,
+    >,
+    pub versioned_hashes: Vec<VersionedHash>,
+    pub parent_beacon_block_root: Root,
+}
+
+impl<
+        const BYTES_PER_LOGS_BLOOM: usize,
+        const MAX_EXTRA_DATA_BYTES: usize,
+        const MAX_BYTES_PER_TRANSACTION: usize,
+        const MAX_TRANSACTIONS_PER_PAYLOAD: usize,
+        const MAX_WITHDRAWALS_PER_PAYLOAD: usize,
+        const MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: usize,
+        const MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: usize,
+    > PayloadRequest
+    for NewPayloadRequest<
+        BYTES_PER_LOGS_BLOOM,
+        MAX_EXTRA_DATA_BYTES,
+        MAX_BYTES_PER_TRANSACTION,
+        MAX_TRANSACTIONS_PER_PAYLOAD,
+        MAX_WITHDRAWALS_PER_PAYLOAD,
+        MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD,
+        MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD,
+    >
+{
+}
diff --git a/ethereum-consensus/src/electra/execution_payload.rs b/ethereum-consensus/src/electra/execution_payload.rs
@@ -91,7 +91,7 @@ impl<
         const MAX_TRANSACTIONS_PER_PAYLOAD: usize,
         const MAX_WITHDRAWALS_PER_PAYLOAD: usize,
         const MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: usize,
-        const MAX_EXECUTION_LAYER_EXITS: usize,
+        const MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: usize,
     >
     TryFrom<
         &'a ExecutionPayload<
@@ -101,7 +101,7 @@ impl<
             MAX_TRANSACTIONS_PER_PAYLOAD,
             MAX_WITHDRAWALS_PER_PAYLOAD,
             MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD,
-            MAX_EXECUTION_LAYER_EXITS,
+            MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD,
         >,
     > for ExecutionPayloadHeader<BYTES_PER_LOGS_BLOOM, MAX_EXTRA_DATA_BYTES>
 {
@@ -115,7 +115,7 @@ impl<
             MAX_TRANSACTIONS_PER_PAYLOAD,
             MAX_WITHDRAWALS_PER_PAYLOAD,
             MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD,
-            MAX_EXECUTION_LAYER_EXITS,
+            MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD,
         >,
     ) -> Result<ExecutionPayloadHeader<BYTES_PER_LOGS_BLOOM, MAX_EXTRA_DATA_BYTES>, Self::Error>
     {

diff --git a/ethereum-consensus/src/electra/helpers.rs b/ethereum-consensus/src/electra/helpers.rs
@@ -423,8 +423,6 @@ pub fn switch_to_compounding_validator<
     const PENDING_BALANCE_DEPOSITS_LIMIT: usize,
     const PENDING_PARTIAL_WITHDRAWALS_LIMIT: usize,
     const PENDING_CONSOLIDATIONS_LIMIT: usize,
-    const MAX_VALIDATORS_PER_SLOT: usize,
-    const MAX_COMMITTEES_PER_SLOT: usize,
 >(
     state: &mut BeaconState<
         SLOTS_PER_HISTORICAL_ROOT,

diff --git a/ethereum-consensus/src/electra/mod.rs b/ethereum-consensus/src/electra/mod.rs
@@ -2,6 +2,7 @@ pub mod beacon_block;
 pub mod beacon_state;
 pub mod block_processing;
 pub mod constants;
+pub mod execution_engine;
 pub mod execution_payload;
 pub mod fork;
 pub mod genesis;