From f1f9f92dec41d890d665cc51ed60b93e4eef0774 Mon Sep 17 00:00:00 2001
From: realbigsean <seananderson33@GMAIL.com>
Date: Mon, 6 May 2024 21:56:50 -0400
Subject: [PATCH] =?UTF-8?q?update=20`process=5Foperations`=C2=A0deposit=20?=
 =?UTF-8?q?length=20check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process_operations.rs                     | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/consensus/state_processing/src/per_block_processing/process_operations.rs b/consensus/state_processing/src/per_block_processing/process_operations.rs
index 9b4e9d7139..9aaef8f965 100644
--- a/consensus/state_processing/src/per_block_processing/process_operations.rs
+++ b/consensus/state_processing/src/per_block_processing/process_operations.rs
@@ -357,17 +357,34 @@ pub fn process_deposits<E: EthSpec>(
     deposits: &[Deposit],
     spec: &ChainSpec,
 ) -> Result<(), BlockProcessingError> {
-    let expected_deposit_len = std::cmp::min(
-        E::MaxDeposits::to_u64(),
-        state.get_outstanding_deposit_len()?,
-    );
-    block_verify!(
-        deposits.len() as u64 == expected_deposit_len,
-        BlockProcessingError::DepositCountInvalid {
-            expected: expected_deposit_len as usize,
-            found: deposits.len(),
-        }
-    );
+    // [Modified in Electra:EIP6110]
+    // Disable former deposit mechanism once all prior deposits are processed
+    //
+    // If `deposit_receipts_start_index` does not exist as a field on `state`, electra is disabled
+    // which means we always want to use the old check, so this field defaults to `u64::MAX`.
+    let eth1_deposit_index_limit = state.deposit_receipts_start_index().unwrap_or(u64::MAX);
+
+    if state.eth1_deposit_index() < eth1_deposit_index_limit {
+        let expected_deposit_len = std::cmp::min(
+            E::MaxDeposits::to_u64(),
+            state.get_outstanding_deposit_len()?,
+        );
+        block_verify!(
+            deposits.len() as u64 == expected_deposit_len,
+            BlockProcessingError::DepositCountInvalid {
+                expected: expected_deposit_len as usize,
+                found: deposits.len(),
+            }
+        );
+    } else {
+        block_verify!(
+            deposits.len() as u64 == 0,
+            BlockProcessingError::DepositCountInvalid {
+                expected: 0,
+                found: deposits.len(),
+            }
+        );
+    }
 
     // Verify merkle proofs in parallel.
     deposits