@dxos/echo-db 2.33.8-dev.8609bc45 → 2.33.9-dev.6b3d59af

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-db",
-  "version": "2.33.8-dev.8609bc45",
+  "version": "2.33.9-dev.6b3d59af",
   "description": "ECHO database.",
   "license": "MIT",
   "main": "dist/src/index.js",
@@ -10,22 +10,22 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.33.8-dev.8609bc45",
-    "@dxos/codec-protobuf": "2.33.8-dev.8609bc45",
-    "@dxos/credentials": "2.33.8-dev.8609bc45",
-    "@dxos/crypto": "2.33.8-dev.8609bc45",
-    "@dxos/debug": "2.33.8-dev.8609bc45",
-    "@dxos/echo-protocol": "2.33.8-dev.8609bc45",
-    "@dxos/feed-store": "2.33.8-dev.8609bc45",
-    "@dxos/mesh-protocol": "2.33.8-dev.8609bc45",
-    "@dxos/model-factory": "2.33.8-dev.8609bc45",
-    "@dxos/network-manager": "2.33.8-dev.8609bc45",
-    "@dxos/object-model": "2.33.8-dev.8609bc45",
-    "@dxos/protocol-plugin-presence": "2.33.8-dev.8609bc45",
-    "@dxos/protocol-plugin-replicator": "2.33.8-dev.8609bc45",
-    "@dxos/protocols": "2.33.8-dev.8609bc45",
-    "@dxos/random-access-multi-storage": "2.33.8-dev.8609bc45",
-    "@dxos/util": "2.33.8-dev.8609bc45",
+    "@dxos/async": "2.33.9-dev.6b3d59af",
+    "@dxos/codec-protobuf": "2.33.9-dev.6b3d59af",
+    "@dxos/credentials": "2.33.9-dev.6b3d59af",
+    "@dxos/crypto": "2.33.9-dev.6b3d59af",
+    "@dxos/debug": "2.33.9-dev.6b3d59af",
+    "@dxos/echo-protocol": "2.33.9-dev.6b3d59af",
+    "@dxos/feed-store": "2.33.9-dev.6b3d59af",
+    "@dxos/mesh-protocol": "2.33.9-dev.6b3d59af",
+    "@dxos/model-factory": "2.33.9-dev.6b3d59af",
+    "@dxos/network-manager": "2.33.9-dev.6b3d59af",
+    "@dxos/object-model": "2.33.9-dev.6b3d59af",
+    "@dxos/protocol-plugin-presence": "2.33.9-dev.6b3d59af",
+    "@dxos/protocol-plugin-replicator": "2.33.9-dev.6b3d59af",
+    "@dxos/protocols": "2.33.9-dev.6b3d59af",
+    "@dxos/random-access-multi-storage": "2.33.9-dev.6b3d59af",
+    "@dxos/util": "2.33.9-dev.6b3d59af",
     "base-x": "~3.0.9",
     "buffer-json-encoding": "^1.0.2",
     "debug": "^4.3.3",
@@ -35,10 +35,10 @@
     "pify": "~5.0.0"
   },
   "devDependencies": {
-    "@dxos/browser-mocha": "2.33.7",
+    "@dxos/browser-mocha": "2.33.8",
     "@dxos/eslint-plugin": "~1.0.34",
-    "@dxos/protocols-toolchain": "2.33.7",
-    "@dxos/testutils": "2.33.7",
+    "@dxos/protocols-toolchain": "2.33.8",
+    "@dxos/testutils": "2.33.8",
     "@types/columnify": "^1.5.1",
     "@types/debug": "^4.1.7",
     "@types/faker": "^5.5.1",

package/src/echo.test.ts

@@ -11,9 +11,9 @@ import { latch, promiseTimeout, waitForCondition } from '@dxos/async';
 import {
   defaultSecretProvider, defaultSecretValidator, generateSeedPhrase, keyPairFromSeedPhrase
 } from '@dxos/credentials';
-import { humanize } from '@dxos/crypto';
 import { ObjectModel } from '@dxos/object-model';
 import { afterTest } from '@dxos/testutils';
+import { humanize } from '@dxos/util';
 
 import { ECHO } from './echo';
 import { Contact } from './halo';

package/src/halo/halo-factory.ts

@@ -16,7 +16,6 @@ import {
   Filter,
   SecretProvider
 } from '@dxos/credentials';
-import { keyToString } from '@dxos/crypto';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
 import { ObjectModel } from '@dxos/object-model';
@@ -55,17 +54,15 @@ export class HaloFactory {
     private readonly _options: PipelineOptions = {}
   ) {}
 
-  async constructParty (feedHints: PublicKey[]): Promise<HaloParty> {
+  async constructParty (): Promise<HaloParty> {
     const credentialsSigner = CredentialsSigner.createDirectDeviceSigner(this._keyring);
     const feedProvider = this._feedProviderFactory(credentialsSigner.getIdentityKey().publicKey);
-    const writableFeed = await feedProvider.createOrOpenWritableFeed();
     const halo = new HaloParty(
       this._modelFactory,
       this._snapshotStore,
       feedProvider,
       credentialsSigner,
       this._networkManager,
-      [...feedHints, writableFeed.key],
       undefined,
       this._options
     );
@@ -82,10 +79,11 @@ export class HaloFactory {
       await this._keyring.createKeyRecord({ type: KeyType.DEVICE });
 
     // 1. Create a feed for the HALO.
-    const halo = await this.constructParty([]);
+    const halo = await this.constructParty();
     const feedKey = await halo.getWriteFeedKey();
     const feedKeyPair = this._keyring.getKey(feedKey);
     assert(feedKeyPair);
+    halo._setGenesisFeedKey(feedKey);
 
     // Connect the pipeline.
     await halo.open();
@@ -152,7 +150,7 @@ export class HaloFactory {
   }
 
   private async _joinHalo (invitationDescriptor: InvitationDescriptor, secretProvider: SecretProvider) {
-    log(`Admitting device with invitation: ${keyToString(invitationDescriptor.invitation)}`);
+    log(`Admitting device with invitation: ${PublicKey.stringify(invitationDescriptor.invitation)}`);
     assert(invitationDescriptor.identityKey);
 
     let identityKey = this._keyring.findKey(Keyring.signingFilter({ type: KeyType.IDENTITY }));
@@ -194,9 +192,10 @@ export class HaloFactory {
     );
 
     await initiator.connect();
-    const { hints } = await initiator.redeemInvitation(secretProvider);
+    const { genesisFeedKey } = await initiator.redeemInvitation(secretProvider);
 
-    const halo = await this.constructParty(hints);
+    const halo = await this.constructParty();
+    halo._setGenesisFeedKey(genesisFeedKey);
     await halo.open();
 
     await initiator.destroy();

package/src/halo/halo-party.ts

@@ -5,12 +5,10 @@
 import assert from 'assert';
 
 import { Event, synchronized } from '@dxos/async';
-import { KeyHint } from '@dxos/credentials';
 import { timed } from '@dxos/debug';
-import { Timeframe } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
-import { PublicKey } from '@dxos/protocols';
+import { PublicKey, Timeframe } from '@dxos/protocols';
 
 import { InvitationAuthenticator, InvitationDescriptor, InvitationFactory, InvitationOptions } from '../invitations';
 import { PARTY_ITEM_TYPE } from '../parties';
@@ -32,7 +30,7 @@ export const HALO_PARTY_DEVICE_PREFERENCES_TYPE = 'dxos:item/halo/device/prefere
  */
 export interface JoinedParty {
   partyKey: PublicKey,
-  keyHints: KeyHint[]
+  genesisFeed: PublicKey,
 }
 
 /**
@@ -48,13 +46,14 @@ export class HaloParty {
   private readonly _contactManager: ContactManager;
   private readonly _preferences: Preferences;
 
+  private _genesisFeedKey?: PublicKey | undefined;
+
   constructor (
     modelFactory: ModelFactory,
     snapshotStore: SnapshotStore,
     private readonly _feedProvider: PartyFeedProvider,
     private readonly _credentialsSigner: CredentialsSigner,
     private readonly _networkManager: NetworkManager,
-    private readonly _feedHints: PublicKey[] = [],
     private readonly _initialTimeframe: Timeframe | undefined,
     _options: PipelineOptions
   ) {
@@ -134,6 +133,13 @@ export class HaloParty {
     return this._partyCore.processor;
   }
 
+  /**
+   * @internal
+   */
+  _setGenesisFeedKey (genesisFeedKey: PublicKey) {
+    this._genesisFeedKey = genesisFeedKey;
+  }
+
   /**
    * Opens the pipeline and connects the streams.
    */
@@ -144,13 +150,15 @@ export class HaloParty {
       return this;
     }
 
+    assert(this._genesisFeedKey);
     await this._partyCore.open({
-      feedHints: this._feedHints,
+      genesisFeedKey: this._genesisFeedKey,
       initialTimeframe: this._initialTimeframe
     });
 
     this._invitationManager = new InvitationFactory(
       this._partyCore.processor,
+      this._genesisFeedKey,
       this._credentialsSigner,
       this._partyCore.credentialsWriter,
       this._networkManager

package/src/halo/halo.ts

@@ -7,11 +7,12 @@ import debug from 'debug';
 
 import { synchronized } from '@dxos/async';
 import { KeyRecord, Keyring, KeyType, SecretProvider } from '@dxos/credentials';
-import { createKeyPair, humanize, KeyPair } from '@dxos/crypto';
+import { createKeyPair, KeyPair } from '@dxos/crypto';
 import { raise } from '@dxos/debug';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
 import { PublicKey } from '@dxos/protocols';
+import { humanize } from '@dxos/util';
 
 import { ResultSet } from '../api';
 import { InvitationAuthenticator, InvitationDescriptor, InvitationOptions } from '../invitations';
@@ -225,6 +226,7 @@ export class HALO {
    */
   async createInvitation (authenticationDetails: InvitationAuthenticator, options?: InvitationOptions) {
     assert(this.identity?.halo, 'HALO not initialized.');
+
     return this.identity.halo.createInvitation(authenticationDetails, options);
   }
 

package/src/halo/identity-manager.ts

@@ -69,9 +69,14 @@ export class IdentityManager {
   async loadFromStorage () {
     const identityKey = this.getIdentityKey();
     if (identityKey) {
-      if (this._metadataStore.getParty(identityKey.publicKey)) {
+      const metadata = this._metadataStore.getParty(identityKey.publicKey);
+      if (metadata) {
         // TODO(marik-d): Snapshots for halo party?
-        const halo = await this._haloFactory.constructParty([]);
+        const halo = await this._haloFactory.constructParty();
+
+        assert(metadata.genesisFeedKey);
+        halo._setGenesisFeedKey(metadata.genesisFeedKey);
+
         // Always open the HALO.
         await halo.open();
         await this._initialize(halo);
@@ -89,6 +94,10 @@ export class IdentityManager {
     assert(!this._identity, 'Identity already initialized.');
 
     const halo = await this._haloFactory.createHalo(options);
+
+    const identityKey = this.getIdentityKey() ?? failUndefined();
+    await this._metadataStore.setGenesisFeed(identityKey.publicKey, await halo.getWriteFeedKey());
+
     await this._initialize(halo);
     return halo;
   }

package/src/halo/party-opener.ts

@@ -4,7 +4,6 @@
 
 import debug from 'debug';
 
-import { KeyType } from '@dxos/credentials';
 import { SubscriptionGroup, Unsubscribe } from '@dxos/util';
 
 import { PartyManager } from '../parties';
@@ -25,9 +24,8 @@ export const autoPartyOpener = (preferences: Preferences, partyManager: PartyMan
 
     for (const partyDesc of values) {
       if (!partyManager.parties.some(x => x.key === partyDesc.partyKey)) {
-        log(`Auto-opening new Party from HALO: ${partyDesc.partyKey.toHex()} hints=${JSON.stringify(partyDesc.keyHints)}`);
-        const feedHints = partyDesc.keyHints.filter(hint => hint.type === KeyType.FEED).map(hint => hint.publicKey!);
-        await partyManager.addParty(partyDesc.partyKey, feedHints);
+        log(`Auto-opening new Party from HALO: ${partyDesc.partyKey.toHex()}`);
+        await partyManager.addParty(partyDesc.partyKey, partyDesc.genesisFeed);
       }
     }
   }));

package/src/halo/preferences.ts

@@ -7,7 +7,6 @@ import stableStringify from 'json-stable-stringify';
 import defaultsDeep from 'lodash.defaultsdeep';
 
 import { Event } from '@dxos/async';
-import { KeyHint } from '@dxos/credentials';
 import { raise } from '@dxos/debug';
 import { ObjectModel } from '@dxos/object-model';
 import { PublicKey } from '@dxos/protocols';
@@ -151,8 +150,8 @@ export class Preferences {
       type: HALO_PARTY_DESCRIPTOR_TYPE,
       props: {
         publicKey: joinedParty.partyKey.asBuffer(),
-        subscribed: true,
-        hints: joinedParty.keyHints.map(hint => ({ ...hint, publicKey: hint.publicKey?.toHex() }))
+        genesisFeed: joinedParty.genesisFeed.toHex(),
+        subscribed: true
       }
     });
   }
@@ -160,12 +159,9 @@ export class Preferences {
   subscribeToJoinedPartyList (callback: (parties: JoinedParty[]) => void): () => void {
     const database = this._getDatabase() ?? raise(new IdentityNotInitializedError());
 
-    const converter = (partyDesc: Item<any>) => ({
+    const converter = (partyDesc: Item<any>): JoinedParty => ({
       partyKey: PublicKey.from(partyDesc.model.get('publicKey')),
-      keyHints: Object.values(partyDesc.model.get('hints')).map((hint: any) => ({
-        ...hint,
-        publicKey: PublicKey.from(hint.publicKey)
-      } as KeyHint))
+      genesisFeed: PublicKey.from(partyDesc.model.get('genesisFeed'))
     });
 
     const result = database.select({ type: HALO_PARTY_DESCRIPTOR_TYPE }).exec();

package/src/invitations/greeting-initiator.ts

@@ -23,7 +23,6 @@ import {
   SignedMessage,
   NotarizeResponse
 } from '@dxos/credentials';
-import { keyToString } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
 import { PublicKey } from '@dxos/protocols';
 
@@ -36,6 +35,11 @@ const log = debug('dxos:echo-db:greeting-initiator');
 
 const DEFAULT_TIMEOUT = 30_000;
 
+export interface InvitationResult {
+  partyKey: PublicKey;
+  genesisFeedKey: PublicKey
+}
+
 /**
  * Attempts to connect to a greeting responder to 'redeem' an invitation, potentially with some out-of-band
  * authentication check, in order to be admitted to a Party.
@@ -88,10 +92,10 @@ export class GreetingInitiator {
     // Therefore at present the greeter discovers the invitation id from session metadata, via the invitee's peer id.
     // TODO(dboreham): Invitation is actually invitationID.
     const localPeerId = invitation;
-    log('Local PeerId:', keyToString(localPeerId));
+    log('Local PeerId:', PublicKey.stringify(localPeerId));
     this._greeterPlugin = new GreetingCommandPlugin(Buffer.from(localPeerId), new Greeter().createMessageHandler());
 
-    log(keyToString(localPeerId), 'connecting to', keyToString(swarmKey));
+    log(PublicKey.stringify(localPeerId), 'connecting to', PublicKey.stringify(swarmKey));
 
     const peerJoinedWaiter = waitForEvent(this._greeterPlugin, 'peer:joined',
       (remotePeerId: any) => remotePeerId && Buffer.from(responderPeerId).equals(remotePeerId),
@@ -113,7 +117,7 @@ export class GreetingInitiator {
   /**
    * Called after connecting to initiate greeting protocol exchange.
    */
-  async redeemInvitation (secretProvider: SecretProvider): Promise<{ partyKey: PublicKey, hints: PublicKey[] }> {
+  async redeemInvitation (secretProvider: SecretProvider): Promise<InvitationResult> {
     assert(this._state === GreetingState.CONNECTED);
     const { swarmKey } = this._invitationDescriptor;
 
@@ -171,9 +175,10 @@ export class GreetingInitiator {
     await this.disconnect();
 
     this._state = GreetingState.SUCCEEDED;
+    assert(notarizeResponse.genesisFeed);
     return {
       partyKey,
-      hints: notarizeResponse.feedHints ?? []
+      genesisFeedKey: notarizeResponse.genesisFeed
     };
   }
 

package/src/invitations/greeting-protocol-provider.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import { keyToString } from '@dxos/crypto';
 import { protocolFactory } from '@dxos/network-manager';
+import { PublicKey } from '@dxos/protocols';
 
 /**
  * Creates a duplex connection with a single peer using a common rendezvous key as topic.
@@ -16,6 +16,6 @@ import { protocolFactory } from '@dxos/network-manager';
 // TODO(dboreham): Write a test to check resources are released (no resource leaks).
 export const greetingProtocolProvider = (rendezvousKey: any, peerId: Buffer | Uint8Array, protocolPlugins: any[]) => protocolFactory({
   getTopics: () => [rendezvousKey],
-  session: { peerId: keyToString(peerId) },
+  session: { peerId: PublicKey.stringify(peerId) },
   plugins: protocolPlugins
 });

package/src/invitations/greeting-responder.ts

@@ -9,14 +9,13 @@ import { Event, waitForCondition } from '@dxos/async';
 import {
   admitsKeys,
   createEnvelopeMessage, Greeter,
-  GreetingCommandPlugin, KeyHint,
+  GreetingCommandPlugin,
   Keyring,
-  KeyType,
   SecretProvider,
-  SecretValidator
-  , Message as HaloMessage
+  SecretValidator,
+  Message as HaloMessage
 } from '@dxos/credentials';
-import { keyToString, randomBytes } from '@dxos/crypto';
+import { randomBytes } from '@dxos/crypto';
 import { FeedWriter, SwarmKey } from '@dxos/echo-protocol';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
 import { PublicKey } from '@dxos/protocols';
@@ -60,13 +59,14 @@ export class GreetingResponder {
   constructor (
     private readonly _networkManager: NetworkManager,
     private readonly _partyProcessor: PartyStateProvider,
+    private readonly _genesisFeedKey: PublicKey,
     private readonly _credentialsSigner: CredentialsSigner,
     private readonly _credentialsWriter: FeedWriter<HaloMessage>
   ) {
     this._greeter = new Greeter(
       this._partyProcessor.partyKey,
-      async (messages: any) => this._writeCredentialsToParty(messages),
-      async () => this._gatherHints()
+      this._genesisFeedKey,
+      async (messages: any) => this._writeCredentialsToParty(messages)
     );
 
     this._greeterPlugin = new GreetingCommandPlugin(Buffer.from(this._swarmKey), this._greeter.createMessageHandler());
@@ -130,11 +130,11 @@ export class GreetingResponder {
     // TODO(dboreham): Add tests for idempotence and transactional integrity over the greet flow.
     (this._greeterPlugin as any).once('peer:joined', (joinedPeerId: Buffer) => {
       if (joinedPeerId.equals(invitation.id)) {
-        log(`Initiator connected: ${keyToString(joinedPeerId)}`);
+        log(`Initiator connected: ${PublicKey.stringify(joinedPeerId)}`);
         this._state = GreetingState.CONNECTED;
         this.connected.emit(invitation.id);
       } else {
-        log(`Unexpected initiator connected: ${keyToString(joinedPeerId)}`);
+        log(`Unexpected initiator connected: ${PublicKey.stringify(joinedPeerId)}`);
       }
     });
 
@@ -158,7 +158,7 @@ export class GreetingResponder {
       label: 'Greeting responder'
     });
 
-    log(`Greeting for: ${this._partyProcessor.partyKey.toHex()} on swarmKey ${keyToString(this._swarmKey)}`);
+    log(`Greeting for: ${this._partyProcessor.partyKey.toHex()} on swarmKey ${PublicKey.stringify(this._swarmKey)}`);
 
     this._state = GreetingState.LISTENING;
     log('Listening');
@@ -210,6 +210,7 @@ export class GreetingResponder {
     // Place the self-signed messages inside an Envelope, sign then write the signed Envelope to the Party.
     const envelopes = [];
     for (const message of messages) {
+      // TODO(dmaretskyi): Refactor to pass in a callback: `await admitKeys(messages)`.
       const admittedKeys = admitsKeys(message);
 
       // TODO(telackey): Add hasKey/isMember to PartyProcessor?
@@ -238,24 +239,4 @@ export class GreetingResponder {
     // Return the signed messages to the caller because copies are sent back to the invitee.
     return envelopes;
   }
-
-  /**
-   * Callback to gather member key and feed "hints" for the Invitee.
-   * @private
-   */
-  _gatherHints (): KeyHint[] {
-    assert(this._state === GreetingState.SUCCEEDED);
-
-    const memberKeys = this._partyProcessor.memberKeys.map((publicKey) => ({
-      publicKey,
-      type: KeyType.UNKNOWN
-    }));
-
-    const memberFeeds = this._partyProcessor.feedKeys.map((publicKey) => ({
-      publicKey,
-      type: KeyType.FEED
-    }));
-
-    return [...memberKeys, ...memberFeeds];
-  }
 }

package/src/invitations/halo-recovery-initiator.ts

@@ -19,7 +19,7 @@ import {
   SignedMessage,
   codec
 } from '@dxos/credentials';
-import { keyToBuffer, keyToString, randomBytes, verify } from '@dxos/crypto';
+import { randomBytes, verify } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
 import { PublicKey } from '@dxos/protocols';
 
@@ -66,7 +66,7 @@ export class HaloRecoveryInitiator {
 
     // This is a temporary connection, there is no need to any special or permanent ID.
     this._peerId = randomBytes();
-    log('Local PeerId:', keyToString(this._peerId));
+    log('Local PeerId:', PublicKey.stringify(this._peerId));
 
     const swarmKey = this._credentialsSigner.getIdentityKey().publicKey.asBuffer();
 
@@ -102,7 +102,7 @@ export class HaloRecoveryInitiator {
 
     // Send to the first peer (any peer will do).
     const peer = this._greeterPlugin.peers[0];
-    const responderPeerId = keyToBuffer(peer.getSession().peerId);
+    const responderPeerId = PublicKey.bufferize(peer.getSession().peerId);
 
     // Synthesize an "invitationID" which is the signature of both peerIds signed by our Identity key.
     const signature = this._credentialsSigner.signer.rawSign(

package/src/invitations/invitation-descriptor.ts

@@ -6,7 +6,7 @@ import assert from 'assert';
 import base from 'base-x';
 import stableStringify from 'json-stable-stringify';
 
-import { keyToBuffer, keyToString, ripemd160 } from '@dxos/crypto';
+import { ripemd160 } from '@dxos/crypto';
 import { SwarmKey } from '@dxos/echo-protocol';
 import * as proto from '@dxos/echo-protocol';
 import { PublicKey } from '@dxos/protocols';
@@ -46,8 +46,8 @@ export class InvitationDescriptor {
   static fromQueryParameters (queryParameters: InvitationQueryParameters): InvitationDescriptor {
     const { hash, swarmKey, invitation, identityKey, type } = queryParameters;
 
-    const descriptor = new InvitationDescriptor(parseInvitationType(type), keyToBuffer(swarmKey),
-      keyToBuffer(invitation), identityKey ? PublicKey.from(identityKey) : undefined);
+    const descriptor = new InvitationDescriptor(parseInvitationType(type), PublicKey.bufferize(swarmKey),
+      PublicKey.bufferize(invitation), identityKey ? PublicKey.from(identityKey) : undefined);
 
     if (hash !== descriptor.hash) {
       throw new InvalidInvitationError();
@@ -104,8 +104,8 @@ export class InvitationDescriptor {
    */
   toQueryParameters (): InvitationQueryParameters {
     const query: Partial<InvitationQueryParameters> = {
-      swarmKey: keyToString(this.swarmKey),
-      invitation: keyToString(this.invitation),
+      swarmKey: PublicKey.stringify(this.swarmKey),
+      invitation: PublicKey.stringify(this.invitation),
       type: stringifyInvitationType(this.type)
     };
 

package/src/invitations/invitation-factory.ts

@@ -21,8 +21,7 @@ import { InvitationDescriptor, InvitationDescriptorType } from './invitation-des
 export class InvitationFactory {
   constructor (
     private readonly _partyProcessor: PartyStateProvider,
-    // This needs to be a provider in case this is a backend for the HALO party.
-    // Then the identity would be changed after this is instantiated.
+    private readonly _genesisFeedKey: PublicKey,
     private readonly _credentialsSigner: CredentialsSigner,
     private readonly _credentialsWriter: FeedWriter<HaloMessage>,
     private readonly _networkManager: NetworkManager
@@ -62,6 +61,7 @@ export class InvitationFactory {
     const responder = new GreetingResponder(
       this._networkManager,
       this._partyProcessor,
+      this._genesisFeedKey,
       this._credentialsSigner,
       this._credentialsWriter
     );

package/src/invitations/offline-invitation-claimer.ts

@@ -20,7 +20,7 @@ import {
   SignedMessage,
   codec
 } from '@dxos/credentials';
-import { keyToBuffer, keyToString, randomBytes } from '@dxos/crypto';
+import { randomBytes } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
 import { PublicKey } from '@dxos/protocols';
 
@@ -66,7 +66,7 @@ export class OfflineInvitationClaimer {
 
     // This is a temporary connection, there is no need to any special or permanent ID.
     const localPeerId = randomBytes();
-    log('Local PeerId:', keyToString(localPeerId));
+    log('Local PeerId:', PublicKey.stringify(localPeerId));
 
     this._greeterPlugin = new GreetingCommandPlugin(localPeerId, async () => false);
 
@@ -100,7 +100,7 @@ export class OfflineInvitationClaimer {
     const { invitation: invitationID } = this._invitationDescriptor;
 
     // Send to the first peer (any peer will do).
-    const responderPeerId = keyToBuffer(this._greeterPlugin.peers[0].getSession().peerId);
+    const responderPeerId = PublicKey.bufferize(this._greeterPlugin.peers[0].getSession().peerId);
 
     // We expect to receive a new swarm/rendezvousKey to use for the full Greeting process.
     const claimResponse = await this._greeterPlugin.send(

package/src/packlets/database/data-mirror.test.ts

@@ -6,10 +6,10 @@ import expect from 'expect';
 import { it as test } from 'mocha';
 
 import { promiseTimeout } from '@dxos/async';
-import { EchoEnvelope, MockFeedWriter, Timeframe } from '@dxos/echo-protocol';
+import { EchoEnvelope, MockFeedWriter } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
-import { PublicKey } from '@dxos/protocols';
+import { PublicKey, Timeframe } from '@dxos/protocols';
 
 import { DataMirror } from './data-mirror';
 import { DataServiceHost } from './data-service-host';

package/src/packlets/database/item-demuxer.test.ts

@@ -9,10 +9,10 @@ import { it as test } from 'mocha';
 import { latch } from '@dxos/async';
 import { createId } from '@dxos/crypto';
 import { checkType } from '@dxos/debug';
-import { EchoEnvelope, MockFeedWriter, Timeframe } from '@dxos/echo-protocol';
+import { EchoEnvelope, MockFeedWriter } from '@dxos/echo-protocol';
 import { ModelFactory, TestModel } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
-import { PublicKey } from '@dxos/protocols';
+import { PublicKey, Timeframe } from '@dxos/protocols';
 
 import { Item } from './item';
 import { ItemDemuxer } from './item-demuxer';

package/src/packlets/database/testing.ts

@@ -2,9 +2,9 @@
 // Copyright 2021 DXOS.org
 //
 
-import { EchoEnvelope, MockFeedWriter, Timeframe } from '@dxos/echo-protocol';
+import { EchoEnvelope, MockFeedWriter } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
-import { PublicKey } from '@dxos/protocols';
+import { PublicKey, Timeframe } from '@dxos/protocols';
 
 import { DataServiceHost } from './data-service-host';
 import { DataServiceRouter } from './data-service-router';

package/src/packlets/database/timeframe-clock.ts

@@ -3,7 +3,9 @@
 //
 
 import { Event } from '@dxos/async';
-import { FeedKey, Timeframe } from '@dxos/echo-protocol';
+import { timed } from '@dxos/debug';
+import { FeedKey } from '@dxos/echo-protocol';
+import { Timeframe } from '@dxos/protocols';
 
 /**
  * Keeps state of the last timeframe that was processed by ECHO.
@@ -29,6 +31,7 @@ export class TimeframeClock {
     return !gaps.isEmpty();
   }
 
+  @timed(5_000)
   async waitUntilReached (target: Timeframe) {
     await this.update.waitForCondition(() => Timeframe.dependencies(target, this._timeframe).isEmpty());
   }