@did-btcr2/method 0.18.1 → 0.19.0

package/dist/types/index.d.ts

@@ -1,42 +1,41 @@
+export * from './core/beacon/aggregation/cohort/index.js';
+export * from './core/beacon/aggregation/cohort/messages/base.js';
+export * from './core/beacon/aggregation/cohort/messages/constants.js';
+export * from './core/beacon/aggregation/cohort/messages/index.js';
+export * from './core/beacon/aggregation/cohort/messages/keygen//subscribe.js';
 export * from './core/beacon/aggregation/cohort/messages/keygen/cohort-advert.js';
 export * from './core/beacon/aggregation/cohort/messages/keygen/cohort-ready.js';
 export * from './core/beacon/aggregation/cohort/messages/keygen/opt-in-accept.js';
 export * from './core/beacon/aggregation/cohort/messages/keygen/opt-in.js';
-export * from './core/beacon/aggregation/cohort/messages/keygen//subscribe.js';
 export * from './core/beacon/aggregation/cohort/messages/sign/aggregated-nonce.js';
 export * from './core/beacon/aggregation/cohort/messages/sign/authorization-request.js';
 export * from './core/beacon/aggregation/cohort/messages/sign/nonce-contribution.js';
 export * from './core/beacon/aggregation/cohort/messages/sign/request-signature.js';
 export * from './core/beacon/aggregation/cohort/messages/sign/signature-authorization.js';
-export * from './core/beacon/aggregation/cohort/messages/base.js';
-export * from './core/beacon/aggregation/cohort/messages/constants.js';
-export * from './core/beacon/aggregation/cohort/messages/index.js';
-export * from './core/beacon/aggregation/cohort/index.js';
 export * from './core/beacon/aggregation/cohort/status.js';
 export * from './core/beacon/aggregation/communication/adapter/did-comm.js';
 export * from './core/beacon/aggregation/communication/adapter/nostr.js';
 export * from './core/beacon/aggregation/communication/error.js';
 export * from './core/beacon/aggregation/communication/factory.js';
 export * from './core/beacon/aggregation/communication/service.js';
-export * from './core/beacon/aggregation/session/index.js';
-export * from './core/beacon/aggregation/session/status.js';
 export * from './core/beacon/aggregation/coordinator.js';
 export * from './core/beacon/aggregation/participant.js';
-export * from './core/beacon/cid-aggregate.js';
+export * from './core/beacon/aggregation/session/index.js';
+export * from './core/beacon/aggregation/session/status.js';
+export * from './core/beacon/cas-beacon.js';
 export * from './core/beacon/error.js';
 export * from './core/beacon/factory.js';
+export * from './core/beacon/interfaces.js';
 export * from './core/beacon/singleton.js';
-export * from './core/beacon/smt-aggregate.js';
+export * from './core/beacon/smt-beacon.js';
 export * from './core/beacon/utils.js';
-export * from './core/crud/deactivate.js';
-export * from './core/crud/read.js';
-export * from './core/crud/update.js';
 export * from './core/identifier.js';
-export * from './interfaces/beacon.js';
-export * from './interfaces/crud.js';
+export * from './core/interfaces.js';
+export * from './core/resolve.js';
+export * from './core/types.js';
+export * from './core/update.js';
 export * from './utils/appendix.js';
 export * from './utils/did-document-builder.js';
 export * from './utils/did-document.js';
 export * from './utils/general.js';
-export * from './utils/types.js';
 export * from './did-btcr2.js';

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mEAAmE,CAAC;AAClF,cAAc,kEAAkE,CAAC;AACjF,cAAc,mEAAmE,CAAC;AAClF,cAAc,4DAA4D,CAAC;AAC3E,cAAc,gEAAgE,CAAC;AAE/E,cAAc,oEAAoE,CAAC;AACnF,cAAc,yEAAyE,CAAC;AACxF,cAAc,sEAAsE,CAAC;AACrF,cAAc,qEAAqE,CAAC;AACpF,cAAc,2EAA2E,CAAC;AAE1F,cAAc,mDAAmD,CAAC;AAClE,cAAc,wDAAwD,CAAC;AACvE,cAAc,oDAAoD,CAAC;AAEnE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,4CAA4C,CAAC;AAE3D,cAAc,6DAA6D,CAAC;AAC5E,cAAc,0DAA0D,CAAC;AACzE,cAAc,kDAAkD,CAAC;AACjE,cAAc,oDAAoD,CAAC;AACnE,cAAc,oDAAoD,CAAC;AAEnE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,6CAA6C,CAAC;AAE5D,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AAEzD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AAEvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AAEtC,cAAc,sBAAsB,CAAC;AAErC,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AAErC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2CAA2C,CAAC;AAC1D,cAAc,mDAAmD,CAAC;AAClE,cAAc,wDAAwD,CAAC;AACvE,cAAc,oDAAoD,CAAC;AACnE,cAAc,gEAAgE,CAAC;AAC/E,cAAc,mEAAmE,CAAC;AAClF,cAAc,kEAAkE,CAAC;AACjF,cAAc,mEAAmE,CAAC;AAClF,cAAc,4DAA4D,CAAC;AAC3E,cAAc,oEAAoE,CAAC;AACnF,cAAc,yEAAyE,CAAC;AACxF,cAAc,sEAAsE,CAAC;AACrF,cAAc,qEAAqE,CAAC;AACpF,cAAc,2EAA2E,CAAC;AAC1F,cAAc,4CAA4C,CAAC;AAC3D,cAAc,6DAA6D,CAAC;AAC5E,cAAc,0DAA0D,CAAC;AACzE,cAAc,kDAAkD,CAAC;AACjE,cAAc,oDAAoD,CAAC;AACnE,cAAc,oDAAoD,CAAC;AACnE,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AAEvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AAEnC,cAAc,gBAAgB,CAAC"}

package/dist/types/utils/appendix.d.ts

@@ -1,6 +1,6 @@
 import { HashBytes } from '@did-btcr2/common';
 import { DidDocument, DidService, DidVerificationMethod } from '@web5/dids';
-import { RootCapability } from '../interfaces/crud.js';
+import { RootCapability } from '../core/interfaces.js';
 /**
  * Implements {@link https://dcdpr.github.io/did-btcr2/#appendix | 9. Appendix} methods.
  *
@@ -95,16 +95,11 @@ export declare class Appendix {
      *   }
      * }
      */
-    static derefernceRootCapabilityIdentifier(capabilityId: string): RootCapability;
+    static dereferenceZcapId(capabilityId: string): RootCapability;
     /**
-     * Implements {@link https://dcdpr.github.io/did-btcr2/#fetch-content-from-addressable-storage | 9.3. Fetch Content from Addressable Storage}.
-     *
-     * The Fetch Content from Addressable Storage function takes in SHA256 hash of some content, hashBytes, converts these
-     * bytes to a IPFS v1 Content Identifier and attempts to retrieve the identified content from Content Addressable
-     * Storage (CAS). It returns the retrieved content or null.
-     *
-     * @param {HashBytes} hashBytes The SHA256 hash of the content to be fetched.
-     * @returns {string} The fetched content or null if not found.
+     * Implements CAS Lookup Step from {@link https://dcdpr.github.io/did-btcr2/operations/resolve.html#process-beacon-signals | 7.2.e Process Beacon Signals }.
+     * @param {HashBytes} hashBytes The hash bytes to look up in the CAS system.
+     * @returns {Promise<string | undefined>} The content fetched from the CAS system, or undefined if not found.
      */
     static fetchFromCas(hashBytes: HashBytes): Promise<string | undefined>;
 }

package/dist/types/utils/appendix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appendix.d.ts","sourceRoot":"","sources":["../../../src/utils/appendix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAe,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EACL,WAAW,EAGX,UAAU,EACV,qBAAqB,EAEtB,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;;;GAKG;AACH,qBAAa,QAAQ;IACnB;;;;OAIG;WACW,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IAMpE;;;;OAIG;WACW,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,qBAAqB;IAcjF;;;;OAIG;WACW,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,UAAU;IAW3D;;;;;OAKG;WACW,sBAAsB,CAAC,WAAW,EAAE,WAAW,GAAG,qBAAqB,EAAE;IAgBvF;;;;;;;;;;;;;;;;;;;;OAoBG;WACW,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc;IAwBtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuCG;WACW,kCAAkC,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IA+CtF;;;;;;;;;OASG;WACiB,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAepF"}
+{"version":3,"file":"appendix.d.ts","sourceRoot":"","sources":["../../../src/utils/appendix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAe,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EACL,WAAW,EAGX,UAAU,EACV,qBAAqB,EAEtB,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;;;GAKG;AACH,qBAAa,QAAQ;IACnB;;;;OAIG;WACW,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IAMpE;;;;OAIG;WACW,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,qBAAqB;IAcjF;;;;OAIG;WACW,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,UAAU;IAW3D;;;;;OAKG;WACW,sBAAsB,CAAC,WAAW,EAAE,WAAW,GAAG,qBAAqB,EAAE;IAgBvF;;;;;;;;;;;;;;;;;;;;OAoBG;WACW,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc;IAwBtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuCG;WACW,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IA+CrE;;;;OAIG;WACU,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAW7E"}

package/dist/types/utils/did-document-builder.d.ts

@@ -1,4 +1,4 @@
-import { BeaconService } from '../interfaces/beacon.js';
+import { BeaconService } from '../core/beacon/interfaces.js';
 import { DidDocument, DidVerificationMethod } from './did-document.js';
 export declare class DidDocumentBuilder {
     private document;

package/dist/types/utils/did-document-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"did-document-builder.d.ts","sourceRoot":"","sources":["../../../src/utils/did-document-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAEvE,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAA4B;gBAEhC,eAAe,EAAE,OAAO,CAAC,WAAW,CAAC;IAYjD,cAAc,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI;IAOhD,kBAAkB,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,GAAG,qBAAqB,CAAC,GAAG,IAAI;IAO/E,mBAAmB,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,GAAG,qBAAqB,CAAC,GAAG,IAAI;IAOjF,wBAAwB,CAAC,oBAAoB,EAAE,KAAK,CAAC,MAAM,GAAG,qBAAqB,CAAC,GAAG,IAAI;IAO3F,wBAAwB,CAAC,oBAAoB,EAAE,KAAK,CAAC,MAAM,GAAG,qBAAqB,CAAC,GAAG,IAAI;IAO3F,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,IAAI;IAOhD,KAAK,IAAI,WAAW;CAWrB"}
+{"version":3,"file":"did-document-builder.d.ts","sourceRoot":"","sources":["../../../src/utils/did-document-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAEvE,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAA4B;gBAEhC,eAAe,EAAE,OAAO,CAAC,WAAW,CAAC;IAYjD,cAAc,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI;IAOhD,kBAAkB,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,GAAG,qBAAqB,CAAC,GAAG,IAAI;IAO/E,mBAAmB,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,GAAG,qBAAqB,CAAC,GAAG,IAAI;IAOjF,wBAAwB,CAAC,oBAAoB,EAAE,KAAK,CAAC,MAAM,GAAG,qBAAqB,CAAC,GAAG,IAAI;IAO3F,wBAAwB,CAAC,oBAAoB,EAAE,KAAK,CAAC,MAAM,GAAG,qBAAqB,CAAC,GAAG,IAAI;IAO3F,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,IAAI;IAOhD,KAAK,IAAI,WAAW;CAWrB"}

package/dist/types/utils/did-document.d.ts

@@ -1,6 +1,7 @@
 import { JSONObject, KeyBytes } from '@did-btcr2/common';
 import { DidDocument as IIDidDocument, DidVerificationMethod as IIDidVerificationMethod } from '@web5/dids';
-import { BeaconService } from '../interfaces/beacon.js';
+import { BeaconService } from '../core/beacon/interfaces.js';
+export declare const ID_PLACEHOLDER_VALUE = "did:btcr2:_";
 export declare const BECH32M_CHARS = "";
 export declare const DID_REGEX: RegExp;
 export type ExternalData = {
@@ -90,12 +91,13 @@ export declare class DidDocument implements IDidDocument {
     capabilityInvocation?: Array<string | DidVerificationMethod>;
     capabilityDelegation?: Array<string | DidVerificationMethod>;
     service: Array<BeaconService>;
+    deactivated?: boolean;
     constructor(document: IDidDocument);
     /**
      * Convert the DidDocument to a JSON object.
-     * @returns {JSONObject} The JSON representation of the DidDocument.
+     * @returns {DidDocument} The JSON representation of the DidDocument.
      */
-    json(): JSONObject;
+    json(): DidDocument;
     /**
      * Create a minimal DidDocument from "k1" btcr2 identifier.
      * @param {string} publicKeyMultibase The public key in multibase format.
@@ -167,60 +169,60 @@ export declare class DidDocument implements IDidDocument {
      * @returns {DidDocument} Validated DID Document.
      * @throws {DidDocumentError} If the DID Document is invalid.
      */
-    static validate(didDocument: DidDocument | IntermediateDidDocument): DidDocument;
+    static validate(didDocument: DidDocument | GenesisDocument): DidDocument;
     /**
-     * Validate the IntermediateDidDocument.
-     * @returns {boolean} True if the IntermediateDidDocument is valid.
+     * Validate the GenesisDocument.
+     * @returns {boolean} True if the GenesisDocument is valid.
      */
-    validateIntermediate(): boolean;
+    validateGenesis(): boolean;
     /**
-     * Convert the DidDocument to an IntermediateDidDocument.
-     * @returns {IntermediateDidDocument} The IntermediateDidDocument representation of the DidDocument.
+     * Convert the DidDocument to an GenesisDocument.
+     * @returns {GenesisDocument} The GenesisDocument representation of the DidDocument.
      */
-    toIntermediate(): IntermediateDidDocument;
+    toIntermediate(): GenesisDocument;
+}
+export declare class Document {
+    static isValid(didDocument: DidDocument | GenesisDocument): boolean;
 }
 /**
- * IntermediateDidDocument extends the DidDocument class for creating and managing intermediate DID documents.
+ * GenesisDocument extends the DidDocument class for creating and managing intermediate DID documents.
  * This class is used to create a minimal DID document with a placeholder ID.
  * It is used in the process of creating a new DID document.
- * @class IntermediateDidDocument
+ * @class GenesisDocument
  * @extends {DidDocument}
  */
-export declare class IntermediateDidDocument extends DidDocument {
-    constructor(document: JSONObject);
+export declare class GenesisDocument extends DidDocument {
+    constructor(document: object | DidDocument);
     /**
-     * Convert the IntermediateDidDocument to a DidDocument by replacing the placeholder value with the provided DID.
+     * Convert the GenesisDocument to a DidDocument by replacing the placeholder value with the provided DID.
      * @param did The DID to replace the placeholder value in the document.
      * @returns {DidDocument} A new DidDocument with the placeholder value replaced by the provided DID.
      */
     toDidDocument(did: string): DidDocument;
     /**
-     * Create an IntermediateDidDocument from a DidDocument by replacing the DID with a placeholder value.
+     * Create an GenesisDocument from a DidDocument by replacing the DID with a placeholder value.
      * @param {DidDocument} didDocument The DidDocument to convert.
-     * @returns {IntermediateDidDocument} The IntermediateDidDocument representation of the DidDocument.
+     * @returns {GenesisDocument} The GenesisDocument representation of the DidDocument.
      */
-    static fromDidDocument(didDocument: DidDocument): IntermediateDidDocument;
+    static fromDidDocument(didDocument: DidDocument): GenesisDocument;
     /**
-     * Create a minimal IntermediateDidDocument with a placeholder ID.
+     * Create a minimal GenesisDocument with a placeholder ID.
      * @param {Array<DidVerificationMethod>} verificationMethod The public key in multibase format.
      * @param {VerificationRelationships} relationships The public key in multibase format.
      * @param {Array<BeaconService>} service The service to be included in the document.
-     * @returns {IntermediateDidDocument} A new IntermediateDidDocument with the placeholder ID.
+     * @returns {GenesisDocument} A new GenesisDocument with the placeholder ID.
      */
-    static create(verificationMethod: Array<DidVerificationMethod>, relationships: VerificationRelationships, service: Array<BeaconService>): IntermediateDidDocument;
+    static create(verificationMethod: Array<DidVerificationMethod>, relationships: VerificationRelationships, service: Array<BeaconService>): GenesisDocument;
     /**
-     * Create a minimal IntermediateDidDocument from a public key.
+     * Create a minimal GenesisDocument from a public key.
      * @param {KeyBytes} publicKey The public key in bytes format.
-     * @returns {IntermediateDidDocument} A new IntermediateDidDocument with the placeholder ID.
+     * @returns {GenesisDocument} A new GenesisDocument with the placeholder ID.
      */
-    static fromPublicKey(publicKey: KeyBytes, network: string): IntermediateDidDocument;
+    static fromPublicKey(publicKey: KeyBytes, network: string): GenesisDocument;
     /**
      * Taken an object, convert it to an IntermediateDocuemnt and then to a DidDocument.
-     * @param {JSONObject} object The JSON object to convert.
+     * @param {object | DidDocument} object The JSON object to convert.
      * @returns {DidDocument} The created DidDocument.
      */
-    static fromJSON(object: JSONObject): IntermediateDidDocument;
-}
-export declare class Document {
-    static isValid(didDocument: DidDocument | IntermediateDidDocument): boolean;
+    static fromJSON(object: object | DidDocument): GenesisDocument;
 }

package/dist/types/utils/did-document.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"did-document.d.ts","sourceRoot":"","sources":["../../../src/utils/did-document.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"did-document.d.ts","sourceRoot":"","sources":["../../../src/utils/did-document.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-btcr2/method",
-  "version": "0.18.1",
+  "version": "0.19.0",
   "type": "module",
   "description": "Javascript/TypeScript reference implementation of did:btcr2 method, a censorship resistant DID Method using the Bitcoin blockchain as a Verifiable Data Registry to announce changes to the DID document. Core package of the did-btcr2-js monorepo.",
   "main": "./dist/cjs/index.js",
@@ -83,11 +83,11 @@
     "multiformats": "^13.3.1",
     "nostr-tools": "^2.15.0",
     "tiny-secp256k1": "^2.2.3",
-    "@did-btcr2/bitcoin": "0.3.2",
-    "@did-btcr2/common": "2.2.2",
-    "@did-btcr2/keypair": "0.7.2",
-    "@did-btcr2/cryptosuite": "3.2.1",
-    "@did-btcr2/kms": "0.1.1"
+    "@did-btcr2/bitcoin": "0.3.4",
+    "@did-btcr2/cryptosuite": "4.0.0",
+    "@did-btcr2/common": "3.1.0",
+    "@did-btcr2/kms": "0.1.1",
+    "@did-btcr2/keypair": "0.8.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",

package/src/core/beacon/aggregation/cohort/index.ts

@@ -90,7 +90,7 @@ export class AggregateBeaconCohort implements BeaconCohort {
   public beaconAddress: string = '';
 
   /**
-   * Type of beacon used in the cohort (default is 'SMTAggregateBeacon').
+   * Type of beacon used in the cohort (default is 'SMTBeacon').
    * @type {string}
    */
   public beaconType: string;
@@ -110,7 +110,7 @@ export class AggregateBeaconCohort implements BeaconCohort {
     this.coordinatorDid = coordinatorDid || '';
     this.status = status as COHORT_STATUS_TYPE || COHORT_STATUS.COHORT_ADVERTISED;
     this.network = network;
-    this.beaconType = beaconType || 'SMTAggregateBeacon';
+    this.beaconType = beaconType || 'SMTBeacon';
   }
 
   set cohortKeys(keys: Array<Uint8Array>) {
@@ -287,6 +287,6 @@ export class AggregateBeaconCohort implements BeaconCohort {
    * @returns {BeaconCohort} The JSON object representation of the cohort.
    */
   public json(): BeaconCohort {
-    return Object.json(this) as BeaconCohort;
+    return Object.fromEntries(Object.entries(this)) as BeaconCohort;
   }
 }

package/src/core/beacon/aggregation/cohort/messages/base.ts

@@ -1,5 +1,3 @@
-import { Maybe } from '@did-btcr2/common';
-
 export const MESSAGE_PREFIX = 'https://btcr2.tools/';
 
 export type BaseBody = {
@@ -38,20 +36,11 @@ export class BaseMessage {
     this.body = body;
   }
 
-  /**
-   * Creates a BaseMessage from a JSON object.
-   * @param {Maybe<Base>} data The JSON object to initialize the BaseMessage.
-   * @returns {BaseMessage} The initialized BaseMessage.
-   */
-  public static fromJSON(data: Maybe<Base>): BaseMessage {
-    return new BaseMessage(data);
-  }
-
   /**
    * Converts a BaseMessage to a JSON object.
    * @returns {Base} The JSON representation of the BaseMessage.
    */
   public json(): Base {
-    return Object.json(this) as Base;
+    return Object.fromEntries(Object.entries(this)) as Base;
   }
 }

package/src/core/beacon/aggregation/cohort/messages/keygen/cohort-advert.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_ADVERT } from '../constants.js';
 
@@ -34,7 +34,7 @@ export class BeaconCohortAdvertMessage extends BaseMessage {
    * @returns {BeaconCohortAdvertMessage} The new BeaconCohortAdvertMessage.
    */
   public static fromJSON(data: Maybe<CohortAdvertMessage>): BeaconCohortAdvertMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type !== BEACON_COHORT_ADVERT){
       throw new Error(`Invalid type: ${message.type}`);
     }

package/src/core/beacon/aggregation/cohort/messages/keygen/cohort-ready.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_READY } from '../constants.js';
 
@@ -30,7 +30,7 @@ export class BeaconCohortReadyMessage extends BaseMessage {
    * @returns {BeaconCohortReadyMessage} The new BeaconCohortReadyMessage.
    */
   public static fromJSON(data: Maybe<CohortReadyMessage>): BeaconCohortReadyMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type !== BEACON_COHORT_READY) {
       throw new Error(`Invalid type: ${message.type}`);
     }

package/src/core/beacon/aggregation/cohort/messages/keygen/opt-in-accept.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_OPT_IN_ACCEPT } from '../constants.js';
 
@@ -25,7 +25,7 @@ export class BeaconCohortOptInAcceptMessage extends BaseMessage {
    * @returns {BeaconCohortOptInAcceptMessage} The new BeaconCohortOptInAcceptMessage.
    */
   public static fromJSON(data: Maybe<CohortOptInAcceptMessage>): BeaconCohortOptInAcceptMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type != BEACON_COHORT_OPT_IN_ACCEPT) {
       throw new Error(`Invalid type: ${message.type}`);
     }

package/src/core/beacon/aggregation/cohort/messages/keygen/opt-in.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_OPT_IN } from '../constants.js';
 
@@ -24,7 +24,7 @@ export class BeaconCohortOptInMessage extends BaseMessage {
    * @returns {BeaconCohortOptInMessage} The new BeaconCohortOptInMessage.
    */
   public static fromJSON(data: Maybe<CohortOptInMessage>): BeaconCohortOptInMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type != BEACON_COHORT_OPT_IN) {
       throw new Error(`Invalid type: ${message.type}`);
     }

package/src/core/beacon/aggregation/cohort/messages/keygen/subscribe.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_OPT_IN_ACCEPT } from '../constants.js';
 
@@ -26,7 +26,7 @@ export class BeaconCohortSubscribeMessage extends BaseMessage {
    * @returns {BeaconCohortSubscribeMessage} The serialized SubscribeMessage.
    */
   public static fromJSON(data: Maybe<CohortSubscribeMessage>): BeaconCohortSubscribeMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type != BEACON_COHORT_OPT_IN_ACCEPT) {
       throw new Error(`Invalid type: ${message.type}`);
     }

package/src/core/beacon/aggregation/cohort/messages/sign/aggregated-nonce.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_AGGREGATED_NONCE } from '../constants.js';
 
@@ -29,7 +29,7 @@ export class BeaconCohortAggregatedNonceMessage extends BaseMessage {
    * @returns {BeaconCohortAggregatedNonceMessage} The new BeaconCohortAggregatedNonceMessage.
    */
   public static fromJSON(data: Maybe<CohortAggregatedNonceMessage>): BeaconCohortAggregatedNonceMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type != BEACON_COHORT_AGGREGATED_NONCE) {
       throw new Error(`Invalid type: ${message.type}`);
     }

package/src/core/beacon/aggregation/cohort/messages/sign/authorization-request.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_AUTHORIZATION_REQUEST } from '../constants.js';
 
@@ -30,7 +30,7 @@ export class BeaconCohortAuthorizationRequestMessage extends BaseMessage {
    * @returns {BeaconCohortAuthorizationRequestMessage} The serialized BeaconCohortAuthorizationRequestMessage.
    */
   public static fromJSON(data: Maybe<CohortAuthorizationRequestMessage>): BeaconCohortAuthorizationRequestMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type != BEACON_COHORT_AUTHORIZATION_REQUEST) {
       throw new Error(`Invalid type: ${message.type}`);
     }

package/src/core/beacon/aggregation/cohort/messages/sign/nonce-contribution.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_NONCE_CONTRIBUTION } from '../constants.js';
 
@@ -30,7 +30,7 @@ export class BeaconCohortNonceContributionMessage extends BaseMessage {
    * @returns {BeaconCohortNonceContributionMessage} The new BeaconCohortNonceContributionMessage.
    */
   public static fromJSON(data: Maybe<CohortNonceContributionMessage>): BeaconCohortNonceContributionMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type != BEACON_COHORT_NONCE_CONTRIBUTION) {
       throw new Error(`Invalid type: ${message.type}`);
     }

package/src/core/beacon/aggregation/cohort/messages/sign/request-signature.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_REQUEST_SIGNATURE } from '../constants.js';
 
@@ -30,7 +30,7 @@ export class BeaconCohortRequestSignatureMessage extends BaseMessage {
    * @returns {BeaconCohortRequestSignatureMessage} The new BeaconCohortRequestSignatureMessage.
    */
   public static fromJSON(data: Maybe<CohortRequestSignatureMessage>): BeaconCohortRequestSignatureMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type != BEACON_COHORT_REQUEST_SIGNATURE) {
       throw new Error(`Invalid type: ${message.type}`);
     }

package/src/core/beacon/aggregation/cohort/messages/sign/signature-authorization.ts

@@ -1,4 +1,4 @@
-import { Maybe } from '@did-btcr2/common';
+import { JSONUtils, Maybe } from '@did-btcr2/common';
 import { BaseMessage } from '../base.js';
 import { BEACON_COHORT_SIGNATURE_AUTHORIZATION } from '../constants.js';
 
@@ -31,7 +31,7 @@ export class BeaconCohortSignatureAuthorizationMessage extends BaseMessage {
    * @returns {BeaconCohortSignatureAuthorizationMessage} The serialized BeaconCohortSignatureAuthorizationMessage.
    */
   public static fromJSON(data: Maybe<CohortSignatureAuthorizationMessage>): BeaconCohortSignatureAuthorizationMessage {
-    const message = JSON.parse(data);
+    const message = JSONUtils.isParsable(data) ? JSON.parse(data) : data;
     if (message.type != BEACON_COHORT_SIGNATURE_AUTHORIZATION) {
       throw new Error(`Invalid type: ${message.type}`);
     }