@did-btcr2/method 0.25.3 → 0.27.0

package/dist/esm/core/aggregation/transport/didcomm.js

@@ -0,0 +1,32 @@
+import { NotImplementedError } from '@did-btcr2/common';
+/**
+ * DIDComm Transport (stub).
+ *
+ * @class DidCommTransport
+ * @implements {Transport}
+ */
+export class DidCommTransport {
+    name = 'didcomm';
+    start() {
+        throw new NotImplementedError('DidCommTransport not implemented. Use NostrTransport instead.');
+    }
+    registerActor(_did, _keys) {
+        throw new NotImplementedError('DidCommTransport not implemented.');
+    }
+    getActorPk(_did) {
+        throw new NotImplementedError('DidCommTransport not implemented.');
+    }
+    registerPeer(_did, _communicationPk) {
+        throw new NotImplementedError('DidCommTransport not implemented.');
+    }
+    getPeerPk(_did) {
+        throw new NotImplementedError('DidCommTransport not implemented.');
+    }
+    registerMessageHandler(_actorDid, _messageType, _handler) {
+        throw new NotImplementedError('DidCommTransport not implemented.');
+    }
+    async sendMessage(_message, _sender, _recipient) {
+        throw new NotImplementedError('DidCommTransport not implemented.');
+    }
+}
+//# sourceMappingURL=didcomm.js.map

package/dist/esm/core/aggregation/transport/didcomm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"didcomm.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/transport/didcomm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAKxD;;;;;GAKG;AACH,MAAM,OAAO,gBAAgB;IACpB,IAAI,GAAW,SAAS,CAAC;IAEzB,KAAK;QACV,MAAM,IAAI,mBAAmB,CAAC,+DAA+D,CAAC,CAAC;IACjG,CAAC;IAEM,aAAa,CAAC,IAAY,EAAE,KAAqB;QACtD,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;IACrE,CAAC;IAEM,UAAU,CAAC,IAAY;QAC5B,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;IACrE,CAAC;IAEM,YAAY,CAAC,IAAY,EAAE,gBAA4B;QAC5D,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;IACrE,CAAC;IAEM,SAAS,CAAC,IAAY;QAC3B,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;IACrE,CAAC;IAEM,sBAAsB,CAAC,SAAiB,EAAE,YAAoB,EAAE,QAAwB;QAC7F,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,QAAqB,EAAE,OAAe,EAAE,UAAmB;QAClF,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;IACrE,CAAC;CACF"}

package/dist/esm/core/aggregation/transport/error.js

@@ -0,0 +1,12 @@
+import { MethodError } from '@did-btcr2/common';
+export class TransportError extends MethodError {
+    constructor(message, type = 'TransportError', data) {
+        super(message, type, data);
+    }
+}
+export class TransportAdapterError extends MethodError {
+    constructor(message, type = 'TransportAdapterError', data) {
+        super(message, type, data);
+    }
+}
+//# sourceMappingURL=error.js.map

package/dist/esm/core/aggregation/transport/error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/transport/error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,OAAO,cAAe,SAAQ,WAAW;IAC7C,YAAY,OAAe,EAAE,OAAe,gBAAgB,EAAE,IAA0B;QACtF,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,WAAW;IACpD,YAAY,OAAe,EAAE,OAAe,uBAAuB,EAAE,IAA0B;QAC7F,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF"}

package/dist/esm/core/aggregation/transport/factory.js

@@ -0,0 +1,20 @@
+import { NotImplementedError } from '@did-btcr2/common';
+import { NostrTransport } from './nostr.js';
+import { TransportError } from './error.js';
+/**
+ * Factory for creating Transport instances.
+ * @class TransportFactory
+ */
+export class TransportFactory {
+    static establish(config) {
+        switch (config.type) {
+            case 'nostr':
+                return new NostrTransport({ relays: config.relays });
+            case 'didcomm':
+                throw new NotImplementedError('DIDComm transport not implemented yet.');
+            default:
+                throw new TransportError(`Invalid transport type: ${config.type}`, 'INVALID_TRANSPORT_TYPE', { config });
+        }
+    }
+}
+//# sourceMappingURL=factory.js.map

package/dist/esm/core/aggregation/transport/factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/transport/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAQ5C;;;GAGG;AACH,MAAM,OAAO,gBAAgB;IAC3B,MAAM,CAAC,SAAS,CAAC,MAAuB;QACtC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,OAAO;gBACV,OAAO,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YACvD,KAAK,SAAS;gBACZ,MAAM,IAAI,mBAAmB,CAAC,wCAAwC,CAAC,CAAC;YAC1E;gBACE,MAAM,IAAI,cAAc,CACtB,2BAA2B,MAAM,CAAC,IAAI,EAAE,EACxC,wBAAwB,EAAE,EAAE,MAAM,EAAE,CACrC,CAAC;QACN,CAAC;IACH,CAAC;CACF"}

package/dist/esm/core/aggregation/transport/index.js

@@ -0,0 +1,6 @@
+export * from './transport.js';
+export * from './error.js';
+export * from './factory.js';
+export * from './nostr.js';
+export * from './didcomm.js';
+//# sourceMappingURL=index.js.map

package/dist/esm/core/aggregation/transport/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/transport/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}

package/dist/esm/core/aggregation/transport/nostr.js

@@ -0,0 +1,262 @@
+var _a;
+import { CompressedSecp256k1PublicKey } from '@did-btcr2/keypair';
+import { bytesToHex, hexToBytes } from '@noble/hashes/utils';
+import { finalizeEvent, nip44 } from 'nostr-tools';
+import { SimplePool } from 'nostr-tools/pool';
+import { COHORT_ADVERT } from '../messages/constants.js';
+import { isAggregationMessageType, isKeygenMessageType, isSignMessageType, isUpdateMessageType } from '../messages/guards.js';
+import { TransportAdapterError } from './error.js';
+/**
+ * Default Nostr relay URLs.
+ * @constant {Array<string>} DEFAULT_NOSTR_RELAYS
+ */
+export const DEFAULT_NOSTR_RELAYS = [
+    'wss://relay.damus.io',
+    'wss://nos.lol',
+    'wss://relay.snort.social',
+    'wss://nostr-pub.wellorder.net',
+];
+/**
+ * Nostr Transport for did:btcr2 aggregation messages.
+ *
+ * A single NostrTransport manages one relay pool and supports multiple
+ * registered actors. Each actor registers its own DID and keys via
+ * {@link registerActor}; the transport resolves the correct identity when
+ * sending or receiving.
+ *
+ * Message routing:
+ * - Keygen messages (COHORT_ADVERT, COHORT_OPT_IN, COHORT_OPT_IN_ACCEPT, COHORT_READY) → kind 1 (plaintext)
+ * - Update messages (SUBMIT_UPDATE, DISTRIBUTE_AGGREGATED_DATA, VALIDATION_ACK) → kind 1059 (NIP-44 encrypted)
+ * - Sign messages → kind 1059 (NIP-44 encrypted)
+ *
+ * @class NostrTransport
+ * @implements {Transport}
+ */
+export class NostrTransport {
+    name = 'nostr';
+    pool;
+    #relays;
+    #actors = new Map();
+    #peerRegistry = new Map();
+    #started = false;
+    constructor(config) {
+        this.#relays = config?.relays ?? DEFAULT_NOSTR_RELAYS;
+    }
+    /**
+     * Registers an actor (DID + keys) to send/receive messages with.
+     * Must be called before start() to ensure subscriptions are created for the actor.
+     * @param {string} did - The DID of the actor.
+     * @param {SchnorrKeyPair} keys - The Schnorr key pair for the actor.
+     * @throws {TransportAdapterError} If the actor is already registered or if the transport has already started.
+     * @example
+     * const transport = new NostrTransport();
+     * const keys = SchnorrKeyPair.generate();
+     * transport.registerActor('did:btcr2:...', keys);
+     * transport.start();
+     */
+    registerActor(did, keys) {
+        const entry = { keys, handlers: new Map() };
+        this.#actors.set(did, entry);
+        // If already started, create a directed subscription for this actor
+        if (this.#started && this.pool) {
+            this.#subscribeDirected(did, entry);
+        }
+    }
+    getActorPk(did) {
+        return this.#actors.get(did)?.keys.publicKey.compressed;
+    }
+    registerPeer(did, communicationPk) {
+        try {
+            new CompressedSecp256k1PublicKey(communicationPk);
+        }
+        catch {
+            throw new TransportAdapterError(`Invalid communication public key for peer ${did}: expected a 33-byte compressed secp256k1 key.`, 'INVALID_PEER_KEY', { adapter: this.name, did, keyLength: communicationPk.length });
+        }
+        this.#peerRegistry.set(did, communicationPk);
+    }
+    getPeerPk(did) {
+        return this.#peerRegistry.get(did);
+    }
+    registerMessageHandler(actorDid, messageType, handler) {
+        const actor = this.#actors.get(actorDid);
+        if (!actor) {
+            throw new TransportAdapterError(`Cannot register handler: actor ${actorDid} not registered. Call registerActor() first.`, 'UNKNOWN_ACTOR_ERROR', { adapter: this.name, did: actorDid });
+        }
+        actor.handlers.set(messageType, handler);
+    }
+    start() {
+        if (this.#started)
+            return this;
+        this.#started = true;
+        this.pool = new SimplePool();
+        const since = Math.floor(Date.now() / 1000);
+        // Broadcast subscription: kind 1 COHORT_ADVERT events (all actors receive these)
+        this.pool.subscribeMany(this.#relays, { kinds: [1], '#t': [COHORT_ADVERT], since }, {
+            onclose: (reasons) => console.debug('Nostr broadcast subscription closed', reasons),
+            onevent: this.#handleBroadcastEvent.bind(this),
+        });
+        // Directed subscriptions for any actors already registered
+        for (const [did, entry] of this.#actors) {
+            this.#subscribeDirected(did, entry);
+        }
+        console.info(`NostrTransport started, listening on ${this.#relays.length} relay(s)`);
+        return this;
+    }
+    async sendMessage(message, sender, to) {
+        const type = message.type;
+        if (!type) {
+            throw new TransportAdapterError('Message type is undefined', 'SEND_MESSAGE_ERROR', { adapter: this.name, type });
+        }
+        const actor = this.#actors.get(sender);
+        if (!actor) {
+            throw new TransportAdapterError(`Unknown sender: ${sender}. Call registerActor() before sending messages.`, 'UNKNOWN_ACTOR_ERROR', { adapter: this.name, did: sender });
+        }
+        const senderKeys = actor.keys;
+        // Sender p-tag matches the event signing key
+        const tags = [
+            ['p', bytesToHex(senderKeys.publicKey.x)],
+            ['t', type],
+        ];
+        if (to) {
+            const recipientPkBytes = this.#peerRegistry.get(to);
+            if (recipientPkBytes) {
+                const recipientPk = new CompressedSecp256k1PublicKey(recipientPkBytes);
+                tags.push(['p', bytesToHex(recipientPk.x)]);
+            }
+        }
+        // Keygen messages: plaintext, kind 1
+        if (isKeygenMessageType(type)) {
+            const event = finalizeEvent({
+                kind: 1,
+                created_at: Math.floor(Date.now() / 1000),
+                tags,
+                content: JSON.stringify(message, _a.#jsonReplacer),
+            }, senderKeys.secretKey.bytes);
+            console.debug(`Publishing kind 1 [${type}]`);
+            await this.#publishToRelays(event);
+            return;
+        }
+        // Update and sign messages: NIP-44 encrypted, kind 1059
+        if (isUpdateMessageType(type) || isSignMessageType(type)) {
+            if (!to) {
+                throw new TransportAdapterError(`Encrypted messages require a recipient DID, got undefined for type: ${type}`, 'SEND_MESSAGE_ERROR', { adapter: this.name });
+            }
+            const recipientPkBytes = this.#peerRegistry.get(to);
+            if (!recipientPkBytes) {
+                throw new TransportAdapterError(`Unknown peer DID: ${to}. Register peer via registerPeer() before sending encrypted messages.`, 'UNKNOWN_PEER_ERROR', { adapter: this.name, did: to });
+            }
+            const recipientPk = new CompressedSecp256k1PublicKey(recipientPkBytes);
+            const conversationKey = nip44.v2.utils.getConversationKey(senderKeys.secretKey.bytes, bytesToHex(recipientPk.x));
+            const content = nip44.v2.encrypt(JSON.stringify(message, _a.#jsonReplacer), conversationKey);
+            const event = finalizeEvent({
+                kind: 1059,
+                created_at: Math.floor(Date.now() / 1000),
+                tags,
+                content,
+            }, senderKeys.secretKey.bytes);
+            console.debug(`Publishing kind 1059 [${type}]`);
+            await this.#publishToRelays(event);
+            return;
+        }
+        console.warn(`Unsupported message type: ${type}`);
+    }
+    #subscribeDirected(did, entry) {
+        if (!this.pool)
+            return;
+        const pkHex = bytesToHex(entry.keys.publicKey.x);
+        const since = Math.floor(Date.now() / 1000);
+        this.pool.subscribeMany(this.#relays, { kinds: [1, 1059], '#p': [pkHex], since }, {
+            onclose: (reasons) => console.debug(`Nostr directed subscription closed for ${did}`, reasons),
+            onevent: this.#makeActorEventHandler(did),
+        });
+    }
+    #makeActorEventHandler(actorDid) {
+        return async (event) => {
+            const actor = this.#actors.get(actorDid);
+            if (!actor)
+                return;
+            let message;
+            try {
+                if (event.kind === 1) {
+                    message = JSON.parse(event.content, _a.#jsonReviver);
+                }
+                else if (event.kind === 1059) {
+                    const conversationKey = nip44.v2.utils.getConversationKey(actor.keys.secretKey.bytes, event.pubkey);
+                    const plaintext = nip44.v2.decrypt(event.content, conversationKey);
+                    message = JSON.parse(plaintext, _a.#jsonReviver);
+                }
+                else {
+                    return;
+                }
+            }
+            catch (err) {
+                console.debug(`Failed to parse event ${event.id} for ${actorDid}:`, err);
+                return;
+            }
+            this.#dispatchMessage(message, actor);
+        };
+    }
+    async #handleBroadcastEvent(event) {
+        if (event.kind !== 1)
+            return;
+        let message;
+        try {
+            message = JSON.parse(event.content, _a.#jsonReviver);
+        }
+        catch (err) {
+            console.debug(`Failed to parse broadcast event ${event.id}:`, err);
+            return;
+        }
+        if (message.body && typeof message.body === 'object') {
+            message = { ...message, ...message.body };
+        }
+        const messageType = message.type;
+        if (!messageType || !isAggregationMessageType(messageType))
+            return;
+        // Dispatch to ALL actors that have a handler for this message type
+        for (const actor of this.#actors.values()) {
+            const handler = actor.handlers.get(messageType);
+            if (handler)
+                await handler(message);
+        }
+    }
+    #dispatchMessage(message, actor) {
+        if (message.body && typeof message.body === 'object') {
+            message = { ...message, ...message.body };
+        }
+        const messageType = message.type;
+        if (!messageType || !isAggregationMessageType(messageType))
+            return;
+        const handler = actor.handlers.get(messageType);
+        if (handler)
+            handler(message);
+    }
+    async #publishToRelays(event) {
+        const relayPromises = this.pool?.publish(this.#relays, event);
+        if (!relayPromises?.length)
+            return;
+        const results = await Promise.allSettled(relayPromises);
+        const accepted = results.filter(r => r.status === 'fulfilled').length;
+        const rejected = results.filter(r => r.status === 'rejected');
+        for (const r of rejected) {
+            console.debug(`Relay rejected event ${event.id}: ${r.reason}`);
+        }
+        if (accepted === 0) {
+            throw new TransportAdapterError(`All ${results.length} relay(s) rejected event ${event.id}`, 'PUBLISH_ERROR', { adapter: this.name, reasons: rejected.map(r => String(r.reason)) });
+        }
+    }
+    static #jsonReplacer(_key, value) {
+        if (value instanceof Uint8Array) {
+            return { __bytes: bytesToHex(value) };
+        }
+        return value;
+    }
+    static #jsonReviver(_key, value) {
+        if (value && typeof value === 'object' && '__bytes' in value) {
+            return hexToBytes(value.__bytes);
+        }
+        return value;
+    }
+}
+_a = NostrTransport;
+//# sourceMappingURL=nostr.js.map

package/dist/esm/core/aggregation/transport/nostr.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nostr.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/transport/nostr.ts"],"names":[],"mappings":"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"}

package/dist/esm/core/aggregation/transport/transport.js

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

package/dist/esm/core/aggregation/transport/transport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../../../src/core/aggregation/transport/transport.ts"],"names":[],"mappings":""}

package/dist/esm/core/beacon/beacon.js

@@ -1,3 +1,10 @@
+import { SchnorrKeyPair } from '@did-btcr2/keypair';
+import { hexToBytes } from '@noble/hashes/utils';
+import { opcodes, Psbt, script } from 'bitcoinjs-lib';
+import { BeaconError } from './error.js';
+import { StaticFeeEstimator } from './fee-estimator.js';
+/** Default fee estimator used when none is supplied. ~5 sat/vB static rate. */
+const DEFAULT_FEE_ESTIMATOR = new StaticFeeEstimator(5);
 /**
  * Abstract base class for all BTCR2 Beacon types.
  * A Beacon is a service listed in a BTCR2 DID document that informs resolvers
@@ -21,5 +28,78 @@ export class Beacon {
     constructor(service) {
         this.service = service;
     }
+    /**
+     * Shared PSBT construction + signing + broadcast helper used by all beacon types.
+     *
+     * Steps:
+     * 1. Parse the beacon's `serviceEndpoint` (stripping `bitcoin:` prefix) into a Bitcoin address.
+     * 2. Query the address for unconfirmed/confirmed UTXOs.
+     * 3. Select the most recent confirmed UTXO.
+     * 4. Fetch the previous transaction hex for `nonWitnessUtxo`.
+     * 5. Build a PSBT: input (UTXO) → change output + OP_RETURN(signalBytes).
+     * 6. Compute the fee via the supplied (or default) {@link FeeEstimator} against the tx vsize.
+     * 7. Sign input 0 with an ECDSA signer derived from `secretKey`.
+     * 8. Finalize, extract, and broadcast via the REST transaction endpoint.
+     *
+     * Fee handling: the PSBT is constructed with a placeholder change amount, signed to measure
+     * vsize, then the change is adjusted to pay the actual fee and the input re-signed. This
+     * two-pass approach avoids hardcoded fee constants and produces a tx that matches the
+     * estimator's rate.
+     *
+     * @param signalBytes 32-byte payload to embed in OP_RETURN.
+     * @param secretKey Secret key used to sign the spending input.
+     * @param bitcoin Bitcoin network connection.
+     * @param options Broadcast options (fee estimator, etc.).
+     * @returns The txid of the broadcast transaction.
+     * @throws {BeaconError} if the address is unfunded or no UTXO is available.
+     */
+    async buildSignAndBroadcast(signalBytes, secretKey, bitcoin, options) {
+        const feeEstimator = options?.feeEstimator ?? DEFAULT_FEE_ESTIMATOR;
+        // Strip the 'bitcoin:' prefix from the service endpoint.
+        const bitcoinAddress = this.service.serviceEndpoint.replace('bitcoin:', '');
+        // Fetch UTXOs at the beacon address.
+        const utxos = await bitcoin.rest.address.getUtxos(bitcoinAddress);
+        if (!utxos.length) {
+            throw new BeaconError('No UTXOs found, please fund address!', 'UNFUNDED_BEACON_ADDRESS', { bitcoinAddress });
+        }
+        // Take the most recently confirmed UTXO.
+        const utxo = utxos.sort((a, b) => b.status.block_height - a.status.block_height).shift();
+        if (!utxo) {
+            throw new BeaconError('Beacon bitcoin address unfunded or utxos unconfirmed.', 'UNFUNDED_BEACON_ADDRESS', { bitcoinAddress });
+        }
+        // Get the previous tx hex for non-witness UTXO reference.
+        const prevTx = await bitcoin.rest.transaction.getHex(utxo.txid);
+        // Build the ECDSA signer from the secret key.
+        const keyPair = SchnorrKeyPair.fromSecret(secretKey);
+        const signer = {
+            publicKey: keyPair.publicKey.compressed,
+            sign: (hash) => keyPair.secretKey.sign(hash, { scheme: 'ecdsa' }),
+        };
+        // First pass: build with a placeholder fee (0 sats) so we can measure vsize.
+        const build = (fee) => new Psbt({ network: bitcoin.data })
+            .addInput({
+            hash: utxo.txid,
+            index: utxo.vout,
+            nonWitnessUtxo: hexToBytes(prevTx),
+        })
+            .addOutput({ address: bitcoinAddress, value: BigInt(utxo.value) - fee })
+            .addOutput({ script: script.compile([opcodes.OP_RETURN, signalBytes]), value: 0n });
+        const probeTx = build(0n)
+            .signInput(0, signer)
+            .finalizeAllInputs()
+            .extractTransaction();
+        const vsize = probeTx.virtualSize();
+        // Second pass: use the estimator to compute the real fee.
+        const fee = await feeEstimator.estimateFee(vsize);
+        if (BigInt(utxo.value) <= fee) {
+            throw new BeaconError(`UTXO value (${utxo.value}) insufficient to cover fee (${fee}).`, 'INSUFFICIENT_FUNDS', { bitcoinAddress, utxoValue: utxo.value, fee: fee.toString() });
+        }
+        const signedTxHex = build(fee)
+            .signInput(0, signer)
+            .finalizeAllInputs()
+            .extractTransaction()
+            .toHex();
+        return bitcoin.rest.transaction.send(signedTxHex);
+    }
 }
 //# sourceMappingURL=beacon.js.map

package/dist/esm/core/beacon/beacon.js.map

@@ -1 +1 @@
-{"version":3,"file":"beacon.js","sourceRoot":"","sources":["../../../../src/core/beacon/beacon.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAgB,MAAM;IAC1B;;OAEG;IACM,OAAO,CAAgB;IAEhC,YAAY,OAAsB;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CA+BF"}
+{"version":3,"file":"beacon.js","sourceRoot":"","sources":["../../../../src/core/beacon/beacon.ts"],"names":[],"mappings":"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"}

package/dist/esm/core/beacon/cas-beacon.js

@@ -1,9 +1,5 @@
 import { canonicalHash, canonicalize, decode, encode, hash } from '@did-btcr2/common';
-import { SchnorrKeyPair } from '@did-btcr2/keypair';
-import { hexToBytes } from '@noble/hashes/utils';
-import { opcodes, Psbt, script } from 'bitcoinjs-lib';
 import { Beacon } from './beacon.js';
-import { CASBeaconError } from './error.js';
 /**
  * Implements {@link https://dcdpr.github.io/did-btcr2/terminology.html#cas-beacon | CAS Beacon}.
  *
@@ -31,7 +27,7 @@ export class CASBeacon extends Beacon {
      * For each signal, the signalBytes contain the hex-encoded hash of a CAS Announcement.
      * The CAS Announcement maps DIDs to their base64url-encoded update hashes.
      * This method looks up the CAS Announcement from the sidecar, extracts the update
-     * hash for the DID being resolved, and retrieves the corresponding signed update.
+     * hash for the DID being resolved, and retrieves the corresponding signed update from sidecar.
      *
      * @param {Array<BeaconSignal>} signals The array of Beacon Signals to process.
      * @param {SidecarData} sidecar The sidecar data associated with the CAS Beacon.
@@ -44,8 +40,8 @@ export class CASBeacon extends Beacon {
         // Extract the DID from the beacon service id (strip the #fragment)
         const did = this.service.id.split('#')[0];
         for (const signal of signals) {
-            // Decode signal bytes from hex and re-encode to base64url for sidecar lookup
-            const announcementHash = encode(decode(signal.signalBytes, 'hex'));
+            // Signal bytes are hex — matches hex-keyed sidecar maps directly
+            const announcementHash = signal.signalBytes;
             // Look up the CAS Announcement in sidecar casMap
             const casAnnouncement = sidecar.casMap.get(announcementHash);
             if (!casAnnouncement) {
@@ -58,11 +54,13 @@ export class CASBeacon extends Beacon {
                 continue;
             }
             // Look up this DID's update hash in the CAS Announcement
-            const updateHash = casAnnouncement[did];
+            // Announcement values are base64urlnopad per spec — convert to hex for map lookup
+            const updateHashEncoded = casAnnouncement[did];
             // If no entry for this DID, this announcement doesn't contain an update for us — skip
-            if (!updateHash) {
+            if (!updateHashEncoded) {
                 continue;
             }
+            const updateHash = encode(decode(updateHashEncoded, 'base64urlnopad'), 'hex');
             // Look up the signed update in sidecar updateMap
             const signedUpdate = sidecar.updateMap.get(updateHash);
             if (!signedUpdate) {
@@ -81,71 +79,34 @@ export class CASBeacon extends Beacon {
     /**
      * Broadcasts a CAS Beacon signal to the Bitcoin network.
      *
-     * Creates a CAS Announcement mapping the DID to the update hash, then broadcasts
-     * the hash of the announcement via OP_RETURN. The CAS Announcement is distributed
-     * to resolvers via sidecar data.
+     * Creates a CAS Announcement mapping the DID to the update hash, broadcasts the hash of the
+     * announcement via OP_RETURN, and optionally publishes the announcement off-chain via the
+     * supplied `casPublish` callback. UTXO selection, PSBT construction, fee estimation, signing,
+     * and broadcast are delegated to {@link Beacon.buildSignAndBroadcast}.
      *
      * @param {SignedBTCR2Update} signedUpdate The signed BTCR2 update to broadcast.
      * @param {KeyBytes} secretKey The secret key for signing the Bitcoin transaction.
      * @param {BitcoinConnection} bitcoin The Bitcoin network connection.
+     * @param {CASBroadcastOptions} [options] Optional broadcast configuration, including a
+     *   `casPublish` callback to publish the announcement off-chain and a `feeEstimator`.
      * @returns {Promise<SignedBTCR2Update>} The signed update that was broadcast.
-     * @throws {CASBeaconError} if the bitcoin address is invalid or unfunded.
+     * @throws {BeaconError} if the bitcoin address is invalid, unfunded, or UTXO cannot cover the fee.
      */
-    async broadcastSignal(signedUpdate, secretKey, bitcoin) {
+    async broadcastSignal(signedUpdate, secretKey, bitcoin, options) {
         // Extract the DID from the beacon service id (strip the #fragment)
         const did = this.service.id.split('#')[0];
-        // Hash the signed update (base64url for the CAS Announcement entry)
+        // Hash the signed update (base64urlnopad for the CAS Announcement entry per spec)
         const updateHash = canonicalHash(signedUpdate);
         // Create the CAS Announcement mapping this DID to its update hash
         const casAnnouncement = { [did]: updateHash };
-        // TODO: Publish CAS Announcement to content-addressed store (e.g., IPFS via Helia)
         // Canonicalize and hash the CAS Announcement for the OP_RETURN output
         const announcementHash = hash(canonicalize(casAnnouncement));
-        // Convert the serviceEndpoint to a bitcoin address by removing the 'bitcoin:' prefix
-        const bitcoinAddress = this.service.serviceEndpoint.replace('bitcoin:', '');
-        // Query the Bitcoin network for UTXOs associated with the bitcoinAddress
-        const utxos = await bitcoin.rest.address.getUtxos(bitcoinAddress);
-        // If no utxos are found, throw an error indicating the address is unfunded.
-        if (!utxos.length) {
-            throw new CASBeaconError('No UTXOs found, please fund address!', 'UNFUNDED_BEACON_ADDRESS', { bitcoinAddress });
+        // Delegate UTXO selection, PSBT construction, fee estimation, signing, and broadcast
+        await this.buildSignAndBroadcast(announcementHash, secretKey, bitcoin, options);
+        // Publish CAS Announcement to content-addressed store if callback provided
+        if (options?.casPublish) {
+            await options.casPublish(casAnnouncement);
         }
-        // Sort utxos by block height and take the most recent one
-        const utxo = utxos.sort((a, b) => b.status.block_height - a.status.block_height).shift();
-        // If no utxos are found, throw an error.
-        if (!utxo) {
-            throw new CASBeaconError('Beacon bitcoin address unfunded or utxos unconfirmed.', 'UNFUNDED_BEACON_ADDRESS', { bitcoinAddress });
-        }
-        // Get the previous tx to the utxo being spent
-        const prevTx = await bitcoin.rest.transaction.getHex(utxo.txid);
-        // Construct a spend transaction
-        const spendTx = new Psbt({ network: bitcoin.data })
-            // Spend tx contains the utxo as its input
-            .addInput({
-            hash: utxo.txid,
-            index: utxo.vout,
-            nonWitnessUtxo: hexToBytes(prevTx)
-        })
-            // Add a change output minus a fee of 500 sats
-            // TODO: calculate fee based on transaction vsize and current fee rates
-            .addOutput({ address: bitcoinAddress, value: BigInt(utxo.value) - BigInt(500) })
-            // Add an OP_RETURN output containing the CAS Announcement hash
-            .addOutput({ script: script.compile([opcodes.OP_RETURN, announcementHash]), value: 0n });
-        // Construct a key pair and PSBT signer from the secret key
-        const keyPair = SchnorrKeyPair.fromSecret(secretKey);
-        const signer = {
-            publicKey: keyPair.publicKey.compressed,
-            sign: (hash) => keyPair.secretKey.sign(hash, { scheme: 'ecdsa' }),
-        };
-        // Sign 0th input, finalize extract to hex in prep for broadcast
-        const signedTx = spendTx.signInput(0, signer)
-            .finalizeAllInputs()
-            .extractTransaction()
-            .toHex();
-        // Broadcast spendTx to the Bitcoin network.
-        const txid = await bitcoin.rest.transaction.send(signedTx);
-        // Log the txid of the broadcasted transaction
-        console.info(`CAS Beacon Signal Broadcasted with txid: ${txid}`);
-        // Return the signed update
         return signedUpdate;
     }
 }

package/dist/esm/core/beacon/cas-beacon.js.map

@@ -1 +1 @@
-{"version":3,"file":"cas-beacon.js","sourceRoot":"","sources":["../../../../src/core/beacon/cas-beacon.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cas-beacon.js","sourceRoot":"","sources":["../../../../src/core/beacon/cas-beacon.ts"],"names":[],"mappings":"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"}