apply pr suggestions

nucypher · Aug 10, 2023 · 43d45f0 · 43d45f0 · github-actions · Aug 11, 2023
1 parent 9e42bee
commit 43d45f0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/src/agents/coordinator.ts b/src/agents/coordinator.ts
@@ -25,7 +25,6 @@ export interface CoordinatorRitual {
 export type DkgParticipant = {
   provider: string;
   aggregated: boolean;
-  // TODO: How do I get the transcript from the Coordinator?
   transcript: Transcript;
   decryptionRequestStaticKey: SessionStaticKey;
 };

diff --git a/src/characters/cbd-recipient.ts b/src/characters/cbd-recipient.ts
@@ -56,13 +56,15 @@ export class ThresholdDecrypter {
     provider: ethers.providers.Web3Provider,
     conditionExpr: ConditionExpression,
     variant: FerveoVariant,
-    ciphertext: Ciphertext
+    ciphertext: Ciphertext,
+    verifyRitual = true
   ): Promise<Uint8Array> {
     const decryptionShares = await this.retrieve(
       provider,
       conditionExpr,
       variant,
-      ciphertext
+      ciphertext,
+      verifyRitual
     );
 
     const combineDecryptionSharesFn =
@@ -80,7 +82,8 @@ export class ThresholdDecrypter {
     web3Provider: ethers.providers.Web3Provider,
     conditionExpr: ConditionExpression,
     variant: FerveoVariant,
-    ciphertext: Ciphertext
+    ciphertext: Ciphertext,
+    verifyRitual = true
   ): Promise<DecryptionSharePrecomputed[] | DecryptionShareSimple[]> {
     const ritualState = await DkgCoordinatorAgent.getRitualState(
       web3Provider,
@@ -92,14 +95,16 @@ export class ThresholdDecrypter {
       );
     }
 
-    const isLocallyVerified = await DkgClient.verifyRitual(
-      web3Provider,
-      this.ritualId
-    );
-    if (!isLocallyVerified) {
-      throw new Error(
-        `Ritual with id ${this.ritualId} has failed local verification.`
+    if (verifyRitual) {
+      const isLocallyVerified = await DkgClient.verifyRitual(
+        web3Provider,
+        this.ritualId
       );
+      if (!isLocallyVerified) {
+        throw new Error(
+          `Ritual with id ${this.ritualId} has failed local verification.`
+        );
+      }
     }
 
     const dkgParticipants = await DkgCoordinatorAgent.getParticipants(

diff --git a/src/dkg.ts b/src/dkg.ts
@@ -182,14 +182,6 @@ export class DkgClient {
       ritualId
     );
 
-    // TODO: Does this check make sense here? Or do we delegate it to the Coordinator contract?
-    // for (const p of participants) {
-    //   // Not every participant has submitted a transcript
-    //   if (!p.aggregated) {
-    //     return false;
-    //   }
-    // }
-
     const validatorMessages = participants.map((p) => {
       const validatorAddress = EthereumAddress.fromString(p.provider);
       // TODO: Replace with real keys