@did-btcr2/method 0.24.1 → 0.25.2

package/src/core/{resolve.ts → resolver.ts}

@@ -1,19 +1,15 @@
-import {
-  BitcoinConnection,
-  getNetwork
-} from '@did-btcr2/bitcoin';
+import { getNetwork } from '@did-btcr2/bitcoin';
 import {
   canonicalHash,
   canonicalize,
   DateUtils,
-  IdentifierHrp,
-  INVALID_DID,
+  encode as encodeHash,
+  decode as decodeHash,
   INVALID_DID_DOCUMENT,
   INVALID_DID_UPDATE,
   JSONPatch,
   JSONUtils,
   LATE_PUBLISHING_ERROR,
-  MISSING_UPDATE_DATA,
   ResolveError
 } from '@did-btcr2/common';
 import {
@@ -24,13 +20,11 @@ import {
   UnsignedBTCR2Update
 } 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 { BeaconService, BlockMetadata } from './beacon/interfaces.js';
-import { BeaconSignalDiscovery } from './beacon/signal-discovery.js';
+import { BeaconService, BeaconSignal, BlockMetadata } from './beacon/interfaces.js';
 import { BeaconUtils } from './beacon/utils.js';
 import { DidComponents, Identifier } from './identifier.js';
 import { SMTProof } from './interfaces.js';
@@ -49,16 +43,137 @@ export interface DidResolutionResponse {
   }
 }
 
+/** The resolver needs a genesis document whose hash matches genesisHash. */
+export interface NeedGenesisDocument {
+  readonly kind: 'NeedGenesisDocument';
+  /** Base64url-encoded SHA-256 hash from the DID identifier's genesisBytes. */
+  readonly genesisHash: string;
+}
+
+/** The resolver needs beacon signals for these beacon service addresses. */
+export interface NeedBeaconSignals {
+  readonly kind: 'NeedBeaconSignals';
+  /** The beacon services that need signal data. Pass directly to BeaconSignalDiscovery. */
+  readonly beaconServices: ReadonlyArray<BeaconService>;
+}
+
+/** The resolver needs a CAS Announcement whose canonical hash matches announcementHash. */
+export interface NeedCASAnnouncement {
+  readonly kind: 'NeedCASAnnouncement';
+  /** Base64url-encoded canonical hash of the CAS Announcement. */
+  readonly announcementHash: string;
+  /** The beacon service that produced this signal. */
+  readonly beaconServiceId: string;
+}
+
+/** The resolver needs a SignedBTCR2Update whose canonical hash matches updateHash. */
+export interface NeedSignedUpdate {
+  readonly kind: 'NeedSignedUpdate';
+  /** Base64url-encoded canonical hash of the signed update. */
+  readonly updateHash: string;
+  /** The beacon service that produced this signal. */
+  readonly beaconServiceId: string;
+}
+
+/** Discriminated union of all data the resolver may request from the caller. */
+export type DataNeed = NeedGenesisDocument | NeedBeaconSignals | NeedCASAnnouncement | NeedSignedUpdate;
+
+/**
+ * Output of {@link Resolver.resolve}. Analogous to Rust's `ResolverState` enum.
+ * Either the resolver needs data from the caller, or resolution is complete.
+ */
+export type ResolverState =
+  | { status: 'action-required'; needs: ReadonlyArray<DataNeed> }
+  | { status: 'resolved'; result: DidResolutionResponse };
+
 /**
- * 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}
+ * Return type from {@link Beacon.processSignals}.
+ * Contains successfully resolved updates and any data needs that must be
+ * satisfied before the remaining signals can be processed.
  */
-export class Resolve {
+export interface BeaconProcessResult {
+  updates: Array<[SignedBTCR2Update, BlockMetadata]>;
+  needs: Array<DataNeed>;
+}
+
+/**
+ * Different possible Resolver states representing phases in the resolution process.
+ */
+enum ResolverPhase {
+  GenesisDocument = 'GenesisDocument',
+  BeaconDiscovery = 'BeaconDiscovery',
+  BeaconProcess   = 'BeaconProcess',
+  ApplyUpdates    = 'ApplyUpdates',
+  Complete        = 'Complete',
+}
+
+/**
+ * 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 ---
+  readonly #didComponents: DidComponents;
+  readonly #versionId?: string;
+  readonly #versionTime?: string;
+
+  /**
+   * The specific phase the Resolver is current in.
+   */
+  #phase: ResolverPhase;
+  #sidecarData: SidecarData;
+  #currentDocument: DidDocument | null;
+  #providedGenesisDocument: object | null = null;
+  #beaconServicesSignals: Map<BeaconService, Array<BeaconSignal>> = new Map();
+  #processedServices: Set<string> = new Set();
+  #requestCache: Set<string> = new Set();
+  #unsortedUpdates: Array<[SignedBTCR2Update, BlockMetadata]> = [];
+  #resolvedResponse: DidResolutionResponse | null = null;
+
+  /**
+   * @internal — Use {@link DidBtcr2.resolve} to create instances.
+   */
+  constructor(
+    didComponents: DidComponents,
+    sidecarData: SidecarData,
+    currentDocument: DidDocument | null,
+    options?: { versionId?: string; versionTime?: string; genesisDocument?: object }
+  ) {
+    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.
@@ -66,13 +181,13 @@ export class Resolve {
    */
   static deterministic(didComponents: DidComponents): DidDocument {
     // 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({
@@ -88,7 +203,7 @@ export class Resolve {
         id                 : `${did}#initialKey`,
         type               : 'Multikey',
         controller         : did,
-        publicKeyMultibase : publicKeyMultibase.encoded
+        publicKeyMultibase : multibase.encoded
       }],
       service
     });
@@ -97,33 +212,30 @@ 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(
+  static external(
     didComponents: DidComponents,
     genesisDocument: object,
-  ): Promise<DidDocument> {
-    // Get the genesis bytes from the did components
-    const { genesisBytes } = didComponents;
-
-    // Convert the genesis bytes to a hex string
-    const genesisHex = hex.encode(genesisBytes);
+  ): DidDocument {
+    // 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) {
+    if (genesisBytes !== genesisDocumentBytes) {
       throw new ResolveError(
-        `Initial document mismatch: genesisBytes ${genesisHex} !== hashBytes ${hashBytes}`,
-        INVALID_DID_DOCUMENT, { genesisBytes, hashBytes }
+        `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(
@@ -137,21 +249,21 @@ 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: Sidecar = {} as Sidecar): SidecarData {
     // BTCR2 Signed Updates map
     const updateMap = new Map<string, SignedBTCR2Update>();
     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<string, CASAnnouncement>();
     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
@@ -164,97 +276,20 @@ 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: DidComponents,
-    genesisDocument?: object,
-  ): Promise<DidDocument> {
-    // 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: Array<BeaconService>,
-    sidecarData: SidecarData,
-    bitcoin: BitcoinConnection
-  ): Promise<Array<[SignedBTCR2Update, BlockMetadata]>> {
-    // 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(
+  static updates(
     currentDocument: DidDocument,
     unsortedUpdates: Array<[SignedBTCR2Update, BlockMetadata]>,
     versionTime?: string,
     versionId?: string
-  ): Promise<DidResolutionResponse> {
+  ): DidResolutionResponse {
     // Start the version number being processed at 1
     let currentVersionId = 1;
 
@@ -280,7 +315,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);
@@ -319,12 +354,12 @@ export class Resolve {
           );
         }
         // 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']) as UnsignedBTCR2Update;
         // 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
@@ -345,14 +380,15 @@ export class Resolve {
       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;
       }
@@ -362,13 +398,16 @@ export class Resolve {
     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: SignedBTCR2Update, updateHashHistory: string[]): void {
+  private static confirmDuplicate(update: SignedBTCR2Update, updateHashHistory: string[]): void {
     // Create unsigned_update by removing the proof property from update.
     const { proof: _, ...unsignedUpdate } = update;
 
@@ -391,13 +430,13 @@ 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(
+  private static applyUpdate(
     currentDocument: DidDocument,
     update: SignedBTCR2Update
-  ): Promise<DidDocument> {
+  ): DidDocument {
     // Get the capability id from the to update proof.
     const capabilityId = update.proof?.capability;
     // Since this field is optional, check that it exists
@@ -461,7 +500,7 @@ export class Resolve {
     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;
@@ -478,4 +517,190 @@ 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(): ResolverState {
+    // 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 as string);
+            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 as string);
+              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: Array<DataNeed> = [];
+
+          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 as string);
+              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 data the resolver requested in a previous {@link resolve} call.
+   * Call once per need, then call {@link resolve} again to continue.
+   *
+   * Analogous to Rust's `Resolver::process_responses()`.
+   *
+   * @param need The DataNeed being fulfilled (from the `needs` array).
+   * @param data The data payload corresponding to the need kind.
+   */
+  provide(need: NeedGenesisDocument, data: object): void;
+  provide(need: NeedBeaconSignals, data: Map<BeaconService, Array<BeaconSignal>>): void;
+  provide(need: NeedCASAnnouncement, data: CASAnnouncement): void;
+  provide(need: NeedSignedUpdate, data: SignedBTCR2Update): void;
+  provide(need: DataNeed, data: object | Map<BeaconService, Array<BeaconSignal>> | CASAnnouncement | SignedBTCR2Update): void {
+    switch(need.kind) {
+      case 'NeedGenesisDocument': {
+        this.#providedGenesisDocument = data;
+        break;
+      }
+
+      case 'NeedBeaconSignals': {
+        const signals = data as Map<BeaconService, Array<BeaconSignal>>;
+        for(const [service, serviceSignals] of signals) {
+          this.#beaconServicesSignals.set(service, serviceSignals);
+        }
+        break;
+      }
+
+      case 'NeedCASAnnouncement': {
+        const announcement = data as CASAnnouncement;
+        this.#sidecarData.casMap.set(canonicalHash(announcement), announcement);
+        break;
+      }
+
+      case 'NeedSignedUpdate': {
+        const update = data as SignedBTCR2Update;
+        this.#sidecarData.updateMap.set(canonicalHash(update), update);
+        break;
+      }
+    }
+  }
+}