@did-btcr2/method 0.14.6 → 0.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser.js +5346 -2734
- package/dist/browser.mjs +5346 -2734
- package/dist/cjs/core/beacon/aggregation/protocol/nostr.js +4 -4
- package/dist/cjs/core/beacon/aggregation/protocol/nostr.js.map +1 -1
- package/dist/cjs/core/beacon/cid-aggregate.js +2 -2
- package/dist/cjs/core/beacon/singleton.js +4 -4
- package/dist/cjs/core/beacon/singleton.js.map +1 -1
- package/dist/cjs/core/crud/create.js +4 -4
- package/dist/cjs/core/crud/create.js.map +1 -1
- package/dist/cjs/core/crud/deactivate.js +4 -4
- package/dist/cjs/core/crud/deactivate.js.map +1 -1
- package/dist/cjs/core/crud/read.js +42 -38
- package/dist/cjs/core/crud/read.js.map +1 -1
- package/dist/cjs/core/crud/update.js +2 -2
- package/dist/cjs/core/crud/update.js.map +1 -1
- package/dist/cjs/core/key-manager/index.js +5 -5
- package/dist/cjs/core/key-manager/index.js.map +1 -1
- package/dist/cjs/did-btcr2.js +3 -1
- package/dist/cjs/did-btcr2.js.map +1 -1
- package/dist/cjs/utils/appendix.js +4 -4
- package/dist/cjs/utils/appendix.js.map +1 -1
- package/dist/cjs/utils/did-document-builder.js +1 -1
- package/dist/cjs/utils/did-document-builder.js.map +1 -1
- package/dist/cjs/utils/did-document.js +2 -2
- package/dist/cjs/utils/did-document.js.map +1 -1
- package/dist/cjs/utils/identifier.js +5 -5
- package/dist/cjs/utils/identifier.js.map +1 -1
- package/dist/esm/core/beacon/aggregation/protocol/nostr.js +4 -4
- package/dist/esm/core/beacon/aggregation/protocol/nostr.js.map +1 -1
- package/dist/esm/core/beacon/cid-aggregate.js +2 -2
- package/dist/esm/core/beacon/singleton.js +4 -4
- package/dist/esm/core/beacon/singleton.js.map +1 -1
- package/dist/esm/core/crud/create.js +4 -4
- package/dist/esm/core/crud/create.js.map +1 -1
- package/dist/esm/core/crud/deactivate.js +4 -4
- package/dist/esm/core/crud/deactivate.js.map +1 -1
- package/dist/esm/core/crud/read.js +42 -38
- package/dist/esm/core/crud/read.js.map +1 -1
- package/dist/esm/core/crud/update.js +2 -2
- package/dist/esm/core/crud/update.js.map +1 -1
- package/dist/esm/core/key-manager/index.js +5 -5
- package/dist/esm/core/key-manager/index.js.map +1 -1
- package/dist/esm/did-btcr2.js +3 -1
- package/dist/esm/did-btcr2.js.map +1 -1
- package/dist/esm/utils/appendix.js +4 -4
- package/dist/esm/utils/appendix.js.map +1 -1
- package/dist/esm/utils/did-document-builder.js +1 -1
- package/dist/esm/utils/did-document-builder.js.map +1 -1
- package/dist/esm/utils/did-document.js +2 -2
- package/dist/esm/utils/did-document.js.map +1 -1
- package/dist/esm/utils/identifier.js +5 -5
- package/dist/esm/utils/identifier.js.map +1 -1
- package/dist/types/core/beacon/aggregation/protocol/nostr.d.ts +1 -1
- package/dist/types/core/beacon/cid-aggregate.d.ts +2 -2
- package/dist/types/core/beacon/singleton.d.ts.map +1 -1
- package/dist/types/core/crud/deactivate.d.ts +4 -4
- package/dist/types/core/crud/deactivate.d.ts.map +1 -1
- package/dist/types/core/crud/read.d.ts +17 -22
- package/dist/types/core/crud/read.d.ts.map +1 -1
- package/dist/types/core/key-manager/index.d.ts +6 -6
- package/dist/types/core/key-manager/index.d.ts.map +1 -1
- package/dist/types/core/key-manager/interface.d.ts +3 -3
- package/dist/types/core/key-manager/interface.d.ts.map +1 -1
- package/dist/types/did-btcr2.d.ts +1 -1
- package/dist/types/did-btcr2.d.ts.map +1 -1
- package/dist/types/interfaces/crud.d.ts +3 -6
- package/dist/types/interfaces/crud.d.ts.map +1 -1
- package/dist/types/types/crud.d.ts +5 -5
- package/dist/types/types/crud.d.ts.map +1 -1
- package/dist/types/utils/appendix.d.ts +7 -7
- package/dist/types/utils/appendix.d.ts.map +1 -1
- package/dist/types/utils/did-document-builder.d.ts +1 -1
- package/dist/types/utils/did-document-builder.d.ts.map +1 -1
- package/dist/types/utils/did-document.d.ts +1 -1
- package/dist/types/utils/did-document.d.ts.map +1 -1
- package/dist/types/utils/identifier.d.ts +2 -2
- package/dist/types/utils/identifier.d.ts.map +1 -1
- package/package.json +8 -7
- package/src/core/beacon/aggregation/protocol/nostr.ts +4 -4
- package/src/core/beacon/cid-aggregate.ts +2 -2
- package/src/core/beacon/singleton.ts +4 -4
- package/src/core/crud/create.ts +4 -4
- package/src/core/crud/deactivate.ts +4 -4
- package/src/core/crud/read.ts +54 -45
- package/src/core/crud/update.ts +2 -2
- package/src/core/key-manager/index.ts +7 -7
- package/src/core/key-manager/interface.ts +3 -3
- package/src/did-btcr2.ts +4 -1
- package/src/interfaces/crud.ts +3 -6
- package/src/types/crud.ts +5 -5
- package/src/utils/appendix.ts +9 -9
- package/src/utils/did-document-builder.ts +1 -1
- package/src/utils/did-document.ts +2 -2
- package/src/utils/identifier.ts +5 -5
- package/dist/browser.js.map +0 -7
- package/dist/browser.mjs.map +0 -7
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SchnorrKeyPair,
|
|
1
|
+
import { SchnorrKeyPair, Secp256k1SecretKey } from '@did-btcr2/keypair';
|
|
2
2
|
import { SimplePool, } from 'nostr-tools/pool';
|
|
3
3
|
import { Identifier } from '../../../../utils/identifier.js';
|
|
4
4
|
export class NostrAdapter {
|
|
@@ -39,12 +39,12 @@ export class NostrAdapter {
|
|
|
39
39
|
console.log(`Sending message to ${recipient} from ${sender}:`, message);
|
|
40
40
|
}
|
|
41
41
|
/**
|
|
42
|
-
* Generates a Nostr identity using the
|
|
42
|
+
* Generates a Nostr identity using the Secp256k1SecretKey and Identifier classes.
|
|
43
43
|
* @returns {string} A BTCR2 DID used for communication over the nostr protocol
|
|
44
44
|
*/
|
|
45
45
|
generateIdentity() {
|
|
46
|
-
this.config.keys.secret =
|
|
47
|
-
this.config.keys.public =
|
|
46
|
+
this.config.keys.secret = Secp256k1SecretKey.random();
|
|
47
|
+
this.config.keys.public = Secp256k1SecretKey.getPublicKey(this.config.keys.secret);
|
|
48
48
|
this.config.did = Identifier.encode({
|
|
49
49
|
idType: this.config.components.idType || 'KEY',
|
|
50
50
|
version: this.config.components.version || 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nostr.js","sourceRoot":"","sources":["../../../../../../src/core/beacon/aggregation/protocol/nostr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"nostr.js","sourceRoot":"","sources":["../../../../../../src/core/beacon/aggregation/protocol/nostr.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,8 +99,8 @@ export class CIDAggregateBeacon extends Beacon {
|
|
|
99
99
|
*
|
|
100
100
|
* The Broadcast CIDAggregate Beacon Signal algorithm involving two roles: a set of cohort participants and a Beacon
|
|
101
101
|
* coordinator. The Beacon coordinator collects individual DID Update Payload Content Identifiers (CIDs) for specific
|
|
102
|
-
* did:
|
|
103
|
-
* (CAS). The CID for the DID Update Bundle is included in a Partially Signed Bitcoin Transaction (PSBT) transaction
|
|
102
|
+
* did:btcr2 idntifiers and aggregates them into a DID Update Bundle, which is then published to a Content Addressable
|
|
103
|
+
* Storage (CAS). The CID for the DID Update Bundle is included in a Partially Signed Bitcoin Transaction (PSBT) transaction
|
|
104
104
|
* output spent from the Beacon’s n-of-n address. Each of the n cohort participants in the Beacon MUST sign the
|
|
105
105
|
* transaction before it can be broadcast to the network. It is RECOMMENDED that cohort participants keep a copy of
|
|
106
106
|
* the DID Update Bundle and separately pin it to the CAS.
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BitcoinNetworkConnection } from '@did-btcr2/bitcoin';
|
|
2
2
|
import { INVALID_SIDECAR_DATA, LATE_PUBLISHING_ERROR, SingletonBeaconError } from '@did-btcr2/common';
|
|
3
3
|
import { opcodes, Psbt, script } from 'bitcoinjs-lib';
|
|
4
4
|
import { base58btc } from 'multiformats/bases/base58';
|
|
5
5
|
import { Beacon } from '../../interfaces/beacon.js';
|
|
6
6
|
import { Appendix } from '../../utils/appendix.js';
|
|
7
7
|
import { KeyManager, Signer } from '../key-manager/index.js';
|
|
8
|
-
const bitcoin = new
|
|
8
|
+
const bitcoin = new BitcoinNetworkConnection();
|
|
9
9
|
/**
|
|
10
10
|
* Implements {@link https://dcdpr.github.io/did-btcr2/#singleton-beacon | 5.1 Singleton Beacon}.
|
|
11
11
|
*
|
|
@@ -106,7 +106,7 @@ export class SingletonBeacon extends Beacon {
|
|
|
106
106
|
// 5. If signalsMetadata:
|
|
107
107
|
if (signalsMetadata) {
|
|
108
108
|
// 5.1 Set didUpdatePayload to signalsMetadata.updatePayload
|
|
109
|
-
didUpdatePayload = signalsMetadataMap.get(signal.txid)?.
|
|
109
|
+
didUpdatePayload = signalsMetadataMap.get(signal.txid)?.didUpdate;
|
|
110
110
|
if (!didUpdatePayload) {
|
|
111
111
|
throw new SingletonBeaconError('Update Payload not found in signal metadata.', 'PROCESS_SIGNAL_ERROR');
|
|
112
112
|
}
|
|
@@ -210,7 +210,7 @@ export class SingletonBeacon extends Beacon {
|
|
|
210
210
|
// 10. Initialize signalMetadata to an empty object.
|
|
211
211
|
// 11. Set signalMetadata.updatePayload to didUpdatePayload.
|
|
212
212
|
// 12. Return the object {<signalId>: { updatePayload: DidUpdatePayload; proofs?: any; }}.
|
|
213
|
-
return { [spentTx]: {
|
|
213
|
+
return { [spentTx]: { didUpdate: didUpdatePayload } };
|
|
214
214
|
}
|
|
215
215
|
}
|
|
216
216
|
//# sourceMappingURL=singleton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleton.js","sourceRoot":"","sources":["../../../../src/core/beacon/singleton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,
|
|
1
|
+
{"version":3,"file":"singleton.js","sourceRoot":"","sources":["../../../../src/core/beacon/singleton.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IdentifierTypes } from '@did-btcr2/common';
|
|
2
|
-
import {
|
|
2
|
+
import { CompressedSecp256k1PublicKey } from '@did-btcr2/keypair';
|
|
3
3
|
import { getNetwork } from '@did-btcr2/bitcoin';
|
|
4
4
|
import { BeaconUtils } from '../../utils/beacons.js';
|
|
5
5
|
import { DidDocument } from '../../utils/did-document.js';
|
|
@@ -36,8 +36,8 @@ export class Create {
|
|
|
36
36
|
const idType = IdentifierTypes.KEY;
|
|
37
37
|
// Call the the did:btcr2 Identifier Encoding algorithm
|
|
38
38
|
const identifier = Identifier.encode({ version, network, idType, genesisBytes: pubKeyBytes });
|
|
39
|
-
// Instantiate
|
|
40
|
-
const { compressed: publicKey, multibase: publicKeyMultibase } = new
|
|
39
|
+
// Instantiate CompressedSecp256k1PublicKey object and get the multibase formatted publicKey
|
|
40
|
+
const { compressed: publicKey, multibase: publicKeyMultibase } = new CompressedSecp256k1PublicKey(pubKeyBytes);
|
|
41
41
|
// Generate the service field for the DID Document
|
|
42
42
|
const service = BeaconUtils.generateBeaconServices({
|
|
43
43
|
identifier,
|
|
@@ -53,7 +53,7 @@ export class Create {
|
|
|
53
53
|
id: `${identifier}#initialKey`,
|
|
54
54
|
type: 'Multikey',
|
|
55
55
|
controller: identifier,
|
|
56
|
-
publicKeyMultibase: publicKeyMultibase.
|
|
56
|
+
publicKeyMultibase: publicKeyMultibase.encoded,
|
|
57
57
|
}],
|
|
58
58
|
service,
|
|
59
59
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/core/crud/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA4B,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/core/crud/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA4B,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAO,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAA2B,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAwCvD;;;;;;;;;;GAUG;AACH,MAAM,OAAO,MAAM;IACjB;;;;;;;;;;;;OAYG;IACI,MAAM,CAAC,aAAa,CAAC,EAAE,WAAW,EAAE,OAAO,EAGjD;QACC,iDAAiD;QACjD,MAAM,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;QAErD,sBAAsB;QACtB,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC;QAEnC,uDAAuD;QACvD,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;QAE9F,4FAA4F;QAC5F,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,GAAG,IAAI,4BAA4B,CAAC,WAAW,CAAC,CAAC;QAE/G,kDAAkD;QAClD,MAAM,OAAO,GAAG,WAAW,CAAC,sBAAsB,CAAC;YACjD,UAAU;YACV,SAAS;YACT,OAAO,EAAG,UAAU,CAAC,OAAO,CAAC;YAC7B,IAAI,EAAM,iBAAiB;SAC5B,CAAC,CAAC;QAEH,oEAAoE;QACpE,MAAM,eAAe,GAAG,IAAI,WAAW,CAAC;YACtC,EAAE,EAAmB,UAAU;YAC/B,UAAU,EAAW,CAAC,UAAU,CAAC;YACjC,kBAAkB,EAAG,CAAC;oBACpB,EAAE,EAAmB,GAAG,UAAU,aAAa;oBAC/C,IAAI,EAAiB,UAAU;oBAC/B,UAAU,EAAW,UAAU;oBAC/B,kBAAkB,EAAG,kBAAkB,CAAC,OAAO;iBAChD,CAAC;YACF,OAAO;SACR,CAAC,CAAC;QAEH,+BAA+B;QAC/B,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9C,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,oBAAoB,EAAE,OAAO,EAG3D;QACC,8BAA8B;QAC9B,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC;QAExC,sBAAsB;QACtB,yCAAyC;QACzC,MAAM,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;QAErD,gCAAgC;QAChC,oBAAoB,CAAC,oBAAoB,EAAE,CAAC;QAE5C,4GAA4G;QAC5G,gBAAgB;QAChB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;QAErF,oHAAoH;QACpH,mBAAmB;QACnB,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1E,gEAAgE;QAChE,oIAAoI;QACpI,MAAM,eAAe,GAAG,oBAAoB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAEhE,6BAA6B;QAC7B,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC;IAClC,CAAC;CACF"}
|
|
@@ -5,10 +5,10 @@ import { DidBtcr2 } from '../../did-btcr2.js';
|
|
|
5
5
|
* document. To do this, the DID controller constructs a valid DID Update Payload with a JSON patch that adds this
|
|
6
6
|
* property and announces the payload through a Beacon in their current DID document following the algorithm in Update.
|
|
7
7
|
* Once a did:btcr2 has been deactivated this state is considered permanent and resolution MUST terminate.
|
|
8
|
-
* @class
|
|
9
|
-
* @type {
|
|
10
|
-
* @extends {
|
|
8
|
+
* @class Deactivate
|
|
9
|
+
* @type {Deactivate}
|
|
10
|
+
* @extends {DidBtcr2}
|
|
11
11
|
*/
|
|
12
|
-
export class
|
|
12
|
+
export class Deactivate extends DidBtcr2 {
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=deactivate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deactivate.js","sourceRoot":"","sources":["../../../../src/core/crud/deactivate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;;;;;GASG;AACH,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"deactivate.js","sourceRoot":"","sources":["../../../../src/core/crud/deactivate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;;;;;GASG;AACH,MAAM,OAAO,UAAW,SAAQ,QAAQ;CAAG"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { BitcoinNetworkConnection, GENESIS_TX_ID, getNetwork, TXIN_WITNESS_COINBASE } from '@did-btcr2/bitcoin';
|
|
2
|
+
import { ID_PLACEHOLDER_VALUE, IdentifierHrp, INVALID_DID, INVALID_DID_DOCUMENT, INVALID_DID_UPDATE, LATE_PUBLISHING_ERROR, Logger, MethodError, ResolveError } from '@did-btcr2/common';
|
|
3
3
|
import { Cryptosuite, DataIntegrityProof, SchnorrMultikey } from '@did-btcr2/cryptosuite';
|
|
4
|
-
import {
|
|
4
|
+
import { CompressedSecp256k1PublicKey } from '@did-btcr2/keypair';
|
|
5
5
|
import { bytesToHex } from '@noble/hashes/utils';
|
|
6
6
|
import { DidBtcr2 } from '../../did-btcr2.js';
|
|
7
7
|
import { Appendix } from '../../utils/appendix.js';
|
|
@@ -11,7 +11,7 @@ import { BeaconFactory } from '../beacon/factory.js';
|
|
|
11
11
|
;
|
|
12
12
|
;
|
|
13
13
|
;
|
|
14
|
-
const bitcoin = new
|
|
14
|
+
const bitcoin = new BitcoinNetworkConnection();
|
|
15
15
|
/**
|
|
16
16
|
* Implements {@link https://dcdpr.github.io/did-btcr2/#read | 4.2 Read}.
|
|
17
17
|
* The read operation is executed by a resolver after a resolution request identifying a specific did:btcr2 identifier is
|
|
@@ -47,8 +47,8 @@ export class Resolve {
|
|
|
47
47
|
static deterministic({ identifier, identifierComponents }) {
|
|
48
48
|
// Deconstruct the components
|
|
49
49
|
const { network, genesisBytes } = identifierComponents;
|
|
50
|
-
// Construct a new
|
|
51
|
-
const { compressed: publicKey, multibase: publicKeyMultibase } = new
|
|
50
|
+
// Construct a new CompressedSecp256k1PublicKey and deconstruct the publicKey and publicKeyMultibase
|
|
51
|
+
const { compressed: publicKey, multibase: publicKeyMultibase } = new CompressedSecp256k1PublicKey(genesisBytes);
|
|
52
52
|
// Generate the service field for the DID Document
|
|
53
53
|
const service = BeaconUtils.generateBeaconServices({
|
|
54
54
|
identifier,
|
|
@@ -63,7 +63,7 @@ export class Resolve {
|
|
|
63
63
|
id: `${identifier}#initialKey`,
|
|
64
64
|
type: 'Multikey',
|
|
65
65
|
controller: identifier,
|
|
66
|
-
publicKeyMultibase: publicKeyMultibase.
|
|
66
|
+
publicKeyMultibase: publicKeyMultibase.encoded
|
|
67
67
|
}],
|
|
68
68
|
service
|
|
69
69
|
});
|
|
@@ -203,14 +203,14 @@ export class Resolve {
|
|
|
203
203
|
*/
|
|
204
204
|
static async targetDocument({ initialDocument, resolutionsOptions }) {
|
|
205
205
|
// Set the network from the options or default to mainnet
|
|
206
|
-
const network = resolutionsOptions.network
|
|
206
|
+
const network = resolutionsOptions.network;
|
|
207
207
|
// 1. If resolutionOptions.versionId is not null, set targetVersionId to resolutionOptions.versionId.
|
|
208
208
|
const targetVersionId = resolutionsOptions.versionId;
|
|
209
209
|
// 2. Else if resolutionOptions.versionTime is not null, set targetTime to resolutionOptions.versionTime.
|
|
210
210
|
// 3. Else set targetTime to the UNIX timestamp for now at the moment of execution.
|
|
211
211
|
const targetTime = resolutionsOptions.versionTime ?? new Date().toUnix();
|
|
212
212
|
// 4. Set signalsMetadata to resolutionOptions.sidecarData.signalsMetadata.
|
|
213
|
-
const signalsMetadata = resolutionsOptions.sidecarData
|
|
213
|
+
const signalsMetadata = resolutionsOptions.sidecarData?.signalsMetadata ?? {};
|
|
214
214
|
// 5. Set currentVersionId to 1
|
|
215
215
|
const currentVersionId = 1;
|
|
216
216
|
// 6. If currentVersionId equals targetVersionId return initialDocument.
|
|
@@ -219,7 +219,7 @@ export class Resolve {
|
|
|
219
219
|
}
|
|
220
220
|
// 10. Set targetDocument to the result of calling the Traverse Bitcoin Blockchain History algorithm
|
|
221
221
|
// passing in contemporaryDIDDocument, contemporaryBlockheight, currentVersionId, targetVersionId,
|
|
222
|
-
// targetTime, didDocumentHistory,
|
|
222
|
+
// targetTime, didDocumentHistory, updateHashHistory, signalsMetadata, and network.
|
|
223
223
|
const targetDocument = this.traverseBlockchainHistory({
|
|
224
224
|
contemporaryDidDocument: initialDocument,
|
|
225
225
|
contemporaryBlockHeight: 0,
|
|
@@ -227,7 +227,7 @@ export class Resolve {
|
|
|
227
227
|
targetVersionId,
|
|
228
228
|
targetTime,
|
|
229
229
|
didDocumentHistory: new Array(),
|
|
230
|
-
|
|
230
|
+
updateHashHistory: new Array(),
|
|
231
231
|
signalsMetadata,
|
|
232
232
|
network
|
|
233
233
|
});
|
|
@@ -260,13 +260,13 @@ export class Resolve {
|
|
|
260
260
|
* @param {UnixTimestamp} params.targetTime The timestamp used to target specific historical states of a DID document.
|
|
261
261
|
* Only Beacon Signals included in the Bitcoin blockchain before the targetTime are processed.
|
|
262
262
|
* @param {boolean} params.didDocumentHistory An array of DID documents ordered ascensing by version (1...N).
|
|
263
|
-
* @param {boolean} params.
|
|
263
|
+
* @param {boolean} params.updateHashHistory An array of SHA256 hashes of BTCR2 Updates ordered by version that are
|
|
264
264
|
* applied to the DID document in order to construct the contemporaryDIDDocument.
|
|
265
265
|
* @param {SignalsMetadata} params.signalsMetadata See {@link SignalsMetadata} for details.
|
|
266
|
-
* @param {
|
|
266
|
+
* @param {string} params.network The bitcoin network to connect to (mainnet, signet, testnet, regtest).
|
|
267
267
|
* @returns {Promise<DidDocument>} The resolved DID Document object with a validated single, canonical history.
|
|
268
268
|
*/
|
|
269
|
-
static async traverseBlockchainHistory({ contemporaryDidDocument, contemporaryBlockHeight, currentVersionId, targetVersionId, targetTime, didDocumentHistory,
|
|
269
|
+
static async traverseBlockchainHistory({ contemporaryDidDocument, contemporaryBlockHeight, currentVersionId, targetVersionId, targetTime, didDocumentHistory, updateHashHistory, signalsMetadata, network }) {
|
|
270
270
|
// 1. Set contemporaryHash to the SHA256 hash of the contemporaryDidDocument
|
|
271
271
|
let contemporaryHash = await JSON.canonicalization.process(contemporaryDidDocument, 'base58');
|
|
272
272
|
// 2. Find all BTCR2 Beacons in contemporaryDIDDocument.service where service.type equals one of
|
|
@@ -294,8 +294,8 @@ export class Resolve {
|
|
|
294
294
|
// 10.1. If update.targetVersionId is less than or equal to currentVersionId, run Algorithm Confirm Duplicate
|
|
295
295
|
// Update passing in update, documentHistory, and contemporaryHash.
|
|
296
296
|
if (updateTargetVersionId <= currentVersionId) {
|
|
297
|
-
|
|
298
|
-
await this.confirmDuplicateUpdate({ update, updateHashHistory:
|
|
297
|
+
updateHashHistory.push(contemporaryHash);
|
|
298
|
+
await this.confirmDuplicateUpdate({ update, updateHashHistory: updateHashHistory });
|
|
299
299
|
// 10.2. If update.targetVersionId equals currentVersionId + 1:
|
|
300
300
|
}
|
|
301
301
|
else if (updateTargetVersionId === currentVersionId + 1) {
|
|
@@ -318,8 +318,8 @@ export class Resolve {
|
|
|
318
318
|
delete unsecuredUpdate.proof;
|
|
319
319
|
// 10.2.7 Set updateHash to the result of passing unsecuredUpdate into the JSON Canonicalization and Hash algorithm.
|
|
320
320
|
const updateHash = await JSON.canonicalization.process(update, 'base58');
|
|
321
|
-
// 10.2.8. Push updateHash onto
|
|
322
|
-
|
|
321
|
+
// 10.2.8. Push updateHash onto updateHashHistory.
|
|
322
|
+
updateHashHistory.push(updateHash);
|
|
323
323
|
// 10.2.9. Set contemporaryHash to result of passing contemporaryDIDDocument into the JSON Canonicalization and Hash algorithm.
|
|
324
324
|
contemporaryHash = await JSON.canonicalization.process(contemporaryDidDocument, 'base58');
|
|
325
325
|
// 10.3. If update.targetVersionId is greater than currentVersionId + 1, MUST throw a LatePublishing error.
|
|
@@ -364,19 +364,28 @@ export class Resolve {
|
|
|
364
364
|
*
|
|
365
365
|
* @public
|
|
366
366
|
* @param {FindNextSignals} params The parameters for the findNextSignals operation.
|
|
367
|
-
* @param {number} params.
|
|
368
|
-
* @param {Array<BeaconService>} params.target The target blockheight at which to stop finding signals.
|
|
367
|
+
* @param {number} params.contemporaryBlockHeight The blockheight to start looking for beacon signals.
|
|
369
368
|
* @param {Array<BeaconService>} params.beacons The beacons to look for in the block.
|
|
369
|
+
* @param {Array<BeaconService>} params.network The bitcoin network to connect to (mainnet, signet, testnet, regtest).
|
|
370
|
+
* @param {UnixTimestamp} params.targetTime The timestamp used to target specific historical states of a DID document.
|
|
371
|
+
* Only Beacon Signals included in the Bitcoin blockchain before the targetTime are processed.
|
|
370
372
|
* @returns {Promise<Array<BeaconSignal>>} An array of BeaconSignal objects with blockHeight and signals.
|
|
371
373
|
*/
|
|
372
|
-
static async findNextSignals({ contemporaryBlockHeight, targetTime, beacons }) {
|
|
374
|
+
static async findNextSignals({ contemporaryBlockHeight, targetTime, network, beacons }) {
|
|
373
375
|
let height = contemporaryBlockHeight;
|
|
374
376
|
// Create an default beaconSignal and beaconSignals array
|
|
375
377
|
let beaconSignals = [];
|
|
378
|
+
// Get the bitcoin network connection
|
|
379
|
+
bitcoin.setActiveNetwork(network);
|
|
380
|
+
// Opt into REST connection if available
|
|
376
381
|
if (bitcoin.network.rest) {
|
|
377
|
-
return await this.findSignalsRest(
|
|
382
|
+
return await this.findSignalsRest(beacons);
|
|
378
383
|
}
|
|
379
|
-
//
|
|
384
|
+
// If no rest and no rpc connection is available, throw an error
|
|
385
|
+
if (!bitcoin.network.rpc) {
|
|
386
|
+
throw new ResolveError(`No Bitcoin connection available, cannot find next signals`, 'NO_BITCOIN_CONNECTION');
|
|
387
|
+
}
|
|
388
|
+
// Opt into rpc connection to get the block data at the blockhash
|
|
380
389
|
let block = await bitcoin.network.rpc.getBlock({ height });
|
|
381
390
|
Logger.info(`Searching for signals, please wait ...`);
|
|
382
391
|
while (block.time <= targetTime) {
|
|
@@ -453,15 +462,10 @@ export class Resolve {
|
|
|
453
462
|
}
|
|
454
463
|
/**
|
|
455
464
|
* Helper method for the {@link findNextSignals | Find Next Signals} algorithm.
|
|
456
|
-
*
|
|
457
|
-
* @param params See {@link FindNextSignalsRestParams} for details.
|
|
458
|
-
* @param {BitcoinClient} params.connection The bitcoin connection to use.
|
|
459
|
-
* @param {Array<BeaconSignal>} params.beaconSignals The beacon signals to process.
|
|
460
|
-
* @param {BlockV3} params.block The block to process.
|
|
461
|
-
* @param {Array<BeaconService>} params.beacons The beacons to process.
|
|
465
|
+
* @param {Array<BeaconService>} beacons The beacons to process.
|
|
462
466
|
* @returns {Promise<Array<BeaconSignal>>} The beacon signals found in the block.
|
|
463
467
|
*/
|
|
464
|
-
static async findSignalsRest(
|
|
468
|
+
static async findSignalsRest(beacons) {
|
|
465
469
|
// Empty array of beaconSignals
|
|
466
470
|
const beaconSignals = new Array();
|
|
467
471
|
// Iterate over each beacon
|
|
@@ -557,16 +561,16 @@ export class Resolve {
|
|
|
557
561
|
const service = { id, type, serviceEndpoint: `bitcoin:${address}` };
|
|
558
562
|
// Establish a Beacon instance using the service and sidecar
|
|
559
563
|
const beacon = BeaconFactory.establish(service, sidecar);
|
|
560
|
-
// 2.5 Set
|
|
561
|
-
const
|
|
564
|
+
// 2.5 Set didUpdate to null.
|
|
565
|
+
const didUpdate = await beacon.processSignal(signalTx, signalsMetadata) ?? null;
|
|
562
566
|
// If the updates is null, throw an error
|
|
563
|
-
if (!
|
|
564
|
-
throw new MethodError('No
|
|
567
|
+
if (!didUpdate) {
|
|
568
|
+
throw new MethodError('No didUpdate for beacon', 'PROCESS_BEACON_SIGNALS_ERROR', { tx, signalsMetadata });
|
|
565
569
|
}
|
|
566
|
-
// 2.9 If
|
|
567
|
-
updates.push(
|
|
570
|
+
// 2.9 If didUpdate is not null, push didUpdate to updates.
|
|
571
|
+
updates.push(didUpdate);
|
|
568
572
|
// 3. Return updates.
|
|
569
|
-
return
|
|
573
|
+
return didUpdate;
|
|
570
574
|
}
|
|
571
575
|
/**
|
|
572
576
|
* Implements {@link https://dcdpr.github.io/did-btcr2/#confirm-duplicate-update | 7.2.2.4 Confirm Duplicate Update}.
|
|
@@ -581,7 +585,7 @@ export class Resolve {
|
|
|
581
585
|
* @param {DidUpdatePayload} params.update The DID Update Payload to confirm.
|
|
582
586
|
* @param {Array<string>} params.updateHashHistory The history of hashes for previously applied updates.
|
|
583
587
|
* @returns {Promise<void>} A promise that resolves if the update is a duplicate, otherwise throws an error.
|
|
584
|
-
* @throws {
|
|
588
|
+
* @throws {ResolveError} if the update hash does not match the historical hash.
|
|
585
589
|
*/
|
|
586
590
|
static async confirmDuplicateUpdate({ update, updateHashHistory }) {
|
|
587
591
|
// 1. Let unsecuredUpdate be a copy of the update object.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/core/crud/read.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/core/crud/read.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BTCR2_DID_UPDATE_PAYLOAD_CONTEXT, MethodError, INVALID_DID_DOCUMENT, INVALID_DID_UPDATE, INVALID_PUBLIC_KEY_TYPE, Logger, NOT_FOUND } from '@did-btcr2/common';
|
|
2
2
|
import { SchnorrMultikey } from '@did-btcr2/cryptosuite';
|
|
3
|
-
import { SchnorrKeyPair,
|
|
3
|
+
import { SchnorrKeyPair, Secp256k1SecretKey } from '@did-btcr2/keypair';
|
|
4
4
|
import { Appendix } from '../../utils/appendix.js';
|
|
5
5
|
import { DidDocument } from '../../utils/did-document.js';
|
|
6
6
|
import { BeaconFactory } from '../beacon/factory.js';
|
|
@@ -100,7 +100,7 @@ export class Update {
|
|
|
100
100
|
id,
|
|
101
101
|
controller,
|
|
102
102
|
keys: new SchnorrKeyPair({
|
|
103
|
-
secretKey:
|
|
103
|
+
secretKey: Secp256k1SecretKey.decode(secretKeyMultibase)
|
|
104
104
|
})
|
|
105
105
|
});
|
|
106
106
|
// 1.3 If the privateKey is not found, throw an error
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/core/crud/update.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gCAAgC,EAChC,WAAW,EAGX,oBAAoB,EACpB,kBAAkB,EAClB,uBAAuB,EACvB,MAAM,EACN,SAAS,EAGV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/core/crud/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { KeyManagerError, Logger, MULTIBASE_URI_PREFIX } from '@did-btcr2/common';
|
|
2
2
|
import { SchnorrMultikey } from '@did-btcr2/cryptosuite';
|
|
3
|
-
import {
|
|
3
|
+
import { CompressedSecp256k1PublicKey, SchnorrKeyPair } from '@did-btcr2/keypair';
|
|
4
4
|
import { sha256 } from '@noble/hashes/sha2';
|
|
5
5
|
import { MemoryStore } from '@web5/common';
|
|
6
6
|
import { Did } from '@web5/dids';
|
|
@@ -79,9 +79,9 @@ export class KeyManager {
|
|
|
79
79
|
throw new Error('Method not implemented.' + txHex + keyUri);
|
|
80
80
|
}
|
|
81
81
|
/**
|
|
82
|
-
* Gets the key pair from the key store and returns a
|
|
82
|
+
* Gets the key pair from the key store and returns a CompressedSecp256k1PublicKey.
|
|
83
83
|
* @param {KeyIdentifier} keyUri The URI of the key to get the public key for.
|
|
84
|
-
* @returns {Promise<
|
|
84
|
+
* @returns {Promise<CompressedSecp256k1PublicKey>} The public key associated with the key URI.
|
|
85
85
|
*/
|
|
86
86
|
async getPublicKey(keyUri) {
|
|
87
87
|
// Use the active key URI if not provided
|
|
@@ -205,13 +205,13 @@ export class KeyManager {
|
|
|
205
205
|
}
|
|
206
206
|
/**
|
|
207
207
|
* Computes a multibase-compliant URI from a key.
|
|
208
|
-
* @param key A SchnorrKeyPair,
|
|
208
|
+
* @param key A SchnorrKeyPair, CompressedSecp256k1PublicKey, or multibase string
|
|
209
209
|
* @returns {string} A multibase URI (e.g. 'urn:mb:zQ3s...')
|
|
210
210
|
*/
|
|
211
211
|
static toMultibaseUri(data) {
|
|
212
212
|
const multibase = data instanceof SchnorrKeyPair
|
|
213
213
|
? data.publicKey.multibase
|
|
214
|
-
: data instanceof
|
|
214
|
+
: data instanceof CompressedSecp256k1PublicKey
|
|
215
215
|
? data.multibase
|
|
216
216
|
: data;
|
|
217
217
|
return `${MULTIBASE_URI_PREFIX}${multibase}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/key-manager/index.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,eAAe,EACf,MAAM,EACN,oBAAoB,EAGrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/key-manager/index.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/did-btcr2.js
CHANGED
|
@@ -91,6 +91,8 @@ export class DidBtcr2 {
|
|
|
91
91
|
// 1. Pass identifier to the did:btcr2 Identifier Decoding algorithm, retrieving idType, version, network, and genesisBytes.
|
|
92
92
|
// 2. Set identifierComponents to a map of idType, version, network, and genesisBytes.
|
|
93
93
|
const identifierComponents = Identifier.decode(identifier);
|
|
94
|
+
// Set the network based on the decoded identifier
|
|
95
|
+
resolutionsOptions.network ??= identifierComponents.network;
|
|
94
96
|
// 3. Set initialDocument to the result of running the algorithm in Resolve Initial Document passing in the
|
|
95
97
|
// identifier, identifierComponents and resolutionOptions.
|
|
96
98
|
const initialDocument = await Resolve.initialDocument({ identifier, identifierComponents, resolutionsOptions });
|
|
@@ -143,7 +145,7 @@ export class DidBtcr2 {
|
|
|
143
145
|
* @param {string} params.identifier The btcr2 identifier to be updated.
|
|
144
146
|
* @param {DidDocument} params.sourceDocument The DID document being updated.
|
|
145
147
|
* @param {string} params.sourceVersionId The versionId of the source document.
|
|
146
|
-
* @param {
|
|
148
|
+
* @param {PatchOperation} params.documentPatch The JSON patch to be applied to the source document.
|
|
147
149
|
* @param {string} params.verificationMethodId The verificationMethod ID to sign the update
|
|
148
150
|
* @param {string[]} params.beaconIds The beacon IDs to announce the update
|
|
149
151
|
* @returns {Promise<void>} Promise resolving to void
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"did-btcr2.js","sourceRoot":"","sources":["../../src/did-btcr2.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"did-btcr2.js","sourceRoot":"","sources":["../../src/did-btcr2.ts"],"names":[],"mappings":"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"}
|