Merge 50deb8f188ab565dd752b7a273caf80e31d3713c into d2cb0a5adaf65546b155ef4d987ac5d00563a701

.gitmodules

@@ -200,3 +200,7 @@
 	url = https://github.com/logos-co/mix-rln-spam-protection-plugin.git
 	ignore = untracked
 	branch = master
+[submodule "vendor/nim-libp2p-mix"]
+	path = vendor/nim-libp2p-mix
+	url = git@github.com:logos-co/nim-libp2p-mix.git
+	branch = master

apps/chat2mix/chat2mix.nim

@@ -29,9 +29,9 @@ import
     peerid, # Implement how peers interact
     protobuf/minprotobuf, # message serialisation/deserialisation from and to protobufs
     nameresolving/dnsresolver,
-    protocols/mix/curve25519,
-    protocols/mix/mix_protocol,
   ] # define DNS resolution
+import libp2p_mix/curve25519
+import libp2p_mix/mix_protocol
 import
   waku/[
     waku_core,

examples/lightpush_mix/lightpush_publisher_mix.nim

@@ -7,8 +7,8 @@ import
   confutils,
   libp2p/crypto/crypto,
   libp2p/crypto/curve25519,
-  libp2p/protocols/mix,
-  libp2p/protocols/mix/curve25519,
+  libp2p_mix,
+  libp2p_mix/curve25519,
   libp2p/multiaddress,
   eth/keys,
   eth/p2p/discoveryv5/enr,

vendor/mix-rln-spam-protection-plugin

@@ -1 +1 @@
-Subproject commit b2fe03f8693b0893fa5674b39410c979e4fb57e9
+Subproject commit 8222ae3a98d83308bd98e92ea24b3d841d6c7289

vendor/nim-libp2p-mix

@@ -0,0 +1 @@
+Subproject commit 13e9b585c50d7328d508eae815c2a3245039a9e4

waku.nimble

@@ -25,6 +25,7 @@ requires "nim >= 2.2.4",
   "stint",
   "metrics",
   "libp2p >= 1.15.0",
+  "libp2p_mix",
   "web3",
   "presto",
   "regex",

waku/discovery/waku_kademlia.nim

@@ -11,7 +11,7 @@ import
   libp2p/crypto/curve25519,
   libp2p/protocols/[kademlia, service_discovery],
   libp2p/protocols/service_discovery/types as kad_types,
-  libp2p/protocols/mix/mix_protocol
+  libp2p_mix/mix_protocol
 
 import waku/waku_core, waku/node/peer_manager
 

waku/factory/conf_builder/mix_conf_builder.nim

@@ -1,5 +1,5 @@
 import chronicles, std/options, results
-import libp2p/crypto/crypto, libp2p/crypto/curve25519, libp2p/protocols/mix/curve25519
+import libp2p/crypto/crypto, libp2p/crypto/curve25519, libp2p_mix/curve25519
 import ../waku_conf, waku/waku_mix
 
 logScope:

waku/node/kernel_api/lightpush.nim

@@ -17,7 +17,7 @@ import
   libp2p/transports/tcptransport,
   libp2p/transports/wstransport,
   libp2p/utility,
-  libp2p/protocols/mix
+  libp2p_mix
 
 import
   ../waku_node,

waku/node/waku_node.nim

@@ -23,8 +23,8 @@ import
   libp2p/transports/wstransport,
   libp2p/utility,
   libp2p/utils/offsettedseq,
-  libp2p/protocols/mix,
-  libp2p/protocols/mix/mix_protocol
+  libp2p_mix,
+  libp2p_mix/mix_protocol
 
 import
   waku/[

waku/waku_enr/capabilities.nim

@@ -3,7 +3,7 @@
 import
   std/[options, bitops, sequtils, net, tables], results, eth/keys, libp2p/crypto/crypto
 import ../common/enr, ../waku_core/codecs
-import libp2p/protocols/mix
+import libp2p_mix
 
 const CapabilitiesEnrField* = "waku2"
 

waku/waku_mix/protocol.nim

@@ -5,13 +5,13 @@ import chronicles, std/[options, sequtils], chronos, results, metrics
 import
   libp2p/crypto/curve25519,
   libp2p/crypto/crypto,
-  libp2p/protocols/mix,
-  libp2p/protocols/mix/mix_node,
-  libp2p/protocols/mix/mix_protocol,
-  libp2p/protocols/mix/mix_metrics,
-  libp2p/protocols/mix/delay_strategy,
-  libp2p/protocols/mix/spam_protection,
-  libp2p/protocols/mix/cover_traffic,
+  libp2p_mix,
+  libp2p_mix/mix_node,
+  libp2p_mix/mix_protocol,
+  libp2p_mix/mix_metrics,
+  libp2p_mix/delay_strategy,
+  libp2p_mix/spam_protection,
+  libp2p_mix/cover_traffic,
   libp2p/[multiaddress, multicodec, peerid, peerinfo],
   eth/common/keys