@did-btcr2/method 0.35.0 → 0.36.0

package/dist/browser.js

@@ -93203,6 +93203,7 @@ a=end-of-candidates
     InMemoryRateLimitStore: () => InMemoryRateLimitStore,
     InMemoryTransport: () => InMemoryTransport,
     InboxBuffer: () => InboxBuffer,
+    KNOWN_BEACON_TYPES: () => KNOWN_BEACON_TYPES,
     KeyPairAggregationSigner: () => KeyPairAggregationSigner,
     NONCE_CONTRIBUTION: () => NONCE_CONTRIBUTION,
     NonceCache: () => NonceCache,
@@ -93275,6 +93276,7 @@ a=end-of-candidates
     registerBeaconStrategy: () => registerBeaconStrategy,
     reviveFromWire: () => reviveFromWire,
     signEnvelope: () => signEnvelope,
+    validateCohortConditions: () => validateCohortConditions,
     verifyEnvelope: () => verifyEnvelope,
     verifyRequestAuth: () => verifyRequestAuth
   });
@@ -103381,7 +103383,7 @@ a=end-of-candidates
     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";
@@ -103547,6 +103549,57 @@ a=end-of-candidates
     }
   };
 
+  // src/core/aggregation/conditions.ts
+  init_shim();
+  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(c2) {
+    const problems = [];
+    if (!KNOWN_BEACON_TYPES.includes(c2.beaconType)) {
+      problems.push(`beaconType must be one of ${KNOWN_BEACON_TYPES.join(", ")}`);
+    }
+    if (!Number.isInteger(c2.minParticipants) || c2.minParticipants < 1) {
+      problems.push("minParticipants must be an integer >= 1");
+    }
+    if (c2.maxParticipants !== void 0) {
+      if (!Number.isInteger(c2.maxParticipants) || c2.maxParticipants < 1) {
+        problems.push("maxParticipants must be an integer >= 1");
+      } else if (Number.isInteger(c2.minParticipants) && c2.maxParticipants < c2.minParticipants) {
+        problems.push("maxParticipants must be >= minParticipants");
+      }
+    }
+    checkPair(problems, "DidsPerParticipant", c2.minDidsPerParticipant, c2.maxDidsPerParticipant);
+    checkPair(problems, "SecondsBetweenAnnouncements", c2.minSecondsBetweenAnnouncements, c2.maxSecondsBetweenAnnouncements);
+    if (c2.pendingUpdateTrigger !== void 0 && (!Number.isInteger(c2.pendingUpdateTrigger) || c2.pendingUpdateTrigger < 1)) {
+      problems.push("pendingUpdateTrigger must be an integer >= 1");
+    }
+    checkCost(problems, "costOfEnrollment", c2.costOfEnrollment);
+    checkCost(problems, "costPerAnnouncement", c2.costPerAnnouncement);
+    return problems;
+  }
+
   // src/core/aggregation/messages/base.ts
   init_shim();
   var AGGREGATION_WIRE_VERSION = 1;
@@ -103981,6 +104034,14 @@ a=end-of-candidates
      * 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,
@@ -104013,13 +104074,13 @@ a=end-of-candidates
           { cohortId, phase: state.phase }
         );
       }
+      const { network, ...conditions } = state.config;
       const message2 = createCohortAdvertMessage({
         from: this.did,
         cohortId,
-        cohortSize: state.config.minParticipants,
-        beaconType: state.config.beaconType,
-        network: state.config.network,
-        communicationPk: this.publicKey.compressed
+        network,
+        communicationPk: this.publicKey.compressed,
+        ...conditions
       });
       state.phase = "Advertised" /* Advertised */;
       return [message2];
@@ -104078,6 +104139,14 @@ a=end-of-candidates
           { 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);
@@ -104111,6 +104180,14 @@ a=end-of-candidates
           { 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 messages2 = [];
@@ -104428,6 +104505,59 @@ a=end-of-candidates
   // src/core/aggregation/participant.ts
   init_shim();
   init_utils();
+
+  // src/core/aggregation/messages/bodies.ts
+  init_shim();
+  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(m2) {
+    return m2.type === COHORT_ADVERT && hasStr(m2.body, "cohortId") && hasIntMin(m2.body, "minParticipants", 1) && optIntMin(m2.body, "maxParticipants", 1) && hasStr(m2.body, "beaconType") && hasStr(m2.body, "network") && hasBytes(m2.body, "communicationPk");
+  }
+  function isCohortOptInMessage(m2) {
+    return m2.type === COHORT_OPT_IN && hasStr(m2.body, "cohortId") && hasBytes(m2.body, "participantPk") && hasBytes(m2.body, "communicationPk");
+  }
+  function isCohortOptInAcceptMessage(m2) {
+    return m2.type === COHORT_OPT_IN_ACCEPT && hasStr(m2.body, "cohortId");
+  }
+  function isCohortReadyMessage(m2) {
+    return m2.type === COHORT_READY && hasStr(m2.body, "cohortId") && hasStr(m2.body, "beaconAddress") && hasBytesArray(m2.body, "cohortKeys");
+  }
+  function isSubmitUpdateMessage(m2) {
+    return m2.type === SUBMIT_UPDATE && hasStr(m2.body, "cohortId") && !!m2.body && typeof m2.body.signedUpdate === "object";
+  }
+  function isDistributeAggregatedDataMessage(m2) {
+    return m2.type === DISTRIBUTE_AGGREGATED_DATA && hasStr(m2.body, "cohortId") && hasStr(m2.body, "beaconType") && hasStr(m2.body, "signalBytesHex");
+  }
+  function isValidationAckMessage(m2) {
+    return m2.type === VALIDATION_ACK && hasStr(m2.body, "cohortId") && hasBool(m2.body, "approved");
+  }
+  function isAuthorizationRequestMessage(m2) {
+    return m2.type === AUTHORIZATION_REQUEST && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasStr(m2.body, "pendingTx") && hasStr(m2.body, "prevOutScriptHex") && hasStr(m2.body, "prevOutValue");
+  }
+  function isNonceContributionMessage(m2) {
+    return m2.type === NONCE_CONTRIBUTION && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "nonceContribution");
+  }
+  function isAggregatedNonceMessage(m2) {
+    return m2.type === AGGREGATED_NONCE && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "aggregatedNonce");
+  }
+  function isSignatureAuthorizationMessage(m2) {
+    return m2.type === SIGNATURE_AUTHORIZATION && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "partialSignature");
+  }
+
+  // src/core/aggregation/participant.ts
   var AggregationParticipant = class {
     did;
     /** MuSig2 signing capability. The raw secret never lives as a field here. */
@@ -104485,16 +104615,15 @@ a=end-of-candidates
       return map3;
     }
     #handleCohortAdvert(message2) {
-      const cohortId = message2.body?.cohortId;
-      if (!cohortId) return;
+      if (!isCohortAdvertMessage(message2)) return;
+      const { cohortId, network, communicationPk, ...conditions } = message2.body;
       if (this.#cohortStates.has(cohortId)) return;
       const advert = {
         cohortId,
         serviceDid: message2.from,
-        cohortSize: message2.body?.cohortSize ?? 0,
-        network: message2.body?.network ?? "",
-        beaconType: message2.body?.beaconType ?? "CASBeacon",
-        serviceCommunicationPk: message2.body?.communicationPk ?? new Uint8Array()
+        network,
+        serviceCommunicationPk: communicationPk,
+        ...conditions
       };
       this.#cohortStates.set(cohortId, {
         phase: "Discovered" /* Discovered */,
@@ -104519,7 +104648,7 @@ a=end-of-candidates
       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
       });
@@ -104842,50 +104971,6 @@ a=end-of-candidates
   // src/core/aggregation/messages/index.ts
   init_shim();
 
-  // src/core/aggregation/messages/bodies.ts
-  init_shim();
-  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(m2) {
-    return m2.type === COHORT_ADVERT && hasStr(m2.body, "cohortId") && hasNum(m2.body, "cohortSize") && hasStr(m2.body, "beaconType") && hasStr(m2.body, "network") && hasBytes(m2.body, "communicationPk");
-  }
-  function isCohortOptInMessage(m2) {
-    return m2.type === COHORT_OPT_IN && hasStr(m2.body, "cohortId") && hasBytes(m2.body, "participantPk") && hasBytes(m2.body, "communicationPk");
-  }
-  function isCohortOptInAcceptMessage(m2) {
-    return m2.type === COHORT_OPT_IN_ACCEPT && hasStr(m2.body, "cohortId");
-  }
-  function isCohortReadyMessage(m2) {
-    return m2.type === COHORT_READY && hasStr(m2.body, "cohortId") && hasStr(m2.body, "beaconAddress") && hasBytesArray(m2.body, "cohortKeys");
-  }
-  function isSubmitUpdateMessage(m2) {
-    return m2.type === SUBMIT_UPDATE && hasStr(m2.body, "cohortId") && !!m2.body && typeof m2.body.signedUpdate === "object";
-  }
-  function isDistributeAggregatedDataMessage(m2) {
-    return m2.type === DISTRIBUTE_AGGREGATED_DATA && hasStr(m2.body, "cohortId") && hasStr(m2.body, "beaconType") && hasStr(m2.body, "signalBytesHex");
-  }
-  function isValidationAckMessage(m2) {
-    return m2.type === VALIDATION_ACK && hasStr(m2.body, "cohortId") && hasBool(m2.body, "approved");
-  }
-  function isAuthorizationRequestMessage(m2) {
-    return m2.type === AUTHORIZATION_REQUEST && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasStr(m2.body, "pendingTx") && hasStr(m2.body, "prevOutScriptHex") && hasStr(m2.body, "prevOutValue");
-  }
-  function isNonceContributionMessage(m2) {
-    return m2.type === NONCE_CONTRIBUTION && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "nonceContribution");
-  }
-  function isAggregatedNonceMessage(m2) {
-    return m2.type === AGGREGATED_NONCE && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "aggregatedNonce");
-  }
-  function isSignatureAuthorizationMessage(m2) {
-    return m2.type === SIGNATURE_AUTHORIZATION && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "partialSignature");
-  }
-
   // src/core/aggregation/messages/guards.ts
   init_shim();
   var KEYGEN_VALUES = /* @__PURE__ */ new Set([
@@ -111731,6 +111816,11 @@ ${value2}`;
         }
         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);

package/dist/browser.mjs

@@ -103245,7 +103245,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";
@@ -103411,6 +103411,57 @@ var AggregationCohort = class {
   }
 };
 
+// src/core/aggregation/conditions.ts
+init_shim();
+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(c2) {
+  const problems = [];
+  if (!KNOWN_BEACON_TYPES.includes(c2.beaconType)) {
+    problems.push(`beaconType must be one of ${KNOWN_BEACON_TYPES.join(", ")}`);
+  }
+  if (!Number.isInteger(c2.minParticipants) || c2.minParticipants < 1) {
+    problems.push("minParticipants must be an integer >= 1");
+  }
+  if (c2.maxParticipants !== void 0) {
+    if (!Number.isInteger(c2.maxParticipants) || c2.maxParticipants < 1) {
+      problems.push("maxParticipants must be an integer >= 1");
+    } else if (Number.isInteger(c2.minParticipants) && c2.maxParticipants < c2.minParticipants) {
+      problems.push("maxParticipants must be >= minParticipants");
+    }
+  }
+  checkPair(problems, "DidsPerParticipant", c2.minDidsPerParticipant, c2.maxDidsPerParticipant);
+  checkPair(problems, "SecondsBetweenAnnouncements", c2.minSecondsBetweenAnnouncements, c2.maxSecondsBetweenAnnouncements);
+  if (c2.pendingUpdateTrigger !== void 0 && (!Number.isInteger(c2.pendingUpdateTrigger) || c2.pendingUpdateTrigger < 1)) {
+    problems.push("pendingUpdateTrigger must be an integer >= 1");
+  }
+  checkCost(problems, "costOfEnrollment", c2.costOfEnrollment);
+  checkCost(problems, "costPerAnnouncement", c2.costPerAnnouncement);
+  return problems;
+}
+
 // src/core/aggregation/messages/base.ts
 init_shim();
 var AGGREGATION_WIRE_VERSION = 1;
@@ -103845,6 +103896,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,
@@ -103877,13 +103936,13 @@ var AggregationService = class {
         { cohortId, phase: state.phase }
       );
     }
+    const { network, ...conditions } = state.config;
     const message2 = createCohortAdvertMessage({
       from: this.did,
       cohortId,
-      cohortSize: state.config.minParticipants,
-      beaconType: state.config.beaconType,
-      network: state.config.network,
-      communicationPk: this.publicKey.compressed
+      network,
+      communicationPk: this.publicKey.compressed,
+      ...conditions
     });
     state.phase = "Advertised" /* Advertised */;
     return [message2];
@@ -103942,6 +104001,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);
@@ -103975,6 +104042,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 messages2 = [];
@@ -104292,6 +104367,59 @@ var AggregationService = class {
 // src/core/aggregation/participant.ts
 init_shim();
 init_utils();
+
+// src/core/aggregation/messages/bodies.ts
+init_shim();
+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(m2) {
+  return m2.type === COHORT_ADVERT && hasStr(m2.body, "cohortId") && hasIntMin(m2.body, "minParticipants", 1) && optIntMin(m2.body, "maxParticipants", 1) && hasStr(m2.body, "beaconType") && hasStr(m2.body, "network") && hasBytes(m2.body, "communicationPk");
+}
+function isCohortOptInMessage(m2) {
+  return m2.type === COHORT_OPT_IN && hasStr(m2.body, "cohortId") && hasBytes(m2.body, "participantPk") && hasBytes(m2.body, "communicationPk");
+}
+function isCohortOptInAcceptMessage(m2) {
+  return m2.type === COHORT_OPT_IN_ACCEPT && hasStr(m2.body, "cohortId");
+}
+function isCohortReadyMessage(m2) {
+  return m2.type === COHORT_READY && hasStr(m2.body, "cohortId") && hasStr(m2.body, "beaconAddress") && hasBytesArray(m2.body, "cohortKeys");
+}
+function isSubmitUpdateMessage(m2) {
+  return m2.type === SUBMIT_UPDATE && hasStr(m2.body, "cohortId") && !!m2.body && typeof m2.body.signedUpdate === "object";
+}
+function isDistributeAggregatedDataMessage(m2) {
+  return m2.type === DISTRIBUTE_AGGREGATED_DATA && hasStr(m2.body, "cohortId") && hasStr(m2.body, "beaconType") && hasStr(m2.body, "signalBytesHex");
+}
+function isValidationAckMessage(m2) {
+  return m2.type === VALIDATION_ACK && hasStr(m2.body, "cohortId") && hasBool(m2.body, "approved");
+}
+function isAuthorizationRequestMessage(m2) {
+  return m2.type === AUTHORIZATION_REQUEST && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasStr(m2.body, "pendingTx") && hasStr(m2.body, "prevOutScriptHex") && hasStr(m2.body, "prevOutValue");
+}
+function isNonceContributionMessage(m2) {
+  return m2.type === NONCE_CONTRIBUTION && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "nonceContribution");
+}
+function isAggregatedNonceMessage(m2) {
+  return m2.type === AGGREGATED_NONCE && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "aggregatedNonce");
+}
+function isSignatureAuthorizationMessage(m2) {
+  return m2.type === SIGNATURE_AUTHORIZATION && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "partialSignature");
+}
+
+// src/core/aggregation/participant.ts
 var AggregationParticipant = class {
   did;
   /** MuSig2 signing capability. The raw secret never lives as a field here. */
@@ -104349,16 +104477,15 @@ var AggregationParticipant = class {
     return map3;
   }
   #handleCohortAdvert(message2) {
-    const cohortId = message2.body?.cohortId;
-    if (!cohortId) return;
+    if (!isCohortAdvertMessage(message2)) return;
+    const { cohortId, network, communicationPk, ...conditions } = message2.body;
     if (this.#cohortStates.has(cohortId)) return;
     const advert = {
       cohortId,
       serviceDid: message2.from,
-      cohortSize: message2.body?.cohortSize ?? 0,
-      network: message2.body?.network ?? "",
-      beaconType: message2.body?.beaconType ?? "CASBeacon",
-      serviceCommunicationPk: message2.body?.communicationPk ?? new Uint8Array()
+      network,
+      serviceCommunicationPk: communicationPk,
+      ...conditions
     };
     this.#cohortStates.set(cohortId, {
       phase: "Discovered" /* Discovered */,
@@ -104383,7 +104510,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
     });
@@ -104706,50 +104833,6 @@ var SILENT_LOGGER = {
 // src/core/aggregation/messages/index.ts
 init_shim();
 
-// src/core/aggregation/messages/bodies.ts
-init_shim();
-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(m2) {
-  return m2.type === COHORT_ADVERT && hasStr(m2.body, "cohortId") && hasNum(m2.body, "cohortSize") && hasStr(m2.body, "beaconType") && hasStr(m2.body, "network") && hasBytes(m2.body, "communicationPk");
-}
-function isCohortOptInMessage(m2) {
-  return m2.type === COHORT_OPT_IN && hasStr(m2.body, "cohortId") && hasBytes(m2.body, "participantPk") && hasBytes(m2.body, "communicationPk");
-}
-function isCohortOptInAcceptMessage(m2) {
-  return m2.type === COHORT_OPT_IN_ACCEPT && hasStr(m2.body, "cohortId");
-}
-function isCohortReadyMessage(m2) {
-  return m2.type === COHORT_READY && hasStr(m2.body, "cohortId") && hasStr(m2.body, "beaconAddress") && hasBytesArray(m2.body, "cohortKeys");
-}
-function isSubmitUpdateMessage(m2) {
-  return m2.type === SUBMIT_UPDATE && hasStr(m2.body, "cohortId") && !!m2.body && typeof m2.body.signedUpdate === "object";
-}
-function isDistributeAggregatedDataMessage(m2) {
-  return m2.type === DISTRIBUTE_AGGREGATED_DATA && hasStr(m2.body, "cohortId") && hasStr(m2.body, "beaconType") && hasStr(m2.body, "signalBytesHex");
-}
-function isValidationAckMessage(m2) {
-  return m2.type === VALIDATION_ACK && hasStr(m2.body, "cohortId") && hasBool(m2.body, "approved");
-}
-function isAuthorizationRequestMessage(m2) {
-  return m2.type === AUTHORIZATION_REQUEST && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasStr(m2.body, "pendingTx") && hasStr(m2.body, "prevOutScriptHex") && hasStr(m2.body, "prevOutValue");
-}
-function isNonceContributionMessage(m2) {
-  return m2.type === NONCE_CONTRIBUTION && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "nonceContribution");
-}
-function isAggregatedNonceMessage(m2) {
-  return m2.type === AGGREGATED_NONCE && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "aggregatedNonce");
-}
-function isSignatureAuthorizationMessage(m2) {
-  return m2.type === SIGNATURE_AUTHORIZATION && hasStr(m2.body, "cohortId") && hasStr(m2.body, "sessionId") && hasBytes(m2.body, "partialSignature");
-}
-
 // src/core/aggregation/messages/guards.ts
 init_shim();
 var KEYGEN_VALUES = /* @__PURE__ */ new Set([
@@ -111595,6 +111678,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);
@@ -129101,6 +129189,7 @@ export {
   InMemoryRateLimitStore,
   InMemoryTransport,
   InboxBuffer,
+  KNOWN_BEACON_TYPES,
   KeyPairAggregationSigner,
   NONCE_CONTRIBUTION,
   NonceCache,
@@ -129173,6 +129262,7 @@ export {
   registerBeaconStrategy,
   reviveFromWire,
   signEnvelope,
+  validateCohortConditions,
   verifyEnvelope,
   verifyRequestAuth
 };