fix bug, fix tests, bump versions

dcx.code-workspace

@@ -6,20 +6,20 @@
     },
     {
       "name": "applicant",
-      "path": "packages/applicant",
+      "path": "packages/applicant"
     },
     {
       "name": "common",
-      "path": "packages/common",
+      "path": "packages/common"
     },
     {
       "name": "issuer",
-      "path": "packages/issuer",
+      "path": "packages/issuer"
     },
     {
       "name": "server",
-      "path": "packages/server",
-    },
+      "path": "packages/server"
+    }
   ],
   "settings": {
     "eslint.workingDirectories": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcx-protocol/root",
-  "version": "5.0.0",
+  "version": "0.6.0",
   "description": "DCX: Decentralized Credential Exchange. DWN protocol for verifiable credential exchange.",
   "type": "module",
   "workspaces": [
@@ -105,4 +105,4 @@
       "ws@<8.17.1": ">=8.17.1"
     }
   }
-}
+}

packages/applicant/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcx-protocol/applicant",
-  "version": "5.0.0",
+  "version": "0.6.1",
   "description": "DCX Applicant protocol and server",
   "type": "module",
   "main": "./dist/cjs/index.js",

packages/applicant/src/dcx-applicant.ts

@@ -423,8 +423,8 @@ export class DcxApplicant implements DcxManager {
 
     // Check the state of the password and recovery phrase
     const { password, recoveryPhrase } = await DcxAgentRecovery.validate({
-      password       : this.config.applicantProtocol.web5Password,
-      recoveryPhrase : this.config.applicantProtocol.web5RecoveryPhrase,
+      password       : this.config.applicant.web5Password,
+      recoveryPhrase : this.config.applicant.web5RecoveryPhrase,
       type           : 'applicant'
     });
 

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcx-protocol/common",
-  "version": "3.2.0",
+  "version": "0.4.3",
   "description": "Common library shared by the other @dcx-protocol packages",
   "type": "module",
   "main": "./dist/cjs/index.js",

packages/common/src/dcx-config.ts

@@ -2,10 +2,33 @@ import {
   DcxHandshakeManifest,
   DcxOptions,
   EmailAddressManifest,
-  PhoneNumberManifest,
-  defaultTrustedIssuers
+  PhoneNumberManifest
 } from './index.js';
 
+export type DcxIssuerConfig = {
+  cursorFile: string;
+  lastRecordIdFile: string;
+  web5Password: string;
+  web5RecoveryPhrase: string;
+  agentDataPath: string;
+};
+
+export type DcxApplicantConfig = {
+  web5Password: string;
+  web5RecoveryPhrase: string;
+};
+
+export const MX = {
+  name : 'mx',
+  id   : 'did:dht:sa713dw7jyg44ejwcdf8iqcseh7jcz51wj6fjxbooj41ipeg76eo'
+};
+export const FORMFREE = {
+  name : 'formfree',
+  id   : 'did:dht:hcf5e55bbm44s4oixp5z89wtxenxyk35su7f5pd4r5np93ikyowy'
+};
+
+export const defaultTrustedIssuers = [MX, FORMFREE];
+
 export const dcxConfig = {
   ...[DcxHandshakeManifest, PhoneNumberManifest, EmailAddressManifest],
   issuers      : defaultTrustedIssuers,
@@ -36,4 +59,6 @@ export const dcxOptions: DcxOptions = {
   issuers   : dcxConfig.issuers,
   gateways  : dcxConfig.gatewayUris,
   dwns      : dcxConfig.dwnEndpoints,
-};
+};
+
+export type DcxConfig = typeof dcxConfig & { [key: string]: any };

packages/common/src/index.ts

@@ -12,7 +12,6 @@ export { schema as manifestSchema } from './schemas/manifest.js';
 export type * from './types/did.js';
 export type * from './types/handlers.js';
 export type * from './types/options.js';
-export type * from './types/config.js';
 export type * from './types/pex.js';
 export type * from './types/server.js';
 export type * from './types/web5.js';
@@ -35,5 +34,4 @@ export * from './dcx-agent.js';
 export * from './dcx-config.js';
 export * from './dcx-dht-manager.js';
 export * from './dcx-identity-vault.js';
-export * from './dcx-manager.js';
-export * from './dcx-trusted-issuers.js';
+export * from './dcx-manager.js';

packages/common/tests/dcx-config.spec.ts

@@ -49,10 +49,10 @@ describe('dcxConfig', () => {
     });
 
     it('should contain property dcxConfig.applicant as an object with at least 2 entries', () => {
-      const dcxApplicantProtocol = dcxConfig.applicant;
-      expect(dcxApplicantProtocol).to.not.be.null.and.not.be.undefined;
-      expect(dcxApplicantProtocol).to.be.an('object');
-      expect(Object.entries(dcxApplicantProtocol)).to.have.lengthOf.gte(2);
+      const dcxApplicantConfig = dcxConfig.applicant;
+      expect(dcxApplicantConfig).to.not.be.null.and.not.be.undefined;
+      expect(dcxApplicantConfig).to.be.an('object');
+      expect(Object.entries(dcxApplicantConfig)).to.have.lengthOf.gte(2);
     });
   });
 });

packages/common/tests/file-system.spec.ts

@@ -9,7 +9,7 @@ describe('FileSystem class', () => {
   const CURSOR = 'cursor.json';
   const randomUUID = crypto.randomUUID();
 
-  afterEach(async () => {
+  after(async () => {
     await FileSystem.rm(EXISTS_FILE_PATH);
     await FileSystem.rm(DNE_FILE_PATH);
     await FileSystem.rm(LAST_RECORD_ID);

packages/issuer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcx-protocol/issuer",
-  "version": "5.0.0",
+  "version": "0.6.1",
   "description": "DCX Issuer protocol and server",
   "type": "module",
   "main": "./dist/cjs/index.js",

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcx-protocol/server",
-  "version": "2.0.0",
+  "version": "0.3.1",
   "description": "DCX Server Implementation",
   "type": "module",
   "main": "./dist/cjs/index.js",

packages/server/src/applicant/index.ts

@@ -152,8 +152,8 @@ export class DcxApplicantServer {
     this.isPolling = true;
     Logger.log('DCX server starting ...');
 
-    const CURSOR = this.issuer.config.issuerProtocol.cursorFile!;
-    const LAST_RECORD_ID = this.issuer.config.issuerProtocol.lastRecordIdFile!;
+    const CURSOR = this.issuer.config.issuer.cursorFile!;
+    const LAST_RECORD_ID = this.issuer.config.issuer.lastRecordIdFile!;
 
     let cursor = await FileSystem.readToJson(CURSOR);
     const pagination = Objects.isEmpty(cursor) ? {} : { cursor };

packages/server/src/issuer/index.ts

@@ -152,8 +152,8 @@ export class DcxIssuerServer {
     this.isPolling = true;
     Logger.log('DCX server starting ...');
 
-    const CURSOR = this.issuer.config.issuerProtocol.cursorFile!;
-    const LAST_RECORD_ID = this.issuer.config.issuerProtocol.lastRecordIdFile!;
+    const CURSOR = this.issuer.config.issuer.cursorFile!;
+    const LAST_RECORD_ID = this.issuer.config.issuer.lastRecordIdFile!;
 
     let cursor = await FileSystem.readToJson(CURSOR);
     const pagination = Objects.isEmpty(cursor) ? {} : { cursor };