Use JsonTypeDef for PostSyncDuties request

Author: courtneyeh

Diff for: data/beaconrestapi/src/integration-test/java/tech/pegasys/teku/beaconrestapi/v1/validator/PostSyncDutiesIntegrationTest.java

@@ -15,8 +15,10 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.when;
+import static tech.pegasys.teku.ethereum.json.types.validator.SyncCommitteeDutiesBuilder.SYNC_COMMITTEE_DUTIES_TYPE;
 import static tech.pegasys.teku.infrastructure.http.HttpStatusCodes.SC_BAD_REQUEST;
 import static tech.pegasys.teku.infrastructure.http.HttpStatusCodes.SC_OK;
+import static tech.pegasys.teku.infrastructure.json.JsonUtil.parse;
 import static tech.pegasys.teku.infrastructure.unsigned.UInt64.ONE;
 
 import it.unimi.dsi.fastutil.ints.IntList;
@@ -27,8 +29,6 @@
 import okhttp3.Response;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import tech.pegasys.teku.api.response.v1.validator.PostSyncDutiesResponse;
-import tech.pegasys.teku.api.schema.BLSPubKey;
 import tech.pegasys.teku.beacon.sync.events.SyncState;
 import tech.pegasys.teku.beaconrestapi.AbstractDataBackedRestAPIIntegrationTest;
 import tech.pegasys.teku.beaconrestapi.handlers.v1.validator.PostSyncDuties;
@@ -68,11 +68,9 @@ void shouldGetSyncCommitteeDuties() throws IOException {
         post(PostSyncDuties.ROUTE.replace("{epoch}", "1"), jsonProvider.objectToJSON(validators));
 
     Assertions.assertThat(response.code()).isEqualTo(SC_OK);
-    final PostSyncDutiesResponse dutiesResponse =
-        jsonProvider.jsonToObject(response.body().string(), PostSyncDutiesResponse.class);
-    assertThat(dutiesResponse.data.get(0))
-        .isEqualTo(
-            new tech.pegasys.teku.api.response.v1.validator.SyncCommitteeDuty(
-                new BLSPubKey(VALIDATOR_KEYS.get(1).getPublicKey()), ONE, IntSet.of(11)));
+    final SyncCommitteeDuties committeeDuties =
+        parse(response.body().string(), SYNC_COMMITTEE_DUTIES_TYPE);
+    assertThat(committeeDuties.getDuties().get(0))
+        .isEqualTo(new SyncCommitteeDuty(VALIDATOR_KEYS.get(1).getPublicKey(), 1, IntSet.of(11)));
   }
 }

Diff for: data/serializer/src/main/java/tech/pegasys/teku/api/response/v1/validator/PostSyncDutiesResponse.java

@@ -19,7 +19,6 @@
 
 import com.google.common.base.Throwables;
 import it.unimi.dsi.fastutil.ints.IntCollection;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39,7 +38,6 @@
 import tech.pegasys.teku.api.migrated.ValidatorLivenessAtEpoch;
 import tech.pegasys.teku.api.response.v1.beacon.PostDataFailureResponse;
 import tech.pegasys.teku.api.response.v1.beacon.ValidatorStatus;
-import tech.pegasys.teku.api.response.v1.validator.PostSyncDutiesResponse;
 import tech.pegasys.teku.api.response.v1.validator.PostValidatorLivenessResponse;
 import tech.pegasys.teku.api.schema.altair.ContributionAndProof;
 import tech.pegasys.teku.bls.BLSPublicKey;
@@ -50,7 +48,6 @@
 import tech.pegasys.teku.ethereum.json.types.validator.BeaconCommitteeSelectionProof;
 import tech.pegasys.teku.ethereum.json.types.validator.ProposerDuties;
 import tech.pegasys.teku.ethereum.json.types.validator.SyncCommitteeDuties;
-import tech.pegasys.teku.ethereum.json.types.validator.SyncCommitteeDuty;
 import tech.pegasys.teku.ethereum.json.types.validator.SyncCommitteeSelectionProof;
 import tech.pegasys.teku.infrastructure.async.AsyncRunner;
 import tech.pegasys.teku.infrastructure.async.ExceptionThrowingRunnable;
@@ -223,25 +220,7 @@ public SafeFuture<Optional<AttesterDuties>> getAttestationDuties(
   @Override
   public SafeFuture<Optional<SyncCommitteeDuties>> getSyncCommitteeDuties(
       final UInt64 epoch, final IntCollection validatorIndices) {
-    return sendRequest(
-        () ->
-            apiClient
-                .getSyncCommitteeDuties(epoch, validatorIndices)
-                .map(this::responseToSyncCommitteeDuties));
-  }
-
-  private SyncCommitteeDuties responseToSyncCommitteeDuties(final PostSyncDutiesResponse response) {
-    return new SyncCommitteeDuties(
-        response.executionOptimistic,
-        response.data.stream()
-            .map(
-                duty ->
-                    new SyncCommitteeDuty(
-                        duty.pubkey.asBLSPublicKey(),
-                        duty.validatorIndex.intValue(),
-                        IntOpenHashSet.toSet(
-                            duty.committeeIndices.stream().mapToInt(UInt64::intValue))))
-            .toList());
+    return sendRequest(() -> typeDefClient.postSyncDuties(epoch, validatorIndices));
   }
 
   @Override

Diff for: data/serializer/src/main/java/tech/pegasys/teku/api/response/v1/validator/SyncCommitteeDuty.java

@@ -21,7 +21,6 @@
 import static tech.pegasys.teku.validator.remote.apiclient.ValidatorApiMethod.GET_GENESIS;
 import static tech.pegasys.teku.validator.remote.apiclient.ValidatorApiMethod.GET_PROPOSER_DUTIES;
 import static tech.pegasys.teku.validator.remote.apiclient.ValidatorApiMethod.GET_SYNC_COMMITTEE_CONTRIBUTION;
-import static tech.pegasys.teku.validator.remote.apiclient.ValidatorApiMethod.GET_SYNC_COMMITTEE_DUTIES;
 import static tech.pegasys.teku.validator.remote.apiclient.ValidatorApiMethod.GET_VALIDATORS;
 import static tech.pegasys.teku.validator.remote.apiclient.ValidatorApiMethod.PREPARE_BEACON_PROPOSER;
 import static tech.pegasys.teku.validator.remote.apiclient.ValidatorApiMethod.SEND_CONTRIBUTION_AND_PROOF;
@@ -64,7 +63,6 @@
 import tech.pegasys.teku.api.response.v1.validator.GetProposerDutiesResponse;
 import tech.pegasys.teku.api.response.v1.validator.GetSyncCommitteeContributionResponse;
 import tech.pegasys.teku.api.response.v1.validator.PostAttesterDutiesResponse;
-import tech.pegasys.teku.api.response.v1.validator.PostSyncDutiesResponse;
 import tech.pegasys.teku.api.response.v1.validator.PostValidatorLivenessResponse;
 import tech.pegasys.teku.api.schema.Attestation;
 import tech.pegasys.teku.api.schema.SignedAggregateAndProof;
@@ -224,16 +222,6 @@ public Optional<PostDataFailureResponse> sendSyncCommitteeMessages(
             jsonProvider, PostDataFailureResponse.class));
   }
 
-  @Override
-  public Optional<PostSyncDutiesResponse> getSyncCommitteeDuties( // todo remove
-      final UInt64 epoch, final Collection<Integer> validatorIndices) {
-    return post(
-        GET_SYNC_COMMITTEE_DUTIES,
-        Map.of("epoch", epoch.toString()),
-        validatorIndices.stream().map(UInt64::valueOf).toList(),
-        createHandler(PostSyncDutiesResponse.class));
-  }
-
   @Override
   public void subscribeToSyncCommitteeSubnets(
       final List<SyncCommitteeSubnetSubscription> subnetSubscriptions) {

Diff for: validator/remote/src/main/java/tech/pegasys/teku/validator/remote/RemoteValidatorApiHandler.java

@@ -23,7 +23,6 @@
 import tech.pegasys.teku.api.response.v1.beacon.ValidatorResponse;
 import tech.pegasys.teku.api.response.v1.validator.GetProposerDutiesResponse;
 import tech.pegasys.teku.api.response.v1.validator.PostAttesterDutiesResponse;
-import tech.pegasys.teku.api.response.v1.validator.PostSyncDutiesResponse;
 import tech.pegasys.teku.api.response.v1.validator.PostValidatorLivenessResponse;
 import tech.pegasys.teku.api.schema.Attestation;
 import tech.pegasys.teku.api.schema.SignedAggregateAndProof;
@@ -64,9 +63,6 @@ Optional<PostDataFailureResponse> sendAggregateAndProofs(
   Optional<PostDataFailureResponse> sendSyncCommitteeMessages(
       List<SyncCommitteeMessage> syncCommitteeMessages);
 
-  Optional<PostSyncDutiesResponse> getSyncCommitteeDuties(
-      UInt64 epoch, Collection<Integer> validatorIndices);
-
   void subscribeToSyncCommitteeSubnets(List<SyncCommitteeSubnetSubscription> subnetSubscriptions);
 
   void sendContributionAndProofs(

Diff for: validator/remote/src/main/java/tech/pegasys/teku/validator/remote/apiclient/OkHttpValidatorRestApiClient.java

@@ -13,6 +13,7 @@
 
 package tech.pegasys.teku.validator.remote.typedef;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import okhttp3.HttpUrl;
@@ -24,6 +25,7 @@
 import tech.pegasys.teku.ethereum.json.types.beacon.StateValidatorData;
 import tech.pegasys.teku.ethereum.json.types.validator.BeaconCommitteeSelectionProof;
 import tech.pegasys.teku.ethereum.json.types.validator.ProposerDuties;
+import tech.pegasys.teku.ethereum.json.types.validator.SyncCommitteeDuties;
 import tech.pegasys.teku.ethereum.json.types.validator.SyncCommitteeSelectionProof;
 import tech.pegasys.teku.infrastructure.ssz.SszList;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
@@ -44,6 +46,7 @@
 import tech.pegasys.teku.validator.remote.typedef.handlers.GetStateValidatorsRequest;
 import tech.pegasys.teku.validator.remote.typedef.handlers.GetSyncingStatusRequest;
 import tech.pegasys.teku.validator.remote.typedef.handlers.PostStateValidatorsRequest;
+import tech.pegasys.teku.validator.remote.typedef.handlers.PostSyncDutiesRequest;
 import tech.pegasys.teku.validator.remote.typedef.handlers.ProduceBlockRequest;
 import tech.pegasys.teku.validator.remote.typedef.handlers.RegisterValidatorsRequest;
 import tech.pegasys.teku.validator.remote.typedef.handlers.SendSignedBlockRequest;
@@ -60,6 +63,7 @@ public class OkHttpValidatorTypeDefClient extends OkHttpValidatorMinimalTypeDefC
   private final GetProposerDutiesRequest getProposerDutiesRequest;
   private final GetStateValidatorsRequest getStateValidatorsRequest;
   private final PostStateValidatorsRequest postStateValidatorsRequest;
+  private final PostSyncDutiesRequest postSyncDutiesRequest;
   private final SendSignedBlockRequest sendSignedBlockRequest;
   private final RegisterValidatorsRequest registerValidatorsRequest;
   private final CreateAttestationDataRequest createAttestationDataRequest;
@@ -79,6 +83,7 @@ public OkHttpValidatorTypeDefClient(
     this.getProposerDutiesRequest = new GetProposerDutiesRequest(baseEndpoint, okHttpClient);
     this.getStateValidatorsRequest = new GetStateValidatorsRequest(baseEndpoint, okHttpClient);
     this.postStateValidatorsRequest = new PostStateValidatorsRequest(baseEndpoint, okHttpClient);
+    this.postSyncDutiesRequest = new PostSyncDutiesRequest(baseEndpoint, okHttpClient);
     this.sendSignedBlockRequest =
         new SendSignedBlockRequest(spec, baseEndpoint, okHttpClient, preferSszBlockEncoding);
     this.registerValidatorsRequest =
@@ -119,6 +124,11 @@ public Optional<List<StateValidatorData>> postStateValidators(final List<String>
         .map(ObjectAndMetaData::getData);
   }
 
+  public Optional<SyncCommitteeDuties> postSyncDuties(
+      final UInt64 epoch, final Collection<Integer> validatorIndices) {
+    return postSyncDutiesRequest.postSyncDuties(epoch, validatorIndices);
+  }
+
   public SendSignedBlockResult sendSignedBlock(final SignedBlockContainer blockContainer) {
     return sendSignedBlockRequest.sendSignedBlock(blockContainer);
   }

Diff for: validator/remote/src/main/java/tech/pegasys/teku/validator/remote/apiclient/ValidatorRestApiClient.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright Consensys Software Inc., 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.validator.remote.typedef.handlers;
+
+import static tech.pegasys.teku.ethereum.json.types.validator.SyncCommitteeDutiesBuilder.SYNC_COMMITTEE_DUTIES_TYPE;
+import static tech.pegasys.teku.infrastructure.json.types.CoreTypes.INTEGER_TYPE;
+import static tech.pegasys.teku.infrastructure.json.types.DeserializableTypeDefinition.listOf;
+import static tech.pegasys.teku.validator.remote.apiclient.ValidatorApiMethod.GET_SYNC_COMMITTEE_DUTIES;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import tech.pegasys.teku.ethereum.json.types.validator.SyncCommitteeDuties;
+import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.validator.remote.typedef.ResponseHandler;
+
+public class PostSyncDutiesRequest extends AbstractTypeDefRequest {
+  public PostSyncDutiesRequest(final HttpUrl baseEndpoint, final OkHttpClient okHttpClient) {
+    super(baseEndpoint, okHttpClient);
+  }
+
+  public Optional<SyncCommitteeDuties> postSyncDuties(
+      final UInt64 epoch, final Collection<Integer> validatorIndices) {
+    return postJson(
+        GET_SYNC_COMMITTEE_DUTIES,
+        Map.of("epoch", epoch.toString()),
+        validatorIndices.stream().toList(),
+        listOf(INTEGER_TYPE, 1),
+        new ResponseHandler<>(SYNC_COMMITTEE_DUTIES_TYPE));
+  }
+}