Skip to content

Add peerDAS kzg batch verification metric #9415

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.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ public class DataColumnSidecarGossipValidator {
0.001, 0.002, 0.003, 0.004, 0.005, 0.01, 0.015, 0.02, 0.025, 0.03, 0.04, 0.05,
0.1, 0.5, 1.0
});
public static final BiFunction<MetricsSystem, TimeProvider, MetricsHistogram>
DATA_COLUMN_SIDECAR_KZG_BATCH_VERIFICATION_HISTOGRAM =
(metricsSystem, timeProvider) ->
new MetricsHistogram(
metricsSystem,
timeProvider,
TekuMetricCategory.BEACON,
"kzg_verification_data_column_batch_seconds",
"Runtime of batched data column kzg verification",
new double[] {
0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0
});

private final Spec spec;
private final Set<SlotProposerIndexAndColumnIndex> receivedValidDataColumnSidecarInfoSet;
Expand All @@ -78,6 +90,7 @@ public class DataColumnSidecarGossipValidator {
private final Counter totalDataColumnSidecarsProcessingRequestsCounter;
private final Counter totalDataColumnSidecarsProcessingSuccessesCounter;
private final MetricsHistogram dataColumnSidecarInclusionProofVerificationTimeSeconds;
private final MetricsHistogram dataColumnSidecarKzgBatchVerificationTimeSeconds;

public static DataColumnSidecarGossipValidator create(
final Spec spec,
Expand Down Expand Up @@ -143,6 +156,8 @@ private DataColumnSidecarGossipValidator(
this.dataColumnSidecarInclusionProofVerificationTimeSeconds =
DATA_COLUMN_SIDECAR_INCLUSION_PROOF_VERIFICATION_HISTOGRAM.apply(
metricsSystem, timeProvider);
this.dataColumnSidecarKzgBatchVerificationTimeSeconds =
DATA_COLUMN_SIDECAR_KZG_BATCH_VERIFICATION_HISTOGRAM.apply(metricsSystem, timeProvider);

this.validInclusionProofInfoSet = validInclusionProofInfoSet;
this.validSignedBlockHeaders = validSignedBlockHeaders;
Expand Down Expand Up @@ -259,7 +274,12 @@ public SafeFuture<InternalValidationResult> validate(final DataColumnSidecar dat
/*
* [REJECT] The sidecar's column data is valid as verified by verify_data_column_sidecar_kzg_proofs(sidecar).
*/
if (!miscHelpersFulu.verifyDataColumnSidecarKzgProof(kzg, dataColumnSidecar)) {
try (MetricsHistogram.Timer ignored =
dataColumnSidecarKzgBatchVerificationTimeSeconds.startTimer()) {
if (!miscHelpersFulu.verifyDataColumnSidecarKzgProof(kzg, dataColumnSidecar)) {
return completedFuture(reject("DataColumnSidecar does not pass kzg validation"));
}
} catch (final Throwable t) {
return completedFuture(reject("DataColumnSidecar does not pass kzg validation"));
}

Expand Down Expand Up @@ -334,7 +354,12 @@ private SafeFuture<InternalValidationResult> validateDataColumnSidecarWithKnownV
/*
* [REJECT] The sidecar's column data is valid as verified by verify_data_column_sidecar_kzg_proofs(sidecar).
*/
if (!miscHelpersFulu.verifyDataColumnSidecarKzgProof(kzg, dataColumnSidecar)) {
try (MetricsHistogram.Timer ignored =
dataColumnSidecarKzgBatchVerificationTimeSeconds.startTimer()) {
if (!miscHelpersFulu.verifyDataColumnSidecarKzgProof(kzg, dataColumnSidecar)) {
return completedFuture(reject("DataColumnSidecar does not pass kzg validation"));
}
} catch (final Throwable t) {
return completedFuture(reject("DataColumnSidecar does not pass kzg validation"));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import static tech.pegasys.teku.networking.eth2.rpc.beaconchain.methods.DataColumnSidecarsResponseInvalidResponseException.InvalidResponseType.DATA_COLUMN_SIDECAR_SLOT_NOT_IN_RANGE;
import static tech.pegasys.teku.networking.eth2.rpc.beaconchain.methods.DataColumnSidecarsResponseInvalidResponseException.InvalidResponseType.DATA_COLUMN_SIDECAR_UNEXPECTED_IDENTIFIER;
import static tech.pegasys.teku.statetransition.validation.DataColumnSidecarGossipValidator.DATA_COLUMN_SIDECAR_INCLUSION_PROOF_VERIFICATION_HISTOGRAM;
import static tech.pegasys.teku.statetransition.validation.DataColumnSidecarGossipValidator.DATA_COLUMN_SIDECAR_KZG_BATCH_VERIFICATION_HISTOGRAM;

import java.io.IOException;
import java.util.HashSet;
Expand All @@ -41,6 +42,7 @@ public class DataColumnSidecarsByRangeListenerValidatingProxy

private final Set<UInt64> columns;
private final MetricsHistogram dataColumnSidecarInclusionProofVerificationTimeSeconds;
private final MetricsHistogram dataColumnSidecarKzgBatchVerificationTimeSeconds;

public DataColumnSidecarsByRangeListenerValidatingProxy(
final Spec spec,
Expand All @@ -60,6 +62,8 @@ public DataColumnSidecarsByRangeListenerValidatingProxy(
this.dataColumnSidecarInclusionProofVerificationTimeSeconds =
DATA_COLUMN_SIDECAR_INCLUSION_PROOF_VERIFICATION_HISTOGRAM.apply(
metricsSystem, timeProvider);
this.dataColumnSidecarKzgBatchVerificationTimeSeconds =
DATA_COLUMN_SIDECAR_KZG_BATCH_VERIFICATION_HISTOGRAM.apply(metricsSystem, timeProvider);
}

@Override
Expand All @@ -86,7 +90,15 @@ public SafeFuture<?> onResponse(final DataColumnSidecar dataColumnSidecar) {
DataColumnSidecarsResponseInvalidResponseException.InvalidResponseType
.DATA_COLUMN_SIDECAR_INCLUSION_PROOF_VERIFICATION_FAILED);
}
verifyKzgProof(dataColumnSidecar);
try (MetricsHistogram.Timer ignored =
dataColumnSidecarKzgBatchVerificationTimeSeconds.startTimer()) {
verifyKzgProof(dataColumnSidecar);
} catch (final IOException ioException) {
throw new DataColumnSidecarsResponseInvalidResponseException(
peer,
DataColumnSidecarsResponseInvalidResponseException.InvalidResponseType
.DATA_COLUMN_SIDECAR_KZG_VERIFICATION_FAILED);
}

return dataColumnSidecarResponseListener.onResponse(dataColumnSidecar);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import static tech.pegasys.teku.networking.eth2.rpc.beaconchain.methods.DataColumnSidecarsResponseInvalidResponseException.InvalidResponseType;
import static tech.pegasys.teku.statetransition.validation.DataColumnSidecarGossipValidator.DATA_COLUMN_SIDECAR_INCLUSION_PROOF_VERIFICATION_HISTOGRAM;
import static tech.pegasys.teku.statetransition.validation.DataColumnSidecarGossipValidator.DATA_COLUMN_SIDECAR_KZG_BATCH_VERIFICATION_HISTOGRAM;

import java.io.IOException;
import java.util.List;
Expand All @@ -32,6 +33,7 @@
public class DataColumnSidecarsByRootValidator extends AbstractDataColumnSidecarValidator {
private final Set<DataColumnIdentifier> expectedDataColumnIdentifiers;
private final MetricsHistogram dataColumnSidecarInclusionProofVerificationTimeSeconds;
private final MetricsHistogram dataColumnSidecarKzgBatchVerificationTimeSeconds;

public DataColumnSidecarsByRootValidator(
final Peer peer,
Expand All @@ -46,6 +48,8 @@ public DataColumnSidecarsByRootValidator(
this.dataColumnSidecarInclusionProofVerificationTimeSeconds =
DATA_COLUMN_SIDECAR_INCLUSION_PROOF_VERIFICATION_HISTOGRAM.apply(
metricsSystem, timeProvider);
this.dataColumnSidecarKzgBatchVerificationTimeSeconds =
DATA_COLUMN_SIDECAR_KZG_BATCH_VERIFICATION_HISTOGRAM.apply(metricsSystem, timeProvider);
}

public void validate(final DataColumnSidecar dataColumnSidecar) {
Expand All @@ -63,6 +67,12 @@ public void validate(final DataColumnSidecar dataColumnSidecar) {
throw new DataColumnSidecarsResponseInvalidResponseException(
peer, InvalidResponseType.DATA_COLUMN_SIDECAR_INCLUSION_PROOF_VERIFICATION_FAILED);
}
verifyKzgProof(dataColumnSidecar);
try (MetricsHistogram.Timer ignored =
dataColumnSidecarKzgBatchVerificationTimeSeconds.startTimer()) {
verifyKzgProof(dataColumnSidecar);
} catch (final IOException ioException) {
throw new DataColumnSidecarsResponseInvalidResponseException(
peer, InvalidResponseType.DATA_COLUMN_SIDECAR_KZG_VERIFICATION_FAILED);
}
}
}