Update SetParticipantParams for HMSS protocol (#1470)

world-federation-of-advertisers · Feb 16, 2024 · 321b373 · 321b373
1 parent bd00d25
commit 321b373
Show file tree

Hide file tree

Showing 17 changed files with 391 additions and 113 deletions.
diff --git a/src/main/kotlin/org/wfanet/measurement/kingdom/deploy/common/HmssProtocolConfig.kt b/src/main/kotlin/org/wfanet/measurement/kingdom/deploy/common/HmssProtocolConfig.kt
@@ -25,7 +25,10 @@ object HmssProtocolConfig {
   lateinit var protocolConfig: ProtocolConfig.HonestMajorityShareShuffle
     private set
 
-  /** A set of external duchy ids that the first one must be corresponding to the aggregator. */
+  /**
+   * Set of external IDs of required Duchies, where the first entry must correspond to the Duchy in
+   * the aggregator role.
+   */
   lateinit var requiredExternalDuchyIds: Set<String>
     private set
 

diff --git a/.../kotlin/org/wfanet/measurement/kingdom/deploy/gcloud/spanner/readers/RequisitionReader.kt b/.../kotlin/org/wfanet/measurement/kingdom/deploy/gcloud/spanner/readers/RequisitionReader.kt
@@ -233,6 +233,9 @@ class RequisitionReader : BaseSpannerReader<RequisitionReader.Result>() {
         ComputationParticipant.Details.ProtocolCase.REACH_ONLY_LIQUID_LEGIONS_V2 -> {
           reachOnlyLiquidLegionsV2 = participantDetails.reachOnlyLiquidLegionsV2
         }
+        ComputationParticipant.Details.ProtocolCase.HONEST_MAJORITY_SHARE_SHUFFLE -> {
+          honestMajorityShareShuffle = participantDetails.honestMajorityShareShuffle
+        }
         // Protocol may only be set after computation participant sets requisition params.
         ComputationParticipant.Details.ProtocolCase.PROTOCOL_NOT_SET -> Unit
       }

diff --git a/...kotlin/org/wfanet/measurement/kingdom/deploy/gcloud/spanner/writers/CreateMeasurements.kt b/...kotlin/org/wfanet/measurement/kingdom/deploy/gcloud/spanner/writers/CreateMeasurements.kt
@@ -182,6 +182,7 @@ class CreateMeasurements(private val requests: List<CreateMeasurementRequest>) :
         )
       }
       ProtocolConfig.ProtocolCase.HONEST_MAJORITY_SHARE_SHUFFLE -> {
+        // For each EDP, insert a Requisition for each non-aggregator Duchy.
         insertRequisitions(
           measurementConsumerId,
           measurementId,

diff --git a/...anet/measurement/kingdom/deploy/gcloud/spanner/writers/SetParticipantRequisitionParams.kt b/...anet/measurement/kingdom/deploy/gcloud/spanner/writers/SetParticipantRequisitionParams.kt
@@ -126,10 +126,20 @@ class SetParticipantRequisitionParams(private val request: SetParticipantRequisi
 
     val participantDetails =
       computationParticipant.details.copy {
-        if (request.hasLiquidLegionsV2()) {
-          liquidLegionsV2 = request.liquidLegionsV2
-        } else if (request.hasReachOnlyLiquidLegionsV2()) {
-          reachOnlyLiquidLegionsV2 = request.reachOnlyLiquidLegionsV2
+        @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA") // Protobuf enum fields cannot be null.
+        when (request.protocolCase) {
+          SetParticipantRequisitionParamsRequest.ProtocolCase.LIQUID_LEGIONS_V2 -> {
+            liquidLegionsV2 = request.liquidLegionsV2
+          }
+          SetParticipantRequisitionParamsRequest.ProtocolCase.REACH_ONLY_LIQUID_LEGIONS_V2 -> {
+            reachOnlyLiquidLegionsV2 = request.reachOnlyLiquidLegionsV2
+          }
+          SetParticipantRequisitionParamsRequest.ProtocolCase.HONEST_MAJORITY_SHARE_SHUFFLE -> {
+            honestMajorityShareShuffle = request.honestMajorityShareShuffle
+          }
+          SetParticipantRequisitionParamsRequest.ProtocolCase.PROTOCOL_NOT_SET -> {
+            error("Unspecified protocol case in SetParticipantRequisitionParamsRequest.")
+          }
         }
       }
 

diff --git a/src/main/kotlin/org/wfanet/measurement/kingdom/service/api/v2alpha/RequisitionsService.kt b/src/main/kotlin/org/wfanet/measurement/kingdom/service/api/v2alpha/RequisitionsService.kt
@@ -28,6 +28,7 @@ import org.wfanet.measurement.api.v2alpha.DataProviderCertificateKey
 import org.wfanet.measurement.api.v2alpha.DataProviderKey
 import org.wfanet.measurement.api.v2alpha.DuchyCertificateKey
 import org.wfanet.measurement.api.v2alpha.ElGamalPublicKey
+import org.wfanet.measurement.api.v2alpha.EncryptedMessage
 import org.wfanet.measurement.api.v2alpha.EncryptionPublicKey
 import org.wfanet.measurement.api.v2alpha.FulfillDirectRequisitionRequest
 import org.wfanet.measurement.api.v2alpha.FulfillDirectRequisitionResponse
@@ -44,7 +45,7 @@ import org.wfanet.measurement.api.v2alpha.Requisition
 import org.wfanet.measurement.api.v2alpha.Requisition.DuchyEntry
 import org.wfanet.measurement.api.v2alpha.Requisition.Refusal
 import org.wfanet.measurement.api.v2alpha.Requisition.State
-import org.wfanet.measurement.api.v2alpha.RequisitionKt.DuchyEntryKt.liquidLegionsV2
+import org.wfanet.measurement.api.v2alpha.RequisitionKt.DuchyEntryKt
 import org.wfanet.measurement.api.v2alpha.RequisitionKt.DuchyEntryKt.value
 import org.wfanet.measurement.api.v2alpha.RequisitionKt.duchyEntry
 import org.wfanet.measurement.api.v2alpha.RequisitionKt.refusal
@@ -435,6 +436,9 @@ private fun DuchyValue.toDuchyEntryValue(
       DuchyValue.ProtocolCase.REACH_ONLY_LIQUID_LEGIONS_V2 -> {
         reachOnlyLiquidLegionsV2 = source.reachOnlyLiquidLegionsV2.toDuchyEntryLlV2(apiVersion)
       }
+      DuchyValue.ProtocolCase.HONEST_MAJORITY_SHARE_SHUFFLE -> {
+        honestMajorityShareShuffle = source.honestMajorityShareShuffle.toDuchyEntryHmss(apiVersion)
+      }
       DuchyValue.ProtocolCase.PROTOCOL_NOT_SET -> error("protocol not set")
     }
   }
@@ -444,7 +448,7 @@ private fun ComputationParticipant.LiquidLegionsV2Details.toDuchyEntryLlV2(
   apiVersion: Version
 ): DuchyEntry.LiquidLegionsV2 {
   val source = this
-  return liquidLegionsV2 {
+  return DuchyEntryKt.liquidLegionsV2 {
     elGamalPublicKey = signedMessage {
       setMessage(
         any {
@@ -461,6 +465,27 @@ private fun ComputationParticipant.LiquidLegionsV2Details.toDuchyEntryLlV2(
   }
 }
 
+private fun ComputationParticipant.HonestMajorityShareShuffleDetails.toDuchyEntryHmss(
+  apiVersion: Version
+): DuchyEntry.HonestMajorityShareShuffle {
+  val source = this
+  return DuchyEntryKt.honestMajorityShareShuffle {
+    publicKey = signedMessage {
+      setMessage(
+        any {
+          value = source.tinkPublicKey
+          typeUrl =
+            when (apiVersion) {
+              Version.V2_ALPHA -> ProtoReflection.getTypeUrl(EncryptedMessage.getDescriptor())
+            }
+        }
+      )
+      signature = source.tinkPublicKeySignature
+      signatureAlgorithmOid = source.tinkPublicKeySignatureAlgorithmOid
+    }
+  }
+}
+
 /** Converts an internal duchy map entry to a public [DuchyEntry]. */
 private fun Map.Entry<String, DuchyValue>.toDuchyEntry(apiVersion: Version): DuchyEntry {
   val mapEntry = this

diff --git a/...kotlin/org/wfanet/measurement/kingdom/service/internal/testing/CertificatesServiceTest.kt b/...kotlin/org/wfanet/measurement/kingdom/service/internal/testing/CertificatesServiceTest.kt
@@ -39,6 +39,7 @@ import org.wfanet.measurement.internal.kingdom.Certificate
 import org.wfanet.measurement.internal.kingdom.CertificateKt
 import org.wfanet.measurement.internal.kingdom.CertificateKt.details
 import org.wfanet.measurement.internal.kingdom.CertificatesGrpcKt.CertificatesCoroutineImplBase
+import org.wfanet.measurement.internal.kingdom.ComputationParticipant
 import org.wfanet.measurement.internal.kingdom.ComputationParticipantsGrpcKt.ComputationParticipantsCoroutineImplBase
 import org.wfanet.measurement.internal.kingdom.DataProvidersGrpcKt.DataProvidersCoroutineImplBase
 import org.wfanet.measurement.internal.kingdom.DuchyProtocolConfig
@@ -543,14 +544,14 @@ abstract class CertificatesServiceTest<T : CertificatesCoroutineImplBase> {
     val dataProvider = population.createDataProvider(dataProvidersService)
 
     val measurementOne =
-      population.createComputedMeasurement(
+      population.createLlv2Measurement(
         measurementsService,
         measurementConsumer,
         "measurement one",
         dataProvider,
       )
     val measurementTwo =
-      population.createComputedMeasurement(
+      population.createLlv2Measurement(
         measurementsService,
         measurementConsumer,
         "measurement two",
@@ -674,17 +675,9 @@ abstract class CertificatesServiceTest<T : CertificatesCoroutineImplBase> {
       population.createMeasurementConsumer(measurementConsumersService, accountsService)
 
     val measurementOne =
-      population.createComputedMeasurement(
-        measurementsService,
-        measurementConsumer,
-        "measurement one",
-      )
+      population.createLlv2Measurement(measurementsService, measurementConsumer, "measurement one")
     val measurementTwo =
-      population.createComputedMeasurement(
-        measurementsService,
-        measurementConsumer,
-        "measurement two",
-      )
+      population.createLlv2Measurement(measurementsService, measurementConsumer, "measurement two")
     measurementsService.cancelMeasurement(
       cancelMeasurementRequest {
         externalMeasurementConsumerId = measurementTwo.externalMeasurementConsumerId
@@ -796,17 +789,9 @@ abstract class CertificatesServiceTest<T : CertificatesCoroutineImplBase> {
     val measurementConsumer =
       population.createMeasurementConsumer(measurementConsumersService, accountsService)
     val measurementOne =
-      population.createComputedMeasurement(
-        measurementsService,
-        measurementConsumer,
-        "measurement one",
-      )
+      population.createLlv2Measurement(measurementsService, measurementConsumer, "measurement one")
     val measurementTwo =
-      population.createComputedMeasurement(
-        measurementsService,
-        measurementConsumer,
-        "measurement two",
-      )
+      population.createLlv2Measurement(measurementsService, measurementConsumer, "measurement two")
     measurementsService.cancelMeasurement(
       cancelMeasurementRequest {
         externalMeasurementConsumerId = measurementTwo.externalMeasurementConsumerId
@@ -828,6 +813,7 @@ abstract class CertificatesServiceTest<T : CertificatesCoroutineImplBase> {
         this.externalDuchyId = externalDuchyId
         externalDuchyCertificateId = certificate.externalCertificateId
         externalComputationId = measurementOne.externalComputationId
+        liquidLegionsV2 = ComputationParticipant.LiquidLegionsV2Details.getDefaultInstance()
       }
     )
     val request = revokeCertificateRequest {