@did-btcr2/method 0.24.1 → 0.25.2

package/dist/{cjs/core/resolve.js → esm/core/resolver.js}

@@ -1,25 +1,81 @@
 import { getNetwork } from '@did-btcr2/bitcoin';
-import { canonicalHash, canonicalize, DateUtils, IdentifierHrp, INVALID_DID, INVALID_DID_DOCUMENT, INVALID_DID_UPDATE, JSONPatch, JSONUtils, LATE_PUBLISHING_ERROR, MISSING_UPDATE_DATA, ResolveError } from '@did-btcr2/common';
+import { canonicalHash, canonicalize, DateUtils, encode as encodeHash, decode as decodeHash, INVALID_DID_DOCUMENT, INVALID_DID_UPDATE, JSONPatch, JSONUtils, LATE_PUBLISHING_ERROR, ResolveError } from '@did-btcr2/common';
 import { BIP340Cryptosuite, BIP340DataIntegrityProof, SchnorrMultikey } from '@did-btcr2/cryptosuite';
 import { CompressedSecp256k1PublicKey } from '@did-btcr2/keypair';
-import { hex } from '@scure/base';
 import { DidBtcr2 } from '../did-btcr2.js';
 import { Appendix } from '../utils/appendix.js';
 import { DidDocument, ID_PLACEHOLDER_VALUE } from '../utils/did-document.js';
 import { BeaconFactory } from './beacon/factory.js';
-import { BeaconSignalDiscovery } from './beacon/signal-discovery.js';
 import { BeaconUtils } from './beacon/utils.js';
 import { Identifier } from './identifier.js';
 /**
- * Implements {@link https://dcdpr.github.io/did-btcr2/operations/resolve.html | 7.2 Resolve}.
- * Resolving a did:btcr2 identifier iteratively builds a DID document by applying BTCR2 Updates
- * to an Initial DID Document that have been committed to the Bitcoin blockchain by Authorized
- * Beacon Signals. The Initial DID Document is either deterministically created from the DID or
- * provided by Sidecar Data.
- * @class Resolve
- * @type {Resolve}
+ * Different possible Resolver states representing phases in the resolution process.
  */
-export class Resolve {
+var ResolverPhase;
+(function (ResolverPhase) {
+    ResolverPhase["GenesisDocument"] = "GenesisDocument";
+    ResolverPhase["BeaconDiscovery"] = "BeaconDiscovery";
+    ResolverPhase["BeaconProcess"] = "BeaconProcess";
+    ResolverPhase["ApplyUpdates"] = "ApplyUpdates";
+    ResolverPhase["Complete"] = "Complete";
+})(ResolverPhase || (ResolverPhase = {}));
+/**
+ * Sans-I/O state machine for did:btcr2 resolution.
+ *
+ * Created by {@link DidBtcr2.resolve} (the factory). The caller drives resolution
+ * by repeatedly calling {@link resolve} and {@link provide}:
+ *
+ * ```typescript
+ * const resolver = DidBtcr2.resolve(did, { sidecar });
+ * let state = resolver.resolve();
+ *
+ * while (state.status === 'action-required') {
+ *   for (const need of state.needs) { ... fetch & provide ... }
+ *   state = resolver.resolve();
+ * }
+ * const { didDocument, metadata } = state.result;
+ * ```
+ *
+ * The Resolver performs **zero I/O**. All external data (Bitcoin signals, CAS
+ * data, genesis documents) flows through the advance/provide protocol.
+ *
+ * @class Resolver
+ */
+export class Resolver {
+    // --- Immutable inputs ---
+    #didComponents;
+    #versionId;
+    #versionTime;
+    /**
+     * The specific phase the Resolver is current in.
+     */
+    #phase;
+    #sidecarData;
+    #currentDocument;
+    #providedGenesisDocument = null;
+    #beaconServicesSignals = new Map();
+    #processedServices = new Set();
+    #requestCache = new Set();
+    #unsortedUpdates = [];
+    #resolvedResponse = null;
+    /**
+     * @internal — Use {@link DidBtcr2.resolve} to create instances.
+     */
+    constructor(didComponents, sidecarData, currentDocument, options) {
+        this.#didComponents = didComponents;
+        this.#sidecarData = sidecarData;
+        this.#currentDocument = currentDocument;
+        this.#versionId = options?.versionId;
+        this.#versionTime = options?.versionTime;
+        // If a genesis document was provided (from sidecar), pre-seed it for validation
+        if (options?.genesisDocument) {
+            this.#providedGenesisDocument = options.genesisDocument;
+        }
+        // If current document was established by the factory, skip GenesisDocument phase
+        this.#phase = currentDocument
+            ? ResolverPhase.BeaconDiscovery
+            : ResolverPhase.GenesisDocument;
+    }
     /**
      * Implements subsection {@link https://dcdpr.github.io/did-btcr2/operations/resolve.html#if-genesis_bytes-is-a-secp256k1-public-key | 7.2.d.1 if genesis bytes is a secp256k1 Public Key}.
      * @param {DidComponents} didComponents The decoded components of the did.
@@ -27,11 +83,11 @@ export class Resolve {
      */
     static deterministic(didComponents) {
         // Deconstruct the bytes from the given components
-        const { genesisBytes } = didComponents;
+        const genesisBytes = didComponents.genesisBytes;
         // Encode the did from the didComponents
         const did = Identifier.encode(genesisBytes, didComponents);
         // Construct a new CompressedSecp256k1PublicKey and deconstruct the publicKey and publicKeyMultibase
-        const { multibase: publicKeyMultibase } = new CompressedSecp256k1PublicKey(genesisBytes);
+        const { multibase } = new CompressedSecp256k1PublicKey(genesisBytes);
         // Generate the service field for the DID Document
         const service = BeaconUtils.generateBeaconServices({
             id: did,
@@ -45,7 +101,7 @@ export class Resolve {
                     id: `${did}#initialKey`,
                     type: 'Multikey',
                     controller: did,
-                    publicKeyMultibase: publicKeyMultibase.encoded
+                    publicKeyMultibase: multibase.encoded
                 }],
             service
         });
@@ -53,23 +109,21 @@ export class Resolve {
     /**
      * Implements subsection {@link https://dcdpr.github.io/did-btcr2/operations/resolve.html#if-genesis_bytes-is-a-sha-256-hash | 7.2.d.2 if genesis_bytes is a SHA-256 Hash}.
      * @param {DidComponents} didComponents BTCR2 DID components used to resolve the DID Document
-     * @param {GenesisDocument} genesisDocument The genesis document for resolving the DID Document.
-     * @returns {Promise<DidDocument>} The resolved DID Document object
+     * @param {object} genesisDocument The genesis document for resolving the DID Document.
+     * @returns {DidDocument} The resolved DID Document object
      * @throws {ResolveError} InvalidDidDocument if not conformant to DID Core v1.1
      */
-    static async external(didComponents, genesisDocument) {
-        // Get the genesis bytes from the did components
-        const { genesisBytes } = didComponents;
-        // Convert the genesis bytes to a hex string
-        const genesisHex = hex.encode(genesisBytes);
+    static external(didComponents, genesisDocument) {
+        // Encode the genesis bytes from the did components
+        const genesisBytes = encodeHash(didComponents.genesisBytes);
         // Canonicalize and sha256 hash the currentDocument
-        const hashBytes = canonicalHash(genesisDocument);
+        const genesisDocumentBytes = canonicalHash(genesisDocument);
         // If the genesisBytes do not match the hashBytes, throw an error
-        if (genesisHex !== hashBytes) {
-            throw new ResolveError(`Initial document mismatch: genesisBytes ${genesisHex} !== hashBytes ${hashBytes}`, INVALID_DID_DOCUMENT, { genesisBytes, hashBytes });
+        if (genesisBytes !== genesisDocumentBytes) {
+            throw new ResolveError(`Initial document mismatch: genesisBytes !== genesisDocumentBytes`, INVALID_DID_DOCUMENT, { genesisBytes, genesisDocumentBytes });
         }
         // Encode the did from the didComponents
-        const did = Identifier.encode(genesisBytes, didComponents);
+        const did = Identifier.encode(decodeHash(genesisBytes), didComponents);
         // Replace the placeholder did with the did throughout the currentDocument.
         const currentDocument = JSON.parse(JSON.stringify(genesisDocument).replaceAll(ID_PLACEHOLDER_VALUE, did));
         // Return a W3C conformant DID Document
@@ -78,20 +132,20 @@ export class Resolve {
     /**
      * Implements subsection {@link https://dcdpr.github.io/did-btcr2/operations/resolve.html#process-sidecar-data | Process Sidecar Data}
      * @param {Sidecar} sidecar The sidecar data to process.
-     * @returns {ProcessedSidecar} The processed sidecar data containing maps of updates, CAS announcements, and SMT proofs.
+     * @returns {SidecarData} The processed sidecar data containing maps of updates, CAS announcements, and SMT proofs.
      */
     static sidecarData(sidecar = {}) {
         // BTCR2 Signed Updates map
         const updateMap = new Map();
         if (sidecar.updates?.length)
             for (const update of sidecar.updates) {
-                updateMap.set(canonicalHash(update, { encoding: 'hex' }), update);
+                updateMap.set(canonicalHash(update), update);
             }
         // CAS Announcements map
         const casMap = new Map();
         if (sidecar.casUpdates?.length)
             for (const update of sidecar.casUpdates) {
-                casMap.set(canonicalHash(update, { encoding: 'hex' }), update);
+                casMap.set(canonicalHash(update), update);
             }
         // SMT Proofs map
         const smtMap = new Map();
@@ -101,68 +155,15 @@ export class Resolve {
             }
         return { updateMap, casMap, smtMap };
     }
-    /**
-     * Implements subsection {@link https://dcdpr.github.io/did-btcr2/operations/resolve.html#establish-current-document | 7.2.d Establish current_document}.
-     * Resolution begins by creating an Initial Did Document called current_document (Current DID Document).
-     * The current_document is iteratively patched with BTCR2 Signed Updates announced by Authorized Beacon Signals.
-     * @param {DidComponents} didComponents The decoded components of the did.
-     * @param {GenesisDocument} genesisDocument The genesis document for resolving the DID Document.
-     * @returns {Promise<DidDocument>} The resolved DID Document object.
-     * @throws {ResolveError} if the DID hrp is invalid, no sidecarData passed and hrp = "x".
-     */
-    static async currentDocument(didComponents, genesisDocument) {
-        // Deconstruct the hrp from the components
-        const { hrp, genesisBytes } = didComponents;
-        // If hrp `x`, perform external resolution
-        if (hrp === IdentifierHrp.x) {
-            if (!genesisDocument)
-                throw new ResolveError('External resolution requires genesisDocument', MISSING_UPDATE_DATA, { didComponents });
-            return await this.external(didComponents, genesisDocument);
-        }
-        // Check for hrp `k`
-        if (hrp === IdentifierHrp.k) {
-            // Validate genesis bytes as a compressed secp256k1 public key
-            if (!CompressedSecp256k1PublicKey.isValid(genesisBytes)) {
-                throw new ResolveError('Deterministic resolution requires valid secp256k1 public key', INVALID_DID, { genesisBytes });
-            }
-            // Perform deterministic resolution
-            return this.deterministic(didComponents);
-        }
-        // Else, throw an error for unsupported hrp
-        throw new ResolveError(`Unsupported DID hrp ${hrp}`, INVALID_DID, { hrp });
-    }
-    /**
-     * Finds uses the beacon services in the currentDocument to scan for onchain Beacon Signals (transactions) containing
-     * Signal Bytes (last output in OP_RETURN transaction).
-     * @param {Array<BeaconService>} beaconServices The array of BeaconService objects to search for signals.
-     * @param {SidecarData} sidecarData The sidecar data containing maps of updates, CAS announcements, and SMT proofs.
-     * @param {BitcoinConnection} bitcoin The bitcoin network connection used to fetch beacon signals
-     * @returns {Promise<Array<[SignedBTCR2Update, BlockMetadata]>>} The array of BTCR2 Signed Updates announced by the Beacon Signals.
-     */
-    static async beaconSignals(beaconServices, sidecarData, bitcoin) {
-        // Discover Beacon Signals via indexer server (esplora/electrs) or full node
-        const beaconServicesSignals = bitcoin.rest
-            ? await BeaconSignalDiscovery.indexer(beaconServices, bitcoin)
-            : await BeaconSignalDiscovery.fullnode(beaconServices, bitcoin);
-        // Process each beacon's signals in parallel
-        const promises = await Promise.all(Array.from(beaconServicesSignals.entries()).map(async ([service, signals]) => {
-            // Skip beacons with no signals
-            if (!signals.length)
-                return [];
-            // Establish a typed beacon and process its signals
-            return BeaconFactory.establish(service).processSignals(signals, sidecarData);
-        }));
-        return promises.flat();
-    }
     /**
      * Implements subsection {@link https://dcdpr.github.io/did-btcr2/operations/resolve.html#process-updates | 7.2.f Process updates Array}.
      * @param {DidDocument} currentDocument The current DID Document to apply the updates to.
      * @param {Array<[SignedBTCR2Update, BlockMetadata]>} unsortedUpdates The unsorted array of BTCR2 Signed Updates and their associated Block Metadata.
      * @param {string} [versionTime] The optional version time to limit updates to.
      * @param {string} [versionId] The optional version id to limit updates to.
-     * @returns {Promise<DidResolutionResponse>} The updated DID Document, number of confirmations, and version id.
+     * @returns {DidResolutionResponse} The updated DID Document, number of confirmations, and version id.
      */
-    static async updates(currentDocument, unsortedUpdates, versionTime, versionId) {
+    static updates(currentDocument, unsortedUpdates, versionTime, versionId) {
         // Start the version number being processed at 1
         let currentVersionId = 1;
         // Initialize an empty array to hold the update hashes
@@ -182,7 +183,7 @@ export class Resolve {
         // Iterate over each (update block) pair
         for (const [update, block] of updates) {
             // Get the hash of the current document
-            const currentDocumentHash = canonicalHash(response.didDocument, { encoding: 'base64url' });
+            const currentDocumentHash = canonicalHash(response.didDocument);
             // Safely convert block.time to timestamp
             const blocktime = DateUtils.blocktimeToTimestamp(block.time);
             // TODO: How to detect if block is unconfirmed and exit gracefully or return without it
@@ -211,11 +212,11 @@ export class Resolve {
                     throw new ResolveError(`Hash mismatch: update.sourceHash !== currentDocumentHash`, INVALID_DID_UPDATE, { sourceHash: update.sourceHash, currentDocumentHash });
                 }
                 // Apply the update to the currentDocument and set it in the response
-                response.didDocument = await this.applyUpdate(response.didDocument, update);
+                response.didDocument = this.applyUpdate(response.didDocument, update);
                 // Create unsigned_update by removing the proof property from update.
                 const unsignedUpdate = JSONUtils.deleteKeys(update, ['proof']);
                 // Push the canonicalized unsigned update hash to the updateHashHistory
-                updateHashHistory.push(canonicalHash(unsignedUpdate, { encoding: 'base64url' }));
+                updateHashHistory.push(canonicalHash(unsignedUpdate));
             }
             // If update.targetVersionId > currentVersionId + 1, throw LATE_PUBLISHING error
             else if (update.targetVersionId > currentVersionId + 1) {
@@ -229,13 +230,14 @@ export class Resolve {
             // Set response.versionId to be the new  currentVersionId
             response.metadata.versionId = `${currentVersionId}`;
             // If resolutionOptions.versionId is defined and <= currentVersionId, return currentDocument
-            if (currentVersionId >= Number(versionId)) {
+            const versionIdNumber = Number(versionId);
+            if (!isNaN(versionIdNumber) && versionIdNumber <= currentVersionId) {
                 return response;
             }
             // Check if the current document is deactivated before further processing
-            if (currentDocument.deactivated) {
+            if (response.didDocument.deactivated) {
                 // Set the response deactivated flag to true
-                response.metadata.deactivated = currentDocument.deactivated;
+                response.metadata.deactivated = response.didDocument.deactivated;
                 // If deactivated, stop processing further updates and return the response
                 return response;
             }
@@ -243,10 +245,12 @@ export class Resolve {
         // Return response data
         return response;
     }
+    // ─── Private static: update internals ──────────────────────────────
     /**
      * Implements subsection {@link https://dcdpr.github.io/did-btcr2/#confirm-duplicate-update | 7.2.f.1 Confirm Duplicate Update}.
      * This step confirms that an update with a lower-than-expected targetVersionId is a true duplicate.
      * @param {SignedBTCR2Update} update The BTCR2 Signed Update to confirm as a duplicate.
+     * @param {string[]} updateHashHistory The accumulated hash history for comparison.
      * @returns {void} Does not return a value, but throws an error if the update is not a valid duplicate.
      */
     static confirmDuplicate(update, updateHashHistory) {
@@ -265,10 +269,10 @@ export class Resolve {
      * Implements subsection {@link https://dcdpr.github.io/did-btcr2/operations/resolve.html#apply-update | 7.2.f.3 Apply Update}.
      * @param {DidDocument} currentDocument The current DID Document to apply the update to.
      * @param {SignedBTCR2Update} update The BTCR2 Signed Update to apply.
-     * @returns {Promise<DidDocument>} The updated DID Document after applying the update.
+     * @returns {DidDocument} The updated DID Document after applying the update.
      * @throws {ResolveError} If the update is invalid or cannot be applied.
      */
-    static async applyUpdate(currentDocument, update) {
+    static applyUpdate(currentDocument, update) {
         // Get the capability id from the to update proof.
         const capabilityId = update.proof?.capability;
         // Since this field is optional, check that it exists
@@ -313,7 +317,7 @@ export class Resolve {
         // Verify that updatedDocument is conformant to DID Core v1.1.
         DidDocument.validate(updatedDocument);
         // Canonicalize and hash the updatedDocument to get the currentDocumentHash.
-        const currentDocumentHash = canonicalHash(updatedDocument, { encoding: 'base64url' });
+        const currentDocumentHash = canonicalHash(updatedDocument);
         // Prepare the update targetHash for comparison with currentDocumentHash.
         const updateTargetHash = update.targetHash;
         // Make sure the update.targetHash equals currentDocumentHash.
@@ -324,5 +328,149 @@ export class Resolve {
         //  Return final updatedDocument.
         return updatedDocument;
     }
+    // ─── Instance: state machine ───────────────────────────────────────
+    /**
+     * Advance the state machine. Returns either:
+     * - `{ status: 'action-required', needs }` — caller must provide data via {@link provide}
+     * - `{ status: 'resolved', result }` — resolution complete
+     *
+     * Analogous to Rust's `Resolver::resolve()`.
+     */
+    resolve() {
+        // Internal loop — keeps advancing through phases until data is needed or done
+        while (true) {
+            switch (this.#phase) {
+                // Phase: GenesisDocument
+                // Only entered for EXTERNAL (x HRP) identifiers when genesis doc was not in sidecar.
+                case ResolverPhase.GenesisDocument: {
+                    if (this.#providedGenesisDocument) {
+                        // Genesis doc was provided — establish the current document
+                        this.#currentDocument = Resolver.external(this.#didComponents, this.#providedGenesisDocument);
+                        this.#providedGenesisDocument = null;
+                        this.#phase = ResolverPhase.BeaconDiscovery;
+                        continue;
+                    }
+                    // Need genesis document from caller
+                    const genesisHash = encodeHash(this.#didComponents.genesisBytes);
+                    return {
+                        status: 'action-required',
+                        needs: [{ kind: 'NeedGenesisDocument', genesisHash }]
+                    };
+                }
+                // Phase: BeaconDiscovery
+                // Extract beacon services, emit NeedBeaconSignals for addresses not yet queried.
+                case ResolverPhase.BeaconDiscovery: {
+                    const beaconServices = BeaconUtils.getBeaconServices(this.#currentDocument);
+                    // Filter to services whose addresses haven't been requested yet
+                    const newServices = beaconServices.filter(service => {
+                        const address = BeaconUtils.parseBitcoinAddress(service.serviceEndpoint);
+                        return !this.#requestCache.has(address);
+                    });
+                    if (newServices.length > 0) {
+                        // Mark addresses as requested so we don't re-request on subsequent rounds
+                        for (const service of newServices) {
+                            const address = BeaconUtils.parseBitcoinAddress(service.serviceEndpoint);
+                            this.#requestCache.add(address);
+                        }
+                        return {
+                            status: 'action-required',
+                            needs: [{ kind: 'NeedBeaconSignals', beaconServices: newServices }]
+                        };
+                    }
+                    // No new beacon services to query — move to processing
+                    this.#phase = ResolverPhase.BeaconProcess;
+                    continue;
+                }
+                // Phase: BeaconProcess
+                // Process each beacon's signals. Collect updates and data needs.
+                case ResolverPhase.BeaconProcess: {
+                    const allNeeds = [];
+                    for (const [service, signals] of this.#beaconServicesSignals) {
+                        // Skip already-processed services and services with no signals
+                        if (this.#processedServices.has(service.id) || !signals.length)
+                            continue;
+                        // Establish a typed beacon and process its signals
+                        const beacon = BeaconFactory.establish(service);
+                        const result = beacon.processSignals(signals, this.#sidecarData);
+                        if (result.needs.length > 0) {
+                            // This service has unmet data needs — collect them
+                            allNeeds.push(...result.needs);
+                        }
+                        else {
+                            // All signals for this service resolved — collect updates, mark processed
+                            this.#unsortedUpdates.push(...result.updates);
+                            this.#processedServices.add(service.id);
+                        }
+                    }
+                    if (allNeeds.length > 0) {
+                        return { status: 'action-required', needs: allNeeds };
+                    }
+                    this.#phase = ResolverPhase.ApplyUpdates;
+                    continue;
+                }
+                // Phase: ApplyUpdates
+                // Apply collected updates, then check for new beacon services (multi-round).
+                case ResolverPhase.ApplyUpdates: {
+                    if (this.#unsortedUpdates.length > 0) {
+                        // Apply all collected updates to the current document
+                        this.#resolvedResponse = Resolver.updates(this.#currentDocument, this.#unsortedUpdates, this.#versionTime, this.#versionId);
+                        this.#currentDocument = this.#resolvedResponse.didDocument;
+                        this.#unsortedUpdates = [];
+                        // Check for new beacon services added by updates (multi-round discovery)
+                        const beaconServices = BeaconUtils.getBeaconServices(this.#currentDocument);
+                        const hasNewServices = beaconServices.some(service => {
+                            const address = BeaconUtils.parseBitcoinAddress(service.serviceEndpoint);
+                            return !this.#requestCache.has(address);
+                        });
+                        if (hasNewServices) {
+                            // Loop back to discover signals for new beacon services
+                            this.#phase = ResolverPhase.BeaconDiscovery;
+                            continue;
+                        }
+                    }
+                    this.#phase = ResolverPhase.Complete;
+                    continue;
+                }
+                // Phase: Complete
+                case ResolverPhase.Complete: {
+                    return {
+                        status: 'resolved',
+                        result: this.#resolvedResponse ?? {
+                            didDocument: this.#currentDocument,
+                            metadata: {
+                                versionId: this.#versionId ?? '1',
+                                deactivated: this.#currentDocument.deactivated || false
+                            }
+                        }
+                    };
+                }
+            }
+        }
+    }
+    provide(need, data) {
+        switch (need.kind) {
+            case 'NeedGenesisDocument': {
+                this.#providedGenesisDocument = data;
+                break;
+            }
+            case 'NeedBeaconSignals': {
+                const signals = data;
+                for (const [service, serviceSignals] of signals) {
+                    this.#beaconServicesSignals.set(service, serviceSignals);
+                }
+                break;
+            }
+            case 'NeedCASAnnouncement': {
+                const announcement = data;
+                this.#sidecarData.casMap.set(canonicalHash(announcement), announcement);
+                break;
+            }
+            case 'NeedSignedUpdate': {
+                const update = data;
+                this.#sidecarData.updateMap.set(canonicalHash(update), update);
+                break;
+            }
+        }
+    }
 }
-//# sourceMappingURL=resolve.js.map
+//# sourceMappingURL=resolver.js.map

package/dist/esm/core/resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/core/resolver.ts"],"names":[],"mappings":"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"}

package/dist/esm/core/update.js

@@ -22,10 +22,10 @@ export class Update {
      * @param {Btcr2DidDocument} sourceDocument The source DID document to be updated.
      * @param {PatchOperation[]} patches The array of JSON Patch operations to apply to the sourceDocument.
      * @param {number} sourceVersionId The version ID of the source document.
-     * @returns {Promise<SignedBTCR2Update>} The constructed SignedBTCR2Update object.
+     * @returns {UnsignedBTCR2Update} The constructed UnsignedBTCR2Update object.
      * @throws {UpdateError} InvalidDid if sourceDocument.id does not match identifier.
      */
-    static async construct(sourceDocument, patches, sourceVersionId) {
+    static construct(sourceDocument, patches, sourceVersionId) {
         // Initialize an unsigned update conformant to btcr2 spec.
         const unsignedUpdate = {
             '@context': [
@@ -37,7 +37,7 @@ export class Update {
             patch: patches,
             targetHash: '',
             targetVersionId: sourceVersionId + 1,
-            sourceHash: canonicalHash(sourceDocument, { encoding: 'base64url' }),
+            sourceHash: canonicalHash(sourceDocument),
         };
         // Apply all JSON patches to sourceDocument.
         const targetDocument = JSONPatch.apply(sourceDocument, patches);
@@ -50,7 +50,7 @@ export class Update {
             throw new UpdateError('Error validating targetDocument: ' + (error instanceof Error ? error.message : String(error)), INVALID_DID_UPDATE, targetDocument);
         }
         // Set the targetHash by canonicalizing the targetDocument and encoding it in base64url.
-        unsignedUpdate.targetHash = canonicalHash(targetDocument, { encoding: 'base64url' });
+        unsignedUpdate.targetHash = canonicalHash(targetDocument);
         // Return unsignedUpdate.
         return unsignedUpdate;
     }
@@ -64,7 +64,7 @@ export class Update {
      * @returns {SignedBTCR2Update} Did update payload secured with a proof => SignedBTCR2Update
      * @throws {UpdateError} if the privateKeyBytes are invalid
      */
-    static async sign(did, unsignedUpdate, verificationMethod, secretKey) {
+    static sign(did, unsignedUpdate, verificationMethod, secretKey) {
         // Parse the controller from the verificationMethod
         const controller = verificationMethod.controller;
         // Parse the fragment from the vmId

package/dist/esm/core/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/core/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/core/update.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,SAAS,EAGT,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,eAAe,EAGhB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAoB,WAAW,EAAyB,MAAM,0BAA0B,CAAC;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,MAAM;IACjB;;;;;;;;;OASG;IACH,MAAM,CAAC,SAAS,CACd,cAAgC,EAChC,OAAyB,EACzB,eAAuB;QAEvB,0DAA0D;QAC1D,MAAM,cAAc,GAAwB;YAC1C,UAAU,EAAQ;gBAChB,8BAA8B;gBAC9B,0BAA0B;gBAC1B,mCAAmC;gBACnC,8BAA8B;aAC/B;YACD,KAAK,EAAa,OAAO;YACzB,UAAU,EAAQ,EAAE;YACpB,eAAe,EAAG,eAAe,GAAG,CAAC;YACrC,UAAU,EAAQ,aAAa,CAAC,cAAc,CAAC;SAChD,CAAC;QAEF,4CAA4C;QAC5C,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAEhE,IAAI,CAAC;YACH,4DAA4D;YAC5D,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qEAAqE;YACrE,MAAM,IAAI,WAAW,CACnB,mCAAmC,GAAG,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAC9F,kBAAkB,EAAE,cAAc,CACnC,CAAC;QACJ,CAAC;QAED,wFAAwF;QACxF,cAAc,CAAC,UAAU,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;QAE1D,yBAAyB;QACzB,OAAO,cAAc,CAAC;IACxB,CAAC;IAED;;;;;;;;;OASG;IACH,MAAM,CAAC,IAAI,CACT,GAAW,EACX,cAAmC,EACnC,kBAAyC,EACzC,SAAmB;QAEnB,mDAAmD;QACnD,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC;QACjD,mCAAmC;QACnC,MAAM,EAAE,GAAG,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAE3E,+BAA+B;QAC/B,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,CAAC,EAAE,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAE1E,yCAAyC;QACzC,MAAM,MAAM,GAAwB;YAClC,UAAU,EAAG;gBACX,8BAA8B;gBAC9B,0BAA0B;gBAC1B,mCAAmC;gBACnC,8BAA8B;aAC/B;YACD,WAAW,EAAU,iBAAiB;YACtC,IAAI,EAAiB,oBAAoB;YACzC,kBAAkB,EAAG,kBAAkB,CAAC,EAAE;YAC1C,YAAY,EAAS,sBAAsB;YAC3C,UAAU,EAAW,iBAAiB,kBAAkB,CAAC,GAAG,CAAC,EAAE;YAC/D,gBAAgB,EAAK,OAAO;SAC7B,CAAC;QAEF,6CAA6C;QAC7C,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC,oBAAoB,EAAE,CAAC;QAEhE,uDAAuD;QACvD,OAAO,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,CAAC,QAAQ,CACnB,aAA4B,EAC5B,MAAyB,EACzB,SAAmB,EACnB,OAA0B;QAE1B,4BAA4B;QAC5B,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAEtD,uBAAuB;QACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAExE,yBAAyB;QACzB,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}