@dxos/credentials 2.33.8-dev.8609bc45 → 2.33.9-dev.0628f3ab

package/src/auth/auth-plugin.test.ts

@@ -4,15 +4,15 @@
 
 // DXOS testing browser.
 
-import assert from 'assert';
 import debug from 'debug';
 import eos from 'end-of-stream';
 import expect from 'expect';
+import assert from 'node:assert';
 import pify from 'pify';
 import pump from 'pump';
 import waitForExpect from 'wait-for-expect';
 
-import { keyToString, randomBytes, createKeyPair } from '@dxos/crypto';
+import { randomBytes, createKeyPair } from '@dxos/crypto';
 import { FeedStore, createBatchStream, HypercoreFeed } from '@dxos/feed-store';
 import { Protocol, ProtocolOptions } from '@dxos/mesh-protocol';
 import { Replicator } from '@dxos/protocol-plugin-replicator';
@@ -83,7 +83,7 @@ const createProtocol = async (partyKey: PublicKey, authenticator: Authenticator,
   const auth = new AuthPlugin(peerId, authenticator, [Replicator.extension]);
   const authPromise = new Promise((resolve) => {
     auth.on('authenticated', (incomingPeerId) => {
-      log(`Authenticated ${keyToString(incomingPeerId)} on ${keyToString(peerId)}`);
+      log(`Authenticated ${PublicKey.stringify(incomingPeerId)} on ${PublicKey.stringify(peerId)}`);
       resolve(true);
     });
   });
@@ -112,7 +112,7 @@ const createProtocol = async (partyKey: PublicKey, authenticator: Authenticator,
   const proto = new Protocol({
     streamOptions: { live: true },
     discoveryKey: partyKey.asBuffer(),
-    userSession: { peerId: keyToString(peerId), credentials },
+    userSession: { peerId: PublicKey.stringify(peerId), credentials },
     initiator: !!protocolOptions?.initiator
   })
     .setExtension(auth.createExtension())
@@ -184,7 +184,7 @@ it('Auth & Repl (GOOD)', async () => {
   await waitForExpect(async () => {
     const msgs = await getMessages(node1, node2);
     expect(msgs).toContain(message1);
-    log(`${message1} on ${keyToString(node2.id)}.`);
+    log(`${message1} on ${PublicKey.stringify(node2.id)}.`);
   });
 
   const message2 = randomBytes(32).toString('hex');
@@ -192,7 +192,7 @@ it('Auth & Repl (GOOD)', async () => {
   await waitForExpect(async () => {
     const msgs = await getMessages(node2, node1);
     expect(msgs).toContain(message2);
-    log(`${message2} on ${keyToString(node1.id)}.`);
+    log(`${message2} on ${PublicKey.stringify(node1.id)}.`);
   });
 
   connection.destroy();

package/src/auth/auth-plugin.ts

@@ -2,9 +2,9 @@
 // Copyright 2019 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
 import { EventEmitter } from 'events';
+import assert from 'node:assert';
 
 import { Extension, ERR_EXTENSION_RESPONSE_FAILED, Protocol } from '@dxos/mesh-protocol';
 

package/src/greet/greeter-plugin.test.ts

@@ -7,7 +7,7 @@ import expect from 'expect';
 import pump from 'pump';
 
 import { trigger } from '@dxos/async';
-import { keyToString, randomBytes } from '@dxos/crypto';
+import { randomBytes } from '@dxos/crypto';
 import { Protocol } from '@dxos/mesh-protocol';
 import { PublicKey, PublicKeyLike } from '@dxos/protocols';
 import { arraysEqual } from '@dxos/util';
@@ -24,23 +24,16 @@ const log = debug('dxos:halo:greet');
 /**
  * Create the Greeter with Plugin and Protocol.
  */
-const createGreeter = async (targetPartyKey: PublicKeyLike) => {
+const createGreeter = async (targetPartyKey: PublicKeyLike, genesisFeedKey: PublicKey) => {
   const [writePromise, outerResolve] = trigger<Message[]>();
 
-  const hints = [
-    { publicKey: PublicKey.from(randomBytes(32)), type: KeyType.IDENTITY },
-    { publicKey: PublicKey.from(randomBytes(32)), type: KeyType.DEVICE },
-    { publicKey: PublicKey.from(randomBytes(32)), type: KeyType.FEED },
-    { publicKey: PublicKey.from(randomBytes(32)), type: KeyType.FEED }
-  ];
-
   const greeter = new Greeter(
     targetPartyKey,
+    genesisFeedKey,
     async messages => {
       outerResolve(messages);
       return messages;
-    },
-    async () => hints
+    }
   );
 
   const peerId = randomBytes(32);
@@ -51,13 +44,13 @@ const createGreeter = async (targetPartyKey: PublicKeyLike) => {
       live: true
     },
     discoveryKey: peerId,
-    userSession: { peerId: keyToString(peerId) },
+    userSession: { peerId: PublicKey.stringify(peerId) },
     initiator: true
   })
     .setExtension(plugin.createExtension())
     .init();
 
-  return { greeter, rendezvousKey: peerId, plugin, protocol, writePromise: writePromise(), hints };
+  return { greeter, rendezvousKey: peerId, plugin, protocol, writePromise: writePromise() };
 };
 
 /**
@@ -71,8 +64,8 @@ const createInvitee = async (rendezvousKey: Buffer, invitationId: Buffer) => {
 
   const connectionPromise = new Promise<void>(resolve => {
     plugin.on('peer:joined', (peerId) => {
-      if (peerId && keyToString(peerId) === keyToString(rendezvousKey)) {
-        log(`${keyToString(peerId)} connected.`);
+      if (peerId && PublicKey.stringify(peerId) === PublicKey.stringify(rendezvousKey)) {
+        log(`${PublicKey.stringify(peerId)} connected.`);
         resolve();
       }
     });
@@ -83,7 +76,7 @@ const createInvitee = async (rendezvousKey: Buffer, invitationId: Buffer) => {
       live: true
     },
     discoveryKey: rendezvousKey,
-    userSession: { peerId: keyToString(peerId) },
+    userSession: { peerId: PublicKey.stringify(peerId) },
     initiator: false
   })
     .setExtension(plugin.createExtension())
@@ -100,14 +93,15 @@ const connect = (source: Protocol, target: Protocol) => pump(source.stream, targ
 
 it('Greeting Flow using GreetingCommandPlugin', async () => {
   const targetPartyKey = PublicKey.from(randomBytes(32));
+  const genesisFeedKey = PublicKey.from(randomBytes(32));
   const secret = '0000';
 
   const secretProvider: SecretProvider = async () => Buffer.from(secret);
   const secretValidator: SecretValidator = async (invitation, secret) => !!secret && !!invitation.secret && arraysEqual(secret, invitation.secret);
 
   const {
-    protocol: greeterProtocol, greeter, rendezvousKey, hints, writePromise
-  } = await createGreeter(targetPartyKey);
+    protocol: greeterProtocol, greeter, rendezvousKey, writePromise
+  } = await createGreeter(targetPartyKey, genesisFeedKey);
 
   const invitation = await greeter.createInvitation(targetPartyKey, secretValidator, secretProvider);
 
@@ -162,7 +156,7 @@ it('Greeting Flow using GreetingCommandPlugin', async () => {
 
     // Send them to the greeter.
     const notarizeResponse = await plugin.send(rendezvousKey, command);
-    expect(notarizeResponse.feedHints).toEqual(hints.filter(hint => hint.type === KeyType.FEED).map(hint => hint.publicKey));
+    expect(notarizeResponse.genesisFeed).toEqual(genesisFeedKey);
 
     // In the real world, the response would be signed in an envelope by the Greeter, but in this test it is not altered.
     const written = await writePromise;

package/src/greet/greeter.test.js

@@ -21,27 +21,20 @@ const createKeyring = async () => {
   await keyring.createKeyRecord({ type: KeyType.PARTY });
   await keyring.createKeyRecord({ type: KeyType.IDENTITY });
   await keyring.createKeyRecord({ type: KeyType.DEVICE });
+  await keyring.createKeyRecord({ type: KeyType.FEED });
   return keyring;
 };
 
-const createGreeter = (keyring, hints = []) => new Greeter(
+const createGreeter = (keyring) => new Greeter(
   keyring.findKey(Filter.matches({ type: KeyType.PARTY })).publicKey,
-  messages => messages,
-  () => hints
+  keyring.findKey(Filter.matches({ type: KeyType.FEED })).publicKey,
+  messages => messages
 );
 
 it('Good invitation', async () => {
   const keyring = await createKeyring();
   const secret = '0000';
-
-  const hints = [
-    { publicKey: randomBytes(32), type: KeyType.IDENTITY },
-    { publicKey: randomBytes(32), type: KeyType.DEVICE },
-    { publicKey: randomBytes(32), type: KeyType.FEED },
-    { publicKey: randomBytes(32), type: KeyType.FEED }
-  ];
-
-  const greeter = createGreeter(keyring, hints);
+  const greeter = createGreeter(keyring);
 
   const secretProvider = async () => Buffer.from(secret);
   const secretValidator = async (invitation, secret) => secret && arraysEqual(secret, invitation.secret);
@@ -105,9 +98,7 @@ it('Good invitation', async () => {
       }
     };
 
-    const response = await greeter.handleMessage(message.payload, invitation.id, randomBytes());
-
-    expect(response.feedHints).toEqual(hints.filter(hint => hint.type === KeyType.FEED).map(hint => hint.publicKey));
+    await greeter.handleMessage(message.payload, invitation.id, randomBytes());
 
     // The `FINISH` command informs the Greeter the Invitee is done.
     {

package/src/greet/greeter.ts

@@ -2,8 +2,8 @@
 // Copyright 2019 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { ERR_EXTENSION_RESPONSE_FAILED } from '@dxos/mesh-protocol';
 import { PublicKeyLike, PublicKey } from '@dxos/protocols';
@@ -11,7 +11,7 @@ import { arraysEqual } from '@dxos/util';
 
 import { Keyring } from '../keys';
 import { getPartyCredentialMessageType } from '../party';
-import { PartyCredential, Message, KeyHint, Command, NotarizeResponse, WithTypeUrl, KeyType } from '../proto';
+import { PartyCredential, Message, Command, NotarizeResponse, WithTypeUrl } from '../proto';
 import { PeerId } from '../typedefs';
 import {
   ERR_GREET_INVALID_COMMAND,
@@ -28,7 +28,6 @@ import { Invitation, InvitationOnFinish, SecretProvider, SecretValidator } from
 const log = debug('dxos:halo:greet');
 
 export type PartyWriter = (params: Message[]) => Promise<Message[]>;
-export type HintProvider = (params: Message[]) => Promise<KeyHint[]>;
 
 /**
  * Reference Greeter that uses useable, single-use "invitations" to authenticate the invitee.
@@ -36,7 +35,6 @@ export type HintProvider = (params: Message[]) => Promise<KeyHint[]>;
 export class Greeter {
   _partyKey?: PublicKey;
   _partyWriter?: PartyWriter;
-  _hintProvider?: HintProvider;
   _invitations = new Map<string, Invitation>();
 
   /**
@@ -44,18 +42,19 @@ export class Greeter {
    * TODO(telackey): Does it make sense to separate out the Invitee functionality?
    * @param {PublicKeyLike} [partyKey] The publicKey of the target Party.
    * @param {function} [partyWriter] Callback function to write messages to the Party.
-   * @param {function} [hintProvider] Callback function to gather feed and key hints to give to the invitee.
    */
-  constructor (partyKey?: PublicKeyLike, partyWriter?: PartyWriter, hintProvider?: HintProvider) {
-    if (partyKey || partyWriter || hintProvider) {
+  constructor (
+    partyKey?: PublicKeyLike,
+    private readonly _genesisFeedKey?: PublicKey,
+    partyWriter?: PartyWriter
+  ) {
+    if (partyKey || partyWriter) {
       assert(partyKey);
       assert(partyWriter);
-      assert(hintProvider);
     }
 
     this._partyKey = partyKey ? PublicKey.from(partyKey) : undefined;
     this._partyWriter = partyWriter;
-    this._hintProvider = hintProvider;
   }
 
   /**
@@ -250,19 +249,16 @@ export class Greeter {
     log('Admitting new node after successful greeting.');
 
     assert(this._partyWriter);
-    assert(this._hintProvider);
 
     // Write the supplied messages to the target Party.
     const copies = await this._partyWriter(params);
 
-    // Retrieve the hinted feed and key info for the invitee.
-    const hints = await this._hintProvider(params);
-
     await invitation.notarize();
+    assert(this._genesisFeedKey);
     return {
       '@type': 'dxos.credentials.greet.NotarizeResponse',
       copies,
-      feedHints: hints.filter(hint => hint.type === KeyType.FEED).map(hint => hint.publicKey!)
+      genesisFeed: this._genesisFeedKey
     };
   }
 }

package/src/greet/greeting-command-plugin.ts

@@ -7,13 +7,13 @@
  *   and moved somewhere more abstract (RpcProtocolPlugin?).
  */
 
-import assert from 'assert';
 import debug from 'debug';
 import { EventEmitter } from 'events';
+import assert from 'node:assert';
 
 import { WithTypeUrl } from '@dxos/codec-protobuf';
-import { keyToBuffer, keyToString } from '@dxos/crypto';
 import { Extension, ERR_EXTENSION_RESPONSE_FAILED, Protocol } from '@dxos/mesh-protocol';
+import { PublicKey } from '@dxos/protocols';
 
 import { wrapMessage } from '../party';
 import { codec, Command } from '../proto';
@@ -28,7 +28,7 @@ export type GreetingCommandMessageHandler = (message: any, remotePeerId: Buffer,
 
 const getPeerId = (protocol: Protocol) => {
   const { peerId } = protocol.getSession() ?? {};
-  return keyToBuffer(peerId);
+  return PublicKey.bufferize(peerId);
 };
 
 /**
@@ -113,7 +113,7 @@ export class GreetingCommandPlugin extends EventEmitter {
   async _send (peerId: PeerId, message: Command, oneway: boolean) {
     assert(Buffer.isBuffer(peerId));
     // `peerId` is a Buffer, but here we only need its string form.
-    const peerIdStr = keyToString(peerId);
+    const peerIdStr = PublicKey.stringify(peerId);
     const peer = this._peers.get(peerIdStr);
     assert(peer, `Peer not connected: ${peerIdStr}`);
     const extension = peer.getExtension(GreetingCommandPlugin.EXTENSION_NAME);

package/src/greet/greeting-message.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { ClaimResponse, Command, SignedMessage, Message, WithTypeUrl } from '../proto';
 

package/src/greet/party-invitation-claim-handler.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { ERR_EXTENSION_RESPONSE_FAILED } from '@dxos/mesh-protocol';
 

package/src/identity/identity-message-processor.ts

@@ -2,9 +2,9 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
 import { EventEmitter } from 'events';
+import assert from 'node:assert';
 
 import { PublicKey, PublicKeyLike } from '@dxos/protocols';
 

package/src/identity/identity-message.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Keyring } from '../keys';
 import { unwrapEnvelopes, extractContents, unwrapMessage, wrapMessage } from '../party';

package/src/identity/seedphrase.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import { generateMnemonic, mnemonicToSeedSync } from 'bip39';
+import assert from 'node:assert';
 
 import { createKeyPair } from '@dxos/crypto';
 

package/src/keys/keyring-helpers.ts

@@ -6,11 +6,11 @@
 // TODO(burdon): Factor out helpers.
 //
 
-import assert from 'assert';
 import stableStringify from 'json-stable-stringify';
+import assert from 'node:assert';
 
-import { createKeyPair, KeyPair, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH } from '@dxos/crypto';
-import { PublicKey, PublicKeyLike } from '@dxos/protocols';
+import { createKeyPair, KeyPair } from '@dxos/crypto';
+import { PublicKey, PublicKeyLike, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH } from '@dxos/protocols';
 
 import { KeyChain, KeyRecord, KeyType, createDateTimeString } from '../proto';
 import { MakeOptional } from '../typedefs';

package/src/keys/keyring.test.ts

@@ -4,10 +4,10 @@
 
 // DXOS testing browser.
 
-import assert from 'assert';
 import expect from 'expect';
+import assert from 'node:assert';
 
-import { createKeyPair, keyToString, randomBytes, verify } from '@dxos/crypto';
+import { createKeyPair, randomBytes, verify } from '@dxos/crypto';
 import { PublicKey } from '@dxos/protocols';
 
 import { KeyType, schema } from '../proto';
@@ -90,7 +90,7 @@ it('Add/retrieve a publicKey from an external source (without secret present)',
 
 it('Retrieve a non-existent key', async () => {
   const keyring = new Keyring();
-  const internal = keyring.findKey(Filter.matches({ key: keyToString(randomBytes(32)) }));
+  const internal = keyring.findKey(Filter.matches({ key: PublicKey.stringify(randomBytes(32)) }));
   expect(internal).toBeUndefined();
 });
 
@@ -194,8 +194,8 @@ it('Attempt to add a badly formatted key', async () => {
   const keyring = new Keyring();
   const good = createKeyPair();
   const bad = {
-    publicKey: keyToString(good.publicKey),
-    secretKey: keyToString(good.secretKey),
+    publicKey: PublicKey.stringify(good.publicKey),
+    secretKey: PublicKey.stringify(good.secretKey),
     type: KeyType.IDENTITY
   };
 

package/src/keys/keyring.ts

@@ -2,12 +2,12 @@
 // Copyright 2019 DXOS.org
 //
 
-import assert from 'assert';
 import memdown from 'memdown';
+import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 import {
-  KeyPair, keyToBuffer, randomBytes, sign as cryptoSign, verify as cryptoVerify
+  KeyPair, randomBytes, sign as cryptoSign, verify as cryptoVerify
 } from '@dxos/crypto';
 import { PublicKey, PublicKeyLike } from '@dxos/protocols';
 import { arraysEqual } from '@dxos/util';
@@ -583,7 +583,7 @@ export class Keyring implements Signer {
         item.publicKey = PublicKey.from(item.publicKey);
       }
       if (item.secretKey) {
-        item.secretKey = keyToBuffer(item.secretKey);
+        item.secretKey = PublicKey.bufferize(item.secretKey);
       }
 
       if (item.secretKey) {

package/src/keys/keystore.ts

@@ -2,12 +2,12 @@
 // Copyright 2019 DXOS.org
 //
 
-import assert from 'assert';
 import bufferJson from 'buffer-json-encoding';
 import debug from 'debug';
 import encode from 'encoding-down';
 import levelup, { LevelUp } from 'levelup';
 import memdown from 'memdown';
+import assert from 'node:assert';
 import toArray from 'stream-to-array';
 
 import { PublicKey } from '@dxos/protocols';

package/src/party/party-credential.ts

@@ -2,7 +2,7 @@
 // Copyright 2019 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { randomBytes } from '@dxos/crypto';
 import { PublicKey, PublicKeyLike } from '@dxos/protocols';

package/src/party/party-invitation-manager.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { PublicKey } from '@dxos/protocols';
 

package/src/party/party-state.ts

@@ -2,9 +2,9 @@
 // Copyright 2019 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
 import { EventEmitter } from 'events';
+import assert from 'node:assert';
 
 import { discoveryKey } from '@dxos/crypto';
 import { PublicKey, PublicKeyLike } from '@dxos/protocols';

package/src/proto/gen/dxos/credentials/greet.ts

@@ -32,7 +32,7 @@ export interface HandshakeResponse {
 }
 export interface NotarizeResponse {
     copies?: ReturnType<(typeof substitutions)["google.protobuf.Any"]["decode"]>[];
-    feedHints?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>[];
+    genesisFeed?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
 }
 export interface KeyHint {
     publicKey?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;

package/src/proto/gen/index.ts

@@ -49,5 +49,5 @@ export interface TYPES {
 }
 export interface SERVICES {
 }
-export const schemaJson = JSON.parse("{\"nested\":{\"dxos\":{\"nested\":{\"credentials\":{\"nested\":{\"auth\":{\"nested\":{\"Auth\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":\"The publicKey of the target Party for these credentials.\"},\"deviceKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":\"The publicKey of the authenticating Device.\"},\"identityKey\":{\"type\":\"PubKey\",\"id\":3,\"comment\":\"The publicKey of the authenticating Identity.\"},\"feedKey\":{\"type\":\"PubKey\",\"id\":4,\"comment\":\"The publicKey of the authenticating Identity.\"},\"feedAdmit\":{\"type\":\"google.protobuf.Any\",\"id\":5,\"comment\":\"FeedAdmit message to the should be written to a control feed in case the `feedKey` is not admitted to the party.\"}},\"comment\":\"The payload for a SignedMessage sent during handshake for replication authentication.\"}}},\"greet\":{\"nested\":{\"BeginResponse\":{\"fields\":{\"info\":{\"keyType\":\"string\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null}},\"comment\":null},\"ClaimResponse\":{\"fields\":{\"id\":{\"type\":\"bytes\",\"id\":1,\"comment\":null},\"rendezvousKey\":{\"type\":\"bytes\",\"id\":2,\"comment\":null}},\"comment\":null},\"Command\":{\"fields\":{\"command\":{\"type\":\"Type\",\"id\":1,\"comment\":null},\"secret\":{\"type\":\"bytes\",\"id\":2,\"comment\":null},\"params\":{\"rule\":\"repeated\",\"type\":\"google.protobuf.Any\",\"id\":10,\"comment\":null}},\"nested\":{\"Type\":{\"values\":{\"BEGIN\":0,\"HANDSHAKE\":1,\"NOTARIZE\":2,\"FINISH\":3,\"CLAIM\":10},\"comment\":null,\"comments\":{\"BEGIN\":null,\"HANDSHAKE\":null,\"NOTARIZE\":null,\"FINISH\":null,\"CLAIM\":null}}},\"comment\":\"A Greeter command.\"},\"HandshakeResponse\":{\"fields\":{\"nonce\":{\"type\":\"bytes\",\"id\":1,\"comment\":null},\"partyKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null}},\"comment\":null},\"KeyHint\":{\"fields\":{\"publicKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"type\":{\"type\":\"KeyType\",\"id\":2,\"comment\":null}},\"comment\":null},\"NotarizeResponse\":{\"fields\":{\"copies\":{\"rule\":\"repeated\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null},\"feedHints\":{\"rule\":\"repeated\",\"type\":\"PubKey\",\"id\":2,\"comment\":null}},\"comment\":null}}},\"identity\":{\"nested\":{\"DeviceInfo\":{\"fields\":{\"publicKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"displayName\":{\"type\":\"string\",\"id\":2,\"comment\":null}},\"comment\":null},\"IdentityInfo\":{\"fields\":{\"publicKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"displayName\":{\"type\":\"string\",\"id\":2,\"comment\":null}},\"comment\":null}}},\"Message\":{\"fields\":{\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null}},\"comment\":null},\"party\":{\"nested\":{\"Envelope\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"message\":{\"type\":\"Message\",\"id\":2,\"comment\":null}},\"comment\":null},\"FeedAdmit\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"feedKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null}},\"comment\":null},\"FeedGenesis\":{\"fields\":{\"feedKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"ownerKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null}},\"comment\":null},\"KeyAdmit\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"admitKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null},\"admitKeyType\":{\"type\":\"KeyType\",\"id\":3,\"comment\":null}},\"comment\":null},\"PartyCredential\":{\"oneofs\":{\"contents\":{\"oneof\":[\"envelope\",\"partyGenesis\",\"keyAdmit\",\"feedAdmit\",\"feedGenesis\"],\"comment\":null}},\"fields\":{\"type\":{\"type\":\"Type\",\"id\":1,\"comment\":null},\"envelope\":{\"type\":\"Envelope\",\"id\":10,\"comment\":null},\"partyGenesis\":{\"type\":\"PartyGenesis\",\"id\":11,\"comment\":null},\"keyAdmit\":{\"type\":\"KeyAdmit\",\"id\":12,\"comment\":null},\"feedAdmit\":{\"type\":\"FeedAdmit\",\"id\":13,\"comment\":null},\"feedGenesis\":{\"type\":\"FeedGenesis\",\"id\":14,\"comment\":null}},\"nested\":{\"Type\":{\"values\":{\"ENVELOPE\":0,\"PARTY_GENESIS\":1,\"FEED_GENESIS\":2,\"KEY_ADMIT\":3,\"FEED_ADMIT\":4},\"comment\":null,\"comments\":{\"ENVELOPE\":null,\"PARTY_GENESIS\":null,\"FEED_GENESIS\":null,\"KEY_ADMIT\":null,\"FEED_ADMIT\":null}}},\"comment\":null},\"PartyGenesis\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"feedKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null},\"admitKey\":{\"type\":\"PubKey\",\"id\":3,\"comment\":null},\"admitKeyType\":{\"type\":\"KeyType\",\"id\":4,\"comment\":null}},\"comment\":null},\"PartyInvitation\":{\"fields\":{\"id\":{\"type\":\"bytes\",\"id\":1,\"comment\":null},\"partyKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null},\"issuerKey\":{\"type\":\"PubKey\",\"id\":3,\"comment\":null},\"inviteeKey\":{\"type\":\"PubKey\",\"id\":4,\"comment\":null}},\"comment\":null}}},\"SignedMessage\":{\"fields\":{\"signed\":{\"rule\":\"required\",\"type\":\"Signed\",\"id\":1,\"comment\":null},\"signatures\":{\"rule\":\"repeated\",\"type\":\"Signature\",\"id\":2,\"comment\":null}},\"nested\":{\"Signature\":{\"fields\":{\"key\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"signature\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"keyChain\":{\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"Signed\":{\"fields\":{\"created\":{\"rule\":\"required\",\"type\":\"string\",\"id\":1,\"comment\":null},\"nonce\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":10,\"comment\":null}},\"comment\":null}},\"comment\":\"A generic container message used whenever messages are signed (e.g. PartyCredential)\"}}},\"halo\":{\"nested\":{\"keys\":{\"nested\":{\"KeyChain\":{\"fields\":{\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"message\":{\"rule\":\"required\",\"type\":\"SignedMessage\",\"id\":2,\"comment\":null},\"parents\":{\"rule\":\"repeated\",\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"KeyRecord\":{\"fields\":{\"type\":{\"rule\":\"required\",\"type\":\"KeyType\",\"id\":1,\"comment\":\"The `KeyType` type of the key. This is often unknown for keys from other sources.\"},\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":2,\"comment\":\"The public key as a Buffer (required).\"},\"secretKey\":{\"type\":\"PrivKey\",\"id\":3,\"comment\":\"The secret key as a Buffer (this will never be visible outside the Keyring).\"},\"hint\":{\"type\":\"bool\",\"id\":4,\"comment\":\"Is this key from a Greeting \\\"hint\\\"?\"},\"own\":{\"type\":\"bool\",\"id\":5,\"comment\":\"Determines if this is our key?\\nUsually true if `secretKey` is present; may be false for \\\"inception keys\\\" such as the Party key.\"},\"trusted\":{\"type\":\"bool\",\"id\":6,\"comment\":\"Is this key to be trusted?\"},\"added\":{\"type\":\"string\",\"id\":7,\"comment\":\"An RFC-3339 date/time string for when the key was added to the Keyring.\"},\"created\":{\"type\":\"string\",\"id\":8,\"comment\":\"An RFC-3339 date/time string for when the key was created.\"}},\"comment\":null},\"KeyRecordList\":{\"fields\":{\"keys\":{\"rule\":\"repeated\",\"type\":\"KeyRecord\",\"id\":1,\"comment\":null}},\"comment\":null},\"KeyType\":{\"values\":{\"UNKNOWN\":0,\"IDENTITY\":1,\"DEVICE\":2,\"PARTY\":3,\"FEED\":4,\"DXNS_ADDRESS\":5},\"comment\":null,\"comments\":{\"UNKNOWN\":null,\"IDENTITY\":null,\"DEVICE\":null,\"PARTY\":null,\"FEED\":null,\"DXNS_ADDRESS\":null}},\"PrivKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null},\"PubKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null}}}}}}},\"google\":{\"nested\":{\"protobuf\":{\"nested\":{\"Any\":{\"fields\":{\"type_url\":{\"type\":\"string\",\"id\":1},\"value\":{\"type\":\"bytes\",\"id\":2}},\"comment\":null},\"BoolValue\":{\"fields\":{\"value\":{\"type\":\"bool\",\"id\":1}},\"comment\":null},\"BytesValue\":{\"fields\":{\"value\":{\"type\":\"bytes\",\"id\":1}},\"comment\":null},\"DoubleValue\":{\"fields\":{\"value\":{\"type\":\"double\",\"id\":1}},\"comment\":null},\"FloatValue\":{\"fields\":{\"value\":{\"type\":\"float\",\"id\":1}},\"comment\":null},\"Int32Value\":{\"fields\":{\"value\":{\"type\":\"int32\",\"id\":1}},\"comment\":null},\"Int64Value\":{\"fields\":{\"value\":{\"type\":\"int64\",\"id\":1}},\"comment\":null},\"StringValue\":{\"fields\":{\"value\":{\"type\":\"string\",\"id\":1}},\"comment\":null},\"UInt32Value\":{\"fields\":{\"value\":{\"type\":\"uint32\",\"id\":1}},\"comment\":null},\"UInt64Value\":{\"fields\":{\"value\":{\"type\":\"uint64\",\"id\":1}},\"comment\":null}}}}}}}");
+export const schemaJson = JSON.parse("{\"nested\":{\"dxos\":{\"nested\":{\"credentials\":{\"nested\":{\"auth\":{\"nested\":{\"Auth\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":\"The publicKey of the target Party for these credentials.\"},\"deviceKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":\"The publicKey of the authenticating Device.\"},\"identityKey\":{\"type\":\"PubKey\",\"id\":3,\"comment\":\"The publicKey of the authenticating Identity.\"},\"feedKey\":{\"type\":\"PubKey\",\"id\":4,\"comment\":\"The publicKey of the authenticating Identity.\"},\"feedAdmit\":{\"type\":\"google.protobuf.Any\",\"id\":5,\"comment\":\"FeedAdmit message to the should be written to a control feed in case the `feedKey` is not admitted to the party.\"}},\"comment\":\"The payload for a SignedMessage sent during handshake for replication authentication.\"}}},\"greet\":{\"nested\":{\"BeginResponse\":{\"fields\":{\"info\":{\"keyType\":\"string\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null}},\"comment\":null},\"ClaimResponse\":{\"fields\":{\"id\":{\"type\":\"bytes\",\"id\":1,\"comment\":null},\"rendezvousKey\":{\"type\":\"bytes\",\"id\":2,\"comment\":null}},\"comment\":null},\"Command\":{\"fields\":{\"command\":{\"type\":\"Type\",\"id\":1,\"comment\":null},\"secret\":{\"type\":\"bytes\",\"id\":2,\"comment\":null},\"params\":{\"rule\":\"repeated\",\"type\":\"google.protobuf.Any\",\"id\":10,\"comment\":null}},\"nested\":{\"Type\":{\"values\":{\"BEGIN\":0,\"HANDSHAKE\":1,\"NOTARIZE\":2,\"FINISH\":3,\"CLAIM\":10},\"comment\":null,\"comments\":{\"BEGIN\":null,\"HANDSHAKE\":null,\"NOTARIZE\":null,\"FINISH\":null,\"CLAIM\":null}}},\"comment\":\"A Greeter command.\"},\"HandshakeResponse\":{\"fields\":{\"nonce\":{\"type\":\"bytes\",\"id\":1,\"comment\":null},\"partyKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null}},\"comment\":null},\"KeyHint\":{\"fields\":{\"publicKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"type\":{\"type\":\"KeyType\",\"id\":2,\"comment\":null}},\"comment\":null},\"NotarizeResponse\":{\"fields\":{\"copies\":{\"rule\":\"repeated\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null},\"genesisFeed\":{\"type\":\"PubKey\",\"id\":3,\"comment\":null}},\"comment\":null}}},\"identity\":{\"nested\":{\"DeviceInfo\":{\"fields\":{\"publicKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"displayName\":{\"type\":\"string\",\"id\":2,\"comment\":null}},\"comment\":null},\"IdentityInfo\":{\"fields\":{\"publicKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"displayName\":{\"type\":\"string\",\"id\":2,\"comment\":null}},\"comment\":null}}},\"Message\":{\"fields\":{\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":1,\"comment\":null}},\"comment\":null},\"party\":{\"nested\":{\"Envelope\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"message\":{\"type\":\"Message\",\"id\":2,\"comment\":null}},\"comment\":null},\"FeedAdmit\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"feedKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null}},\"comment\":null},\"FeedGenesis\":{\"fields\":{\"feedKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"ownerKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null}},\"comment\":null},\"KeyAdmit\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"admitKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null},\"admitKeyType\":{\"type\":\"KeyType\",\"id\":3,\"comment\":null}},\"comment\":null},\"PartyCredential\":{\"oneofs\":{\"contents\":{\"oneof\":[\"envelope\",\"partyGenesis\",\"keyAdmit\",\"feedAdmit\",\"feedGenesis\"],\"comment\":null}},\"fields\":{\"type\":{\"type\":\"Type\",\"id\":1,\"comment\":null},\"envelope\":{\"type\":\"Envelope\",\"id\":10,\"comment\":null},\"partyGenesis\":{\"type\":\"PartyGenesis\",\"id\":11,\"comment\":null},\"keyAdmit\":{\"type\":\"KeyAdmit\",\"id\":12,\"comment\":null},\"feedAdmit\":{\"type\":\"FeedAdmit\",\"id\":13,\"comment\":null},\"feedGenesis\":{\"type\":\"FeedGenesis\",\"id\":14,\"comment\":null}},\"nested\":{\"Type\":{\"values\":{\"ENVELOPE\":0,\"PARTY_GENESIS\":1,\"FEED_GENESIS\":2,\"KEY_ADMIT\":3,\"FEED_ADMIT\":4},\"comment\":null,\"comments\":{\"ENVELOPE\":null,\"PARTY_GENESIS\":null,\"FEED_GENESIS\":null,\"KEY_ADMIT\":null,\"FEED_ADMIT\":null}}},\"comment\":null},\"PartyGenesis\":{\"fields\":{\"partyKey\":{\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"feedKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null},\"admitKey\":{\"type\":\"PubKey\",\"id\":3,\"comment\":null},\"admitKeyType\":{\"type\":\"KeyType\",\"id\":4,\"comment\":null}},\"comment\":null},\"PartyInvitation\":{\"fields\":{\"id\":{\"type\":\"bytes\",\"id\":1,\"comment\":null},\"partyKey\":{\"type\":\"PubKey\",\"id\":2,\"comment\":null},\"issuerKey\":{\"type\":\"PubKey\",\"id\":3,\"comment\":null},\"inviteeKey\":{\"type\":\"PubKey\",\"id\":4,\"comment\":null}},\"comment\":null}}},\"SignedMessage\":{\"fields\":{\"signed\":{\"rule\":\"required\",\"type\":\"Signed\",\"id\":1,\"comment\":null},\"signatures\":{\"rule\":\"repeated\",\"type\":\"Signature\",\"id\":2,\"comment\":null}},\"nested\":{\"Signature\":{\"fields\":{\"key\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"signature\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"keyChain\":{\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"Signed\":{\"fields\":{\"created\":{\"rule\":\"required\",\"type\":\"string\",\"id\":1,\"comment\":null},\"nonce\":{\"rule\":\"required\",\"type\":\"bytes\",\"id\":2,\"comment\":null},\"payload\":{\"rule\":\"required\",\"type\":\"google.protobuf.Any\",\"id\":10,\"comment\":null}},\"comment\":null}},\"comment\":\"A generic container message used whenever messages are signed (e.g. PartyCredential)\"}}},\"halo\":{\"nested\":{\"keys\":{\"nested\":{\"KeyChain\":{\"fields\":{\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":1,\"comment\":null},\"message\":{\"rule\":\"required\",\"type\":\"SignedMessage\",\"id\":2,\"comment\":null},\"parents\":{\"rule\":\"repeated\",\"type\":\"KeyChain\",\"id\":3,\"comment\":null}},\"comment\":null},\"KeyRecord\":{\"fields\":{\"type\":{\"rule\":\"required\",\"type\":\"KeyType\",\"id\":1,\"comment\":\"The `KeyType` type of the key. This is often unknown for keys from other sources.\"},\"publicKey\":{\"rule\":\"required\",\"type\":\"PubKey\",\"id\":2,\"comment\":\"The public key as a Buffer (required).\"},\"secretKey\":{\"type\":\"PrivKey\",\"id\":3,\"comment\":\"The secret key as a Buffer (this will never be visible outside the Keyring).\"},\"hint\":{\"type\":\"bool\",\"id\":4,\"comment\":\"Is this key from a Greeting \\\"hint\\\"?\"},\"own\":{\"type\":\"bool\",\"id\":5,\"comment\":\"Determines if this is our key?\\nUsually true if `secretKey` is present; may be false for \\\"inception keys\\\" such as the Party key.\"},\"trusted\":{\"type\":\"bool\",\"id\":6,\"comment\":\"Is this key to be trusted?\"},\"added\":{\"type\":\"string\",\"id\":7,\"comment\":\"An RFC-3339 date/time string for when the key was added to the Keyring.\"},\"created\":{\"type\":\"string\",\"id\":8,\"comment\":\"An RFC-3339 date/time string for when the key was created.\"}},\"comment\":null},\"KeyRecordList\":{\"fields\":{\"keys\":{\"rule\":\"repeated\",\"type\":\"KeyRecord\",\"id\":1,\"comment\":null}},\"comment\":null},\"KeyType\":{\"values\":{\"UNKNOWN\":0,\"IDENTITY\":1,\"DEVICE\":2,\"PARTY\":3,\"FEED\":4,\"DXNS_ADDRESS\":5},\"comment\":null,\"comments\":{\"UNKNOWN\":null,\"IDENTITY\":null,\"DEVICE\":null,\"PARTY\":null,\"FEED\":null,\"DXNS_ADDRESS\":null}},\"PrivKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null},\"PubKey\":{\"fields\":{\"data\":{\"type\":\"bytes\",\"id\":1,\"comment\":null}},\"comment\":null}}}}}}},\"google\":{\"nested\":{\"protobuf\":{\"nested\":{\"Any\":{\"fields\":{\"type_url\":{\"type\":\"string\",\"id\":1},\"value\":{\"type\":\"bytes\",\"id\":2}},\"comment\":null},\"BoolValue\":{\"fields\":{\"value\":{\"type\":\"bool\",\"id\":1}},\"comment\":null},\"BytesValue\":{\"fields\":{\"value\":{\"type\":\"bytes\",\"id\":1}},\"comment\":null},\"DoubleValue\":{\"fields\":{\"value\":{\"type\":\"double\",\"id\":1}},\"comment\":null},\"FloatValue\":{\"fields\":{\"value\":{\"type\":\"float\",\"id\":1}},\"comment\":null},\"Int32Value\":{\"fields\":{\"value\":{\"type\":\"int32\",\"id\":1}},\"comment\":null},\"Int64Value\":{\"fields\":{\"value\":{\"type\":\"int64\",\"id\":1}},\"comment\":null},\"StringValue\":{\"fields\":{\"value\":{\"type\":\"string\",\"id\":1}},\"comment\":null},\"UInt32Value\":{\"fields\":{\"value\":{\"type\":\"uint32\",\"id\":1}},\"comment\":null},\"UInt64Value\":{\"fields\":{\"value\":{\"type\":\"uint64\",\"id\":1}},\"comment\":null}}}}}}}");
 export const schema = Schema.fromJson<TYPES, SERVICES>(schemaJson, substitutions);