Fix incorrect Condition parsing (#239)

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.0.0-beta.3](https://github.com/nucypher/nucypher-ts/compare/v1.0.0-beta.2...v1.0.0-beta.3) (2023-07-07)
+
+
+### ⚠ BREAKING CHANGES
+
+* incorrect condition parsing leading to undefined variables in context
+
+### Bug Fixes
+
+* incorrect condition parsing leading to undefined variables in context ([298fe22](https://github.com/nucypher/nucypher-ts/commit/298fe22e25674682ac04240957129af815ae56c8))
+
 ## [1.0.0-beta.2](https://github.com/nucypher/nucypher-ts/compare/v1.0.0-alpha.0...v1.0.0-beta.2) (2023-07-07)
 
 ## [1.0.0-alpha.0](https://github.com/nucypher/nucypher-ts/compare/v1.0.0-beta.1...v1.0.0-alpha.0) (2023-06-27)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nucypher/nucypher-ts",
   "author": "Piotr Roslaniec <[email protected]>",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "license": "GPL-3.0-only",
   "repository": {
     "type": "git",

src/characters/porter.ts

@@ -9,7 +9,6 @@ import {
 import axios, { AxiosResponse } from 'axios';
 import qs from 'qs';
 
-import { ConditionContext } from '../conditions';
 import { Base64EncodedBytes, ChecksumAddress, HexEncodedBytes } from '../types';
 import { fromBase64, fromHexString, toBase64, toHexString } from '../utils';
 
@@ -138,18 +137,15 @@ export class Porter {
     aliceVerifyingKey: PublicKey,
     bobEncryptingKey: PublicKey,
     bobVerifyingKey: PublicKey,
-    conditionsContext?: ConditionContext
+    conditionContextJSON?: string | undefined
   ): Promise<readonly RetrieveCFragsResult[]> {
-    const context = conditionsContext
-      ? await conditionsContext.toJson()
-      : undefined;
     const data: PostRetrieveCFragsRequest = {
       treasure_map: toBase64(treasureMap.toBytes()),
       retrieval_kits: retrievalKits.map((rk) => toBase64(rk.toBytes())),
       alice_verifying_key: toHexString(aliceVerifyingKey.toCompressedBytes()),
       bob_encrypting_key: toHexString(bobEncryptingKey.toCompressedBytes()),
       bob_verifying_key: toHexString(bobVerifyingKey.toCompressedBytes()),
-      context,
+      context: conditionContextJSON,
     };
     const resp: AxiosResponse<PostRetrieveCFragsResponse> = await axios.post(
       new URL('/retrieve_cfrags', this.porterUrl).toString(),

src/characters/pre-recipient.ts

@@ -8,7 +8,7 @@ import {
 } from '@nucypher/nucypher-core';
 import { ethers } from 'ethers';
 
-import { Condition, ConditionContext } from '../conditions';
+import { ConditionContext, ConditionExpression } from '../conditions';
 import { Keyring } from '../keyring';
 import { PolicyMessageKit } from '../kits/message';
 import { RetrievalResult } from '../kits/retrieval';
@@ -103,14 +103,11 @@ export class PreTDecDecrypter {
     const conditions = messageKits
       .map((mk) => mk.conditions)
       .filter((condition): condition is Conditions => !!condition)
-      .map((condition) => JSON.parse(condition.toString()))
-      .reduce((acc: Record<string, string>[], val) => acc.concat(val), []);
+      .map((condition) => ConditionExpression.fromJSON(condition.toString()))
+      .reduce((acc: ConditionExpression[], val) => acc.concat(val), [])
+      .map((condExpr: ConditionExpression) => condExpr.condition);
 
-    const conditionsList = conditions.map((ele: Record<string, string>) => {
-      return Condition.fromObj(ele);
-    });
-
-    const conditionContext = new ConditionContext(conditionsList, provider);
+    const conditionContext = new ConditionContext(conditions, provider);
 
     const policyMessageKits = messageKits.map((mk) =>
       PolicyMessageKit.fromMessageKit(
@@ -121,13 +118,16 @@ export class PreTDecDecrypter {
     );
 
     const retrievalKits = policyMessageKits.map((pk) => pk.asRetrievalKit());
+    const conditionContextJSON = conditionContext
+      ? await conditionContext.toJson()
+      : undefined;
     const retrieveCFragsResponses = await this.porter.retrieveCFrags(
       treasureMap,
       retrievalKits,
       this.publisherVerifyingKey,
       this.decryptingKey,
       this.keyring.publicKey,
-      conditionContext
+      conditionContextJSON
     );
 
     return zip(policyMessageKits, retrieveCFragsResponses).map((pair) => {

test/utils.ts

@@ -82,7 +82,7 @@ export const fakeAlice = (aliceKey = 'fake-secret-key-32-bytes-alice-x') => {
 };
 
 export const fakeWeb3Provider = (
-  secretKeyBytes: Uint8Array,
+  secretKeyBytes = SecretKey.random().toBEBytes(),
   blockNumber?: number,
   blockTimestamp?: number
 ): ethers.providers.Web3Provider => {