@did-btcr2/method 0.34.0 → 0.36.0

package/dist/cjs/index.js

@@ -86,6 +86,8 @@ __export(index_exports, {
   InMemoryRateLimitStore: () => InMemoryRateLimitStore,
   InMemoryTransport: () => InMemoryTransport,
   InboxBuffer: () => InboxBuffer,
+  KNOWN_BEACON_TYPES: () => KNOWN_BEACON_TYPES,
+  KeyPairAggregationSigner: () => KeyPairAggregationSigner,
   NONCE_CONTRIBUTION: () => NONCE_CONTRIBUTION,
   NonceCache: () => NonceCache,
   NostrTransport: () => NostrTransport,
@@ -157,6 +159,7 @@ __export(index_exports, {
   registerBeaconStrategy: () => registerBeaconStrategy,
   reviveFromWire: () => reviveFromWire,
   signEnvelope: () => signEnvelope,
+  validateCohortConditions: () => validateCohortConditions,
   verifyEnvelope: () => verifyEnvelope,
   verifyRequestAuth: () => verifyRequestAuth
 });
@@ -224,6 +227,7 @@ function getBeaconStrategy(type) {
 }
 
 // src/core/aggregation/cohort.ts
+var import_bitcoin = require("@did-btcr2/bitcoin");
 var import_common3 = require("@did-btcr2/common");
 var import_smt2 = require("@did-btcr2/smt");
 var import_secp256k1 = require("@noble/curves/secp256k1.js");
@@ -299,7 +303,7 @@ var AggregationCohort = class {
   validationRejections = /* @__PURE__ */ new Set();
   constructor({ id, minParticipants, serviceDid, network, beaconType }) {
     this.id = id || crypto.randomUUID();
-    this.minParticipants = minParticipants || 2;
+    this.minParticipants = minParticipants ?? 2;
     this.serviceDid = serviceDid || "";
     this.network = network;
     this.beaconType = beaconType || "CASBeacon";
@@ -325,7 +329,7 @@ var AggregationCohort = class {
     }
     const keyAggContext = (0, import_musig2.keyAggregate)(this.#cohortKeys);
     const aggPubkey = (0, import_musig2.keyAggExport)(keyAggContext);
-    const payment = (0, import_btc_signer.p2tr)(aggPubkey);
+    const payment = (0, import_btc_signer.p2tr)(aggPubkey, void 0, (0, import_bitcoin.getNetwork)(this.network));
     this.tapTweak = import_secp256k1.schnorr.utils.taggedHash("TapTweak", aggPubkey);
     if (!payment.address) {
       throw new AggregationCohortError(
@@ -465,6 +469,56 @@ var AggregationCohort = class {
   }
 };
 
+// src/core/aggregation/conditions.ts
+var KNOWN_BEACON_TYPES = ["CASBeacon", "SMTBeacon"];
+function checkPair(problems, label, min, max) {
+  if (min !== void 0 && (!Number.isInteger(min) || min < 0)) {
+    problems.push(`min${label} must be an integer >= 0`);
+  }
+  if (max !== void 0 && (!Number.isInteger(max) || max < 0)) {
+    problems.push(`max${label} must be an integer >= 0`);
+  }
+  if (min !== void 0 && max !== void 0 && Number.isInteger(min) && Number.isInteger(max) && max < min) {
+    problems.push(`max${label} must be >= min${label}`);
+  }
+}
+function checkCost(problems, label, cost) {
+  if (cost === void 0) return;
+  if (typeof cost.amount !== "number" || !Number.isFinite(cost.amount) || cost.amount < 0) {
+    problems.push(`${label}.amount must be a finite number >= 0`);
+  }
+  if (typeof cost.unit !== "string" || cost.unit.length === 0) {
+    problems.push(`${label}.unit must be a non-empty string`);
+  }
+  if (cost.basis !== void 0 && cost.basis !== "per-did" && cost.basis !== "per-participant") {
+    problems.push(`${label}.basis must be 'per-did' or 'per-participant'`);
+  }
+}
+function validateCohortConditions(c) {
+  const problems = [];
+  if (!KNOWN_BEACON_TYPES.includes(c.beaconType)) {
+    problems.push(`beaconType must be one of ${KNOWN_BEACON_TYPES.join(", ")}`);
+  }
+  if (!Number.isInteger(c.minParticipants) || c.minParticipants < 1) {
+    problems.push("minParticipants must be an integer >= 1");
+  }
+  if (c.maxParticipants !== void 0) {
+    if (!Number.isInteger(c.maxParticipants) || c.maxParticipants < 1) {
+      problems.push("maxParticipants must be an integer >= 1");
+    } else if (Number.isInteger(c.minParticipants) && c.maxParticipants < c.minParticipants) {
+      problems.push("maxParticipants must be >= minParticipants");
+    }
+  }
+  checkPair(problems, "DidsPerParticipant", c.minDidsPerParticipant, c.maxDidsPerParticipant);
+  checkPair(problems, "SecondsBetweenAnnouncements", c.minSecondsBetweenAnnouncements, c.maxSecondsBetweenAnnouncements);
+  if (c.pendingUpdateTrigger !== void 0 && (!Number.isInteger(c.pendingUpdateTrigger) || c.pendingUpdateTrigger < 1)) {
+    problems.push("pendingUpdateTrigger must be an integer >= 1");
+  }
+  checkCost(problems, "costOfEnrollment", c.costOfEnrollment);
+  checkCost(problems, "costPerAnnouncement", c.costPerAnnouncement);
+  return problems;
+}
+
 // src/core/aggregation/messages/base.ts
 var AGGREGATION_WIRE_VERSION = 1;
 var BaseMessage = class {
@@ -596,6 +650,7 @@ var SigningSessionPhase = /* @__PURE__ */ ((SigningSessionPhase2) => {
 })(SigningSessionPhase || {});
 
 // src/core/aggregation/signing-session.ts
+var import_keypair = require("@did-btcr2/keypair");
 var import_btc_signer2 = require("@scure/btc-signer");
 var musig2 = __toESM(require("@scure/btc-signer/musig2"), 1);
 var BeaconSigningSession = class {
@@ -619,8 +674,14 @@ var BeaconSigningSession = class {
   signature;
   /** Current signing session phase. */
   phase;
-  /** Participant's secret nonce (held only by the participant during signing). */
-  secretNonce;
+  /**
+   * Participant's MuSig2 secret nonce, held only on the participant side
+   * between {@link generateNonceContribution} and {@link generatePartialSignature}.
+   * Private and cleared on every terminal path (success, failure, or teardown
+   * via {@link clearSecrets}) so a spent or abandoned nonce cannot be reused or
+   * serialized.
+   */
+  #secretNonce;
   constructor({ id, cohort, pendingTx, prevOutScripts, prevOutValues }) {
     this.id = id || crypto.randomUUID();
     this.cohort = cohort;
@@ -772,22 +833,24 @@ var BeaconSigningSession = class {
   generateNonceContribution(participantPublicKey, participantSecretKey) {
     const aggPublicKey = musig2.keyAggExport(musig2.keyAggregate(this.cohort.cohortKeys));
     const nonces = musig2.nonceGen(participantPublicKey, participantSecretKey, aggPublicKey);
-    this.secretNonce = nonces.secret;
+    this.#secretNonce = nonces.secret;
     return nonces.public;
   }
   /**
    * Generates a partial signature using the participant's secret key + secret nonce.
    * Requires the aggregated nonce to have been set first (via the service).
    *
-   * Zeros the stored `secretNonce` after use. JS cannot truly erase memory (GC
-   * and immutable strings), but overwriting the bytes shortens the exposure
-   * window and prevents accidental reuse or serialization of a spent nonce.
+   * Clears the stored secret nonce after use on every path (success or throw)
+   * via {@link clearSecrets}. JS cannot truly erase memory (GC may relocate
+   * buffers), but overwriting the bytes shortens the exposure window and
+   * prevents accidental reuse or serialization of a spent nonce - reuse of a
+   * MuSig2 nonce leaks the secret key.
    */
   generatePartialSignature(participantSecretKey) {
     if (!this.aggregatedNonce) {
       throw new SigningSessionError("Aggregated nonce not available.", "MISSING_AGGREGATED_NONCE");
     }
-    if (!this.secretNonce) {
+    if (!this.#secretNonce) {
       throw new SigningSessionError("Secret nonce not available \u2014 generateNonceContribution() must be called first.", "MISSING_SECRET_NONCE");
     }
     const session = new musig2.Session(
@@ -797,10 +860,23 @@ var BeaconSigningSession = class {
       [this.cohort.tapTweak],
       [true]
     );
-    const partialSig = session.sign(this.secretNonce, participantSecretKey);
-    this.secretNonce.fill(0);
-    this.secretNonce = void 0;
-    return partialSig;
+    try {
+      return session.sign(this.#secretNonce, participantSecretKey);
+    } finally {
+      this.clearSecrets();
+    }
+  }
+  /**
+   * Zeroize any retained secret nonce. Safe to call repeatedly and on any path
+   * (completion, failure, or teardown of an abandoned session). Callers that
+   * drop a session before it reaches a partial signature should invoke this so
+   * the secret nonce does not linger on the live object.
+   */
+  clearSecrets() {
+    if (this.#secretNonce) {
+      (0, import_keypair.wipe)(this.#secretNonce);
+      this.#secretNonce = void 0;
+    }
   }
   isComplete() {
     return this.phase === "Complete" /* Complete */;
@@ -814,13 +890,13 @@ var BeaconSigningSession = class {
 var DEFAULT_MAX_UPDATE_SIZE_BYTES = 256 * 1024;
 var AggregationService = class {
   did;
-  keys;
+  publicKey;
   maxUpdateSizeBytes;
   /** Per-cohort state, keyed by cohortId. */
   #cohortStates = /* @__PURE__ */ new Map();
-  constructor({ did, keys, maxUpdateSizeBytes }) {
+  constructor({ did, publicKey, maxUpdateSizeBytes }) {
     this.did = did;
-    this.keys = keys;
+    this.publicKey = publicKey;
     this.maxUpdateSizeBytes = maxUpdateSizeBytes ?? DEFAULT_MAX_UPDATE_SIZE_BYTES;
   }
   receive(message) {
@@ -875,6 +951,14 @@ var AggregationService = class {
    * Cohort starts in `Created` phase — call `advertise()` to broadcast.
    */
   createCohort(config) {
+    const problems = validateCohortConditions(config);
+    if (problems.length > 0) {
+      throw new AggregationServiceError(
+        `Invalid cohort conditions: ${problems.join("; ")}`,
+        "INVALID_COHORT_CONDITIONS",
+        { problems }
+      );
+    }
     const cohort = new AggregationCohort({
       serviceDid: this.did,
       minParticipants: config.minParticipants,
@@ -907,13 +991,13 @@ var AggregationService = class {
         { cohortId, phase: state.phase }
       );
     }
+    const { network, ...conditions } = state.config;
     const message = createCohortAdvertMessage({
       from: this.did,
       cohortId,
-      cohortSize: state.config.minParticipants,
-      beaconType: state.config.beaconType,
-      network: state.config.network,
-      communicationPk: this.keys.publicKey.compressed
+      network,
+      communicationPk: this.publicKey.compressed,
+      ...conditions
     });
     state.phase = "Advertised" /* Advertised */;
     return [message];
@@ -972,6 +1056,14 @@ var AggregationService = class {
         { cohortId, participantDid }
       );
     }
+    const maxParticipants = state.config.maxParticipants;
+    if (maxParticipants !== void 0 && state.acceptedParticipants.size >= maxParticipants) {
+      throw new AggregationServiceError(
+        `Cohort ${cohortId} is full: ${maxParticipants} participants already accepted.`,
+        "COHORT_FULL",
+        { cohortId, maxParticipants }
+      );
+    }
     state.acceptedParticipants.add(participantDid);
     state.cohort.participants.push(participantDid);
     state.cohort.participantKeys.set(participantDid, optIn.participantPk);
@@ -1005,6 +1097,14 @@ var AggregationService = class {
         { cohortId }
       );
     }
+    const maxParticipants = state.config.maxParticipants;
+    if (maxParticipants !== void 0 && state.acceptedParticipants.size > maxParticipants) {
+      throw new AggregationServiceError(
+        `Cohort ${cohortId} has ${state.acceptedParticipants.size} accepted participants, exceeds max ${maxParticipants}.`,
+        "TOO_MANY_PARTICIPANTS",
+        { cohortId, maxParticipants }
+      );
+    }
     const beaconAddress = state.cohort.computeBeaconAddress();
     state.phase = "CohortSet" /* CohortSet */;
     const messages = [];
@@ -1323,14 +1423,71 @@ var AggregationService = class {
 var import_common5 = require("@did-btcr2/common");
 var import_utils3 = require("@noble/hashes/utils");
 var import_btc_signer3 = require("@scure/btc-signer");
+
+// src/core/aggregation/messages/bodies.ts
+var hasStr = (b, k) => !!b && typeof b[k] === "string";
+var hasIntMin = (b, k, min) => {
+  const v = b ? b[k] : void 0;
+  return typeof v === "number" && Number.isInteger(v) && v >= min;
+};
+var optIntMin = (b, k, min) => {
+  const v = b ? b[k] : void 0;
+  return v === void 0 || typeof v === "number" && Number.isInteger(v) && v >= min;
+};
+var hasBool = (b, k) => !!b && typeof b[k] === "boolean";
+var hasBytes = (b, k) => !!b && b[k] instanceof Uint8Array;
+var hasBytesArray = (b, k) => {
+  const v = b ? b[k] : void 0;
+  return Array.isArray(v) && v.every((x) => x instanceof Uint8Array);
+};
+function isCohortAdvertMessage(m) {
+  return m.type === COHORT_ADVERT && hasStr(m.body, "cohortId") && hasIntMin(m.body, "minParticipants", 1) && optIntMin(m.body, "maxParticipants", 1) && hasStr(m.body, "beaconType") && hasStr(m.body, "network") && hasBytes(m.body, "communicationPk");
+}
+function isCohortOptInMessage(m) {
+  return m.type === COHORT_OPT_IN && hasStr(m.body, "cohortId") && hasBytes(m.body, "participantPk") && hasBytes(m.body, "communicationPk");
+}
+function isCohortOptInAcceptMessage(m) {
+  return m.type === COHORT_OPT_IN_ACCEPT && hasStr(m.body, "cohortId");
+}
+function isCohortReadyMessage(m) {
+  return m.type === COHORT_READY && hasStr(m.body, "cohortId") && hasStr(m.body, "beaconAddress") && hasBytesArray(m.body, "cohortKeys");
+}
+function isSubmitUpdateMessage(m) {
+  return m.type === SUBMIT_UPDATE && hasStr(m.body, "cohortId") && !!m.body && typeof m.body.signedUpdate === "object";
+}
+function isDistributeAggregatedDataMessage(m) {
+  return m.type === DISTRIBUTE_AGGREGATED_DATA && hasStr(m.body, "cohortId") && hasStr(m.body, "beaconType") && hasStr(m.body, "signalBytesHex");
+}
+function isValidationAckMessage(m) {
+  return m.type === VALIDATION_ACK && hasStr(m.body, "cohortId") && hasBool(m.body, "approved");
+}
+function isAuthorizationRequestMessage(m) {
+  return m.type === AUTHORIZATION_REQUEST && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasStr(m.body, "pendingTx") && hasStr(m.body, "prevOutScriptHex") && hasStr(m.body, "prevOutValue");
+}
+function isNonceContributionMessage(m) {
+  return m.type === NONCE_CONTRIBUTION && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "nonceContribution");
+}
+function isAggregatedNonceMessage(m) {
+  return m.type === AGGREGATED_NONCE && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "aggregatedNonce");
+}
+function isSignatureAuthorizationMessage(m) {
+  return m.type === SIGNATURE_AUTHORIZATION && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "partialSignature");
+}
+
+// src/core/aggregation/participant.ts
 var AggregationParticipant = class {
   did;
-  keys;
+  /** MuSig2 signing capability. The raw secret never lives as a field here. */
+  #signer;
   /** Per-cohort state, keyed by cohortId. */
   #cohortStates = /* @__PURE__ */ new Map();
-  constructor({ did, keys }) {
+  constructor({ did, signer }) {
     this.did = did;
-    this.keys = keys;
+    this.#signer = signer;
+  }
+  /** The participant's compressed (33-byte) MuSig2 public key. Not secret. */
+  get publicKey() {
+    return this.#signer.publicKey;
   }
   /**
    * Process an incoming message. Updates internal state but never produces
@@ -1375,16 +1532,15 @@ var AggregationParticipant = class {
     return map;
   }
   #handleCohortAdvert(message) {
-    const cohortId = message.body?.cohortId;
-    if (!cohortId) return;
+    if (!isCohortAdvertMessage(message)) return;
+    const { cohortId, network, communicationPk, ...conditions } = message.body;
     if (this.#cohortStates.has(cohortId)) return;
     const advert = {
       cohortId,
       serviceDid: message.from,
-      cohortSize: message.body?.cohortSize ?? 0,
-      network: message.body?.network ?? "",
-      beaconType: message.body?.beaconType ?? "CASBeacon",
-      serviceCommunicationPk: message.body?.communicationPk ?? new Uint8Array()
+      network,
+      serviceCommunicationPk: communicationPk,
+      ...conditions
     };
     this.#cohortStates.set(cohortId, {
       phase: "Discovered" /* Discovered */,
@@ -1409,7 +1565,7 @@ var AggregationParticipant = class {
     const cohort = new AggregationCohort({
       id: cohortId,
       serviceDid: state.serviceDid,
-      minParticipants: state.advert.cohortSize,
+      minParticipants: state.advert.minParticipants,
       network: state.advert.network,
       beaconType: state.advert.beaconType
     });
@@ -1419,8 +1575,8 @@ var AggregationParticipant = class {
       from: this.did,
       to: state.serviceDid,
       cohortId,
-      participantPk: this.keys.publicKey.compressed,
-      communicationPk: this.keys.publicKey.compressed
+      participantPk: this.publicKey,
+      communicationPk: this.publicKey
     });
     return [optInMessage];
   }
@@ -1451,7 +1607,7 @@ var AggregationParticipant = class {
     const beaconAddress = message.body?.beaconAddress;
     const cohortKeys = message.body?.cohortKeys;
     if (!beaconAddress || !cohortKeys) return;
-    const participantPkHex = (0, import_utils3.bytesToHex)(this.keys.publicKey.compressed);
+    const participantPkHex = (0, import_utils3.bytesToHex)(this.publicKey);
     const cohortKeysHex = cohortKeys.map((k) => (0, import_utils3.bytesToHex)(new Uint8Array(k)));
     state.cohort.validateMembership(participantPkHex, cohortKeysHex, beaconAddress);
     state.phase = "CohortReady" /* CohortReady */;
@@ -1618,9 +1774,8 @@ var AggregationParticipant = class {
       prevOutValues
     });
     state.signingSession = session;
-    const nonceContribution = session.generateNonceContribution(
-      this.keys.publicKey.compressed,
-      this.keys.secretKey.bytes
+    const nonceContribution = this.#signer.withSecret(
+      (secretKey) => session.generateNonceContribution(this.publicKey, secretKey)
     );
     state.phase = "NonceSent" /* NonceSent */;
     return [createNonceContributionMessage({
@@ -1663,7 +1818,10 @@ var AggregationParticipant = class {
         { cohortId }
       );
     }
-    const partialSig = state.signingSession.generatePartialSignature(this.keys.secretKey.bytes);
+    const signingSession = state.signingSession;
+    const partialSig = this.#signer.withSecret(
+      (secretKey) => signingSession.generatePartialSignature(secretKey)
+    );
     state.phase = "Complete" /* Complete */;
     return [createSignatureAuthorizationMessage({
       from: this.did,
@@ -1676,6 +1834,37 @@ var AggregationParticipant = class {
   getCohortPhase(cohortId) {
     return this.#cohortStates.get(cohortId)?.phase;
   }
+  /**
+   * Zeroize any retained MuSig2 secret nonces across all cohorts. The raw
+   * signing key is never held here (it lives behind the {@link AggregationSigner}
+   * and is wiped per-operation), but an abandoned signing session can still hold
+   * a secret nonce; call this on teardown to clear it deterministically.
+   */
+  clearSecrets() {
+    for (const state of this.#cohortStates.values()) {
+      state.signingSession?.clearSecrets();
+    }
+  }
+};
+
+// src/core/aggregation/signer.ts
+var import_keypair2 = require("@did-btcr2/keypair");
+var KeyPairAggregationSigner = class {
+  publicKey;
+  #keys;
+  /** @param {SchnorrKeyPair} keys The keypair whose secret backs this signer. */
+  constructor(keys) {
+    this.#keys = keys;
+    this.publicKey = keys.publicKey.compressed;
+  }
+  withSecret(fn) {
+    const secretKey = this.#keys.secretKey.bytes;
+    try {
+      return fn(secretKey);
+    } finally {
+      (0, import_keypair2.wipe)(secretKey);
+    }
+  }
 };
 
 // src/core/aggregation/logger.ts
@@ -1696,49 +1885,6 @@ var SILENT_LOGGER = {
   }
 };
 
-// src/core/aggregation/messages/bodies.ts
-var hasStr = (b, k) => !!b && typeof b[k] === "string";
-var hasNum = (b, k) => !!b && typeof b[k] === "number";
-var hasBool = (b, k) => !!b && typeof b[k] === "boolean";
-var hasBytes = (b, k) => !!b && b[k] instanceof Uint8Array;
-var hasBytesArray = (b, k) => {
-  const v = b ? b[k] : void 0;
-  return Array.isArray(v) && v.every((x) => x instanceof Uint8Array);
-};
-function isCohortAdvertMessage(m) {
-  return m.type === COHORT_ADVERT && hasStr(m.body, "cohortId") && hasNum(m.body, "cohortSize") && hasStr(m.body, "beaconType") && hasStr(m.body, "network") && hasBytes(m.body, "communicationPk");
-}
-function isCohortOptInMessage(m) {
-  return m.type === COHORT_OPT_IN && hasStr(m.body, "cohortId") && hasBytes(m.body, "participantPk") && hasBytes(m.body, "communicationPk");
-}
-function isCohortOptInAcceptMessage(m) {
-  return m.type === COHORT_OPT_IN_ACCEPT && hasStr(m.body, "cohortId");
-}
-function isCohortReadyMessage(m) {
-  return m.type === COHORT_READY && hasStr(m.body, "cohortId") && hasStr(m.body, "beaconAddress") && hasBytesArray(m.body, "cohortKeys");
-}
-function isSubmitUpdateMessage(m) {
-  return m.type === SUBMIT_UPDATE && hasStr(m.body, "cohortId") && !!m.body && typeof m.body.signedUpdate === "object";
-}
-function isDistributeAggregatedDataMessage(m) {
-  return m.type === DISTRIBUTE_AGGREGATED_DATA && hasStr(m.body, "cohortId") && hasStr(m.body, "beaconType") && hasStr(m.body, "signalBytesHex");
-}
-function isValidationAckMessage(m) {
-  return m.type === VALIDATION_ACK && hasStr(m.body, "cohortId") && hasBool(m.body, "approved");
-}
-function isAuthorizationRequestMessage(m) {
-  return m.type === AUTHORIZATION_REQUEST && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasStr(m.body, "pendingTx") && hasStr(m.body, "prevOutScriptHex") && hasStr(m.body, "prevOutValue");
-}
-function isNonceContributionMessage(m) {
-  return m.type === NONCE_CONTRIBUTION && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "nonceContribution");
-}
-function isAggregatedNonceMessage(m) {
-  return m.type === AGGREGATED_NONCE && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "aggregatedNonce");
-}
-function isSignatureAuthorizationMessage(m) {
-  return m.type === SIGNATURE_AUTHORIZATION && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "partialSignature");
-}
-
 // src/core/aggregation/messages/guards.ts
 var KEYGEN_VALUES = /* @__PURE__ */ new Set([
   COHORT_ADVERT,
@@ -1787,11 +1933,11 @@ var TransportAdapterError = class extends import_common6.MethodError {
 var import_common10 = require("@did-btcr2/common");
 
 // src/core/aggregation/transport/http/client.ts
-var import_keypair2 = require("@did-btcr2/keypair");
+var import_keypair4 = require("@did-btcr2/keypair");
 
 // src/core/identifier.ts
 var import_common7 = require("@did-btcr2/common");
-var import_keypair = require("@did-btcr2/keypair");
+var import_keypair3 = require("@did-btcr2/keypair");
 var import_base4 = require("@scure/base");
 var Identifier = class _Identifier {
   /**
@@ -1824,7 +1970,7 @@ var Identifier = class _Identifier {
     }
     if (idType === "KEY") {
       try {
-        new import_keypair.CompressedSecp256k1PublicKey(genesisBytes);
+        new import_keypair3.CompressedSecp256k1PublicKey(genesisBytes);
       } catch {
         throw new import_common7.IdentifierError(
           'Expected "genesisBytes" to be a valid compressed secp256k1 public key',
@@ -1926,7 +2072,7 @@ var Identifier = class _Identifier {
     const genesisBytes = dataBytes.slice(byteIndex + 1);
     if (idType === "KEY") {
       try {
-        new import_keypair.CompressedSecp256k1PublicKey(genesisBytes);
+        new import_keypair3.CompressedSecp256k1PublicKey(genesisBytes);
       } catch {
         throw new import_common7.IdentifierError(`Invalid genesisBytes: ${genesisBytes}`, import_common7.INVALID_DID, { identifier });
       }
@@ -1938,7 +2084,7 @@ var Identifier = class _Identifier {
    * @returns {string} The new did:btcr2 identifier.
    */
   static generate() {
-    const keyPair = import_keypair.SchnorrKeyPair.generate();
+    const keyPair = import_keypair3.SchnorrKeyPair.generate();
     const did = this.encode(
       keyPair.publicKey.compressed,
       {
@@ -1964,7 +2110,7 @@ var Identifier = class _Identifier {
         { did, idType }
       );
     }
-    return new import_keypair.CompressedSecp256k1PublicKey(genesisBytes);
+    return new import_keypair3.CompressedSecp256k1PublicKey(genesisBytes);
   }
   /**
    * Validates a did:btcr2 identifier.
@@ -2371,7 +2517,7 @@ var HttpClientTransport = class {
   }
   registerPeer(did, communicationPk) {
     try {
-      new import_keypair2.CompressedSecp256k1PublicKey(communicationPk);
+      new import_keypair4.CompressedSecp256k1PublicKey(communicationPk);
     } catch {
       throw new HttpTransportError(
         `Invalid communication public key for peer ${did}: expected a 33-byte compressed secp256k1 key.`,
@@ -2567,14 +2713,14 @@ var HttpClientTransport = class {
     const peerBytes = this.#peers.get(did);
     if (peerBytes) {
       try {
-        return new import_keypair2.CompressedSecp256k1PublicKey(peerBytes);
+        return new import_keypair4.CompressedSecp256k1PublicKey(peerBytes);
       } catch {
       }
     }
     try {
       const components = Identifier.decode(did);
       if (components.idType === "KEY") {
-        return new import_keypair2.CompressedSecp256k1PublicKey(components.genesisBytes);
+        return new import_keypair4.CompressedSecp256k1PublicKey(components.genesisBytes);
       }
     } catch {
     }
@@ -2619,7 +2765,7 @@ function flattenMessage(msg) {
 }
 
 // src/core/aggregation/transport/http/server.ts
-var import_keypair3 = require("@did-btcr2/keypair");
+var import_keypair5 = require("@did-btcr2/keypair");
 
 // src/core/aggregation/transport/http/inbox-buffer.ts
 var InboxBuffer = class {
@@ -2784,7 +2930,7 @@ var HttpServerTransport = class {
   }
   registerPeer(did, communicationPk) {
     try {
-      new import_keypair3.CompressedSecp256k1PublicKey(communicationPk);
+      new import_keypair5.CompressedSecp256k1PublicKey(communicationPk);
     } catch {
       throw new HttpTransportError(
         `Invalid peer public key for ${did}`,
@@ -3062,14 +3208,14 @@ var HttpServerTransport = class {
     const peerBytes = this.#peers.get(did);
     if (peerBytes) {
       try {
-        return new import_keypair3.CompressedSecp256k1PublicKey(peerBytes);
+        return new import_keypair5.CompressedSecp256k1PublicKey(peerBytes);
       } catch {
       }
     }
     try {
       const components = Identifier.decode(did);
       if (components.idType === "KEY") {
-        return new import_keypair3.CompressedSecp256k1PublicKey(components.genesisBytes);
+        return new import_keypair5.CompressedSecp256k1PublicKey(components.genesisBytes);
       }
     } catch {
     }
@@ -3168,7 +3314,7 @@ function flattenMessage2(msg) {
 }
 
 // src/core/aggregation/transport/nostr.ts
-var import_keypair4 = require("@did-btcr2/keypair");
+var import_keypair6 = require("@did-btcr2/keypair");
 var import_utils6 = require("@noble/hashes/utils");
 var import_nostr_tools = require("nostr-tools");
 var import_pool = require("nostr-tools/pool");
@@ -3266,7 +3412,7 @@ var NostrTransport = class _NostrTransport {
    */
   registerPeer(did, communicationPk) {
     try {
-      new import_keypair4.CompressedSecp256k1PublicKey(communicationPk);
+      new import_keypair6.CompressedSecp256k1PublicKey(communicationPk);
     } catch {
       throw new TransportAdapterError(
         `Invalid communication public key for peer ${did}: expected a 33-byte compressed secp256k1 key.`,
@@ -3373,7 +3519,7 @@ var NostrTransport = class _NostrTransport {
     if (to) {
       const recipientPkBytes = this.#peerRegistry.get(to);
       if (recipientPkBytes) {
-        const recipientPk = new import_keypair4.CompressedSecp256k1PublicKey(recipientPkBytes);
+        const recipientPk = new import_keypair6.CompressedSecp256k1PublicKey(recipientPkBytes);
         tags.push(["p", (0, import_utils6.bytesToHex)(recipientPk.x)]);
       }
     }
@@ -3404,7 +3550,7 @@ var NostrTransport = class _NostrTransport {
           { adapter: this.name, did: to }
         );
       }
-      const recipientPk = new import_keypair4.CompressedSecp256k1PublicKey(recipientPkBytes);
+      const recipientPk = new import_keypair6.CompressedSecp256k1PublicKey(recipientPkBytes);
       const conversationKey = import_nostr_tools.nip44.v2.utils.getConversationKey(
         senderKeys.secretKey.bytes,
         (0, import_utils6.bytesToHex)(recipientPk.x)
@@ -3695,10 +3841,10 @@ var InMemoryTransport = class {
   start() {
   }
   registerActor(did, keys) {
-    this.#actors.set(did, { keys, handlers: /* @__PURE__ */ new Map() });
+    this.#actors.set(did, { publicKey: keys.publicKey.compressed, handlers: /* @__PURE__ */ new Map() });
   }
   getActorPk(did) {
-    return this.#actors.get(did)?.keys.publicKey.compressed;
+    return this.#actors.get(did)?.publicKey;
   }
   /** True if `did` is registered on this transport. Used by the bus for routing. */
   hasActor(did) {
@@ -3909,8 +4055,11 @@ var AggregationServiceRunner = class _AggregationServiceRunner extends TypedEven
     this.#phaseTimeoutMs = options.phaseTimeoutMs;
     this.#advertRepeatIntervalMs = options.advertRepeatIntervalMs ?? DEFAULT_ADVERT_REPEAT_INTERVAL_MS;
     this.session = new AggregationService({
+      // The coordinator never signs, so the state machine receives only the
+      // public half of the operator's keypair (see ADR 038). The full keypair
+      // remains the operator's transport/communication identity.
       did: options.did,
-      keys: options.keys,
+      publicKey: options.keys.publicKey,
       maxUpdateSizeBytes: options.maxUpdateSizeBytes
     });
   }
@@ -4081,6 +4230,11 @@ var AggregationServiceRunner = class _AggregationServiceRunner extends TypedEven
       }
       const decision = await this.#onOptInReceived(optIn);
       if (!decision.accepted) return;
+      const maxParticipants = this.#config.maxParticipants;
+      const cohortNow = this.session.getCohort(this.#cohortId);
+      if (maxParticipants !== void 0 && cohortNow && cohortNow.participants.length >= maxParticipants) {
+        return;
+      }
       await this.#sendAll(this.session.acceptParticipant(this.#cohortId, msg.from));
       this.emit("participant-accepted", { participantDid: msg.from });
       const cohort = this.session.getCohort(this.#cohortId);
@@ -4262,7 +4416,10 @@ var AggregationParticipantRunner = class _AggregationParticipantRunner extends T
     this.#onProvideUpdate = options.onProvideUpdate;
     this.#onValidateData = options.onValidateData ?? (async (info) => ({ approved: info.matches }));
     this.#onApproveSigning = options.onApproveSigning ?? (async () => ({ approved: true }));
-    this.session = new AggregationParticipant({ did: options.did, keys: options.keys });
+    this.session = new AggregationParticipant({
+      did: options.did,
+      signer: new KeyPairAggregationSigner(options.keys)
+    });
   }
   /**
    * Start listening for cohorts. The runner stays active until {@link stop}
@@ -4275,6 +4432,7 @@ var AggregationParticipantRunner = class _AggregationParticipantRunner extends T
   stop() {
     this.#stopped = true;
     this.#unregisterHandlers();
+    this.session.clearSecrets();
   }
   /** Message types this runner listens for on the transport. */
   static #HANDLED_MESSAGE_TYPES = [
@@ -5110,11 +5268,11 @@ var BeaconFactory = class {
 };
 
 // src/core/beacon/signal-discovery.ts
-var import_bitcoin2 = require("@did-btcr2/bitcoin");
+var import_bitcoin3 = require("@did-btcr2/bitcoin");
 var import_common18 = require("@did-btcr2/common");
 
 // src/core/beacon/utils.ts
-var import_bitcoin = require("@did-btcr2/bitcoin");
+var import_bitcoin2 = require("@did-btcr2/bitcoin");
 var import_common17 = require("@did-btcr2/common");
 var import_btc_signer5 = require("@scure/btc-signer");
 
@@ -6221,7 +6379,7 @@ var BeaconUtils = class {
   static createBeaconService(did, addressType, beaconType) {
     try {
       const components = Identifier.decode(did);
-      const network = (0, import_bitcoin.getNetwork)(components.network);
+      const network = (0, import_bitcoin2.getNetwork)(components.network);
       const pubkey = components.genesisBytes;
       const id = `${did}#initial${addressType.toUpperCase()}`;
       const address = addressType === "p2tr" ? (0, import_btc_signer5.p2tr)(pubkey.slice(1, 33), void 0, network).address : addressType === "p2wpkh" ? (0, import_btc_signer5.p2wpkh)(pubkey, network).address : (0, import_btc_signer5.p2pkh)(pubkey, network).address;
@@ -6372,14 +6530,14 @@ var BeaconSignalDiscovery = class {
     console.info(`Searching for beacon signals, please wait ...`);
     while (block.height <= targetHeight) {
       for (const tx of block.tx) {
-        if (tx.txid === import_bitcoin2.GENESIS_TX_ID) {
+        if (tx.txid === import_bitcoin3.GENESIS_TX_ID) {
           continue;
         }
         for (const vin of tx.vin) {
           if (vin.coinbase) {
             continue;
           }
-          if (vin.txinwitness && vin.txinwitness.length === 1 && vin.txinwitness[0] === import_bitcoin2.TXIN_WITNESS_COINBASE) {
+          if (vin.txinwitness && vin.txinwitness.length === 1 && vin.txinwitness[0] === import_bitcoin3.TXIN_WITNESS_COINBASE) {
             continue;
           }
           if (!vin.txid) {
@@ -6433,10 +6591,10 @@ var BeaconSignalDiscovery = class {
 };
 
 // src/core/resolver.ts
-var import_bitcoin4 = require("@did-btcr2/bitcoin");
+var import_bitcoin5 = require("@did-btcr2/bitcoin");
 var import_common22 = require("@did-btcr2/common");
 var import_cryptosuite3 = require("@did-btcr2/cryptosuite");
-var import_keypair6 = require("@did-btcr2/keypair");
+var import_keypair8 = require("@did-btcr2/keypair");
 
 // src/did-btcr2.ts
 var import_common21 = require("@did-btcr2/common");
@@ -6447,9 +6605,9 @@ var import_common20 = require("@did-btcr2/common");
 var import_cryptosuite2 = require("@did-btcr2/cryptosuite");
 
 // src/utils/did-document.ts
-var import_bitcoin3 = require("@did-btcr2/bitcoin");
+var import_bitcoin4 = require("@did-btcr2/bitcoin");
 var import_common19 = require("@did-btcr2/common");
-var import_keypair5 = require("@did-btcr2/keypair");
+var import_keypair7 = require("@did-btcr2/keypair");
 var import_utils11 = require("@web5/dids/utils");
 var import_btc_signer6 = require("@scure/btc-signer");
 var BTCR2_DID_DOCUMENT_CONTEXT = [
@@ -6771,9 +6929,9 @@ var GenesisDocument = class _GenesisDocument extends DidDocument {
    * @returns {GenesisDocument} A new GenesisDocument with the placeholder ID.
    */
   static fromPublicKey(publicKey, network) {
-    const pk = new import_keypair5.CompressedSecp256k1PublicKey(publicKey);
+    const pk = new import_keypair7.CompressedSecp256k1PublicKey(publicKey);
     const id = ID_PLACEHOLDER_VALUE;
-    const address = (0, import_btc_signer6.p2pkh)(pk.compressed, (0, import_bitcoin3.getNetwork)(network)).address;
+    const address = (0, import_btc_signer6.p2pkh)(pk.compressed, (0, import_bitcoin4.getNetwork)(network)).address;
     const services = [{
       id: `${id}#service-0`,
       serviceEndpoint: `bitcoin:${address}`,
@@ -7280,11 +7438,11 @@ var Resolver = class _Resolver {
   static deterministic(didComponents) {
     const genesisBytes = didComponents.genesisBytes;
     const did = Identifier.encode(genesisBytes, didComponents);
-    const { multibase } = new import_keypair6.CompressedSecp256k1PublicKey(genesisBytes);
+    const { multibase } = new import_keypair8.CompressedSecp256k1PublicKey(genesisBytes);
     const service = BeaconUtils.generateBeaconServices({
       id: did,
       publicKey: genesisBytes,
-      network: (0, import_bitcoin4.getNetwork)(didComponents.network),
+      network: (0, import_bitcoin5.getNetwork)(didComponents.network),
       beaconType: "SingletonBeacon"
     });
     return new DidDocument({
@@ -7757,6 +7915,8 @@ var DidDocumentBuilder = class {
   InMemoryRateLimitStore,
   InMemoryTransport,
   InboxBuffer,
+  KNOWN_BEACON_TYPES,
+  KeyPairAggregationSigner,
   NONCE_CONTRIBUTION,
   NonceCache,
   NostrTransport,
@@ -7828,6 +7988,7 @@ var DidDocumentBuilder = class {
   registerBeaconStrategy,
   reviveFromWire,
   signEnvelope,
+  validateCohortConditions,
   verifyEnvelope,
   verifyRequestAuth
 });