From a27e3f2a6a84eb602dc6944daa503fb4a273d4b4 Mon Sep 17 00:00:00 2001
From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com>
Date: Fri, 5 Jun 2026 15:33:41 +0200
Subject: [PATCH] WIP - fixing import after folder moves

---
 apps/benchmarks/benchmarks.nim                |  2 +-
 apps/chat2/chat2.nim                          |  4 +--
 apps/chat2/config_chat2.nim                   |  2 +-
 apps/chat2bridge/chat2bridge.nim              |  5 ++--
 apps/chat2mix/chat2mix.nim                    |  4 +--
 apps/chat2mix/config_chat2mix.nim             |  2 +-
 .../diagnose_connections.nim                  |  2 +-
 apps/liteprotocoltester/legacy_publisher.nim  |  2 +-
 .../liteprotocoltester/liteprotocoltester.nim |  2 +-
 apps/liteprotocoltester/publisher.nim         |  2 +-
 apps/liteprotocoltester/publisher_base.nim    |  2 +-
 apps/liteprotocoltester/receiver.nim          |  2 +-
 .../service_peer_management.nim               |  2 +-
 apps/liteprotocoltester/tester_config.nim     |  4 +--
 apps/liteprotocoltester/tester_message.nim    |  2 +-
 apps/liteprotocoltester/v3_publisher.nim      |  2 +-
 apps/networkmonitor/networkmonitor.nim        |  2 +-
 apps/wakucanary/wakucanary.nim                | 25 ++++++++++---------
 18 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/apps/benchmarks/benchmarks.nim b/apps/benchmarks/benchmarks.nim
index 3896cd765..65ad7a525 100644
--- a/apps/benchmarks/benchmarks.nim
+++ b/apps/benchmarks/benchmarks.nim
@@ -2,7 +2,7 @@ import
   std/[strutils, times, sequtils, osproc], math, results, options, testutils/unittests
 
 import
-  waku/[
+  logos_delivery/waku/[
     waku_rln_relay/protocol_types,
     waku_rln_relay/rln,
     waku_rln_relay,
diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
index 282e17bfd..a1b101022 100644
--- a/apps/chat2/chat2.nim
+++ b/apps/chat2/chat2.nim
@@ -31,7 +31,7 @@ import
     nameresolving/dnsresolver,
   ] # define DNS resolution
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     waku_lightpush_legacy/common,
     waku_lightpush_legacy/rpc,
@@ -48,7 +48,7 @@ import
   ./config_chat2
 
 import libp2p/protocols/pubsub/rpc/messages, libp2p/protocols/pubsub/pubsub
-import ../../waku/waku_rln_relay
+import ../../logos_delivery/waku/waku_rln_relay
 
 const Help = """
   Commands: /[?|help|connect|nick|exit]
diff --git a/apps/chat2/config_chat2.nim b/apps/chat2/config_chat2.nim
index b0e38c6bc..dfb26eb56 100644
--- a/apps/chat2/config_chat2.nim
+++ b/apps/chat2/config_chat2.nim
@@ -10,7 +10,7 @@ import
   nimcrypto/utils,
   std/strutils,
   regex
-import waku/waku_core
+import logos_delivery/waku/waku_core
 
 type
   Fleet* = enum
diff --git a/apps/chat2bridge/chat2bridge.nim b/apps/chat2bridge/chat2bridge.nim
index eeeea328b..4e8842dab 100644
--- a/apps/chat2bridge/chat2bridge.nim
+++ b/apps/chat2bridge/chat2bridge.nim
@@ -15,7 +15,7 @@ import
   # Waku v2 imports
   libp2p/crypto/crypto,
   libp2p/errors,
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     waku_node,
     node/peer_manager,
@@ -242,7 +242,8 @@ proc stop*(cmb: Chat2MatterBridge) {.async: (raises: [Exception]).} =
 {.pop.}
   # @TODO confutils.nim(775, 17) Error: can raise an unlisted exception: ref IOError
 when isMainModule:
-  import waku/common/utils/nat, waku/rest_api/message_cache
+  import
+    logos_delivery/waku/common/utils/nat, logos_delivery/waku/rest_api/message_cache
 
   let
     rng = newRng()
diff --git a/apps/chat2mix/chat2mix.nim b/apps/chat2mix/chat2mix.nim
index 8b786d7b6..8f48396cf 100644
--- a/apps/chat2mix/chat2mix.nim
+++ b/apps/chat2mix/chat2mix.nim
@@ -33,7 +33,7 @@ import
     protocols/mix/mix_protocol,
   ] # define DNS resolution
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     waku_lightpush/common,
     waku_lightpush/rpc,
@@ -52,7 +52,7 @@ import
   ./config_chat2mix
 
 import libp2p/protocols/pubsub/rpc/messages, libp2p/protocols/pubsub/pubsub
-import ../../waku/waku_rln_relay
+import ../../logos_delivery/waku/waku_rln_relay
 
 logScope:
   topics = "chat2 mix"
diff --git a/apps/chat2mix/config_chat2mix.nim b/apps/chat2mix/config_chat2mix.nim
index 639e14986..f77a729f4 100644
--- a/apps/chat2mix/config_chat2mix.nim
+++ b/apps/chat2mix/config_chat2mix.nim
@@ -12,7 +12,7 @@ import
   confutils/defs,
   confutils/std/net
 
-import waku/waku_core, waku/waku_mix
+import logos_delivery/waku/waku_core, logos_delivery/waku/waku_mix
 
 type
   Fleet* = enum
diff --git a/apps/liteprotocoltester/diagnose_connections.nim b/apps/liteprotocoltester/diagnose_connections.nim
index d2cc75516..362040248 100644
--- a/apps/liteprotocoltester/diagnose_connections.nim
+++ b/apps/liteprotocoltester/diagnose_connections.nim
@@ -15,7 +15,7 @@ import
 
 import
   tools/confutils/cli_args,
-  waku/[
+  logos_delivery/waku/[
     node/peer_manager,
     waku_lightpush/common,
     waku_relay,
diff --git a/apps/liteprotocoltester/legacy_publisher.nim b/apps/liteprotocoltester/legacy_publisher.nim
index 12733ad2d..c2b729b8b 100644
--- a/apps/liteprotocoltester/legacy_publisher.nim
+++ b/apps/liteprotocoltester/legacy_publisher.nim
@@ -1,5 +1,5 @@
 import chronos, results, options
-import waku/[waku_node, waku_core]
+import logos_delivery/waku/[waku_node, waku_core]
 import publisher_base
 
 type LegacyPublisher* = ref object of PublisherBase
diff --git a/apps/liteprotocoltester/liteprotocoltester.nim b/apps/liteprotocoltester/liteprotocoltester.nim
index 1877b8477..9c0b10b95 100644
--- a/apps/liteprotocoltester/liteprotocoltester.nim
+++ b/apps/liteprotocoltester/liteprotocoltester.nim
@@ -12,7 +12,7 @@ import
 
 import
   tools/confutils/cli_args,
-  waku/[
+  logos_delivery/waku/[
     common/enr,
     common/logging,
     factory/waku as waku_factory,
diff --git a/apps/liteprotocoltester/publisher.nim b/apps/liteprotocoltester/publisher.nim
index 0df3f3e3e..cbd36ce68 100644
--- a/apps/liteprotocoltester/publisher.nim
+++ b/apps/liteprotocoltester/publisher.nim
@@ -8,7 +8,7 @@ import
   results,
   json_serialization as js
 import
-  waku/[
+  logos_delivery/waku/[
     common/logging,
     waku_node,
     node/peer_manager,
diff --git a/apps/liteprotocoltester/publisher_base.nim b/apps/liteprotocoltester/publisher_base.nim
index de88d82f8..aaa85b5f8 100644
--- a/apps/liteprotocoltester/publisher_base.nim
+++ b/apps/liteprotocoltester/publisher_base.nim
@@ -1,5 +1,5 @@
 import chronos, results
-import waku/[waku_node, waku_core]
+import logos_delivery/waku/[waku_node, waku_core]
 
 type PublisherBase* = ref object of RootObj
   wakuNode*: WakuNode
diff --git a/apps/liteprotocoltester/receiver.nim b/apps/liteprotocoltester/receiver.nim
index b62094ec6..457626af6 100644
--- a/apps/liteprotocoltester/receiver.nim
+++ b/apps/liteprotocoltester/receiver.nim
@@ -13,7 +13,7 @@ import
   json_serialization as js
 
 import
-  waku/[
+  logos_delivery/waku/[
     common/logging,
     node/peer_manager,
     waku_node,
diff --git a/apps/liteprotocoltester/service_peer_management.nim b/apps/liteprotocoltester/service_peer_management.nim
index d5cfafef1..5481bf2ce 100644
--- a/apps/liteprotocoltester/service_peer_management.nim
+++ b/apps/liteprotocoltester/service_peer_management.nim
@@ -12,7 +12,7 @@ import
 
 import
   tools/confutils/cli_args,
-  waku/[
+  logos_delivery/waku/[
     common/enr,
     waku_node,
     node/peer_manager,
diff --git a/apps/liteprotocoltester/tester_config.nim b/apps/liteprotocoltester/tester_config.nim
index 1f4bedaa8..6fb82cd4c 100644
--- a/apps/liteprotocoltester/tester_config.nim
+++ b/apps/liteprotocoltester/tester_config.nim
@@ -14,12 +14,12 @@ import
 import
   ../../tools/confutils/
     [cli_args, envvar as confEnvvarDefs, envvar_net as confEnvvarNet],
-  waku/[common/logging, waku_core, waku_core/topics/pubsub_topic]
+  logos_delivery/waku/[common/logging, waku_core, waku_core/topics/pubsub_topic]
 
 export confTomlDefs, confTomlNet, confEnvvarDefs, confEnvvarNet
 
 const
-  LitePubsubTopic* = PubsubTopic("/waku/2/rs/66/0")
+  LitePubsubTopic* = PubsubTopic("/logos_delivery/waku/2/rs/66/0")
   LiteContentTopic* = ContentTopic("/tester/1/light-pubsub-example/proto")
   DefaultMinTestMessageSizeStr* = "1KiB"
   DefaultMaxTestMessageSizeStr* = "150KiB"
diff --git a/apps/liteprotocoltester/tester_message.nim b/apps/liteprotocoltester/tester_message.nim
index 38028e4a7..1a169db04 100644
--- a/apps/liteprotocoltester/tester_message.nim
+++ b/apps/liteprotocoltester/tester_message.nim
@@ -6,7 +6,7 @@ import
   json_serialization/std/options,
   json_serialization/lexer
 
-import waku/rest_api/endpoint/serdes
+import logos_delivery/waku/rest_api/endpoint/serdes
 
 type ProtocolTesterMessage* = object
   sender*: string
diff --git a/apps/liteprotocoltester/v3_publisher.nim b/apps/liteprotocoltester/v3_publisher.nim
index c8353b5a3..bdfea75ec 100644
--- a/apps/liteprotocoltester/v3_publisher.nim
+++ b/apps/liteprotocoltester/v3_publisher.nim
@@ -1,5 +1,5 @@
 import results, options, chronos
-import waku/[waku_node, waku_core, waku_lightpush, waku_lightpush/common]
+import logos_delivery/waku/[waku_node, waku_core, waku_lightpush, waku_lightpush/common]
 import publisher_base
 
 type V3Publisher* = ref object of PublisherBase
diff --git a/apps/networkmonitor/networkmonitor.nim b/apps/networkmonitor/networkmonitor.nim
index 23607b118..61bb8d07a 100644
--- a/apps/networkmonitor/networkmonitor.nim
+++ b/apps/networkmonitor/networkmonitor.nim
@@ -17,7 +17,7 @@ import
   metrics/chronos_httpserver,
   presto/[route, server, client]
 import
-  waku/[
+  logos_delivery/waku/[
     waku_core,
     node/peer_manager,
     waku_node,
diff --git a/apps/wakucanary/wakucanary.nim b/apps/wakucanary/wakucanary.nim
index f9023c45c..287b2bb07 100644
--- a/apps/wakucanary/wakucanary.nim
+++ b/apps/wakucanary/wakucanary.nim
@@ -12,26 +12,27 @@ import
   libp2p/multicodec
 import
   ./certsgenerator,
-  waku/[waku_enr, node/peer_manager, waku_core, waku_node, factory/builder],
-  waku/net/net_config,
-  waku/waku_metadata/protocol,
-  waku/common/callbacks
+  logos_delivery/waku/
+    [waku_enr, node/peer_manager, waku_core, waku_node, factory/builder],
+  logos_delivery/waku/net/net_config,
+  logos_delivery/waku/waku_metadata/protocol,
+  logos_delivery/waku/common/callbacks
 
 # protocols and their tag
 const ProtocolsTable = {
-  "store": "/vac/waku/store/",
-  "storev3": "/vac/waku/store-query/3",
-  "relay": "/vac/waku/relay/",
-  "lightpush": "/vac/waku/lightpush/",
-  "filter": "/vac/waku/filter-subscribe/2",
-  "filter-push": "/vac/waku/filter-push/",
+  "store": "/vac/logos_delivery/waku/store/",
+  "storev3": "/vac/logos_delivery/waku/store-query/3",
+  "relay": "/vac/logos_delivery/waku/relay/",
+  "lightpush": "/vac/logos_delivery/waku/lightpush/",
+  "filter": "/vac/logos_delivery/waku/filter-subscribe/2",
+  "filter-push": "/vac/logos_delivery/waku/filter-push/",
   "ipfs-id": "/ipfs/id/",
   "autonat": "/libp2p/autonat/",
   "circuit-relay": "/libp2p/circuit/relay/",
-  "metadata": "/vac/waku/metadata/",
+  "metadata": "/vac/logos_delivery/waku/metadata/",
   "rendezvous": "/rendezvous/",
   "ipfs-ping": "/ipfs/ping/",
-  "peer-exchange": "/vac/waku/peer-exchange/",
+  "peer-exchange": "/vac/logos_delivery/waku/peer-exchange/",
   "mix": "mix/1.0.0",
 }.toTable