@did-btcr2/method 0.35.0 → 0.36.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/browser.js +146 -56
- package/dist/browser.mjs +146 -56
- package/dist/cjs/index.js +146 -55
- package/dist/esm/core/aggregation/cohort.js +3 -1
- package/dist/esm/core/aggregation/cohort.js.map +1 -1
- package/dist/esm/core/aggregation/conditions.js +75 -0
- package/dist/esm/core/aggregation/conditions.js.map +1 -0
- package/dist/esm/core/aggregation/messages/base.js.map +1 -1
- package/dist/esm/core/aggregation/messages/bodies.js +16 -2
- package/dist/esm/core/aggregation/messages/bodies.js.map +1 -1
- package/dist/esm/core/aggregation/messages/factories.js.map +1 -1
- package/dist/esm/core/aggregation/participant.js +9 -7
- package/dist/esm/core/aggregation/participant.js.map +1 -1
- package/dist/esm/core/aggregation/runner/service-runner.js +8 -0
- package/dist/esm/core/aggregation/runner/service-runner.js.map +1 -1
- package/dist/esm/core/aggregation/service.js +23 -3
- package/dist/esm/core/aggregation/service.js.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/types/core/aggregation/cohort.d.ts.map +1 -1
- package/dist/types/core/aggregation/conditions.d.ts +58 -0
- package/dist/types/core/aggregation/conditions.d.ts.map +1 -0
- package/dist/types/core/aggregation/messages/base.d.ts +2 -3
- package/dist/types/core/aggregation/messages/base.d.ts.map +1 -1
- package/dist/types/core/aggregation/messages/bodies.d.ts +2 -3
- package/dist/types/core/aggregation/messages/bodies.d.ts.map +1 -1
- package/dist/types/core/aggregation/messages/factories.d.ts +2 -3
- package/dist/types/core/aggregation/messages/factories.d.ts.map +1 -1
- package/dist/types/core/aggregation/participant.d.ts +7 -4
- package/dist/types/core/aggregation/participant.d.ts.map +1 -1
- package/dist/types/core/aggregation/runner/service-runner.d.ts.map +1 -1
- package/dist/types/core/aggregation/service.d.ts +8 -4
- package/dist/types/core/aggregation/service.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/core/aggregation/cohort.ts +3 -1
- package/src/core/aggregation/conditions.ts +116 -0
- package/src/core/aggregation/messages/base.ts +6 -3
- package/src/core/aggregation/messages/bodies.ts +18 -6
- package/src/core/aggregation/messages/factories.ts +2 -3
- package/src/core/aggregation/participant.ts +16 -11
- package/src/core/aggregation/runner/service-runner.ts +9 -0
- package/src/core/aggregation/service.ts +39 -7
- package/src/index.ts +1 -0
package/dist/cjs/index.js
CHANGED
|
@@ -86,6 +86,7 @@ __export(index_exports, {
|
|
|
86
86
|
InMemoryRateLimitStore: () => InMemoryRateLimitStore,
|
|
87
87
|
InMemoryTransport: () => InMemoryTransport,
|
|
88
88
|
InboxBuffer: () => InboxBuffer,
|
|
89
|
+
KNOWN_BEACON_TYPES: () => KNOWN_BEACON_TYPES,
|
|
89
90
|
KeyPairAggregationSigner: () => KeyPairAggregationSigner,
|
|
90
91
|
NONCE_CONTRIBUTION: () => NONCE_CONTRIBUTION,
|
|
91
92
|
NonceCache: () => NonceCache,
|
|
@@ -158,6 +159,7 @@ __export(index_exports, {
|
|
|
158
159
|
registerBeaconStrategy: () => registerBeaconStrategy,
|
|
159
160
|
reviveFromWire: () => reviveFromWire,
|
|
160
161
|
signEnvelope: () => signEnvelope,
|
|
162
|
+
validateCohortConditions: () => validateCohortConditions,
|
|
161
163
|
verifyEnvelope: () => verifyEnvelope,
|
|
162
164
|
verifyRequestAuth: () => verifyRequestAuth
|
|
163
165
|
});
|
|
@@ -301,7 +303,7 @@ var AggregationCohort = class {
|
|
|
301
303
|
validationRejections = /* @__PURE__ */ new Set();
|
|
302
304
|
constructor({ id, minParticipants, serviceDid, network, beaconType }) {
|
|
303
305
|
this.id = id || crypto.randomUUID();
|
|
304
|
-
this.minParticipants = minParticipants
|
|
306
|
+
this.minParticipants = minParticipants ?? 2;
|
|
305
307
|
this.serviceDid = serviceDid || "";
|
|
306
308
|
this.network = network;
|
|
307
309
|
this.beaconType = beaconType || "CASBeacon";
|
|
@@ -467,6 +469,56 @@ var AggregationCohort = class {
|
|
|
467
469
|
}
|
|
468
470
|
};
|
|
469
471
|
|
|
472
|
+
// src/core/aggregation/conditions.ts
|
|
473
|
+
var KNOWN_BEACON_TYPES = ["CASBeacon", "SMTBeacon"];
|
|
474
|
+
function checkPair(problems, label, min, max) {
|
|
475
|
+
if (min !== void 0 && (!Number.isInteger(min) || min < 0)) {
|
|
476
|
+
problems.push(`min${label} must be an integer >= 0`);
|
|
477
|
+
}
|
|
478
|
+
if (max !== void 0 && (!Number.isInteger(max) || max < 0)) {
|
|
479
|
+
problems.push(`max${label} must be an integer >= 0`);
|
|
480
|
+
}
|
|
481
|
+
if (min !== void 0 && max !== void 0 && Number.isInteger(min) && Number.isInteger(max) && max < min) {
|
|
482
|
+
problems.push(`max${label} must be >= min${label}`);
|
|
483
|
+
}
|
|
484
|
+
}
|
|
485
|
+
function checkCost(problems, label, cost) {
|
|
486
|
+
if (cost === void 0) return;
|
|
487
|
+
if (typeof cost.amount !== "number" || !Number.isFinite(cost.amount) || cost.amount < 0) {
|
|
488
|
+
problems.push(`${label}.amount must be a finite number >= 0`);
|
|
489
|
+
}
|
|
490
|
+
if (typeof cost.unit !== "string" || cost.unit.length === 0) {
|
|
491
|
+
problems.push(`${label}.unit must be a non-empty string`);
|
|
492
|
+
}
|
|
493
|
+
if (cost.basis !== void 0 && cost.basis !== "per-did" && cost.basis !== "per-participant") {
|
|
494
|
+
problems.push(`${label}.basis must be 'per-did' or 'per-participant'`);
|
|
495
|
+
}
|
|
496
|
+
}
|
|
497
|
+
function validateCohortConditions(c) {
|
|
498
|
+
const problems = [];
|
|
499
|
+
if (!KNOWN_BEACON_TYPES.includes(c.beaconType)) {
|
|
500
|
+
problems.push(`beaconType must be one of ${KNOWN_BEACON_TYPES.join(", ")}`);
|
|
501
|
+
}
|
|
502
|
+
if (!Number.isInteger(c.minParticipants) || c.minParticipants < 1) {
|
|
503
|
+
problems.push("minParticipants must be an integer >= 1");
|
|
504
|
+
}
|
|
505
|
+
if (c.maxParticipants !== void 0) {
|
|
506
|
+
if (!Number.isInteger(c.maxParticipants) || c.maxParticipants < 1) {
|
|
507
|
+
problems.push("maxParticipants must be an integer >= 1");
|
|
508
|
+
} else if (Number.isInteger(c.minParticipants) && c.maxParticipants < c.minParticipants) {
|
|
509
|
+
problems.push("maxParticipants must be >= minParticipants");
|
|
510
|
+
}
|
|
511
|
+
}
|
|
512
|
+
checkPair(problems, "DidsPerParticipant", c.minDidsPerParticipant, c.maxDidsPerParticipant);
|
|
513
|
+
checkPair(problems, "SecondsBetweenAnnouncements", c.minSecondsBetweenAnnouncements, c.maxSecondsBetweenAnnouncements);
|
|
514
|
+
if (c.pendingUpdateTrigger !== void 0 && (!Number.isInteger(c.pendingUpdateTrigger) || c.pendingUpdateTrigger < 1)) {
|
|
515
|
+
problems.push("pendingUpdateTrigger must be an integer >= 1");
|
|
516
|
+
}
|
|
517
|
+
checkCost(problems, "costOfEnrollment", c.costOfEnrollment);
|
|
518
|
+
checkCost(problems, "costPerAnnouncement", c.costPerAnnouncement);
|
|
519
|
+
return problems;
|
|
520
|
+
}
|
|
521
|
+
|
|
470
522
|
// src/core/aggregation/messages/base.ts
|
|
471
523
|
var AGGREGATION_WIRE_VERSION = 1;
|
|
472
524
|
var BaseMessage = class {
|
|
@@ -899,6 +951,14 @@ var AggregationService = class {
|
|
|
899
951
|
* Cohort starts in `Created` phase — call `advertise()` to broadcast.
|
|
900
952
|
*/
|
|
901
953
|
createCohort(config) {
|
|
954
|
+
const problems = validateCohortConditions(config);
|
|
955
|
+
if (problems.length > 0) {
|
|
956
|
+
throw new AggregationServiceError(
|
|
957
|
+
`Invalid cohort conditions: ${problems.join("; ")}`,
|
|
958
|
+
"INVALID_COHORT_CONDITIONS",
|
|
959
|
+
{ problems }
|
|
960
|
+
);
|
|
961
|
+
}
|
|
902
962
|
const cohort = new AggregationCohort({
|
|
903
963
|
serviceDid: this.did,
|
|
904
964
|
minParticipants: config.minParticipants,
|
|
@@ -931,13 +991,13 @@ var AggregationService = class {
|
|
|
931
991
|
{ cohortId, phase: state.phase }
|
|
932
992
|
);
|
|
933
993
|
}
|
|
994
|
+
const { network, ...conditions } = state.config;
|
|
934
995
|
const message = createCohortAdvertMessage({
|
|
935
996
|
from: this.did,
|
|
936
997
|
cohortId,
|
|
937
|
-
|
|
938
|
-
|
|
939
|
-
|
|
940
|
-
communicationPk: this.publicKey.compressed
|
|
998
|
+
network,
|
|
999
|
+
communicationPk: this.publicKey.compressed,
|
|
1000
|
+
...conditions
|
|
941
1001
|
});
|
|
942
1002
|
state.phase = "Advertised" /* Advertised */;
|
|
943
1003
|
return [message];
|
|
@@ -996,6 +1056,14 @@ var AggregationService = class {
|
|
|
996
1056
|
{ cohortId, participantDid }
|
|
997
1057
|
);
|
|
998
1058
|
}
|
|
1059
|
+
const maxParticipants = state.config.maxParticipants;
|
|
1060
|
+
if (maxParticipants !== void 0 && state.acceptedParticipants.size >= maxParticipants) {
|
|
1061
|
+
throw new AggregationServiceError(
|
|
1062
|
+
`Cohort ${cohortId} is full: ${maxParticipants} participants already accepted.`,
|
|
1063
|
+
"COHORT_FULL",
|
|
1064
|
+
{ cohortId, maxParticipants }
|
|
1065
|
+
);
|
|
1066
|
+
}
|
|
999
1067
|
state.acceptedParticipants.add(participantDid);
|
|
1000
1068
|
state.cohort.participants.push(participantDid);
|
|
1001
1069
|
state.cohort.participantKeys.set(participantDid, optIn.participantPk);
|
|
@@ -1029,6 +1097,14 @@ var AggregationService = class {
|
|
|
1029
1097
|
{ cohortId }
|
|
1030
1098
|
);
|
|
1031
1099
|
}
|
|
1100
|
+
const maxParticipants = state.config.maxParticipants;
|
|
1101
|
+
if (maxParticipants !== void 0 && state.acceptedParticipants.size > maxParticipants) {
|
|
1102
|
+
throw new AggregationServiceError(
|
|
1103
|
+
`Cohort ${cohortId} has ${state.acceptedParticipants.size} accepted participants, exceeds max ${maxParticipants}.`,
|
|
1104
|
+
"TOO_MANY_PARTICIPANTS",
|
|
1105
|
+
{ cohortId, maxParticipants }
|
|
1106
|
+
);
|
|
1107
|
+
}
|
|
1032
1108
|
const beaconAddress = state.cohort.computeBeaconAddress();
|
|
1033
1109
|
state.phase = "CohortSet" /* CohortSet */;
|
|
1034
1110
|
const messages = [];
|
|
@@ -1347,6 +1423,58 @@ var AggregationService = class {
|
|
|
1347
1423
|
var import_common5 = require("@did-btcr2/common");
|
|
1348
1424
|
var import_utils3 = require("@noble/hashes/utils");
|
|
1349
1425
|
var import_btc_signer3 = require("@scure/btc-signer");
|
|
1426
|
+
|
|
1427
|
+
// src/core/aggregation/messages/bodies.ts
|
|
1428
|
+
var hasStr = (b, k) => !!b && typeof b[k] === "string";
|
|
1429
|
+
var hasIntMin = (b, k, min) => {
|
|
1430
|
+
const v = b ? b[k] : void 0;
|
|
1431
|
+
return typeof v === "number" && Number.isInteger(v) && v >= min;
|
|
1432
|
+
};
|
|
1433
|
+
var optIntMin = (b, k, min) => {
|
|
1434
|
+
const v = b ? b[k] : void 0;
|
|
1435
|
+
return v === void 0 || typeof v === "number" && Number.isInteger(v) && v >= min;
|
|
1436
|
+
};
|
|
1437
|
+
var hasBool = (b, k) => !!b && typeof b[k] === "boolean";
|
|
1438
|
+
var hasBytes = (b, k) => !!b && b[k] instanceof Uint8Array;
|
|
1439
|
+
var hasBytesArray = (b, k) => {
|
|
1440
|
+
const v = b ? b[k] : void 0;
|
|
1441
|
+
return Array.isArray(v) && v.every((x) => x instanceof Uint8Array);
|
|
1442
|
+
};
|
|
1443
|
+
function isCohortAdvertMessage(m) {
|
|
1444
|
+
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");
|
|
1445
|
+
}
|
|
1446
|
+
function isCohortOptInMessage(m) {
|
|
1447
|
+
return m.type === COHORT_OPT_IN && hasStr(m.body, "cohortId") && hasBytes(m.body, "participantPk") && hasBytes(m.body, "communicationPk");
|
|
1448
|
+
}
|
|
1449
|
+
function isCohortOptInAcceptMessage(m) {
|
|
1450
|
+
return m.type === COHORT_OPT_IN_ACCEPT && hasStr(m.body, "cohortId");
|
|
1451
|
+
}
|
|
1452
|
+
function isCohortReadyMessage(m) {
|
|
1453
|
+
return m.type === COHORT_READY && hasStr(m.body, "cohortId") && hasStr(m.body, "beaconAddress") && hasBytesArray(m.body, "cohortKeys");
|
|
1454
|
+
}
|
|
1455
|
+
function isSubmitUpdateMessage(m) {
|
|
1456
|
+
return m.type === SUBMIT_UPDATE && hasStr(m.body, "cohortId") && !!m.body && typeof m.body.signedUpdate === "object";
|
|
1457
|
+
}
|
|
1458
|
+
function isDistributeAggregatedDataMessage(m) {
|
|
1459
|
+
return m.type === DISTRIBUTE_AGGREGATED_DATA && hasStr(m.body, "cohortId") && hasStr(m.body, "beaconType") && hasStr(m.body, "signalBytesHex");
|
|
1460
|
+
}
|
|
1461
|
+
function isValidationAckMessage(m) {
|
|
1462
|
+
return m.type === VALIDATION_ACK && hasStr(m.body, "cohortId") && hasBool(m.body, "approved");
|
|
1463
|
+
}
|
|
1464
|
+
function isAuthorizationRequestMessage(m) {
|
|
1465
|
+
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");
|
|
1466
|
+
}
|
|
1467
|
+
function isNonceContributionMessage(m) {
|
|
1468
|
+
return m.type === NONCE_CONTRIBUTION && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "nonceContribution");
|
|
1469
|
+
}
|
|
1470
|
+
function isAggregatedNonceMessage(m) {
|
|
1471
|
+
return m.type === AGGREGATED_NONCE && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "aggregatedNonce");
|
|
1472
|
+
}
|
|
1473
|
+
function isSignatureAuthorizationMessage(m) {
|
|
1474
|
+
return m.type === SIGNATURE_AUTHORIZATION && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "partialSignature");
|
|
1475
|
+
}
|
|
1476
|
+
|
|
1477
|
+
// src/core/aggregation/participant.ts
|
|
1350
1478
|
var AggregationParticipant = class {
|
|
1351
1479
|
did;
|
|
1352
1480
|
/** MuSig2 signing capability. The raw secret never lives as a field here. */
|
|
@@ -1404,16 +1532,15 @@ var AggregationParticipant = class {
|
|
|
1404
1532
|
return map;
|
|
1405
1533
|
}
|
|
1406
1534
|
#handleCohortAdvert(message) {
|
|
1407
|
-
|
|
1408
|
-
|
|
1535
|
+
if (!isCohortAdvertMessage(message)) return;
|
|
1536
|
+
const { cohortId, network, communicationPk, ...conditions } = message.body;
|
|
1409
1537
|
if (this.#cohortStates.has(cohortId)) return;
|
|
1410
1538
|
const advert = {
|
|
1411
1539
|
cohortId,
|
|
1412
1540
|
serviceDid: message.from,
|
|
1413
|
-
|
|
1414
|
-
|
|
1415
|
-
|
|
1416
|
-
serviceCommunicationPk: message.body?.communicationPk ?? new Uint8Array()
|
|
1541
|
+
network,
|
|
1542
|
+
serviceCommunicationPk: communicationPk,
|
|
1543
|
+
...conditions
|
|
1417
1544
|
};
|
|
1418
1545
|
this.#cohortStates.set(cohortId, {
|
|
1419
1546
|
phase: "Discovered" /* Discovered */,
|
|
@@ -1438,7 +1565,7 @@ var AggregationParticipant = class {
|
|
|
1438
1565
|
const cohort = new AggregationCohort({
|
|
1439
1566
|
id: cohortId,
|
|
1440
1567
|
serviceDid: state.serviceDid,
|
|
1441
|
-
minParticipants: state.advert.
|
|
1568
|
+
minParticipants: state.advert.minParticipants,
|
|
1442
1569
|
network: state.advert.network,
|
|
1443
1570
|
beaconType: state.advert.beaconType
|
|
1444
1571
|
});
|
|
@@ -1758,49 +1885,6 @@ var SILENT_LOGGER = {
|
|
|
1758
1885
|
}
|
|
1759
1886
|
};
|
|
1760
1887
|
|
|
1761
|
-
// src/core/aggregation/messages/bodies.ts
|
|
1762
|
-
var hasStr = (b, k) => !!b && typeof b[k] === "string";
|
|
1763
|
-
var hasNum = (b, k) => !!b && typeof b[k] === "number";
|
|
1764
|
-
var hasBool = (b, k) => !!b && typeof b[k] === "boolean";
|
|
1765
|
-
var hasBytes = (b, k) => !!b && b[k] instanceof Uint8Array;
|
|
1766
|
-
var hasBytesArray = (b, k) => {
|
|
1767
|
-
const v = b ? b[k] : void 0;
|
|
1768
|
-
return Array.isArray(v) && v.every((x) => x instanceof Uint8Array);
|
|
1769
|
-
};
|
|
1770
|
-
function isCohortAdvertMessage(m) {
|
|
1771
|
-
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");
|
|
1772
|
-
}
|
|
1773
|
-
function isCohortOptInMessage(m) {
|
|
1774
|
-
return m.type === COHORT_OPT_IN && hasStr(m.body, "cohortId") && hasBytes(m.body, "participantPk") && hasBytes(m.body, "communicationPk");
|
|
1775
|
-
}
|
|
1776
|
-
function isCohortOptInAcceptMessage(m) {
|
|
1777
|
-
return m.type === COHORT_OPT_IN_ACCEPT && hasStr(m.body, "cohortId");
|
|
1778
|
-
}
|
|
1779
|
-
function isCohortReadyMessage(m) {
|
|
1780
|
-
return m.type === COHORT_READY && hasStr(m.body, "cohortId") && hasStr(m.body, "beaconAddress") && hasBytesArray(m.body, "cohortKeys");
|
|
1781
|
-
}
|
|
1782
|
-
function isSubmitUpdateMessage(m) {
|
|
1783
|
-
return m.type === SUBMIT_UPDATE && hasStr(m.body, "cohortId") && !!m.body && typeof m.body.signedUpdate === "object";
|
|
1784
|
-
}
|
|
1785
|
-
function isDistributeAggregatedDataMessage(m) {
|
|
1786
|
-
return m.type === DISTRIBUTE_AGGREGATED_DATA && hasStr(m.body, "cohortId") && hasStr(m.body, "beaconType") && hasStr(m.body, "signalBytesHex");
|
|
1787
|
-
}
|
|
1788
|
-
function isValidationAckMessage(m) {
|
|
1789
|
-
return m.type === VALIDATION_ACK && hasStr(m.body, "cohortId") && hasBool(m.body, "approved");
|
|
1790
|
-
}
|
|
1791
|
-
function isAuthorizationRequestMessage(m) {
|
|
1792
|
-
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");
|
|
1793
|
-
}
|
|
1794
|
-
function isNonceContributionMessage(m) {
|
|
1795
|
-
return m.type === NONCE_CONTRIBUTION && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "nonceContribution");
|
|
1796
|
-
}
|
|
1797
|
-
function isAggregatedNonceMessage(m) {
|
|
1798
|
-
return m.type === AGGREGATED_NONCE && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "aggregatedNonce");
|
|
1799
|
-
}
|
|
1800
|
-
function isSignatureAuthorizationMessage(m) {
|
|
1801
|
-
return m.type === SIGNATURE_AUTHORIZATION && hasStr(m.body, "cohortId") && hasStr(m.body, "sessionId") && hasBytes(m.body, "partialSignature");
|
|
1802
|
-
}
|
|
1803
|
-
|
|
1804
1888
|
// src/core/aggregation/messages/guards.ts
|
|
1805
1889
|
var KEYGEN_VALUES = /* @__PURE__ */ new Set([
|
|
1806
1890
|
COHORT_ADVERT,
|
|
@@ -4146,6 +4230,11 @@ var AggregationServiceRunner = class _AggregationServiceRunner extends TypedEven
|
|
|
4146
4230
|
}
|
|
4147
4231
|
const decision = await this.#onOptInReceived(optIn);
|
|
4148
4232
|
if (!decision.accepted) return;
|
|
4233
|
+
const maxParticipants = this.#config.maxParticipants;
|
|
4234
|
+
const cohortNow = this.session.getCohort(this.#cohortId);
|
|
4235
|
+
if (maxParticipants !== void 0 && cohortNow && cohortNow.participants.length >= maxParticipants) {
|
|
4236
|
+
return;
|
|
4237
|
+
}
|
|
4149
4238
|
await this.#sendAll(this.session.acceptParticipant(this.#cohortId, msg.from));
|
|
4150
4239
|
this.emit("participant-accepted", { participantDid: msg.from });
|
|
4151
4240
|
const cohort = this.session.getCohort(this.#cohortId);
|
|
@@ -7826,6 +7915,7 @@ var DidDocumentBuilder = class {
|
|
|
7826
7915
|
InMemoryRateLimitStore,
|
|
7827
7916
|
InMemoryTransport,
|
|
7828
7917
|
InboxBuffer,
|
|
7918
|
+
KNOWN_BEACON_TYPES,
|
|
7829
7919
|
KeyPairAggregationSigner,
|
|
7830
7920
|
NONCE_CONTRIBUTION,
|
|
7831
7921
|
NonceCache,
|
|
@@ -7898,6 +7988,7 @@ var DidDocumentBuilder = class {
|
|
|
7898
7988
|
registerBeaconStrategy,
|
|
7899
7989
|
reviveFromWire,
|
|
7900
7990
|
signEnvelope,
|
|
7991
|
+
validateCohortConditions,
|
|
7901
7992
|
verifyEnvelope,
|
|
7902
7993
|
verifyRequestAuth
|
|
7903
7994
|
});
|
|
@@ -63,7 +63,9 @@ export class AggregationCohort {
|
|
|
63
63
|
validationRejections = new Set();
|
|
64
64
|
constructor({ id, minParticipants, serviceDid, network, beaconType }) {
|
|
65
65
|
this.id = id || crypto.randomUUID();
|
|
66
|
-
|
|
66
|
+
// `?? 2` (not `|| 2`) so a deliberately-passed 0 is preserved rather than
|
|
67
|
+
// silently coerced; the service rejects an invalid count at createCohort.
|
|
68
|
+
this.minParticipants = minParticipants ?? 2;
|
|
67
69
|
this.serviceDid = serviceDid || '';
|
|
68
70
|
this.network = network;
|
|
69
71
|
this.beaconType = beaconType || 'CASBeacon';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cohort.js","sourceRoot":"","sources":["../../../../src/core/aggregation/cohort.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cohort.js","sourceRoot":"","sources":["../../../../src/core/aggregation/cohort.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Cohort conditions: the constraints an Aggregation Service advertises for a
|
|
3
|
+
* cohort (did:btcr2 spec, "Step 1: Create Aggregation Cohort"). See ADR 039.
|
|
4
|
+
*
|
|
5
|
+
* The spec frames these as an optional menu ("the Aggregation Service can define
|
|
6
|
+
* conditions such as ..."), so only `beaconType` and `minParticipants` are
|
|
7
|
+
* required here; every other condition is optional and, when absent, means
|
|
8
|
+
* unconstrained.
|
|
9
|
+
*
|
|
10
|
+
* Enforcement is staged (ADR 039): `beaconType` and the participant bounds are
|
|
11
|
+
* enforced by the state machine now; DIDs-per-participant, timing/cadence, and
|
|
12
|
+
* the pending-update trigger are modeled and advertised here but enforced when
|
|
13
|
+
* the multi-cohort (AGG-4) and non-inclusion (AGG-5) tracks land. The two cost
|
|
14
|
+
* conditions are advertised metadata only - the protocol performs no payment or
|
|
15
|
+
* settlement (consistent with ADR 008).
|
|
16
|
+
*/
|
|
17
|
+
/** Beacon types that support aggregation (singleton is single-party only, per ADR 037). */
|
|
18
|
+
export const KNOWN_BEACON_TYPES = ['CASBeacon', 'SMTBeacon'];
|
|
19
|
+
/** Validate an optional [min, max] integer pair. */
|
|
20
|
+
function checkPair(problems, label, min, max) {
|
|
21
|
+
if (min !== undefined && (!Number.isInteger(min) || min < 0)) {
|
|
22
|
+
problems.push(`min${label} must be an integer >= 0`);
|
|
23
|
+
}
|
|
24
|
+
if (max !== undefined && (!Number.isInteger(max) || max < 0)) {
|
|
25
|
+
problems.push(`max${label} must be an integer >= 0`);
|
|
26
|
+
}
|
|
27
|
+
if (min !== undefined && max !== undefined && Number.isInteger(min) && Number.isInteger(max) && max < min) {
|
|
28
|
+
problems.push(`max${label} must be >= min${label}`);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
/** Validate an optional advertised cost. */
|
|
32
|
+
function checkCost(problems, label, cost) {
|
|
33
|
+
if (cost === undefined)
|
|
34
|
+
return;
|
|
35
|
+
if (typeof cost.amount !== 'number' || !Number.isFinite(cost.amount) || cost.amount < 0) {
|
|
36
|
+
problems.push(`${label}.amount must be a finite number >= 0`);
|
|
37
|
+
}
|
|
38
|
+
if (typeof cost.unit !== 'string' || cost.unit.length === 0) {
|
|
39
|
+
problems.push(`${label}.unit must be a non-empty string`);
|
|
40
|
+
}
|
|
41
|
+
if (cost.basis !== undefined && cost.basis !== 'per-did' && cost.basis !== 'per-participant') {
|
|
42
|
+
problems.push(`${label}.basis must be 'per-did' or 'per-participant'`);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Validate a set of cohort conditions. Returns a list of human-readable problems
|
|
47
|
+
* (empty when valid) so the caller can decide how to surface them. Used by
|
|
48
|
+
* `createCohort()` to fail fast instead of discovering invalidity at finalize.
|
|
49
|
+
*/
|
|
50
|
+
export function validateCohortConditions(c) {
|
|
51
|
+
const problems = [];
|
|
52
|
+
if (!KNOWN_BEACON_TYPES.includes(c.beaconType)) {
|
|
53
|
+
problems.push(`beaconType must be one of ${KNOWN_BEACON_TYPES.join(', ')}`);
|
|
54
|
+
}
|
|
55
|
+
if (!Number.isInteger(c.minParticipants) || c.minParticipants < 1) {
|
|
56
|
+
problems.push('minParticipants must be an integer >= 1');
|
|
57
|
+
}
|
|
58
|
+
if (c.maxParticipants !== undefined) {
|
|
59
|
+
if (!Number.isInteger(c.maxParticipants) || c.maxParticipants < 1) {
|
|
60
|
+
problems.push('maxParticipants must be an integer >= 1');
|
|
61
|
+
}
|
|
62
|
+
else if (Number.isInteger(c.minParticipants) && c.maxParticipants < c.minParticipants) {
|
|
63
|
+
problems.push('maxParticipants must be >= minParticipants');
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
checkPair(problems, 'DidsPerParticipant', c.minDidsPerParticipant, c.maxDidsPerParticipant);
|
|
67
|
+
checkPair(problems, 'SecondsBetweenAnnouncements', c.minSecondsBetweenAnnouncements, c.maxSecondsBetweenAnnouncements);
|
|
68
|
+
if (c.pendingUpdateTrigger !== undefined && (!Number.isInteger(c.pendingUpdateTrigger) || c.pendingUpdateTrigger < 1)) {
|
|
69
|
+
problems.push('pendingUpdateTrigger must be an integer >= 1');
|
|
70
|
+
}
|
|
71
|
+
checkCost(problems, 'costOfEnrollment', c.costOfEnrollment);
|
|
72
|
+
checkCost(problems, 'costPerAnnouncement', c.costPerAnnouncement);
|
|
73
|
+
return problems;
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=conditions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../../../src/core/aggregation/conditions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/messages/base.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/messages/base.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAoC1C,MAAM,OAAO,WAAW;IACf,IAAI,CAAS;IACb,OAAO,CAAS;IAChB,EAAE,CAAU;IACZ,IAAI,CAAS;IACb,IAAI,CAAY;IAEvB,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAQ;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,wBAAwB,CAAC;QACnD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,MAAM;QACX,OAAO;YACL,IAAI,EAAM,IAAI,CAAC,IAAI;YACnB,OAAO,EAAG,IAAI,CAAC,OAAO;YACtB,EAAE,EAAQ,IAAI,CAAC,EAAE;YACjB,IAAI,EAAM,IAAI,CAAC,IAAI;YACnB,IAAI,EAAM,IAAI,CAAC,IAAI;SACpB,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -15,7 +15,16 @@ import { AGGREGATED_NONCE, AUTHORIZATION_REQUEST, COHORT_ADVERT, COHORT_OPT_IN,
|
|
|
15
15
|
// Each guard validates `type` plus required body fields so it's safe to use
|
|
16
16
|
// on messages that have round-tripped through JSON / a relay.
|
|
17
17
|
const hasStr = (b, k) => !!b && typeof b[k] === 'string';
|
|
18
|
-
|
|
18
|
+
/** Present, an integer, and >= min. */
|
|
19
|
+
const hasIntMin = (b, k, min) => {
|
|
20
|
+
const v = b ? b[k] : undefined;
|
|
21
|
+
return typeof v === 'number' && Number.isInteger(v) && v >= min;
|
|
22
|
+
};
|
|
23
|
+
/** Absent, or present as an integer >= min. */
|
|
24
|
+
const optIntMin = (b, k, min) => {
|
|
25
|
+
const v = b ? b[k] : undefined;
|
|
26
|
+
return v === undefined || (typeof v === 'number' && Number.isInteger(v) && v >= min);
|
|
27
|
+
};
|
|
19
28
|
const hasBool = (b, k) => !!b && typeof b[k] === 'boolean';
|
|
20
29
|
const hasBytes = (b, k) => !!b && b[k] instanceof Uint8Array;
|
|
21
30
|
const hasBytesArray = (b, k) => {
|
|
@@ -23,9 +32,14 @@ const hasBytesArray = (b, k) => {
|
|
|
23
32
|
return Array.isArray(v) && v.every(x => x instanceof Uint8Array);
|
|
24
33
|
};
|
|
25
34
|
export function isCohortAdvertMessage(m) {
|
|
35
|
+
// Range-check the participant bounds so a malformed advert (missing or
|
|
36
|
+
// zero/negative minParticipants) is rejected rather than silently accepted as
|
|
37
|
+
// a zero-floor cohort. The service does the full cross-field validation at
|
|
38
|
+
// createCohort (see validateCohortConditions); here we guard the wire shape.
|
|
26
39
|
return m.type === COHORT_ADVERT
|
|
27
40
|
&& hasStr(m.body, 'cohortId')
|
|
28
|
-
&&
|
|
41
|
+
&& hasIntMin(m.body, 'minParticipants', 1)
|
|
42
|
+
&& optIntMin(m.body, 'maxParticipants', 1)
|
|
29
43
|
&& hasStr(m.body, 'beaconType')
|
|
30
44
|
&& hasStr(m.body, 'network')
|
|
31
45
|
&& hasBytes(m.body, 'communicationPk');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bodies.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/messages/bodies.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;
|
|
1
|
+
{"version":3,"file":"bodies.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/messages/bodies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factories.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/messages/factories.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"factories.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/messages/factories.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { Transaction } from '@scure/btc-signer';
|
|
|
4
4
|
import { getBeaconStrategy } from './beacon-strategy.js';
|
|
5
5
|
import { AggregationCohort } from './cohort.js';
|
|
6
6
|
import { AggregationParticipantError } from './errors.js';
|
|
7
|
+
import { isCohortAdvertMessage } from './messages/bodies.js';
|
|
7
8
|
import { AGGREGATION_WIRE_VERSION } from './messages/base.js';
|
|
8
9
|
import { AGGREGATED_NONCE, AUTHORIZATION_REQUEST, COHORT_ADVERT, COHORT_OPT_IN_ACCEPT, COHORT_READY, DISTRIBUTE_AGGREGATED_DATA, } from './messages/constants.js';
|
|
9
10
|
import { createCohortOptInMessage, createNonceContributionMessage, createSignatureAuthorizationMessage, createSubmitUpdateMessage, createValidationAckMessage, } from './messages/factories.js';
|
|
@@ -78,18 +79,19 @@ export class AggregationParticipant {
|
|
|
78
79
|
return map;
|
|
79
80
|
}
|
|
80
81
|
#handleCohortAdvert(message) {
|
|
81
|
-
|
|
82
|
-
|
|
82
|
+
// Validate the wire shape (incl. minParticipants range) before trusting it,
|
|
83
|
+
// rather than reading fields with `?? 0` fallbacks (see ADR 039).
|
|
84
|
+
if (!isCohortAdvertMessage(message))
|
|
83
85
|
return;
|
|
86
|
+
const { cohortId, network, communicationPk, ...conditions } = message.body;
|
|
84
87
|
if (this.#cohortStates.has(cohortId))
|
|
85
88
|
return; // Already known
|
|
86
89
|
const advert = {
|
|
87
90
|
cohortId,
|
|
88
91
|
serviceDid: message.from,
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
serviceCommunicationPk: message.body?.communicationPk ?? new Uint8Array(),
|
|
92
|
+
network,
|
|
93
|
+
serviceCommunicationPk: communicationPk,
|
|
94
|
+
...conditions,
|
|
93
95
|
};
|
|
94
96
|
this.#cohortStates.set(cohortId, {
|
|
95
97
|
phase: ParticipantCohortPhase.Discovered,
|
|
@@ -111,7 +113,7 @@ export class AggregationParticipant {
|
|
|
111
113
|
const cohort = new AggregationCohort({
|
|
112
114
|
id: cohortId,
|
|
113
115
|
serviceDid: state.serviceDid,
|
|
114
|
-
minParticipants: state.advert.
|
|
116
|
+
minParticipants: state.advert.minParticipants,
|
|
115
117
|
network: state.advert.network,
|
|
116
118
|
beaconType: state.advert.beaconType,
|
|
117
119
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"participant.js","sourceRoot":"","sources":["../../../../src/core/aggregation/participant.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"participant.js","sourceRoot":"","sources":["../../../../src/core/aggregation/participant.ts"],"names":[],"mappings":"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"}
|
|
@@ -280,6 +280,14 @@ export class AggregationServiceRunner extends TypedEventEmitter {
|
|
|
280
280
|
const decision = await this.#onOptInReceived(optIn);
|
|
281
281
|
if (!decision.accepted)
|
|
282
282
|
return;
|
|
283
|
+
// Don't accept past the advertised maxParticipants: acceptParticipant
|
|
284
|
+
// would throw COHORT_FULL and fail the run. Silently ignore the surplus
|
|
285
|
+
// opt-in (the cohort is full).
|
|
286
|
+
const maxParticipants = this.#config.maxParticipants;
|
|
287
|
+
const cohortNow = this.session.getCohort(this.#cohortId);
|
|
288
|
+
if (maxParticipants !== undefined && cohortNow && cohortNow.participants.length >= maxParticipants) {
|
|
289
|
+
return;
|
|
290
|
+
}
|
|
283
291
|
await this.#sendAll(this.session.acceptParticipant(this.#cohortId, msg.from));
|
|
284
292
|
this.emit('participant-accepted', { participantDid: msg.from });
|
|
285
293
|
// Check if it's time to finalize. The `#finalizing` flag is set synchronously
|