Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@StefanBratanov
StefanBratanov committed Sep 12, 2024
1 parent 624d66c commit 4932619
Show file tree
Hide file tree
Showing 10 changed files with 209 additions and 203 deletions.
140 changes: 30 additions & 110 deletions .../src/main/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.function.Function;
import java.util.stream.IntStream;
import org.apache.tuweni.bytes.Bytes32;
import org.apache.tuweni.units.bigints.UInt256;
import tech.pegasys.teku.bls.BLSSignature;
import tech.pegasys.teku.ethereum.performance.trackers.BlockProductionPerformance;
import tech.pegasys.teku.ethereum.performance.trackers.BlockPublishingPerformance;
Expand All @@ -47,25 +48,23 @@
import tech.pegasys.teku.spec.datastructures.execution.BuilderPayloadOrFallbackData;
import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayload;
import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadContext;
import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadHeader;
import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadResult;
import tech.pegasys.teku.spec.datastructures.execution.SignedExecutionPayloadHeader;
import tech.pegasys.teku.spec.datastructures.execution.versions.eip7732.ExecutionPayloadHeaderEip7732;
import tech.pegasys.teku.spec.datastructures.operations.Attestation;
import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
import tech.pegasys.teku.spec.datastructures.operations.ProposerSlashing;
import tech.pegasys.teku.spec.datastructures.operations.SignedBlsToExecutionChange;
import tech.pegasys.teku.spec.datastructures.operations.SignedVoluntaryExit;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconStateCache;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.eip7732.BeaconStateEip7732;
import tech.pegasys.teku.spec.datastructures.type.SszKZGCommitment;
import tech.pegasys.teku.spec.datastructures.type.SszKZGProof;
import tech.pegasys.teku.spec.executionlayer.ExecutionLayerBlockProductionManager;
import tech.pegasys.teku.spec.logic.versions.deneb.helpers.MiscHelpersDeneb;
import tech.pegasys.teku.spec.schemas.SchemaDefinitions;
import tech.pegasys.teku.spec.schemas.SchemaDefinitionsBellatrix;
import tech.pegasys.teku.spec.schemas.SchemaDefinitionsDeneb;
import tech.pegasys.teku.spec.schemas.SchemaDefinitionsEip7732;
import tech.pegasys.teku.statetransition.OperationPool;
import tech.pegasys.teku.statetransition.attestation.AggregatingAttestationPool;
import tech.pegasys.teku.statetransition.attestation.AttestationForkChecker;
Expand Down Expand Up @@ -183,23 +182,39 @@ public Function<BeaconBlockBodyBuilder, SafeFuture<Void>> createSelector(
blsToExecutionChangePool.getItemsForBlock(blockSlotState));
}

// Post-ePBS: Signed Execution Payload Header
if (bodyBuilder.supportsSignedExecutionPayloadHeader()) {
final SignedExecutionPayloadHeader bid =
executionPayloadHeaderPool
.selectBidForBlock(blockSlotState, parentRoot)
.orElseThrow(
() ->
new IllegalStateException(
"No bid is available for slot " + blockSlotState.getSlot()));
final ExecutionPayloadHeaderEip7732 header =
ExecutionPayloadHeaderEip7732.required(bid.getMessage());
// cache execution payload value
BeaconStateCache.getSlotCaches(blockSlotState)
.setBlockExecutionValue(UInt256.valueOf(header.getValue().bigIntegerValue()));
bodyBuilder.signedExecutionPayloadHeader(bid);
}

// Post-ePBS: Payload attestations
if (bodyBuilder.supportsPayloadAttestations()) {
bodyBuilder.payloadAttestations(
payloadAttestationPool.getPayloadAttestationsForBlock(blockSlotState));
}

final SchemaDefinitions schemaDefinitions =
spec.atSlot(blockSlotState.getSlot()).getSchemaDefinitions();

final SafeFuture<Void> blockProductionComplete;

// In `setExecutionData` the following fields are set:
// Post-Bellatrix: Execution Payload / Execution Payload Header
// Post-Deneb: KZG Commitments
// Post-ePBS: Signed Execution Payload Header
if (bodyBuilder.supportsExecutionPayload()
|| bodyBuilder.supportsSignedExecutionPayloadHeader()) {
// in ePBS, this section is skipped entirely because the bid is already available
if (bodyBuilder.supportsExecutionPayload()) {
final SchemaDefinitionsBellatrix schemaDefinitions =
SchemaDefinitionsBellatrix.required(
spec.atSlot(blockSlotState.getSlot()).getSchemaDefinitions());
blockProductionComplete =
forkChoiceNotifier
.getPayloadId(parentRoot, blockSlotState.getSlot())
Expand All @@ -209,9 +224,8 @@ public Function<BeaconBlockBodyBuilder, SafeFuture<Void>> createSelector(
executionPayloadContext,
bodyBuilder,
requestedBuilderBoostFactor,
SchemaDefinitionsBellatrix.required(schemaDefinitions),
schemaDefinitions,
blockSlotState,
parentRoot,
blockProductionPerformance));
} else {
blockProductionComplete = SafeFuture.COMPLETE;
Expand All @@ -229,7 +243,6 @@ private SafeFuture<Void> setExecutionData(
final Optional<UInt64> requestedBuilderBoostFactor,
final SchemaDefinitionsBellatrix schemaDefinitions,
final BeaconState blockSlotState,
final Bytes32 parentRoot,
final BlockProductionPerformance blockProductionPerformance) {

if (spec.isMergeTransitionComplete(blockSlotState) && executionPayloadContext.isEmpty()) {
Expand All @@ -245,16 +258,6 @@ private SafeFuture<Void> setExecutionData(
return SafeFuture.COMPLETE;
}

// ePBS (EIP7732 TODO: placeholder) need to think about the 3 flows (local, builder, p2p pool)
if (bodyBuilder.supportsSignedExecutionPayloadHeader()) {
final Optional<SignedExecutionPayloadHeader> bid =
executionPayloadHeaderPool.selectBidForBlock(blockSlotState);
if (bid.isPresent()) {
bodyBuilder.signedExecutionPayloadHeader(bid.get());
return SafeFuture.COMPLETE;
}
}

// We should run Builder flow (blinded) only if we have a validator registration
final boolean shouldTryBuilderFlow =
executionPayloadContext
Expand All @@ -271,10 +274,7 @@ private SafeFuture<Void> setExecutionData(

return SafeFuture.allOf(
cacheExecutionPayloadValue(executionPayloadResult, blockSlotState),
// EIP7732 TODO: this whole flow needs drastic changes to make it work, just put a skeleton
// for now
setPayloadOrPayloadHeader(
bodyBuilder, executionPayloadResult, schemaDefinitions, blockSlotState, parentRoot),
setPayloadOrPayloadHeader(bodyBuilder, executionPayloadResult),
setKzgCommitments(bodyBuilder, schemaDefinitions, executionPayloadResult));
}

Expand All @@ -290,25 +290,13 @@ private SafeFuture<Void> cacheExecutionPayloadValue(

private SafeFuture<Void> setPayloadOrPayloadHeader(
final BeaconBlockBodyBuilder bodyBuilder,
final ExecutionPayloadResult executionPayloadResult,
final SchemaDefinitionsBellatrix schemaDefinitions,
final BeaconState state,
final Bytes32 parentRoot) {
final ExecutionPayloadResult executionPayloadResult) {

if (executionPayloadResult.isFromLocalFlow()) {
// local, non-blinded flow
final SafeFuture<ExecutionPayload> executionPayloadFuture =
executionPayloadResult.getExecutionPayloadFutureFromLocalFlow().orElseThrow();
// ePBS
if (bodyBuilder.supportsSignedExecutionPayloadHeader()) {
return executionPayloadFuture.thenAccept(
executionPayload ->
bodyBuilder.signedExecutionPayloadHeader(
createBidFromLocalExecutionPayload(
schemaDefinitions, state, parentRoot, executionPayload)));
} else {
return executionPayloadFuture.thenAccept(bodyBuilder::executionPayload);
}
return executionPayloadFuture.thenAccept(bodyBuilder::executionPayload);
}
// builder, blinded flow
return executionPayloadResult
Expand All @@ -321,90 +309,22 @@ private SafeFuture<Void> setPayloadOrPayloadHeader(
if (builderBidOrFallbackData.getFallbackData().isPresent()) {
final ExecutionPayload executionPayload =
builderBidOrFallbackData.getFallbackDataRequired().getExecutionPayload();
// ePBS
if (bodyBuilder.supportsSignedExecutionPayloadHeader()) {
bodyBuilder.signedExecutionPayloadHeader(
createBidFromLocalExecutionPayload(
schemaDefinitions, state, parentRoot, executionPayload));
} else {
bodyBuilder.executionPayload(executionPayload);
}
bodyBuilder.executionPayload(executionPayload);
} else {
final BuilderBid builderBid =
builderBidOrFallbackData.getBuilderBid().orElseThrow();
// ePBS
if (bodyBuilder.supportsSignedExecutionPayloadHeader()) {
bodyBuilder.signedExecutionPayloadHeader(
createBidFromBuilderBid(schemaDefinitions, builderBid));
} else {
bodyBuilder.executionPayloadHeader(builderBid.getHeader());
}
bodyBuilder.executionPayloadHeader(builderBid.getHeader());
}
});
}

private SignedExecutionPayloadHeader createBidFromLocalExecutionPayload(
final SchemaDefinitionsBellatrix schemaDefinitions,
final BeaconState state,
final Bytes32 parentRoot,
final ExecutionPayload executionPayload) {
final ExecutionPayloadHeader message =
schemaDefinitions
.getExecutionPayloadHeaderSchema()
.createExecutionPayloadHeader(
b ->
b.parentBlockHash(() -> BeaconStateEip7732.required(state).getLatestBlockHash())
.parentBlockRoot(() -> parentRoot)
.blockHash(executionPayload.getBlockHash())
.gasLimit(executionPayload.getGasLimit())
.builderIndex(
() ->
UInt64.valueOf(spec.getBeaconProposerIndex(state, state.getSlot())))
.slot(state::getSlot)
// TODO: need the GetPayloadResponse
.value(() -> UInt64.ZERO)
// TODO: set the root from the kzg commitments
.blobKzgCommitmentsRoot(() -> Bytes32.ZERO));
// TODO: need a real signature
return SchemaDefinitionsEip7732.required(schemaDefinitions)
.getSignedExecutionPayloadHeaderSchema()
.create(message, BLSSignature.empty());
}

// EIP7732 TODO: have to actually get the SignedBuilderBid (not sure of container changes for
// BuilderBid in ePBS)
@SuppressWarnings("unused")
private SignedExecutionPayloadHeader createBidFromBuilderBid(
final SchemaDefinitionsBellatrix schemaDefinitions, final BuilderBid builderBid) {
final ExecutionPayloadHeader message =
schemaDefinitions
.getExecutionPayloadHeaderSchema()
.createExecutionPayloadHeader(
b ->
b.parentBlockHash(() -> Bytes32.ZERO)
.parentBlockRoot(() -> Bytes32.ZERO)
.blockHash(Bytes32.ZERO)
.gasLimit(UInt64.ZERO)
.builderIndex(() -> UInt64.ZERO)
.slot(() -> UInt64.ZERO)
.value(() -> UInt64.ZERO)
.blobKzgCommitmentsRoot(() -> Bytes32.ZERO));
return SchemaDefinitionsEip7732.required(schemaDefinitions)
.getSignedExecutionPayloadHeaderSchema()
.create(message, BLSSignature.empty());
}

private SafeFuture<Void> setKzgCommitments(
final BeaconBlockBodyBuilder bodyBuilder,
final SchemaDefinitions schemaDefinitions,
final ExecutionPayloadResult executionPayloadResult) {
if (!bodyBuilder.supportsKzgCommitments()) {
return SafeFuture.COMPLETE;
}
// ePBS (no blob kzg commitments in block)
if (bodyBuilder.supportsSignedExecutionPayloadHeader()) {
return SafeFuture.COMPLETE;
}
final BlobKzgCommitmentsSchema blobKzgCommitmentsSchema =
SchemaDefinitionsDeneb.required(schemaDefinitions).getBlobKzgCommitmentsSchema();
final SafeFuture<SszList<SszKZGCommitment>> blobKzgCommitments;
Expand Down
84 changes: 72 additions & 12 deletions .../src/main/java/tech/pegasys/teku/validator/coordinator/ExecutionPayloadHeaderFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,100 @@

package tech.pegasys.teku.validator.coordinator;

import java.util.Optional;
import org.apache.tuweni.bytes.Bytes32;
import tech.pegasys.teku.bls.BLSPublicKey;
import tech.pegasys.teku.ethereum.performance.trackers.BlockProductionPerformance;
import tech.pegasys.teku.infrastructure.async.SafeFuture;
import tech.pegasys.teku.infrastructure.unsigned.UInt64;
import tech.pegasys.teku.spec.Spec;
import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadContext;
import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadHeader;
import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadResult;
import tech.pegasys.teku.spec.datastructures.execution.GetPayloadResponse;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconStateCache;
import tech.pegasys.teku.spec.executionlayer.ExecutionLayerBlockProductionManager;
import tech.pegasys.teku.spec.schemas.SchemaDefinitionsEip7732;
import tech.pegasys.teku.statetransition.forkchoice.ForkChoiceNotifier;

@SuppressWarnings("unused")
public class ExecutionPayloadHeaderFactory {

private final Spec spec;
private final ForkChoiceNotifier forkChoiceNotifier;
private final ExecutionLayerBlockProductionManager executionLayerBlockProductionManager;

public ExecutionPayloadHeaderFactory(
final Spec spec,
final ForkChoiceNotifier forkChoiceNotifier,
final ExecutionLayerBlockProductionManager executionLayerBlockProductionManager) {
this.spec = spec;
this.forkChoiceNotifier = forkChoiceNotifier;
this.executionLayerBlockProductionManager = executionLayerBlockProductionManager;
}

// EIP7732 TODO: implement
public SafeFuture<ExecutionPayloadHeader> createUnsignedHeader(
final BeaconState state, final UInt64 slot, final BLSPublicKey builderPublicKey) {
int builderIndex =
BeaconStateCache.getTransitionCaches(state)
final BeaconState slotState,
final UInt64 slot,
final Bytes32 parentRoot,
final BLSPublicKey builderPublicKey) {
final Optional<Integer> maybeBuilderIndex =
BeaconStateCache.getTransitionCaches(slotState)
.getValidatorIndexCache()
.getValidatorIndex(state, builderPublicKey)
.orElseThrow(
() ->
new IllegalArgumentException(
"There is no index assigned to a builder with a public key "
+ builderPublicKey));
return SafeFuture.completedFuture(null);
.getValidatorIndex(slotState, builderPublicKey);
if (maybeBuilderIndex.isEmpty()) {
return SafeFuture.failedFuture(
new IllegalArgumentException(
"There is no index assigned to a builder with a public key " + builderPublicKey));
}
final int builderIndex = maybeBuilderIndex.get();
return forkChoiceNotifier
.getPayloadId(parentRoot, slot)
.thenCompose(
maybeExecutionPayloadContext -> {
final ExecutionPayloadContext executionPayloadContext =
maybeExecutionPayloadContext.orElseThrow();
// TODO: EIP-7732 Disable the builder flow for the prototype
final ExecutionPayloadResult executionPayloadResult =
executionLayerBlockProductionManager.initiateBlockProduction(
executionPayloadContext,
slotState,
false,
Optional.empty(),
BlockProductionPerformance.NOOP);
return executionPayloadResult
.getLocalPayloadResponseRequired()
.thenApply(
getPayloadResponse ->
createLocalBid(
slot,
builderIndex,
parentRoot,
executionPayloadContext,
getPayloadResponse));
});
}

private ExecutionPayloadHeader createLocalBid(
final UInt64 slot,
final int builderIndex,
final Bytes32 parentRoot,
final ExecutionPayloadContext executionPayloadContext,
final GetPayloadResponse getPayloadResponse) {
return SchemaDefinitionsEip7732.required(spec.atSlot(slot).getSchemaDefinitions())
.getExecutionPayloadHeaderSchema()
.createExecutionPayloadHeader(
builder ->
builder
.parentBlockHash(executionPayloadContext::getParentHash)
.parentBlockRoot(() -> parentRoot)
.blockHash(getPayloadResponse.getExecutionPayload().getBlockHash())
.gasLimit(getPayloadResponse.getExecutionPayload().getGasLimit())
.builderIndex(() -> UInt64.valueOf(builderIndex))
.slot(() -> slot)
.value(
() ->
UInt64.valueOf(getPayloadResponse.getExecutionPayloadValue().toLong()))
.blobKzgCommitmentsRoot(() -> Bytes32.ZERO));
}
}
5 changes: 4 additions & 1 deletion ...tor/src/main/java/tech/pegasys/teku/validator/coordinator/MilestoneBasedBlockFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ public MilestoneBasedBlockFactory(
.forEach(
forkAndSpecMilestone -> {
final SpecMilestone milestone = forkAndSpecMilestone.getSpecMilestone();
if (milestone.isGreaterThanOrEqualTo(SpecMilestone.DENEB)) {
// in ePBS, the builder creates the blob sidecars later in the slot
if (milestone.isGreaterThanOrEqualTo(SpecMilestone.EIP7732)) {
registeredFactories.put(milestone, blockFactoryPhase0);
} else if (milestone.isGreaterThanOrEqualTo(SpecMilestone.DENEB)) {
registeredFactories.put(milestone, blockFactoryDenebSupplier.get());
} else {
registeredFactories.put(milestone, blockFactoryPhase0);
Expand Down
Loading

0 comments on commit 4932619

Please sign in to comment.