@did-btcr2/method 0.19.0 → 0.20.0

package/dist/cjs/core/beacon/smt-beacon.js

@@ -1,56 +1,39 @@
-import { MethodError } from '@did-btcr2/common';
-import { AggregateBeacon } from './interfaces.js';
+import { Beacon } from './beacon.js';
+import { SMTBeaconError } from './error.js';
 /**
- * TODO: Finish implementation
  * Implements {@link https://dcdpr.github.io/did-btcr2/terminology.html#smt-beacon | SMTBeacon}.
  * @class SMTBeacon
  * @type {SMTBeacon}
- * @extends {AggregateBeacon}
+ * @extends {Beacon}
  */
-export class SMTBeacon extends AggregateBeacon {
+export class SMTBeacon extends Beacon {
     /**
-     * Creates an instance of SingletonBeacon.
+     * Creates an instance of SMTBeacon.
      * @param {BeaconService} service The Beacon service.
-     * @param {Array<BeaconSignal>} signals The SingletonBeacon sidecar data.
-     * @param {SidecarData} sidecar The sidecar data.
      */
-    constructor(service, signals, sidecar, bitcoin) {
-        super({ ...service, type: 'SMTBeacon' }, signals, sidecar, bitcoin);
+    constructor(service) {
+        super({ ...service, type: 'SMTBeacon' });
     }
     /**
-     * Static, convenience method for establishing a SMTBeacon object.
-     * @param {string} service The Beacon service.
-     * @param {SidecarData} sidecar The sidecar data.
-     * @returns {SingletonBeacon} The Singleton Beacon.
+     * Implements {@link https://dcdpr.github.io/did-btcr2/operations/resolve.html#process-smt-beacon | 7.2.e.1 Process SMT Beacon}.
+     * @param {Array<BeaconSignal>} signals The array of Beacon Signals to process.
+     * @param {SidecarData} sidecar The sidecar data associated with the SMT Beacon.
+     * @returns {Promise<Array<[SignedBTCR2Update, BlockMetadata]>>} The processed signals.
+     * @throws {SMTBeaconError} if processing fails.
      */
-    static establish(service, signals, sidecar) {
-        return new SMTBeacon(service, signals, sidecar);
+    processSignals(signals, sidecar) {
+        throw new SMTBeaconError('Method not implemented.', `METHOD_NOT_IMPLEMENTED`, { signals, sidecar });
     }
     /**
-     * TODO: Figure out if this is necessary or not.
-     * @param {HexString} updateHash The hash of the BTCR2 update to generate the signal for.
-     * @returns {BeaconSignal} The generated signal.
-     * @throws {MethodError} if the signal is invalid.
+     * Broadcast CAS Beacon signal to the Bitcoin network.
+     * @param {SignedBTCR2Update} signedUpdate The signed BTCR2 update to broadcast.
+     * @param {KeyBytes} secretKey The secret key for signing the Bitcoin transaction.
+     * @param {BitcoinNetworkConnection} bitcoin The Bitcoin network connection.
+     * @return {Promise<SignedBTCR2Update>} The signed update that was broadcasted.
+     * @throws {SMTBeaconError} if broadcasting fails.
      */
-    generateSignal(updateHash) {
-        throw new MethodError('Method not implemented.', `METHOD_NOT_IMPLEMENTED`, { updateHash });
-    }
-    /**
-     * Process SMTBeacon signals.
-     * @returns {Promise<Array<BTCR2SignedUpdate>>} The processed signed update or undefined.
-     * @throws {MethodError} if the signal processing fails.
-     */
-    async processSignals() {
-        throw new MethodError('Method not implemented.', `METHOD_NOT_IMPLEMENTED`);
-    }
-    /**
-     * Broadcast a SMTBeacon signal.
-     * @param {HexString} updateHash The hash of the BTCR2 update to broadcast.
-     * @returns {Promise<SignalsMetadata>} The result of the broadcast.
-     * @throws {MethodError} if the broadcast fails.
-     */
-    async broadcastSignal(updateHash) {
-        throw new MethodError('Method not implemented.', `METHOD_NOT_IMPLEMENTED`, { updateHash });
+    async broadcastSignal(signedUpdate, secretKey, bitcoin) {
+        throw new SMTBeaconError('Method not implemented.', `METHOD_NOT_IMPLEMENTED`, { signedUpdate, secretKey, bitcoin });
     }
 }
 //# sourceMappingURL=smt-beacon.js.map

package/dist/cjs/core/beacon/smt-beacon.js.map

@@ -1 +1 @@
-{"version":3,"file":"smt-beacon.js","sourceRoot":"","sources":["../../../../src/core/beacon/smt-beacon.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAG3D,OAAO,EAAE,eAAe,EAA8C,MAAM,iBAAiB,CAAC;AAE9F;;;;;;GAMG;AACH,MAAM,OAAO,SAAU,SAAQ,eAAe;IAC5C;;;;;OAKG;IACH,YACE,OAAsB,EACtB,OAA4B,EAC5B,OAAoB,EACpB,OAAkC;QAElC,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,OAAsB,EAAE,OAA4B,EAAE,OAAoB;QACzF,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,UAAqB;QAClC,MAAM,IAAI,WAAW,CAAC,yBAAyB,EAAE,wBAAwB,EAAE,EAAC,UAAU,EAAC,CAAC,CAAC;IAC3F,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,cAAc;QAClB,MAAM,IAAI,WAAW,CAAC,yBAAyB,EAAE,wBAAwB,CAAC,CAAC;IAC7E,CAAC;IAGD;;;;;OAKG;IACH,KAAK,CAAC,eAAe,CAAC,UAAqB;QACzC,MAAM,IAAI,WAAW,CAAC,yBAAyB,EAAE,wBAAwB,EAAE,EAAC,UAAU,EAAC,CAAC,CAAC;IAC3F,CAAC;CAEF"}
+{"version":3,"file":"smt-beacon.js","sourceRoot":"","sources":["../../../../src/core/beacon/smt-beacon.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5C;;;;;GAKG;AACH,MAAM,OAAO,SAAU,SAAQ,MAAM;IACnC;;;OAGG;IACH,YAAY,OAAsB;QAChC,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;OAMG;IACH,cAAc,CACZ,OAA4B,EAC5B,OAAoB;QAEpB,MAAM,IAAI,cAAc,CAAC,yBAAyB,EAAE,wBAAwB,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,CAAC,CAAC;IACpG,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,eAAe,CACnB,YAA+B,EAC/B,SAAmB,EACnB,OAAiC;QAEjC,MAAM,IAAI,cAAc,CAAC,yBAAyB,EAAE,wBAAwB,EAAE,EAAC,YAAY,EAAE,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;IACpH,CAAC;CACF"}

package/dist/cjs/core/beacon/utils.js

@@ -3,6 +3,7 @@ import { DidMethodError, MethodError } from '@did-btcr2/common';
 import { payments } from 'bitcoinjs-lib';
 import { Appendix } from '../../utils/appendix.js';
 import { Identifier } from '../identifier.js';
+import { BeaconError } from './error.js';
 /**
  * Static class of utility functions for the Beacon Service
  * @class BeaconUtils
@@ -36,9 +37,6 @@ export class BeaconUtils {
         // Return false if the serviceEndpoint is not a valid BIP21 bitcoin address.
         if ([obj.serviceEndpoint].flat().some(ep => typeof ep === 'string' && !ep.startsWith('bitcoin:')))
             return false;
-        // Return false if the casType exists and is not a string.
-        if (obj.casType && typeof obj.casType !== 'string')
-            return false;
         // Else return true
         return true;
     }
@@ -66,8 +64,7 @@ export class BeaconUtils {
             return addrTypes.map((addrType) => this.createBeaconService(did, addrType, beaconType));
         }
         catch (error) {
-            console.error(error);
-            process.exit(1);
+            throw new BeaconError('Failed to create beacon services: ' + error.message, 'BEACON_SERVICE_ERROR', { did, beaconType });
         }
     }
     /**
@@ -94,8 +91,7 @@ export class BeaconUtils {
             return { id, type: beaconType, serviceEndpoint, };
         }
         catch (error) {
-            console.error(error);
-            process.exit(1);
+            throw new BeaconError('Failed to create beacon service: ' + error.message, 'BEACON_SERVICE_ERROR', { did, beaconType });
         }
     }
     /**
@@ -134,8 +130,7 @@ export class BeaconUtils {
             ];
         }
         catch (error) {
-            console.error(error);
-            process.exit(1);
+            throw new BeaconError('Failed to create beacon services: ' + error.message, 'BEACON_SERVICE_ERROR', { id, publicKey, network, beaconType });
         }
     }
     /**

package/dist/cjs/core/beacon/utils.js.map

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

package/dist/cjs/core/resolve.js

@@ -1,5 +1,5 @@
-import { GENESIS_TX_ID, getNetwork, TXIN_WITNESS_COINBASE } from '@did-btcr2/bitcoin';
-import { DateUtils, IdentifierHrp, INVALID_DID, INVALID_DID_DOCUMENT, INVALID_DID_UPDATE, JSONPatch, JSONUtils, LATE_PUBLISHING_ERROR, MethodError, MISSING_UPDATE_DATA, ResolveError } from '@did-btcr2/common';
+import { getNetwork } from '@did-btcr2/bitcoin';
+import { DateUtils, IdentifierHrp, INVALID_DID, INVALID_DID_DOCUMENT, INVALID_DID_UPDATE, JSONPatch, JSONUtils, LATE_PUBLISHING_ERROR, MISSING_UPDATE_DATA, ResolveError } from '@did-btcr2/common';
 import { BIP340Cryptosuite, BIP340DataIntegrityProof, SchnorrMultikey } from '@did-btcr2/cryptosuite';
 import { CompressedSecp256k1PublicKey } from '@did-btcr2/keypair';
 import { bytesToHex } from '@noble/hashes/utils';
@@ -7,6 +7,7 @@ import { canonicalization, 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';
 /**
@@ -19,62 +20,6 @@ import { Identifier } from './identifier.js';
  * @type {Resolve}
  */
 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 {SidecarData} The processed sidecar data containing maps of updates, CAS announcements, and SMT proofs.
-     */
-    static processSidecarData(sidecar = {}) {
-        // BTCR2 Signed Updates map
-        const updateMap = new Map();
-        if (sidecar.updates?.length)
-            for (const update of sidecar.updates) {
-                updateMap.set(canonicalization.process(update, { encoding: 'hex' }), update);
-            }
-        // CAS Announcements map
-        const casMap = new Map();
-        if (sidecar.casUpdates?.length)
-            for (const update of sidecar.casUpdates) {
-                casMap.set(canonicalization.process(update, { encoding: 'hex' }), update);
-            }
-        // SMT Proofs map
-        const smtMap = new Map();
-        if (sidecar.smtProofs?.length)
-            for (const proof of sidecar.smtProofs) {
-                smtMap.set(proof.id, proof);
-            }
-        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 {DidError} if the DID hrp is invalid, no sidecarData passed and hrp = "x".
-     */
-    static async establishCurrentDocument(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 });
-    }
     /**
      * 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.
@@ -111,7 +56,7 @@ export class Resolve {
      * @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
-     * @throws {MethodError} InvalidDidDocument if not conformant to DID Core v1.1
+     * @throws {ResolveError} InvalidDidDocument if not conformant to DID Core v1.1
      */
     static async external(didComponents, genesisDocument) {
         // Canonicalize and sha256 hash the currentDocument
@@ -120,7 +65,7 @@ export class Resolve {
         const genesisBytes = bytesToHex(didComponents.genesisBytes);
         // If the genesisBytes do not match the hashBytes, throw an error
         if (genesisBytes !== hashBytes) {
-            throw new MethodError(`Initial document mismatch: genesisBytes ${genesisBytes} !== hashBytes ${hashBytes}`, INVALID_DID_DOCUMENT, { genesisBytes, hashBytes });
+            throw new ResolveError(`Initial document mismatch: genesisBytes ${genesisBytes} !== hashBytes ${hashBytes}`, INVALID_DID_DOCUMENT, { genesisBytes, hashBytes });
         }
         // Encode the did from the didComponents
         const did = Identifier.encode(didComponents);
@@ -129,42 +74,94 @@ export class Resolve {
         // Return a W3C conformant DID Document
         return new DidDocument(currentDocument);
     }
+    /**
+     * 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.
+     */
+    static sidecarData(sidecar = {}) {
+        // BTCR2 Signed Updates map
+        const updateMap = new Map();
+        if (sidecar.updates?.length)
+            for (const update of sidecar.updates) {
+                updateMap.set(canonicalization.process(update, { encoding: 'hex' }), update);
+            }
+        // CAS Announcements map
+        const casMap = new Map();
+        if (sidecar.casUpdates?.length)
+            for (const update of sidecar.casUpdates) {
+                casMap.set(canonicalization.process(update, { encoding: 'hex' }), update);
+            }
+        // SMT Proofs map
+        const smtMap = new Map();
+        if (sidecar.smtProofs?.length)
+            for (const proof of sidecar.smtProofs) {
+                smtMap.set(proof.id, proof);
+            }
+        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 {BitcoinNetworkConnection} bitcoin The bitcoin network connection used to fetch beacon signals
-     * @param {boolean} [fullBlockchainTraversal=false] Whether to perform a full blockchain traversal or use an indexer
-     * @returns {Promise<Array<[BTCR2SignedUpdate, BlockMetadata]>>} The array of BTCR2 Signed Updates announced by the Beacon Signals.
+     * @returns {Promise<Array<[SignedBTCR2Update, BlockMetadata]>>} The array of BTCR2 Signed Updates announced by the Beacon Signals.
      */
-    static async processBeaconSignals(beaconServices, sidecarData, bitcoin, fullBlockchainTraversal) {
-        // Query indexer or perform a full blockchain traversal for Beacon Signals
-        const beaconServicesSignals = !fullBlockchainTraversal
-            ? await this.queryBlockchainIndexer(beaconServices, bitcoin)
-            : await this.traverseFullBlockchain(beaconServices, bitcoin);
-        // Set updates to an empty array
-        const unsortedUpdates = new Array();
-        // Iterate over each beacon service and its signals
-        for (const [service, signals] of beaconServicesSignals) {
-            // Establish a beacon object
-            const beacon = BeaconFactory.establish(service, signals, sidecarData);
-            // Process its signals
-            const processed = await beacon.processSignals();
-            // Append the processed updates to the updates array
-            unsortedUpdates.push(...processed);
-        }
-        return unsortedUpdates;
+    static async beaconSignals(beaconServices, sidecarData, bitcoin) {
+        // Discover Beacon Signals via indexer server (esplora/electrs) or full node
+        const beaconServicesSignals = bitcoin.network.rest
+            ? await BeaconSignalDiscovery.indexer(beaconServices, bitcoin)
+            : await BeaconSignalDiscovery.fullnode(beaconServices, bitcoin);
+        // Process each beacon's signals in parallel
+        const promises = 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 (await Promise.all(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<[BTCR2SignedUpdate, BlockMetadata]>} unsortedUpdates The unsorted array of BTCR2 Signed Updates and their associated Block Metadata.
+     * @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.
      */
-    static async processUpdatesArray(currentDocument, unsortedUpdates, versionTime, versionId) {
+    static async 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
@@ -198,7 +195,7 @@ export class Resolve {
             // If update.targetVersionId <= currentVersionId, confirm duplicate update
             if (update.targetVersionId <= currentVersionId) {
                 updateHashHistory.push(currentDocumentHash);
-                this.confirmDuplicateUpdate(update, updateHashHistory);
+                this.confirmDuplicate(update, updateHashHistory);
             }
             // If update.targetVersionId == currentVersionId + 1, apply the update
             else if (update.targetVersionId === currentVersionId + 1) {
@@ -210,7 +207,7 @@ export class Resolve {
                     throw new ResolveError(`Hash mismatch: update.sourceHash !== currentDocumentHash`, INVALID_DID_UPDATE, { sourceHash, currentDocumentHash });
                 }
                 // Apply the update to the currentDocument and set it in the response
-                response.currentDocument = await this.applyDidUpdate(response.currentDocument, update);
+                response.currentDocument = await this.applyUpdate(response.currentDocument, 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
@@ -239,198 +236,13 @@ export class Resolve {
         // Return response data
         return response;
     }
-    /**
-     * Retrieves the beacon signals for the given array of BeaconService objects
-     * using a esplora/electrs REST API connection via a bitcoin I/O driver.
-     * @param {Array<BeaconService>} beaconServices Array of BeaconService objects to retrieve signals for
-     * @param {BitcoinNetworkConnection} bitcoin Bitcoin network connection to use for REST calls
-     * @returns {Promise<Array<BeaconSignal>>} Promise resolving to an array of BeaconSignal objects
-     */
-    static async queryBlockchainIndexer(beaconServices, bitcoin) {
-        // Empty array of beaconSignals
-        const beaconServiceSignals = new Map();
-        // Iterate over each beacon
-        for (const beaconService of beaconServices) {
-            beaconServiceSignals.set(beaconService, []);
-            // Get the transactions for the beacon address via REST
-            const beaconSignals = await bitcoin.network.rest.address.getTxs(beaconService.serviceEndpoint);
-            // If no signals are found, continue
-            if (!beaconSignals || !beaconSignals.length) {
-                continue;
-            }
-            // Iterate over each signal
-            for (const beaconSignal of beaconSignals) {
-                // Get the last vout in the transaction
-                const signalVout = beaconSignal.vout.slice(-1)[0];
-                /**
-                 * Look for OP_RETURN in last vout scriptpubkey_asm
-                 * Vout (rest) format:
-                 * {
-                 *  scriptpubkey: '6a20570f177c65e64fb5cf61180b664cdddf09ab76153c2b192e22006e5b22a3917a',
-                 *  scriptpubkey_asm: 'OP_RETURN OP_PUSHBYTES_32 570f177c65e64fb5cf61180b664cdddf09ab76153c2b192e22006e5b22a3917a',
-                 *  scriptpubkey_type: 'op_return',
-                 *  value: 0
-                 * }
-                 */
-                if (!signalVout || !signalVout.scriptpubkey_asm.includes('OP_RETURN')) {
-                    // If not found, continue to next signal
-                    continue;
-                }
-                // Construct output map for easier access
-                const outputMap = new Map(Object.entries(signalVout));
-                // Grab the signal vout scriptpubkey
-                const signalVoutScriptPubkey = outputMap.get('scriptpubkey_asm');
-                // If the signal vout scriptpubkey does not exist, continue to next signal
-                if (!signalVoutScriptPubkey) {
-                    continue;
-                }
-                // Extract hex string hash of the signal bytes from the scriptpubkey
-                const updateHash = signalVoutScriptPubkey.split(' ').slice(-1)[0];
-                if (!updateHash) {
-                    continue;
-                }
-                const confirmations = await bitcoin.network.rest.block.count() - beaconSignal.status.block_height + 1;
-                // Push the beacon signal object to the signals array for the beacon service
-                beaconServiceSignals.get(beaconService)?.push({
-                    tx: beaconSignal,
-                    signalBytes: updateHash,
-                    blockMetadata: {
-                        confirmations,
-                        height: beaconSignal.status.block_height,
-                        time: beaconSignal.status.block_time,
-                    }
-                });
-            }
-        }
-        // Return the beaconSignals
-        return beaconServiceSignals;
-    }
-    /**
-     * Traverse the full blockchain from genesis to chain top looking for beacon signals.
-     * @param {Array<BeaconService>} beaconServices Array of BeaconService objects to search for signals.
-     * @param {BitcoinNetworkConnection} bitcoin Bitcoin network connection to use for RPC calls.
-     * @returns {Promise<Array<BeaconSignal>>} Promise resolving to an array of BeaconSignal objects.
-     */
-    static async traverseFullBlockchain(beaconServices, bitcoin) {
-        const beaconServiceSignals = new Map();
-        for (const beaconService of beaconServices) {
-            beaconServiceSignals.set(beaconService, []);
-        }
-        // Get the RPC connection from the bitcoin network
-        const rpc = bitcoin.network.rpc;
-        // Ensure that the RPC connection is available
-        if (!rpc) {
-            throw new ResolveError('RPC connection is not available', 'RPC_CONNECTION_ERROR', bitcoin);
-        }
-        // Get the current block height
-        const targetHeight = await rpc.getBlockCount();
-        // Set genesis height
-        let height = 0;
-        // Opt into rpc connection to get the block data at the blockhash
-        let block = await bitcoin.network.rpc.getBlock({ height });
-        console.info(`Searching for beacon signals, please wait ...`);
-        while (block.height <= targetHeight) {
-            // Iterate over each transaction in the block
-            for (const tx of block.tx) {
-                // If the txid is a coinbase, continue ...
-                if (tx.txid === GENESIS_TX_ID) {
-                    continue;
-                }
-                // Iterate over each input in the transaction
-                for (const vin of tx.vin) {
-                    // If the vin is a coinbase transaction, continue ...
-                    if (vin.coinbase) {
-                        continue;
-                    }
-                    // If the vin txinwitness contains a coinbase did, continue ...
-                    if (vin.txinwitness && vin.txinwitness.length === 1 && vin.txinwitness[0] === TXIN_WITNESS_COINBASE) {
-                        continue;
-                    }
-                    // If the txid from the vin is undefined, continue ...
-                    if (!vin.txid) {
-                        continue;
-                    }
-                    // If the vout from the vin is undefined, continue ...
-                    if (vin.vout === undefined) {
-                        continue;
-                    }
-                    // Get the previous output transaction data
-                    const prevout = await rpc.getRawTransaction(vin.txid, 2);
-                    // If the previous output vout at the vin.vout index is undefined, continue ...
-                    if (!prevout.vout[vin.vout]) {
-                        continue;
-                    }
-                    // Get the address from the scriptPubKey from the prevvout (previous output's input at the vout index)
-                    const scriptPubKey = prevout.vout[vin.vout].scriptPubKey;
-                    // If the scriptPubKey.address is undefined, continue ...
-                    if (!scriptPubKey.address) {
-                        continue;
-                    }
-                    // If the beaconAddress from prevvout scriptPubKey is not a beacon service endpoint address, continue ...
-                    const beaconService = BeaconUtils.getBeaconServicesMap(beaconServices).get(scriptPubKey.address);
-                    if (!beaconService) {
-                        continue;
-                    }
-                    /**
-                     * Look for 'OP_RETURN' in prevout.vout[vin.vout].scriptPubKey.asm, else continue ...
-                     *
-                     * TxOut (rpc) format:
-                     * {
-                     *  value: 0,
-                     *  n: 1,
-                     *  scriptPubKey: {
-                     *    asm: 'OP_RETURN 570f177c65e64fb5cf61180b664cdddf09ab76153c2b192e22006e5b22a3917a',
-                     *    desc: 'raw(6a20570f177c65e64fb5cf61180b664cdddf09ab76153c2b192e22006e5b22a3917a)#cdgj3pm4',
-                     *    hex: '6a20570f177c65e64fb5cf61180b664cdddf09ab76153c2b192e22006e5b22a3917a',
-                     *    type: 'nulldata'
-                     *  }
-                     * }
-                     */
-                    const txVoutScriptPubkeyAsm = prevout.vout[vin.vout].scriptPubKey.asm;
-                    if (!txVoutScriptPubkeyAsm.includes('OP_RETURN')) {
-                        continue;
-                    }
-                    // Log the found txid and beacon
-                    console.info(`Tx ${tx.txid} contains beacon service address ${scriptPubKey.address} and OP_RETURN!`, tx);
-                    // Extract hex string hash of the signal bytes from the scriptpubkey
-                    const updateHash = txVoutScriptPubkeyAsm.split(' ').slice(-1)[0];
-                    if (!updateHash) {
-                        continue;
-                    }
-                    // Push the beacon signal object to the beacon signals array for that beacon service
-                    beaconServiceSignals.get(beaconService)?.push({
-                        tx,
-                        signalBytes: updateHash,
-                        blockMetadata: {
-                            height: block.height,
-                            time: block.time,
-                            confirmations: block.confirmations
-                        }
-                    });
-                }
-                ;
-            }
-            // Increment the height
-            height += 1;
-            // Check if we've reached the chain tip
-            const tip = await rpc.getBlockCount();
-            if (height > tip) {
-                // If so, break the loop
-                console.info(`Chain tip reached ${height}, breaking ...`);
-                break;
-            }
-            // Reset the block var to the next block data
-            block = await rpc.getBlock({ height });
-        }
-        return beaconServiceSignals;
-    }
     /**
      * 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 {BTCR2SignedUpdate} update The BTCR2 Signed Update to confirm as a duplicate.
+     * @param {SignedBTCR2Update} update The BTCR2 Signed Update to confirm as a duplicate.
      * @returns {void} Does not return a value, but throws an error if the update is not a valid duplicate.
      */
-    static confirmDuplicateUpdate(update, updateHashHistory) {
+    static confirmDuplicate(update, updateHashHistory) {
         // Create unsigned_update by removing the proof property from update.
         const unsignedUpdate = JSONUtils.deleteKeys(update, ['proof']);
         // Hash unsignedUpdate with JSON Document Hashing algorithm
@@ -445,11 +257,11 @@ 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 {BTCR2SignedUpdate} update The BTCR2 Signed Update to apply.
+     * @param {SignedBTCR2Update} update The BTCR2 Signed Update to apply.
      * @returns {Promise<DidDocument>} The updated DID Document after applying the update.
      * @throws {ResolveError} If the update is invalid or cannot be applied.
      */
-    static async applyDidUpdate(currentDocument, update) {
+    static async 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
@@ -475,10 +287,8 @@ export class Resolve {
         }
         // Get the verificationMethod from the DID Document using the verificationMethodId.
         const vm = DidBtcr2.getSigningMethod(currentDocument, verificationMethodId);
-        // Split the vmId by the `#` to get the id and controller.
-        const [vmController, vmId] = vm.id.split('#');
         // Construct a new SchnorrMultikey.
-        const multikey = SchnorrMultikey.fromPublicKeyMultibase(`#${vmId}`, vmController, vm.publicKeyMultibase);
+        const multikey = SchnorrMultikey.fromVerificationMethod(vm);
         // Construct a new BIP340Cryptosuite with the SchnorrMultikey.
         const cryptosuite = new BIP340Cryptosuite(multikey);
         // Canonicalize the update
@@ -489,7 +299,7 @@ export class Resolve {
         const verificationResult = diProof.verifyProof(canonicalUpdate, 'capabilityInvocation');
         // If the result is not verified, throw INVALID_DID_UPDATE error
         if (!verificationResult.verified) {
-            throw new MethodError('Invalid update: proof not verified', INVALID_DID_UPDATE, verificationResult);
+            throw new ResolveError('Invalid update: proof not verified', INVALID_DID_UPDATE, verificationResult);
         }
         // Apply the update.patch to the currentDocument to get the updatedDocument.
         const updatedDocument = JSONPatch.apply(currentDocument, update.patch);
@@ -502,7 +312,7 @@ export class Resolve {
         // Make sure the update.targetHash equals currentDocumentHash.
         if (updateTargetHash !== currentDocumentHash) {
             // If they do not match, throw INVALID_DID_UPDATE error.
-            throw new MethodError(`Invalid update: updateTargetHash !== currentDocumentHash`, INVALID_DID_UPDATE, { updateTargetHash, currentDocumentHash });
+            throw new ResolveError(`Invalid update: updateTargetHash !== currentDocumentHash`, INVALID_DID_UPDATE, { updateTargetHash, currentDocumentHash });
         }
         //  Return final updatedDocument.
         return updatedDocument;