@dxos/echo-db 2.33.7-dev.c2ba88fb → 2.33.8-dev.6bc74570

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-db",
-  "version": "2.33.7-dev.c2ba88fb",
+  "version": "2.33.8-dev.6bc74570",
   "description": "ECHO database.",
   "license": "MIT",
   "main": "dist/src/index.js",
@@ -10,22 +10,22 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.33.7-dev.c2ba88fb",
-    "@dxos/codec-protobuf": "2.33.7-dev.c2ba88fb",
-    "@dxos/credentials": "2.33.7-dev.c2ba88fb",
-    "@dxos/crypto": "2.33.7-dev.c2ba88fb",
-    "@dxos/debug": "2.33.7-dev.c2ba88fb",
-    "@dxos/echo-protocol": "2.33.7-dev.c2ba88fb",
-    "@dxos/feed-store": "2.33.7-dev.c2ba88fb",
-    "@dxos/mesh-protocol": "2.33.7-dev.c2ba88fb",
-    "@dxos/model-factory": "2.33.7-dev.c2ba88fb",
-    "@dxos/network-manager": "2.33.7-dev.c2ba88fb",
-    "@dxos/object-model": "2.33.7-dev.c2ba88fb",
-    "@dxos/protocol-plugin-presence": "2.33.7-dev.c2ba88fb",
-    "@dxos/protocol-plugin-replicator": "2.33.7-dev.c2ba88fb",
-    "@dxos/protocols": "2.33.7-dev.c2ba88fb",
-    "@dxos/random-access-multi-storage": "2.33.7-dev.c2ba88fb",
-    "@dxos/util": "2.33.7-dev.c2ba88fb",
+    "@dxos/async": "2.33.8-dev.6bc74570",
+    "@dxos/codec-protobuf": "2.33.8-dev.6bc74570",
+    "@dxos/credentials": "2.33.8-dev.6bc74570",
+    "@dxos/crypto": "2.33.8-dev.6bc74570",
+    "@dxos/debug": "2.33.8-dev.6bc74570",
+    "@dxos/echo-protocol": "2.33.8-dev.6bc74570",
+    "@dxos/feed-store": "2.33.8-dev.6bc74570",
+    "@dxos/mesh-protocol": "2.33.8-dev.6bc74570",
+    "@dxos/model-factory": "2.33.8-dev.6bc74570",
+    "@dxos/network-manager": "2.33.8-dev.6bc74570",
+    "@dxos/object-model": "2.33.8-dev.6bc74570",
+    "@dxos/protocol-plugin-presence": "2.33.8-dev.6bc74570",
+    "@dxos/protocol-plugin-replicator": "2.33.8-dev.6bc74570",
+    "@dxos/protocols": "2.33.8-dev.6bc74570",
+    "@dxos/random-access-multi-storage": "2.33.8-dev.6bc74570",
+    "@dxos/util": "2.33.8-dev.6bc74570",
     "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.6",
+    "@dxos/browser-mocha": "2.33.7",
     "@dxos/eslint-plugin": "~1.0.34",
-    "@dxos/protocols-toolchain": "2.33.6",
-    "@dxos/testutils": "2.33.6",
+    "@dxos/protocols-toolchain": "2.33.7",
+    "@dxos/testutils": "2.33.7",
     "@types/columnify": "^1.5.1",
     "@types/debug": "^4.1.7",
     "@types/faker": "^5.5.1",

package/src/echo.test.ts

@@ -8,8 +8,10 @@ import expect from 'expect';
 import { it as test } from 'mocha';
 
 import { latch, promiseTimeout, waitForCondition } from '@dxos/async';
-import { defaultSecretProvider, defaultSecretValidator } from '@dxos/credentials';
-import { generateSeedPhrase, keyPairFromSeedPhrase } from '@dxos/crypto';
+import {
+  defaultSecretProvider, defaultSecretValidator, generateSeedPhrase, keyPairFromSeedPhrase
+} from '@dxos/credentials';
+import { humanize } from '@dxos/crypto';
 import { ObjectModel } from '@dxos/object-model';
 import { afterTest } from '@dxos/testutils';
 
@@ -43,7 +45,7 @@ describe('ECHO', () => {
   test('create party and update properties.', async () => {
     const echo = await setup({ createProfile: true });
     const parties = echo.queryParties({ open: true });
-    log('Parties:', parties.value.map(party => party.key.humanize()));
+    log('Parties:', parties.value.map(party => humanize(party.key)));
     expect(parties.value).toHaveLength(0);
 
     const party = await echo.createParty();
@@ -55,12 +57,12 @@ describe('ECHO', () => {
   test('create party and items.', async () => {
     const echo = await setup({ createProfile: true });
     const parties = echo.queryParties({ open: true });
-    log('Parties:', parties.value.map(party => party.key.humanize()));
+    log('Parties:', parties.value.map(party => humanize(party.key)));
     expect(parties.value).toHaveLength(0);
 
     const [updated, onUpdate] = latch();
     const unsubscribe = parties.subscribe(async parties => {
-      log('Updated:', parties.map(party => party.key.humanize()));
+      log('Updated:', parties.map(party => humanize(party.key)));
 
       // TODO(burdon): Update currently called after all mutations below have completed?
       expect(parties).toHaveLength(1);
@@ -83,7 +85,7 @@ describe('ECHO', () => {
     const members = party.queryMembers().value;
     expect(members.length).toBe(1);
     // Within this test, we use the humanized key as the name.
-    expect(members[0].displayName).toEqual(members[0].publicKey.humanize());
+    expect(members[0].displayName).toEqual(humanize(members[0].publicKey));
 
     // TODO(burdon): Test item mutations.
     await party.database.createItem({ model: ObjectModel, type: 'example:item/document' });
@@ -98,12 +100,12 @@ describe('ECHO', () => {
     const echo = await setup({ createProfile: true });
 
     const parties = echo.queryParties({ open: true });
-    log('Parties:', parties.value.map(party => party.key.humanize()));
+    log('Parties:', parties.value.map(party => humanize(party.key)));
     expect(parties.value).toHaveLength(0);
 
     const [updated, onUpdate] = latch();
     const unsubscribe = parties.subscribe(async parties => {
-      log('Updated:', parties.map(party => party.key.humanize()));
+      log('Updated:', parties.map(party => humanize(party.key)));
 
       expect(parties).toHaveLength(1);
       parties.map(async party => {
@@ -126,7 +128,7 @@ describe('ECHO', () => {
     const members = party.queryMembers().value;
     expect(members.length).toBe(1);
     // Within this test, we use the humanized key as the name.
-    expect(members[0].displayName).toEqual(members[0].publicKey.humanize());
+    expect(members[0].displayName).toEqual(humanize(members[0].publicKey));
 
     const parent = await party.database.createItem({ model: ObjectModel, type: 'example:item/document' });
     await party.database.createItem({ model: ObjectModel, parent: parent.id });
@@ -139,7 +141,7 @@ describe('ECHO', () => {
     const echo = await setup({ createProfile: true });
 
     const parties = echo.queryParties({ open: true });
-    log('Parties:', parties.value.map(party => party.key.humanize()));
+    log('Parties:', parties.value.map(party => humanize(party.key)));
     expect(parties.value).toHaveLength(0);
 
     const party = await echo.createParty();
@@ -148,7 +150,7 @@ describe('ECHO', () => {
     const members = party.queryMembers().value;
     expect(members.length).toBe(1);
     // Within this test, we use the humanized key as the name.
-    expect(members[0].displayName).toEqual(members[0].publicKey.humanize());
+    expect(members[0].displayName).toEqual(humanize(members[0].publicKey));
 
     const parentA = await party.database.createItem({ model: ObjectModel, type: 'example:item/document' });
     const childA = await party.database.createItem({ model: ObjectModel, parent: parentA.id });

package/src/echo.ts

@@ -8,13 +8,13 @@ import memdown from 'memdown';
 
 import { synchronized } from '@dxos/async';
 import { Keyring, KeyStore, SecretProvider } from '@dxos/credentials';
-import { PublicKey } from '@dxos/crypto';
 import { InvalidStateError, raise } from '@dxos/debug';
 import { codec, DataService, PartyKey, PartySnapshot } from '@dxos/echo-protocol';
 import { FeedStore } from '@dxos/feed-store';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager, NetworkManagerOptions } from '@dxos/network-manager';
 import { ObjectModel } from '@dxos/object-model';
+import { PublicKey } from '@dxos/protocols';
 import { Storage, createStorage, StorageType } from '@dxos/random-access-multi-storage';
 import { SubscriptionGroup } from '@dxos/util';
 

package/src/halo/contact-manager.ts

@@ -3,9 +3,9 @@
 //
 
 import { Event } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
 import { raise } from '@dxos/debug';
 import { ObjectModel } from '@dxos/object-model';
+import { PublicKey } from '@dxos/protocols';
 
 import { ResultSet } from '../api';
 import { Database, Item } from '../packlets/database';

package/src/halo/halo-factory.ts

@@ -10,15 +10,16 @@ import {
   createIdentityInfoMessage,
   createKeyAdmitMessage,
   createPartyGenesisMessage,
+  keyPairFromSeedPhrase,
   Keyring,
   KeyType,
   Filter,
   SecretProvider
 } from '@dxos/credentials';
-import { keyToString, PublicKey, keyPairFromSeedPhrase } from '@dxos/crypto';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
 import { ObjectModel } from '@dxos/object-model';
+import { PublicKey } from '@dxos/protocols';
 
 import { createHaloPartyAdmissionMessage, GreetingInitiator, HaloRecoveryInitiator, InvitationDescriptor, InvitationDescriptorType, OfflineInvitationClaimer } from '../invitations';
 import { PARTY_ITEM_TYPE } from '../parties';
@@ -150,7 +151,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 }));

package/src/halo/halo-party.ts

@@ -6,11 +6,11 @@ import assert from 'assert';
 
 import { Event, synchronized } from '@dxos/async';
 import { KeyHint } from '@dxos/credentials';
-import { PublicKey } from '@dxos/crypto';
 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 { InvitationAuthenticator, InvitationDescriptor, InvitationFactory, InvitationOptions } from '../invitations';
 import { PARTY_ITEM_TYPE } from '../parties';

package/src/halo/halo.test.ts

@@ -5,13 +5,15 @@
 import expect from 'expect';
 import { it as test } from 'mocha';
 
-import { defaultSecretProvider, Keyring } from '@dxos/credentials';
-import { generateSeedPhrase, keyPairFromSeedPhrase, PublicKey } from '@dxos/crypto';
+import {
+  defaultSecretProvider, generateSeedPhrase, keyPairFromSeedPhrase, Keyring
+} from '@dxos/credentials';
 import { codec } from '@dxos/echo-protocol';
 import { FeedStore } from '@dxos/feed-store';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
 import { ObjectModel } from '@dxos/object-model';
+import { PublicKey } from '@dxos/protocols';
 import { createStorage, StorageType } from '@dxos/random-access-multi-storage';
 import { afterTest, testTimeout } from '@dxos/testutils';
 
@@ -40,12 +42,12 @@ describe('HALO', () => {
     );
 
     return new HALO({
-      keyring: keyring,
-      networkManager: networkManager,
-      metadataStore: metadataStore,
+      keyring,
+      networkManager,
+      metadataStore,
       feedProviderFactory,
-      modelFactory: modelFactory,
-      snapshotStore: snapshotStore,
+      modelFactory,
+      snapshotStore,
       options: {}
     });
   };

package/src/halo/halo.ts

@@ -7,10 +7,11 @@ import debug from 'debug';
 
 import { synchronized } from '@dxos/async';
 import { KeyRecord, Keyring, KeyType, SecretProvider } from '@dxos/credentials';
-import { createKeyPair, KeyPair, PublicKey } from '@dxos/crypto';
+import { createKeyPair, humanize, 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 { ResultSet } from '../api';
 import { InvitationAuthenticator, InvitationDescriptor, InvitationOptions } from '../invitations';
@@ -194,7 +195,7 @@ export class HALO {
 
     const identityKey = this._identityManager.getIdentityKey() ?? raise(new Error('Cannot create HALO. Identity key not found.'));
     await this._identityManager.createHalo({
-      identityDisplayName: displayName || identityKey.publicKey.humanize()
+      identityDisplayName: displayName || humanize(identityKey.publicKey)
     });
   }
 

package/src/halo/preferences.ts

@@ -8,9 +8,9 @@ import defaultsDeep from 'lodash.defaultsdeep';
 
 import { Event } from '@dxos/async';
 import { KeyHint } from '@dxos/credentials';
-import { PublicKey } from '@dxos/crypto';
 import { raise } from '@dxos/debug';
 import { ObjectModel } from '@dxos/object-model';
+import { PublicKey } from '@dxos/protocols';
 
 import { ResultSet } from '../api';
 import { Database, Item } from '../packlets/database';

package/src/halo/types.ts

@@ -6,4 +6,5 @@ export interface CreateProfileOptions {
   publicKey?: Uint8Array
   secretKey?: Uint8Array
   username?: string
+  seedphrase?: string
 }

package/src/invitations/greeting-initiator.ts

@@ -23,8 +23,8 @@ import {
   SignedMessage,
   NotarizeResponse
 } from '@dxos/credentials';
-import { keyToString, PublicKey } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
+import { PublicKey } from '@dxos/protocols';
 
 import { CredentialsSigner } from '../protocol/credentials-signer';
 import { greetingProtocolProvider } from './greeting-protocol-provider';
@@ -87,10 +87,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),

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

@@ -16,9 +16,10 @@ import {
   SecretValidator
   , Message as HaloMessage
 } from '@dxos/credentials';
-import { keyToString, randomBytes, PublicKey } 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';
 
 import { PartyStateProvider } from '../pipeline';
 import { CredentialsSigner } from '../protocol/credentials-signer';
@@ -129,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)}`);
       }
     });
 
@@ -157,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');

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

@@ -19,8 +19,9 @@ import {
   SignedMessage,
   codec
 } from '@dxos/credentials';
-import { keyToBuffer, keyToString, PublicKey, randomBytes, verify } from '@dxos/crypto';
+import { randomBytes, verify } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
+import { PublicKey } from '@dxos/protocols';
 
 import { InvalidInvitationError } from '../packlets/errors';
 import { CredentialsSigner } from '../protocol';
@@ -65,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();
 
@@ -101,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,9 +6,10 @@ import assert from 'assert';
 import base from 'base-x';
 import stableStringify from 'json-stable-stringify';
 
-import { keyToBuffer, keyToString, ripemd160, PublicKey } 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';
 
 import { InvalidInvitationError } from '../packlets/errors';
 
@@ -45,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();
@@ -103,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

@@ -5,9 +5,9 @@
 import assert from 'assert';
 
 import { createPartyInvitationMessage, Message as HaloMessage } from '@dxos/credentials';
-import { PublicKey } from '@dxos/crypto';
 import { FeedWriter } from '@dxos/echo-protocol';
 import { NetworkManager } from '@dxos/network-manager';
+import { PublicKey } from '@dxos/protocols';
 
 import { PartyStateProvider } from '../pipeline';
 import { CredentialsSigner } from '../protocol/credentials-signer';

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

@@ -20,8 +20,9 @@ import {
   SignedMessage,
   codec
 } from '@dxos/credentials';
-import { keyToBuffer, keyToString, PublicKey, randomBytes } from '@dxos/crypto';
+import { randomBytes } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
+import { PublicKey } from '@dxos/protocols';
 
 import { InvalidInvitationError } from '../packlets/errors';
 import { CredentialsSigner } from '../protocol';
@@ -65,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);
 
@@ -99,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 { PublicKey } from '@dxos/crypto';
 import { EchoEnvelope, MockFeedWriter, Timeframe } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
+import { PublicKey } from '@dxos/protocols';
 
 import { DataMirror } from './data-mirror';
 import { DataServiceHost } from './data-service-host';

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

@@ -5,10 +5,10 @@
 import assert from 'assert';
 import debug from 'debug';
 
-import { PublicKey } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
 import { DataService } from '@dxos/echo-protocol';
 import { Model } from '@dxos/model-factory';
+import { PublicKey } from '@dxos/protocols';
 
 import { Entity } from './entity';
 import { ItemManager } from './item-manager';

package/src/packlets/database/data-service-host.ts

@@ -6,7 +6,6 @@ import assert from 'assert';
 import debug from 'debug';
 
 import { Stream } from '@dxos/codec-protobuf';
-import { PublicKey } from '@dxos/crypto';
 import { failUndefined, raise } from '@dxos/debug';
 import {
   EchoEnvelope,
@@ -17,6 +16,7 @@ import {
   SubscribeEntityStreamRequest,
   SubscribeEntityStreamResponse
 } from '@dxos/echo-protocol';
+import { PublicKey } from '@dxos/protocols';
 
 import { EntityNotFoundError } from '../errors';
 import { Item } from './item';

package/src/packlets/database/database.ts

@@ -5,10 +5,10 @@
 import assert from 'assert';
 
 import { Event, synchronized } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
 import { ItemID, ItemType } from '@dxos/echo-protocol';
 import { Model, ModelConstructor, ModelFactory, validateModelClass } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
+import { PublicKey } from '@dxos/protocols';
 
 import { DataServiceHost } from './data-service-host';
 import { DatabaseBackend } from './database-backend';

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

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

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

@@ -5,10 +5,11 @@
 import expect from 'expect';
 import { it as test } from 'mocha';
 
-import { createId, PublicKey } from '@dxos/crypto';
+import { createId } from '@dxos/crypto';
 import { MockFeedWriter } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
+import { PublicKey } from '@dxos/protocols';
 
 import { ItemManager } from './item-manager';
 

package/src/packlets/database/item-manager.ts

@@ -6,10 +6,11 @@ import assert from 'assert';
 import debug from 'debug';
 
 import { Event, trigger } from '@dxos/async';
-import { createId, PublicKey } from '@dxos/crypto';
+import { createId } from '@dxos/crypto';
 import { timed } from '@dxos/debug';
 import { EchoEnvelope, FeedWriter, ItemID, ItemType, mapFeedWriter, ModelSnapshot } from '@dxos/echo-protocol';
 import { Model, ModelFactory, ModelMessage, ModelType, StateManager } from '@dxos/model-factory';
+import { PublicKey } from '@dxos/protocols';
 
 import { UnknownModelError } from '../errors';
 import { Entity } from './entity';

package/src/packlets/database/selection/selection.test.ts

@@ -6,10 +6,10 @@ import expect from 'expect';
 import { it as test } from 'mocha';
 
 import { Event, promiseTimeout } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
 import { ItemID, ItemType } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
+import { PublicKey } from '@dxos/protocols';
 
 import { Entity } from '../entity';
 import { Item } from '../item';

package/src/packlets/database/testing.ts

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

package/src/packlets/errors/errors.ts

@@ -0,0 +1,43 @@
+//
+// Copyright 2021 DXOS.org
+//
+
+import { DXOSError } from '@dxos/debug';
+import { ItemID } from '@dxos/echo-protocol';
+import { PublicKey } from '@dxos/protocols';
+
+export class PartyNotFoundError extends DXOSError {
+  constructor (partyKey: PublicKey) {
+    super('PARTY_NOT_FOUND', `Party with key not found: ${partyKey}`);
+  }
+}
+
+export class EntityNotFoundError extends DXOSError {
+  constructor (entityId: ItemID) {
+    super('ENTITY_NOT_FOUND', `Entitiy not found: ${entityId}`);
+  }
+}
+
+export class UnknownModelError extends DXOSError {
+  constructor (model: string) {
+    super('UNKNOWN_MODEL', `Unknown model ${model}.`);
+  }
+}
+
+export class IdentityNotInitializedError extends DXOSError {
+  constructor () {
+    super('IDENTITY_NOT_INITIALIZED', 'Identity not initialized.');
+  }
+}
+
+export class InvalidInvitationError extends DXOSError {
+  constructor () {
+    super('INVALID_INVITATION', 'Invitation is invalid.');
+  }
+}
+
+export class InvalidStorageVersionError extends DXOSError {
+  constructor (expected: number, actual: number) {
+    super('INVALID_STORAGE_VERSION', `Invalid storage version: Expected ${expected}, actual ${actual}.`);
+  }
+}