Skip to content

Updated to support 1.3.0.RC3 ref tests for capella #6846

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

Merged
lucassaldanha merged 4 commits into from
Feb 22, 2023
Merged

Updated to support 1.3.0.RC3 ref tests for capella #6846

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
8480b3f
Updated to support 1.3.0.RC3 ref tests
rolfyone Feb 21, 2023
338654a
Merge remote-tracking branch 'upstream/master' into ref-test-rc3
rolfyone Feb 21, 2023
2af0e4e
Re-enable execution of validation rules during actual block processin…
rolfyone Feb 22, 2023
91ebd0e
Merge branch 'master' into ref-test-rc3
rolfyone Feb 22, 2023
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
20 changes: 12 additions & 8 deletions .../main/java/tech/pegasys/teku/spec/logic/versions/capella/block/BlockProcessorCapella.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ protected BlockValidationResult validateBlockPreProcessing(
() ->
new BlockProcessingException(
"BlsToExecutionChanges was not found during block processing.")),
signatureVerifier);
signatureVerifier,
false);
}

@Override
Expand All @@ -155,7 +156,7 @@ public void processBlsToExecutionChanges(
throws BlockProcessingException {
final BlockValidationResult result =
verifyBlsToExecutionChangesPreProcessing(
state, blsToExecutionChanges, BLSSignatureVerifier.SIMPLE);
state, blsToExecutionChanges, BLSSignatureVerifier.SIMPLE, true);
if (!result.isValid()) {
throw new BlockProcessingException(result.getFailureReason());
}
Expand Down Expand Up @@ -312,7 +313,8 @@ public static Bytes32 getWithdrawalAddressFromEth1Address(final Bytes20 toExecut
BlockValidationResult verifyBlsToExecutionChangesPreProcessing(
final BeaconState genericState,
final SszList<SignedBlsToExecutionChange> signedBlsToExecutionChanges,
final BLSSignatureVerifier signatureVerifier) {
final BLSSignatureVerifier signatureVerifier,
final boolean executeValidationRules) {

final Set<UInt64> validatorsSeenInBlock = new HashSet<>();
for (SignedBlsToExecutionChange signedBlsToExecutionChange : signedBlsToExecutionChanges) {
Expand All @@ -323,11 +325,13 @@ BlockValidationResult verifyBlsToExecutionChangesPreProcessing(
"Duplicated BlsToExecutionChange for validator " + addressChange.getValidatorIndex());
}

final Optional<OperationInvalidReason> operationInvalidReason =
operationValidator.validateBlsToExecutionChange(
genericState.getFork(), genericState, addressChange);
if (operationInvalidReason.isPresent()) {
return BlockValidationResult.failed(operationInvalidReason.get().describe());
if (executeValidationRules) {
final Optional<OperationInvalidReason> operationInvalidReason =
operationValidator.validateBlsToExecutionChange(
genericState.getFork(), genericState, addressChange);
if (operationInvalidReason.isPresent()) {
return BlockValidationResult.failed(operationInvalidReason.get().describe());
}
}

boolean signatureValid =
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/tech/pegasys/teku/spec/logic/versions/capella/block/BlockProcessorCapellaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public void shouldRejectBlockWithMoreThanOneBlsExecutionChangesForSameValidator(

final BlockValidationResult validationResult =
capellaBlockProcessor.verifyBlsToExecutionChangesPreProcessing(
state, blsToExecutionChangesListWithDuplicate, BLSSignatureVerifier.NO_OP);
state, blsToExecutionChangesListWithDuplicate, BLSSignatureVerifier.NO_OP, true);

assertThat(validationResult.isValid()).isFalse();
assertThat(validationResult.getFailureReason())
Expand Down