Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate beacon state #8833

Merged
merged 4 commits into from
Nov 19, 2024
Merged

Migrate beacon state #8833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b1466d
migrate beacon state
tbenr Nov 16, 2024
bb255bb
fix historical summary schema
tbenr Nov 17, 2024
adfd8c5
fix ref test compilation
tbenr Nov 17, 2024
465efa2
fix ref tests
tbenr Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions ...c/referenceTest/java/tech/pegasys/teku/reference/altair/fork/ForkUpgradeTestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package tech.pegasys.teku.reference.altair.fork;

import static tech.pegasys.teku.infrastructure.ssz.SszDataAssert.assertThatSszData;
import static tech.pegasys.teku.spec.SpecMilestone.BELLATRIX;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableMap;
Expand Down Expand Up @@ -44,14 +45,26 @@ public void runTest(final TestDefinition testDefinition) throws Throwable {
}

private void processUpgrade(final TestDefinition testDefinition, final SpecMilestone milestone) {
final SpecVersion spec = testDefinition.getSpec().getGenesisSpec();
final SpecMilestone previousMilestone = milestone.getPreviousMilestone();
final SpecVersion previousMilestoneSpecVersion =
testDefinition.getSpec().forMilestone(previousMilestone);
final BeaconStateSchema<?, ?> fromMilestoneSchema =
switch (milestone) {
case ALTAIR -> BeaconStateSchemaPhase0.create(spec.getConfig());
case BELLATRIX -> BeaconStateSchemaAltair.create(spec.getConfig());
case CAPELLA -> BeaconStateSchemaBellatrix.create(spec.getConfig());
case DENEB -> BeaconStateSchemaCapella.create(spec.getConfig());
case ELECTRA -> BeaconStateSchemaDeneb.create(spec.getConfig());
case ALTAIR -> BeaconStateSchemaPhase0.create(previousMilestoneSpecVersion.getConfig());
case BELLATRIX ->
BeaconStateSchemaAltair.create(previousMilestoneSpecVersion.getConfig());
case CAPELLA ->
BeaconStateSchemaBellatrix.create(
previousMilestoneSpecVersion.getConfig(),
previousMilestoneSpecVersion.getSchemaDefinitions().getSchemaRegistry());
case DENEB ->
BeaconStateSchemaCapella.create(
previousMilestoneSpecVersion.getConfig(),
previousMilestoneSpecVersion.getSchemaDefinitions().getSchemaRegistry());
case ELECTRA ->
BeaconStateSchemaDeneb.create(
previousMilestoneSpecVersion.getConfig(),
previousMilestoneSpecVersion.getSchemaDefinitions().getSchemaRegistry());
default ->
throw new IllegalStateException(
"Unhandled fork upgrade for test "
Expand Down
19 changes: 10 additions & 9 deletions .../spec/datastructures/state/beaconstate/versions/bellatrix/BeaconStateSchemaBellatrix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.bellatrix;

import static com.google.common.base.Preconditions.checkArgument;
import static tech.pegasys.teku.spec.schemas.registry.SchemaTypes.EXECUTION_PAYLOAD_HEADER_SCHEMA;

import com.google.common.annotations.VisibleForTesting;
import java.util.List;
Expand All @@ -24,37 +25,37 @@
import tech.pegasys.teku.infrastructure.ssz.sos.SszField;
import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
import tech.pegasys.teku.spec.config.SpecConfig;
import tech.pegasys.teku.spec.config.SpecConfigBellatrix;
import tech.pegasys.teku.spec.datastructures.execution.versions.bellatrix.ExecutionPayloadHeaderSchemaBellatrix;
import tech.pegasys.teku.spec.datastructures.state.SyncCommittee.SyncCommitteeSchema;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconStateSchema;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.common.AbstractBeaconStateSchema;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.common.BeaconStateFields;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.altair.BeaconStateSchemaAltair;
import tech.pegasys.teku.spec.schemas.registry.SchemaRegistry;

public class BeaconStateSchemaBellatrix
extends AbstractBeaconStateSchema<BeaconStateBellatrix, MutableBeaconStateBellatrix> {

public static final int LATEST_EXECUTION_PAYLOAD_HEADER_FIELD_INDEX = 24;

@VisibleForTesting
BeaconStateSchemaBellatrix(final SpecConfig specConfig) {
super("BeaconStateBellatrix", getUniqueFields(specConfig), specConfig);
BeaconStateSchemaBellatrix(final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
super("BeaconStateBellatrix", getUniqueFields(specConfig, schemaRegistry), specConfig);
}

public static BeaconStateSchemaBellatrix create(final SpecConfig specConfig) {
return new BeaconStateSchemaBellatrix(specConfig);
public static BeaconStateSchemaBellatrix create(
final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
return new BeaconStateSchemaBellatrix(specConfig, schemaRegistry);
}

public static List<SszField> getUniqueFields(final SpecConfig specConfig) {
public static List<SszField> getUniqueFields(
final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
final List<SszField> newFields =
List.of(
new SszField(
LATEST_EXECUTION_PAYLOAD_HEADER_FIELD_INDEX,
BeaconStateFields.LATEST_EXECUTION_PAYLOAD_HEADER,
() ->
new ExecutionPayloadHeaderSchemaBellatrix(
SpecConfigBellatrix.required(specConfig))));
() -> schemaRegistry.get(EXECUTION_PAYLOAD_HEADER_SCHEMA)));

return Stream.concat(
BeaconStateSchemaAltair.getUniqueFields(specConfig).stream(), newFields.stream())
Expand Down
41 changes: 12 additions & 29 deletions ...teku/spec/datastructures/state/beaconstate/versions/capella/BeaconStateSchemaCapella.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.capella;

import static com.google.common.base.Preconditions.checkArgument;
import static tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.bellatrix.BeaconStateSchemaBellatrix.LATEST_EXECUTION_PAYLOAD_HEADER_FIELD_INDEX;
import static tech.pegasys.teku.spec.schemas.registry.SchemaTypes.HISTORICAL_SUMMARIES_SCHEMA;

import com.google.common.annotations.VisibleForTesting;
import java.util.List;
Expand All @@ -27,14 +27,14 @@
import tech.pegasys.teku.infrastructure.ssz.sos.SszField;
import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
import tech.pegasys.teku.spec.config.SpecConfig;
import tech.pegasys.teku.spec.config.SpecConfigCapella;
import tech.pegasys.teku.spec.datastructures.execution.versions.capella.ExecutionPayloadHeaderSchemaCapella;
import tech.pegasys.teku.spec.datastructures.state.SyncCommittee;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconStateSchema;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.common.AbstractBeaconStateSchema;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.common.BeaconStateFields;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.bellatrix.BeaconStateSchemaBellatrix;
import tech.pegasys.teku.spec.datastructures.state.versions.capella.HistoricalSummary;
import tech.pegasys.teku.spec.schemas.registry.SchemaRegistry;

public class BeaconStateSchemaCapella
extends AbstractBeaconStateSchema<BeaconStateCapella, MutableBeaconStateCapella> {
Expand All @@ -43,23 +43,12 @@ public class BeaconStateSchemaCapella
public static final int HISTORICAL_SUMMARIES_FIELD_INDEX = 27;

@VisibleForTesting
BeaconStateSchemaCapella(final SpecConfig specConfig) {
super("BeaconStateCapella", getUniqueFields(specConfig), specConfig);
BeaconStateSchemaCapella(final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
super("BeaconStateCapella", getUniqueFields(specConfig, schemaRegistry), specConfig);
}

public static List<SszField> getUniqueFields(final SpecConfig specConfig) {
final HistoricalSummary.HistoricalSummarySchema historicalSummarySchema =
new HistoricalSummary.HistoricalSummarySchema();

final List<SszField> updatedFields =
List.of(
new SszField(
LATEST_EXECUTION_PAYLOAD_HEADER_FIELD_INDEX,
BeaconStateFields.LATEST_EXECUTION_PAYLOAD_HEADER,
() ->
new ExecutionPayloadHeaderSchemaCapella(
SpecConfigCapella.required(specConfig))));

public static List<SszField> getUniqueFields(
final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
final List<SszField> newFields =
List.of(
new SszField(
Expand All @@ -73,18 +62,11 @@ public static List<SszField> getUniqueFields(final SpecConfig specConfig) {
new SszField(
HISTORICAL_SUMMARIES_FIELD_INDEX,
BeaconStateFields.HISTORICAL_SUMMARIES,
() ->
SszListSchema.create(
historicalSummarySchema, specConfig.getHistoricalRootsLimit())));
() -> schemaRegistry.get(HISTORICAL_SUMMARIES_SCHEMA)));

return Stream.concat(
BeaconStateSchemaBellatrix.getUniqueFields(specConfig).stream(), newFields.stream())
.map(
field ->
updatedFields.stream()
.filter(updatedField -> updatedField.getIndex() == field.getIndex())
.findFirst()
.orElse(field))
BeaconStateSchemaBellatrix.getUniqueFields(specConfig, schemaRegistry).stream(),
newFields.stream())
.toList();
}

Expand Down Expand Up @@ -126,8 +108,9 @@ public MutableBeaconStateCapella createBuilder() {
return new MutableBeaconStateCapellaImpl(createEmptyBeaconStateImpl(), true);
}

public static BeaconStateSchemaCapella create(final SpecConfig specConfig) {
return new BeaconStateSchemaCapella(specConfig);
public static BeaconStateSchemaCapella create(
final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
return new BeaconStateSchemaCapella(specConfig, schemaRegistry);
}

public static BeaconStateSchemaCapella required(final BeaconStateSchema<?, ?> schema) {
Expand Down
31 changes: 9 additions & 22 deletions ...sys/teku/spec/datastructures/state/beaconstate/versions/deneb/BeaconStateSchemaDeneb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.deneb;

import static com.google.common.base.Preconditions.checkArgument;
import static tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.bellatrix.BeaconStateSchemaBellatrix.LATEST_EXECUTION_PAYLOAD_HEADER_FIELD_INDEX;

import com.google.common.annotations.VisibleForTesting;
import java.util.List;
Expand All @@ -25,39 +24,26 @@
import tech.pegasys.teku.infrastructure.ssz.sos.SszField;
import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
import tech.pegasys.teku.spec.config.SpecConfig;
import tech.pegasys.teku.spec.config.SpecConfigDeneb;
import tech.pegasys.teku.spec.datastructures.execution.versions.deneb.ExecutionPayloadHeaderSchemaDeneb;
import tech.pegasys.teku.spec.datastructures.state.SyncCommittee;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconStateSchema;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.common.AbstractBeaconStateSchema;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.common.BeaconStateFields;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.capella.BeaconStateSchemaCapella;
import tech.pegasys.teku.spec.datastructures.state.versions.capella.HistoricalSummary;
import tech.pegasys.teku.spec.schemas.registry.SchemaRegistry;

public class BeaconStateSchemaDeneb
extends AbstractBeaconStateSchema<BeaconStateDeneb, MutableBeaconStateDeneb> {

@VisibleForTesting
BeaconStateSchemaDeneb(final SpecConfig specConfig) {
super("BeaconStateDeneb", getUniqueFields(specConfig), specConfig);
BeaconStateSchemaDeneb(final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
super("BeaconStateDeneb", getUniqueFields(specConfig, schemaRegistry), specConfig);
}

public static List<SszField> getUniqueFields(final SpecConfig specConfig) {
final List<SszField> updatedFields =
List.of(
new SszField(
LATEST_EXECUTION_PAYLOAD_HEADER_FIELD_INDEX,
BeaconStateFields.LATEST_EXECUTION_PAYLOAD_HEADER,
() -> new ExecutionPayloadHeaderSchemaDeneb(SpecConfigDeneb.required(specConfig))));

return BeaconStateSchemaCapella.getUniqueFields(specConfig).stream()
.map(
field ->
updatedFields.stream()
.filter(updatedField -> updatedField.getIndex() == field.getIndex())
.findFirst()
.orElse(field))
.toList();
public static List<SszField> getUniqueFields(
final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
return BeaconStateSchemaCapella.getUniqueFields(specConfig, schemaRegistry).stream().toList();
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -92,8 +78,9 @@ public MutableBeaconStateDeneb createBuilder() {
return new MutableBeaconStateDenebImpl(createEmptyBeaconStateImpl(), true);
}

public static BeaconStateSchemaDeneb create(final SpecConfig specConfig) {
return new BeaconStateSchemaDeneb(specConfig);
public static BeaconStateSchemaDeneb create(
final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
return new BeaconStateSchemaDeneb(specConfig, schemaRegistry);
}

public static BeaconStateSchemaDeneb required(final BeaconStateSchema<?, ?> schema) {
Expand Down
42 changes: 16 additions & 26 deletions ...teku/spec/datastructures/state/beaconstate/versions/electra/BeaconStateSchemaElectra.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
package tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.electra;

import static com.google.common.base.Preconditions.checkArgument;
import static tech.pegasys.teku.spec.schemas.registry.SchemaTypes.PENDING_CONSOLIDATIONS_SCHEMA;
import static tech.pegasys.teku.spec.schemas.registry.SchemaTypes.PENDING_DEPOSITS_SCHEMA;
import static tech.pegasys.teku.spec.schemas.registry.SchemaTypes.PENDING_PARTIAL_WITHDRAWALS_SCHEMA;

import com.google.common.annotations.VisibleForTesting;
import java.util.List;
Expand All @@ -26,7 +29,6 @@
import tech.pegasys.teku.infrastructure.ssz.sos.SszField;
import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
import tech.pegasys.teku.spec.config.SpecConfig;
import tech.pegasys.teku.spec.config.SpecConfigElectra;
import tech.pegasys.teku.spec.datastructures.execution.versions.deneb.ExecutionPayloadHeaderSchemaDeneb;
import tech.pegasys.teku.spec.datastructures.state.SyncCommittee;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconStateSchema;
Expand All @@ -37,6 +39,7 @@
import tech.pegasys.teku.spec.datastructures.state.versions.electra.PendingConsolidation;
import tech.pegasys.teku.spec.datastructures.state.versions.electra.PendingDeposit;
import tech.pegasys.teku.spec.datastructures.state.versions.electra.PendingPartialWithdrawal;
import tech.pegasys.teku.spec.schemas.registry.SchemaRegistry;

public class BeaconStateSchemaElectra
extends AbstractBeaconStateSchema<BeaconStateElectra, MutableBeaconStateElectra> {
Expand All @@ -51,19 +54,12 @@ public class BeaconStateSchemaElectra
public static final int PENDING_CONSOLIDATIONS_FIELD_INDEX = 36;

@VisibleForTesting
BeaconStateSchemaElectra(final SpecConfig specConfig) {
super("BeaconStateElectra", getUniqueFields(specConfig), specConfig);
BeaconStateSchemaElectra(final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
super("BeaconStateElectra", getUniqueFields(specConfig, schemaRegistry), specConfig);
}

private static List<SszField> getUniqueFields(final SpecConfig specConfig) {
final PendingDeposit.PendingDepositSchema pendingDepositSchema =
new PendingDeposit.PendingDepositSchema();
final PendingPartialWithdrawal.PendingPartialWithdrawalSchema pendingPartialWithdrawalSchema =
new PendingPartialWithdrawal.PendingPartialWithdrawalSchema();
final SpecConfigElectra specConfigElectra = SpecConfigElectra.required(specConfig);
final PendingConsolidation.PendingConsolidationSchema pendingConsolidationSchema =
new PendingConsolidation.PendingConsolidationSchema();

private static List<SszField> getUniqueFields(
final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
final List<SszField> newFields =
List.of(
new SszField(
Expand Down Expand Up @@ -93,26 +89,19 @@ private static List<SszField> getUniqueFields(final SpecConfig specConfig) {
new SszField(
PENDING_DEPOSITS_FIELD_INDEX,
BeaconStateFields.PENDING_DEPOSITS,
() ->
SszListSchema.create(
pendingDepositSchema, specConfigElectra.getPendingDepositsLimit())),
() -> schemaRegistry.get(PENDING_DEPOSITS_SCHEMA)),
new SszField(
PENDING_PARTIAL_WITHDRAWALS_FIELD_INDEX,
BeaconStateFields.PENDING_PARTIAL_WITHDRAWALS,
() ->
SszListSchema.create(
pendingPartialWithdrawalSchema,
specConfigElectra.getPendingPartialWithdrawalsLimit())),
() -> schemaRegistry.get(PENDING_PARTIAL_WITHDRAWALS_SCHEMA)),
new SszField(
PENDING_CONSOLIDATIONS_FIELD_INDEX,
BeaconStateFields.PENDING_CONSOLIDATIONS,
() ->
SszListSchema.create(
pendingConsolidationSchema,
specConfigElectra.getPendingConsolidationsLimit())));
() -> schemaRegistry.get(PENDING_CONSOLIDATIONS_SCHEMA)));

return Stream.concat(
BeaconStateSchemaDeneb.getUniqueFields(specConfig).stream(), newFields.stream())
BeaconStateSchemaDeneb.getUniqueFields(specConfig, schemaRegistry).stream(),
newFields.stream())
.toList();
}

Expand Down Expand Up @@ -148,8 +137,9 @@ public MutableBeaconStateElectra createBuilder() {
return new MutableBeaconStateElectraImpl(createEmptyBeaconStateImpl(), true);
}

public static BeaconStateSchemaElectra create(final SpecConfig specConfig) {
return new BeaconStateSchemaElectra(specConfig);
public static BeaconStateSchemaElectra create(
final SpecConfig specConfig, final SchemaRegistry schemaRegistry) {
return new BeaconStateSchemaElectra(specConfig, schemaRegistry);
}

public static BeaconStateSchemaElectra required(final BeaconStateSchema<?, ?> schema) {
Expand Down
4 changes: 1 addition & 3 deletions .../java/tech/pegasys/teku/spec/logic/versions/altair/forktransition/AltairStateUpgrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ public BeaconStateAltair upgrade(final BeaconState preState) {
final UInt64 epoch = beaconStateAccessors.getCurrentEpoch(preState);
final int validatorCount = preState.getValidators().size();

return schemaDefinitions
.getBeaconStateSchema()
.createEmpty()
return BeaconStateAltair.required(schemaDefinitions.getBeaconStateSchema().createEmpty())
.updatedAltair(
state -> {
BeaconStateFields.copyCommonFieldsFromSource(state, preState);
Expand Down
4 changes: 1 addition & 3 deletions ...tech/pegasys/teku/spec/logic/versions/bellatrix/forktransition/BellatrixStateUpgrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ public BeaconStateBellatrix upgrade(final BeaconState preState) {
final UInt64 epoch = beaconStateAccessors.getCurrentEpoch(preState);
BeaconStateAltair preStateAltair = BeaconStateAltair.required(preState);

return schemaDefinitions
.getBeaconStateSchema()
.createEmpty()
return BeaconStateBellatrix.required(schemaDefinitions.getBeaconStateSchema().createEmpty())
.updatedBellatrix(
state -> {
BeaconStateFields.copyCommonFieldsFromSource(state, preState);
Expand Down
4 changes: 1 addition & 3 deletions ...ava/tech/pegasys/teku/spec/logic/versions/capella/forktransition/CapellaStateUpgrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ public CapellaStateUpgrade(
public BeaconStateCapella upgrade(final BeaconState preState) {
final UInt64 epoch = beaconStateAccessors.getCurrentEpoch(preState);
BeaconStateBellatrix preStateBellatrix = BeaconStateBellatrix.required(preState);
return schemaDefinitions
.getBeaconStateSchema()
.createEmpty()
return BeaconStateCapella.required(schemaDefinitions.getBeaconStateSchema().createEmpty())
.updatedCapella(
state -> {
BeaconStateFields.copyCommonFieldsFromSource(state, preState);
Expand Down
4 changes: 1 addition & 3 deletions ...in/java/tech/pegasys/teku/spec/logic/versions/deneb/forktransition/DenebStateUpgrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ public DenebStateUpgrade(
public BeaconStateDeneb upgrade(final BeaconState preState) {
final UInt64 epoch = beaconStateAccessors.getCurrentEpoch(preState);
final BeaconStateCapella preStateCapella = BeaconStateCapella.required(preState);
return schemaDefinitions
.getBeaconStateSchema()
.createEmpty()
return BeaconStateDeneb.required(schemaDefinitions.getBeaconStateSchema().createEmpty())
.updatedDeneb(
state -> {
BeaconStateFields.copyCommonFieldsFromSource(state, preState);
Expand Down
Loading