Added warning for genesis state not matching latest block header (#9482)

This will give earlier warning when an invalid genesis state is in use.

Signed-off-by: Paul Harris <paul.harris@consensys.net>

Author: rolfyone

CHANGELOG.md

@@ -20,4 +20,5 @@
 - Improved configuration loading to use builtin configurations to default any fields we need that were missing from a passed in configuration.
 - Add `/teku/v1/admin/add_peer` endpoint to allow adding static peers via the REST API.
 
-### Bug Fixes
+### Bug Fixes
+ - Added an error if the genesis state has invalid data in its latest block header.

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/state/AnchorPoint.java

@@ -84,6 +84,11 @@ public static AnchorPoint fromGenesisState(final Spec spec, final BeaconState ge
         SignedBeaconBlock.create(spec, genesisBlock, BLSSignature.empty());
 
     final Bytes32 genesisBlockRoot = genesisBlock.hashTreeRoot();
+    checkArgument(
+        genesisState.getLatestBlockHeader().getBodyRoot().equals(genesisBlock.getBodyRoot()),
+        String.format(
+            "Genesis block root %s does not match genesis state latest block root %s",
+            genesisState.getLatestBlockHeader().getBodyRoot(), genesisBlock.getBodyRoot()));
     final UInt64 genesisEpoch = spec.getCurrentEpoch(genesisState);
     final Checkpoint genesisCheckpoint = new Checkpoint(genesisEpoch, genesisBlockRoot);
 

ethereum/spec/src/test/java/tech/pegasys/teku/spec/datastructures/state/AnchorPointTest.java

@@ -21,6 +21,7 @@
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
 import tech.pegasys.teku.spec.datastructures.blocks.BeaconBlockAndState;
+import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
 
 public class AnchorPointTest {
@@ -41,4 +42,15 @@ public void create_withCheckpointPriorToState() {
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("Block must be at or prior to the start of the checkpoint epoch");
   }
+
+  @Test
+  public void shouldDetectInvalidGenesisStateWithMismatchedBlockHeader() {
+    final BeaconState beaconState = dataStructureUtil.genesisBeaconState(12);
+    final BeaconState brokenGenesisState =
+        beaconState.updated(
+            s -> s.setLatestBlockHeader(dataStructureUtil.randomBeaconBlockHeader()));
+    assertThatThrownBy(() -> AnchorPoint.fromGenesisState(spec, brokenGenesisState))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("does not match genesis state latest block root");
+  }
 }

ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/util/DataStructureUtil.java

@@ -77,6 +77,7 @@
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszPrimitiveListSchema;
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszPrimitiveVectorSchema;
 import tech.pegasys.teku.infrastructure.ssz.schema.collections.SszUInt64ListSchema;
+import tech.pegasys.teku.infrastructure.time.SystemTimeProvider;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.kzg.KZGCell;
 import tech.pegasys.teku.kzg.KZGCommitment;
@@ -144,6 +145,7 @@
 import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequestsSchema;
 import tech.pegasys.teku.spec.datastructures.execution.versions.electra.WithdrawalRequest;
 import tech.pegasys.teku.spec.datastructures.forkchoice.VoteTracker;
+import tech.pegasys.teku.spec.datastructures.interop.MockStartDepositGenerator;
 import tech.pegasys.teku.spec.datastructures.lightclient.LightClientBootstrap;
 import tech.pegasys.teku.spec.datastructures.lightclient.LightClientBootstrapSchema;
 import tech.pegasys.teku.spec.datastructures.lightclient.LightClientHeaderSchema;
@@ -198,6 +200,7 @@
 import tech.pegasys.teku.spec.datastructures.type.SszKZGProof;
 import tech.pegasys.teku.spec.datastructures.type.SszPublicKey;
 import tech.pegasys.teku.spec.datastructures.type.SszSignature;
+import tech.pegasys.teku.spec.datastructures.util.DepositGenerator;
 import tech.pegasys.teku.spec.datastructures.validator.BeaconPreparableProposer;
 import tech.pegasys.teku.spec.executionlayer.ForkChoiceState;
 import tech.pegasys.teku.spec.executionlayer.PayloadBuildingAttributes;
@@ -1915,6 +1918,22 @@ public ForkChoiceState randomForkChoiceState(
         optimisticHead);
   }
 
+  public BeaconState genesisBeaconState(final int validatorCount) {
+    final List<BLSKeyPair> keyPairs = new ArrayList<>();
+    for (int i = 0; i < validatorCount; i++) {
+      keyPairs.add(randomKeyPair());
+    }
+    final List<DepositData> initialDepositData =
+        new MockStartDepositGenerator(spec, new DepositGenerator(spec, true))
+            .createDeposits(keyPairs, spec.getGenesisSpecConfig().getMaxEffectiveBalance());
+
+    final List<Deposit> deposits = initialDepositData.stream().map(Deposit::new).toList();
+    final BeaconState initialState =
+        spec.initializeBeaconStateFromEth1(Bytes32.ZERO, UInt64.ZERO, deposits, Optional.empty());
+    return initialState.updated(
+        state -> state.setGenesisTime(new SystemTimeProvider().getTimeInSeconds()));
+  }
+
   public BeaconState randomBeaconState() {
     return randomBeaconState(100, 100);
   }
@@ -1999,6 +2018,9 @@ public BeaconStateBuilderElectra stateBuilderElectra(
   }
 
   public BeaconState randomBeaconState(final UInt64 slot) {
+    if (slot.isZero()) {
+      return genesisBeaconState(100);
+    }
     return randomBeaconState().updated(state -> state.setSlot(slot));
   }
 

ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/validation/AbstractAttestationValidatorTest.java

@@ -15,16 +15,13 @@
 
 import static tech.pegasys.teku.infrastructure.async.SafeFutureAssert.safeJoin;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import tech.pegasys.teku.bls.BLSKeyGenerator;
-import tech.pegasys.teku.bls.BLSKeyPair;
 import tech.pegasys.teku.bls.BLSSignatureVerifier;
 import tech.pegasys.teku.infrastructure.metrics.StubMetricsSystem;
 import tech.pegasys.teku.spec.Spec;
@@ -76,17 +73,18 @@
 abstract class AbstractAttestationValidatorTest {
   private static final Logger LOG = LogManager.getLogger();
 
-  private static final List<BLSKeyPair> VALIDATOR_KEYS = BLSKeyGenerator.generateKeyPairs(64);
-
   protected final Spec spec = createSpec();
   protected final AttestationSchema<?> attestationSchema =
       spec.getGenesisSchemaDefinitions().getAttestationSchema();
   protected final StorageSystem storageSystem =
-      InMemoryStorageSystemBuilder.buildDefault(StateStorageMode.ARCHIVE);
+      InMemoryStorageSystemBuilder.create()
+          .numberOfValidators(64)
+          .specProvider(spec)
+          .storageMode(StateStorageMode.ARCHIVE)
+          .build();
   protected final RecentChainData recentChainData = storageSystem.recentChainData();
-  protected final ChainBuilder chainBuilder = ChainBuilder.create(spec, VALIDATOR_KEYS);
-  protected final ChainUpdater chainUpdater =
-      new ChainUpdater(storageSystem.recentChainData(), chainBuilder);
+  protected final ChainBuilder chainBuilder = storageSystem.chainBuilder();
+  protected final ChainUpdater chainUpdater = storageSystem.chainUpdater();
   protected final AttestationGenerator attestationGenerator =
       new AttestationGenerator(spec, chainBuilder.getValidatorKeys());
   protected final AsyncBLSSignatureVerifier signatureVerifier =
@@ -108,7 +106,7 @@ public static void reset() {
 
   @BeforeEach
   public void setUp() {
-    chainUpdater.initializeGenesis(false);
+    storageSystem.chainUpdater().initializeGenesis(false);
   }
 
   public abstract Spec createSpec();

ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/validation/AggregateAttestationValidatorTest.java

@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestTemplate;
-import tech.pegasys.teku.bls.BLSKeyPair;
 import tech.pegasys.teku.bls.BLSSignature;
 import tech.pegasys.teku.bls.BLSSignatureVerifier;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
@@ -51,7 +50,6 @@
 import tech.pegasys.teku.spec.datastructures.blocks.BeaconBlockAndState;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBlockAndState;
 import tech.pegasys.teku.spec.datastructures.blocks.StateAndBlockSummary;
-import tech.pegasys.teku.spec.datastructures.interop.MockStartValidatorKeyPairFactory;
 import tech.pegasys.teku.spec.datastructures.operations.AggregateAndProof;
 import tech.pegasys.teku.spec.datastructures.operations.AggregateAndProof.AggregateAndProofSchema;
 import tech.pegasys.teku.spec.datastructures.operations.Attestation;
@@ -119,8 +117,6 @@
 @TestSpecContext(milestone = {PHASE0, ELECTRA})
 class AggregateAttestationValidatorTest {
 
-  private static final List<BLSKeyPair> VALIDATOR_KEYS =
-      new MockStartValidatorKeyPairFactory().generateKeyPairs(0, 1024);
   private Spec spec;
   private SpecVersion genesisSpec;
   private DataStructureUtil dataStructureUtil;
@@ -154,10 +150,15 @@ public void setUp(final SpecContext specContext) {
     signedAggregateAndProofSchema =
         specContext.getSchemaDefinitions().getSignedAggregateAndProofSchema();
     aggregateAndProofSchema = specContext.getSchemaDefinitions().getAggregateAndProofSchema();
-    storageSystem = InMemoryStorageSystemBuilder.buildDefault(StateStorageMode.ARCHIVE);
-
-    final ChainBuilder chainBuilder = ChainBuilder.create(spec, VALIDATOR_KEYS);
-    chainUpdater = new ChainUpdater(storageSystem.recentChainData(), chainBuilder);
+    storageSystem =
+        InMemoryStorageSystemBuilder.create()
+            .specProvider(spec)
+            .numberOfValidators(1024)
+            .storageMode(StateStorageMode.ARCHIVE)
+            .build();
+
+    final ChainBuilder chainBuilder = storageSystem.chainBuilder();
+    chainUpdater = storageSystem.chainUpdater();
     generator = new AggregateGenerator(spec, chainBuilder.getValidatorKeys());
 
     attestationValidator = mock(AttestationValidator.class);

storage/src/testFixtures/java/tech/pegasys/teku/storage/client/ChainUpdater.java

@@ -117,7 +117,7 @@ public SignedBlockAndState initializeGenesisWithPayload(
     return initializeGenesis(signDeposits, Optional.of(executionPayloadHeader));
   }
 
-  public SignedBlockAndState initializeGenesis(
+  private SignedBlockAndState initializeGenesis(
       final boolean signDeposits, final Optional<ExecutionPayloadHeader> payloadHeader) {
     final SignedBlockAndState genesis =
         chainBuilder.generateGenesis(UInt64.ZERO, signDeposits, payloadHeader);