Beacon api + validator electra

beacon_node/beacon_chain/src/eth1_chain.rs

@@ -546,12 +546,20 @@ impl<E: EthSpec> Eth1ChainBackend<E> for CachingEth1Backend<E> {
             state.eth1_data().deposit_count
         };
 
-        match deposit_index.cmp(&deposit_count) {
+        // [New in Electra:EIP6110]
+        let deposit_index_limit =
+            if let Ok(deposit_receipts_start_index) = state.deposit_requests_start_index() {
+                std::cmp::min(deposit_count, deposit_receipts_start_index)
+            } else {
+                deposit_count
+            };
+
+        match deposit_index.cmp(&deposit_index_limit) {
             Ordering::Greater => Err(Error::DepositIndexTooHigh),
             Ordering::Equal => Ok(vec![]),
             Ordering::Less => {
                 let next = deposit_index;
-                let last = std::cmp::min(deposit_count, next + E::MaxDeposits::to_u64());
+                let last = std::cmp::min(deposit_index_limit, next + E::MaxDeposits::to_u64());
 
                 self.core
                     .deposits()

beacon_node/http_api/tests/fork_tests.rs

@@ -150,8 +150,13 @@ async fn attestations_across_fork_with_skip_slots() {
         .collect::<Vec<_>>();
 
     assert!(!unaggregated_attestations.is_empty());
+    let fork_name = harness.spec.fork_name_at_slot::<E>(fork_slot);
     client
-        .post_beacon_pool_attestations(&unaggregated_attestations)
+        .post_beacon_pool_attestations_v1(&unaggregated_attestations)
+        .await
+        .unwrap();
+    client
+        .post_beacon_pool_attestations_v2(&unaggregated_attestations, fork_name)
         .await
         .unwrap();
 
@@ -162,7 +167,11 @@ async fn attestations_across_fork_with_skip_slots() {
     assert!(!signed_aggregates.is_empty());
 
     client
-        .post_validator_aggregate_and_proof(&signed_aggregates)
+        .post_validator_aggregate_and_proof_v1(&signed_aggregates)
+        .await
+        .unwrap();
+    client
+        .post_validator_aggregate_and_proof_v2(&signed_aggregates, fork_name)
         .await
         .unwrap();
 }

beacon_node/http_api/tests/interactive_tests.rs

@@ -890,9 +890,10 @@ async fn queue_attestations_from_http() {
         .flat_map(|attestations| attestations.into_iter().map(|(att, _subnet)| att))
         .collect::<Vec<_>>();
 
+    let fork_name = tester.harness.spec.fork_name_at_slot::<E>(attestation_slot);
     let attestation_future = tokio::spawn(async move {
         client
-            .post_beacon_pool_attestations(&attestations)
+            .post_beacon_pool_attestations_v2(&attestations, fork_name)
             .await
             .expect("attestations should be processed successfully")
     });