@did-btcr2/method 0.15.0 → 0.16.0

package/dist/types/utils/did-document.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"did-document.d.ts","sourceRoot":"","sources":["../../../src/utils/did-document.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"did-document.d.ts","sourceRoot":"","sources":["../../../src/utils/did-document.ts"],"names":[],"mappings":"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"}

package/dist/types/utils/identifier.d.ts

@@ -14,7 +14,7 @@ import { DidComponents } from './appendix.js';
  */
 export declare class Identifier {
     /**
-     * Implements {@link https://dcdpr.github.io/did-btcr2/#didbtc1-identifier-encoding | 3.2 did:btcr2 Identifier Encoding}.
+     * Implements {@link https://dcdpr.github.io/did-btcr2/#didbtcr2-identifier-encoding | 3.2 did:btcr2 Identifier Encoding}.
      *
      * A did:btcr2 DID consists of a did:btcr2 prefix, followed by an id-bech32 value, which is a Bech32m encoding of:
      *  - the specification version;
@@ -37,7 +37,7 @@ export declare class Identifier {
         genesisBytes: Bytes;
     }): string;
     /**
-     * Implements {@link https://dcdpr.github.io/did-btcr2/#didbtc1-identifier-decoding | 3.3 did:btcr2 Identifier Decoding}.
+     * Implements {@link https://dcdpr.github.io/did-btcr2/#didbtcr2-identifier-decoding | 3.3 did:btcr2 Identifier Decoding}.
      * @param {string} identifier The BTCR2 DID to be parsed
      * @returns {DidComponents} The parsed identifier components. See {@link DidComponents} for details.
      * @throws {DidError} if an error occurs while parsing the identifier

package/dist/types/utils/identifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identifier.d.ts","sourceRoot":"","sources":["../../../src/utils/identifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,KAAK,EAAqC,MAAM,mBAAmB,CAAC;AAChI,OAAO,EAAa,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;;;;;GAUG;AACH,qBAAa,UAAU;IACrB;;;;;;;;;;;;;;;;OAgBG;WACW,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;QAC/D,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB,YAAY,EAAE,KAAK,CAAC;KACrB,GAAG,MAAM;IAuFV;;;;;;;OAOG;WACW,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa;IA8HvD;;;OAGG;WACW,QAAQ,IAAI;QAAE,IAAI,EAAE,cAAc,CAAC;QAAC,UAAU,EAAE;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE;CAWnG"}
+{"version":3,"file":"identifier.d.ts","sourceRoot":"","sources":["../../../src/utils/identifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,KAAK,EAAqC,MAAM,mBAAmB,CAAC;AAChI,OAAO,EAAgC,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAElF,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;;;;;GAUG;AACH,qBAAa,UAAU;IACrB;;;;;;;;;;;;;;;;OAgBG;WACW,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;QAC/D,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB,YAAY,EAAE,KAAK,CAAC;KACrB,GAAG,MAAM;IAuFV;;;;;;;OAOG;WACW,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa;IA8HvD;;;OAGG;WACW,QAAQ,IAAI;QAAE,IAAI,EAAE,cAAc,CAAC;QAAC,UAAU,EAAE;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE;CAWnG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-btcr2/method",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "type": "module",
   "description": "Javascript/TypeScript reference implementation of did:btcr2 method, a censorship resistant DID Method using the Bitcoin blockchain as a Verifiable Data Registry to announce changes to the DID document. Core package of the did-btcr2-js monorepo.",
   "main": "./dist/cjs/index.js",
@@ -83,10 +83,10 @@
     "multiformats": "^13.3.1",
     "nostr-tools": "^2.15.0",
     "tiny-secp256k1": "^2.2.3",
-    "@did-btcr2/bitcoin": "0.2.0",
-    "@did-btcr2/common": "2.1.0",
-    "@did-btcr2/cryptosuite": "3.1.0",
-    "@did-btcr2/keypair": "0.5.1"
+    "@did-btcr2/bitcoin": "0.3.0",
+    "@did-btcr2/common": "2.2.0",
+    "@did-btcr2/cryptosuite": "3.2.0",
+    "@did-btcr2/keypair": "0.6.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",
@@ -140,6 +140,7 @@
     "do": "pnpm tsx",
     "do:lib": "${PWD}/lib/run-lib.sh",
     "do:lib:btc": "${PWD}/lib/do-lib.sh bitcoin",
-    "do:lib:btcr2": "${PWD}/lib/do-lib.sh btcr2"
+    "do:lib:btcr2": "${PWD}/lib/do-lib.sh btcr2",
+    "pack:local": "pnpm pack && mv *.tgz ./release"
   }
 }

package/src/core/beacon/aggregation/protocol/nostr.ts

@@ -1,4 +1,4 @@
-import { SchnorrKeyPair, SecretKey } from '@did-btcr2/keypair';
+import { SchnorrKeyPair, Secp256k1SecretKey } from '@did-btcr2/keypair';
 import { Filter } from 'nostr-tools';
 import { SimplePool, } from 'nostr-tools/pool';
 import { Identifier } from '../../../../utils/identifier.js';
@@ -62,12 +62,12 @@ export class NostrAdapter implements ProtocolService {
   }
 
   /**
-   * Generates a Nostr identity using the SecretKey and Identifier classes.
+   * Generates a Nostr identity using the Secp256k1SecretKey and Identifier classes.
    * @returns {string} A BTCR2 DID used for communication over the nostr protocol
    */
   public generateIdentity(): string {
-    this.config.keys.secret = SecretKey.random();
-    this.config.keys.public = SecretKey.getPublicKey(this.config.keys.secret);
+    this.config.keys.secret = Secp256k1SecretKey.random();
+    this.config.keys.public = Secp256k1SecretKey.getPublicKey(this.config.keys.secret);
     this.config.did = Identifier.encode(
       {
         idType       : this.config.components.idType  || 'KEY',

package/src/core/beacon/cid-aggregate.ts

@@ -111,8 +111,8 @@ export class CIDAggregateBeacon extends Beacon {
    *
    * The Broadcast CIDAggregate Beacon Signal algorithm involving two roles: a set of cohort participants and a Beacon
    * coordinator. The Beacon coordinator collects individual DID Update Payload Content Identifiers (CIDs) for specific
-   * did:btc1s and aggregates them into a DID Update Bundle, which is then published to a Content Addressable Storage
-   * (CAS). The CID for the DID Update Bundle is included in a Partially Signed Bitcoin Transaction (PSBT) transaction
+   * did:btcr2 idntifiers and aggregates them into a DID Update Bundle, which is then published to a Content Addressable
+   * Storage (CAS). The CID for the DID Update Bundle is included in a Partially Signed Bitcoin Transaction (PSBT) transaction
    * output spent from the Beacon’s n-of-n address. Each of the n cohort participants in the Beacon MUST sign the
    * transaction before it can be broadcast to the network. It is RECOMMENDED that cohort participants keep a copy of
    * the DID Update Bundle and separately pin it to the CAS.

package/src/core/beacon/singleton.ts

@@ -119,7 +119,7 @@ export class SingletonBeacon extends Beacon {
     // 5. If signalsMetadata:
     if (signalsMetadata) {
       // 5.1 Set didUpdatePayload to signalsMetadata.updatePayload
-      didUpdatePayload = signalsMetadataMap.get(signal.txid)?.btc1Update;
+      didUpdatePayload = signalsMetadataMap.get(signal.txid)?.didUpdate;
 
       if(!didUpdatePayload) {
         throw new SingletonBeaconError('Update Payload not found in signal metadata.', 'PROCESS_SIGNAL_ERROR');
@@ -246,6 +246,6 @@ export class SingletonBeacon extends Beacon {
     // 10. Initialize signalMetadata to an empty object.
     // 11. Set signalMetadata.updatePayload to didUpdatePayload.
     // 12. Return the object {<signalId>: { updatePayload: DidUpdatePayload; proofs?: any; }}.
-    return { [spentTx]: { btc1Update: didUpdatePayload } };
+    return { [spentTx]: { didUpdate: didUpdatePayload } };
   }
 }

package/src/core/crud/create.ts

@@ -1,5 +1,5 @@
 import { IdentifierTypes, KeyBytes, PatchOperation } from '@did-btcr2/common';
-import { PublicKey } from '@did-btcr2/keypair';
+import { CompressedSecp256k1PublicKey } from '@did-btcr2/keypair';
 import { DidCreateOptions as IDidCreateOptions } from '@web5/dids';
 import { getNetwork } from  '@did-btcr2/bitcoin';
 import { BeaconUtils } from '../../utils/beacons.js';
@@ -82,8 +82,8 @@ export class Create {
     // Call the the did:btcr2 Identifier Encoding algorithm
     const identifier = Identifier.encode({ version, network, idType, genesisBytes: pubKeyBytes });
 
-    // Instantiate PublicKey object and get the multibase formatted publicKey
-    const { compressed: publicKey, multibase: publicKeyMultibase } = new PublicKey(pubKeyBytes);
+    // Instantiate CompressedSecp256k1PublicKey object and get the multibase formatted publicKey
+    const { compressed: publicKey, multibase: publicKeyMultibase } = new CompressedSecp256k1PublicKey(pubKeyBytes);
 
     // Generate the service field for the DID Document
     const service = BeaconUtils.generateBeaconServices({
@@ -101,7 +101,7 @@ export class Create {
         id                 : `${identifier}#initialKey`,
         type               : 'Multikey',
         controller         : identifier,
-        publicKeyMultibase : publicKeyMultibase.address,
+        publicKeyMultibase : publicKeyMultibase.encoded,
       }],
       service,
     });

package/src/core/crud/deactivate.ts

@@ -6,8 +6,8 @@ import { DidBtcr2 } from '../../did-btcr2.js';
  * document. To do this, the DID controller constructs a valid DID Update Payload with a JSON patch that adds this
  * property and announces the payload through a Beacon in their current DID document following the algorithm in Update.
  * Once a did:btcr2 has been deactivated this state is considered permanent and resolution MUST terminate.
- * @class Btc1Deactivate
- * @type {Btc1Deactivate}
- * @extends {DidBtc1}
+ * @class Deactivate
+ * @type {Deactivate}
+ * @extends {DidBtcr2}
  */
-export class Btc1Deactivate extends DidBtcr2 {}
+export class Deactivate extends DidBtcr2 {}

package/src/core/crud/read.ts

@@ -24,7 +24,7 @@ import {
   UnixTimestamp
 } from '@did-btcr2/common';
 import { Cryptosuite, DataIntegrityProof, SchnorrMultikey } from '@did-btcr2/cryptosuite';
-import { PublicKey } from '@did-btcr2/keypair';
+import { CompressedSecp256k1PublicKey } from '@did-btcr2/keypair';
 import { bytesToHex } from '@noble/hashes/utils';
 import { DidBtcr2 } from '../../did-btcr2.js';
 import { DidResolutionOptions } from '../../interfaces/crud.js';
@@ -136,8 +136,8 @@ export class Resolve {
     // Deconstruct the components
     const { network, genesisBytes } = identifierComponents;
 
-    // Construct a new PublicKey and deconstruct the publicKey and publicKeyMultibase
-    const { compressed: publicKey, multibase: publicKeyMultibase } = new PublicKey(genesisBytes);
+    // Construct a new CompressedSecp256k1PublicKey and deconstruct the publicKey and publicKeyMultibase
+    const { compressed: publicKey, multibase: publicKeyMultibase } = new CompressedSecp256k1PublicKey(genesisBytes);
 
     // Generate the service field for the DID Document
     const service = BeaconUtils.generateBeaconServices({
@@ -154,7 +154,7 @@ export class Resolve {
         id                 : `${identifier}#initialKey`,
         type               : 'Multikey',
         controller         : identifier,
-        publicKeyMultibase : publicKeyMultibase.address
+        publicKeyMultibase : publicKeyMultibase.encoded
       }],
       service
     });
@@ -353,7 +353,7 @@ export class Resolve {
 
     // 10. Set targetDocument to the result of calling the Traverse Bitcoin Blockchain History algorithm
     // passing in contemporaryDIDDocument, contemporaryBlockheight, currentVersionId, targetVersionId,
-    // targetTime, didDocumentHistory, btc1UpdateHashHistory, signalsMetadata, and network.
+    // targetTime, didDocumentHistory, updateHashHistory, signalsMetadata, and network.
     const targetDocument = this.traverseBlockchainHistory({
       contemporaryDidDocument : initialDocument,
       contemporaryBlockHeight : 0,
@@ -361,7 +361,7 @@ export class Resolve {
       targetVersionId,
       targetTime,
       didDocumentHistory      : new Array(),
-      btc1UpdateHashHistory   : new Array(),
+      updateHashHistory       : new Array(),
       signalsMetadata,
       network
     });
@@ -396,7 +396,7 @@ export class Resolve {
    * @param {UnixTimestamp} params.targetTime The timestamp used to target specific historical states of a DID document.
    *    Only Beacon Signals included in the Bitcoin blockchain before the targetTime are processed.
    * @param {boolean} params.didDocumentHistory An array of DID documents ordered ascensing by version (1...N).
-   * @param {boolean} params.btc1UpdateHashHistory An array of SHA256 hashes of BTCR2 Updates ordered by version that are
+   * @param {boolean} params.updateHashHistory An array of SHA256 hashes of BTCR2 Updates ordered by version that are
    *    applied to the DID document in order to construct the contemporaryDIDDocument.
    * @param {SignalsMetadata} params.signalsMetadata See {@link SignalsMetadata} for details.
    * @param {string} params.network The bitcoin network to connect to (mainnet, signet, testnet, regtest).
@@ -409,7 +409,7 @@ export class Resolve {
     targetVersionId,
     targetTime,
     didDocumentHistory,
-    btc1UpdateHashHistory,
+    updateHashHistory,
     signalsMetadata,
     network
   }: {
@@ -419,7 +419,7 @@ export class Resolve {
     targetVersionId?: number;
     targetTime: number;
     didDocumentHistory: DidDocument[];
-    btc1UpdateHashHistory: string[];
+    updateHashHistory: string[];
     signalsMetadata: SignalsMetadata;
     network: string;
   }): Promise<DidDocument> {
@@ -463,8 +463,8 @@ export class Resolve {
       // 10.1. If update.targetVersionId is less than or equal to currentVersionId, run Algorithm Confirm Duplicate
       //      Update passing in update, documentHistory, and contemporaryHash.
       if (updateTargetVersionId <= currentVersionId) {
-        btc1UpdateHashHistory.push(contemporaryHash);
-        await this.confirmDuplicateUpdate({ update, updateHashHistory: btc1UpdateHashHistory });
+        updateHashHistory.push(contemporaryHash);
+        await this.confirmDuplicateUpdate({ update, updateHashHistory: updateHashHistory });
 
         //  10.2. If update.targetVersionId equals currentVersionId + 1:
       } else if (updateTargetVersionId === currentVersionId + 1) {
@@ -498,8 +498,8 @@ export class Resolve {
         // 10.2.7 Set updateHash to the result of passing unsecuredUpdate into the JSON Canonicalization and Hash algorithm.
         const updateHash = await JSON.canonicalization.process(update, 'base58');
 
-        // 10.2.8. Push updateHash onto btc1UpdateHashHistory.
-        btc1UpdateHashHistory.push(updateHash as string);
+        // 10.2.8. Push updateHash onto updateHashHistory.
+        updateHashHistory.push(updateHash as string);
 
         // 10.2.9. Set contemporaryHash to result of passing contemporaryDIDDocument into the JSON Canonicalization and Hash algorithm.
         contemporaryHash = await JSON.canonicalization.process(contemporaryDidDocument, 'base58');
@@ -796,19 +796,19 @@ export class Resolve {
     // Establish a Beacon instance using the service and sidecar
     const beacon = BeaconFactory.establish(service, sidecar);
 
-    // 2.5 Set btc1Update to null.
-    const btc1Update = await beacon.processSignal(signalTx, signalsMetadata) ?? null;
+    // 2.5 Set didUpdate to null.
+    const didUpdate = await beacon.processSignal(signalTx, signalsMetadata) ?? null;
 
     // If the updates is null, throw an error
-    if (!btc1Update) {
-      throw new MethodError('No btc1Update for beacon', 'PROCESS_BEACON_SIGNALS_ERROR', { tx, signalsMetadata });
+    if (!didUpdate) {
+      throw new MethodError('No didUpdate for beacon', 'PROCESS_BEACON_SIGNALS_ERROR', { tx, signalsMetadata });
     }
 
-    // 2.9 If btc1Update is not null, push btc1Update to updates.
-    updates.push(btc1Update);
+    // 2.9 If didUpdate is not null, push didUpdate to updates.
+    updates.push(didUpdate);
 
     // 3. Return updates.
-    return btc1Update;
+    return didUpdate;
   }
 
   /**
@@ -824,7 +824,7 @@ export class Resolve {
    * @param {DidUpdatePayload} params.update The DID Update Payload to confirm.
    * @param {Array<string>} params.updateHashHistory The history of hashes for previously applied updates.
    * @returns {Promise<void>} A promise that resolves if the update is a duplicate, otherwise throws an error.
-   * @throws {DidBtc1Error} if the update hash does not match the historical hash.
+   * @throws {ResolveError} if the update hash does not match the historical hash.
    */
   public static async confirmDuplicateUpdate({ update, updateHashHistory }: {
     update: DidUpdatePayload;

package/src/core/crud/update.ts

@@ -12,7 +12,7 @@ import {
   ProofOptions
 } from '@did-btcr2/common';
 import { SchnorrMultikey } from '@did-btcr2/cryptosuite';
-import { SchnorrKeyPair, SecretKey } from '@did-btcr2/keypair';
+import { SchnorrKeyPair, Secp256k1SecretKey } from '@did-btcr2/keypair';
 import type { DidService } from '@web5/dids';
 import { BeaconService } from '../../interfaces/ibeacon.js';
 import { SignalsMetadata } from '../../types/crud.js';
@@ -158,7 +158,7 @@ export class Update {
           id,
           controller,
           keys : new SchnorrKeyPair({
-            secretKey : SecretKey.decode(secretKeyMultibase)
+            secretKey : Secp256k1SecretKey.decode(secretKeyMultibase)
           })
         });
 

package/src/core/key-manager/index.ts

@@ -10,7 +10,7 @@ import {
   SignatureBytes
 } from '@did-btcr2/common';
 import { SchnorrMultikey } from '@did-btcr2/cryptosuite';
-import { PublicKey, SchnorrKeyPair } from '@did-btcr2/keypair';
+import { CompressedSecp256k1PublicKey, SchnorrKeyPair } from '@did-btcr2/keypair';
 import { sha256 } from '@noble/hashes/sha2';
 import { KeyValueStore, MemoryStore } from '@web5/common';
 import { KeyIdentifier } from '@web5/crypto';
@@ -104,11 +104,11 @@ export class KeyManager implements IKeyManager, CryptoSigner, BitcoinSigner  {
   }
 
   /**
-   * Gets the key pair from the key store and returns a PublicKey.
+   * Gets the key pair from the key store and returns a CompressedSecp256k1PublicKey.
    * @param {KeyIdentifier} keyUri The URI of the key to get the public key for.
-   * @returns {Promise<PublicKey>} The public key associated with the key URI.
+   * @returns {Promise<CompressedSecp256k1PublicKey>} The public key associated with the key URI.
    */
-  public async getPublicKey(keyUri?: KeyIdentifier): Promise<PublicKey> {
+  public async getPublicKey(keyUri?: KeyIdentifier): Promise<CompressedSecp256k1PublicKey> {
     // Use the active key URI if not provided
     const key = await this.getKey(keyUri);
 
@@ -264,13 +264,13 @@ export class KeyManager implements IKeyManager, CryptoSigner, BitcoinSigner  {
 
   /**
    * Computes a multibase-compliant URI from a key.
-   * @param key A SchnorrKeyPair, PublicKey, or multibase string
+   * @param key A SchnorrKeyPair, CompressedSecp256k1PublicKey, or multibase string
    * @returns {string} A multibase URI (e.g. 'urn:mb:zQ3s...')
    */
-  public static toMultibaseUri(data: SchnorrKeyPair | PublicKey | Multibase<'zQ3s'>): string {
+  public static toMultibaseUri(data: SchnorrKeyPair | CompressedSecp256k1PublicKey | Multibase<'zQ3s'>): string {
     const multibase = data instanceof SchnorrKeyPair
       ? data.publicKey.multibase
-      : data instanceof PublicKey
+      : data instanceof CompressedSecp256k1PublicKey
         ? data.multibase
         : data;
 

package/src/core/key-manager/interface.ts

@@ -1,6 +1,6 @@
 import { HashBytes, Hex, SignatureBytes } from '@did-btcr2/common';
 import { Multikey, SchnorrMultikey } from '@did-btcr2/cryptosuite';
-import { SchnorrKeyPair, PublicKey } from '@did-btcr2/keypair';
+import { SchnorrKeyPair, CompressedSecp256k1PublicKey } from '@did-btcr2/keypair';
 import { KeyValueStore } from '@web5/common';
 
 export type KeyManagerOptions = {
@@ -77,9 +77,9 @@ export interface IKeyManager {
     /**
      * Gets the public key of a key pair.
      * @param {KeyIdentifier} keyUri The URI of the key to get the public key for.
-     * @returns {Promise<PublicKey>} The public key of the key pair.
+     * @returns {Promise<CompressedSecp256k1PublicKey>} The public key of the key pair.
      */
-    getPublicKey(keyUri: KeyIdentifier): Promise<PublicKey>;
+    getPublicKey(keyUri: KeyIdentifier): Promise<CompressedSecp256k1PublicKey>;
 
     /**
      * Imports a key pair into the key store.

package/src/did-btcr2.ts

@@ -176,7 +176,7 @@ export class DidBtcr2 implements DidMethod {
    * @param {string} params.identifier The btcr2 identifier to be updated.
    * @param {DidDocument} params.sourceDocument The DID document being updated.
    * @param {string} params.sourceVersionId The versionId of the source document.
-   * @param {Btc1DocumentPatch} params.documentPatch The JSON patch to be applied to the source document.
+   * @param {PatchOperation} params.documentPatch The JSON patch to be applied to the source document.
    * @param {string} params.verificationMethodId The verificationMethod ID to sign the update
    * @param {string[]} params.beaconIds The beacon IDs to announce the update
    * @returns {Promise<void>} Promise resolving to void

package/src/interfaces/crud.ts

@@ -1,4 +1,3 @@
-import { BitcoinCoreRpcClient } from '@did-btcr2/bitcoin';
 import { UnixTimestamp } from '@did-btcr2/common';
 import { DidResolutionOptions as IDidResolutionOptions } from '@web5/dids';
 import { SidecarData } from '../types/crud.js';
@@ -8,7 +7,6 @@ import { DidDocument } from '../utils/did-document.js';
  * Options for resolving a DID Document
  * @param {?number} versionId The versionId for resolving the DID Document
  * @param {?UnixTimestamp} versionTime The versionTime for resolving the DID Document
- * @param {?BitcoinCoreRpcClient} rpc BitcoinCoreRpcClient client connection
  * @param {?SidecarData} sidecarData The sidecar data for resolving the DID Document
  */
 export interface DidResolutionOptions extends IDidResolutionOptions {
@@ -16,9 +14,8 @@ export interface DidResolutionOptions extends IDidResolutionOptions {
   versionTime?: UnixTimestamp;
   sidecarData?: SidecarData;
   network?: string;
-  rpc?: BitcoinCoreRpcClient;
 }
-export interface Btc1RootCapability {
+export interface RootCapability {
     '@context': string;
     id: string;
     controller: string;

package/src/types/crud.ts

@@ -8,23 +8,23 @@ export type FindNextSignals = {
   beacons: BeaconService[]
 };
 export type Metadata = {
-  btc1Update: DidUpdatePayload;
+  didUpdate: DidUpdatePayload;
   proofs?: string;
 };
 export type SignalSidecarData = Metadata;
-export interface Btc1SidecarData {
+export interface Sidecar {
   did: string;
 }
 export type SignalsMetadata = { [signalId: string]: Metadata; };
-export interface SingletonSidecar extends Btc1SidecarData {
+export interface SingletonSidecar extends Sidecar {
   signalsMetadata: SignalsMetadata;
 }
-export interface CIDAggregateSidecar extends Btc1SidecarData {
+export interface CIDAggregateSidecar extends Sidecar {
   initialDocument: DidDocument;
   signalsMetadata: SignalsMetadata;
   cidUpdates: Array<string>;
 }
-export interface SMTAggregateSidecar extends Btc1SidecarData {
+export interface SMTAggregateSidecar extends Sidecar {
   initialDocument: DidDocument;
   signalsMetadata: SignalsMetadata;
   smtProof: ProofBytes;

package/src/utils/appendix.ts

@@ -10,7 +10,7 @@ import {
 import { createHelia } from 'helia';
 import { CID } from 'multiformats';
 import { create as createDigest } from 'multiformats/hashes/digest';
-import { Btc1RootCapability } from '../interfaces/crud.js';
+import { RootCapability } from '../interfaces/crud.js';
 import { DidVerificationMethod } from './did-document.js';
 
 export interface DidComponents {
@@ -97,7 +97,7 @@ export class Appendix {
 
 
   /**
-   * Implements {@link https://dcdpr.github.io/did-btcr2/#derive-root-capability-from-didbtc1-identifier | 9.4.1 Derive Root Capability from did:btcr2 Identifier}.
+   * Implements {@link https://dcdpr.github.io/did-btcr2/#derive-root-capability-from-didbtcr2-identifier | 9.4.1 Derive Root Capability from did:btcr2 Identifier }.
    *
    * The Derive Root Capability algorithm deterministically generates a ZCAP-LD root capability from a given did:btcr2
    * identifier. Each root capability is unique to the identifier. This root capability is defined and understood by the
@@ -105,7 +105,7 @@ export class Appendix {
    * document. It takes in a did:btcr2 identifier and returns a rootCapability object. It returns the root capability.
    *
    * @param {string} identifier The did-btcr2 identifier to derive the root capability from
-   * @returns {Btc1RootCapability} The root capability object
+   * @returns {RootCapability} The root capability object
    * @example Root capability for updating the DID document for
    * did:btcr2:k1q0rnnwf657vuu8trztlczvlmphjgc6q598h79cm6sp7c4fgqh0fkc0vzd9u
    * ```
@@ -117,9 +117,9 @@ export class Appendix {
    * }
    * ```
    */
-  public static deriveRootCapability(identifier: string): Btc1RootCapability {
+  public static deriveRootCapability(identifier: string): RootCapability {
     // 1. Define rootCapability as an empty object.
-    const rootCapability = {} as Btc1RootCapability;
+    const rootCapability = {} as RootCapability;
 
     // 2. Set rootCapability.@context to ‘https://w3id.org/zcap/v1’.
     rootCapability['@context'] = W3C_ZCAP_V1;
@@ -148,7 +148,7 @@ export class Appendix {
    * capability object.
    *
    * @param {string} capabilityId The root capability identifier to dereference.
-   * @returns {Btc1RootCapability} The root capability object.
+   * @returns {RootCapability} The root capability object.
    * @example a didUpdatePayload with an invoked ZCAP-LD capability containing a patch defining how the DID document
    * for did:btcr2:k1q0rnnwf657vuu8trztlczvlmphjgc6q598h79cm6sp7c4fgqh0fkc0vzd9u SHOULD be mutated.
    * ```
@@ -174,16 +174,16 @@ export class Appendix {
    *    "cryptosuite": "schnorr-secp256k1-jcs-2025",
    *    "verificationMethod": "did:btcr2:k1q0rnnwf657vuu8trztlczvlmphjgc6q598h79cm6sp7c4fgqh0fkc0vzd9u#initialKey",
    *    "invocationTarget": "did:btcr2:k1q0rnnwf657vuu8trztlczvlmphjgc6q598h79cm6sp7c4fgqh0fkc0vzd9u",
-   *    "capability": "urn:zcap:root:did%3Abtc1%3Ak1q0rnnwf657vuu8trztlczvlmphjgc6q598h79cm6sp7c4fgqh0fkc0vzd9u",
+   *    "capability": "urn:zcap:root:did%3Abtcr2%3Ak1q0rnnwf657vuu8trztlczvlmphjgc6q598h79cm6sp7c4fgqh0fkc0vzd9u",
    *    "capabilityAction": "Write",
    *    "proofPurpose": "assertionMethod",
    *    "proofValue": "z381yXYmxU8NudZ4HXY56DfMN6zfD8syvWcRXzT9xD9uYoQToo8QsXD7ahM3gXTzuay5WJbqTswt2BKaGWYn2hHhVFKJLXaDz"
    *   }
    * }
    */
-  public static derefernceRootCapabilityIdentifier(capabilityId: string): Btc1RootCapability {
+  public static derefernceRootCapabilityIdentifier(capabilityId: string): RootCapability {
     // 1. Set rootCapability to an empty object.
-    const rootCapability = {} as Btc1RootCapability;
+    const rootCapability = {} as RootCapability;
 
     // 2. Set components to the result of capabilityId.split(":").
     const [urn, zcap, root, did] = capabilityId.split(':') ?? [];

package/src/utils/did-document-builder.ts

@@ -2,7 +2,7 @@ import { DidDocumentError, INVALID_DID_DOCUMENT } from '@did-btcr2/common';
 import { BeaconService } from '../interfaces/ibeacon.js';
 import { DidDocument, DidVerificationMethod } from './did-document.js';
 
-export class Btc1DidDocumentBuilder {
+export class DidDocumentBuilder {
   private document: Partial<DidDocument> = {};
 
   constructor(initialDocument: Partial<DidDocument>) {

package/src/utils/did-document.ts

@@ -14,7 +14,7 @@ import { BeaconUtils } from './beacons.js';
 import { Identifier } from './identifier.js';
 
 export const BECH32M_CHARS = '';
-export const BTC1_DID_REGEX = /did:btcr2:(x1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]*)/g;
+export const DID_REGEX = /did:btcr2:(x1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]*)/g;
 
 export type ExternalData = {
   id: string,
@@ -432,7 +432,7 @@ export class DidDocument implements IDidDocument {
  */
 export class IntermediateDidDocument extends DidDocument {
   constructor(document: IDidDocument) {
-    const intermediateDocument = JSON.cloneReplace(document, BTC1_DID_REGEX, ID_PLACEHOLDER_VALUE) as IDidDocument;
+    const intermediateDocument = JSON.cloneReplace(document, DID_REGEX, ID_PLACEHOLDER_VALUE) as IDidDocument;
     super(intermediateDocument);
   }
 

package/src/utils/identifier.ts

@@ -1,5 +1,5 @@
 import { BitcoinNetworkNames, MethodError, IdentifierTypes, Bytes, INVALID_DID, METHOD_NOT_SUPPORTED } from '@did-btcr2/common';
-import { PublicKey, SchnorrKeyPair } from '@did-btcr2/keypair';
+import { CompressedSecp256k1PublicKey, SchnorrKeyPair } from '@did-btcr2/keypair';
 import { bech32m } from '@scure/base';
 import { DidComponents } from './appendix.js';
 
@@ -16,7 +16,7 @@ import { DidComponents } from './appendix.js';
  */
 export class Identifier {
   /**
-   * Implements {@link https://dcdpr.github.io/did-btcr2/#didbtc1-identifier-encoding | 3.2 did:btcr2 Identifier Encoding}.
+   * Implements {@link https://dcdpr.github.io/did-btcr2/#didbtcr2-identifier-encoding | 3.2 did:btcr2 Identifier Encoding}.
    *
    * A did:btcr2 DID consists of a did:btcr2 prefix, followed by an id-bech32 value, which is a Bech32m encoding of:
    *  - the specification version;
@@ -61,7 +61,7 @@ export class Identifier {
     // 5. If idType is “key” and genesisBytes is not a valid compressed secp256k1 public key, raise invalidDid error.
     if (idType === 'KEY') {
       try {
-        new PublicKey(genesisBytes);
+        new CompressedSecp256k1PublicKey(genesisBytes);
       } catch {
         throw new MethodError(
           'Expected "genesisBytes" to be a valid compressed secp256k1 public key',
@@ -125,7 +125,7 @@ export class Identifier {
   }
 
   /**
-   * Implements {@link https://dcdpr.github.io/did-btcr2/#didbtc1-identifier-decoding | 3.3 did:btcr2 Identifier Decoding}.
+   * Implements {@link https://dcdpr.github.io/did-btcr2/#didbtcr2-identifier-decoding | 3.3 did:btcr2 Identifier Decoding}.
    * @param {string} identifier The BTCR2 DID to be parsed
    * @returns {DidComponents} The parsed identifier components. See {@link DidComponents} for details.
    * @throws {DidError} if an error occurs while parsing the identifier
@@ -248,7 +248,7 @@ export class Identifier {
     // 19. If idType is “key” and genesisBytes is not a valid compressed secp256k1 public key, raise invalidDid error.
     if (idType === 'KEY') {
       try {
-        new PublicKey(genesisBytes);
+        new CompressedSecp256k1PublicKey(genesisBytes);
       } catch {
         throw new MethodError(`Invalid genesisBytes: ${genesisBytes}`, INVALID_DID, { identifier });
       }