Checking correctness merging of master (from beginning to infrastruct…

…ure module)
zilm13 · Oct 17, 2024 · db7139e · db7139e
1 parent 89d4630
commit db7139e
Show file tree

Hide file tree

Showing 73 changed files with 1,477 additions and 291 deletions.
diff --git a/...idator/src/jmh/java/tech/pegasys/teku/validator/coordinator/DepositProviderBenchmark.java b/...idator/src/jmh/java/tech/pegasys/teku/validator/coordinator/DepositProviderBenchmark.java
@@ -68,7 +68,7 @@ public class DepositProviderBenchmark {
       new DepositProvider(
           metricsSystem,
           mock(RecentChainData.class),
-          new Eth1DataCache(metricsSystem, new Eth1VotingPeriod(spec)),
+          new Eth1DataCache(spec, metricsSystem, new Eth1VotingPeriod(spec)),
           mock(StorageUpdateChannel.class),
           mock(Eth1DepositStorageChannel.class),
           spec,

diff --git a/beacon/validator/src/main/java/tech/pegasys/teku/validator/coordinator/DepositProvider.java b/beacon/validator/src/main/java/tech/pegasys/teku/validator/coordinator/DepositProvider.java
@@ -184,6 +184,9 @@ public void onSlot(final UInt64 slot) {
         .get()
         .thenAccept(
             state -> {
+              if (spec.isFormerDepositMechanismDisabled(state)) {
+                return;
+              }
               // We want to verify our Beacon Node view of the eth1 deposits.
               // So we want to check if it has the necessary deposit data to propose a block
               final UInt64 eth1DepositCount = state.getEth1Data().getDepositCount();

diff --git a/beacon/validator/src/main/java/tech/pegasys/teku/validator/coordinator/Eth1DataCache.java b/beacon/validator/src/main/java/tech/pegasys/teku/validator/coordinator/Eth1DataCache.java
@@ -28,6 +28,7 @@
 import tech.pegasys.teku.infrastructure.metrics.SettableGauge;
 import tech.pegasys.teku.infrastructure.metrics.TekuMetricCategory;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.datastructures.blocks.Eth1Data;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 
@@ -39,6 +40,7 @@ public class Eth1DataCache {
   static final String VOTES_CURRENT_METRIC_NAME = "eth1_current_period_votes_current";
   static final String VOTES_BEST_METRIC_NAME = "eth1_current_period_votes_best";
 
+  private final Spec spec;
   private final Eth1VotingPeriod eth1VotingPeriod;
   private final UInt64 cacheDuration;
 
@@ -50,7 +52,9 @@ public class Eth1DataCache {
   private final SettableGauge currentPeriodVotesBest;
   private final SettableGauge currentPeriodVotesMax;
 
-  public Eth1DataCache(final MetricsSystem metricsSystem, final Eth1VotingPeriod eth1VotingPeriod) {
+  public Eth1DataCache(
+      final Spec spec, final MetricsSystem metricsSystem, final Eth1VotingPeriod eth1VotingPeriod) {
+    this.spec = spec;
     this.eth1VotingPeriod = eth1VotingPeriod;
     cacheDuration = eth1VotingPeriod.getCacheDurationInSeconds();
     metricsSystem.createIntegerGauge(
@@ -111,6 +115,10 @@ public void onEth1Block(
   }
 
   public Eth1Data getEth1Vote(final BeaconState state) {
+    if (spec.isFormerDepositMechanismDisabled(state)) {
+      // no need for a real vote when Eth1 polling has been disabled
+      return state.getEth1Data();
+    }
     final NavigableMap<UInt64, Eth1Data> votesToConsider =
         getVotesToConsider(state.getSlot(), state.getGenesisTime(), state.getEth1Data());
     // Avoid using .values() directly as it has O(n) lookup which gets expensive fast
@@ -134,6 +142,10 @@ public Collection<Eth1Data> getAllEth1Blocks() {
   }
 
   public void updateMetrics(final BeaconState state) {
+    if (spec.isFormerDepositMechanismDisabled(state)) {
+      // no need to update metrics when Eth1 polling has been disabled
+      return;
+    }
     final Eth1Data currentEth1Data = state.getEth1Data();
     // Avoid using .values() directly as it has O(n) lookup which gets expensive fast
     final Set<Eth1Data> knownBlocks =

diff --git a/...on/validator/src/test/java/tech/pegasys/teku/validator/coordinator/Eth1DataCacheTest.java b/...on/validator/src/test/java/tech/pegasys/teku/validator/coordinator/Eth1DataCacheTest.java
@@ -67,7 +67,7 @@ void setUp() {
     when(eth1VotingPeriod.getSpecRangeLowerBound(SLOT, GENESIS_TIME))
         .thenReturn(VOTING_PERIOD_START);
     when(eth1VotingPeriod.getSpecRangeUpperBound(SLOT, GENESIS_TIME)).thenReturn(VOTING_PERIOD_END);
-    eth1DataCache = new Eth1DataCache(metricsSystem, eth1VotingPeriod);
+    eth1DataCache = new Eth1DataCache(spec, metricsSystem, eth1VotingPeriod);
   }
 
   // Add tests for eth1 block with no votes
@@ -215,6 +215,17 @@ void noValidVotesInThisPeriod_eth1ChainNotLive() {
     assertThat(eth1DataCache.getEth1Vote(beaconState)).isEqualTo(stateEth1Data);
   }
 
+  @Test
+  void shouldReturnStateEth1Data_ifFormerDepositMechanismHasBeenDisabled() {
+    final Spec spec = mock(Spec.class);
+    eth1DataCache = new Eth1DataCache(spec, new StubMetricsSystem(), eth1VotingPeriod);
+    final BeaconState beaconState = createBeaconStateWithVotes(createEth1Data(STATE_DEPOSIT_COUNT));
+
+    when(spec.isFormerDepositMechanismDisabled(beaconState)).thenReturn(true);
+
+    assertThat(eth1DataCache.getEth1Vote(beaconState)).isEqualTo(beaconState.getEth1Data());
+  }
+
   @Test
   void shouldPruneOldBlocksWhenNewerOnesReceived() {
     final UInt64 olderBlockTimestamp = ZERO;
@@ -254,6 +265,24 @@ void shouldUpdateMetrics() {
     assertGaugeValue(Eth1DataCache.VOTES_BEST_METRIC_NAME, 4);
   }
 
+  @Test
+  void shouldNotUpdateMetrics_ifFormerDepositMechanismHasBeenDisabled() {
+    final Spec spec = mock(Spec.class);
+    eth1DataCache = new Eth1DataCache(spec, new StubMetricsSystem(), eth1VotingPeriod);
+    final BeaconState beaconState = getStateForMetricsAssertions();
+
+    when(spec.isFormerDepositMechanismDisabled(beaconState)).thenReturn(true);
+
+    eth1DataCache.updateMetrics(beaconState);
+
+    // all gauge values are 0
+    assertGaugeValue(Eth1DataCache.VOTES_TOTAL_METRIC_NAME, 0);
+    assertGaugeValue(Eth1DataCache.VOTES_MAX_METRIC_NAME, 0);
+    assertGaugeValue(Eth1DataCache.VOTES_UNKNOWN_METRIC_NAME, 0);
+    assertGaugeValue(Eth1DataCache.VOTES_CURRENT_METRIC_NAME, 0);
+    assertGaugeValue(Eth1DataCache.VOTES_BEST_METRIC_NAME, 0);
+  }
+
   @Test
   void shouldIncludeUnknownBlocksWhenCalculatingVoteBestMetric() {
     // Metric needs to indicate when a block will be voted in which happens even when unknown

diff --git a/...validator/src/test/java/tech/pegasys/teku/validator/coordinator/Eth1DataProviderTest.java b/...validator/src/test/java/tech/pegasys/teku/validator/coordinator/Eth1DataProviderTest.java
@@ -70,7 +70,7 @@ public void setup() {
     assertThat(slotsInVotingPeriod).isEqualTo(SLOTS_IN_VOTING_PERIOD_ASSERTION);
 
     final Eth1VotingPeriod eth1VotingPeriod = new Eth1VotingPeriod(spec);
-    final Eth1DataCache eth1DataCache = new Eth1DataCache(metricsSystem, eth1VotingPeriod);
+    final Eth1DataCache eth1DataCache = new Eth1DataCache(spec, metricsSystem, eth1VotingPeriod);
     final DepositProvider depositProvider =
         new DepositProvider(
             new StubMetricsSystem(),

diff --git a/...on-test/resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blocks.json b/...on-test/resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blocks.json
@@ -10,7 +10,7 @@
       "in" : "header",
       "schema" : {
         "type" : "string",
-        "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "eip7594" ],
+        "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
         "description" : "Version of the block being submitted, if using SSZ encoding."
       }
     } ],
@@ -37,7 +37,7 @@
             }, {
               "$ref" : "#/components/schemas/SignedBlockContentsDeneb"
             }, {
-              "$ref" : "#/components/schemas/SignedBlockContentsEip7594"
+              "$ref" : "#/components/schemas/SignedBlockContentsElectra"
             } ]
           }
         }

diff --git a/...ces/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_light_client_updates.json b/...ces/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_light_client_updates.json
@@ -44,7 +44,7 @@
                       "bellatrix",
                       "capella",
                       "deneb",
-                      "eip7594"
+                      "electra"
                     ]
                   },
                   "data": {

diff --git a/...beacon/schema/BeaconBlockBodyEip7594.json → ...beacon/schema/BeaconBlockBodyElectra.json b/...beacon/schema/BeaconBlockBodyEip7594.json → ...beacon/schema/BeaconBlockBodyElectra.json
diff --git a/...pi/beacon/schema/BlindedBlockEip7594.json → ...api/beacon/schema/BeaconBlockElectra.json b/...pi/beacon/schema/BlindedBlockEip7594.json → ...api/beacon/schema/BeaconBlockElectra.json
@@ -1,5 +1,5 @@
 {
-  "title" : "BlindedBlockEip7594",
+  "title" : "BeaconBlockElectra",
   "type" : "object",
   "required" : [ "slot", "proposer_index", "parent_root", "state_root", "body" ],
   "properties" : {
@@ -28,7 +28,7 @@
       "format" : "byte"
     },
     "body" : {
-      "$ref" : "#/components/schemas/BlindedBlockBodyEip7594"
+      "$ref" : "#/components/schemas/BeaconBlockBodyElectra"
     }
   }
 }
diff --git a/...api/beacon/schema/BeaconStateEip7594.json → ...api/beacon/schema/BeaconStateElectra.json b/...api/beacon/schema/BeaconStateEip7594.json → ...api/beacon/schema/BeaconStateElectra.json
@@ -1,7 +1,7 @@
 {
   "title" : "BeaconStateElectra",
   "type" : "object",
-  "required" : [ "genesis_time", "genesis_validators_root", "slot", "fork", "latest_block_header", "block_roots", "state_roots", "historical_roots", "eth1_data", "eth1_data_votes", "eth1_deposit_index", "validators", "balances", "randao_mixes", "slashings", "previous_epoch_participation", "current_epoch_participation", "justification_bits", "previous_justified_checkpoint", "current_justified_checkpoint", "finalized_checkpoint", "inactivity_scores", "current_sync_committee", "next_sync_committee", "latest_execution_payload_header", "next_withdrawal_index", "next_withdrawal_validator_index", "historical_summaries", "deposit_requests_start_index", "deposit_balance_to_consume", "exit_balance_to_consume", "earliest_exit_epoch", "consolidation_balance_to_consume", "earliest_consolidation_epoch", "pending_balance_deposits", "pending_partial_withdrawals", "pending_consolidations" ],
+  "required" : [ "genesis_time", "genesis_validators_root", "slot", "fork", "latest_block_header", "block_roots", "state_roots", "historical_roots", "eth1_data", "eth1_data_votes", "eth1_deposit_index", "validators", "balances", "randao_mixes", "slashings", "previous_epoch_participation", "current_epoch_participation", "justification_bits", "previous_justified_checkpoint", "current_justified_checkpoint", "finalized_checkpoint", "inactivity_scores", "current_sync_committee", "next_sync_committee", "latest_execution_payload_header", "next_withdrawal_index", "next_withdrawal_validator_index", "historical_summaries", "deposit_requests_start_index", "deposit_balance_to_consume", "exit_balance_to_consume", "earliest_exit_epoch", "consolidation_balance_to_consume", "earliest_consolidation_epoch", "pending_deposits", "pending_partial_withdrawals", "pending_consolidations" ],
   "properties" : {
     "genesis_time" : {
       "type" : "string",
@@ -207,10 +207,10 @@
       "example" : "1",
       "format" : "uint64"
     },
-    "pending_balance_deposits" : {
+    "pending_deposits" : {
       "type" : "array",
       "items" : {
-        "$ref" : "#/components/schemas/PendingBalanceDeposit"
+        "$ref" : "#/components/schemas/PendingDeposit"
       }
     },
     "pending_partial_withdrawals" : {

diff --git a/...eacon/schema/BlindedBlockBodyEip7594.json → ...eacon/schema/BlindedBlockBodyElectra.json b/...eacon/schema/BlindedBlockBodyEip7594.json → ...eacon/schema/BlindedBlockBodyElectra.json
diff --git a/...ion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BlindedBlockElectra.json b/...ion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BlindedBlockElectra.json
@@ -0,0 +1,34 @@
+{
+  "title" : "BlindedBlockElectra",
+  "type" : "object",
+  "required" : [ "slot", "proposer_index", "parent_root", "state_root", "body" ],
+  "properties" : {
+    "slot" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "proposer_index" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "parent_root" : {
+      "type" : "string",
+      "description" : "Bytes32 hexadecimal",
+      "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+      "format" : "byte"
+    },
+    "state_root" : {
+      "type" : "string",
+      "description" : "Bytes32 hexadecimal",
+      "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+      "format" : "byte"
+    },
+    "body" : {
+      "$ref" : "#/components/schemas/BlindedBlockBodyElectra"
+    }
+  }
+}
diff --git a/...i/beacon/schema/BlockContentsEip7594.json → ...i/beacon/schema/BlockContentsElectra.json b/...i/beacon/schema/BlockContentsEip7594.json → ...i/beacon/schema/BlockContentsElectra.json
@@ -1,10 +1,10 @@
 {
-  "title" : "BlockContentsEip7594",
+  "title" : "BlockContentsElectra",
   "type" : "object",
   "required" : [ "block", "kzg_proofs", "blobs" ],
   "properties" : {
     "block" : {
-      "$ref" : "#/components/schemas/BeaconBlockEip7594"
+      "$ref" : "#/components/schemas/BeaconBlockElectra"
     },
     "kzg_proofs" : {
       "type" : "array",

diff --git a/...egration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/DepositRequest.json b/...egration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/DepositRequest.json
@@ -1,38 +1,37 @@
 {
-<<<<<<<< HEAD:data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/DepositRequest.json
   "title" : "DepositRequest",
-========
-  "title" : "BeaconBlockEip7594",
->>>>>>>> das:data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BeaconBlockEip7594.json
   "type" : "object",
-  "required" : [ "slot", "proposer_index", "parent_root", "state_root", "body" ],
+  "required" : [ "pubkey", "withdrawal_credentials", "amount", "signature", "index" ],
   "properties" : {
-    "slot" : {
+    "pubkey" : {
       "type" : "string",
-      "description" : "unsigned 64 bit integer",
-      "example" : "1",
-      "format" : "uint64"
+      "pattern" : "^0x[a-fA-F0-9]{2,}$",
+      "description" : "Bytes48 hexadecimal",
+      "format" : "bytes"
     },
-    "proposer_index" : {
+    "withdrawal_credentials" : {
+      "type" : "string",
+      "description" : "Bytes32 hexadecimal",
+      "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+      "format" : "byte"
+    },
+    "amount" : {
       "type" : "string",
       "description" : "unsigned 64 bit integer",
       "example" : "1",
       "format" : "uint64"
     },
-    "parent_root" : {
+    "signature" : {
       "type" : "string",
-      "description" : "Bytes32 hexadecimal",
-      "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-      "format" : "byte"
+      "pattern" : "^0x[a-fA-F0-9]{2,}$",
+      "description" : "SSZ hexadecimal",
+      "format" : "bytes"
     },
-    "state_root" : {
+    "index" : {
       "type" : "string",
-      "description" : "Bytes32 hexadecimal",
-      "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-      "format" : "byte"
-    },
-    "body" : {
-      "$ref" : "#/components/schemas/BeaconBlockBodyEip7594"
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
     }
   }
 }
diff --git a/...t/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetAllBlocksAtSlotResponse.json b/...t/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetAllBlocksAtSlotResponse.json
@@ -5,7 +5,7 @@
   "properties" : {
     "version" : {
       "type" : "string",
-      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "eip7594" ]
+      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
     },
     "data" : {
       "type" : "array",
@@ -27,7 +27,7 @@
             }, {
               "$ref" : "#/components/schemas/BeaconBlockDeneb"
             }, {
-              "$ref" : "#/components/schemas/BeaconBlockEip7594"
+              "$ref" : "#/components/schemas/BeaconBlockElectra"
             } ]
           },
           "signature" : {

diff --git a/...test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetBlindedBlockResponse.json b/...test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetBlindedBlockResponse.json
@@ -5,7 +5,7 @@
   "properties" : {
     "version" : {
       "type" : "string",
-      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "eip7594" ]
+      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
     },
     "execution_optimistic" : {
       "type" : "boolean"
@@ -27,7 +27,7 @@
       }, {
         "$ref" : "#/components/schemas/SignedBlindedBlockDeneb"
       }, {
-        "$ref" : "#/components/schemas/SignedBlindedBlockEip7594"
+        "$ref" : "#/components/schemas/SignedBlindedBlockElectra"
       }  ]
     }
   }

diff --git a/...tion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetBlockV2Response.json b/...tion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetBlockV2Response.json
@@ -5,7 +5,7 @@
   "properties" : {
     "version" : {
       "type" : "string",
-      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "eip7594" ]
+      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
     },
     "execution_optimistic" : {
       "type" : "boolean"
@@ -27,7 +27,7 @@
       }, {
         "$ref" : "#/components/schemas/SignedBeaconBlockDeneb"
       }, {
-        "$ref" : "#/components/schemas/SignedBeaconBlockEip7594"
+        "$ref" : "#/components/schemas/SignedBeaconBlockElectra"
       }  ]
     }
   }

diff --git a/...ources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetLightClientBootstrapResponse.json b/...ources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetLightClientBootstrapResponse.json
@@ -5,7 +5,7 @@
   "properties" : {
     "version" : {
       "type" : "string",
-      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "eip7594" ]
+      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
     },
     "data" : {
       "$ref" : "#/components/schemas/LightClientBootstrap"

diff --git a/...tion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetStateV2Response.json b/...tion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetStateV2Response.json
@@ -5,7 +5,7 @@
   "properties" : {
     "version" : {
       "type" : "string",
-      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "eip7594" ]
+      "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
     },
     "execution_optimistic" : {
       "type" : "boolean"
@@ -27,7 +27,7 @@
       }, {
         "$ref" : "#/components/schemas/BeaconStateDeneb"
       }, {
-        "$ref" : "#/components/schemas/BeaconStateEip7594"
+        "$ref" : "#/components/schemas/BeaconStateElectra"
       }  ]
     }
   }