@dxos/credentials 2.33.7-dev.c2ba88fb → 2.33.8-dev.6bc74570
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/.rush/temp/package-deps_build.json +24 -23
- package/.rush/temp/package-deps_build_test.json +24 -23
- package/.rush/temp/shrinkwrap-deps.json +11 -1
- package/credentials.build.log +13 -11
- package/dist/src/auth/auth-message.d.ts +1 -1
- package/dist/src/auth/auth-message.d.ts.map +1 -1
- package/dist/src/auth/auth-message.js +2 -2
- package/dist/src/auth/auth-message.js.map +1 -1
- package/dist/src/auth/auth-plugin.test.js +10 -9
- package/dist/src/auth/auth-plugin.test.js.map +1 -1
- package/dist/src/auth/auth.test.js.map +1 -1
- package/dist/src/auth/authenticator.js +2 -2
- package/dist/src/auth/authenticator.js.map +1 -1
- package/dist/src/greet/greeter-plugin.test.js +10 -9
- package/dist/src/greet/greeter-plugin.test.js.map +1 -1
- package/dist/src/greet/greeter.d.ts +1 -1
- package/dist/src/greet/greeter.d.ts.map +1 -1
- package/dist/src/greet/greeter.js +2 -2
- package/dist/src/greet/greeter.js.map +1 -1
- package/dist/src/greet/greeting-command-plugin.d.ts.map +1 -1
- package/dist/src/greet/greeting-command-plugin.js +3 -3
- package/dist/src/greet/greeting-command-plugin.js.map +1 -1
- package/dist/src/greet/invitation.d.ts +1 -1
- package/dist/src/greet/invitation.d.ts.map +1 -1
- package/dist/src/greet/invitation.js +2 -1
- package/dist/src/greet/invitation.js.map +1 -1
- package/dist/src/identity/identity-message-processor.d.ts +1 -1
- package/dist/src/identity/identity-message-processor.d.ts.map +1 -1
- package/dist/src/identity/identity-message-processor.js +4 -4
- package/dist/src/identity/identity-message-processor.js.map +1 -1
- package/dist/src/identity/index.d.ts +1 -0
- package/dist/src/identity/index.d.ts.map +1 -1
- package/dist/src/identity/index.js +1 -0
- package/dist/src/identity/index.js.map +1 -1
- package/dist/src/identity/seedphrase.d.ts +9 -0
- package/dist/src/identity/seedphrase.d.ts.map +1 -0
- package/dist/src/identity/seedphrase.js +28 -0
- package/dist/src/identity/seedphrase.js.map +1 -0
- package/dist/src/identity/seedphrase.test.js +20 -4
- package/dist/src/identity/seedphrase.test.js.map +1 -1
- package/dist/src/keys/filter.d.ts +1 -1
- package/dist/src/keys/filter.d.ts.map +1 -1
- package/dist/src/keys/filter.js +2 -2
- package/dist/src/keys/filter.js.map +1 -1
- package/dist/src/keys/keyring-helpers.d.ts +2 -1
- package/dist/src/keys/keyring-helpers.d.ts.map +1 -1
- package/dist/src/keys/keyring-helpers.js +7 -6
- package/dist/src/keys/keyring-helpers.js.map +1 -1
- package/dist/src/keys/keyring.d.ts +1 -1
- package/dist/src/keys/keyring.d.ts.map +1 -1
- package/dist/src/keys/keyring.js +10 -9
- package/dist/src/keys/keyring.js.map +1 -1
- package/dist/src/keys/keyring.test.js +9 -8
- package/dist/src/keys/keyring.test.js.map +1 -1
- package/dist/src/keys/keystore.js +2 -2
- package/dist/src/keys/keystore.js.map +1 -1
- package/dist/src/keys/signer.d.ts +1 -1
- package/dist/src/keys/signer.d.ts.map +1 -1
- package/dist/src/party/party-credential.d.ts +1 -1
- package/dist/src/party/party-credential.d.ts.map +1 -1
- package/dist/src/party/party-credential.js +7 -6
- package/dist/src/party/party-credential.js.map +1 -1
- package/dist/src/party/party-invitation-manager.js +3 -3
- package/dist/src/party/party-invitation-manager.js.map +1 -1
- package/dist/src/party/party-state.d.ts +1 -1
- package/dist/src/party/party-state.d.ts.map +1 -1
- package/dist/src/party/party-state.js +8 -7
- package/dist/src/party/party-state.js.map +1 -1
- package/dist/src/proto/gen/dxos/halo/keys.d.ts +9 -9
- package/dist/src/proto/gen/index.d.ts.map +1 -1
- package/dist/src/proto/gen/index.js +1 -1
- package/dist/src/proto/gen/index.js.map +1 -1
- package/dist/src/proto/substitutions.d.ts +2 -2
- package/dist/src/proto/substitutions.js +2 -2
- package/dist/src/proto/substitutions.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +13 -12
- package/src/auth/auth-message.ts +1 -1
- package/src/auth/auth-plugin.test.ts +6 -5
- package/src/auth/auth.test.ts +2 -1
- package/src/auth/authenticator.ts +1 -1
- package/src/greet/greeter-plugin.test.ts +6 -5
- package/src/greet/greeter.ts +1 -1
- package/src/greet/greeting-command-plugin.ts +3 -3
- package/src/greet/invitation.ts +2 -1
- package/src/identity/identity-message-processor.ts +1 -1
- package/src/identity/index.ts +1 -0
- package/src/identity/seedphrase.test.ts +20 -1
- package/src/identity/seedphrase.ts +24 -0
- package/src/keys/filter.ts +1 -1
- package/src/keys/keyring-helpers.ts +2 -1
- package/src/keys/keyring.test.ts +5 -4
- package/src/keys/keyring.ts +3 -2
- package/src/keys/keystore.ts +1 -1
- package/src/keys/signer.ts +1 -1
- package/src/party/party-credential.ts +2 -1
- package/src/party/party-invitation-manager.ts +1 -1
- package/src/party/party-state.ts +2 -1
- package/src/proto/gen/dxos/halo/keys.ts +9 -9
- package/src/proto/gen/index.ts +1 -1
- package/src/proto/substitutions.ts +1 -1
|
@@ -12,6 +12,7 @@ const pump_1 = __importDefault(require("pump"));
|
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const crypto_1 = require("@dxos/crypto");
|
|
14
14
|
const mesh_protocol_1 = require("@dxos/mesh-protocol");
|
|
15
|
+
const protocols_1 = require("@dxos/protocols");
|
|
15
16
|
const util_1 = require("@dxos/util");
|
|
16
17
|
const keys_1 = require("../keys");
|
|
17
18
|
const party_1 = require("../party");
|
|
@@ -25,10 +26,10 @@ const log = (0, debug_1.default)('dxos:halo:greet');
|
|
|
25
26
|
const createGreeter = async (targetPartyKey) => {
|
|
26
27
|
const [writePromise, outerResolve] = (0, async_1.trigger)();
|
|
27
28
|
const hints = [
|
|
28
|
-
{ publicKey:
|
|
29
|
-
{ publicKey:
|
|
30
|
-
{ publicKey:
|
|
31
|
-
{ publicKey:
|
|
29
|
+
{ publicKey: protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32)), type: proto_1.KeyType.IDENTITY },
|
|
30
|
+
{ publicKey: protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32)), type: proto_1.KeyType.DEVICE },
|
|
31
|
+
{ publicKey: protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32)), type: proto_1.KeyType.FEED },
|
|
32
|
+
{ publicKey: protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32)), type: proto_1.KeyType.FEED }
|
|
32
33
|
];
|
|
33
34
|
const greeter = new greeter_1.Greeter(targetPartyKey, async (messages) => {
|
|
34
35
|
outerResolve(messages);
|
|
@@ -41,7 +42,7 @@ const createGreeter = async (targetPartyKey) => {
|
|
|
41
42
|
live: true
|
|
42
43
|
},
|
|
43
44
|
discoveryKey: peerId,
|
|
44
|
-
userSession: { peerId:
|
|
45
|
+
userSession: { peerId: protocols_1.PublicKey.stringify(peerId) },
|
|
45
46
|
initiator: true
|
|
46
47
|
})
|
|
47
48
|
.setExtension(plugin.createExtension())
|
|
@@ -57,8 +58,8 @@ const createInvitee = async (rendezvousKey, invitationId) => {
|
|
|
57
58
|
const plugin = new greeting_command_plugin_1.GreetingCommandPlugin(peerId, invitee.createMessageHandler());
|
|
58
59
|
const connectionPromise = new Promise(resolve => {
|
|
59
60
|
plugin.on('peer:joined', (peerId) => {
|
|
60
|
-
if (peerId &&
|
|
61
|
-
log(`${
|
|
61
|
+
if (peerId && protocols_1.PublicKey.stringify(peerId) === protocols_1.PublicKey.stringify(rendezvousKey)) {
|
|
62
|
+
log(`${protocols_1.PublicKey.stringify(peerId)} connected.`);
|
|
62
63
|
resolve();
|
|
63
64
|
}
|
|
64
65
|
});
|
|
@@ -68,7 +69,7 @@ const createInvitee = async (rendezvousKey, invitationId) => {
|
|
|
68
69
|
live: true
|
|
69
70
|
},
|
|
70
71
|
discoveryKey: rendezvousKey,
|
|
71
|
-
userSession: { peerId:
|
|
72
|
+
userSession: { peerId: protocols_1.PublicKey.stringify(peerId) },
|
|
72
73
|
initiator: false
|
|
73
74
|
})
|
|
74
75
|
.setExtension(plugin.createExtension())
|
|
@@ -81,7 +82,7 @@ const createInvitee = async (rendezvousKey, invitationId) => {
|
|
|
81
82
|
*/
|
|
82
83
|
const connect = (source, target) => (0, pump_1.default)(source.stream, target.stream, source.stream);
|
|
83
84
|
it('Greeting Flow using GreetingCommandPlugin', async () => {
|
|
84
|
-
const targetPartyKey =
|
|
85
|
+
const targetPartyKey = protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32));
|
|
85
86
|
const secret = '0000';
|
|
86
87
|
const secretProvider = async () => Buffer.from(secret);
|
|
87
88
|
const secretValidator = async (invitation, secret) => !!secret && !!invitation.secret && (0, util_1.arraysEqual)(secret, invitation.secret);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeter-plugin.test.js","sourceRoot":"","sources":["../../../src/greet/greeter-plugin.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,kDAA0B;AAC1B,oDAA4B;AAC5B,gDAAwB;AAExB,uCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"greeter-plugin.test.js","sourceRoot":"","sources":["../../../src/greet/greeter-plugin.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { PublicKeyLike, PublicKey } from '@dxos/
|
|
2
|
+
import { PublicKeyLike, PublicKey } from '@dxos/protocols';
|
|
3
3
|
import { Message, KeyHint, Command, NotarizeResponse, WithTypeUrl } from '../proto';
|
|
4
4
|
import { PeerId } from '../typedefs';
|
|
5
5
|
import { Invitation, InvitationOnFinish, SecretProvider, SecretValidator } from './invitation';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeter.d.ts","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"greeter.d.ts","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK3D,OAAO,EAAmB,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAW,MAAM,UAAU,CAAC;AAC9G,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAWrC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/F,oBAAY,WAAW,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AACpE,oBAAY,YAAY,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAErE;;GAEG;AACH,qBAAa,OAAO;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B,YAAY,0BAAiC;IAE7C;;;;;;OAMG;gBACU,QAAQ,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,YAAY;IAY7F;;;;;;;;;;OAUG;IACH,gBAAgB,CAAE,QAAQ,EAAE,aAAa,EACvC,eAAe,EAAE,eAAe,EAChC,cAAc,CAAC,EAAE,cAAc,EAC/B,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,UAAU,CAAC,EAAE,MAAM;;;IAgBrB,oBAAoB,cACK,OAAO,gBAAgB,MAAM,UAAU,MAAM;;;;;;;;;;;;;;;;;IAKtE;;;;;;OAMG;IACG,aAAa,CAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;IAuC3E;;;;;;OAMG;IACG,cAAc,CAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAuB1D;;;;OAIG;IACG,aAAa,CAAE,UAAU,EAAE,UAAU;IAKrC,YAAY,CAAE,YAAY,EAAE,MAAM;;;;;;;;;;;;;IA0BlC,gBAAgB,CAAE,UAAU,EAAE,UAAU;;;;;IAaxC,eAAe,CAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;CA6CtG"}
|
|
@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.Greeter = void 0;
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const debug_1 = __importDefault(require("debug"));
|
|
12
|
-
const crypto_1 = require("@dxos/crypto");
|
|
13
12
|
const mesh_protocol_1 = require("@dxos/mesh-protocol");
|
|
13
|
+
const protocols_1 = require("@dxos/protocols");
|
|
14
14
|
const util_1 = require("@dxos/util");
|
|
15
15
|
const keys_1 = require("../keys");
|
|
16
16
|
const party_1 = require("../party");
|
|
@@ -37,7 +37,7 @@ class Greeter {
|
|
|
37
37
|
(0, assert_1.default)(partyWriter);
|
|
38
38
|
(0, assert_1.default)(hintProvider);
|
|
39
39
|
}
|
|
40
|
-
this._partyKey = partyKey ?
|
|
40
|
+
this._partyKey = partyKey ? protocols_1.PublicKey.from(partyKey) : undefined;
|
|
41
41
|
this._partyWriter = partyWriter;
|
|
42
42
|
this._hintProvider = hintProvider;
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeter.js","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"greeter.js","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-command-plugin.d.ts","sourceRoot":"","sources":["../../../src/greet/greeting-command-plugin.ts"],"names":[],"mappings":";;AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"greeting-command-plugin.d.ts","sourceRoot":"","sources":["../../../src/greet/greeting-command-plugin.ts"],"names":[],"mappings":";;AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAiC,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAIzF,OAAO,EAAS,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAOrC,oBAAY,6BAA6B,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAOjH;;;;;;;;;;;;;GAaG;AAEH,qBAAa,qBAAsB,SAAQ,YAAY;IACrD,OAAc,cAAc,SAA+B;IAE3D,OAAO,EAAE,MAAM,CAAC;IAChB,mBAAmB,EAAE,6BAA6B,CAAC;IACnD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAEZ,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,6BAA6B;IAgB9E,IAAI,MAAM,WAET;IAED,IAAI,KAAK,UAER;IAED;;;OAGG;IACH,eAAe,CAAE,OAAO,SAAkB;IAO1C;;;;;OAKG;IACG,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,UAAQ;IAMzE;;;;;;;;;OASG;IACG,KAAK,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO;IA2C9D;;;;;;OAMG;IACG,QAAQ,CAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAoBlC,QAAQ,CAAE,QAAQ,EAAE,QAAQ;IAa5B,WAAW,CAAE,QAAQ,EAAE,QAAQ;CAatC"}
|
|
@@ -14,8 +14,8 @@ exports.GreetingCommandPlugin = void 0;
|
|
|
14
14
|
const assert_1 = __importDefault(require("assert"));
|
|
15
15
|
const debug_1 = __importDefault(require("debug"));
|
|
16
16
|
const events_1 = require("events");
|
|
17
|
-
const crypto_1 = require("@dxos/crypto");
|
|
18
17
|
const mesh_protocol_1 = require("@dxos/mesh-protocol");
|
|
18
|
+
const protocols_1 = require("@dxos/protocols");
|
|
19
19
|
const party_1 = require("../party");
|
|
20
20
|
const proto_1 = require("../proto");
|
|
21
21
|
const error_codes_1 = require("./error-codes");
|
|
@@ -24,7 +24,7 @@ const DEFAULT_TIMEOUT = 30000;
|
|
|
24
24
|
const getPeerId = (protocol) => {
|
|
25
25
|
var _a;
|
|
26
26
|
const { peerId } = (_a = protocol.getSession()) !== null && _a !== void 0 ? _a : {};
|
|
27
|
-
return
|
|
27
|
+
return protocols_1.PublicKey.bufferize(peerId);
|
|
28
28
|
};
|
|
29
29
|
/**
|
|
30
30
|
* A Protocol plugin. Implements a simple request/response protocol.
|
|
@@ -95,7 +95,7 @@ class GreetingCommandPlugin extends events_1.EventEmitter {
|
|
|
95
95
|
async _send(peerId, message, oneway) {
|
|
96
96
|
(0, assert_1.default)(Buffer.isBuffer(peerId));
|
|
97
97
|
// `peerId` is a Buffer, but here we only need its string form.
|
|
98
|
-
const peerIdStr =
|
|
98
|
+
const peerIdStr = protocols_1.PublicKey.stringify(peerId);
|
|
99
99
|
const peer = this._peers.get(peerIdStr);
|
|
100
100
|
(0, assert_1.default)(peer, `Peer not connected: ${peerIdStr}`);
|
|
101
101
|
const extension = peer.getExtension(GreetingCommandPlugin.EXTENSION_NAME);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-command-plugin.js","sourceRoot":"","sources":["../../../src/greet/greeting-command-plugin.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,sCAAsC;AACtC;;GAEG;AAEH,oDAA4B;AAC5B,kDAA0B;AAC1B,mCAAsC;AAGtC,
|
|
1
|
+
{"version":3,"file":"greeting-command-plugin.js","sourceRoot":"","sources":["../../../src/greet/greeting-command-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation.d.ts","sourceRoot":"","sources":["../../../src/greet/invitation.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"invitation.d.ts","sourceRoot":"","sources":["../../../src/greet/invitation.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAI3D;;GAEG;AAEH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,GAAG,CAAA;IACP,SAAS,EAAE,GAAG,CAAA;CACf;AAED;;GAEG;AACH,oBAAY,cAAc,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAEnE;;GAEG;AACH,oBAAY,eAAe,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAE1F,eAAO,MAAM,qBAAqB,EAAE,cAAgD,CAAC;AAErF,eAAO,MAAM,sBAAsB,EAAE,eAC2E,CAAC;AAGjH,oBAAY,kBAAkB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;AAEpD;;;;;;;;;;;GAWG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAiB;IAClD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAS;IAEtC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA2B;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,OAAO,CAAC,CAAS;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAS;IAE1B;;OAEG;gBACU,QAAQ,EAAE,aAAa,EAClC,eAAe,EAAE,eAAe,EAChC,cAAc,CAAC,EAAE,cAAc,EAC/B,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,UAAU,SAAI;IAQhB,IAAI,EAAE,WAEL;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,KAAK,WAER;IAED,IAAI,QAAQ,cAEX;IAED,IAAI,MAAM,WAET;IAED,IAAI,IAAI,YAEP;IAED,IAAI,KAAK,YAER;IAED,IAAI,SAAS,YAEZ;IAED,IAAI,SAAS,YAEZ;IAED,IAAI,OAAO,YAEV;IAED,IAAI,QAAQ,YAEX;IAED,IAAI,OAAO,YAKV;IAED,IAAI,MAAM,uBAET;IAED;;;OAGG;IACG,MAAM;IAUZ;;;;OAIG;IACG,KAAK;IAiBX;;;OAGG;IACG,SAAS;IAUf;;;OAGG;IACG,QAAQ;IAUd;;;;OAIG;IACG,MAAM;IAaZ;;;OAGG;IACG,QAAQ,CAAE,MAAM,EAAE,MAAM;CAG/B"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Invitation = exports.defaultSecretValidator = exports.defaultSecretProvider = void 0;
|
|
7
7
|
const crypto_1 = require("@dxos/crypto");
|
|
8
|
+
const protocols_1 = require("@dxos/protocols");
|
|
8
9
|
const proto_1 = require("../proto");
|
|
9
10
|
const defaultSecretProvider = async () => Buffer.from('0000');
|
|
10
11
|
exports.defaultSecretProvider = defaultSecretProvider;
|
|
@@ -31,7 +32,7 @@ class Invitation {
|
|
|
31
32
|
this._authNonce = (0, crypto_1.randomBytes)(32);
|
|
32
33
|
this._nonce = (0, crypto_1.randomBytes)(32);
|
|
33
34
|
this._issued = (0, proto_1.createDateTimeString)();
|
|
34
|
-
this._partyKey =
|
|
35
|
+
this._partyKey = protocols_1.PublicKey.from(partyKey);
|
|
35
36
|
this._secretValidator = secretValidator;
|
|
36
37
|
this._secretProvider = secretProvider;
|
|
37
38
|
this._onFinish = onFinish;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation.js","sourceRoot":"","sources":["../../../src/greet/invitation.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,
|
|
1
|
+
{"version":3,"file":"invitation.js","sourceRoot":"","sources":["../../../src/greet/invitation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-message-processor.d.ts","sourceRoot":"","sources":["../../../src/identity/identity-message-processor.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAa,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"identity-message-processor.d.ts","sourceRoot":"","sources":["../../../src/identity/identity-message-processor.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAa,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAI3D,OAAO,EAAE,UAAU,EAA+B,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAIzC;;;GAGG;AACH,qBAAa,wBAAyB,SAAQ,YAAY;IACxD,MAAM,EAAE,UAAU,CAAC;IAGnB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;gBAE7B,KAAK,EAAE,UAAU;IAQ9B;;;;;OAKG;IACH,IAAI,YAAY,+BAEf;IAED;;;OAGG;IACH,OAAO,CAAE,SAAS,EAAE,aAAa;IASjC;;;OAGG;IACG,cAAc,CAAE,OAAO,EAAE,aAAa;IAkB5C;;;;OAIG;IACG,2BAA2B,CAAE,OAAO,EAAE,aAAa;CAuD1D"}
|
|
@@ -10,7 +10,7 @@ exports.IdentityMessageProcessor = void 0;
|
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const debug_1 = __importDefault(require("debug"));
|
|
12
12
|
const events_1 = require("events");
|
|
13
|
-
const
|
|
13
|
+
const protocols_1 = require("@dxos/protocols");
|
|
14
14
|
const identity_1 = require("../identity");
|
|
15
15
|
const keys_1 = require("../keys");
|
|
16
16
|
const party_1 = require("../party");
|
|
@@ -41,7 +41,7 @@ class IdentityMessageProcessor extends events_1.EventEmitter {
|
|
|
41
41
|
*/
|
|
42
42
|
getInfo(publicKey) {
|
|
43
43
|
(0, keys_1.assertValidPublicKey)(publicKey);
|
|
44
|
-
publicKey =
|
|
44
|
+
publicKey = protocols_1.PublicKey.from(publicKey);
|
|
45
45
|
const message = this._infoMessages.get(publicKey.toHex());
|
|
46
46
|
// The saved copy is a SignedMessage, but we only want to return the contents.
|
|
47
47
|
return message ? message.signed.payload : undefined;
|
|
@@ -76,7 +76,7 @@ class IdentityMessageProcessor extends events_1.EventEmitter {
|
|
|
76
76
|
if ((0, party_1.isEnvelope)(message)) {
|
|
77
77
|
// If this message has an Envelope, the Envelope must match this Party.
|
|
78
78
|
signedIdentityInfo = message.signed.payload.envelope.message.payload;
|
|
79
|
-
identityKey =
|
|
79
|
+
identityKey = protocols_1.PublicKey.from(signedIdentityInfo.signed.payload.publicKey);
|
|
80
80
|
partyKey = message.signed.payload.envelope.partyKey;
|
|
81
81
|
(0, assert_1.default)((0, party_1.isSignedMessage)(signedIdentityInfo));
|
|
82
82
|
(0, assert_1.default)(message.signatures);
|
|
@@ -99,7 +99,7 @@ class IdentityMessageProcessor extends events_1.EventEmitter {
|
|
|
99
99
|
else {
|
|
100
100
|
// If this message has no Envelope, the Identity key itself must match the Party.
|
|
101
101
|
signedIdentityInfo = message;
|
|
102
|
-
identityKey =
|
|
102
|
+
identityKey = protocols_1.PublicKey.from(signedIdentityInfo.signed.payload.publicKey);
|
|
103
103
|
partyKey = identityKey;
|
|
104
104
|
}
|
|
105
105
|
// Check the inner message signature.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-message-processor.js","sourceRoot":"","sources":["../../../src/identity/identity-message-processor.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAC1B,mCAAsC;AAEtC
|
|
1
|
+
{"version":3,"file":"identity-message-processor.js","sourceRoot":"","sources":["../../../src/identity/identity-message-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/identity/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/identity/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,cAAc,CAAC"}
|
|
@@ -20,4 +20,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
20
20
|
__exportStar(require("./events"), exports);
|
|
21
21
|
__exportStar(require("./identity-message"), exports);
|
|
22
22
|
__exportStar(require("./identity-message-processor"), exports);
|
|
23
|
+
__exportStar(require("./seedphrase"), exports);
|
|
23
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/identity/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,2CAAyB;AACzB,qDAAmC;AACnC,+DAA6C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/identity/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,2CAAyB;AACzB,qDAAmC;AACnC,+DAA6C;AAC7C,+CAA6B"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Generate bip39 seed phrase (aka mnemonic).
|
|
3
|
+
*/
|
|
4
|
+
export declare const generateSeedPhrase: () => string;
|
|
5
|
+
/**
|
|
6
|
+
* Generate key pair from seed phrase.
|
|
7
|
+
*/
|
|
8
|
+
export declare const keyPairFromSeedPhrase: (seedPhrase: string) => import("@dxos/crypto").KeyPair;
|
|
9
|
+
//# sourceMappingURL=seedphrase.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"seedphrase.d.ts","sourceRoot":"","sources":["../../../src/identity/seedphrase.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,eAAO,MAAM,kBAAkB,QAAO,MAA4B,CAAC;AAEnE;;GAEG;AACH,eAAO,MAAM,qBAAqB,eAAgB,MAAM,mCAIvD,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
//
|
|
3
|
+
// Copyright 2020 DXOS.org
|
|
4
|
+
//
|
|
5
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
6
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.keyPairFromSeedPhrase = exports.generateSeedPhrase = void 0;
|
|
10
|
+
const assert_1 = __importDefault(require("assert"));
|
|
11
|
+
const bip39_1 = require("bip39");
|
|
12
|
+
const crypto_1 = require("@dxos/crypto");
|
|
13
|
+
// Util functions for Identity: export, import, create.
|
|
14
|
+
/**
|
|
15
|
+
* Generate bip39 seed phrase (aka mnemonic).
|
|
16
|
+
*/
|
|
17
|
+
const generateSeedPhrase = () => (0, bip39_1.generateMnemonic)();
|
|
18
|
+
exports.generateSeedPhrase = generateSeedPhrase;
|
|
19
|
+
/**
|
|
20
|
+
* Generate key pair from seed phrase.
|
|
21
|
+
*/
|
|
22
|
+
const keyPairFromSeedPhrase = (seedPhrase) => {
|
|
23
|
+
(0, assert_1.default)(seedPhrase);
|
|
24
|
+
const seed = (0, bip39_1.mnemonicToSeedSync)(seedPhrase);
|
|
25
|
+
return (0, crypto_1.createKeyPair)(seed);
|
|
26
|
+
};
|
|
27
|
+
exports.keyPairFromSeedPhrase = keyPairFromSeedPhrase;
|
|
28
|
+
//# sourceMappingURL=seedphrase.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"seedphrase.js","sourceRoot":"","sources":["../../../src/identity/seedphrase.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,iCAA6D;AAE7D,yCAA6C;AAE7C,uDAAuD;AAEvD;;GAEG;AACI,MAAM,kBAAkB,GAAG,GAAW,EAAE,CAAC,IAAA,wBAAgB,GAAE,CAAC;AAAtD,QAAA,kBAAkB,sBAAoC;AAEnE;;GAEG;AACI,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAE,EAAE;IAC1D,IAAA,gBAAM,EAAC,UAAU,CAAC,CAAC;IACnB,MAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,UAAU,CAAC,CAAC;IAC5C,OAAO,IAAA,sBAAa,EAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC;AAJW,QAAA,qBAAqB,yBAIhC"}
|
|
@@ -6,17 +6,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
6
6
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
const bip39_1 = require("bip39");
|
|
9
10
|
const expect_1 = __importDefault(require("expect"));
|
|
10
11
|
const crypto_1 = require("@dxos/crypto");
|
|
12
|
+
const protocols_1 = require("@dxos/protocols");
|
|
11
13
|
const keys_1 = require("../keys");
|
|
12
14
|
const proto_1 = require("../proto");
|
|
15
|
+
const seedphrase_1 = require("./seedphrase");
|
|
16
|
+
it('Basic bip39 operations work', async () => {
|
|
17
|
+
const seedPhrase = (0, bip39_1.generateMnemonic)();
|
|
18
|
+
const seed = (0, bip39_1.mnemonicToSeedSync)(seedPhrase);
|
|
19
|
+
const keyPair = await (0, crypto_1.createKeyPair)(seed.slice(0, 32));
|
|
20
|
+
(0, expect_1.default)(keyPair).not.toBeUndefined();
|
|
21
|
+
});
|
|
22
|
+
it('Create keypair from seedphrase', async () => {
|
|
23
|
+
const seedPhrase = (0, seedphrase_1.generateSeedPhrase)();
|
|
24
|
+
(0, expect_1.default)(typeof seedPhrase).toBe('string');
|
|
25
|
+
(0, expect_1.default)(seedPhrase.split(/\s+/g).length).toEqual(12);
|
|
26
|
+
const recoveredKeyPair = (0, seedphrase_1.keyPairFromSeedPhrase)(seedPhrase);
|
|
27
|
+
(0, expect_1.default)(recoveredKeyPair).toBeDefined();
|
|
28
|
+
});
|
|
13
29
|
it('Create cold identity key and recover', async () => {
|
|
14
30
|
// Generate a seed phrase and validate result.
|
|
15
|
-
const seedPhrase = (0,
|
|
31
|
+
const seedPhrase = (0, seedphrase_1.generateSeedPhrase)();
|
|
16
32
|
(0, expect_1.default)(typeof seedPhrase === 'string').toBeTruthy();
|
|
17
33
|
(0, expect_1.default)(seedPhrase.split(/\s+/g).length).toEqual(12);
|
|
18
34
|
// Add the key to a keyring and verify it is retrievable.
|
|
19
|
-
const identityKeyPair = (0,
|
|
35
|
+
const identityKeyPair = (0, seedphrase_1.keyPairFromSeedPhrase)(seedPhrase);
|
|
20
36
|
const origKeyring = new keys_1.Keyring();
|
|
21
37
|
await origKeyring.addKeyRecord({ ...identityKeyPair, type: proto_1.KeyType.IDENTITY });
|
|
22
38
|
const identityKeyRecord = origKeyring.findKey(keys_1.Keyring.signingFilter({ type: proto_1.KeyType.IDENTITY }));
|
|
@@ -24,9 +40,9 @@ it('Create cold identity key and recover', async () => {
|
|
|
24
40
|
(0, expect_1.default)(identityKeyRecord.type).toEqual(proto_1.KeyType.IDENTITY);
|
|
25
41
|
(0, expect_1.default)(identityKeyRecord.own).toBeTruthy();
|
|
26
42
|
// Recover seed phrase to key pair.
|
|
27
|
-
const recoveredKeyPair = (0,
|
|
43
|
+
const recoveredKeyPair = (0, seedphrase_1.keyPairFromSeedPhrase)(seedPhrase);
|
|
28
44
|
// Verify same key as exported above.
|
|
29
|
-
(0, expect_1.default)(
|
|
45
|
+
(0, expect_1.default)(protocols_1.PublicKey.from(recoveredKeyPair.publicKey)).toEqual(identityKeyRecord.publicKey);
|
|
30
46
|
const newKeyring = new keys_1.Keyring();
|
|
31
47
|
await newKeyring.addKeyRecord({ ...recoveredKeyPair, type: proto_1.KeyType.IDENTITY });
|
|
32
48
|
/* Expect a message signed with the identity key in this new keyring to be verified as
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seedphrase.test.js","sourceRoot":"","sources":["../../../src/identity/seedphrase.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"seedphrase.test.js","sourceRoot":"","sources":["../../../src/identity/seedphrase.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../src/keys/filter.ts"],"names":[],"mappings":"AAMA,OAAO,EAAa,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../src/keys/filter.ts"],"names":[],"mappings":"AAMA,OAAO,EAAa,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3D,oBAAY,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;AAEnD;;GAEG;AACH,qBAAa,MAAM;IACjB;;OAEG;IACH,MAAM,CAAC,MAAM,CAAE,MAAM,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,cAAc;IAIpE;;OAEG;IACH,MAAM,CAAC,GAAG,CAAE,MAAM,EAAE,cAAc,GAAG,cAAc;IAInD;;OAEG;IACH,MAAM,CAAC,GAAG,CAAE,GAAG,OAAO,EAAE,cAAc,EAAE,GAAG,cAAc;IAIzD;;OAEG;IACH,MAAM,CAAC,WAAW,CAAE,QAAQ,EAAE,MAAM,GAAG,cAAc;IAIrD;;OAEG;IACH,MAAM,CAAC,UAAU,CAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc;IAInE;;OAEG;IACH,MAAM,CAAC,MAAM,CAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,cAAc;IAIpE;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAE,UAAU,EAAE,GAAG,GAAG,cAAc;CAGjD"}
|
package/dist/src/keys/filter.js
CHANGED
|
@@ -8,7 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Filter = void 0;
|
|
10
10
|
const lodash_matches_1 = __importDefault(require("lodash.matches"));
|
|
11
|
-
const
|
|
11
|
+
const protocols_1 = require("@dxos/protocols");
|
|
12
12
|
/**
|
|
13
13
|
* Utility to create simple filtering predicates.
|
|
14
14
|
*/
|
|
@@ -47,7 +47,7 @@ class Filter {
|
|
|
47
47
|
* Filters objects for required key.
|
|
48
48
|
*/
|
|
49
49
|
static hasKey(property, key) {
|
|
50
|
-
return ({ [property]: value }) =>
|
|
50
|
+
return ({ [property]: value }) => protocols_1.PublicKey.from(value).equals(key);
|
|
51
51
|
}
|
|
52
52
|
/**
|
|
53
53
|
* Filters objects for exact object.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/keys/filter.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oEAAqC;AAErC
|
|
1
|
+
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/keys/filter.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oEAAqC;AAErC,+CAA2D;AAI3D;;GAEG;AACH,MAAa,MAAM;IACjB;;OAEG;IACH,MAAM,CAAC,MAAM,CAAE,MAA6B,EAAE,MAAsB;QAClE,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,GAAG,CAAE,MAAsB;QAChC,OAAO,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,GAAG,CAAE,GAAG,OAAyB;QACtC,OAAO,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAE,QAAgB;QAClC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;IACxD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,UAAU,CAAE,QAAgB,EAAE,MAAa;QAChD,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,MAAM,CAAE,QAAgB,EAAE,GAAkB;QACjD,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,qBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAE,UAAe;QAC7B,OAAO,IAAA,wBAAO,EAAC,UAAU,CAAC,CAAC;IAC7B,CAAC;CACF;AAlDD,wBAkDC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { KeyPair
|
|
1
|
+
import { KeyPair } from '@dxos/crypto';
|
|
2
|
+
import { PublicKeyLike } from '@dxos/protocols';
|
|
2
3
|
import { KeyChain, KeyRecord, KeyType } from '../proto';
|
|
3
4
|
import { MakeOptional } from '../typedefs';
|
|
4
5
|
import { SecretKey } from './keytype';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring-helpers.d.ts","sourceRoot":"","sources":["../../../src/keys/keyring-helpers.ts"],"names":[],"mappings":"AAWA,OAAO,EAAiB,OAAO,EAAa,aAAa,EAAwC,MAAM,
|
|
1
|
+
{"version":3,"file":"keyring-helpers.d.ts","sourceRoot":"","sources":["../../../src/keys/keyring-helpers.ts"],"names":[],"mappings":"AAWA,OAAO,EAAiB,OAAO,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAa,aAAa,EAAwC,MAAM,iBAAiB,CAAC;AAEjG,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAwB,MAAM,UAAU,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC;;GAEG;AAEH,eAAO,MAAM,gBAAgB,QAAS,aAAa,YAAY,OAAO,yBAUrE,CAAC;AAEF;;GAEG;AAGH,wBAAgB,oBAAoB,CAAE,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,aAAa,CAGzG;AAED;;GAEG;AAGH,wBAAgB,oBAAoB,CAAE,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,SAAS,CAKlG;AAED;;GAEG;AAGH,wBAAgB,kBAAkB,CAAE,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAIhF;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,cAAe,KAAK,SAAS,EAAE,KAAK,CAAC,SAMhE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,cAAe,SAAS,KAAG,SAKnD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,cAAe,QAAQ,SAAS,CAAC,SASlE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,gBAAgB,QAAQ,SAAS,CAAC,YACnD,aAAa,OAAO,EAAE,WAAW,CAAC,KAAqB,SAoBjE,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,kBAAkB,QAAS,GAAG,WAwBzC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,UAAU,SAAS,GAAG,oBAAwI,CAAC;AAE5K;;;GAGG;AACH,eAAO,MAAM,0BAA0B,cAAe,KAAK,SAAS,EAAE,KAAK,CAAC,cAoB3E,CAAC"}
|
|
@@ -13,6 +13,7 @@ exports.checkAndNormalizeKeyRecord = exports.isKeyChain = exports.canonicalStrin
|
|
|
13
13
|
const assert_1 = __importDefault(require("assert"));
|
|
14
14
|
const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
|
|
15
15
|
const crypto_1 = require("@dxos/crypto");
|
|
16
|
+
const protocols_1 = require("@dxos/protocols");
|
|
16
17
|
const proto_1 = require("../proto");
|
|
17
18
|
/**
|
|
18
19
|
* Checks for a valid publicKey Buffer.
|
|
@@ -20,9 +21,9 @@ const proto_1 = require("../proto");
|
|
|
20
21
|
// TODO(burdon): Move to dxos/crypto.
|
|
21
22
|
const isValidPublicKey = (key, keyType) => {
|
|
22
23
|
try {
|
|
23
|
-
|
|
24
|
+
protocols_1.PublicKey.from(key);
|
|
24
25
|
if (keyType && [proto_1.KeyType.PARTY, proto_1.KeyType.IDENTITY, proto_1.KeyType.FEED, proto_1.KeyType.DEVICE].includes(keyType)) {
|
|
25
|
-
(0, assert_1.default)(
|
|
26
|
+
(0, assert_1.default)(protocols_1.PublicKey.from(key).asUint8Array().length === protocols_1.PUBLIC_KEY_LENGTH);
|
|
26
27
|
}
|
|
27
28
|
return true;
|
|
28
29
|
}
|
|
@@ -49,7 +50,7 @@ exports.assertValidPublicKey = assertValidPublicKey;
|
|
|
49
50
|
function assertValidSecretKey(key, keyType) {
|
|
50
51
|
(0, assert_1.default)(key);
|
|
51
52
|
if (keyType && [proto_1.KeyType.PARTY, proto_1.KeyType.IDENTITY, proto_1.KeyType.FEED, proto_1.KeyType.DEVICE].includes(keyType)) {
|
|
52
|
-
(0, assert_1.default)(key.length ===
|
|
53
|
+
(0, assert_1.default)(key.length === protocols_1.SECRET_KEY_LENGTH);
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
56
|
exports.assertValidSecretKey = assertValidSecretKey;
|
|
@@ -105,7 +106,7 @@ exports.assertValidAttributes = assertValidAttributes;
|
|
|
105
106
|
*/
|
|
106
107
|
const createKeyRecord = (attributes = {}, keyPair = (0, crypto_1.createKeyPair)()) => {
|
|
107
108
|
const { publicKey: rawPublicKey, secretKey } = keyPair;
|
|
108
|
-
const publicKey =
|
|
109
|
+
const publicKey = protocols_1.PublicKey.from(rawPublicKey);
|
|
109
110
|
// Disallow invalid attributes.
|
|
110
111
|
(0, exports.assertValidAttributes)(attributes);
|
|
111
112
|
return {
|
|
@@ -137,7 +138,7 @@ const canonicalStringify = (obj) => (0, json_stable_stringify_1.default)(obj, {
|
|
|
137
138
|
return undefined;
|
|
138
139
|
}
|
|
139
140
|
if (value) {
|
|
140
|
-
if (
|
|
141
|
+
if (protocols_1.PublicKey.isPublicKey(value)) {
|
|
141
142
|
return value.toHex();
|
|
142
143
|
}
|
|
143
144
|
if (Buffer.isBuffer(value)) {
|
|
@@ -172,7 +173,7 @@ const checkAndNormalizeKeyRecord = (keyRecord) => {
|
|
|
172
173
|
added: (0, proto_1.createDateTimeString)(),
|
|
173
174
|
...rest
|
|
174
175
|
}, {
|
|
175
|
-
publicKey:
|
|
176
|
+
publicKey: protocols_1.PublicKey.from(publicKey).asBuffer(),
|
|
176
177
|
secretKey: secretKey ? Buffer.from(secretKey) : undefined
|
|
177
178
|
});
|
|
178
179
|
};
|