apply pr suggestions

src/characters/cbd-recipient.ts

@@ -13,7 +13,7 @@ import {
 import { ethers } from 'ethers';
 
 import { DkgCoordinatorAgent, DkgParticipant } from '../agents/coordinator';
-import { ConditionExpression } from '../conditions';
+import { ConditionContext } from '../conditions';
 import { DkgRitual } from '../dkg';
 import { PorterClient } from '../porter';
 import { fromJSON, objectEquals, toJSON } from '../utils';
@@ -42,13 +42,11 @@ export class ThresholdDecrypter {
   // Retrieve and decrypt ciphertext using provider and condition expression
   public async retrieveAndDecrypt(
     provider: ethers.providers.Provider,
-    conditionExpr: ConditionExpression,
     thresholdMessageKit: ThresholdMessageKit,
     signer?: ethers.Signer
   ): Promise<Uint8Array> {
     const decryptionShares = await this.retrieve(
       provider,
-      conditionExpr,
       thresholdMessageKit,
       signer
     );
@@ -59,23 +57,25 @@ export class ThresholdDecrypter {
   // Retrieve decryption shares
   public async retrieve(
     provider: ethers.providers.Provider,
-    conditionExpr: ConditionExpression,
     thresholdMessageKit: ThresholdMessageKit,
     signer?: ethers.Signer
   ): Promise<DecryptionShareSimple[]> {
     const dkgParticipants = await DkgCoordinatorAgent.getParticipants(
       provider,
       this.ritualId
     );
-    const contextStr = await conditionExpr
-      .buildContext(provider, {}, signer)
-      .toJson();
-    const { sharedSecrets, encryptedRequests } = this.makeDecryptionRequests(
-      this.ritualId,
-      new Context(contextStr),
-      dkgParticipants,
-      thresholdMessageKit
-    );
+    const wasmContext = await ConditionContext.fromAccessControlPolicy(
+      provider,
+      thresholdMessageKit.acp,
+      signer
+    ).toWASMContext();
+    const { sharedSecrets, encryptedRequests } =
+      await this.makeDecryptionRequests(
+        this.ritualId,
+        wasmContext,
+        dkgParticipants,
+        thresholdMessageKit
+      );
 
     const { encryptedResponses, errors } = await this.porter.cbdDecrypt(
       encryptedRequests,
@@ -117,21 +117,21 @@ export class ThresholdDecrypter {
     );
   }
 
-  private makeDecryptionRequests(
+  private async makeDecryptionRequests(
     ritualId: number,
-    conditionContext: Context,
+    wasmContext: Context,
     dkgParticipants: Array<DkgParticipant>,
     thresholdMessageKit: ThresholdMessageKit
-  ): {
+  ): Promise<{
     sharedSecrets: Record<string, SessionSharedSecret>;
     encryptedRequests: Record<string, EncryptedThresholdDecryptionRequest>;
-  } {
+  }> {
     const decryptionRequest = new ThresholdDecryptionRequest(
       ritualId,
       FerveoVariant.simple,
       thresholdMessageKit.ciphertextHeader,
       thresholdMessageKit.acp,
-      conditionContext
+      wasmContext
     );
 
     const ephemeralSessionKey = this.makeSessionKey();

src/conditions/condition-expr.ts

@@ -2,7 +2,7 @@ import { Conditions as WASMConditions } from '@nucypher/nucypher-core';
 import { ethers } from 'ethers';
 import { SemVer } from 'semver';
 
-import { toBytes, toJSON } from '../utils';
+import { toJSON } from '../utils';
 
 import { Condition } from './condition';
 import { ConditionContext, CustomContextParam } from './context';
@@ -13,7 +13,7 @@ export type ConditionExpressionJSON = {
 };
 
 export class ConditionExpression {
-  static VERSION = '1.0.0';
+  public static VERSION = '1.0.0';
 
   constructor(
     public readonly condition: Condition,
@@ -61,6 +61,10 @@ export class ConditionExpression {
     return new WASMConditions(toJSON(this.toObj()));
   }
 
+  public static fromWASMConditions(conditions: WASMConditions) {
+    return ConditionExpression.fromJSON(conditions.toString());
+  }
+
   public buildContext(
     provider: ethers.providers.Provider,
     customParameters: Record<string, CustomContextParam> = {},
@@ -78,10 +82,6 @@ export class ConditionExpression {
     return this.condition.requiresSigner();
   }
 
-  public asAad(): Uint8Array {
-    return toBytes(this.toJson());
-  }
-
   public equals(other: ConditionExpression): boolean {
     return [
       this.version === other.version,

src/conditions/condition.ts

@@ -75,6 +75,6 @@ export class Condition {
   }
 
   public equals(other: Condition) {
-    return objectEquals(this, other);
+    return objectEquals(this.toObj(), other.toObj());
   }
 }

src/conditions/context/context.ts

@@ -1,8 +1,13 @@
-import { Conditions as WASMConditions } from '@nucypher/nucypher-core';
+import {
+  AccessControlPolicy,
+  Context,
+  Conditions as WASMConditions,
+} from '@nucypher/nucypher-core';
 import { ethers } from 'ethers';
 
 import { fromJSON, toJSON } from '../../utils';
 import { Condition } from '../condition';
+import { ConditionExpression } from '../condition-expr';
 import { USER_ADDRESS_PARAM } from '../const';
 
 import { TypedSignature, WalletAuthenticationProvider } from './providers';
@@ -31,7 +36,7 @@ export class ConditionContext {
     this.validate();
   }
 
-  public requiresSigner(): boolean {
+  private requiresSigner(): boolean {
     return this.conditions.some((cond) => cond.requiresSigner());
   }
 
@@ -120,19 +125,35 @@ export class ConditionContext {
     return parameters;
   };
 
-  public toJson = async (): Promise<string> => {
+  public async toJson(): Promise<string> {
     const parameters = await this.toObj();
     return toJSON(parameters);
-  };
+  }
 
-  public withCustomParams = (
+  public withCustomParams(
     params: Record<string, CustomContextParam>
-  ): ConditionContext => {
+  ): ConditionContext {
     return new ConditionContext(
       this.provider,
       this.conditions,
       params,
       this.signer
     );
-  };
+  }
+
+  public async toWASMContext(): Promise<Context> {
+    const asJson = await this.toJson();
+    return new Context(asJson);
+  }
+
+  public static fromAccessControlPolicy(
+    provider: ethers.providers.Provider,
+    acp: AccessControlPolicy,
+    signer?: ethers.Signer
+  ): ConditionContext {
+    const conditions = acp.conditions
+      ? [ConditionExpression.fromWASMConditions(acp.conditions).condition]
+      : [];
+    return new ConditionContext(provider, conditions, {}, signer);
+  }
 }

test/unit/cbd-strategy.test.ts

@@ -132,7 +132,6 @@ describe('CbdDeployedStrategy', () => {
     const decryptedMessage =
       await deployedStrategy.decrypter.retrieveAndDecrypt(
         aliceProvider,
-        conditionExpr,
         thresholdMessageKit,
         aliceSigner
       );

test/unit/conditions/condition-expr.test.ts

@@ -188,6 +188,13 @@ describe('condition set', () => {
       expect(conditionExprFromJson.equals(conditionExprFromJson)).toBeTruthy();
     });
 
+    it('serializes to and from WASM conditions', () => {
+      const conditionExpr = new ConditionExpression(erc721BalanceCondition);
+      const wasmConditions = conditionExpr.toWASMConditions();
+      const fromWasm = ConditionExpression.fromWASMConditions(wasmConditions);
+      expect(conditionExpr.equals(fromWasm)).toBeTruthy();
+    });
+
     it('incompatible version', () => {
       const currentVersion = new SemVer(ConditionExpression.VERSION);
       const invalidVersion = currentVersion.inc('major');

test/unit/conditions/context.test.ts

@@ -90,20 +90,16 @@ describe('context parameters', () => {
     };
     const condition = new ContractCondition(conditionObj);
     const conditionExpr = new ConditionExpression(condition);
-    const conditionContext = conditionExpr.buildContext(provider, {}, signer);
     expect(conditionExpr.contextRequiresSigner()).toBe(true);
-    expect(conditionContext.requiresSigner()).toBe(true);
   });
 
   it('detects if a signer is not required', () => {
     const condition = new RpcCondition(testRpcConditionObj);
     const conditionExpr = new ConditionExpression(condition);
-    const conditionContext = conditionExpr.buildContext(provider, {}, signer);
     expect(JSON.stringify(condition.toObj()).includes(USER_ADDRESS_PARAM)).toBe(
       false
     );
     expect(conditionExpr.contextRequiresSigner()).toBe(false);
-    expect(conditionContext.requiresSigner()).toBe(false);
   });
 
   describe('custom method parameters', () => {

test/utils.ts

@@ -14,7 +14,6 @@ import {
   DkgPublicKey,
   EncryptedThresholdDecryptionResponse,
   EncryptedTreasureMap,
-  encryptForDkg,
   EthereumAddress,
   FerveoVariant,
   Keypair,
@@ -323,16 +322,8 @@ export const fakeTDecFlow = async ({
   threshold,
   receivedMessages,
   message,
-  conditionExpr,
-  dkgPublicKey,
   thresholdMessageKit,
 }: FakeDkgRitualFlow) => {
-  const [_ciphertext, authenticatedData] = encryptForDkg(
-    message,
-    dkgPublicKey,
-    conditionExpr.toWASMConditions()
-  );
-
   // Having aggregated the transcripts, the validators can now create decryption shares
   const decryptionShares: (
     | DecryptionSharePrecomputed
@@ -349,7 +340,7 @@ export const fakeTDecFlow = async ({
     const decryptionShare = aggregate.createDecryptionShareSimple(
       dkg,
       thresholdMessageKit.ciphertextHeader,
-      authenticatedData.aad(),
+      thresholdMessageKit.acp.aad(),
       keypair
     );
     decryptionShares.push(decryptionShare);
@@ -362,7 +353,6 @@ export const fakeTDecFlow = async ({
     throw new Error('Decryption failed');
   }
   return {
-    authenticatedData,
     decryptionShares,
     plaintext,
     sharedSecret,
@@ -393,7 +383,7 @@ export const fakeDkgTDecFlowE2E = async (
     conditionExpr
   );
 
-  const { decryptionShares, authenticatedData } = await fakeTDecFlow({
+  const { decryptionShares } = await fakeTDecFlow({
     ...ritual,
     message,
     conditionExpr,
@@ -405,7 +395,6 @@ export const fakeDkgTDecFlowE2E = async (
     ...ritual,
     message,
     decryptionShares,
-    authenticatedData,
     thresholdMessageKit,
   };
 };