wip

package.json

@@ -52,7 +52,7 @@
     "prebuild": "yarn typechain"
   },
   "dependencies": {
-    "@nucypher/nucypher-core": "^0.9.0",
+    "@nucypher/nucypher-core": "../nucypher-core/nucypher-core-wasm/pkg",
     "axios": "^0.21.1",
     "deep-equal": "^2.2.1",
     "ethers": "^5.4.1",

src/agents/contracts.ts

@@ -12,7 +12,7 @@ const POLYGON: Contracts = {
 
 const MUMBAI: Contracts = {
   SUBSCRIPTION_MANAGER: '0xb9015d7b35ce7c81dde38ef7136baa3b1044f313',
-  COORDINATOR: undefined,
+  COORDINATOR: '0x0f019Ade1D34399D946CF2f161386362655Dd1A4',
 };
 
 const GOERLI: Contracts = {

src/characters/cbd-recipient.ts

@@ -57,12 +57,7 @@ export class CbdTDecDecrypter {
       getCombineDecryptionSharesFunction(variant);
     const sharedSecret = combineDecryptionSharesFn(decryptionShares);
 
-    const plaintext = decryptWithSharedSecret(
-      ciphertext,
-      aad,
-      sharedSecret,
-      dkgRitual.dkgPublicParams
-    );
+    const plaintext = decryptWithSharedSecret(ciphertext, aad, sharedSecret);
     return [plaintext];
   }
 

src/dkg.ts

@@ -4,12 +4,11 @@ import {
   DecryptionSharePrecomputed,
   DecryptionShareSimple,
   DkgPublicKey,
-  DkgPublicParameters,
   SharedSecret,
 } from '@nucypher/nucypher-core';
 import { ethers } from 'ethers';
 
-import { bytesEquals } from './utils';
+import { bytesEquals, fromHexString } from './utils';
 
 // TODO: Expose from @nucypher/nucypher-core
 export enum FerveoVariant {
@@ -47,40 +46,29 @@ export function getCombineDecryptionSharesFunction(
 export interface DkgRitualJSON {
   id: number;
   dkgPublicKey: Uint8Array;
-  dkgPublicParams: Uint8Array;
 }
 
 export class DkgRitual {
   constructor(
     public readonly id: number,
-    public readonly dkgPublicKey: DkgPublicKey,
-    public readonly dkgPublicParams: DkgPublicParameters
+    public readonly dkgPublicKey: DkgPublicKey
   ) {}
 
   public toObj(): DkgRitualJSON {
     return {
       id: this.id,
       dkgPublicKey: this.dkgPublicKey.toBytes(),
-      dkgPublicParams: this.dkgPublicParams.toBytes(),
     };
   }
 
   public static fromObj(json: DkgRitualJSON): DkgRitual {
-    return new DkgRitual(
-      json.id,
-      DkgPublicKey.fromBytes(json.dkgPublicKey),
-      DkgPublicParameters.fromBytes(json.dkgPublicParams)
-    );
+    return new DkgRitual(json.id, DkgPublicKey.fromBytes(json.dkgPublicKey));
   }
 
   public equals(other: DkgRitual): boolean {
     return (
       this.id === other.id &&
-      bytesEquals(this.dkgPublicKey.toBytes(), other.dkgPublicKey.toBytes()) &&
-      bytesEquals(
-        this.dkgPublicParams.toBytes(),
-        other.dkgPublicParams.toBytes()
-      )
+      bytesEquals(this.dkgPublicKey.toBytes(), other.dkgPublicKey.toBytes())
     );
   }
 }
@@ -100,7 +88,19 @@ export class DkgClient {
       throw new Error('Invalid provider');
     }
     // TODO: Create a new DKG ritual here
-    throw new Error('Not implemented');
+    const pkWord1 = fromHexString(
+      '9045795411ed251bf2eecc9415552c41863502a207104ef7ab482bc2364729d9'
+    );
+    console.assert(pkWord1.length === 32);
+    const pkWord2 = fromHexString('b99e2949cee8d888663b2995fc647fcf');
+    // We need to concat two words returned by the DKG contract
+    const dkgPkBytes = new Uint8Array([...pkWord1, ...pkWord2]);
+    console.assert(dkgPkBytes.length === 48);
+
+    return {
+      id: 0,
+      dkgPublicKey: DkgPublicKey.fromBytes(dkgPkBytes),
+    } as DkgRitual;
   }
 
   // TODO: Without Validator public key in Coordinator, we cannot verify the

src/index.ts

@@ -31,6 +31,7 @@ export { conditions, CustomContextParam };
 // SDK
 export { Cohort } from './sdk/cohort';
 export { DeployedPreStrategy, PreStrategy } from './sdk/strategy/pre-strategy';
+export { DeployedCbdStrategy, CbdStrategy } from './sdk/strategy/cbd-strategy';
 
 // Re-exports
 export {

test/unit/ritual.test.ts

@@ -0,0 +1,19 @@
+import { DkgPublicKey } from '@nucypher/nucypher-core';
+
+import { fromHexString } from '../../src/utils';
+
+describe('Ritual', () => {
+  it('deserializes premade dkg ritual', async () => {
+    const pkWord1 = fromHexString(
+      '9045795411ed251bf2eecc9415552c41863502a207104ef7ab482bc2364729d9'
+    );
+    const pkWord2 = fromHexString('b99e2949cee8d888663b2995fc647fcf');
+
+    // We need to concat two words returned by the DKG contract
+    const dkgPkBytes = new Uint8Array([...pkWord1, ...pkWord2]);
+    expect(dkgPkBytes.length).toEqual(48);
+
+    const dkgPk = DkgPublicKey.fromBytes(dkgPkBytes);
+    expect(dkgPk.toBytes()).toEqual(dkgPkBytes);
+  });
+});

test/utils.ts

@@ -302,7 +302,6 @@ export const fakeTDecFlow = ({
   variant,
   ciphertext,
   aad,
-  dkg,
   message,
 }: FakeDkgRitualFlow) => {
   // Having aggregated the transcripts, the validators can now create decryption shares
@@ -348,12 +347,7 @@ export const fakeTDecFlow = ({
   }
 
   // The client should have access to the public parameters of the DKG
-  const plaintext = decryptWithSharedSecret(
-    ciphertext,
-    aad,
-    sharedSecret,
-    dkg.publicParams()
-  );
+  const plaintext = decryptWithSharedSecret(ciphertext, aad, sharedSecret);
   if (!bytesEqual(plaintext, message)) {
     throw new Error('Decryption failed');
   }
@@ -501,11 +495,7 @@ export const mockRandomSessionStaticSecret = (secret: SessionStaticSecret) => {
 export const fakeRitualId = 0;
 
 export const fakeDkgRitual = (ritual: { dkg: Dkg }) => {
-  return new DkgRitual(
-    fakeRitualId,
-    ritual.dkg.publicKey(),
-    ritual.dkg.publicParams()
-  );
+  return new DkgRitual(fakeRitualId, ritual.dkg.publicKey());
 };
 
 export const mockInitializeRitual = (fakeRitual: unknown) => {