@did-btcr2/method 0.40.2 → 0.42.0

package/dist/browser.js

@@ -93159,6 +93159,7 @@ a=end-of-candidates
     CASBeaconError: () => CASBeaconError,
     CHANGE_OUTPUT_VBYTES: () => CHANGE_OUTPUT_VBYTES,
     DEFAULT_FEE_ESTIMATOR: () => DEFAULT_FEE_ESTIMATOR,
+    DEFAULT_MAX_DISCOVERY_ROUNDS: () => DEFAULT_MAX_DISCOVERY_ROUNDS,
     DID_REGEX: () => DID_REGEX,
     DUST_LIMIT_SATS: () => DUST_LIMIT_SATS,
     DidBtcr2: () => DidBtcr2,
@@ -117822,6 +117823,9 @@ a=end-of-candidates
     }
   };
 
+  // src/core/btcr2-update.ts
+  init_shim();
+
   // src/core/did-sender-resolver.ts
   init_shim();
   function resolveBtcr2SenderPk(did) {
@@ -118140,9 +118144,9 @@ a=end-of-candidates
     }
     /**
      * Add a proof to a document.
-     * @param {UnsignedBTCR2Update} unsignedDocument The document to add the proof to.
-     * @param {DataIntegrityConfig} config The configuration for generating the proof.
-     * @returns {SignedBTCR2Update} A document with a proof added.
+     * @param {UnsecuredDocument} unsignedDocument The document to add the proof to.
+     * @param {DataIntegrityProofOptions} config The proof options for generating the proof.
+     * @returns {SecuredDocument} A document with a proof added.
      */
     addProof(unsignedDocument, config) {
       const proof = this.cryptosuite.createProof(unsignedDocument, config);
@@ -118235,7 +118239,7 @@ a=end-of-candidates
     /**
      * Create a proof for an insecure document.
      * @param {DidUpdatePayload} document The document to create a proof for.
-     * @param {DataIntegrityConfig} config The options to use when creating the proof.
+     * @param {DataIntegrityProofOptions} config The options to use when creating the proof.
      * @returns {DataIntegrityProofObject} The proof for the document.
      */
     createProof(document2, config) {
@@ -118252,7 +118256,7 @@ a=end-of-candidates
     }
     /**
      * Verify a proof for a secure document.
-     * @param {SignedBTCR2Update} secureDocument The secure document to verify.
+     * @param {SecuredDocument} secureDocument The secured document to verify.
      * @returns {VerificationResult} The result of the verification.
      */
     verifyProof(secureDocument) {
@@ -118267,8 +118271,8 @@ a=end-of-candidates
     }
     /**
      * Transform a document into canonical form.
-     * @param {UnsignedBTCR2Update | SignedBTCR2Update} document The document to transform.
-     * @param {DataIntegrityConfig} config The config to use when transforming the document.
+     * @param {UnsecuredDocument} document The document to transform.
+     * @param {DataIntegrityProofOptions} config The config to use when transforming the document.
      * @returns {string} The canonicalized document.
      * @throws {MethodError} if the document cannot be transformed.
      */
@@ -118295,7 +118299,7 @@ a=end-of-candidates
     }
     /**
      * Configure the proof by canonicalzing it.
-     * @param {DataIntegrityConfig} config The config to use when transforming the proof.
+     * @param {DataIntegrityProofOptions} config The config to use when transforming the proof.
      * @returns {string} The canonicalized proof configuration.
      * @throws {CryptosuiteError} if the proof configuration cannot be canonicalized.
      */
@@ -118315,7 +118319,7 @@ a=end-of-candidates
     /**
      * Serialize the proof into a byte array.
      * @param {HashBytes} hash The canonicalized proof configuration.
-     * @param {DataIntegrityConfig} config The config to use when serializing the proof.
+     * @param {DataIntegrityProofOptions} config The config to use when serializing the proof.
      * @returns {SignatureBytes} The serialized proof.
      * @throws {CryptosuiteError} if the multikey does not match the verification method.
      */
@@ -118329,7 +118333,7 @@ a=end-of-candidates
      * Verify the proof by comparing the hash of the proof configuration and document to the proof bytes.
      * @param {HashBytes} hash The canonicalized proof configuration and document hash.
      * @param {SignatureBytes} signature The proof bytes to verify against.
-     * @param {DataIntegrityConfig} config The config to use when verifying the proof.
+     * @param {DataIntegrityProofOptions} config The config to use when verifying the proof.
      * @returns {boolean} True if the proof is verified, false otherwise.
      * @throws {CryptosuiteError} if the multikey does not match the verification method.
      */
@@ -119286,7 +119290,8 @@ a=end-of-candidates
       return new Resolver(didComponents, sidecarData, currentDocument, {
         versionId: resolutionOptions.versionId,
         versionTime: resolutionOptions.versionTime,
-        genesisDocument: resolutionOptions.sidecar?.genesisDocument
+        genesisDocument: resolutionOptions.sidecar?.genesisDocument,
+        maxDiscoveryRounds: resolutionOptions.maxDiscoveryRounds
       });
     }
     /**
@@ -119395,6 +119400,21 @@ a=end-of-candidates
 
   // src/core/resolver.ts
   init_utils2();
+  var DEFAULT_MAX_DISCOVERY_ROUNDS = 10;
+  function isRecord(value2) {
+    return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
+  }
+  function isCASAnnouncement(value2) {
+    return isRecord(value2) && Object.values(value2).every((v) => typeof v === "string");
+  }
+  function isSignedBTCR2Update(value2) {
+    if (!isRecord(value2)) return false;
+    return Array.isArray(value2.patch) && typeof value2.sourceHash === "string" && typeof value2.targetHash === "string" && typeof value2.targetVersionId === "number" && isRecord(value2.proof);
+  }
+  function isSMTProof(value2) {
+    if (!isRecord(value2)) return false;
+    return typeof value2.id === "string" && typeof value2.collapsed === "string" && Array.isArray(value2.hashes);
+  }
   var Resolver = class _Resolver {
     // --- Immutable inputs ---
     #didComponents;
@@ -119412,6 +119432,10 @@ a=end-of-candidates
     #requestCache = /* @__PURE__ */ new Set();
     #unsortedUpdates = [];
     #resolvedResponse = null;
+    /** Upper bound on multi-round beacon-discovery passes; see {@link DEFAULT_MAX_DISCOVERY_ROUNDS}. */
+    #maxDiscoveryRounds;
+    /** Count of beacon-discovery passes driven by updates adding new beacon services. */
+    #discoveryRounds = 0;
     /**
      * @internal Use {@link DidBtcr2.resolve} to create instances.
      */
@@ -119421,6 +119445,7 @@ a=end-of-candidates
       this.#currentDocument = currentDocument;
       this.#versionId = options2?.versionId;
       this.#versionTime = options2?.versionTime;
+      this.#maxDiscoveryRounds = options2?.maxDiscoveryRounds ?? DEFAULT_MAX_DISCOVERY_ROUNDS;
       if (options2?.genesisDocument) {
         this.#providedGenesisDocument = options2.genesisDocument;
       }
@@ -119735,6 +119760,13 @@ a=end-of-candidates
                 return !this.#requestCache.has(address);
               });
               if (hasNewServices) {
+                if (++this.#discoveryRounds > this.#maxDiscoveryRounds) {
+                  throw new ResolveError(
+                    `Exceeded maximum beacon-discovery rounds (${this.#maxDiscoveryRounds}); the DID document may chain beacon services without terminating.`,
+                    INVALID_DID_DOCUMENT,
+                    { maxDiscoveryRounds: this.#maxDiscoveryRounds }
+                  );
+                }
                 this.#phase = "BeaconDiscovery" /* BeaconDiscovery */;
                 continue;
               }
@@ -119761,38 +119793,84 @@ a=end-of-candidates
     provide(need, data) {
       switch (need.kind) {
         case "NeedGenesisDocument": {
+          if (!isRecord(data)) {
+            throw new ResolveError(
+              "Provided data for NeedGenesisDocument must be a document object.",
+              INVALID_DID_UPDATE,
+              { kind: need.kind }
+            );
+          }
           this.#providedGenesisDocument = data;
           break;
         }
         case "NeedBeaconSignals": {
-          const signals = data;
-          for (const [service, serviceSignals] of signals) {
+          if (!(data instanceof Map)) {
+            throw new ResolveError(
+              "Provided data for NeedBeaconSignals must be a Map of beacon services to signals.",
+              INVALID_DID_UPDATE,
+              { kind: need.kind }
+            );
+          }
+          for (const [service, serviceSignals] of data) {
             this.#beaconServicesSignals.set(service, serviceSignals);
           }
           break;
         }
         case "NeedCASAnnouncement": {
-          const announcement = data;
-          this.#sidecarData.casMap.set(canonicalHash(announcement, { encoding: "hex" }), announcement);
+          if (!isCASAnnouncement(data)) {
+            throw new ResolveError(
+              "Provided data for NeedCASAnnouncement is not a CAS announcement.",
+              INVALID_DID_UPDATE,
+              { kind: need.kind }
+            );
+          }
+          const announcementHash = canonicalHash(data, { encoding: "hex" });
+          if (announcementHash !== need.announcementHash) {
+            throw new ResolveError(
+              `CAS announcement hash mismatch: expected ${need.announcementHash}, got ${announcementHash}.`,
+              INVALID_DID_UPDATE,
+              { expected: need.announcementHash, actual: announcementHash }
+            );
+          }
+          this.#sidecarData.casMap.set(announcementHash, data);
           break;
         }
         case "NeedSignedUpdate": {
-          const update = data;
-          this.#sidecarData.updateMap.set(canonicalHash(update, { encoding: "hex" }), update);
+          if (!isSignedBTCR2Update(data)) {
+            throw new ResolveError(
+              "Provided data for NeedSignedUpdate is not a signed BTCR2 update.",
+              INVALID_DID_UPDATE,
+              { kind: need.kind }
+            );
+          }
+          const updateHash = canonicalHash(data, { encoding: "hex" });
+          if (updateHash !== need.updateHash) {
+            throw new ResolveError(
+              `Signed update hash mismatch: expected ${need.updateHash}, got ${updateHash}.`,
+              INVALID_DID_UPDATE,
+              { expected: need.updateHash, actual: updateHash }
+            );
+          }
+          this.#sidecarData.updateMap.set(updateHash, data);
           break;
         }
         case "NeedSMTProof": {
-          const smtNeed = need;
-          const proof = data;
-          const proofIdHex = encode(decode(proof.id, "base64urlnopad"), "hex");
-          if (proofIdHex !== smtNeed.smtRootHash) {
+          if (!isSMTProof(data)) {
+            throw new ResolveError(
+              "Provided data for NeedSMTProof is not an SMT proof.",
+              INVALID_DID_UPDATE,
+              { kind: need.kind }
+            );
+          }
+          const proofIdHex = encode(decode(data.id, "base64urlnopad"), "hex");
+          if (proofIdHex !== need.smtRootHash) {
             throw new ResolveError(
-              `SMT proof root hash mismatch: expected ${smtNeed.smtRootHash}, got ${proofIdHex}`,
+              `SMT proof root hash mismatch: expected ${need.smtRootHash}, got ${proofIdHex}`,
               INVALID_DID_UPDATE,
-              { expected: smtNeed.smtRootHash, actual: proofIdHex }
+              { expected: need.smtRootHash, actual: proofIdHex }
             );
           }
-          this.#sidecarData.smtMap.set(smtNeed.smtRootHash, proof);
+          this.#sidecarData.smtMap.set(need.smtRootHash, data);
           break;
         }
       }

package/dist/browser.mjs

@@ -117775,6 +117775,9 @@ var BeaconSignalDiscovery = class {
   }
 };
 
+// src/core/btcr2-update.ts
+init_shim();
+
 // src/core/did-sender-resolver.ts
 init_shim();
 function resolveBtcr2SenderPk(did) {
@@ -118093,9 +118096,9 @@ var BIP340DataIntegrityProof = class {
   }
   /**
    * Add a proof to a document.
-   * @param {UnsignedBTCR2Update} unsignedDocument The document to add the proof to.
-   * @param {DataIntegrityConfig} config The configuration for generating the proof.
-   * @returns {SignedBTCR2Update} A document with a proof added.
+   * @param {UnsecuredDocument} unsignedDocument The document to add the proof to.
+   * @param {DataIntegrityProofOptions} config The proof options for generating the proof.
+   * @returns {SecuredDocument} A document with a proof added.
    */
   addProof(unsignedDocument, config) {
     const proof = this.cryptosuite.createProof(unsignedDocument, config);
@@ -118188,7 +118191,7 @@ var BIP340Cryptosuite = class {
   /**
    * Create a proof for an insecure document.
    * @param {DidUpdatePayload} document The document to create a proof for.
-   * @param {DataIntegrityConfig} config The options to use when creating the proof.
+   * @param {DataIntegrityProofOptions} config The options to use when creating the proof.
    * @returns {DataIntegrityProofObject} The proof for the document.
    */
   createProof(document2, config) {
@@ -118205,7 +118208,7 @@ var BIP340Cryptosuite = class {
   }
   /**
    * Verify a proof for a secure document.
-   * @param {SignedBTCR2Update} secureDocument The secure document to verify.
+   * @param {SecuredDocument} secureDocument The secured document to verify.
    * @returns {VerificationResult} The result of the verification.
    */
   verifyProof(secureDocument) {
@@ -118220,8 +118223,8 @@ var BIP340Cryptosuite = class {
   }
   /**
    * Transform a document into canonical form.
-   * @param {UnsignedBTCR2Update | SignedBTCR2Update} document The document to transform.
-   * @param {DataIntegrityConfig} config The config to use when transforming the document.
+   * @param {UnsecuredDocument} document The document to transform.
+   * @param {DataIntegrityProofOptions} config The config to use when transforming the document.
    * @returns {string} The canonicalized document.
    * @throws {MethodError} if the document cannot be transformed.
    */
@@ -118248,7 +118251,7 @@ var BIP340Cryptosuite = class {
   }
   /**
    * Configure the proof by canonicalzing it.
-   * @param {DataIntegrityConfig} config The config to use when transforming the proof.
+   * @param {DataIntegrityProofOptions} config The config to use when transforming the proof.
    * @returns {string} The canonicalized proof configuration.
    * @throws {CryptosuiteError} if the proof configuration cannot be canonicalized.
    */
@@ -118268,7 +118271,7 @@ var BIP340Cryptosuite = class {
   /**
    * Serialize the proof into a byte array.
    * @param {HashBytes} hash The canonicalized proof configuration.
-   * @param {DataIntegrityConfig} config The config to use when serializing the proof.
+   * @param {DataIntegrityProofOptions} config The config to use when serializing the proof.
    * @returns {SignatureBytes} The serialized proof.
    * @throws {CryptosuiteError} if the multikey does not match the verification method.
    */
@@ -118282,7 +118285,7 @@ var BIP340Cryptosuite = class {
    * Verify the proof by comparing the hash of the proof configuration and document to the proof bytes.
    * @param {HashBytes} hash The canonicalized proof configuration and document hash.
    * @param {SignatureBytes} signature The proof bytes to verify against.
-   * @param {DataIntegrityConfig} config The config to use when verifying the proof.
+   * @param {DataIntegrityProofOptions} config The config to use when verifying the proof.
    * @returns {boolean} True if the proof is verified, false otherwise.
    * @throws {CryptosuiteError} if the multikey does not match the verification method.
    */
@@ -119239,7 +119242,8 @@ var DidBtcr2 = class {
     return new Resolver(didComponents, sidecarData, currentDocument, {
       versionId: resolutionOptions.versionId,
       versionTime: resolutionOptions.versionTime,
-      genesisDocument: resolutionOptions.sidecar?.genesisDocument
+      genesisDocument: resolutionOptions.sidecar?.genesisDocument,
+      maxDiscoveryRounds: resolutionOptions.maxDiscoveryRounds
     });
   }
   /**
@@ -119348,6 +119352,21 @@ var DidBtcr2 = class {
 
 // src/core/resolver.ts
 init_utils2();
+var DEFAULT_MAX_DISCOVERY_ROUNDS = 10;
+function isRecord(value2) {
+  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
+}
+function isCASAnnouncement(value2) {
+  return isRecord(value2) && Object.values(value2).every((v) => typeof v === "string");
+}
+function isSignedBTCR2Update(value2) {
+  if (!isRecord(value2)) return false;
+  return Array.isArray(value2.patch) && typeof value2.sourceHash === "string" && typeof value2.targetHash === "string" && typeof value2.targetVersionId === "number" && isRecord(value2.proof);
+}
+function isSMTProof(value2) {
+  if (!isRecord(value2)) return false;
+  return typeof value2.id === "string" && typeof value2.collapsed === "string" && Array.isArray(value2.hashes);
+}
 var Resolver = class _Resolver {
   // --- Immutable inputs ---
   #didComponents;
@@ -119365,6 +119384,10 @@ var Resolver = class _Resolver {
   #requestCache = /* @__PURE__ */ new Set();
   #unsortedUpdates = [];
   #resolvedResponse = null;
+  /** Upper bound on multi-round beacon-discovery passes; see {@link DEFAULT_MAX_DISCOVERY_ROUNDS}. */
+  #maxDiscoveryRounds;
+  /** Count of beacon-discovery passes driven by updates adding new beacon services. */
+  #discoveryRounds = 0;
   /**
    * @internal Use {@link DidBtcr2.resolve} to create instances.
    */
@@ -119374,6 +119397,7 @@ var Resolver = class _Resolver {
     this.#currentDocument = currentDocument;
     this.#versionId = options2?.versionId;
     this.#versionTime = options2?.versionTime;
+    this.#maxDiscoveryRounds = options2?.maxDiscoveryRounds ?? DEFAULT_MAX_DISCOVERY_ROUNDS;
     if (options2?.genesisDocument) {
       this.#providedGenesisDocument = options2.genesisDocument;
     }
@@ -119688,6 +119712,13 @@ var Resolver = class _Resolver {
               return !this.#requestCache.has(address);
             });
             if (hasNewServices) {
+              if (++this.#discoveryRounds > this.#maxDiscoveryRounds) {
+                throw new ResolveError(
+                  `Exceeded maximum beacon-discovery rounds (${this.#maxDiscoveryRounds}); the DID document may chain beacon services without terminating.`,
+                  INVALID_DID_DOCUMENT,
+                  { maxDiscoveryRounds: this.#maxDiscoveryRounds }
+                );
+              }
               this.#phase = "BeaconDiscovery" /* BeaconDiscovery */;
               continue;
             }
@@ -119714,38 +119745,84 @@ var Resolver = class _Resolver {
   provide(need, data) {
     switch (need.kind) {
       case "NeedGenesisDocument": {
+        if (!isRecord(data)) {
+          throw new ResolveError(
+            "Provided data for NeedGenesisDocument must be a document object.",
+            INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
         this.#providedGenesisDocument = data;
         break;
       }
       case "NeedBeaconSignals": {
-        const signals = data;
-        for (const [service, serviceSignals] of signals) {
+        if (!(data instanceof Map)) {
+          throw new ResolveError(
+            "Provided data for NeedBeaconSignals must be a Map of beacon services to signals.",
+            INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
+        for (const [service, serviceSignals] of data) {
           this.#beaconServicesSignals.set(service, serviceSignals);
         }
         break;
       }
       case "NeedCASAnnouncement": {
-        const announcement = data;
-        this.#sidecarData.casMap.set(canonicalHash(announcement, { encoding: "hex" }), announcement);
+        if (!isCASAnnouncement(data)) {
+          throw new ResolveError(
+            "Provided data for NeedCASAnnouncement is not a CAS announcement.",
+            INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
+        const announcementHash = canonicalHash(data, { encoding: "hex" });
+        if (announcementHash !== need.announcementHash) {
+          throw new ResolveError(
+            `CAS announcement hash mismatch: expected ${need.announcementHash}, got ${announcementHash}.`,
+            INVALID_DID_UPDATE,
+            { expected: need.announcementHash, actual: announcementHash }
+          );
+        }
+        this.#sidecarData.casMap.set(announcementHash, data);
         break;
       }
       case "NeedSignedUpdate": {
-        const update = data;
-        this.#sidecarData.updateMap.set(canonicalHash(update, { encoding: "hex" }), update);
+        if (!isSignedBTCR2Update(data)) {
+          throw new ResolveError(
+            "Provided data for NeedSignedUpdate is not a signed BTCR2 update.",
+            INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
+        const updateHash = canonicalHash(data, { encoding: "hex" });
+        if (updateHash !== need.updateHash) {
+          throw new ResolveError(
+            `Signed update hash mismatch: expected ${need.updateHash}, got ${updateHash}.`,
+            INVALID_DID_UPDATE,
+            { expected: need.updateHash, actual: updateHash }
+          );
+        }
+        this.#sidecarData.updateMap.set(updateHash, data);
         break;
       }
       case "NeedSMTProof": {
-        const smtNeed = need;
-        const proof = data;
-        const proofIdHex = encode(decode(proof.id, "base64urlnopad"), "hex");
-        if (proofIdHex !== smtNeed.smtRootHash) {
+        if (!isSMTProof(data)) {
+          throw new ResolveError(
+            "Provided data for NeedSMTProof is not an SMT proof.",
+            INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
+        const proofIdHex = encode(decode(data.id, "base64urlnopad"), "hex");
+        if (proofIdHex !== need.smtRootHash) {
           throw new ResolveError(
-            `SMT proof root hash mismatch: expected ${smtNeed.smtRootHash}, got ${proofIdHex}`,
+            `SMT proof root hash mismatch: expected ${need.smtRootHash}, got ${proofIdHex}`,
             INVALID_DID_UPDATE,
-            { expected: smtNeed.smtRootHash, actual: proofIdHex }
+            { expected: need.smtRootHash, actual: proofIdHex }
           );
         }
-        this.#sidecarData.smtMap.set(smtNeed.smtRootHash, proof);
+        this.#sidecarData.smtMap.set(need.smtRootHash, data);
         break;
       }
     }
@@ -119822,6 +119899,7 @@ export {
   CASBeaconError,
   CHANGE_OUTPUT_VBYTES,
   DEFAULT_FEE_ESTIMATOR,
+  DEFAULT_MAX_DISCOVERY_ROUNDS,
   DID_REGEX,
   DUST_LIMIT_SATS,
   DidBtcr2,

package/dist/cjs/index.js

@@ -42,6 +42,7 @@ __export(index_exports, {
   CASBeaconError: () => CASBeaconError,
   CHANGE_OUTPUT_VBYTES: () => CHANGE_OUTPUT_VBYTES,
   DEFAULT_FEE_ESTIMATOR: () => DEFAULT_FEE_ESTIMATOR,
+  DEFAULT_MAX_DISCOVERY_ROUNDS: () => DEFAULT_MAX_DISCOVERY_ROUNDS,
   DID_REGEX: () => DID_REGEX,
   DUST_LIMIT_SATS: () => DUST_LIMIT_SATS,
   DidBtcr2: () => DidBtcr2,
@@ -2913,7 +2914,8 @@ var DidBtcr2 = class {
     return new Resolver(didComponents, sidecarData, currentDocument, {
       versionId: resolutionOptions.versionId,
       versionTime: resolutionOptions.versionTime,
-      genesisDocument: resolutionOptions.sidecar?.genesisDocument
+      genesisDocument: resolutionOptions.sidecar?.genesisDocument,
+      maxDiscoveryRounds: resolutionOptions.maxDiscoveryRounds
     });
   }
   /**
@@ -3022,6 +3024,21 @@ var DidBtcr2 = class {
 
 // src/core/resolver.ts
 var import_utils6 = require("@noble/curves/utils.js");
+var DEFAULT_MAX_DISCOVERY_ROUNDS = 10;
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isCASAnnouncement(value) {
+  return isRecord(value) && Object.values(value).every((v) => typeof v === "string");
+}
+function isSignedBTCR2Update(value) {
+  if (!isRecord(value)) return false;
+  return Array.isArray(value.patch) && typeof value.sourceHash === "string" && typeof value.targetHash === "string" && typeof value.targetVersionId === "number" && isRecord(value.proof);
+}
+function isSMTProof(value) {
+  if (!isRecord(value)) return false;
+  return typeof value.id === "string" && typeof value.collapsed === "string" && Array.isArray(value.hashes);
+}
 var Resolver = class _Resolver {
   // --- Immutable inputs ---
   #didComponents;
@@ -3039,6 +3056,10 @@ var Resolver = class _Resolver {
   #requestCache = /* @__PURE__ */ new Set();
   #unsortedUpdates = [];
   #resolvedResponse = null;
+  /** Upper bound on multi-round beacon-discovery passes; see {@link DEFAULT_MAX_DISCOVERY_ROUNDS}. */
+  #maxDiscoveryRounds;
+  /** Count of beacon-discovery passes driven by updates adding new beacon services. */
+  #discoveryRounds = 0;
   /**
    * @internal Use {@link DidBtcr2.resolve} to create instances.
    */
@@ -3048,6 +3069,7 @@ var Resolver = class _Resolver {
     this.#currentDocument = currentDocument;
     this.#versionId = options?.versionId;
     this.#versionTime = options?.versionTime;
+    this.#maxDiscoveryRounds = options?.maxDiscoveryRounds ?? DEFAULT_MAX_DISCOVERY_ROUNDS;
     if (options?.genesisDocument) {
       this.#providedGenesisDocument = options.genesisDocument;
     }
@@ -3362,6 +3384,13 @@ var Resolver = class _Resolver {
               return !this.#requestCache.has(address);
             });
             if (hasNewServices) {
+              if (++this.#discoveryRounds > this.#maxDiscoveryRounds) {
+                throw new import_common12.ResolveError(
+                  `Exceeded maximum beacon-discovery rounds (${this.#maxDiscoveryRounds}); the DID document may chain beacon services without terminating.`,
+                  import_common12.INVALID_DID_DOCUMENT,
+                  { maxDiscoveryRounds: this.#maxDiscoveryRounds }
+                );
+              }
               this.#phase = "BeaconDiscovery" /* BeaconDiscovery */;
               continue;
             }
@@ -3388,38 +3417,84 @@ var Resolver = class _Resolver {
   provide(need, data) {
     switch (need.kind) {
       case "NeedGenesisDocument": {
+        if (!isRecord(data)) {
+          throw new import_common12.ResolveError(
+            "Provided data for NeedGenesisDocument must be a document object.",
+            import_common12.INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
         this.#providedGenesisDocument = data;
         break;
       }
       case "NeedBeaconSignals": {
-        const signals = data;
-        for (const [service, serviceSignals] of signals) {
+        if (!(data instanceof Map)) {
+          throw new import_common12.ResolveError(
+            "Provided data for NeedBeaconSignals must be a Map of beacon services to signals.",
+            import_common12.INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
+        for (const [service, serviceSignals] of data) {
           this.#beaconServicesSignals.set(service, serviceSignals);
         }
         break;
       }
       case "NeedCASAnnouncement": {
-        const announcement = data;
-        this.#sidecarData.casMap.set((0, import_common12.canonicalHash)(announcement, { encoding: "hex" }), announcement);
+        if (!isCASAnnouncement(data)) {
+          throw new import_common12.ResolveError(
+            "Provided data for NeedCASAnnouncement is not a CAS announcement.",
+            import_common12.INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
+        const announcementHash = (0, import_common12.canonicalHash)(data, { encoding: "hex" });
+        if (announcementHash !== need.announcementHash) {
+          throw new import_common12.ResolveError(
+            `CAS announcement hash mismatch: expected ${need.announcementHash}, got ${announcementHash}.`,
+            import_common12.INVALID_DID_UPDATE,
+            { expected: need.announcementHash, actual: announcementHash }
+          );
+        }
+        this.#sidecarData.casMap.set(announcementHash, data);
         break;
       }
       case "NeedSignedUpdate": {
-        const update = data;
-        this.#sidecarData.updateMap.set((0, import_common12.canonicalHash)(update, { encoding: "hex" }), update);
+        if (!isSignedBTCR2Update(data)) {
+          throw new import_common12.ResolveError(
+            "Provided data for NeedSignedUpdate is not a signed BTCR2 update.",
+            import_common12.INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
+        const updateHash = (0, import_common12.canonicalHash)(data, { encoding: "hex" });
+        if (updateHash !== need.updateHash) {
+          throw new import_common12.ResolveError(
+            `Signed update hash mismatch: expected ${need.updateHash}, got ${updateHash}.`,
+            import_common12.INVALID_DID_UPDATE,
+            { expected: need.updateHash, actual: updateHash }
+          );
+        }
+        this.#sidecarData.updateMap.set(updateHash, data);
         break;
       }
       case "NeedSMTProof": {
-        const smtNeed = need;
-        const proof = data;
-        const proofIdHex = (0, import_common12.encode)((0, import_common12.decode)(proof.id, "base64urlnopad"), "hex");
-        if (proofIdHex !== smtNeed.smtRootHash) {
+        if (!isSMTProof(data)) {
+          throw new import_common12.ResolveError(
+            "Provided data for NeedSMTProof is not an SMT proof.",
+            import_common12.INVALID_DID_UPDATE,
+            { kind: need.kind }
+          );
+        }
+        const proofIdHex = (0, import_common12.encode)((0, import_common12.decode)(data.id, "base64urlnopad"), "hex");
+        if (proofIdHex !== need.smtRootHash) {
           throw new import_common12.ResolveError(
-            `SMT proof root hash mismatch: expected ${smtNeed.smtRootHash}, got ${proofIdHex}`,
+            `SMT proof root hash mismatch: expected ${need.smtRootHash}, got ${proofIdHex}`,
             import_common12.INVALID_DID_UPDATE,
-            { expected: smtNeed.smtRootHash, actual: proofIdHex }
+            { expected: need.smtRootHash, actual: proofIdHex }
           );
         }
-        this.#sidecarData.smtMap.set(smtNeed.smtRootHash, proof);
+        this.#sidecarData.smtMap.set(need.smtRootHash, data);
         break;
       }
     }
@@ -3494,6 +3569,7 @@ var DidDocumentBuilder = class {
   CASBeaconError,
   CHANGE_OUTPUT_VBYTES,
   DEFAULT_FEE_ESTIMATOR,
+  DEFAULT_MAX_DISCOVERY_ROUNDS,
   DID_REGEX,
   DUST_LIMIT_SATS,
   DidBtcr2,

package/dist/esm/core/btcr2-update.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=btcr2-update.js.map