@did-btcr2/method 0.18.1 → 0.20.0

package/src/utils/appendix.ts

@@ -1,4 +1,4 @@
-import { HashBytes, W3C_ZCAP_V1 } from '@did-btcr2/common';
+import { HashBytes } from '@did-btcr2/common';
 import { strings } from '@helia/strings';
 import {
   DidDocument,
@@ -11,7 +11,7 @@ import {
 import { createHelia } from 'helia';
 import { CID } from 'multiformats';
 import { create as createDigest } from 'multiformats/hashes/digest';
-import { RootCapability } from '../interfaces/crud.js';
+import { RootCapability } from '../core/interfaces.js';
 
 /**
  * Implements {@link https://dcdpr.github.io/did-btcr2/#appendix | 9. Appendix} methods.
@@ -109,27 +109,13 @@ export class Appendix {
    * }
    * ```
    */
-  public static deriveRootCapability(identifier: string): RootCapability {
-    // 1. Define rootCapability as an empty object.
-    const rootCapability = {} as RootCapability;
-
-    // 2. Set rootCapability.@context to ‘https://w3id.org/zcap/v1’.
-    rootCapability['@context'] = W3C_ZCAP_V1;
-
-    // 3. Set encodedIdentifier to result of calling algorithm encodeURIComponent(identifier).
-    const encodedIdentifier = encodeURIComponent(identifier);
-
-    // 4. Set rootCapability.id to urn:zcap:root:${encodedIdentifier}.
-    rootCapability.id = `urn:zcap:root:${encodedIdentifier}`;
-
-    // 5. Set rootCapability.controller to identifier.
-    rootCapability.controller = identifier;
-
-    // 6. Set rootCapability.invocationTarget to identifier.
-    rootCapability.invocationTarget = identifier;
-
-    // 7. Return rootCapability.
-    return rootCapability;
+  static deriveRootCapability(identifier: string): RootCapability {
+    return {
+      '@context'       : 'https://w3id.org/zcap/v1',
+      id               : `urn:zcap:root:${encodeURIComponent(identifier)}`,
+      controller       : identifier,
+      invocationTarget : identifier,
+    };
   }
 
 
@@ -173,7 +159,7 @@ export class Appendix {
    *   }
    * }
    */
-  public static derefernceRootCapabilityIdentifier(capabilityId: string): RootCapability {
+  public static dereferenceZcapId(capabilityId: string): RootCapability {
     // 1. Set rootCapability to an empty object.
     const rootCapability = {} as RootCapability;
 
@@ -221,28 +207,24 @@ export class Appendix {
   }
 
   /**
-   * 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.
    */
-  public static async fetchFromCas(hashBytes: HashBytes): Promise<string | undefined> {
-    // 1. Set cid to the result of converting hashBytes to an IPFS v1 CID.
+  static async fetchFromCas(hashBytes: HashBytes): Promise<string | undefined> {
+    // Construct CID from hash bytes
     const cid = CID.create(1, 1, createDigest(1, hashBytes));
 
-    // Create a Helia node connection to IPFS
-    const helia = strings(await createHelia());
+    // Connect to IPFS/Helia node
+    const helia = await createHelia();
+    const node = strings(helia);
 
-    // 2. Set content to the result of fetching the cid from a CAS system. Which CAS systems checked is up to implementation.
-    // TODO: Is this right? Are implementations just supposed to check all CAS they trust?'
-    const content = await helia.get(cid, {});
-
-    // 3. If content for cid cannot be found, set content to null.
-    // 4. Return content.
-    return content;
+    // Return the IPFS get result
+    return await node.get(cid, {});
   }
-}
+}
+
+
+
+
+

package/src/utils/did-document-builder.ts

@@ -1,7 +1,12 @@
 import { DidDocumentError, INVALID_DID_DOCUMENT } from '@did-btcr2/common';
-import { BeaconService } from '../interfaces/beacon.js';
+import { BeaconService } from '../core/beacon/interfaces.js';
 import { DidDocument, DidVerificationMethod } from './did-document.js';
 
+/**
+ * A builder class for constructing DID Documents.
+ * @type {DidDocumentBuilder}
+ * @class DidDocumentBuilder
+ */
 export class DidDocumentBuilder {
   private document: Partial<DidDocument> = {};
 

package/src/utils/did-document.ts

@@ -2,19 +2,21 @@ import { getNetwork } from '@did-btcr2/bitcoin';
 import {
   BTCR2_DID_DOCUMENT_CONTEXT,
   DidDocumentError,
-  ID_PLACEHOLDER_VALUE,
   IdentifierTypes,
   INVALID_DID_DOCUMENT,
   JSONObject,
-  KeyBytes,
+  JSONUtils,
+  KeyBytes
 } from '@did-btcr2/common';
 import { CompressedSecp256k1PublicKey } from '@did-btcr2/keypair';
-import { DidService, DidDocument as IIDidDocument, DidVerificationMethod as IIDidVerificationMethod } from '@web5/dids';
-import { BeaconService } from '../interfaces/beacon.js';
+import { DidDocument as W3CDidDocument, DidVerificationMethod as W3CDidVerificationMethod } from '@web5/dids';
+import { BeaconService } from '../core/beacon/interfaces.js';
 import { BeaconUtils } from '../core/beacon/utils.js';
 import { Identifier } from '../core/identifier.js';
 import { Appendix } from './appendix.js';
+import { payments } from 'bitcoinjs-lib';
 
+export const ID_PLACEHOLDER_VALUE = 'did:btcr2:_';
 export const BECH32M_CHARS = '';
 export const DID_REGEX = /did:btcr2:(x1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]*)/g;
 
@@ -34,7 +36,10 @@ export type VerificationRelationships = {
   capabilityDelegation?: Array<string | DidVerificationMethod>;
 }
 
-export interface IDidVerificationMethod extends IIDidVerificationMethod {
+/** Loose type for unvalidated DID document-like input objects. */
+export type DidDocumentLike = Partial<Btcr2DidDocument>;
+
+export interface Btcr2VerificationMethod extends W3CDidVerificationMethod {
   id: string;
   type: string;
   controller: string;
@@ -48,14 +53,14 @@ export interface IDidVerificationMethod extends IIDidVerificationMethod {
  * @type {DidVerificationMethod}
  *
  */
-export class DidVerificationMethod implements IDidVerificationMethod {
+export class DidVerificationMethod implements Btcr2VerificationMethod {
   id: string;
   type: string;
   controller: string;
   publicKeyMultibase: string;
   secretKeyMultibase?: string | undefined;
 
-  constructor({ id, type, controller, publicKeyMultibase, secretKeyMultibase }: IDidVerificationMethod) {
+  constructor({ id, type, controller, publicKeyMultibase, secretKeyMultibase }: Btcr2VerificationMethod) {
     this.id = id;
     this.type = type;
     this.controller = controller;
@@ -70,9 +75,9 @@ export class DidVerificationMethod implements IDidVerificationMethod {
 
 /**
  * BTCR2 DID Document Interface
- * @interface IDidDocument
- * @type {IDidDocument}
- * @extends {IIDidDocument}
+ * @interface Btcr2DidDocument
+ * @type {Btcr2DidDocument}
+ * @extends {W3CDidDocument}
  * @property {string} id - The identifier of the DID Document.
  * @property {Array<string>} [controller] - The controller of the DID Document.
  * @property {Array<string | JSONObject>} ['@context'] - The context of the DID Document.
@@ -83,7 +88,7 @@ export class DidVerificationMethod implements IDidVerificationMethod {
  * @property {Array<string | DidVerificationMethod>} [capabilityDelegation] - The capability delegation methods of the DID Document.
  * @property {Array<BeaconService>} service - The services of the DID Document.
  */
-export interface IDidDocument extends IIDidDocument {
+export interface Btcr2DidDocument extends W3CDidDocument {
   id: string;
   controller?: Array<string>;
   '@context'?: Array<string | JSONObject>;
@@ -99,7 +104,7 @@ export interface IDidDocument extends IIDidDocument {
  * BTCR2 DID Document extends the DidDocument class adding helper methods and properties
  * @class DidDocument
  * @type {DidDocument}
- * @implements {IDidDocument}
+ * @implements {Btcr2DidDocument}
  * @property {string} id - The identifier of the DID Document.
  * @property {Array<string>} [controller] - The controller of the DID Document.
  * @property {Array<string | JSONObject>} ['@context'] - The context of the DID Document.
@@ -110,7 +115,7 @@ export interface IDidDocument extends IIDidDocument {
  * @property {Array<string | DidVerificationMethod>} [capabilityDelegation] - The capability delegation methods of the DID Document.
  * @property {Array<BeaconService>} service - The services of the DID Document.
  */
-export class DidDocument implements IDidDocument {
+export class DidDocument implements Btcr2DidDocument {
   id: string;
   controller?: Array<string>;
   '@context'?: Array<string | JSONObject> = BTCR2_DID_DOCUMENT_CONTEXT;
@@ -120,18 +125,22 @@ export class DidDocument implements IDidDocument {
   capabilityInvocation?: Array<string | DidVerificationMethod>;
   capabilityDelegation?: Array<string | DidVerificationMethod>;
   service: Array<BeaconService>;
+  deactivated?: boolean;
 
-  constructor(document: IDidDocument) {
+  constructor(document: Btcr2DidDocument) {
     // Set the ID and ID type
-    const idType = document.id.includes('k1')
+    const idType = document.id.includes('k')
       ? IdentifierTypes.KEY
       : IdentifierTypes.EXTERNAL;
 
     // Validate ID and parts for non-intermediate
-    const isIntermediate = document.id === ID_PLACEHOLDER_VALUE;
+    const isGenesis = document.id === ID_PLACEHOLDER_VALUE;
+
     // Deconstruct the document parts for validation
     const { id, controller, verificationMethod: vm, service } = document;
-    if (!isIntermediate) {
+
+    // If not genesis, validate core properties
+    if (!isGenesis) {
       if (!DidDocument.isValidId(id)) {
         throw new DidDocumentError(`Invalid id: ${id}`, INVALID_DID_DOCUMENT, document);
       }
@@ -172,29 +181,19 @@ export class DidDocument implements IDidDocument {
     // Sanitize the DID Document
     DidDocument.sanitize(this);
     // If the DID Document is not an intermediateDocument, validate it
-    if (!isIntermediate) {
+    if (!isGenesis) {
       DidDocument.validate(this);
     } else {
-      this.validateIntermediate();
+      this.validateGenesis();
     }
   }
 
   /**
    * Convert the DidDocument to a JSON object.
-   * @returns {JSONObject} The JSON representation of the DidDocument.
+   * @returns {DidDocument} The JSON representation of the DidDocument.
    */
-  public json(): JSONObject {
-    return {
-      id                   : this.id,
-      controller           : this.controller,
-      '@context'           : this['@context'],
-      verificationMethod   : this.verificationMethod,
-      authentication       : this.authentication,
-      assertionMethod      : this.assertionMethod,
-      capabilityInvocation : this.capabilityInvocation,
-      capabilityDelegation : this.capabilityDelegation,
-      service              : this.service
-    };
+  public json(): DidDocument {
+    return Object.fromEntries(Object.entries(this)) as DidDocument;
   }
 
   /**
@@ -222,7 +221,7 @@ export class DidDocument implements IDidDocument {
         })
       ],
       service
-    } as IDidDocument;
+    } as Btcr2DidDocument;
     return new DidDocument(document);
   }
 
@@ -232,7 +231,7 @@ export class DidDocument implements IDidDocument {
    * @returns {DidDocument} A new DidDocument.
    */
   public static fromExternalIdentifier(data: ExternalData): DidDocument {
-    return new DidDocument(data as IDidDocument);
+    return new DidDocument(data as Btcr2DidDocument);
   }
 
 
@@ -255,7 +254,7 @@ export class DidDocument implements IDidDocument {
    * @returns {boolean} True if the DID document is valid.
    * @throws {DidDocumentError} If any validation check fails.
    */
-  public static isValid(didDocument: DidDocument): boolean {
+  public static isValid(didDocument: DidDocumentLike): boolean {
     if (!this.isValidContext(didDocument?.['@context'])) {
       throw new DidDocumentError('Invalid "@context"', INVALID_DID_DOCUMENT, didDocument);
     }
@@ -280,7 +279,7 @@ export class DidDocument implements IDidDocument {
    * @param {DidDocument['@context']} context The context to validate.
    * @returns {boolean} True if the context is valid.
    */
-  private static isValidContext(context: DidDocument['@context']): boolean {
+  private static isValidContext(context: unknown): boolean {
     if(!context) return false;
     if(!Array.isArray(context)) return false;
     if(!context.every(ctx => typeof ctx === 'string' && BTCR2_DID_DOCUMENT_CONTEXT.includes(ctx))) return false;
@@ -293,7 +292,8 @@ export class DidDocument implements IDidDocument {
    * @param {string} id The id to validate.
    * @returns {boolean} True if the id is valid.
    */
-  private static isValidId(id: string): boolean {
+  private static isValidId(id: unknown): boolean {
+    if (typeof id !== 'string') return false;
     try {
       Identifier.decode(id);
       return true;
@@ -320,7 +320,7 @@ export class DidDocument implements IDidDocument {
    * @param {DidVerificationMethod[]} verificationMethod The verification methods to validate.
    * @returns {boolean} True if the verification methods are valid.
    */
-  private static isValidVerificationMethods(verificationMethod: IIDidVerificationMethod[]): boolean {
+  private static isValidVerificationMethods(verificationMethod: unknown): boolean {
     return Array.isArray(verificationMethod) && verificationMethod.every(Appendix.isDidVerificationMethod);
   }
 
@@ -330,7 +330,7 @@ export class DidDocument implements IDidDocument {
    * @param {DidService[]} service The services to validate.
    * @returns {boolean} True if the services are valid.
    */
-  private static isValidServices(service: DidService[]): boolean {
+  private static isValidServices(service: unknown): boolean {
     return Array.isArray(service) && service.every(BeaconUtils.isBeaconService);
   }
 
@@ -340,33 +340,25 @@ export class DidDocument implements IDidDocument {
    * @param {DidDocument} didDocument The DID Document to validate.
    * @returns {boolean} True if the verification relationships are valid.
    */
-  public static isValidVerificationRelationships(didDocument: DidDocument): boolean {
-    // Define the available verification relationships
-    const possibleVerificationRelationships: (keyof DidDocument)[] = [
+  public static isValidVerificationRelationships(didDocument: DidDocumentLike): boolean {
+    const possibleVerificationRelationships = [
       'authentication',
       'assertionMethod',
       'capabilityInvocation',
       'capabilityDelegation'
-    ];
-
-    // Get the DID Document keys
-    const verificationRelationships = Object.keys(didDocument) as Array<keyof DidDocument>;
-
-    // Filter the DID Document keys to only those that are in the available verification relationships
-    const availableVerificationRelationships = possibleVerificationRelationships.filter(
-      key => verificationRelationships.includes(key as keyof DidDocument)
-    ) as (keyof DidDocument)[];
-
-    // Check if all available verification relationships are valid
-    return availableVerificationRelationships.every((key) =>
-      // Check if the key exists in the DID Document
-      didDocument[key] &&
-      // Check if the key is an array
-      Array.isArray(didDocument[key]) &&
-      // Check that every value in the array is a string or DidVerificationMethod
-      didDocument[key].every(
-        entry => typeof entry === 'string' || Appendix.isDidVerificationMethod(entry)
-      ));
+    ] as const;
+
+    const keys = Object.keys(didDocument);
+    const availableKeys = possibleVerificationRelationships.filter(key => keys.includes(key));
+
+    return availableKeys.every((key) => {
+      const value = didDocument[key];
+      return value &&
+        Array.isArray(value) &&
+        value.every(
+          (entry) => typeof entry === 'string' || Appendix.isDidVerificationMethod(entry)
+        );
+    });
   }
 
   /**
@@ -374,10 +366,10 @@ export class DidDocument implements IDidDocument {
    * @returns {DidDocument} Validated DID Document.
    * @throws {DidDocumentError} If the DID Document is invalid.
    */
-  public static validate(didDocument: DidDocument | IntermediateDidDocument): DidDocument {
+  public static validate(didDocument: any): DidDocument {
     // Validate the DID Document
     if (didDocument.id === ID_PLACEHOLDER_VALUE) {
-      (didDocument as IntermediateDidDocument).validateIntermediate();
+      (didDocument as GenesisDocument).validateGenesis();
     } else {
       DidDocument.isValid(didDocument);
     }
@@ -386,111 +378,117 @@ export class DidDocument implements IDidDocument {
   }
 
   /**
-   * Validate the IntermediateDidDocument.
-   * @returns {boolean} True if the IntermediateDidDocument is valid.
+   * Validate the GenesisDocument.
+   * @returns {boolean} True if the GenesisDocument is valid.
    */
-  public validateIntermediate(): boolean {
+  public validateGenesis(): boolean {
     // Validate the id
     if(this.id !== ID_PLACEHOLDER_VALUE) {
-      throw new DidDocumentError('Invalid IntermediateDidDocument ID', INVALID_DID_DOCUMENT, this);
+      throw new DidDocumentError('Invalid GenesisDocument ID', INVALID_DID_DOCUMENT, this);
     }
     // Validate the controller
     if(!this.controller?.every(c => c === ID_PLACEHOLDER_VALUE)) {
-      throw new DidDocumentError('Invalid IntermediateDidDocument controller', INVALID_DID_DOCUMENT, this);
+      throw new DidDocumentError('Invalid GenesisDocument controller', INVALID_DID_DOCUMENT, this);
     }
     // Validate the verificationMethod
     if(!this.verificationMethod.every(vm => vm.id.includes(ID_PLACEHOLDER_VALUE) && vm.controller === ID_PLACEHOLDER_VALUE)) {
-      throw new DidDocumentError('Invalid IntermediateDidDocument verificationMethod', INVALID_DID_DOCUMENT, this);
+      throw new DidDocumentError('Invalid GenesisDocument verificationMethod', INVALID_DID_DOCUMENT, this);
     }
     // Validate the service
     if(!this.service.every(svc => svc.id.includes(ID_PLACEHOLDER_VALUE))) {
-      throw new DidDocumentError('Invalid IntermediateDidDocument service', INVALID_DID_DOCUMENT, this);
+      throw new DidDocumentError('Invalid GenesisDocument service', INVALID_DID_DOCUMENT, this);
     }
     if(!DidDocument.isValidVerificationRelationships(this)) {
       // Return true if all validations pass
-      throw new DidDocumentError('Invalid IntermediateDidDocument assertionMethod', INVALID_DID_DOCUMENT, this);
+      throw new DidDocumentError('Invalid GenesisDocument assertionMethod', INVALID_DID_DOCUMENT, this);
     }
 
     return true;
   }
 
   /**
-   * 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.
    */
-  public toIntermediate(): IntermediateDidDocument {
+  public toIntermediate(): GenesisDocument {
     if(this.id.includes('k1')) {
       throw new DidDocumentError('Cannot convert a key identifier to an intermediate document', INVALID_DID_DOCUMENT, this);
     }
-    return new IntermediateDidDocument(this);
+    return new GenesisDocument(this);
+  }
+}
+
+export class Document {
+  public static isValid(didDocument: DidDocument | GenesisDocument): boolean {
+    return new DidDocument(didDocument).validateGenesis();
   }
 }
 
+
 /**
- * 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 class IntermediateDidDocument extends DidDocument {
-  constructor(document: JSONObject) {
-    super(document as IDidDocument);
+export class GenesisDocument extends DidDocument {
+  constructor(document: object | DidDocument) {
+    super(document as 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.
    */
   public toDidDocument(did: string): DidDocument {
     const stringThis = JSON.stringify(this).replaceAll(ID_PLACEHOLDER_VALUE, did);
-    const parseThis = JSON.parse(stringThis) as IDidDocument;
+    const parseThis = JSON.parse(stringThis) as Btcr2DidDocument;
     return new DidDocument(parseThis);
   }
 
 
   /**
-   * 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.
    */
-  public static fromDidDocument(didDocument: DidDocument): IntermediateDidDocument {
-    const intermediateDocument = JSON.cloneReplace(didDocument, DID_REGEX, ID_PLACEHOLDER_VALUE) as IDidDocument;
-    return new IntermediateDidDocument(intermediateDocument);
+  public static fromDidDocument(didDocument: DidDocument): GenesisDocument {
+    const intermediateDocument = JSONUtils.cloneReplace(didDocument, DID_REGEX, ID_PLACEHOLDER_VALUE) as Btcr2DidDocument;
+    return new GenesisDocument(intermediateDocument);
   }
 
   /**
-   * 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.
    */
   public static create(
     verificationMethod: Array<DidVerificationMethod>,
     relationships: VerificationRelationships,
     service: Array<BeaconService>
-  ): IntermediateDidDocument {
+  ): GenesisDocument {
     const id = ID_PLACEHOLDER_VALUE;
-    return new IntermediateDidDocument({ id, ...relationships, verificationMethod, service, });
+    return new GenesisDocument({ id, ...relationships, verificationMethod, service, });
   }
 
   /**
-   * 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.
    */
-  public static fromPublicKey(publicKey: KeyBytes, network: string): IntermediateDidDocument {
+  public static fromPublicKey(publicKey: KeyBytes, network: string): GenesisDocument {
     const pk = new CompressedSecp256k1PublicKey(publicKey);
     const id = ID_PLACEHOLDER_VALUE;
-    const service = BeaconUtils.generateBeaconService({
-      id          : `${id}#key-0`,
-      publicKey   : pk.compressed,
-      network     : getNetwork(network),
-      addressType : 'p2pkh',
-      type        : 'SingletonBeacon',
-    });
+    const address = payments.p2pkh({ pubkey: pk.compressed, network: getNetwork(network) })?.address;
+    const services = [{
+      id              : `${id}#key-0`,
+      serviceEndpoint : `bitcoin:${address}`,
+      type            : 'SingletonBeacon',
+    }];
 
     const relationships = {
       authentication       : [`${id}#key-0`],
@@ -507,21 +505,15 @@ export class IntermediateDidDocument extends DidDocument {
       }
     ];
 
-    return IntermediateDidDocument.create(verificationMethod, relationships, [service]);
+    return GenesisDocument.create(verificationMethod, relationships, services);
   }
 
   /**
    * 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.
    */
-  public static fromJSON(object: JSONObject): IntermediateDidDocument {
-    return new IntermediateDidDocument(object as IDidDocument);
+  public static fromJSON(object: object | DidDocument): GenesisDocument {
+    return new GenesisDocument(object as Btcr2DidDocument);
   }
-}
-
-export class Document {
-  public static isValid(didDocument: DidDocument | IntermediateDidDocument): boolean {
-    return new DidDocument(didDocument).validateIntermediate();
-  }
-}
+}

package/src/utils/general.ts

@@ -36,7 +36,7 @@ export class GeneralUtils {
    */
   static bigintToBuffer(value: bigint): Buffer {
     const hex = value.toString(16).padStart(64, '0');
-    return Buffer.fromHex(hex);
+    return Buffer.from(hex, 'hex');
   }
 
   /**