@did-btcr2/method 0.22.0 → 0.24.1

package/src/core/beacon/aggregation/coordinator.ts

@@ -1,4 +1,4 @@
-import { Logger, Maybe } from '@did-btcr2/common';
+import { Maybe } from '@did-btcr2/common';
 import { RawSchnorrKeyPair } from '@did-btcr2/keypair';
 import { BeaconCoordinatorError } from '../error.js';
 import { AggregateBeaconCohort } from './cohort/index.js';
@@ -6,12 +6,12 @@ import {
   BEACON_COHORT_ADVERT,
   BEACON_COHORT_NONCE_CONTRIBUTION,
   BEACON_COHORT_OPT_IN,
-  BEACON_COHORT_OPT_IN_ACCEPT,
   BEACON_COHORT_REQUEST_SIGNATURE,
   BEACON_COHORT_SIGNATURE_AUTHORIZATION
 } from './cohort/messages/constants.js';
 import { BeaconCohortAdvertMessage } from './cohort/messages/keygen/cohort-advert.js';
 import { BeaconCohortReadyMessage } from './cohort/messages/keygen/cohort-ready.js';
+import { BeaconCohortOptInAcceptMessage } from './cohort/messages/keygen/opt-in-accept.js';
 import { BeaconCohortOptInMessage, CohortOptInMessage } from './cohort/messages/keygen/opt-in.js';
 import { BeaconCohortAggregatedNonceMessage } from './cohort/messages/sign/aggregated-nonce.js';
 import { BeaconCohortNonceContributionMessage, CohortNonceContributionMessage } from './cohort/messages/sign/nonce-contribution.js';
@@ -98,7 +98,7 @@ export class BeaconCoordinator {
    * @returns {void}
    */
   start(): void {
-    Logger.info(`Setting up BeaconCoordinator ${this.name} (${this.did}) on ${this.protocol.name} ...`);
+    console.info(`Setting up BeaconCoordinator ${this.name} (${this.did}) on ${this.protocol.name} ...`);
     this.protocol.registerMessageHandler(BEACON_COHORT_OPT_IN, this.#handleOptIn.bind(this));
     this.protocol.registerMessageHandler(BEACON_COHORT_REQUEST_SIGNATURE, this.#handleRequestSignature.bind(this));
     this.protocol.registerMessageHandler(BEACON_COHORT_NONCE_CONTRIBUTION, this.#handleNonceContribution.bind(this));
@@ -117,7 +117,7 @@ export class BeaconCoordinator {
     const participant = optIn.from;
     const participantPk = optIn.body?.participantPk;
     if(!cohortId || !participant || !participantPk) {
-      Logger.warn(`Invalid opt-in message from ${participant}: missing cohortId, participant or participantPk`);
+      console.warn(`Invalid opt-in message from ${participant}: missing cohortId, participant or participantPk`);
       return;
     }
     const cohort = this.cohorts.find(c => c.id === cohortId);
@@ -142,16 +142,16 @@ export class BeaconCoordinator {
     const signatureRequest = BeaconCohortRequestSignatureMessage.fromJSON(message);
     const cohortId = signatureRequest.body?.cohortId;
     if (!cohortId) {
-      Logger.warn(`Signature request missing cohort ID from ${signatureRequest.from}`);
+      console.warn(`Signature request missing cohort ID from ${signatureRequest.from}`);
       return;
     }
     const cohort = this.cohorts.find(c => c.id === cohortId);
     if (!cohort) {
-      Logger.error(`Cohort with ID ${cohortId} not found.`);
+      console.error(`Cohort with ID ${cohortId} not found.`);
       return;
     }
     cohort.addSignatureRequest(signatureRequest);
-    Logger.info(`Received signature request from ${signatureRequest.from} for cohort ${cohortId}.`);
+    console.info(`Received signature request from ${signatureRequest.from} for cohort ${cohortId}.`);
   }
 
   /**
@@ -164,12 +164,12 @@ export class BeaconCoordinator {
     const nonceContribMessage = BeaconCohortNonceContributionMessage.fromJSON(message);
     const cohortId = nonceContribMessage.body?.cohortId;
     if (!cohortId) {
-      Logger.warn(`Nonce contribution message missing cohort ID from ${nonceContribMessage.from}`);
+      console.warn(`Nonce contribution message missing cohort ID from ${nonceContribMessage.from}`);
       return;
     }
     const sessionId = nonceContribMessage.body?.sessionId;
     if (!sessionId) {
-      Logger.warn(`Nonce contribution message missing session ID from ${nonceContribMessage.from}`);
+      console.warn(`Nonce contribution message missing session ID from ${nonceContribMessage.from}`);
       return;
     }
     // Get the signing session using the cohort ID from the message.
@@ -177,7 +177,7 @@ export class BeaconCoordinator {
 
     // If the signing session does not exist, log an error and return.
     if(!signingSession) {
-      Logger.error(`Session ${cohortId || sessionId} not found.`);
+      console.error(`Session ${cohortId || sessionId} not found.`);
       return;
     }
 
@@ -190,12 +190,12 @@ export class BeaconCoordinator {
     }
     const nonceContribution = nonceContribMessage.body?.nonceContribution;
     if(!nonceContribution) {
-      Logger.warn(`Nonce contribution message missing nonce contribution from ${nonceContribMessage.from}`);
+      console.warn(`Nonce contribution message missing nonce contribution from ${nonceContribMessage.from}`);
       return;
     }
     // Add the nonce contribution to the signing session.
     signingSession.addNonceContribution(nonceContribMessage.from, nonceContribution);
-    Logger.info(`Nonce contribution received from ${nonceContribMessage.from} for session ${sessionId}.`);
+    console.info(`Nonce contribution received from ${nonceContribMessage.from} for session ${sessionId}.`);
 
     if (signingSession.status !== SIGNING_SESSION_STATUS.NONCE_CONTRIBUTIONS_RECEIVED) {
       await this.sendAggregatedNonce(signingSession);
@@ -211,17 +211,17 @@ export class BeaconCoordinator {
     const sigAuthMessage = BeaconCohortSignatureAuthorizationMessage.fromJSON(message);
     const cohortId = sigAuthMessage.body?.cohortId;
     if (!cohortId) {
-      Logger.warn(`Signature authorization message missing cohort ID from ${sigAuthMessage.from}`);
+      console.warn(`Signature authorization message missing cohort ID from ${sigAuthMessage.from}`);
       return;
     }
     const sessionId = sigAuthMessage.body?.sessionId;
     if (!sessionId) {
-      Logger.warn(`Signature authorization message missing session ID from ${sigAuthMessage.from}`);
+      console.warn(`Signature authorization message missing session ID from ${sigAuthMessage.from}`);
       return;
     }
     const signingSession = this.activeSigningSessions.get(cohortId || sessionId);
     if (!signingSession) {
-      Logger.error(`Session ${sessionId} not found.`);
+      console.error(`Session ${sessionId} not found.`);
       return;
     }
 
@@ -240,12 +240,12 @@ export class BeaconCoordinator {
     }
     const partialSignature = sigAuthMessage.body?.partialSignature;
     if (!partialSignature) {
-      Logger.warn(`Signature authorization message missing partial signature from ${sigAuthMessage.from}`);
+      console.warn(`Signature authorization message missing partial signature from ${sigAuthMessage.from}`);
       return;
     }
     // Add the signature authorization to the signing session.
     signingSession.addPartialSignature(sigAuthMessage.from, partialSignature);
-    Logger.info(`Received partial signature from ${sigAuthMessage.from} for session ${sessionId}.`);
+    console.info(`Received partial signature from ${sigAuthMessage.from} for session ${sessionId}.`);
 
     if(signingSession.partialSignatures.size === signingSession.cohort.participants.length) {
       signingSession.status = SIGNING_SESSION_STATUS.PARTIAL_SIGNATURES_RECEIVED;
@@ -253,7 +253,7 @@ export class BeaconCoordinator {
 
     if (signingSession.status === SIGNING_SESSION_STATUS.PARTIAL_SIGNATURES_RECEIVED) {
       const signature = await signingSession.generateFinalSignature();
-      Logger.info(`Final signature ${Buffer.from(signature).toString('hex')} generated for session ${signingSession.id}`);
+      console.info(`Final signature ${Buffer.from(signature).toString('hex')} generated for session ${signingSession.id}`);
     }
   }
 
@@ -263,14 +263,14 @@ export class BeaconCoordinator {
    * @returns {Promise<void>}
    */
   private async _startKeyGeneration(cohort: AggregateBeaconCohort): Promise<void> {
-    Logger.info(`Starting key generation for cohort ${cohort.id} with participants: ${cohort.participants.join(', ')}`);
+    console.info(`Starting key generation for cohort ${cohort.id} with participants: ${cohort.participants.join(', ')}`);
     cohort.finalize();
     for(const participant of cohort.participants) {
       const message = cohort.getCohortReadyMessage(participant, this.did);
-      Logger.info(`Sending BEACON_COHORT_READY message to ${participant}`);
+      console.info(`Sending BEACON_COHORT_READY message to ${participant}`);
       await this.protocol.sendMessage(message, participant, this.did);
     }
-    Logger.info(`Finished sending BEACON_COHORT_READY message to ${cohort.participants.length} participants`);
+    console.info(`Finished sending BEACON_COHORT_READY message to ${cohort.participants.length} participants`);
   }
 
   /**
@@ -279,12 +279,8 @@ export class BeaconCoordinator {
    * @returns {Promise<void>}
    */
   async acceptSubscription(participant: string): Promise<void> {
-    Logger.info(`Accepting subscription from ${participant}`);
-    const message = {
-      type : BEACON_COHORT_OPT_IN_ACCEPT,
-      to   : participant,
-      from : this.did
-    };
+    console.info(`Accepting subscription from ${participant}`);
+    const message = new BeaconCohortOptInAcceptMessage({ to: participant, from: this.did });
     await this.protocol.sendMessage(message, this.did, participant);
   }
 
@@ -295,7 +291,7 @@ export class BeaconCoordinator {
    */
   async sendAggregatedNonce(session: BeaconCohortSigningSession): Promise<void> {
     const aggregatedNonce = session.generateAggregatedNonce();
-    Logger.info(`Aggregated Nonces for session ${session.id}:`, aggregatedNonce);
+    console.info(`Aggregated Nonces for session ${session.id}:`, aggregatedNonce);
 
     session.status = SIGNING_SESSION_STATUS.AWAITING_PARTIAL_SIGNATURES;
     for (const participant of session.cohort.participants) {
@@ -306,10 +302,10 @@ export class BeaconCoordinator {
         sessionId       : session.id,
         aggregatedNonce : aggregatedNonce
       });
-      Logger.info(`Sending AGGREGATED_NONCE message to ${participant}`);
+      console.info(`Sending AGGREGATED_NONCE message to ${participant}`);
       await this.protocol.sendMessage(message, participant, this.did);
     }
-    Logger.info(`Successfully sent aggregated nonce message to all participants in session ${session.id}.`);
+    console.info(`Successfully sent aggregated nonce message to all participants in session ${session.id}.`);
   }
 
   /**
@@ -325,7 +321,7 @@ export class BeaconCoordinator {
     beaconType: string = 'SMTBeacon'
   ): Promise<AggregateBeaconCohort> {
     const cohort = new AggregateBeaconCohort({ minParticipants, network, beaconType });
-    Logger.info(`Advertising new cohort ${cohort.id} ...`);
+    console.info(`Advertising new cohort ${cohort.id} ...`);
     this.cohorts.push(cohort);
     const message = new BeaconCohortAdvertMessage({
       from       : this.did,
@@ -334,9 +330,9 @@ export class BeaconCoordinator {
       network    : cohort.network,
       beaconType
     });
-    Logger.info(`Sending ${BEACON_COHORT_ADVERT} message to network ...`, message);
+    console.info(`Sending ${BEACON_COHORT_ADVERT} message to network ...`, message);
     await this.protocol.sendMessage(message, this.did);
-    Logger.info(`Cohort ${cohort.id} advertised successfully.`);
+    console.info(`Cohort ${cohort.id} advertised successfully.`);
     return cohort;
   }
 
@@ -349,13 +345,13 @@ export class BeaconCoordinator {
   async announceCohortReady(cohortId: string): Promise<AggregateBeaconCohort> {
     const cohort = this.cohorts.find(c => c.id === cohortId);
     if (!cohort) {
-      Logger.error(`Cohort with ID ${cohortId} not found.`);
+      console.error(`Cohort with ID ${cohortId} not found.`);
       throw new BeaconCoordinatorError(
         `Cohort with ID ${cohortId} not found.`,
         'COHORT_NOT_FOUND', { cohortId }
       );
     }
-    Logger.info(`Announcing cohort ${cohort.id} to ${cohort.participants.length} subscribers...`);
+    console.info(`Announcing cohort ${cohort.id} to ${cohort.participants.length} subscribers...`);
     this.cohorts.push(cohort);
     for (const participant of cohort.participants) {
       const message = new BeaconCohortReadyMessage({
@@ -365,7 +361,7 @@ export class BeaconCoordinator {
         beaconAddress : cohort.beaconAddress,
         cohortKeys    : cohort.cohortKeys,
       });
-      Logger.info(`Sending ${BEACON_COHORT_ADVERT} message to ${participant}`);
+      console.info(`Sending ${BEACON_COHORT_ADVERT} message to ${participant}`);
 
       await this.protocol.sendMessage(message, this.did, participant);
     }
@@ -379,24 +375,24 @@ export class BeaconCoordinator {
    * @throws {BeaconCoordinatorError} If the cohort with the given ID is not found.
    */
   async startSigningSession(cohortId: string): Promise<BeaconCohortSigningSession> {
-    Logger.info(`Attempting to start signing session for cohort ${cohortId}`);
+    console.info(`Attempting to start signing session for cohort ${cohortId}`);
     const cohort = this.cohorts.find(c => c.id === cohortId);
     if (!cohort) {
-      Logger.error(`Cohort with ID ${cohortId} not found.`);
+      console.error(`Cohort with ID ${cohortId} not found.`);
       throw new BeaconCoordinatorError(`Cohort with ID ${cohortId} not found.`, 'COHORT_NOT_FOUND');
     }
-    Logger.info(`Cohort ${cohortId} found. Starting signing session.`);
+    console.info(`Cohort ${cohortId} found. Starting signing session.`);
     const signingSession = cohort.startSigningSession();
-    Logger.info(`Starting signing session ${signingSession.id} for cohort ${cohortId}`);
+    console.info(`Starting signing session ${signingSession.id} for cohort ${cohortId}`);
     for (const participant of cohort.participants) {
       const msg = signingSession.getAuthorizationRequest(participant, this.did);
-      Logger.info(`Sending authorization request to ${participant}`);
+      console.info(`Sending authorization request to ${participant}`);
       await this.protocol.sendMessage(msg, this.did, participant).catch(error => {
-        Logger.error(`Error sending authorization request to ${participant}: ${error.message}`);
+        console.error(`Error sending authorization request to ${participant}: ${error.message}`);
       });
     }
     this.activeSigningSessions.set(cohortId, signingSession);
-    Logger.info(`Signing session ${signingSession.id} started for cohort ${cohortId}`);
+    console.info(`Signing session ${signingSession.id} started for cohort ${cohortId}`);
     return signingSession;
   }
 
@@ -412,7 +408,7 @@ export class BeaconCoordinator {
       did      : service.did,
       keys     : service.keys,
     });
-    Logger.info(`BeaconCoordinator ${coordinator.name} initialized with DID ${coordinator.did}. Run .start() to listen for messages`);
+    console.info(`BeaconCoordinator ${coordinator.name} initialized with DID ${coordinator.did}. Run .start() to listen for messages`);
     return coordinator;
   }
 }

package/src/core/beacon/aggregation/participant.ts

@@ -1,4 +1,4 @@
-import { KeyBytes, Logger, Maybe } from '@did-btcr2/common';
+import { KeyBytes, Maybe } from '@did-btcr2/common';
 import { HDKey } from '@scure/bip32';
 import { mnemonicToSeedSync } from '@scure/bip39';
 import * as musig2 from '@scure/btc-signer/musig2';
@@ -130,7 +130,7 @@ export class BeaconParticipant {
     this.protocol = protocol || new NostrAdapter();
     this.protocol.setKeys({ public: pk, secret });
     this.cohortKeyState.set('__UNSET__', this.beaconKeyIndex);
-    Logger.debug(`BeaconParticipant initialized with DID: ${this.did}, Name: ${this.name}, Key Index: ${this.beaconKeyIndex}`);
+    console.debug(`BeaconParticipant initialized with DID: ${this.did}, Name: ${this.name}, Key Index: ${this.beaconKeyIndex}`);
   }
 
   /**
@@ -138,7 +138,7 @@ export class BeaconParticipant {
    * @returns {void}
    */
   public start(): void {
-    Logger.info(`Setting up BeaconParticipant ${this.name} (${this.did}) on ${this.protocol.name} ...`);
+    console.info(`Setting up BeaconParticipant ${this.name} (${this.did}) on ${this.protocol.name} ...`);
     this.protocol.registerMessageHandler(BEACON_COHORT_ADVERT, this._handleCohortAdvert.bind(this));
     this.protocol.registerMessageHandler(BEACON_COHORT_OPT_IN_ACCEPT, this._handleSubscribeAccept.bind(this));
     this.protocol.registerMessageHandler(BEACON_COHORT_READY, this._handleCohortReady.bind(this));
@@ -171,10 +171,10 @@ export class BeaconParticipant {
       this.beaconKeyIndex = this.cohortKeyState.size + 1;
     }
     if(this.cohortKeyState.has(cohortId)) {
-      Logger.warn(`Cohort key state for cohort ${cohortId} already exists. Updating key index.`);
+      console.warn(`Cohort key state for cohort ${cohortId} already exists. Updating key index.`);
     }
     this.cohortKeyState.set(cohortId, this.beaconKeyIndex);
-    Logger.info(`Cohort key state updated. Next beacon key index: ${this.beaconKeyIndex + 1}`);
+    console.info(`Cohort key state updated. Next beacon key index: ${this.beaconKeyIndex + 1}`);
   }
 
   /**
@@ -196,7 +196,7 @@ export class BeaconParticipant {
     }
 
     if (this.cohortKeyState.has(cohortId)) {
-      Logger.warn(`Cohort key state already exists for ${cohortId}. Skipping migration from '__UNSET__'.`);
+      console.warn(`Cohort key state already exists for ${cohortId}. Skipping migration from '__UNSET__'.`);
       this.cohortKeyState.delete(unsetKey);
       return;
     }
@@ -204,7 +204,7 @@ export class BeaconParticipant {
     this.setCohortKey(cohortId);
     this.cohortKeyState.delete(unsetKey);
 
-    Logger.info(`Finalized '__UNSET__' CohortKeyState with ${cohortId} for ${this.did}`);
+    console.info(`Finalized '__UNSET__' CohortKeyState with ${cohortId} for ${this.did}`);
   }
 
   /**
@@ -226,25 +226,25 @@ export class BeaconParticipant {
    * @returns {Promise<void>}
    */
   public async _handleCohortAdvert(message: Maybe<CohortAdvertMessage>): Promise<void> {
-    Logger.debug('_handleCohortAdvert', message);
+    console.debug('_handleCohortAdvert', message);
     const cohortAdvertMessage = BeaconCohortAdvertMessage.fromJSON(message);
-    Logger.info(`Received new cohort announcement from ${cohortAdvertMessage.from}`, cohortAdvertMessage);
+    console.info(`Received new cohort announcement from ${cohortAdvertMessage.from}`, cohortAdvertMessage);
 
     const cohortId = cohortAdvertMessage.body?.cohortId;
     if (!cohortId) {
-      Logger.warn('Received malformed cohort advert message: missing cohortId', cohortAdvertMessage);
+      console.warn('Received malformed cohort advert message: missing cohortId', cohortAdvertMessage);
       return;
     }
 
     const network = cohortAdvertMessage.body?.network;
     if (!network) {
-      Logger.warn('Received malformed cohort advert message: missing network', cohortAdvertMessage);
+      console.warn('Received malformed cohort advert message: missing network', cohortAdvertMessage);
       return;
     }
 
     const minParticipants = cohortAdvertMessage.body?.cohortSize;
     if (!cohortId || !network || !minParticipants) {
-      Logger.warn('Received malformed cohort advert message: missing minParticipants', cohortAdvertMessage);
+      console.warn('Received malformed cohort advert message: missing minParticipants', cohortAdvertMessage);
       return;
     }
 
@@ -271,30 +271,30 @@ export class BeaconParticipant {
     const cohortId = cohortSetMessage.body?.cohortId;
     const cohort = this.cohorts.find(c => c.id === cohortId);
     if (!cohortId || !cohort) {
-      Logger.warn(`Cohort with ID ${cohortId} not found or not joined by participant ${this.did}.`);
+      console.warn(`Cohort with ID ${cohortId} not found or not joined by participant ${this.did}.`);
       return;
     }
     this.finalizeUnsetCohortKey(cohortId);
     const participantPkBytes = this.getCohortKey(cohortId).publicKey;
     if(!participantPkBytes) {
-      Logger.error(`Failed to derive public key for cohort ${cohortId}`);
+      console.error(`Failed to derive public key for cohort ${cohortId}`);
       return;
     }
     const participantPk = Buffer.from(participantPkBytes).toString('hex');
     const beaconAddress = cohortSetMessage.body?.beaconAddress;
     if(!beaconAddress) {
-      Logger.error(`Beacon address not provided in cohort set message for ${cohortId}`);
+      console.error(`Beacon address not provided in cohort set message for ${cohortId}`);
       return;
     }
     const cohortKeys = cohortSetMessage.body?.cohortKeys;
     if(!cohortKeys) {
-      Logger.error(`Cohort keys not provided in cohort set message for ${cohortId}`);
+      console.error(`Cohort keys not provided in cohort set message for ${cohortId}`);
       return;
     }
     const keys = cohortKeys.map(key => Buffer.from(key).toString('hex'));
     cohort.validateCohort([participantPk], keys, beaconAddress);
-    Logger.info(`BeaconParticipant w/ pk ${participantPk} successfully joined cohort ${cohortId} with beacon address ${beaconAddress}.`);
-    Logger.info(`Cohort status: ${cohort.status}`);
+    console.info(`BeaconParticipant w/ pk ${participantPk} successfully joined cohort ${cohortId} with beacon address ${beaconAddress}.`);
+    console.info(`Cohort status: ${cohort.status}`);
   }
 
   /**
@@ -306,17 +306,17 @@ export class BeaconParticipant {
     const authRequest = BeaconCohortAuthorizationRequestMessage.fromJSON(message);
     const cohort = this.cohorts.find(c => c.id === authRequest.body?.cohortId);
     if (!cohort) {
-      Logger.warn(`Authorization request for unknown cohort ${authRequest.body?.cohortId} from ${authRequest.from}`);
+      console.warn(`Authorization request for unknown cohort ${authRequest.body?.cohortId} from ${authRequest.from}`);
       return;
     }
     const id = authRequest.body?.sessionId;
     if (!id) {
-      Logger.warn(`Authorization request missing session ID from ${authRequest.from}`);
+      console.warn(`Authorization request missing session ID from ${authRequest.from}`);
       return;
     }
     const pendingTx = authRequest.body?.pendingTx;
     if (!pendingTx) {
-      Logger.warn(`Authorization request missing pending transaction from ${authRequest.from}`);
+      console.warn(`Authorization request missing pending transaction from ${authRequest.from}`);
       return;
     }
     const session = new BeaconCohortSigningSession({
@@ -338,23 +338,23 @@ export class BeaconParticipant {
     const aggNonceMessage = BeaconCohortAggregatedNonceMessage.fromJSON(message);
     const sessionId = aggNonceMessage.body?.sessionId;
     if (!sessionId) {
-      Logger.warn(`Aggregated nonce message missing session ID from ${aggNonceMessage.from}`);
+      console.warn(`Aggregated nonce message missing session ID from ${aggNonceMessage.from}`);
       return;
     }
     const session = this.activeSigningSessions.get(sessionId);
     if (!session) {
-      Logger.warn(`Aggregated nonce message received for unknown session ${sessionId}`);
+      console.warn(`Aggregated nonce message received for unknown session ${sessionId}`);
       return;
     }
     const aggregatedNonce = aggNonceMessage.body?.aggregatedNonce;
     if (!aggregatedNonce) {
-      Logger.warn(`Aggregated nonce message missing aggregated nonce from ${aggNonceMessage.from}`);
+      console.warn(`Aggregated nonce message missing aggregated nonce from ${aggNonceMessage.from}`);
       return;
     }
     session.aggregatedNonce = aggregatedNonce;
     const participantSk = this.getCohortKey(session.cohort.id).privateKey;
     if(!participantSk) {
-      Logger.error(`Failed to derive secret key for cohort ${session.cohort.id}`);
+      console.error(`Failed to derive secret key for cohort ${session.cohort.id}`);
       return;
     }
     const partialSig = session.generatePartialSignature(participantSk);
@@ -368,7 +368,7 @@ export class BeaconParticipant {
    */
   public async subscribeToCoordinator(coordinatorDid: string): Promise<any> {
     if(this.coordinatorDids.includes(coordinatorDid)) {
-      Logger.info(`Already subscribed to coordinator ${coordinatorDid}`);
+      console.info(`Already subscribed to coordinator ${coordinatorDid}`);
       return;
     }
     const subMessage = new BeaconCohortSubscribeMessage({ to: coordinatorDid, from: this.did });
@@ -382,16 +382,16 @@ export class BeaconParticipant {
    * @returns {Promise<void>}
    */
   public async joinCohort(cohortId: string, coordinatorDid: string): Promise<void> {
-    Logger.info(`BeaconParticipant ${this.did} joining cohort ${cohortId} with coordinator ${coordinatorDid}`);
+    console.info(`BeaconParticipant ${this.did} joining cohort ${cohortId} with coordinator ${coordinatorDid}`);
     this.finalizeUnsetCohortKey(cohortId);
     const cohort = this.cohorts.find(c => c.id === cohortId);
     if (!cohort) {
-      Logger.warn(`Cohort with ID ${cohortId} not found.`);
+      console.warn(`Cohort with ID ${cohortId} not found.`);
       return;
     }
     const pk = this.getCohortKey(cohortId).publicKey;
     if(!pk) {
-      Logger.error(`Failed to derive public key for cohort ${cohortId} at index ${this.beaconKeyIndex}`);
+      console.error(`Failed to derive public key for cohort ${cohortId} at index ${this.beaconKeyIndex}`);
       return;
     }
     this.setCohortKey(cohortId);
@@ -415,11 +415,11 @@ export class BeaconParticipant {
   public async requestCohortSignature(cohortId: string, data: string): Promise<boolean> {
     const cohort = this.cohorts.find(c => c.id === cohortId);
     if (!cohort) {
-      Logger.warn(`Cohort with ID ${cohortId} not found.`);
+      console.warn(`Cohort with ID ${cohortId} not found.`);
       return false;
     }
     if(cohort.status !== COHORT_STATUS.COHORT_SET_STATUS) {
-      Logger.warn(`Cohort ${cohortId} not in a set state. Current status: ${cohort.status}`);
+      console.warn(`Cohort ${cohortId} not in a set state. Current status: ${cohort.status}`);
       return false;
     }
     const reqSigMessage = new BeaconCohortRequestSignatureMessage({
@@ -469,16 +469,14 @@ export class BeaconParticipant {
     session: BeaconCohortSigningSession
   ): Promise<void> {
     const nonceContributionMessage = BeaconCohortNonceContributionMessage.fromJSON({
-      to        : cohort.coordinatorDid,
-      from      : this.did,
-      body : {
-        sessionId : session.id,
-        cohortId  : cohort.id,
-        nonceContribution
-      }
+      to                : cohort.coordinatorDid,
+      from              : this.did,
+      sessionId         : session.id,
+      cohortId          : cohort.id,
+      nonceContribution
     });
     await this.protocol.sendMessage(nonceContributionMessage, this.did, cohort.coordinatorDid);
-    Logger.info(`Nonce contribution sent for session ${session.id} in cohort ${cohort.id} by participant ${this.did}`);
+    console.info(`Nonce contribution sent for session ${session.id} in cohort ${cohort.id} by participant ${this.did}`);
   }
 
   /**
@@ -496,7 +494,7 @@ export class BeaconParticipant {
       partialSignature : partialSig,
     });
     await this.protocol.sendMessage(sigAuthMessage, this.did, session.cohort.coordinatorDid);
-    Logger.info(`Partial signature sent for session ${session.id} in cohort ${session.cohort.id} by participant ${this.did}`);
+    console.info(`Partial signature sent for session ${session.id} in cohort ${session.cohort.id} by participant ${this.did}`);
   }
 
   /**

package/src/core/beacon/aggregation/session/index.ts

@@ -1,4 +1,3 @@
-import { Logger } from '@did-btcr2/common';
 import * as musig2 from '@scure/btc-signer/musig2';
 import { Transaction } from 'bitcoinjs-lib';
 import { AggregateBeaconError } from '../../error.js';
@@ -166,7 +165,7 @@ export class BeaconCohortSigningSession implements SigningSession {
     }
 
     if (this.nonceContributions.get(from)) {
-      Logger.warn(`WARNING: Nonce contribution already received from ${from}.`);
+      console.warn(`WARNING: Nonce contribution already received from ${from}.`);
     }
 
     this.nonceContributions.set(from, nonceContribution);
@@ -188,7 +187,7 @@ export class BeaconCohortSigningSession implements SigningSession {
         `Missing ${missing} nonce contributions. ` +
         `Received ${this.cohort?.participants.length} of ${this.nonceContributions.size} nonce contributions. ` +
         `Current status: ${this.status}`,
-        'NONCE_CONTRIBUTION_ERROR', this.json()
+        'NONCE_CONTRIBUTION_ERROR', this.toJSON()
       );
     }
     const sortedPubkeys = musig2.sortKeys(this.cohort.cohortKeys);
@@ -210,7 +209,7 @@ export class BeaconCohortSigningSession implements SigningSession {
     }
 
     if(this.partialSignatures.get(from)) {
-      Logger.warn(`WARNING: Partial signature already received from ${from}.`);
+      console.warn(`WARNING: Partial signature already received from ${from}.`);
     }
 
     this.partialSignatures.set(from, partialSignature);
@@ -236,7 +235,7 @@ export class BeaconCohortSigningSession implements SigningSession {
     }
 
     const sigSum = [...this.partialSignatures.values()].reduce((sum, sig) => sum + bigEndianToInt(sig), 0n);
-    Logger.info(`Aggregated Signature computed: ${sigSum}`);
+    console.info(`Aggregated Signature computed: ${sigSum}`);
 
     this.aggregatedNonce ??= this.generateAggregatedNonce();
 
@@ -267,8 +266,20 @@ export class BeaconCohortSigningSession implements SigningSession {
    * Converts the signing session instance to a JSON object representation.
    * @returns {BeaconCohortSigningSession} The JSON object representation of the signing session.
    */
-  public json(): BeaconCohortSigningSession {
-    return Object.fromEntries(Object.entries(this)) as BeaconCohortSigningSession;
+  public toJSON(): Partial<BeaconCohortSigningSession> {
+    return {
+      id                 : this.id,
+      cohort             : this.cohort,
+      pendingTx          : this.pendingTx,
+      nonceContributions : this.nonceContributions,
+      aggregatedNonce    : this.aggregatedNonce,
+      partialSignatures  : this.partialSignatures,
+      signature          : this.signature,
+      status             : this.status,
+      processedRequests  : this.processedRequests,
+      nonceSecrets       : this.nonceSecrets,
+      musig2Session      : this.musig2Session
+    };
   }
 
   /**

package/src/core/beacon/beacon.ts

@@ -1,5 +1,5 @@
 import { KeyBytes } from '@did-btcr2/common';
-import { BitcoinNetworkConnection } from '../../../../bitcoin/dist/types/bitcoin.js';
+import { BitcoinConnection } from '@did-btcr2/bitcoin';
 import { SignedBTCR2Update } from '../../../../cryptosuite/dist/types/data-integrity-proof/interface.js';
 import { SidecarData } from '../types.js';
 import { BeaconService, BeaconSignal, BlockMetadata } from './interfaces.js';
@@ -47,12 +47,12 @@ export abstract class Beacon {
    * Used during the update path.
    * @param {SignedBTCR2Update} signedUpdate The signed BTCR2 update to broadcast.
    * @param {KeyBytes} secretKey The secret key for signing the Bitcoin transaction.
-   * @param {BitcoinNetworkConnection} bitcoin The Bitcoin network connection.
+   * @param {BitcoinConnection} bitcoin The Bitcoin network connection.
    * @returns {Promise<SignedBTCR2Update>} The signed update that was broadcast.
    */
   abstract broadcastSignal(
     signedUpdate: SignedBTCR2Update,
     secretKey: KeyBytes,
-    bitcoin: BitcoinNetworkConnection
+    bitcoin: BitcoinConnection
   ): Promise<SignedBTCR2Update>;
 }

package/src/core/beacon/cas-beacon.ts

@@ -1,4 +1,4 @@
-import { BitcoinNetworkConnection } from '@did-btcr2/bitcoin';
+import { BitcoinConnection } from '@did-btcr2/bitcoin';
 import { KeyBytes } from '@did-btcr2/common';
 import { SignedBTCR2Update } from '@did-btcr2/cryptosuite';
 import { SidecarData } from '../types.js';
@@ -39,14 +39,14 @@ export class CASBeacon extends Beacon {
    * Broadcast CAS Beacon signal to the Bitcoin network.
    * @param {SignedBTCR2Update} signedUpdate The signed BTCR2 update to broadcast.
    * @param {KeyBytes} secretKey The secret key for signing the Bitcoin transaction.
-   * @param {BitcoinNetworkConnection} bitcoin The Bitcoin network connection.
+   * @param {BitcoinConnection} bitcoin The Bitcoin network connection.
    * @return {Promise<SignedBTCR2Update>} The signed update that was broadcasted.
    * @throws {CASBeaconError} if broadcasting fails.
    */
   async broadcastSignal(
     signedUpdate: SignedBTCR2Update,
     secretKey: KeyBytes,
-    bitcoin: BitcoinNetworkConnection
+    bitcoin: BitcoinConnection
   ): Promise<SignedBTCR2Update> {
     throw new CASBeaconError('Method not implemented.', `METHOD_NOT_IMPLEMENTED`, {signedUpdate, secretKey, bitcoin});
   }