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

9129 il signer #9130

Merged
merged 1 commit into from
Feb 17, 2025
+58 −1
Merged

9129 il signer #9130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions ethereum/spec/src/main/java/tech/pegasys/teku/spec/signatures/DeletableSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import tech.pegasys.teku.spec.datastructures.builder.ValidatorRegistration;
import tech.pegasys.teku.spec.datastructures.operations.AggregateAndProof;
import tech.pegasys.teku.spec.datastructures.operations.AttestationData;
import tech.pegasys.teku.spec.datastructures.operations.InclusionList;
import tech.pegasys.teku.spec.datastructures.operations.VoluntaryExit;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.ContributionAndProof;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.SyncAggregatorSelectionData;
Expand Down Expand Up @@ -110,6 +111,12 @@ public SafeFuture<BLSSignature> signValidatorRegistration(
return sign(() -> delegate.signValidatorRegistration(validatorRegistration));
}

@Override
public SafeFuture<BLSSignature> signInclusionList(
final InclusionList inclusionList, final ForkInfo forkInfo) {
return sign(() -> delegate.signInclusionList(inclusionList, forkInfo));
}

@Override
public Optional<URL> getSigningServiceUrl() {
return delegate.getSigningServiceUrl();
Expand Down
7 changes: 7 additions & 0 deletions ethereum/spec/src/main/java/tech/pegasys/teku/spec/signatures/LocalSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import tech.pegasys.teku.spec.datastructures.builder.ValidatorRegistration;
import tech.pegasys.teku.spec.datastructures.operations.AggregateAndProof;
import tech.pegasys.teku.spec.datastructures.operations.AttestationData;
import tech.pegasys.teku.spec.datastructures.operations.InclusionList;
import tech.pegasys.teku.spec.datastructures.operations.VoluntaryExit;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.ContributionAndProof;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.SyncAggregatorSelectionData;
Expand Down Expand Up @@ -122,6 +123,12 @@ public SafeFuture<BLSSignature> signValidatorRegistration(
return sign(signingRootUtil.signingRootForValidatorRegistration(validatorRegistration));
}

@Override
public SafeFuture<BLSSignature> signInclusionList(
final InclusionList inclusionList, final ForkInfo forkInfo) {
return sign(signingRootUtil.signingRootForInclusionList(inclusionList, forkInfo));
}

private SafeFuture<Bytes> signingRootFromSyncCommitteeUtils(
final UInt64 slot, final Function<SyncCommitteeUtil, Bytes> createSigningRoot) {
return SafeFuture.of(() -> createSigningRoot.apply(spec.getSyncCommitteeUtilRequired(slot)));
Expand Down
3 changes: 3 additions & 0 deletions ethereum/spec/src/main/java/tech/pegasys/teku/spec/signatures/Signer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import tech.pegasys.teku.spec.datastructures.builder.ValidatorRegistration;
import tech.pegasys.teku.spec.datastructures.operations.AggregateAndProof;
import tech.pegasys.teku.spec.datastructures.operations.AttestationData;
import tech.pegasys.teku.spec.datastructures.operations.InclusionList;
import tech.pegasys.teku.spec.datastructures.operations.VoluntaryExit;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.ContributionAndProof;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.SyncAggregatorSelectionData;
Expand Down Expand Up @@ -56,6 +57,8 @@ SafeFuture<BLSSignature> signContributionAndProof(

SafeFuture<BLSSignature> signValidatorRegistration(ValidatorRegistration validatorRegistration);

SafeFuture<BLSSignature> signInclusionList(InclusionList inclusionList, ForkInfo forkInfo);

default boolean isLocal() {
return getSigningServiceUrl().isEmpty();
}
Expand Down
14 changes: 14 additions & 0 deletions ethereum/spec/src/main/java/tech/pegasys/teku/spec/signatures/SigningRootUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import tech.pegasys.teku.spec.datastructures.builder.ValidatorRegistration;
import tech.pegasys.teku.spec.datastructures.operations.AggregateAndProof;
import tech.pegasys.teku.spec.datastructures.operations.AttestationData;
import tech.pegasys.teku.spec.datastructures.operations.InclusionList;
import tech.pegasys.teku.spec.datastructures.operations.VoluntaryExit;
import tech.pegasys.teku.spec.datastructures.state.ForkInfo;
import tech.pegasys.teku.spec.logic.common.helpers.MiscHelpers;
Expand Down Expand Up @@ -112,4 +113,17 @@ public Bytes signingRootForValidatorRegistration(
final Bytes32 domain = miscHelpers.computeDomain(Domain.APPLICATION_BUILDER);
return miscHelpers.computeSigningRoot(validatorRegistration, domain);
}

public Bytes signingRootForInclusionList(
final InclusionList inclusionList, final ForkInfo forkInfo) {
final UInt64 slot = inclusionList.getSlot();
final SpecVersion specVersion = spec.atSlot(slot);
final Bytes32 domain =
spec.getDomain(
Domain.DOMAIN_INCLUSION_LIST_COMMITTEE,
spec.computeEpochAtSlot(slot),
forkInfo.getFork(),
forkInfo.getGenesisValidatorsRoot());
return specVersion.miscHelpers().computeSigningRoot(inclusionList, domain);
}
}
7 changes: 7 additions & 0 deletions ethereum/spec/src/main/java/tech/pegasys/teku/spec/signatures/SlashingProtectedSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import tech.pegasys.teku.spec.datastructures.builder.ValidatorRegistration;
import tech.pegasys.teku.spec.datastructures.operations.AggregateAndProof;
import tech.pegasys.teku.spec.datastructures.operations.AttestationData;
import tech.pegasys.teku.spec.datastructures.operations.InclusionList;
import tech.pegasys.teku.spec.datastructures.operations.VoluntaryExit;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.ContributionAndProof;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.SyncAggregatorSelectionData;
Expand Down Expand Up @@ -148,6 +149,12 @@ public SafeFuture<BLSSignature> signValidatorRegistration(
return delegate.signValidatorRegistration(validatorRegistration);
}

@Override
public SafeFuture<BLSSignature> signInclusionList(
final InclusionList inclusionList, final ForkInfo forkInfo) {
return delegate.signInclusionList(inclusionList, forkInfo);
}

@Override
public Optional<URL> getSigningServiceUrl() {
return delegate.getSigningServiceUrl();
Expand Down
7 changes: 7 additions & 0 deletions ...um/spec/src/testFixtures/java/tech/pegasys/teku/spec/generator/signatures/NoOpSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import tech.pegasys.teku.spec.datastructures.builder.ValidatorRegistration;
import tech.pegasys.teku.spec.datastructures.operations.AggregateAndProof;
import tech.pegasys.teku.spec.datastructures.operations.AttestationData;
import tech.pegasys.teku.spec.datastructures.operations.InclusionList;
import tech.pegasys.teku.spec.datastructures.operations.VoluntaryExit;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.ContributionAndProof;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.SyncAggregatorSelectionData;
Expand Down Expand Up @@ -93,6 +94,12 @@ public SafeFuture<BLSSignature> signValidatorRegistration(
return new SafeFuture<>();
}

@Override
public SafeFuture<BLSSignature> signInclusionList(
final InclusionList inclusionList, final ForkInfo forkInfo) {
return new SafeFuture<>();
}

@Override
public abstract Optional<URL> getSigningServiceUrl();
}
3 changes: 2 additions & 1 deletion validator/api/src/main/java/tech/pegasys/teku/validator/api/signer/SignType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ public enum SignType {
VALIDATOR_REGISTRATION("validator_registration"),
CONTRIBUTION_AND_PROOF("contribution_and_proof"),
BEACON_BLOCK("beacon_block"),
BLOB_SIDECAR("blob_sidecar");
BLOB_SIDECAR("blob_sidecar"),
INCLUSION_LIST("inclusion_list");

private final String name;

Expand Down
11 changes: 11 additions & 0 deletions validator/client/src/main/java/tech/pegasys/teku/validator/client/signer/ExternalSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import tech.pegasys.teku.spec.datastructures.builder.ValidatorRegistration;
import tech.pegasys.teku.spec.datastructures.operations.AggregateAndProof;
import tech.pegasys.teku.spec.datastructures.operations.AttestationData;
import tech.pegasys.teku.spec.datastructures.operations.InclusionList;
import tech.pegasys.teku.spec.datastructures.operations.VoluntaryExit;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.ContributionAndProof;
import tech.pegasys.teku.spec.datastructures.operations.versions.altair.SyncAggregatorSelectionData;
Expand Down Expand Up @@ -264,6 +265,16 @@ public SafeFuture<BLSSignature> signValidatorRegistration(
slashableGenericMessage("validator registration")));
}

@Override
public SafeFuture<BLSSignature> signInclusionList(
final InclusionList inclusionList, final ForkInfo forkInfo) {
return sign(
signingRootUtil.signingRootForInclusionList(inclusionList, forkInfo),
SignType.INCLUSION_LIST,
Map.of(SignType.INCLUSION_LIST.getName(), inclusionList, FORK_INFO, forkInfo),
slashableGenericMessage("inclusion list"));
}

@Override
public Optional<URL> getSigningServiceUrl() {
return Optional.of(signingServiceUrl);
Expand Down