From 2322dafd706bdd143310d458b2c533c7a9b75ecd Mon Sep 17 00:00:00 2001
From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com>
Date: Wed, 24 Jun 2026 14:24:49 +0200
Subject: [PATCH] Add events to interface level

---
 library/logos_delivery_api/node_api.nim       |  6 +--
 logos_delivery/api/kernel_api.nim             | 21 ++++++----
 logos_delivery/api/logos_delivery_api.nim     | 33 +++++++++++++++
 logos_delivery/api/messaging_client_api.nim   | 31 +++++++++++++-
 .../api/reliable_channel_manager_api.nim      | 42 +++++++++++++++++--
 logos_delivery/api/types.nim                  | 27 +++++++++---
 logos_delivery/channels/events.nim            | 39 -----------------
 logos_delivery/channels/reliable_channel.nim  | 15 ++-----
 .../channels/reliable_channel_manager.nim     |  1 -
 logos_delivery/channels/types.nim             | 15 -------
 logos_delivery/logos_delivery.nim             | 11 +++--
 .../recv_service/recv_service.nim             |  2 +-
 .../send_service/send_service.nim             |  2 +-
 logos_delivery/waku/events/events.nim         |  8 +---
 logos_delivery/waku/events/health_events.nim  | 13 ++----
 logos_delivery/waku/events/message_events.nim | 35 ----------------
 .../health_monitor/node_health_monitor.nim    |  1 +
 .../waku/node/health_monitor/topic_health.nim |  2 +-
 .../waku/node/subscription_manager.nim        |  2 +-
 logos_delivery/waku/node/waku_node.nim        |  2 +-
 logos_delivery/waku/node/waku_node/relay.nim  |  1 -
 logos_delivery/waku/utils/requests.nim        | 10 -----
 logos_delivery/waku/waku_lightpush/client.nim |  2 +-
 .../waku/waku_lightpush/self_req_handler.nim  |  4 +-
 .../waku/waku_lightpush_legacy/client.nim     |  2 +-
 .../self_req_handler.nim                      | 10 +----
 logos_delivery/waku/waku_store/client.nim     |  4 +-
 27 files changed, 171 insertions(+), 170 deletions(-)
 create mode 100644 logos_delivery/api/logos_delivery_api.nim
 delete mode 100644 logos_delivery/channels/events.nim
 delete mode 100644 logos_delivery/channels/types.nim
 delete mode 100644 logos_delivery/waku/events/message_events.nim
 delete mode 100644 logos_delivery/waku/utils/requests.nim

diff --git a/library/logos_delivery_api/node_api.nim b/library/logos_delivery_api/node_api.nim
index 354ab3a98..8f0ee3921 100644
--- a/library/logos_delivery_api/node_api.nim
+++ b/library/logos_delivery_api/node_api.nim
@@ -3,9 +3,9 @@ import chronos, chronicles, results, ffi
 import
   logos_delivery,
   logos_delivery/waku/node/waku_node,
-  logos_delivery/waku/events/message_events,
+  logos_delivery/api/messaging_client_api,
   logos_delivery/api/types,
-  logos_delivery/waku/events/[message_events, health_events],
+  logos_delivery/waku/events/health_events,
   tools/confutils/conf_from_json,
   ../declare_lib,
   ../json_event
@@ -116,7 +116,7 @@ proc logosdelivery_start_node(
     chronicles.error "MessageReceivedEvent.listen failed", err = $error
     return err("MessageReceivedEvent.listen failed: " & $error)
 
-  let ConnectionStatusChangeListener = EventConnectionStatusChange.listen(
+  discard EventConnectionStatusChange.listen(
     ctx.myLib[].waku.brokerCtx,
     proc(event: EventConnectionStatusChange) {.async: (raises: []).} =
       callEventCallback(ctx, "onConnectionStatusChange"):
diff --git a/logos_delivery/api/kernel_api.nim b/logos_delivery/api/kernel_api.nim
index 4c1a838bb..ea64eab22 100644
--- a/logos_delivery/api/kernel_api.nim
+++ b/logos_delivery/api/kernel_api.nim
@@ -1,18 +1,25 @@
 import std/options
 import chronos, results
-import logos_delivery/api/types
+import brokers/event_broker
+
+import logos_delivery/api/types as api_types
 import logos_delivery/waku/waku_core/topics/pubsub_topic
-import logos_delivery/waku/waku_store/common
+import logos_delivery/waku/waku_store/common as store_types
+
+export event_broker
+export api_types, pubsub_topic, store_types
 
 type IKernel* = ref object of RootObj
 
+EventBroker:
+  # Internal event emitted when a message arrives from the network via any protocol
+  type MessageSeenEvent* = object
+    topic*: PubsubTopic
+    message*: WakuMessage
+
 # --- topic construction ---
 method buildContentTopic*(
-    self: IKernel,
-    appName: string,
-    appVersion: uint32,
-    name: string,
-    encoding: string,
+    self: IKernel, appName: string, appVersion: uint32, name: string, encoding: string
 ): Future[Result[ContentTopic, string]] {.async: (raises: []), base.} =
   return err("Interface IKernel.buildContentTopic not implemented")
 
diff --git a/logos_delivery/api/logos_delivery_api.nim b/logos_delivery/api/logos_delivery_api.nim
new file mode 100644
index 000000000..162159d8e
--- /dev/null
+++ b/logos_delivery/api/logos_delivery_api.nim
@@ -0,0 +1,33 @@
+## `LogosDelivery` is the project entry point. It is a pure concentrator: it
+## owns exactly one instance of each API layer
+##
+##   Waku  <-  MessagingClient  <-  ReliableChannelManager
+##
+## and chains them together (each layer drives the one below it). Every layer
+## keeps its own, separate public API — `LogosDelivery` only wires them up and
+## drives the shared `new` / `start` / `stop` lifecycle.
+
+{.push raises: [].}
+
+import results, chronos
+import brokers/event_broker
+import types as api_types
+
+export api_types, event_broker
+
+type
+  ## Entry point. Holds one instance of each API layer.
+  ILogosDelivery* = ref object of RootObj
+
+EventBroker:
+  type EventConnectionStatusChange* = object
+    connectionStatus*: ConnectionStatus
+
+method start*(self: ILogosDelivery): Future[Result[void, string]] {.async, base.} =
+  return err("ILogosDelivery.start not implemented")
+
+method stop*(self: ILogosDelivery): Future[Result[void, string]] {.async, base.} =
+  return err("ILogosDelivery.stop not implemented")
+
+method isOnline*(self: ILogosDelivery): Future[Result[bool, string]] {.async, base.} =
+  return err("ILogosDelivery.isOnline not implemented")
diff --git a/logos_delivery/api/messaging_client_api.nim b/logos_delivery/api/messaging_client_api.nim
index 227a7620b..46acec3bc 100644
--- a/logos_delivery/api/messaging_client_api.nim
+++ b/logos_delivery/api/messaging_client_api.nim
@@ -1,8 +1,37 @@
 import chronos, results
-import logos_delivery/api/types
+import brokers/event_broker
+
+import logos_delivery/api/types as api_types
+
+export event_broker, api_types
 
 type IMessagingClient* = ref object of RootObj
 
+EventBroker:
+  # Event emitted when a message is sent to the network
+  type MessageSentEvent* = object
+    requestId*: RequestId
+    messageHash*: string
+
+EventBroker:
+  # Event emitted when a message send operation fails
+  type MessageErrorEvent* = object
+    requestId*: RequestId
+    messageHash*: string
+    error*: string
+
+EventBroker:
+  # Confirmation that a message has been correctly delivered to some neighbouring nodes.
+  type MessagePropagatedEvent* = object
+    requestId*: RequestId
+    messageHash*: string
+
+EventBroker:
+  # Event emitted when a message is received via Waku
+  type MessageReceivedEvent* = object
+    messageHash*: string
+    message*: WakuMessage
+
 method subscribe*(
     self: IMessagingClient, contentTopic: ContentTopic
 ): Future[Result[void, string]] {.async: (raises: []), base.} =
diff --git a/logos_delivery/api/reliable_channel_manager_api.nim b/logos_delivery/api/reliable_channel_manager_api.nim
index c93146a77..206ef0df7 100644
--- a/logos_delivery/api/reliable_channel_manager_api.nim
+++ b/logos_delivery/api/reliable_channel_manager_api.nim
@@ -1,9 +1,43 @@
 import chronos, results
-import logos_delivery/api/types
-import logos_delivery/channels/types
-import logos_delivery/channels/reliable_channel
 
-type IReliableChannelManager* = ref object of RootObj
+import brokers/event_broker
+
+import logos_delivery/api/types as api_types
+
+export event_broker, api_types
+
+type
+  IReliableChannelManager* = ref object of RootObj
+
+  SendHandler* = proc(envelope: MessageEnvelope): Future[Result[RequestId, string]] {.
+    async: (raises: [CatchableError]), gcsafe
+  .}
+    ## Egress dispatch boundary. Typically wraps `MessagingClient.send`;
+    ## tests inject a fake that records calls and returns canned
+    ## `RequestId`s so the send state machine can be exercised end-to-end
+    ## without a network.
+
+EventBroker:
+  type ChannelMessageReceivedEvent* = object
+    channelId*: ChannelId
+    senderId*: SdsParticipantID
+    payload*: seq[byte]
+
+EventBroker:
+  ## Emitted when every segment of a channel-level `send()` reached
+  ## `Confirmed`. Channel-level analogue of `MessageSentEvent`; the
+  ## `requestId` is the channel-layer parent returned by `send()`.
+  type ChannelMessageSentEvent* = object
+    channelId*: ChannelId
+    requestId*: RequestId
+
+EventBroker:
+  ## Emitted when a channel-level `send()` finalises with at least one
+  ## segment in `Failed`. Channel-level analogue of `MessageErrorEvent`.
+  type ChannelMessageErrorEvent* = object
+    channelId*: ChannelId
+    requestId*: RequestId
+    error*: string
 
 method createReliableChannel*(
     self: IReliableChannelManager,
diff --git a/logos_delivery/api/types.nim b/logos_delivery/api/types.nim
index 5757a8e82..c73b98e38 100644
--- a/logos_delivery/api/types.nim
+++ b/logos_delivery/api/types.nim
@@ -1,14 +1,19 @@
-import logos_delivery/waku/compat/option_valueor
-import libp2p/crypto/crypto
 {.push raises: [].}
-
+import std/hashes
 import bearssl/rand, std/times, chronos
 import stew/byteutils
-import logos_delivery/waku/utils/requests as request_utils
+import libp2p/crypto/crypto
+
+import logos_delivery/waku/compat/option_valueor
+
 import logos_delivery/waku/waku_core/[topics/content_topic, message/message, time]
 
 export content_topic, message
 
+import types/sds_message_id
+
+export sds_message_id
+
 type
   MessageEnvelope* = object
     contentTopic*: ContentTopic
@@ -26,9 +31,16 @@ type
     PartiallyConnected
     Connected
 
+  ChannelId* = SdsChannelID
+
+proc generateRequestId*(rng: crypto.Rng): string =
+  var bytes: array[10, byte]
+  rng.generate(bytes)
+  return byteutils.toHex(bytes)
+
 proc new*(T: typedesc[RequestId], rng: crypto.Rng): T =
   ## Generate a new RequestId using the provided RNG.
-  RequestId(request_utils.generateRequestId(rng))
+  RequestId(generateRequestId(rng))
 
 proc `$`*(r: RequestId): string {.inline.} =
   string(r)
@@ -36,6 +48,11 @@ proc `$`*(r: RequestId): string {.inline.} =
 proc `==`*(a, b: RequestId): bool {.inline.} =
   string(a) == string(b)
 
+proc hash*(r: RequestId): Hash =
+  ## Allows `RequestId` to be used as a `Table` key.
+  hash(string(r))
+
+
 proc init*(
     T: type MessageEnvelope,
     contentTopic: ContentTopic,
diff --git a/logos_delivery/channels/events.nim b/logos_delivery/channels/events.nim
deleted file mode 100644
index 5f69095e4..000000000
--- a/logos_delivery/channels/events.nim
+++ /dev/null
@@ -1,39 +0,0 @@
-## Reliable Channel event types emitted to API consumers.
-##
-## Lifecycle events for individual segments (sent / propagated / errored)
-## are the same as the network-level ones the MessagingClient already
-## emits — `requestId` is shared across layers — so we just re-export
-## `waku/events/message_events` and avoid declaring duplicates.
-##
-## Only the channel-level `MessageReceivedEvent` carries data that has
-## no analogue in the lower layer (reassembled application payload,
-## senderId, channelId), so it lives here.
-
-import logos_delivery/waku/events/message_events as waku_message_events
-import brokers/event_broker
-
-import ./types as channel_types
-
-export waku_message_events, channel_types, event_broker
-
-EventBroker:
-  type ChannelMessageReceivedEvent* = object
-    channelId*: ChannelId
-    senderId*: SdsParticipantID
-    payload*: seq[byte]
-
-EventBroker:
-  ## Emitted when every segment of a channel-level `send()` reached
-  ## `Confirmed`. Channel-level analogue of `MessageSentEvent`; the
-  ## `requestId` is the channel-layer parent returned by `send()`.
-  type ChannelMessageSentEvent* = object
-    channelId*: ChannelId
-    requestId*: RequestId
-
-EventBroker:
-  ## Emitted when a channel-level `send()` finalises with at least one
-  ## segment in `Failed`. Channel-level analogue of `MessageErrorEvent`.
-  type ChannelMessageErrorEvent* = object
-    channelId*: ChannelId
-    requestId*: RequestId
-    error*: string
diff --git a/logos_delivery/channels/reliable_channel.nim b/logos_delivery/channels/reliable_channel.nim
index 307dc17a4..c52d25653 100644
--- a/logos_delivery/channels/reliable_channel.nim
+++ b/logos_delivery/channels/reliable_channel.nim
@@ -24,16 +24,17 @@ import libp2p/crypto/crypto as libp2p_crypto
 import logos_delivery/api/types
 import logos_delivery/messaging/delivery_service/send_service
 import logos_delivery/waku/waku_core/topics
+import logos_delivery/api/reliable_channel_manager_api
+import logos_delivery/api/messaging_client_api
 
-import ./events
 import ./segmentation/segmentation
 import ./scalable_data_sync/scalable_data_sync
 import ./rate_limit_manager/rate_limit_manager
 import ./encryption/encryption
 
 export
-  types, send_service, events, segmentation, scalable_data_sync, rate_limit_manager,
-  encryption
+  types, send_service, reliable_channel_manager_api, segmentation, scalable_data_sync,
+  rate_limit_manager, encryption
 
 const LipWireReliableChannelVersion* = "RELIABLE-CHANNEL-API/1"
   ## Wire-format spec marker for the Reliable Channel layer, as defined
@@ -44,14 +45,6 @@ const LipWireReliableChannelVersion* = "RELIABLE-CHANNEL-API/1"
   ## on breaking on-the-wire changes; implementations pin one version.
 
 type
-  SendHandler* = proc(envelope: MessageEnvelope): Future[Result[RequestId, string]] {.
-    async: (raises: [CatchableError]), gcsafe
-  .}
-    ## Egress dispatch boundary. Typically wraps `MessagingClient.send`;
-    ## tests inject a fake that records calls and returns canned
-    ## `RequestId`s so the send state machine can be exercised end-to-end
-    ## without a network.
-
   MessagePersistence {.pure.} = enum
     Persistent
     Ephemeral
diff --git a/logos_delivery/channels/reliable_channel_manager.nim b/logos_delivery/channels/reliable_channel_manager.nim
index 1e0f35f7c..88d1d1787 100644
--- a/logos_delivery/channels/reliable_channel_manager.nim
+++ b/logos_delivery/channels/reliable_channel_manager.nim
@@ -15,7 +15,6 @@ import brokers/broker_context
 
 import logos_delivery/api/types
 import logos_delivery/api/reliable_channel_manager_api
-import logos_delivery/waku/events/message_events as waku_message_events
 import logos_delivery/messaging/messaging_client
 import logos_delivery/waku/waku_core/topics
 import logos_delivery/waku/persistency/sds_persistency
diff --git a/logos_delivery/channels/types.nim b/logos_delivery/channels/types.nim
deleted file mode 100644
index 7730c5c58..000000000
--- a/logos_delivery/channels/types.nim
+++ /dev/null
@@ -1,15 +0,0 @@
-## Core identifier types for the Reliable Channel API.
-
-import std/hashes
-import logos_delivery/api/types as api_types
-
-import ./scalable_data_sync/scalable_data_sync
-
-export scalable_data_sync
-export api_types
-
-type ChannelId* = SdsChannelID
-
-proc hash*(r: RequestId): Hash =
-  ## Allows `RequestId` to be used as a `Table` key.
-  hash(string(r))
diff --git a/logos_delivery/logos_delivery.nim b/logos_delivery/logos_delivery.nim
index f61202b9a..f739851e7 100644
--- a/logos_delivery/logos_delivery.nim
+++ b/logos_delivery/logos_delivery.nim
@@ -11,6 +11,8 @@
 
 import results, chronos, chronicles
 
+import logos_delivery/api/logos_delivery_api
+export logos_delivery_api
 import logos_delivery/waku/waku
 export waku
 import logos_delivery/messaging/messaging_client
@@ -35,7 +37,8 @@ type
     messaging*: MessagingClientConf
     reliableChannel*: ReliableChannelManagerConf
 
-  LogosDelivery* = ref object ## Entry point. Holds one instance of each API layer.
+  LogosDelivery* = ref object of ILogosDelivery
+    ## Entry point. Holds one instance of each API layer.
     waku*: Waku
     messagingClient*: MessagingClient
     reliableChannelManager*: ReliableChannelManager
@@ -79,7 +82,7 @@ proc new*(
     )
   )
 
-proc start*(self: LogosDelivery): Future[Result[void, string]] {.async.} =
+method start*(self: LogosDelivery): Future[Result[void, string]] {.async.} =
   ## Starts each layer bottom-up: transport first, then messaging, then channels.
   if self.waku.isNil():
     return err("Waku node is not initialized")
@@ -99,7 +102,7 @@ proc start*(self: LogosDelivery): Future[Result[void, string]] {.async.} =
 
   return ok()
 
-proc stop*(self: LogosDelivery): Future[Result[void, string]] {.async.} =
+method stop*(self: LogosDelivery): Future[Result[void, string]] {.async.} =
   ## Stops in reverse order so higher layers drain before their dependencies.
   await self.reliableChannelManager.stop()
   await self.messagingClient.stop()
@@ -109,7 +112,7 @@ proc stop*(self: LogosDelivery): Future[Result[void, string]] {.async.} =
 
   return ok()
 
-proc isOnline*(self: LogosDelivery): Future[Result[bool, string]] {.async.} =
+method isOnline*(self: LogosDelivery): Future[Result[bool, string]] {.async.} =
   if self.waku.isNil():
     return err("Waku node is not initialized")
   return ok(self.waku.healthMonitor.onlineMonitor.amIOnline())
diff --git a/logos_delivery/messaging/delivery_service/recv_service/recv_service.nim b/logos_delivery/messaging/delivery_service/recv_service/recv_service.nim
index 90bdb0839..9840d5a20 100644
--- a/logos_delivery/messaging/delivery_service/recv_service/recv_service.nim
+++ b/logos_delivery/messaging/delivery_service/recv_service/recv_service.nim
@@ -6,6 +6,7 @@ import logos_delivery/waku/compat/option_valueor
 import std/[tables, sequtils, options, sets]
 import chronos, chronicles, libp2p/utility
 import brokers/broker_context
+import logos_delivery/api/[types, logos_delivery_api, kernel_api, messaging_client_api]
 import
   logos_delivery/waku/[
     waku_core,
@@ -13,7 +14,6 @@ import
     waku_store/client,
     waku_store/common,
     waku_filter_v2/client,
-    events/message_events,
     events/health_events,
     waku_node,
     node/subscription_manager,
diff --git a/logos_delivery/messaging/delivery_service/send_service/send_service.nim b/logos_delivery/messaging/delivery_service/send_service/send_service.nim
index 00f2ff672..c6086b797 100644
--- a/logos_delivery/messaging/delivery_service/send_service/send_service.nim
+++ b/logos_delivery/messaging/delivery_service/send_service/send_service.nim
@@ -5,6 +5,7 @@ import logos_delivery/waku/compat/option_valueor
 import std/[sequtils, tables, options, typetraits]
 import chronos, chronicles, libp2p/utility
 import brokers/broker_context
+import logos_delivery/api/messaging_client_api
 import
   ./[send_processor, relay_processor, lightpush_processor, delivery_task],
   logos_delivery/waku/[
@@ -18,7 +19,6 @@ import
     waku_rln_relay/rln_relay,
     waku_lightpush/client,
     waku_lightpush/callbacks,
-    events/message_events,
   ]
 
 logScope:
diff --git a/logos_delivery/waku/events/events.nim b/logos_delivery/waku/events/events.nim
index 130d7c018..b087cfb8e 100644
--- a/logos_delivery/waku/events/events.nim
+++ b/logos_delivery/waku/events/events.nim
@@ -1,9 +1,5 @@
 import
-  ./[
-    message_events, delivery_events, health_events, peer_events, lifecycle_events,
-    discovery_events,
-  ]
+  ./[delivery_events, health_events, peer_events, discovery_events]
 
 export
-  message_events, delivery_events, health_events, peer_events, lifecycle_events,
-  discovery_events
+  delivery_events, health_events, peer_events, discovery_events
diff --git a/logos_delivery/waku/events/health_events.nim b/logos_delivery/waku/events/health_events.nim
index d19de776b..9dc70ae63 100644
--- a/logos_delivery/waku/events/health_events.nim
+++ b/logos_delivery/waku/events/health_events.nim
@@ -1,15 +1,10 @@
 import brokers/event_broker
 
-import logos_delivery/api/types
-import logos_delivery/waku/node/health_monitor/[protocol_health, topic_health]
-import logos_delivery/waku/waku_core/topics
+from logos_delivery/api/logos_delivery_api import EventConnectionStatusChange
+import logos_delivery/waku/node/health_monitor/topic_health
+from logos_delivery/waku/waku_core/topics import ContentTopic, PubsubTopic
 
-export protocol_health, topic_health
-
-# Notify health changes to node connectivity
-EventBroker:
-  type EventConnectionStatusChange* = object
-    connectionStatus*: ConnectionStatus
+export topic_health, EventConnectionStatusChange
 
 # Notify health changes to a subscribed topic
 # TODO: emit content topic health change events when subscribe/unsubscribe
diff --git a/logos_delivery/waku/events/message_events.nim b/logos_delivery/waku/events/message_events.nim
deleted file mode 100644
index 2e4bece80..000000000
--- a/logos_delivery/waku/events/message_events.nim
+++ /dev/null
@@ -1,35 +0,0 @@
-import brokers/event_broker
-import logos_delivery/api/types
-import logos_delivery/waku/[waku_core/message, waku_core/topics]
-export types
-
-EventBroker:
-  # Event emitted when a message is sent to the network
-  type MessageSentEvent* = object
-    requestId*: RequestId
-    messageHash*: string
-
-EventBroker:
-  # Event emitted when a message send operation fails
-  type MessageErrorEvent* = object
-    requestId*: RequestId
-    messageHash*: string
-    error*: string
-
-EventBroker:
-  # Confirmation that a message has been correctly delivered to some neighbouring nodes.
-  type MessagePropagatedEvent* = object
-    requestId*: RequestId
-    messageHash*: string
-
-EventBroker:
-  # Event emitted when a message is received via Waku
-  type MessageReceivedEvent* = object
-    messageHash*: string
-    message*: WakuMessage
-
-EventBroker:
-  # Internal event emitted when a message arrives from the network via any protocol
-  type MessageSeenEvent* = object
-    topic*: PubsubTopic
-    message*: WakuMessage
diff --git a/logos_delivery/waku/node/health_monitor/node_health_monitor.nim b/logos_delivery/waku/node/health_monitor/node_health_monitor.nim
index 465598794..deedaa6cc 100644
--- a/logos_delivery/waku/node/health_monitor/node_health_monitor.nim
+++ b/logos_delivery/waku/node/health_monitor/node_health_monitor.nim
@@ -9,6 +9,7 @@ import
   libp2p/protocols/pubsub,
   libp2p/protocols/pubsub/rpc/messages,
   logos_delivery/api/types,
+  logos_delivery/api/logos_delivery_api,
   logos_delivery/waku/[
     waku_relay,
     waku_rln_relay,
diff --git a/logos_delivery/waku/node/health_monitor/topic_health.nim b/logos_delivery/waku/node/health_monitor/topic_health.nim
index 9273f4835..a08a3c3a9 100644
--- a/logos_delivery/waku/node/health_monitor/topic_health.nim
+++ b/logos_delivery/waku/node/health_monitor/topic_health.nim
@@ -1,6 +1,6 @@
 import chronos
 
-import logos_delivery/waku/waku_core
+from logos_delivery/waku/waku_core/topics import PubsubTopic
 
 type TopicHealth* = enum
   UNHEALTHY
diff --git a/logos_delivery/waku/node/subscription_manager.nim b/logos_delivery/waku/node/subscription_manager.nim
index 15b582ea6..2eadd2009 100644
--- a/logos_delivery/waku/node/subscription_manager.nim
+++ b/logos_delivery/waku/node/subscription_manager.nim
@@ -2,6 +2,7 @@ import logos_delivery/waku/compat/option_valueor
 import std/[sequtils, sets, tables, options], chronos, chronicles, metrics, results
 import libp2p/[peerid, peerinfo]
 import brokers/broker_context
+import logos_delivery/api/kernel_api
 
 import
   logos_delivery/waku/[
@@ -16,7 +17,6 @@ import
     waku_filter_v2/client as filter_client,
     waku_filter_v2/protocol as filter_protocol,
     events/health_events,
-    events/message_events,
     events/peer_events,
     requests/health_requests,
     node/peer_manager,
diff --git a/logos_delivery/waku/node/waku_node.nim b/logos_delivery/waku/node/waku_node.nim
index 2ad7dc601..7a9813b98 100644
--- a/logos_delivery/waku/node/waku_node.nim
+++ b/logos_delivery/waku/node/waku_node.nim
@@ -60,9 +60,9 @@ import
     requests/node_requests,
     requests/health_requests,
     events/health_events,
-    events/message_events,
     events/peer_events,
   ],
+  logos_delivery/api/kernel_api,
   logos_delivery/waku/discovery/waku_kademlia,
   logos_delivery/waku/net/[bound_ports, net_config],
   ./peer_manager,
diff --git a/logos_delivery/waku/node/waku_node/relay.nim b/logos_delivery/waku/node/waku_node/relay.nim
index 57904dc94..a2d1751ef 100644
--- a/logos_delivery/waku/node/waku_node/relay.nim
+++ b/logos_delivery/waku/node/waku_node/relay.nim
@@ -32,7 +32,6 @@ import
     node/waku_node,
     node/subscription_manager,
     node/peer_manager,
-    events/message_events,
   ]
 
 export waku_relay.WakuRelayHandler
diff --git a/logos_delivery/waku/utils/requests.nim b/logos_delivery/waku/utils/requests.nim
deleted file mode 100644
index a7fd9a2a9..000000000
--- a/logos_delivery/waku/utils/requests.nim
+++ /dev/null
@@ -1,10 +0,0 @@
-# Request utils.
-
-{.push raises: [].}
-
-import libp2p/crypto/crypto, stew/byteutils
-
-proc generateRequestId*(rng: crypto.Rng): string =
-  var bytes: array[10, byte]
-  rng.generate(bytes)
-  return byteutils.toHex(bytes)
diff --git a/logos_delivery/waku/waku_lightpush/client.nim b/logos_delivery/waku/waku_lightpush/client.nim
index 680970a51..e33b2875c 100644
--- a/logos_delivery/waku/waku_lightpush/client.nim
+++ b/logos_delivery/waku/waku_lightpush/client.nim
@@ -4,10 +4,10 @@ import logos_delivery/waku/compat/option_valueor
 
 import std/options, results, chronicles, chronos, metrics, bearssl/rand, stew/byteutils
 import libp2p/peerid, libp2p/stream/connection
+import logos_delivery/api/types
 import
   ../waku_core/peers,
   ../node/peer_manager,
-  ../utils/requests,
   ../waku_core,
   ./common,
   ./protocol_metrics,
diff --git a/logos_delivery/waku/waku_lightpush/self_req_handler.nim b/logos_delivery/waku/waku_lightpush/self_req_handler.nim
index 06a0d3715..dcf8ba895 100644
--- a/logos_delivery/waku/waku_lightpush/self_req_handler.nim
+++ b/logos_delivery/waku/waku_lightpush/self_req_handler.nim
@@ -10,8 +10,8 @@
 ## that could be used also as a lightpush client, helping testing and development.
 
 import results, chronos, std/options, metrics
-import ../waku_core, ./protocol, ./common, ./rpc, ./rpc_codec, ../utils/requests
-
+import logos_delivery/api/types
+import ../waku_core, ./protocol, ./common, ./rpc, ./rpc_codec
 proc handleSelfLightPushRequest*(
     self: WakuLightPush, pubSubTopic: Option[PubsubTopic], message: WakuMessage
 ): Future[WakuLightPushResult] {.async.} =
diff --git a/logos_delivery/waku/waku_lightpush_legacy/client.nim b/logos_delivery/waku/waku_lightpush_legacy/client.nim
index 511c3f543..ff7e694d3 100644
--- a/logos_delivery/waku/waku_lightpush_legacy/client.nim
+++ b/logos_delivery/waku/waku_lightpush_legacy/client.nim
@@ -4,10 +4,10 @@ import logos_delivery/waku/compat/option_valueor
 
 import std/options, results, chronicles, chronos, metrics, bearssl/rand, stew/byteutils
 import libp2p/peerid
+import logos_delivery/api/types
 import
   ../waku_core/peers,
   ../node/peer_manager,
-  ../utils/requests,
   ../waku_core,
   ./common,
   ./protocol_metrics,
diff --git a/logos_delivery/waku/waku_lightpush_legacy/self_req_handler.nim b/logos_delivery/waku/waku_lightpush_legacy/self_req_handler.nim
index 3c5d09a9c..466d14f7c 100644
--- a/logos_delivery/waku/waku_lightpush_legacy/self_req_handler.nim
+++ b/logos_delivery/waku/waku_lightpush_legacy/self_req_handler.nim
@@ -10,14 +10,8 @@
 ## that could be used also as a lightpush client, helping testing and development.
 
 import results, chronos, chronicles, std/options, metrics, stew/byteutils
-import
-  ../waku_core,
-  ./protocol,
-  ./common,
-  ./rpc,
-  ./rpc_codec,
-  ./protocol_metrics,
-  ../utils/requests
+import logos_delivery/api/types
+import ../waku_core, ./protocol, ./common, ./rpc, ./rpc_codec, ./protocol_metrics
 
 proc handleSelfLightPushRequest*(
     self: WakuLegacyLightPush, pubSubTopic: PubsubTopic, message: WakuMessage
diff --git a/logos_delivery/waku/waku_store/client.nim b/logos_delivery/waku/waku_store/client.nim
index 21e2699e3..c93fad6a4 100644
--- a/logos_delivery/waku/waku_store/client.nim
+++ b/logos_delivery/waku/waku_store/client.nim
@@ -9,8 +9,8 @@ import
   chronos,
   metrics,
   bearssl/rand
-import
-  ../node/peer_manager, ../utils/requests, ./protocol_metrics, ./common, ./rpc_codec
+import logos_delivery/api/types
+import ../node/peer_manager, ./protocol_metrics, ./common, ./rpc_codec
 
 logScope:
   topics = "waku store client"