@dxos/client-services 0.6.12-staging.e11e696 → 0.6.12

package/src/packlets/invitations/space-invitation-protocol.test.ts

@@ -2,21 +2,20 @@
 // Copyright 2022 DXOS.org
 //
 
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { asyncChain, Trigger } from '@dxos/async';
 import { raise } from '@dxos/debug';
 import { AlreadyJoinedError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import { afterTest, describe, test } from '@dxos/test';
 
 import { type ServiceContext } from '../services';
 import { createIdentity, createPeers } from '../testing';
 import { acceptInvitation, createInvitation, performInvitation } from '../testing/invitation-utils';
 
 const closeAfterTest = async (peer: ServiceContext) => {
-  onTestFinished(async () => {
-    await peer.close();
-  });
+  afterTest(() => peer.close());
   return peer;
 };
 

package/src/packlets/logging/logging.test.ts

@@ -2,11 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import { afterEach, beforeEach, describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { Trigger } from '@dxos/async';
 import { log, LogLevel } from '@dxos/log';
 import { type LogEntry } from '@dxos/protocols/proto/dxos/client/services';
+import { beforeEach, describe, test } from '@dxos/test';
 
 import { LoggingServiceImpl } from './logging-service';
 

package/src/packlets/network/network-service.test.ts

@@ -2,11 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import { afterEach, onTestFinished, beforeEach, describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { Trigger } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { type NetworkService, ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
+import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
 import { NetworkServiceImpl } from './network-service';
 import { type ServiceContext } from '../services';
@@ -40,7 +41,7 @@ describe('NetworkService', () => {
     query.subscribe(({ swarm }) => {
       result.wake(swarm);
     });
-    onTestFinished(() => query.close());
+    afterTest(() => query.close());
     expect(await result.wait()).to.equal(ConnectionState.ONLINE);
 
     result = new Trigger<ConnectionState | undefined>();

package/src/packlets/services/automerge-host.test.ts

@@ -0,0 +1,60 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { expect } from 'chai';
+
+import { asyncTimeout } from '@dxos/async';
+import { AutomergeContext } from '@dxos/echo-db';
+import { AutomergeHost, DataServiceImpl } from '@dxos/echo-pipeline';
+import { IndexMetadataStore } from '@dxos/indexing';
+import { createTestLevel } from '@dxos/kv-store/testing';
+import { afterTest, describe, openAndClose, test } from '@dxos/test';
+
+describe('AutomergeHost', () => {
+  test('automerge context is being synced with host', async () => {
+    //
+    // Setup:
+    // client-services           | <-------------> | client
+    // AutomergeHost             | DataServiceImpl | AutomergeContext
+    // creates repo and document | replicates repo | finds document in repo
+    //
+
+    const level = createTestLevel();
+    await level.open();
+    afterTest(() => level.close());
+
+    const host = new AutomergeHost({
+      db: level,
+      indexMetadataStore: new IndexMetadataStore({ db: level.sublevel('index-metadata') }),
+    });
+    await host.open();
+    afterTest(() => host.close());
+
+    const dataService = new DataServiceImpl({ automergeHost: host, updateIndexes: async () => {} });
+    const client = new AutomergeContext(dataService);
+    await openAndClose(client);
+
+    // Create document in repo.
+    const handle = host.repo.create();
+    const text = 'Hello World!';
+    handle.change((doc: any) => {
+      doc.text = text;
+    });
+
+    // Find document in repo.
+    const doc = client.repo.find<{ text: string }>(handle.url);
+    await asyncTimeout(doc.whenReady(), 1_000);
+    expect(doc.docSync().text).to.equal(text);
+
+    // Changes from client are replicated to host.
+    const newText = 'Goodbye World!!!';
+    doc.change((doc: any) => {
+      doc.text = newText;
+    });
+    await client.flush({ documentIds: [doc.documentId] });
+
+    await asyncTimeout(handle.whenReady(), 1_000);
+    expect(handle.docSync().text).to.equal(newText);
+  });
+});

package/src/packlets/services/service-context.test.ts

@@ -2,11 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { describe, test } from 'vitest';
-
 import { MemorySignalManagerContext, MemorySignalManager } from '@dxos/messaging';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { openAndClose } from '@dxos/test-utils';
+import { describe, openAndClose, test } from '@dxos/test';
 
 import { createServiceContext, performInvitation } from '../testing';
 

package/src/packlets/services/service-context.ts

@@ -2,20 +2,13 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Mutex, scheduleMicroTask, Trigger } from '@dxos/async';
+import { Trigger } from '@dxos/async';
 import { Context, Resource } from '@dxos/context';
 import { getCredentialAssertion, type CredentialProcessor } from '@dxos/credentials';
-import { failUndefined, warnAfterTimeout } from '@dxos/debug';
-import {
-  EchoEdgeReplicator,
-  EchoHost,
-  MeshEchoReplicator,
-  MetadataStore,
-  SpaceManager,
-  valueEncoding,
-} from '@dxos/echo-pipeline';
-import { createChainEdgeIdentity, createEphemeralEdgeIdentity } from '@dxos/edge-client';
-import type { EdgeHttpClient, EdgeConnection } from '@dxos/edge-client';
+import { failUndefined } from '@dxos/debug';
+import { EchoEdgeReplicator, EchoHost } from '@dxos/echo-db';
+import { MeshEchoReplicator, MetadataStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
+import type { EdgeConnection } from '@dxos/edge-client';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { Keyring } from '@dxos/keyring';
@@ -38,7 +31,7 @@ import { safeInstanceof } from '@dxos/util';
 import {
   IdentityManager,
   type CreateIdentityOptions,
-  type IdentityManagerParams,
+  type IdentityManagerRuntimeParams,
   type JoinIdentityParams,
 } from '../identity';
 import {
@@ -50,10 +43,7 @@ import {
 } from '../invitations';
 import { DataSpaceManager, type DataSpaceManagerRuntimeParams, type SigningContext } from '../spaces';
 
-export type ServiceContextRuntimeParams = Pick<
-  IdentityManagerParams,
-  'devicePresenceOfflineTimeout' | 'devicePresenceAnnounceInterval'
-> &
+export type ServiceContextRuntimeParams = IdentityManagerRuntimeParams &
   DataSpaceManagerRuntimeParams & {
     invitationConnectionDefaultParams?: Partial<TeleportParams>;
     disableP2pReplication?: boolean;
@@ -66,8 +56,6 @@ export type ServiceContextRuntimeParams = Pick<
 @safeInstanceof('dxos.client-services.ServiceContext')
 @Trace.resource()
 export class ServiceContext extends Resource {
-  private readonly _edgeIdentityUpdateMutex = new Mutex();
-
   public readonly initialized = new Trigger();
   public readonly metadataStore: MetadataStore;
   public readonly blobStore: BlobStore;
@@ -99,7 +87,6 @@ export class ServiceContext extends Resource {
     public readonly networkManager: SwarmNetworkManager,
     public readonly signalManager: SignalManager,
     private readonly _edgeConnection: EdgeConnection | undefined,
-    private readonly _edgeHttpClient: EdgeHttpClient | undefined,
     public readonly _runtimeParams?: ServiceContextRuntimeParams,
     private readonly _edgeFeatures?: Runtime.Client.EdgeFeatures,
   ) {
@@ -129,50 +116,32 @@ export class ServiceContext extends Resource {
       disableP2pReplication: this._runtimeParams?.disableP2pReplication,
     });
 
-    this.identityManager = new IdentityManager({
-      metadataStore: this.metadataStore,
-      keyring: this.keyring,
-      feedStore: this.feedStore,
-      spaceManager: this.spaceManager,
-      devicePresenceOfflineTimeout: this._runtimeParams?.devicePresenceOfflineTimeout,
-      devicePresenceAnnounceInterval: this._runtimeParams?.devicePresenceAnnounceInterval,
-      edgeConnection: this._edgeConnection,
-      edgeFeatures: this._edgeFeatures,
-      callbacks: {
+    this.identityManager = new IdentityManager(
+      this.metadataStore,
+      this.keyring,
+      this.feedStore,
+      this.spaceManager,
+      this._runtimeParams as IdentityManagerRuntimeParams,
+      {
         onIdentityConstruction: (identity) => {
           if (this._edgeConnection) {
-            scheduleMicroTask(this._ctx, async () => {
-              using _ = await this._edgeIdentityUpdateMutex.acquire();
-
-              log.info('Setting identity on edge connection', {
-                identity: identity.identityKey.toHex(),
-                oldIdentity: this._edgeConnection!.identityKey,
-                swarms: this.networkManager.topics,
-              });
-
-              await warnAfterTimeout(10_000, 'Waiting for identity to be ready for edge connection', async () => {
-                await identity.ready();
-              });
-
-              invariant(identity.deviceCredentialChain);
-              this._edgeConnection!.setIdentity(
-                await createChainEdgeIdentity(
-                  identity.signer,
-                  identity.identityKey,
-                  identity.deviceKey,
-                  identity.deviceCredentialChain,
-                  [], // TODO(dmaretskyi): Service access credentials.
-                ),
-              );
-              this.networkManager.setPeerInfo({
-                identityKey: identity.identityKey.toHex(),
-                peerKey: identity.deviceKey.toHex(),
-              });
+            log.info('Setting identity on edge connection', {
+              identity: identity.identityKey.toHex(),
+              oldIdentity: this._edgeConnection.identityKey,
+              swarms: this.networkManager.topics,
+            });
+            this._edgeConnection.setIdentity({
+              peerKey: identity.deviceKey.toHex(),
+              identityKey: identity.identityKey.toHex(),
+            });
+            this.networkManager.setPeerInfo({
+              identityKey: identity.identityKey.toHex(),
+              peerKey: identity.deviceKey.toHex(),
             });
           }
         },
       },
-    });
+    );
 
     this.echoHost = new EchoHost({ kv: this.level });
 
@@ -216,11 +185,7 @@ export class ServiceContext extends Resource {
 
     log('opening...');
     log.trace('dxos.sdk.service-context.open', trace.begin({ id: this._instanceId }));
-    if (this._edgeConnection) {
-      // TODO(dmaretskyi): Use device key.
-      this._edgeConnection.setIdentity(await createEphemeralEdgeIdentity());
-      await this._edgeConnection.open();
-    }
+    await this._edgeConnection?.open();
     await this.signalManager.open();
     await this.networkManager.open();
 
@@ -327,7 +292,6 @@ export class ServiceContext extends Resource {
       echoHost: this.echoHost,
       invitationsManager: this.invitationsManager,
       edgeConnection: this._edgeConnection,
-      edgeHttpClient: this._edgeHttpClient,
       echoEdgeReplicator: this._echoEdgeReplicator,
       meshReplicator: this._meshReplicator,
       runtimeParams: this._runtimeParams as DataSpaceManagerRuntimeParams,

package/src/packlets/services/service-host.test.ts

@@ -2,8 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
+import chai, { expect } from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 import { rmSync } from 'node:fs';
-import { afterEach, onTestFinished, describe, expect, test } from 'vitest';
 
 import { asyncTimeout, latch, Trigger } from '@dxos/async';
 import { Config } from '@dxos/config';
@@ -13,10 +14,13 @@ import { type PublicKey } from '@dxos/keys';
 import { MemorySignalManagerContext } from '@dxos/messaging';
 import { type Identity } from '@dxos/protocols/proto/dxos/client/services';
 import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { afterTest, describe, test } from '@dxos/test';
 import { isNode } from '@dxos/util';
 
 import { createMockCredential, createServiceHost } from '../testing';
 
+chai.use(chaiAsPromised);
+
 describe('ClientServicesHost', () => {
   const dataRoot = '/tmp/dxos/client-services/service-host/storage';
 
@@ -34,7 +38,7 @@ describe('ClientServicesHost', () => {
   test('queryCredentials', async () => {
     const host = createServiceHost(new Config(), new MemorySignalManagerContext());
     await host.open(new Context());
-    onTestFinished(() => host.close());
+    afterTest(() => host.close());
 
     await host.services.IdentityService!.createIdentity({});
     const { spaceKey } = await host.services.SpacesService!.createSpace();
@@ -45,7 +49,7 @@ describe('ClientServicesHost', () => {
       tick();
       // console.log(credential);
     });
-    onTestFinished(() => stream.close());
+    afterTest(() => stream.close());
 
     await done();
   });
@@ -53,7 +57,7 @@ describe('ClientServicesHost', () => {
   test('write and query credentials', async () => {
     const host = createServiceHost(new Config(), new MemorySignalManagerContext());
     await host.open(new Context());
-    onTestFinished(() => host.close());
+    afterTest(() => host.close());
 
     await host.services.IdentityService!.createIdentity({});
 
@@ -82,7 +86,7 @@ describe('ClientServicesHost', () => {
         queriedCredential.wake(credential);
       }
     });
-    onTestFinished(() => credentials.close());
+    afterTest(() => credentials.close());
 
     await queriedCredential.wait();
   });
@@ -90,7 +94,7 @@ describe('ClientServicesHost', () => {
   test('sign presentation', async () => {
     const host = createServiceHost(new Config(), new MemorySignalManagerContext());
     await host.open(new Context());
-    onTestFinished(() => host.close());
+    afterTest(() => host.close());
 
     await host.services.IdentityService!.createIdentity({});
 
@@ -143,9 +147,9 @@ describe('ClientServicesHost', () => {
           trigger.wake(identity.identity);
         }
       });
-      await expect(asyncTimeout(trigger.wait(), 200)).rejects.toBeInstanceOf(Error);
+      await expect(asyncTimeout(trigger.wait(), 200)).to.be.rejectedWith();
       await stream?.close();
       await host.close();
     }
-  });
+  }).onlyEnvironments('nodejs', 'chromium', 'firefox');
 });

package/src/packlets/services/service-host.ts

@@ -6,7 +6,7 @@ import { Event, synchronized } from '@dxos/async';
 import { clientServiceBundle, type ClientServices } from '@dxos/client-protocol';
 import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
-import { EdgeClient, EdgeHttpClient, createStubEdgeIdentity, type EdgeConnection } from '@dxos/edge-client';
+import { EdgeClient, type EdgeConnection } from '@dxos/edge-client';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { type LevelDB } from '@dxos/kv-store';
@@ -15,7 +15,7 @@ import { EdgeSignalManager, WebsocketSignalManager, type SignalManager } from '@
 import {
   SwarmNetworkManager,
   createIceProvider,
-  createRtcTransportFactory,
+  createSimplePeerTransportFactory,
   type TransportFactory,
 } from '@dxos/network-manager';
 import { trace } from '@dxos/protocols';
@@ -29,9 +29,9 @@ import { ServiceRegistry } from './service-registry';
 import { DevicesServiceImpl } from '../devices';
 import { DevtoolsHostEvents, DevtoolsServiceImpl } from '../devtools';
 import {
+  type CollectDiagnosticsBroadcastHandler,
   createCollectDiagnosticsBroadcastHandler,
   createDiagnostics,
-  type CollectDiagnosticsBroadcastHandler,
 } from '../diagnostics';
 import { IdentityServiceImpl, type CreateIdentityOptions } from '../identity';
 import { ContactsServiceImpl } from '../identity/contacts-service';
@@ -89,7 +89,6 @@ export class ClientServicesHost {
   private _callbacks?: ClientServicesHostCallbacks;
   private _devtoolsProxy?: WebsocketRpcClient<{}, ClientServices>;
   private _edgeConnection?: EdgeConnection = undefined;
-  private _edgeHttpClient?: EdgeHttpClient = undefined;
 
   private _serviceContext!: ServiceContext;
   private readonly _runtimeParams: ServiceContextRuntimeParams;
@@ -213,13 +212,13 @@ export class ClientServicesHost {
 
     const edgeEndpoint = config?.get('runtime.services.edge.url');
     if (edgeEndpoint) {
-      this._edgeConnection = new EdgeClient(createStubEdgeIdentity(), { socketEndpoint: edgeEndpoint });
-      this._edgeHttpClient = new EdgeHttpClient(edgeEndpoint);
+      const randomKey = PublicKey.random().toHex();
+      this._edgeConnection = new EdgeClient(randomKey, randomKey, { socketEndpoint: edgeEndpoint });
     }
 
     const {
       connectionLog = true,
-      transportFactory = createRtcTransportFactory(
+      transportFactory = createSimplePeerTransportFactory(
         { iceServers: this._config?.get('runtime.services.ice') },
         this._config?.get('runtime.services.iceProviders') &&
           createIceProvider(this._config!.get('runtime.services.iceProviders')!),
@@ -279,7 +278,6 @@ export class ClientServicesHost {
       this._networkManager,
       this._signalManager,
       this._edgeConnection,
-      this._edgeHttpClient,
       this._runtimeParams,
       this._config.get('runtime.client.edgeFeatures'),
     );

package/src/packlets/services/service-registry.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { Event } from '@dxos/async';
 import { type ClientServices } from '@dxos/client-protocol';
@@ -12,6 +12,7 @@ import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols/proto';
 import { type SystemService, SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { createLinkedPorts, createProtoRpcPeer, createServiceBundle } from '@dxos/rpc';
+import { describe, test } from '@dxos/test';
 
 import { ServiceRegistry } from './service-registry';
 import { SystemServiceImpl } from '../system';

package/src/packlets/spaces/data-space-manager.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { asyncTimeout, latch } from '@dxos/async';
 import { createAdmissionCredentials } from '@dxos/credentials';
@@ -10,7 +10,7 @@ import { AuthStatus } from '@dxos/echo-pipeline';
 import { writeMessages } from '@dxos/feed-store';
 import { log } from '@dxos/log';
 import { SpaceState } from '@dxos/protocols/proto/dxos/client/services';
-import { openAndClose } from '@dxos/test-utils';
+import { describe, openAndClose, test } from '@dxos/test';
 
 import { TestBuilder, type TestPeer } from '../testing';
 

package/src/packlets/spaces/data-space-manager.ts

@@ -14,11 +14,8 @@ import {
   type DelegateInvitationCredential,
   type MemberInfo,
 } from '@dxos/credentials';
+import { convertLegacyReferences, findInlineObjectOfType, type EchoEdgeReplicator, type EchoHost } from '@dxos/echo-db';
 import {
-  convertLegacyReferences,
-  findInlineObjectOfType,
-  type EchoEdgeReplicator,
-  type EchoHost,
   AuthStatus,
   CredentialServerExtension,
   type MeshEchoReplicator,
@@ -36,7 +33,7 @@ import {
   type SpaceDoc,
 } from '@dxos/echo-protocol';
 import { TYPE_PROPERTIES, generateEchoId, getTypeReference } from '@dxos/echo-schema';
-import type { EdgeConnection, EdgeHttpClient } from '@dxos/edge-client';
+import type { EdgeConnection } from '@dxos/edge-client';
 import { writeMessages, type FeedStore } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
@@ -110,7 +107,6 @@ export type DataSpaceManagerParams = {
   echoHost: EchoHost;
   invitationsManager: InvitationsManager;
   edgeConnection?: EdgeConnection;
-  edgeHttpClient?: EdgeHttpClient;
   meshReplicator?: MeshEchoReplicator;
   echoEdgeReplicator?: EchoEdgeReplicator;
   runtimeParams?: DataSpaceManagerRuntimeParams;
@@ -139,7 +135,6 @@ export class DataSpaceManager extends Resource {
   private readonly _echoHost: EchoHost;
   private readonly _invitationsManager: InvitationsManager;
   private readonly _edgeConnection?: EdgeConnection = undefined;
-  private readonly _edgeHttpClient?: EdgeHttpClient = undefined;
   private readonly _edgeFeatures?: Runtime.Client.EdgeFeatures = undefined;
   private readonly _meshReplicator?: MeshEchoReplicator = undefined;
   private readonly _echoEdgeReplicator?: EchoEdgeReplicator = undefined;
@@ -159,7 +154,6 @@ export class DataSpaceManager extends Resource {
     this._edgeConnection = params.edgeConnection;
     this._edgeFeatures = params.edgeFeatures;
     this._echoEdgeReplicator = params.echoEdgeReplicator;
-    this._edgeHttpClient = params.edgeHttpClient;
     this._runtimeParams = params.runtimeParams;
 
     trace.diagnostic({
@@ -485,7 +479,6 @@ export class DataSpaceManager extends Resource {
       },
       cache: metadata.cache,
       edgeConnection: this._edgeConnection,
-      edgeHttpClient: this._edgeHttpClient,
       edgeFeatures: this._edgeFeatures,
     });
     dataSpace.postOpen.append(async () => {

package/src/packlets/spaces/data-space.ts

@@ -7,15 +7,10 @@ import { AUTH_TIMEOUT } from '@dxos/client-protocol';
 import { Context, ContextDisposedError, cancelWithContext } from '@dxos/context';
 import type { SpecificCredential } from '@dxos/credentials';
 import { timed, warnAfterTimeout } from '@dxos/debug';
-import {
-  type EchoHost,
-  type DatabaseRoot,
-  createMappedFeedWriter,
-  type MetadataStore,
-  type Space,
-} from '@dxos/echo-pipeline';
+import { type EchoHost, type DatabaseRoot } from '@dxos/echo-db';
+import { createMappedFeedWriter, type MetadataStore, type Space } from '@dxos/echo-pipeline';
 import { SpaceDocVersion } from '@dxos/echo-protocol';
-import type { EdgeConnection, EdgeHttpClient } from '@dxos/edge-client';
+import type { EdgeConnection } from '@dxos/edge-client';
 import { type FeedStore, type FeedWrapper } from '@dxos/feed-store';
 import { failedInvariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
@@ -80,7 +75,6 @@ export type DataSpaceParams = {
   callbacks?: DataSpaceCallbacks;
   cache?: SpaceCache;
   edgeConnection?: EdgeConnection;
-  edgeHttpClient?: EdgeHttpClient;
   edgeFeatures?: Runtime.Client.EdgeFeatures;
 };
 
@@ -102,7 +96,7 @@ export class DataSpace {
   private readonly _feedStore: FeedStore<FeedMessage>;
   private readonly _metadataStore: MetadataStore;
   private readonly _signingContext: SigningContext;
-  private readonly _notarizationPlugin: NotarizationPlugin;
+  private readonly _notarizationPlugin = new NotarizationPlugin();
   private readonly _callbacks: DataSpaceCallbacks;
   private readonly _cache?: SpaceCache = undefined;
   private readonly _echoHost: EchoHost;
@@ -142,11 +136,6 @@ export class DataSpace {
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
     this._echoHost = params.echoHost;
-    this._notarizationPlugin = new NotarizationPlugin({
-      spaceId: this._inner.id,
-      edgeClient: params.edgeHttpClient,
-      edgeFeatures: params.edgeFeatures,
-    });
 
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () =>
@@ -329,7 +318,6 @@ export class DataSpace {
     this._state = SpaceState.SPACE_INITIALIZING;
     log('new state', { state: SpaceState[this._state] });
 
-    log('initializing control pipeline');
     await this._initializeAndReadControlPipeline();
 
     // Allow other tasks to run before loading the data pipeline.
@@ -337,13 +325,10 @@ export class DataSpace {
 
     const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState.SPACE_READY);
 
-    log('initializing automerge root');
     this._automergeSpaceState.startProcessingRootDocs();
 
     // TODO(dmaretskyi): Change so `initializeDataPipeline` doesn't wait for the space to be READY, but rather any state with a valid root.
-    log('waiting for space to be ready');
     await ready;
-    log('space is ready');
   }
 
   private async _enterReadyState() {
@@ -360,7 +345,6 @@ export class DataSpace {
   private async _initializeAndReadControlPipeline() {
     await this._inner.controlPipeline.state.waitUntilReachedTargetTimeframe({
       ctx: this._ctx,
-      timeout: 10_000,
       breakOnStall: false,
     });
 
@@ -424,16 +408,8 @@ export class DataSpace {
     }
 
     if (credentials.length > 0) {
-      try {
-        log('will notarize credentials for feed admission', { count: credentials.length });
-        // Never times out
-        await this.notarizationPlugin.notarize({ ctx: this._ctx, credentials, timeout: 0 });
-
-        log('credentials notarized');
-      } catch (err) {
-        log.error('error notarizing credentials for feed admission', err);
-        throw err;
-      }
+      // Never times out
+      await this.notarizationPlugin.notarize({ ctx: this._ctx, credentials, timeout: 0 });
 
       // Set this after credentials are notarized so that on failure we will retry.
       await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey!, this.inner.dataFeedKey!);