revert: keep INostrClient/NostrClient naming and restore onEose/isLive

Reverts three naming changes from the previous refactor: - Interface stays INostrClient (not NostrClient) - Class stays NostrClient (not DefaultNostrClient) - onEose stays onEose (not onCaughtUp) - isLive stays isLive (not isRealTime) All other renames from the API simplification are preserved: subscribe, unsubscribe, publish, count, fetchAll, fetchFirst, etc. https://claude.ai/code/session_01JPcYCcRx5eZN4GvgGxGwbf
2026-08-08 23:54:39 +00:00 · 2026-03-28 16:43:30 +00:00
parent 4e2717c5c5
commit 4be617e64a
156 changed files with 464 additions and 473 deletions
@@ -54,7 +54,7 @@ class ThreadDualAxisChartAssemblerTest {
        val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())

        val client =
-            DefaultNostrClient(
+            NostrClient(
                OkHttpWebSocket.Builder {
                    OkHttpClient
                        .Builder()
@@ -67,7 +67,7 @@ class EventSyncTest {
                    inboxTargets = { setOf(vitor) },
                    dmTargets = { setOf(vitor) },
                    clientBuilder = {
-                        DefaultNostrClient(socketBuilder, appScope)
+                        NostrClient(socketBuilder, appScope)
                    },
                    scope = appScope,
                )
@@ -86,7 +86,7 @@ class EventSyncTest {
                    inboxTargets = { setOf(vitor) },
                    dmTargets = { setOf(vitor) },
                    clientBuilder = {
-                        val newClient = DefaultNostrClient(socketBuilder, appScope)
+                        val newClient = NostrClient(socketBuilder, appScope)
                        val logger = RelayLogger(newClient, debugSending = true, debugReceiving = false)

                        val signer = NostrSignerInternal(KeyPair())
@@ -68,7 +68,7 @@ import com.vitorpamplona.amethyst.ui.screen.AccountSessionManager
 import com.vitorpamplona.amethyst.ui.screen.UiSettingsState
 import com.vitorpamplona.amethyst.ui.tor.TorManager
 import com.vitorpamplona.quartz.nip01Core.core.Address
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayLogger
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayOfflineTracker
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.stats.RelayReqStats
@@ -244,7 +244,7 @@ class AppModules(
            scope = applicationIOScope,
        )

-    // Connects the NostrClient class with okHttp
+    // Connects the INostrClient class with okHttp
    val websocketBuilder =
        OkHttpWebSocket.Builder { url ->
            val useTor = torEvaluatorFlow.flow.value.useTor(url)
@@ -255,7 +255,7 @@ class AppModules(
    val cache: LocalCache = LocalCache

    // Provides a relay pool
-    val client: NostrClient = DefaultNostrClient(websocketBuilder, applicationIOScope)
+    val client: INostrClient = NostrClient(websocketBuilder, applicationIOScope)

    // Watches for changes on Tor and Relay List Settings
    val relayProxyClientConnector =
@@ -135,7 +135,7 @@ import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle
 import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider
 import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.fetchFirst
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
@@ -244,7 +244,7 @@ class Account(
    val nwcFilterAssembler: () -> NWCPaymentFilterAssembler,
    val otsResolverBuilder: () -> OtsResolver,
    val cache: LocalCache,
-    val client: NostrClient,
+    val client: INostrClient,
    val scope: CoroutineScope,
 ) : IAccount {
    private var userProfileCache: User? = null
@@ -28,7 +28,7 @@ import com.vitorpamplona.amethyst.service.location.LocationState
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.nwc.NWCPaymentFilterAssembler
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
 import com.vitorpamplona.quartz.nip03Timestamp.OtsResolver
@@ -50,7 +50,7 @@ class AccountCacheState(
    val contentResolverFn: () -> ContentResolver,
    val otsResolverBuilder: () -> OtsResolver,
    val cache: LocalCache,
-    val client: NostrClient,
+    val client: INostrClient,
 ) {
    val accounts = MutableStateFlow<Map<HexKey, Account>>(emptyMap())

@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.model.nip62Vanish
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.LocalCache.notes
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.fetchFirst
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
@@ -61,7 +61,7 @@ enum class ComplianceStatus {
 class VanishRequestsState(
    val signer: NostrSigner,
    val cache: LocalCache,
-    val client: NostrClient,
+    val client: INostrClient,
    val scope: CoroutineScope,
 ) {
    val noteFlow =
@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.broadcast

 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.listeners.RelayConnectionListener
 import com.vitorpamplona.quartz.nip01Core.relay.client.single.IRelayClient
 import com.vitorpamplona.quartz.nip01Core.relay.commands.toClient.Message
@@ -71,7 +71,7 @@ class BroadcastTracker {
    suspend fun trackBroadcast(
        event: Event,
        relays: Set<NormalizedRelayUrl>,
-        client: NostrClient,
+        client: INostrClient,
    ) {
        val trackingId = UUID.randomUUID().toString()

@@ -232,7 +232,7 @@ class BroadcastTracker {
    @OptIn(DelicateCoroutinesApi::class)
    suspend fun retry(
        broadcast: BroadcastEvent,
-        client: NostrClient,
+        client: INostrClient,
        specificRelay: NormalizedRelayUrl? = null,
    ): BroadcastEvent {
        val event = broadcast.event
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.service.relayClient
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.EventCollector
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayInsertConfirmationCollector
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
@@ -31,7 +31,7 @@ import com.vitorpamplona.quartz.nip59Giftwrap.seals.SealedRumorEvent
 import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent

 class CacheClientConnector(
-    val client: NostrClient,
+    val client: INostrClient,
    val cache: LocalCache,
 ) {
    val receiver =
@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.service.connectivity.ConnectivityStatus
 import com.vitorpamplona.amethyst.service.okhttp.DualHttpClientManagerForRelays
 import com.vitorpamplona.amethyst.ui.tor.TorManager
 import com.vitorpamplona.amethyst.ui.tor.TorServiceStatus
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.utils.Log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -48,7 +48,7 @@ class RelayProxyClientConnector(
    val okHttpClients: DualHttpClientManagerForRelays,
    val connManager: ConnectivityManager,
    val torManager: TorManager,
-    val client: NostrClient,
+    val client: INostrClient,
    val scope: CoroutineScope,
 ) {
    data class RelayServiceInfra(
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.service.relayClient.authCommand.model
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.isDebug
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.auth.RelayAuthenticator
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync
 import com.vitorpamplona.quartz.utils.Log
@@ -35,7 +35,7 @@ class ScreenAuthAccount(

@Stable
 class AuthCoordinator(
-    client: NostrClient,
+    client: INostrClient,
    scope: CoroutineScope,
 ) {
    private val authWithAccounts = ListWithUniqueSetCache<ScreenAuthAccount, Account> { it.account }
@@ -24,7 +24,7 @@ import com.vitorpamplona.amethyst.commons.relayClient.eoseManagers.BaseEoseManag
 import com.vitorpamplona.amethyst.service.relays.EOSEByKey
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.groupByRelay
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
@@ -42,7 +42,7 @@ import com.vitorpamplona.quartz.utils.TimeUtils
 * shares all EOSEs among all users.
 */
 abstract class PerUniqueIdEoseManager<T, U : Any>(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<T>,
    val invalidateAfterEose: Boolean = false,
 ) : BaseEoseManager<T>(client, allKeys) {
@@ -69,7 +69,7 @@ abstract class PerUniqueIdEoseManager<T, U : Any>(
    open fun newSub(key: T): Subscription =
        requestNewSubscription(
            object : SubscriptionListener {
-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -78,11 +78,11 @@ abstract class PerUniqueIdEoseManager<T, U : Any>(

                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
-                    if (isRealTime) {
+                    if (isLive) {
                        newEose(key, relay, TimeUtils.now(), forFilters)
                    }
                }
@@ -25,7 +25,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relays.EOSEAccountKey
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.groupByRelay
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
@@ -46,7 +46,7 @@ import com.vitorpamplona.quartz.utils.TimeUtils
 * app reuse the EOSE because it assumes the filter is going to be different
 */
 abstract class PerUserAndFollowListEoseManager<T, U : Any>(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<T>,
    val invalidateAfterEose: Boolean = false,
 ) : BaseEoseManager<T>(client, allKeys) {
@@ -70,7 +70,7 @@ abstract class PerUserAndFollowListEoseManager<T, U : Any>(
    open fun newSub(key: T): Subscription =
        requestNewSubscription(
            object : SubscriptionListener {
-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -79,11 +79,11 @@ abstract class PerUserAndFollowListEoseManager<T, U : Any>(

                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
-                    if (isRealTime) {
+                    if (isLive) {
                        newEose(key, relay, TimeUtils.now(), forFilters)
                    }
                }
@@ -25,7 +25,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relays.EOSEAccountFast
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.groupByRelay
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
@@ -44,7 +44,7 @@ import com.vitorpamplona.quartz.utils.TimeUtils
 * the subscription disappears and comes back later.
 */
 abstract class PerUserEoseManager<T>(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<T>,
    val invalidateAfterEose: Boolean = false,
 ) : BaseEoseManager<T>(client, allKeys) {
@@ -68,7 +68,7 @@ abstract class PerUserEoseManager<T>(
    open fun newSub(key: T): Subscription =
        requestNewSubscription(
            object : SubscriptionListener {
-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -77,11 +77,11 @@ abstract class PerUserEoseManager<T>(

                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
-                    if (isRealTime) {
+                    if (isLive) {
                        newEose(key, relay, TimeUtils.now(), forFilters)
                    }
                }
@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.service.relayClient.eoseManagers

 import com.vitorpamplona.amethyst.commons.relayClient.eoseManagers.BaseEoseManager
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.groupByRelay
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
@@ -35,14 +35,14 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 * filters
 */
 abstract class SingleSubNoEoseCacheEoseManager<T>(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<T>,
    val invalidateAfterEose: Boolean = false,
 ) : BaseEoseManager<T>(client, allKeys) {
    val sub =
        requestNewSubscription(
            object : SubscriptionListener {
-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -53,11 +53,11 @@ abstract class SingleSubNoEoseCacheEoseManager<T>(

                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
-                    if (isRealTime) {
+                    if (isLive) {
                        if (invalidateAfterEose) {
                            invalidateFilters()
                        }
@@ -20,11 +20,11 @@
 */
 package com.vitorpamplona.amethyst.service.relayClient.notifyCommand.model

-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayNotifier

 class NotifyCoordinator(
-    client: NostrClient,
+    client: INostrClient,
 ) {
    val requests = NotifyRequestsCache()

@@ -43,14 +43,14 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.relay.datasource.RelayFeedF
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.datasource.RelayInfoNip66FilterAssembler
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.threadview.datasources.ThreadFilterAssembler
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.datasource.VideoFilterAssembler
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayOfflineTracker
 import com.vitorpamplona.quartz.nip01Core.relay.client.auth.IAuthStatus
 import kotlinx.coroutines.CoroutineScope

 class RelaySubscriptionsCoordinator(
    cache: LocalCache,
-    client: NostrClient,
+    client: INostrClient,
    authenticator: IAuthStatus,
    failureTracker: RelayOfflineTracker,
    scope: CoroutineScope,
@@ -32,7 +32,7 @@ import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.nip01No
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.nip59GiftWraps.AccountGiftWrapsEoseManager
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountFeedContentStates
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayOfflineTracker
 import com.vitorpamplona.quartz.nip01Core.relay.client.auth.IAuthStatus
 import kotlinx.coroutines.CoroutineScope
@@ -50,7 +50,7 @@ class AccountQueryState(
 */
@Stable
 class AccountFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
    cache: LocalCache,
    authenticator: IAuthStatus,
    failureTracker: RelayOfflineTracker,
@@ -24,7 +24,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.AccountQueryState
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import kotlinx.coroutines.Dispatchers
@@ -34,7 +34,7 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch

 class AccountDraftsEoseManager(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<AccountQueryState>,
 ) : PerUserEoseManager<AccountQueryState>(client, allKeys) {
    override fun user(key: AccountQueryState) = key.account.userProfile()
@@ -30,7 +30,7 @@ import com.vitorpamplona.amethyst.service.BundledUpdate
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.AccountQueryState
 import com.vitorpamplona.amethyst.service.relays.EOSEAccountFast
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayOfflineTracker
 import com.vitorpamplona.quartz.nip01Core.relay.client.auth.IAuthStatus
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
@@ -56,7 +56,7 @@ import kotlinx.coroutines.launch
 * It needs to be super fast on startup.
 */
 class AccountFollowsLoaderSubAssembler(
-    val client: NostrClient,
+    val client: INostrClient,
    val cache: LocalCache,
    val scope: CoroutineScope,
    val authStatus: IAuthStatus,
@@ -108,7 +108,7 @@ class AccountFollowsLoaderSubAssembler(
        orchestrator.requestNewSubscription(
            if (isDebug) logTag + newSubId() else newSubId(),
            object : SubscriptionListener {
-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -117,11 +117,11 @@ class AccountFollowsLoaderSubAssembler(

                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
-                    if (isRealTime) {
+                    if (isLive) {
                        newEose(TimeUtils.now(), relay, forFilters)
                    }
                }
@@ -24,7 +24,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.AccountQueryState
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import com.vitorpamplona.quartz.utils.TimeUtils
@@ -35,7 +35,7 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch

 class AccountMetadataEoseManager(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<AccountQueryState>,
 ) : PerUserEoseManager<AccountQueryState>(client, allKeys) {
    override fun user(key: AccountQueryState) = key.account.userProfile()
@@ -24,7 +24,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.AccountQueryState
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import com.vitorpamplona.quartz.utils.TimeUtils
@@ -36,7 +36,7 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

 class AccountNotificationsEoseFromInboxRelaysManager(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<AccountQueryState>,
 ) : PerUserEoseManager<AccountQueryState>(client, allKeys) {
    override fun user(key: AccountQueryState) = key.account.userProfile()
@@ -24,7 +24,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.AccountQueryState
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import com.vitorpamplona.quartz.utils.TimeUtils
@@ -37,7 +37,7 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

 class AccountNotificationsEoseFromRandomRelaysManager(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<AccountQueryState>,
 ) : PerUserEoseManager<AccountQueryState>(client, allKeys) {
    override fun user(key: AccountQueryState) = key.account.userProfile()
@@ -24,7 +24,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.AccountQueryState
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import kotlinx.coroutines.Dispatchers
@@ -34,7 +34,7 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch

 class AccountGiftWrapsEoseManager(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<AccountQueryState>,
 ) : PerUserEoseManager<AccountQueryState>(client, allKeys) {
    override fun user(key: AccountQueryState) = key.account.userProfile()
@@ -25,7 +25,7 @@ import com.vitorpamplona.amethyst.commons.model.Channel
 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.mixChatsLive.ChannelMetadataAndLiveActivityWatcherSubAssembler
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.nip28PublicChats.ChannelLoaderSubAssembler
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 // This allows multiple screen to be listening to tags, even the same tag
@Stable
@@ -35,7 +35,7 @@ class ChannelFinderQueryState(

@Stable
 class ChannelFinderFilterAssemblyGroup(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<ChannelFinderQueryState>() {
    val group =
        listOf(
@@ -27,7 +27,7 @@ import com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.Channel
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.nip28PublicChats.filterChannelMetadataUpdatesById
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.nip53LiveActivities.filterLiveStreamUpdatesByAddress
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.utils.mapOfSet

@@ -39,7 +39,7 @@ import com.vitorpamplona.quartz.utils.mapOfSet
 * only one EOSE for everybody.
 */
 class ChannelMetadataAndLiveActivityWatcherSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChannelFinderQueryState>,
 ) : SingleSubEoseManager<ChannelFinderQueryState>(client, allKeys) {
    override fun updateFilter(
@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.nip28P

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.SingleSubNoEoseCacheEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.ChannelFinderQueryState
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 /**
@@ -35,7 +35,7 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 * This is one filter for everybody.
 */
 class ChannelLoaderSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChannelFinderQueryState>,
 ) : SingleSubNoEoseCacheEoseManager<ChannelFinderQueryState>(client, allKeys, invalidateAfterEose = true) {
    override fun updateFilter(keys: List<ChannelFinderQueryState>): List<RelayBasedFilter> = filterMissingChannelsById(keys)
@@ -25,11 +25,11 @@ import com.vitorpamplona.amethyst.commons.model.nip28PublicChats.PublicChatChann
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.ChannelFinderQueryState
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class ChannelMetadataWatcherSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChannelFinderQueryState>,
 ) : PerUniqueIdEoseManager<ChannelFinderQueryState, Channel>(client, allKeys) {
    override fun updateFilter(
@@ -25,7 +25,7 @@ import com.vitorpamplona.amethyst.commons.model.nip53LiveActivities.LiveActiviti
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.ChannelFinderQueryState
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 /**
@@ -33,7 +33,7 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 * since they are replaceable.
 */
 class LiveActivityWatcherSubAssembly(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChannelFinderQueryState>,
 ) : PerUniqueIdEoseManager<ChannelFinderQueryState, Channel>(client, allKeys) {
    override fun updateFilter(
@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.loaders.NoteEventLoaderSubAssembler
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.watchers.EventWatcherSubAssembler
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 // This allows multiple screen to be listening to tags, even the same tag
@Stable
@@ -37,7 +37,7 @@ class EventFinderQueryState(

@Stable
 class EventFinderFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<EventFinderQueryState>() {
    val group =
        listOf(
@@ -22,10 +22,10 @@ package com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.loaders

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.SingleSubNoEoseCacheEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.EventFinderQueryState
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 class NoteEventLoaderSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<EventFinderQueryState>,
 ) : SingleSubNoEoseCacheEoseManager<EventFinderQueryState>(client, allKeys, invalidateAfterEose = true) {
    override fun updateFilter(keys: List<EventFinderQueryState>) =
@@ -27,13 +27,13 @@ import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.EventFind
 import com.vitorpamplona.amethyst.service.relays.EOSEAccountFast
 import com.vitorpamplona.amethyst.service.relays.MutableTime
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl

 class EventWatcherSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<EventFinderQueryState>,
 ) : SingleSubEoseManager<EventFinderQueryState>(client, allKeys) {
    var lastNotesOnFilter = emptyList<Note>()
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.service.relayClient.reqCommand.nwc
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl

 // This allows multiple screen to be listening to tags, even the same tag
@@ -37,7 +37,7 @@ class NWCPaymentQueryState(

@Stable
 class NWCPaymentFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<NWCPaymentQueryState>() {
    val group =
        listOf(
@@ -21,11 +21,11 @@
 package com.vitorpamplona.amethyst.service.relayClient.reqCommand.nwc

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.SingleSubNoEoseCacheEoseManager
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class NWCPaymentWatcherSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<NWCPaymentQueryState>,
 ) : SingleSubNoEoseCacheEoseManager<NWCPaymentQueryState>(client, allKeys) {
    override fun updateFilter(keys: List<NWCPaymentQueryState>): List<RelayBasedFilter>? {
@@ -29,7 +29,7 @@ import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.loaders.Us
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.watchers.UserCardsSubAssembler
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.watchers.UserReportsSubAssembler
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.watchers.UserWatcherSubAssembler
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayOfflineTracker

 // This allows multiple screen to be listening to tags, even the same tag
@@ -41,7 +41,7 @@ class UserFinderQueryState(

@Stable
 class UserFinderFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
    cache: LocalCache,
    failureTracker: RelayOfflineTracker,
 ) : ComposeSubscriptionManager<UserFinderQueryState>() {
@@ -27,7 +27,7 @@ import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.follows
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.UserFinderQueryState
 import com.vitorpamplona.amethyst.service.relays.EOSEAccountFast
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayOfflineTracker
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.groupByRelay
@@ -38,7 +38,7 @@ import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.utils.TimeUtils

 class UserOutboxFinderSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    val cache: LocalCache,
    val failureTracker: RelayOfflineTracker,
    allKeys: () -> Set<UserFinderQueryState>,
@@ -69,7 +69,7 @@ class UserOutboxFinderSubAssembler(
    val sub =
        requestNewSubscription(
            object : SubscriptionListener {
-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -28,14 +28,14 @@ import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.UserFinder
 import com.vitorpamplona.amethyst.service.relays.MutableTime
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.utils.mapOfSet

 class UserCardsSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    val cache: LocalCache,
    allKeys: () -> Set<UserFinderQueryState>,
 ) : SingleSubEoseManager<UserFinderQueryState>(client, allKeys) {
@@ -27,14 +27,14 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.UserFinderQueryState
 import com.vitorpamplona.amethyst.service.relays.MutableTime
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.utils.mapOfSet

 class UserReportsSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    val cache: LocalCache,
    allKeys: () -> Set<UserFinderQueryState>,
 ) : SingleSubEoseManager<UserFinderQueryState>(client, allKeys) {
@@ -27,7 +27,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.UserFinderQueryState
 import com.vitorpamplona.amethyst.service.relays.EOSEAccountFast
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.groupByRelay
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
@@ -35,7 +35,7 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.utils.TimeUtils

 class UserWatcherSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    val cache: LocalCache,
    allKeys: () -> Set<UserFinderQueryState>,
 ) : BaseEoseManager<UserFinderQueryState>(client, allKeys) {
@@ -62,7 +62,7 @@ class UserWatcherSubAssembler(
    val sub =
        requestNewSubscription(
            object : SubscriptionListener {
-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -71,11 +71,11 @@ class UserWatcherSubAssembler(

                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
-                    if (isRealTime) {
+                    if (isLive) {
                        newEose(relay, TimeUtils.now(), forFilters)
                    }
                }
@@ -27,7 +27,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.relayClient.searchCommand.subassemblies.SearchPostWatcherSubAssembler
 import com.vitorpamplona.amethyst.service.relayClient.searchCommand.subassemblies.SearchUserWatcherSubAssembler
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -42,7 +42,7 @@ class SearchQueryState(

@Stable
 class SearchFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
    scope: CoroutineScope,
    val cache: LocalCache,
 ) : MutableComposeSubscriptionManager<SearchQueryState>(scope) {
@@ -25,7 +25,7 @@ import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEo
 import com.vitorpamplona.amethyst.service.relayClient.searchCommand.SearchQueryState
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip19Bech32.Nip19Parser
 import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
@@ -44,7 +44,7 @@ import com.vitorpamplona.quartz.utils.Hex
 */
 class SearchPostWatcherSubAssembler(
    val cache: LocalCache,
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<SearchQueryState>,
 ) : PerUniqueIdEoseManager<SearchQueryState, Int>(client, allKeys) {
    override fun updateFilter(
@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEo
 import com.vitorpamplona.amethyst.service.relayClient.searchCommand.SearchQueryState
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip19Bech32.Nip19Parser
 import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
@@ -45,7 +45,7 @@ import com.vitorpamplona.quartz.utils.Hex
 */
 class SearchUserWatcherSubAssembler(
    val cache: LocalCache,
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<SearchQueryState>,
 ) : PerUniqueIdEoseManager<SearchQueryState, Int>(client, allKeys) {
    override fun updateFilter(
@@ -20,7 +20,7 @@
 */
 package com.vitorpamplona.amethyst.service.relayClient.speedLogger

-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.listeners.RelayConnectionListener
 import com.vitorpamplona.quartz.nip01Core.relay.client.single.IRelayClient
 import com.vitorpamplona.quartz.nip01Core.relay.commands.toClient.EventMessage
@@ -29,10 +29,10 @@ import com.vitorpamplona.quartz.utils.Log
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory

 /**
- * Listens to NostrClient's onNotify messages from the relay
+ * Listens to INostrClient's onNotify messages from the relay
 */
 class RelaySpeedLogger(
-    val client: NostrClient,
+    val client: INostrClient,
 ) {
    companion object {
        val TAG: String = RelaySpeedLogger::class.java.simpleName
@@ -38,7 +38,7 @@ import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
 import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync
 import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
 import com.vitorpamplona.quartz.nip02FollowList.tags.ContactTag
@@ -94,7 +94,7 @@ sealed class AccountState {
 class AccountSessionManager(
    val accountsCache: AccountCacheState,
    val nip05ClientBuilder: () -> Nip05Client,
-    val clientBuilder: () -> NostrClient,
+    val clientBuilder: () -> INostrClient,
    val localPreferences: LocalPreferences,
    val scope: CoroutineScope,
 ) {
@@ -219,7 +219,7 @@ class AccountViewModel(
                val customScope = CoroutineScope(viewModelScope.coroutineContext + SupervisorJob())

                // Provides a relay pool
-                val newClient = DefaultNostrClient(Amethyst.instance.websocketBuilder, customScope)
+                val newClient = NostrClient(Amethyst.instance.websocketBuilder, customScope)

                // Authenticates with relays.
                val auth =
@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.privateDM.datasource

 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKey

 // This allows multiple screen to be listening to tags, even the same tag
@@ -34,7 +34,7 @@ class ChatroomQueryState(
 }

 class ChatroomFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<ChatroomQueryState>() {
    val group =
        listOf(
@@ -22,11 +22,11 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.privateDM.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserAndFollowListEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class ChatroomFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChatroomQueryState>,
 ) : PerUserAndFollowListEoseManager<ChatroomQueryState, String>(client, allKeys) {
    override fun updateFilter(
@@ -25,7 +25,7 @@ import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.publicChannels.datasource.subassemblies.ChannelFromUserFilterSubAssembler
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.publicChannels.datasource.subassemblies.ChannelPublicFilterSubAssembler
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 // This allows multiple screen to be listening to tags, even the same tag
 class ChannelQueryState(
@@ -34,7 +34,7 @@ class ChannelQueryState(
 )

 class ChannelFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<ChannelQueryState>() {
    val group =
        listOf(
@@ -27,11 +27,11 @@ import com.vitorpamplona.amethyst.commons.model.nip53LiveActivities.LiveActiviti
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserAndFollowListEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.publicChannels.datasource.ChannelQueryState
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class ChannelFromUserFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChannelQueryState>,
 ) : PerUserAndFollowListEoseManager<ChannelQueryState, Channel>(client, allKeys) {
    override fun updateFilter(
@@ -27,11 +27,11 @@ import com.vitorpamplona.amethyst.commons.model.nip53LiveActivities.LiveActiviti
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.publicChannels.datasource.ChannelQueryState
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class ChannelPublicFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChannelQueryState>,
 ) : PerUniqueIdEoseManager<ChannelQueryState, Channel>(client, allKeys) {
    override fun updateFilter(
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.rooms.datasource
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 // This allows multiple screen to be listening to tags, even the same tag
@Stable
@@ -33,7 +33,7 @@ class ChatroomListState(

@Stable
 class ChatroomListFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<ChatroomListState>() {
    val group =
        listOf(
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.rooms.datasource
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import kotlinx.coroutines.Dispatchers
@@ -33,7 +33,7 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch

 class DMsFromUserFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChatroomListState>,
 ) : PerUserEoseManager<ChatroomListState>(client, allKeys) {
    override fun updateFilter(
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.rooms.datasource
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import kotlinx.coroutines.Dispatchers
@@ -34,7 +34,7 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

 class FollowingEphemeralChatSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChatroomListState>,
 ) : PerUserEoseManager<ChatroomListState>(client, allKeys) {
    override fun updateFilter(
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.rooms.datasource
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import kotlinx.coroutines.Dispatchers
@@ -34,7 +34,7 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

 class FollowingPublicChatSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChatroomListState>,
 ) : PerUserEoseManager<ChatroomListState>(client, allKeys) {
    override fun updateFilter(
@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.chess.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl

@@ -42,7 +42,7 @@ data class ChessQueryState(
 * Sub-assembler that creates the actual relay filters
 */
 class ChessFeedFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ChessQueryState>,
 ) : PerUniqueIdEoseManager<ChessQueryState, String>(client, allKeys) {
    override fun updateFilter(
@@ -21,13 +21,13 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.chess.datasource

 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 /**
 * Filter assembler for chess events
 */
 class ChessFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<ChessQueryState>() {
    val group =
        listOf(
@@ -23,13 +23,13 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.communities.datasource
 import com.vitorpamplona.amethyst.commons.relayClient.eoseManagers.SingleSubEoseManager
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent
 import com.vitorpamplona.quartz.utils.mapOfSet

 class CommunityFeedFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<CommunityQueryState>,
 ) : SingleSubEoseManager<CommunityQueryState>(client, allKeys) {
    override fun updateFilter(
@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.communities.datasource

 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
 import com.vitorpamplona.amethyst.model.AddressableNote
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 // This allows multiple screen to be listening to tags, even the same tag
 class CommunityQueryState(
@@ -30,7 +30,7 @@ class CommunityQueryState(
 )

 class CommunityFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<CommunityQueryState>() {
    val group =
        listOf(
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.datasource
 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountFeedContentStates
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import kotlinx.coroutines.CoroutineScope

 // This allows multiple screen to be listening to tags, even the same tag
@@ -34,7 +34,7 @@ class DiscoveryQueryState(
 )

 class DiscoveryFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<DiscoveryQueryState>() {
    val group =
        listOf(
@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserAndFol
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip51FollowSets.makeFollowSetsFilter
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip53LiveActivities.makeLiveActivitiesFilter
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import kotlinx.coroutines.Dispatchers
@@ -38,7 +38,7 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

 class DiscoveryFollowsSetsAndLiveStreamsSubAssembler2(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<DiscoveryQueryState>,
 ) : PerUserAndFollowListEoseManager<DiscoveryQueryState, TopFilter>(client, allKeys) {
    override fun updateFilter(
@@ -27,7 +27,7 @@ import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip23LongForm.makeLongFormFilter
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip90DVMs.makeContentDVMsFilter
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip99Classifieds.makeClassifiedsFilter
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import kotlinx.coroutines.Dispatchers
@@ -39,7 +39,7 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

 class DiscoveryLongFormClassifiedsAndDVMSubAssembler1(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<DiscoveryQueryState>,
 ) : PerUserAndFollowListEoseManager<DiscoveryQueryState, TopFilter>(client, allKeys) {
    override fun updateFilter(
@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserAndFol
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip28Chats.makePublicChatsFilter
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip72Communities.makeCommunitiesFilter
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import kotlinx.coroutines.Dispatchers
@@ -38,7 +38,7 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

 class DiscoveryPublicChatsAndCommunitiesSubAssembler3(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<DiscoveryQueryState>,
 ) : PerUserAndFollowListEoseManager<DiscoveryQueryState, TopFilter>(client, allKeys) {
    override fun updateFilter(
@@ -24,7 +24,7 @@ import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AddressableNote
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 // This allows multiple screen to be listening to tags, even the same tag
 class FollowPackFeedQueryState(
@@ -34,7 +34,7 @@ class FollowPackFeedQueryState(

@Stable
 class FollowPackFeedFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<FollowPackFeedQueryState>() {
    val group =
        listOf(
@@ -25,12 +25,12 @@ import com.vitorpamplona.amethyst.model.topNavFeeds.allUserFollows.AllUserFollow
 import com.vitorpamplona.amethyst.model.topNavFeeds.allUserFollows.AllUserFollowsByProxyTopNavFilter
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip65Follows.filterHomePostsByAuthors
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip51Lists.followList.FollowListEvent

 class FollowPackFeedFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<FollowPackFeedQueryState>,
 ) : SingleSubEoseManager<FollowPackFeedQueryState>(client, allKeys) {
    override fun updateFilter(
@@ -22,11 +22,11 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.geohash.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class GeoHashFeedFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<GeohashQueryState>,
 ) : PerUniqueIdEoseManager<GeohashQueryState, String>(client, allKeys) {
    override fun updateFilter(
@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.geohash.datasource

 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl

 // This allows multiple screen to be listening to tags, even the same tag
@@ -38,7 +38,7 @@ class GeohashQueryState(
 */
@Stable
 class GeoHashFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<GeohashQueryState>() {
    val group =
        listOf(
@@ -22,11 +22,11 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.hashtag.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class HashtagFeedFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<HashtagQueryState>,
 ) : PerUniqueIdEoseManager<HashtagQueryState, String>(client, allKeys) {
    override fun updateFilter(
@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.hashtag.datasource

 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl

 // This allows multiple screen to be listening to tags, even the same tag
@@ -33,7 +33,7 @@ class HashtagQueryState(
 }

 class HashtagFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<HashtagQueryState>() {
    val group =
        listOf(
@@ -25,7 +25,7 @@ import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountFeedContentStates
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip65Follows.HomeOutboxEventsEoseManager
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import kotlinx.coroutines.CoroutineScope

 // This allows multiple screen to be listening to tags, even the same tag
@@ -39,7 +39,7 @@ class HomeQueryState(

@Stable
 class HomeFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<HomeQueryState>() {
    val group =
        listOf(
@@ -40,7 +40,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip01Core.f
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip64Chess.filterHomePostsByChess
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip72Communities.filterHomePostsByAllCommunities
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip72Communities.filterHomePostsByCommunity
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import kotlinx.coroutines.Dispatchers
@@ -51,7 +51,7 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

 class HomeOutboxEventsEoseManager(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<HomeQueryState>,
 ) : PerUserAndFollowListEoseManager<HomeQueryState, TopFilter>(client, allKeys) {
    override fun updateFilter(
@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.datasource

 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 // This allows multiple screen to be listening to tags, even the same tag
 class UserProfileQueryState(
@@ -30,7 +30,7 @@ class UserProfileQueryState(
 )

 class UserProfileFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<UserProfileQueryState>() {
    val group =
        listOf(
@@ -22,11 +22,11 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class UserProfileFollowersFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<UserProfileQueryState>,
 ) : PerUserEoseManager<UserProfileQueryState>(client, allKeys) {
    override fun updateFilter(
@@ -22,11 +22,11 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class UserProfileMediaFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<UserProfileQueryState>,
 ) : PerUserEoseManager<UserProfileQueryState>(client, allKeys) {
    override fun updateFilter(
@@ -23,12 +23,12 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.datasource
 import com.vitorpamplona.amethyst.commons.relayClient.eoseManagers.SingleSubEoseManager
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.utils.mapOfSet

 class UserProfileMetadataFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<UserProfileQueryState>,
 ) : SingleSubEoseManager<UserProfileQueryState>(client, allKeys) {
    override fun updateFilter(
@@ -22,11 +22,11 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class UserProfilePostsFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<UserProfileQueryState>,
 ) : PerUserEoseManager<UserProfileQueryState>(client, allKeys) {
    override fun updateFilter(
@@ -22,11 +22,11 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class UserProfileZapsFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<UserProfileQueryState>,
 ) : PerUserEoseManager<UserProfileQueryState>(client, allKeys) {
    override fun updateFilter(
@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.relay.datasource

 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl

 // This allows multiple screens to be listening to the same or different relay feeds.
@@ -30,7 +30,7 @@ class RelayFeedQueryState(
 )

 class RelayFeedFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<RelayFeedQueryState>() {
    val group =
        listOf(
@@ -22,11 +22,11 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.relay.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 class RelayFeedFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<RelayFeedQueryState>,
 ) : PerUniqueIdEoseManager<RelayFeedQueryState, String>(client, allKeys) {
    override fun updateFilter(
@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.datasource

 import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers.ComposeSubscriptionManager
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl

 class RelayInfoNip66QueryState(
@@ -30,7 +30,7 @@ class RelayInfoNip66QueryState(
 )

 class RelayInfoNip66FilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<RelayInfoNip66QueryState>() {
    val group =
        listOf(
@@ -22,13 +22,13 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.datasource

 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEoseManager
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip66RelayMonitor.discovery.RelayDiscoveryEvent

 class RelayInfoNip66FilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<RelayInfoNip66QueryState>,
 ) : PerUniqueIdEoseManager<RelayInfoNip66QueryState, String>(client, allKeys) {
    override fun updateFilter(
@@ -27,7 +27,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.eventsync.EventSync.
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.eventsync.EventSync.LiveSyncActivity.SourceRelayInfo
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.fetchAllPages
 import com.vitorpamplona.quartz.nip01Core.relay.client.listeners.RelayConnectionListener
 import com.vitorpamplona.quartz.nip01Core.relay.client.single.IRelayClient
@@ -80,7 +80,7 @@ class EventSync(
    private val outboxTargets: () -> Set<NormalizedRelayUrl>,
    private val inboxTargets: () -> Set<NormalizedRelayUrl>,
    private val dmTargets: () -> Set<NormalizedRelayUrl>,
-    private val clientBuilder: () -> NostrClient,
+    private val clientBuilder: () -> INostrClient,
    private val scope: CoroutineScope,
 ) {
    companion object {
@@ -622,7 +622,7 @@ class EventSync(
     *
     * [onEvent] receives the event and the URL of the relay it came from.
     */
-    private suspend fun NostrClient.downloadFromPool(
+    private suspend fun INostrClient.downloadFromPool(
        relays: List<NormalizedRelayUrl>,
        filters: Map<NormalizedRelayUrl, List<Filter>>,
        onNewPage: (Long, NormalizedRelayUrl) -> Unit,
@@ -661,7 +661,7 @@ class EventSync(
     *
     * @return total number of events received across all pages.
     */
-    private suspend fun NostrClient.downloadFromRelay(
+    private suspend fun INostrClient.downloadFromRelay(
        relay: NormalizedRelayUrl,
        filters: List<Filter>,
        onNewPage: (Long) -> Unit,
@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.threadview.datasources.subassembies.ThreadEventLoaderSubAssembler
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.threadview.datasources.subassembies.ThreadFilterSubAssembler
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient

 // This allows multiple screen to be listening to tags, even the same tag
@Stable
@@ -37,7 +37,7 @@ class ThreadQueryState(

@Stable
 class ThreadFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<ThreadQueryState>() {
    val group =
        listOf(
@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEo
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.threadview.datasources.ThreadQueryState
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 /**
@@ -39,7 +39,7 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 * saves the of the thread EOSEs in the long run to avoid re-downloading
 */
 class ThreadEventLoaderSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ThreadQueryState>,
 ) : PerUniqueIdEoseManager<ThreadQueryState, HexKey>(client, allKeys, invalidateAfterEose = true) {
    override fun updateFilter(
@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEo
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.threadview.datasources.ThreadQueryState
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter

 /**
@@ -36,7 +36,7 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 * saves the of the thread EOSEs in the long run to avoid re-downloading
 */
 class ThreadFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ThreadQueryState>,
 ) : PerUniqueIdEoseManager<ThreadQueryState, HexKey>(client, allKeys) {
    override fun updateFilter(
@@ -24,7 +24,7 @@ import com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountFeedContentStates
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.datasource.subassemblies.VideoOutboxEventsFilterSubAssembler
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import kotlinx.coroutines.CoroutineScope

 // This allows multiple screen to be listening to tags, even the same tag
@@ -35,7 +35,7 @@ class VideoQueryState(
 )

 class VideoFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
 ) : ComposeSubscriptionManager<VideoQueryState>() {
    val group =
        listOf(
@@ -40,7 +40,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.datasource.subassembl
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.datasource.subassemblies.nip65Follows.filterPictureAndVideoByFollows
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.datasource.subassemblies.nip72Communities.filterPictureAndVideoByAllCommunities
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.datasource.subassemblies.nip72Communities.filterPictureAndVideoByCommunity
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
 import com.vitorpamplona.quartz.utils.TimeUtils
@@ -52,7 +52,7 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch

 class VideoOutboxEventsFilterSubAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<VideoQueryState>,
 ) : PerUserAndFollowListEoseManager<VideoQueryState, TopFilter>(client, allKeys) {
    override fun updateFilter(
@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.commons.chess

 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
 import com.vitorpamplona.quartz.nip01Core.relay.client.single.newSubId
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
@@ -49,7 +49,7 @@ enum class RelayFetchStatus {
 /**
 * One-shot relay fetch helper for chess events.
 *
- * Follows the existing NostrClient + SubscriptionListener + Channel pattern
+ * Follows the existing INostrClient + SubscriptionListener + Channel pattern
 * from quartz (see NostrClientSingleDownloadExt.kt).
 *
 * Each fetch opens a subscription, collects events until EOSE from all relays,
@@ -57,12 +57,12 @@ enum class RelayFetchStatus {
 * no state is cached between fetches.
 */
 class ChessRelayFetchHelper(
-    private val client: NostrClient,
+    private val client: INostrClient,
 ) {
    /**
     * Fetch events matching filters from relays, waiting for EOSE.
     *
-     * @param filters Map of relay → filter list (same format as NostrClient.subscribe)
+     * @param filters Map of relay → filter list (same format as INostrClient.subscribe)
     * @param timeoutMs Max time to wait for relays to respond (default from ChessConfig)
     * @param onProgress Optional callback for progress updates per relay
     * @return Deduplicated list of events received before timeout/EOSE
@@ -91,7 +91,7 @@ class ChessRelayFetchHelper(
            object : SubscriptionListener {
                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -100,7 +100,7 @@ class ChessRelayFetchHelper(
                    onProgress?.invoke(RelayFetchProgress(relay, RelayFetchStatus.RECEIVING, count))
                }

-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -20,7 +20,7 @@
 */
 package com.vitorpamplona.amethyst.commons.domain.nip46

-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
 import com.vitorpamplona.quartz.nip46RemoteSigner.signer.NostrSignerRemote
 import kotlinx.coroutines.flow.first
@@ -32,7 +32,7 @@ object BunkerLoginUseCase {
    suspend fun execute(
        bunkerUri: String,
        ephemeralSigner: NostrSignerInternal,
-        client: NostrClient,
+        client: INostrClient,
    ): BunkerLoginResult {
        val remoteSigner = NostrSignerRemote.fromBunkerUri(bunkerUri, ephemeralSigner, client)
        remoteSigner.openSubscription()
@@ -24,7 +24,7 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
 import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.StaticSubscription
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
@@ -83,7 +83,7 @@ object NostrConnectLoginUseCase {

    suspend fun awaitAndLogin(
        uriData: NostrConnectUri,
-        client: NostrClient,
+        client: INostrClient,
    ): BunkerLoginResult {
        val connectData =
            waitForConnectRequest(
@@ -117,7 +117,7 @@ object NostrConnectLoginUseCase {
        ephemeralPubKey: HexKey,
        relays: Set<NormalizedRelayUrl>,
        expectedSecret: String,
-        client: NostrClient,
+        client: INostrClient,
    ): ConnectRequestData {
        val deferred = CompletableDeferred<NostrConnectEvent>()

@@ -201,7 +201,7 @@ object NostrConnectLoginUseCase {
        ephemeralSigner: NostrSignerInternal,
        connectData: ConnectRequestData,
        relays: Set<NormalizedRelayUrl>,
-        client: NostrClient,
+        client: INostrClient,
    ) {
        val ackResponse = BunkerResponseAck(id = connectData.requestId!!)
        val ackEvent =
@@ -27,7 +27,7 @@ import com.vitorpamplona.amethyst.commons.relayClient.subscriptions.Subscription
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
 import com.vitorpamplona.quartz.nip01Core.relay.client.single.newSubId
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
@@ -55,7 +55,7 @@ import kotlinx.coroutines.CoroutineScope
 * ```
 */
 class FeedMetadataCoordinator(
-    private val client: NostrClient,
+    private val client: INostrClient,
    private val scope: CoroutineScope,
    private val indexRelays: Set<NormalizedRelayUrl>,
    private val preloader: MetadataPreloader? = null,
@@ -82,7 +82,7 @@ class FeedMetadataCoordinator(
                    object : SubscriptionListener {
                        override fun onEvent(
                            event: Event,
-                            isRealTime: Boolean,
+                            isLive: Boolean,
                            relay: NormalizedRelayUrl,
                            forFilters: List<Filter>?,
                        ) {
@@ -24,7 +24,7 @@ import com.vitorpamplona.amethyst.commons.relayClient.eoseManagers.SingleSubEose
 import com.vitorpamplona.amethyst.commons.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
@@ -48,7 +48,7 @@ data class MetadataQueryState(
 * - Caches EOSE to avoid re-fetching known metadata
 */
 class MetadataFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<MetadataQueryState>,
 ) : SingleSubEoseManager<MetadataQueryState>(client, allKeys, invalidateAfterEose = true) {
    override fun distinct(key: MetadataQueryState): Any = key.pubkeys.hashCode()
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.commons.relayClient.assemblers
 import com.vitorpamplona.amethyst.commons.relayClient.eoseManagers.SingleSubEoseManager
 import com.vitorpamplona.amethyst.commons.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
@@ -48,7 +48,7 @@ data class ReactionsQueryState(
 * - Caches EOSE to avoid re-fetching known reactions
 */
 class ReactionsFilterAssembler(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<ReactionsQueryState>,
 ) : SingleSubEoseManager<ReactionsQueryState>(client, allKeys, invalidateAfterEose = true) {
    override fun distinct(key: ReactionsQueryState): Any = key.noteIds.hashCode()
@@ -21,14 +21,14 @@
 package com.vitorpamplona.amethyst.commons.relayClient.eoseManagers

 import com.vitorpamplona.amethyst.commons.service.BundledUpdate
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
 import com.vitorpamplona.quartz.nip01Core.relay.client.single.newSubId
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.SubscriptionController
 import kotlinx.coroutines.Dispatchers

 abstract class BaseEoseManager<T>(
-    val client: NostrClient,
+    val client: INostrClient,
    val allKeys: () -> Set<T>,
    val sampleTime: Long = 500,
 ) : IEoseManager {
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.commons.relayClient.eoseManagers
 import com.vitorpamplona.amethyst.commons.relays.EOSECache
 import com.vitorpamplona.amethyst.commons.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.groupByRelay
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
@@ -46,7 +46,7 @@ import com.vitorpamplona.quartz.utils.TimeUtils
 * shared among multiple query states that map to the same key.
 */
 abstract class PerKeyEoseManager<T, K : Any>(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<T>,
    val invalidateAfterEose: Boolean = false,
    cacheSize: Int = 200,
@@ -83,7 +83,7 @@ abstract class PerKeyEoseManager<T, K : Any>(
    open fun newSub(queryState: T): Subscription =
        requestNewSubscription(
            object : SubscriptionListener {
-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -92,11 +92,11 @@ abstract class PerKeyEoseManager<T, K : Any>(

                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
-                    if (isRealTime) {
+                    if (isLive) {
                        newEose(queryState, relay, TimeUtils.now(), forFilters)
                    }
                }
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.commons.relayClient.eoseManagers
 import com.vitorpamplona.amethyst.commons.relays.EOSERelayList
 import com.vitorpamplona.amethyst.commons.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.groupByRelay
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
@@ -44,7 +44,7 @@ import com.vitorpamplona.quartz.utils.TimeUtils
 * shares all EOSEs among all users.
 */
 abstract class SingleSubEoseManager<T>(
-    client: NostrClient,
+    client: INostrClient,
    allKeys: () -> Set<T>,
    val invalidateAfterEose: Boolean = false,
 ) : BaseEoseManager<T>(client, allKeys) {
@@ -67,7 +67,7 @@ abstract class SingleSubEoseManager<T>(
    val sub =
        requestNewSubscription(
            object : SubscriptionListener {
-                override fun onCaughtUp(
+                override fun onEose(
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -76,11 +76,11 @@ abstract class SingleSubEoseManager<T>(

                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
-                    if (isRealTime) {
+                    if (isLive) {
                        newEose(relay, TimeUtils.now(), forFilters)
                    }
                }
@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.commons.chess

 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.publishAndConfirm
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
 import com.vitorpamplona.quartz.nip01Core.relay.client.single.newSubId
@@ -46,7 +46,7 @@ data class BroadcastResult(
 * ensuring the event was actually received and accepted.
 */
 class ChessEventBroadcaster(
-    private val client: NostrClient,
+    private val client: INostrClient,
 ) {
    /**
     * Broadcast an event to the chess relays with confirmation.
@@ -87,12 +87,12 @@ class ChessEventBroadcaster(
                object : SubscriptionListener {
                    override fun onEvent(
                        event: Event,
-                        isRealTime: Boolean,
+                        isLive: Boolean,
                        relay: NormalizedRelayUrl,
                        forFilters: List<Filter>?,
                    ) { }

-                    override fun onCaughtUp(
+                    override fun onEose(
                        relay: NormalizedRelayUrl,
                        forFilters: List<Filter>?,
                    ) { }
@@ -131,11 +131,11 @@ class AccountManager internal constructor(
    // --- Dedicated NIP-46 client (isolated from general relay pool) ---

    private val nip46ClientMutex = Mutex()
-    private var nip46Client: DefaultDefaultNostrClient? = null
+    private var nip46Client: NostrClient? = null

-    private suspend fun getOrCreateNip46Client(): DefaultNostrClient =
+    private suspend fun getOrCreateNip46Client(): INostrClient =
        nip46ClientMutex.withLock {
-            nip46Client ?: DefaultNostrClient(
+            nip46Client ?: NostrClient(
                BasicOkHttpWebSocket.Builder(DesktopHttpClient::getHttpClient),
            ).also {
                nip46Client = it
@@ -155,7 +155,7 @@ class AccountManager internal constructor(
     * but we must wait for the websocket to be ready before sending requests.
     */
    private suspend fun awaitNip46RelayConnection(
-        client: DefaultNostrClient,
+        client: INostrClient,
        targetRelays: Set<NormalizedRelayUrl>,
    ) {
        withTimeout(NIP46_RELAY_CONNECT_TIMEOUT_MS) {
@@ -302,7 +302,7 @@ class AccountManager internal constructor(

    suspend fun loginWithBunker(bunkerUri: String): Result<AccountState.LoggedIn> {
        val listener = createLoginRelayListener()
-        var client: DefaultDefaultNostrClient? = null
+        var client: NostrClient? = null
        try {
            val ephemeralKeyPair = KeyPair()
            val ephemeralSigner = NostrSignerInternal(ephemeralKeyPair)
@@ -363,7 +363,7 @@ class AccountManager internal constructor(

    suspend fun loginWithNostrConnect(onUriGenerated: (String) -> Unit): Result<AccountState.LoggedIn> {
        val listener = createLoginRelayListener()
-        var client: DefaultDefaultNostrClient? = null
+        var client: NostrClient? = null
        try {
            val ephemeralKeyPair = KeyPair()
            val uriData = NostrConnectLoginUseCase.generateUri(ephemeralKeyPair, NIP46_RELAYS, "Amethyst%20Desktop")
@@ -140,7 +140,7 @@ fun ChessScreen(
            onEvent = { event, _, _, _ ->
                viewModel.handleIncomingEvent(event)
            },
-            onCaughtUp = { _, _ ->
+            onEose = { _, _ ->
                // ChessLobbyLogic handles loading state internally
            },
        )
@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.desktop.network

 import com.vitorpamplona.quartz.nip01Core.core.Event
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.listeners.RelayConnectionListener
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
 import com.vitorpamplona.quartz.nip01Core.relay.client.single.IRelayClient
@@ -44,10 +44,10 @@ import kotlinx.coroutines.flow.asStateFlow
 open class RelayConnectionManager(
    websocketBuilder: WebsocketBuilder,
 ) : RelayConnectionListener {
-    private val _client = DefaultNostrClient(websocketBuilder)
+    private val _client = NostrClient(websocketBuilder)

-    /** Exposes the underlying NostrClient for subscription coordinators */
-    val client: com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient get() = _client
+    /** Exposes the underlying INostrClient for subscription coordinators */
+    val client: com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient get() = _client

    private val _relayStatuses = MutableStateFlow<Map<NormalizedRelayUrl, RelayStatus>>(emptyMap())
    val relayStatuses: StateFlow<Map<NormalizedRelayUrl, RelayStatus>> = _relayStatuses.asStateFlow()
@@ -145,7 +145,7 @@ open class RelayConnectionManager(
                object : SubscriptionListener {
                    override fun onEvent(
                        event: Event,
-                        isRealTime: Boolean,
+                        isLive: Boolean,
                        relay: NormalizedRelayUrl,
                        forFilters: List<Filter>?,
                    ) {
@@ -58,7 +58,7 @@ private val CHESS_EVENT_KINDS =
 class DesktopChessSubscriptionController(
    private val relayManager: RelayConnectionManager,
    private val onEvent: (Event, Boolean, NormalizedRelayUrl, List<Filter>?) -> Unit,
-    private val onCaughtUp: (NormalizedRelayUrl, List<Filter>?) -> Unit = { _, _ -> },
+    private val onEose: (NormalizedRelayUrl, List<Filter>?) -> Unit = { _, _ -> },
 ) : ChessSubscriptionController {
    private val _currentState = MutableStateFlow<ChessSubscriptionState?>(null)
    override val currentState: StateFlow<ChessSubscriptionState?> = _currentState.asStateFlow()
@@ -98,7 +98,7 @@ class DesktopChessSubscriptionController(
                object : SubscriptionListener {
                    override fun onEvent(
                        event: Event,
-                        isRealTime: Boolean,
+                        isLive: Boolean,
                        relay: NormalizedRelayUrl,
                        forFilters: List<Filter>?,
                    ) {
@@ -106,16 +106,16 @@ class DesktopChessSubscriptionController(
                        if (event.kind in CHESS_EVENT_KINDS) {
                            DesktopChessEventCache.add(event)
                        }
-                        onEvent(event, isRealTime, relay, forFilters)
+                        onEvent(event, isLive, relay, forFilters)
                    }

-                    override fun onCaughtUp(
+                    override fun onEose(
                        relay: NormalizedRelayUrl,
                        forFilters: List<Filter>?,
                    ) {
                        // Track EOSE time for this relay for efficient re-subscription
                        relayEoseTimes[relay] = TimeUtils.now()
-                        onCaughtUp(relay, forFilters)
+                        onEose(relay, forFilters)
                    }
                },
        )
@@ -162,7 +162,7 @@ class DesktopChessSubscriptionController(
 * @param activeGameIds Set of game IDs the user is actively playing (for game-specific filters)
 * @param opponentPubkeys Set of opponent pubkeys for active games (for move filtering)
 * @param onEvent Callback for incoming events
- * @param onCaughtUp Callback for EOSE (End of Stored Events)
+ * @param onEose Callback for EOSE (End of Stored Events)
 */
 fun createChessSubscriptionWithGames(
    relays: Set<NormalizedRelayUrl>,
@@ -170,7 +170,7 @@ fun createChessSubscriptionWithGames(
    activeGameIds: Set<String> = emptySet(),
    opponentPubkeys: Set<String> = emptySet(),
    onEvent: (Event, Boolean, NormalizedRelayUrl, List<Filter>?) -> Unit,
-    onCaughtUp: (NormalizedRelayUrl, List<Filter>?) -> Unit = { _, _ -> },
+    onEose: (NormalizedRelayUrl, List<Filter>?) -> Unit = { _, _ -> },
 ): SubscriptionConfig? {
    if (relays.isEmpty()) return null

@@ -197,7 +197,7 @@ fun createChessSubscriptionWithGames(
        filters = filters,
        relays = relays,
        onEvent = onEvent,
-        onCaughtUp = onCaughtUp,
+        onEose = onEose,
    )
 }

@@ -207,11 +207,11 @@ fun createChessSubscriptionWithGames(
 */
@Deprecated(
    "Use createChessSubscriptionWithGames for active game support",
-    ReplaceWith("createChessSubscriptionWithGames(relays, userPubkey, emptySet(), emptySet(), onEvent, onCaughtUp)"),
+    ReplaceWith("createChessSubscriptionWithGames(relays, userPubkey, emptySet(), emptySet(), onEvent, onEose)"),
 )
 fun createChessSubscription(
    relays: Set<NormalizedRelayUrl>,
    userPubkey: String,
    onEvent: (Event, Boolean, NormalizedRelayUrl, List<Filter>?) -> Unit,
-    onCaughtUp: (NormalizedRelayUrl, List<Filter>?) -> Unit = { _, _ -> },
-): SubscriptionConfig? = createChessSubscriptionWithGames(relays, userPubkey, emptySet(), emptySet(), onEvent, onCaughtUp)
+    onEose: (NormalizedRelayUrl, List<Filter>?) -> Unit = { _, _ -> },
+): SubscriptionConfig? = createChessSubscriptionWithGames(relays, userPubkey, emptySet(), emptySet(), onEvent, onEose)
@@ -30,7 +30,7 @@ import com.vitorpamplona.amethyst.desktop.model.DesktopDmRelayState
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
-import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
@@ -73,7 +73,7 @@ import kotlin.time.Duration.Companion.seconds
 * ```
 */
 class DesktopRelaySubscriptionsCoordinator(
-    private val client: NostrClient,
+    private val client: INostrClient,
    private val scope: CoroutineScope,
    private val indexRelays: Set<NormalizedRelayUrl>,
    private val localCache: DesktopLocalCache,
@@ -180,7 +180,7 @@ class DesktopRelaySubscriptionsCoordinator(
            object : SubscriptionListener {
                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
@@ -284,7 +284,7 @@ class DesktopRelaySubscriptionsCoordinator(
            object : SubscriptionListener {
                override fun onEvent(
                    event: Event,
-                    isRealTime: Boolean,
+                    isLive: Boolean,
                    relay: NormalizedRelayUrl,
                    forFilters: List<Filter>?,
                ) {
--- a/Show More
+++ b/Show More