diff --git a/githubcom_arnetheducknimresults b/githubcom_arnetheducknimresults new file mode 160000 index 000000000..df8113dda --- /dev/null +++ b/githubcom_arnetheducknimresults @@ -0,0 +1 @@ +Subproject commit df8113dda4c2d74d460a8fa98252b0b771bf1f27 diff --git a/githubcom_ba0f3dnsclientnim_030040 b/githubcom_ba0f3dnsclientnim_030040 new file mode 160000 index 000000000..23214235d --- /dev/null +++ b/githubcom_ba0f3dnsclientnim_030040 @@ -0,0 +1 @@ +Subproject commit 23214235d4784d24aceed99bbfe153379ea557c8 diff --git a/githubcom_cheatfatenimcrypto b/githubcom_cheatfatenimcrypto new file mode 160000 index 000000000..b3dbc9c4d --- /dev/null +++ b/githubcom_cheatfatenimcrypto @@ -0,0 +1 @@ +Subproject commit b3dbc9c4d08e58c5b7bfad6dc7ef2ee52f2f4c08 diff --git a/githubcom_cheatfatenimcrypto_060 b/githubcom_cheatfatenimcrypto_060 new file mode 160000 index 000000000..b3dbc9c4d --- /dev/null +++ b/githubcom_cheatfatenimcrypto_060 @@ -0,0 +1 @@ +Subproject commit b3dbc9c4d08e58c5b7bfad6dc7ef2ee52f2f4c08 diff --git a/githubcom_logosconimlibp2pmixgit_6c5f43ae715443dc72048a12b0ea3afc06f0fa2b b/githubcom_logosconimlibp2pmixgit_6c5f43ae715443dc72048a12b0ea3afc06f0fa2b new file mode 160000 index 000000000..6c5f43ae7 --- /dev/null +++ b/githubcom_logosconimlibp2pmixgit_6c5f43ae715443dc72048a12b0ea3afc06f0fa2b @@ -0,0 +1 @@ +Subproject commit 6c5f43ae715443dc72048a12b0ea3afc06f0fa2b diff --git a/githubcom_logosmessagingnimsdsgit_2e9a7683f0e180bf112135fae3a3803eed8490d4 b/githubcom_logosmessagingnimsdsgit_2e9a7683f0e180bf112135fae3a3803eed8490d4 new file mode 160000 index 000000000..2e9a7683f --- /dev/null +++ b/githubcom_logosmessagingnimsdsgit_2e9a7683f0e180bf112135fae3a3803eed8490d4 @@ -0,0 +1 @@ +Subproject commit 2e9a7683f0e180bf112135fae3a3803eed8490d4 diff --git a/githubcom_nitelynimgraphemes_012 b/githubcom_nitelynimgraphemes_012 new file mode 160000 index 000000000..cc868c314 --- /dev/null +++ b/githubcom_nitelynimgraphemes_012 @@ -0,0 +1 @@ +Subproject commit cc868c314ced482ed88dca2b470aa019480ce4c9 diff --git a/githubcom_nitelynimsegmentation_01 b/githubcom_nitelynimsegmentation_01 new file mode 160000 index 000000000..6845c68cf --- /dev/null +++ b/githubcom_nitelynimsegmentation_01 @@ -0,0 +1 @@ +Subproject commit 6845c68cf00c1546f49d628ae11334acba966bfb diff --git a/githubcom_nitelynimunicodedb_0203 b/githubcom_nitelynimunicodedb_0203 new file mode 160000 index 000000000..f84bce283 --- /dev/null +++ b/githubcom_nitelynimunicodedb_0203 @@ -0,0 +1 @@ +Subproject commit f84bce2835c8d0a96584e3e9cf2a868dd80b3a78 diff --git a/githubcom_nitelynimunicodedb_02303 b/githubcom_nitelynimunicodedb_02303 new file mode 160000 index 000000000..f84bce283 --- /dev/null +++ b/githubcom_nitelynimunicodedb_02303 @@ -0,0 +1 @@ +Subproject commit f84bce2835c8d0a96584e3e9cf2a868dd80b3a78 diff --git a/githubcom_nitelynimunicodedb_04005 b/githubcom_nitelynimunicodedb_04005 new file mode 160000 index 000000000..3c2354acc --- /dev/null +++ b/githubcom_nitelynimunicodedb_04005 @@ -0,0 +1 @@ +Subproject commit 3c2354acc27b2732772b8152e9fd2dd051d3d67d diff --git a/githubcom_nitelynimunicodedb_05106 b/githubcom_nitelynimunicodedb_05106 new file mode 160000 index 000000000..56089e2fb --- /dev/null +++ b/githubcom_nitelynimunicodedb_05106 @@ -0,0 +1 @@ +Subproject commit 56089e2fb1e19b173d120e5e4d1f086ca040b0c8 diff --git a/githubcom_nitelynimunicodedb_06007 b/githubcom_nitelynimunicodedb_06007 new file mode 160000 index 000000000..3009ceb79 --- /dev/null +++ b/githubcom_nitelynimunicodedb_06007 @@ -0,0 +1 @@ +Subproject commit 3009ceb79fcae78773cf6d96f1d5eed4cf35fd97 diff --git a/githubcom_nitelynimunicodedb_07 b/githubcom_nitelynimunicodedb_07 new file mode 160000 index 000000000..66f245871 --- /dev/null +++ b/githubcom_nitelynimunicodedb_07 @@ -0,0 +1 @@ +Subproject commit 66f2458710dc641dd4640368f9483c8a0ec70561 diff --git a/githubcom_nitelynimunicodedb_08 b/githubcom_nitelynimunicodedb_08 new file mode 160000 index 000000000..66f245871 --- /dev/null +++ b/githubcom_nitelynimunicodedb_08 @@ -0,0 +1 @@ +Subproject commit 66f2458710dc641dd4640368f9483c8a0ec70561 diff --git a/githubcom_nitelynimunicodeplus_0102 b/githubcom_nitelynimunicodeplus_0102 new file mode 160000 index 000000000..c9cef2183 --- /dev/null +++ b/githubcom_nitelynimunicodeplus_0102 @@ -0,0 +1 @@ +Subproject commit c9cef21838d739ad81d2c6e137871577a92d8a66 diff --git a/githubcom_nitelynimunicodeplus_02003 b/githubcom_nitelynimunicodeplus_02003 new file mode 160000 index 000000000..1e6980de5 --- /dev/null +++ b/githubcom_nitelynimunicodeplus_02003 @@ -0,0 +1 @@ +Subproject commit 1e6980de5d1c82b3989a471a8a838e57a4dbb3c2 diff --git a/githubcom_nitelynimunicodeplus_03004 b/githubcom_nitelynimunicodeplus_03004 new file mode 160000 index 000000000..8df4f6864 --- /dev/null +++ b/githubcom_nitelynimunicodeplus_03004 @@ -0,0 +1 @@ +Subproject commit 8df4f6864490ddba201087289132fd3dee4ee918 diff --git a/githubcom_nitelynimunicodeplus_04005 b/githubcom_nitelynimunicodeplus_04005 new file mode 160000 index 000000000..c9b89a465 --- /dev/null +++ b/githubcom_nitelynimunicodeplus_04005 @@ -0,0 +1 @@ +Subproject commit c9b89a465feee4096f8adde93c94a0616ee71c6a diff --git a/githubcom_statusimnimbearssl b/githubcom_statusimnimbearssl new file mode 160000 index 000000000..22c6a76ce --- /dev/null +++ b/githubcom_statusimnimbearssl @@ -0,0 +1 @@ +Subproject commit 22c6a76ce015bc07e011562bdcfc51d9446c1e82 diff --git a/githubcom_statusimnimbearssl_025 b/githubcom_statusimnimbearssl_025 new file mode 160000 index 000000000..22c6a76ce --- /dev/null +++ b/githubcom_statusimnimbearssl_025 @@ -0,0 +1 @@ +Subproject commit 22c6a76ce015bc07e011562bdcfc51d9446c1e82 diff --git a/githubcom_statusimnimbearssl_027 b/githubcom_statusimnimbearssl_027 new file mode 160000 index 000000000..22c6a76ce --- /dev/null +++ b/githubcom_statusimnimbearssl_027 @@ -0,0 +1 @@ +Subproject commit 22c6a76ce015bc07e011562bdcfc51d9446c1e82 diff --git a/githubcom_statusimnimchronicles b/githubcom_statusimnimchronicles new file mode 160000 index 000000000..27ec50742 --- /dev/null +++ b/githubcom_statusimnimchronicles @@ -0,0 +1 @@ +Subproject commit 27ec507429a4eb81edc20f28292ee8ec420be05b diff --git a/githubcom_statusimnimchronicles_0102 b/githubcom_statusimnimchronicles_0102 new file mode 160000 index 000000000..27ec50742 --- /dev/null +++ b/githubcom_statusimnimchronicles_0102 @@ -0,0 +1 @@ +Subproject commit 27ec507429a4eb81edc20f28292ee8ec420be05b diff --git a/githubcom_statusimnimchronicles_0110 b/githubcom_statusimnimchronicles_0110 new file mode 160000 index 000000000..27ec50742 --- /dev/null +++ b/githubcom_statusimnimchronicles_0110 @@ -0,0 +1 @@ +Subproject commit 27ec507429a4eb81edc20f28292ee8ec420be05b diff --git a/githubcom_statusimnimchronos_403410 b/githubcom_statusimnimchronos_403410 new file mode 160000 index 000000000..785fcf4dd --- /dev/null +++ b/githubcom_statusimnimchronos_403410 @@ -0,0 +1 @@ +Subproject commit 785fcf4ddec1101a3df1f044d6331504d7ab95c6 diff --git a/githubcom_statusimnimchronos_403500 b/githubcom_statusimnimchronos_403500 new file mode 160000 index 000000000..45f43a9ad --- /dev/null +++ b/githubcom_statusimnimchronos_403500 @@ -0,0 +1 @@ +Subproject commit 45f43a9ad8bd8bcf5903b42f365c1c879bd54240 diff --git a/githubcom_statusimnimchronos_404 b/githubcom_statusimnimchronos_404 new file mode 160000 index 000000000..45f43a9ad --- /dev/null +++ b/githubcom_statusimnimchronos_404 @@ -0,0 +1 @@ +Subproject commit 45f43a9ad8bd8bcf5903b42f365c1c879bd54240 diff --git a/githubcom_statusimnimchronos_420440 b/githubcom_statusimnimchronos_420440 new file mode 160000 index 000000000..45f43a9ad --- /dev/null +++ b/githubcom_statusimnimchronos_420440 @@ -0,0 +1 @@ +Subproject commit 45f43a9ad8bd8bcf5903b42f365c1c879bd54240 diff --git a/githubcom_statusimnimchronos_422 b/githubcom_statusimnimchronos_422 new file mode 160000 index 000000000..45f43a9ad --- /dev/null +++ b/githubcom_statusimnimchronos_422 @@ -0,0 +1 @@ +Subproject commit 45f43a9ad8bd8bcf5903b42f365c1c879bd54240 diff --git a/githubcom_statusimnimfaststreams_030 b/githubcom_statusimnimfaststreams_030 new file mode 160000 index 000000000..50889cd16 --- /dev/null +++ b/githubcom_statusimnimfaststreams_030 @@ -0,0 +1 @@ +Subproject commit 50889cd16ec8771106cdd0eeea460039e8571e06 diff --git a/githubcom_statusimnimhttputils b/githubcom_statusimnimhttputils new file mode 160000 index 000000000..f142cb2e8 --- /dev/null +++ b/githubcom_statusimnimhttputils @@ -0,0 +1 @@ +Subproject commit f142cb2e8bd812dd002a6493b6082827bb248592 diff --git a/githubcom_statusimnimhttputils_020 b/githubcom_statusimnimhttputils_020 new file mode 160000 index 000000000..f142cb2e8 --- /dev/null +++ b/githubcom_statusimnimhttputils_020 @@ -0,0 +1 @@ +Subproject commit f142cb2e8bd812dd002a6493b6082827bb248592 diff --git a/githubcom_statusimnimhttputils_030 b/githubcom_statusimnimhttputils_030 new file mode 160000 index 000000000..f142cb2e8 --- /dev/null +++ b/githubcom_statusimnimhttputils_030 @@ -0,0 +1 @@ +Subproject commit f142cb2e8bd812dd002a6493b6082827bb248592 diff --git a/githubcom_statusimnimjsonrpcgit_43bbf499143eb45046c83ac9794c9e3280a2b8e7 b/githubcom_statusimnimjsonrpcgit_43bbf499143eb45046c83ac9794c9e3280a2b8e7 new file mode 160000 index 000000000..43bbf4991 --- /dev/null +++ b/githubcom_statusimnimjsonrpcgit_43bbf499143eb45046c83ac9794c9e3280a2b8e7 @@ -0,0 +1 @@ +Subproject commit 43bbf499143eb45046c83ac9794c9e3280a2b8e7 diff --git a/githubcom_statusimnimjsonserialization_042 b/githubcom_statusimnimjsonserialization_042 new file mode 160000 index 000000000..c343b0e24 --- /dev/null +++ b/githubcom_statusimnimjsonserialization_042 @@ -0,0 +1 @@ +Subproject commit c343b0e243d9e17e2c40f3a8a24340f7c4a71d44 diff --git a/githubcom_statusimnimmetrics b/githubcom_statusimnimmetrics new file mode 160000 index 000000000..a1296caf3 --- /dev/null +++ b/githubcom_statusimnimmetrics @@ -0,0 +1 @@ +Subproject commit a1296caf3ebb5f30f51a5feae7749a30df2824c2 diff --git a/githubcom_statusimnimprotobufserialization_46753f2b90365035bc0f75c6894e160c35880be1 b/githubcom_statusimnimprotobufserialization_46753f2b90365035bc0f75c6894e160c35880be1 new file mode 160000 index 000000000..46753f2b9 --- /dev/null +++ b/githubcom_statusimnimprotobufserialization_46753f2b90365035bc0f75c6894e160c35880be1 @@ -0,0 +1 @@ +Subproject commit 46753f2b90365035bc0f75c6894e160c35880be1 diff --git a/githubcom_statusimnimsecp256k1 b/githubcom_statusimnimsecp256k1 new file mode 160000 index 000000000..d8f1288b7 --- /dev/null +++ b/githubcom_statusimnimsecp256k1 @@ -0,0 +1 @@ +Subproject commit d8f1288b7c72f00be5fc2c5ea72bf5cae1eafb15 diff --git a/githubcom_statusimnimserialization b/githubcom_statusimnimserialization new file mode 160000 index 000000000..b0f2fa329 --- /dev/null +++ b/githubcom_statusimnimserialization @@ -0,0 +1 @@ +Subproject commit b0f2fa32960ea532a184394b0f27be37bd80248b diff --git a/githubcom_statusimnimserialization_044 b/githubcom_statusimnimserialization_044 new file mode 160000 index 000000000..b0f2fa329 --- /dev/null +++ b/githubcom_statusimnimserialization_044 @@ -0,0 +1 @@ +Subproject commit b0f2fa32960ea532a184394b0f27be37bd80248b diff --git a/githubcom_statusimnimstew b/githubcom_statusimnimstew new file mode 160000 index 000000000..4382b18f0 --- /dev/null +++ b/githubcom_statusimnimstew @@ -0,0 +1 @@ +Subproject commit 4382b18f04b3c43c8409bfcd6b62063773b2bbaa diff --git a/githubcom_statusimnimstew_040 b/githubcom_statusimnimstew_040 new file mode 160000 index 000000000..4382b18f0 --- /dev/null +++ b/githubcom_statusimnimstew_040 @@ -0,0 +1 @@ +Subproject commit 4382b18f04b3c43c8409bfcd6b62063773b2bbaa diff --git a/githubcom_statusimnimstew_042 b/githubcom_statusimnimstew_042 new file mode 160000 index 000000000..4382b18f0 --- /dev/null +++ b/githubcom_statusimnimstew_042 @@ -0,0 +1 @@ +Subproject commit 4382b18f04b3c43c8409bfcd6b62063773b2bbaa diff --git a/githubcom_statusimnimstint b/githubcom_statusimnimstint new file mode 160000 index 000000000..470b78925 --- /dev/null +++ b/githubcom_statusimnimstint @@ -0,0 +1 @@ +Subproject commit 470b7892561b5179ab20bd389a69217d6213fe58 diff --git a/githubcom_statusimnimtaskpools_010 b/githubcom_statusimnimtaskpools_010 new file mode 160000 index 000000000..9e8ccc754 --- /dev/null +++ b/githubcom_statusimnimtaskpools_010 @@ -0,0 +1 @@ +Subproject commit 9e8ccc754631ac55ac2fd495e167e74e86293edb diff --git a/githubcom_statusimnimunittest2 b/githubcom_statusimnimunittest2 new file mode 160000 index 000000000..26f2ef3ae --- /dev/null +++ b/githubcom_statusimnimunittest2 @@ -0,0 +1 @@ +Subproject commit 26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189 diff --git a/githubcom_statusimnimwebsock_021040 b/githubcom_statusimnimwebsock_021040 new file mode 160000 index 000000000..c105d98e6 --- /dev/null +++ b/githubcom_statusimnimwebsock_021040 @@ -0,0 +1 @@ +Subproject commit c105d98e6522e0e2cbe3dfa11b07a273e9fd0e7b diff --git a/githubcom_statusimnimwebsock_42c37b4172519566db016810eccfce8a02cc1cdf b/githubcom_statusimnimwebsock_42c37b4172519566db016810eccfce8a02cc1cdf new file mode 160000 index 000000000..42c37b417 --- /dev/null +++ b/githubcom_statusimnimwebsock_42c37b4172519566db016810eccfce8a02cc1cdf @@ -0,0 +1 @@ +Subproject commit 42c37b4172519566db016810eccfce8a02cc1cdf diff --git a/githubcom_statusimnimzlib b/githubcom_statusimnimzlib new file mode 160000 index 000000000..190246aa0 --- /dev/null +++ b/githubcom_statusimnimzlib @@ -0,0 +1 @@ +Subproject commit 190246aa0bb6569781370964fa2faa474203d6dd diff --git a/githubcom_vacp2pbearsslpkeydecoder_d34aa46bf9d0a3ffff810fbd3c4d2fa024eb9368 b/githubcom_vacp2pbearsslpkeydecoder_d34aa46bf9d0a3ffff810fbd3c4d2fa024eb9368 new file mode 160000 index 000000000..d34aa46bf --- /dev/null +++ b/githubcom_vacp2pbearsslpkeydecoder_d34aa46bf9d0a3ffff810fbd3c4d2fa024eb9368 @@ -0,0 +1 @@ +Subproject commit d34aa46bf9d0a3ffff810fbd3c4d2fa024eb9368 diff --git a/githubcom_vacp2pnimboringssl_004 b/githubcom_vacp2pnimboringssl_004 new file mode 160000 index 000000000..03bd48b54 --- /dev/null +++ b/githubcom_vacp2pnimboringssl_004 @@ -0,0 +1 @@ +Subproject commit 03bd48b54bc2bdc12d8c1bd9c95a32951f2c5962 diff --git a/githubcom_vacp2pnimjwtgit_057ec95eb5af0eea9c49bfe9025b3312c95dc5f2 b/githubcom_vacp2pnimjwtgit_057ec95eb5af0eea9c49bfe9025b3312c95dc5f2 new file mode 160000 index 000000000..057ec95eb --- /dev/null +++ b/githubcom_vacp2pnimjwtgit_057ec95eb5af0eea9c49bfe9025b3312c95dc5f2 @@ -0,0 +1 @@ +Subproject commit 057ec95eb5af0eea9c49bfe9025b3312c95dc5f2 diff --git a/githubcom_vacp2pnimlibp2p_1152 b/githubcom_vacp2pnimlibp2p_1152 new file mode 160000 index 000000000..79002827e --- /dev/null +++ b/githubcom_vacp2pnimlibp2p_1152 @@ -0,0 +1 @@ +Subproject commit 79002827ef32ba51b83e123e1649fc4b394612a1 diff --git a/githubcom_vacp2pnimlibp2pgit_d4cd68b91b82f34a0ede3766ab1ca8119d5015f8 b/githubcom_vacp2pnimlibp2pgit_d4cd68b91b82f34a0ede3766ab1ca8119d5015f8 new file mode 160000 index 000000000..d4cd68b91 --- /dev/null +++ b/githubcom_vacp2pnimlibp2pgit_d4cd68b91b82f34a0ede3766ab1ca8119d5015f8 @@ -0,0 +1 @@ +Subproject commit d4cd68b91b82f34a0ede3766ab1ca8119d5015f8 diff --git a/githubcom_vacp2pnimlsquic_041 b/githubcom_vacp2pnimlsquic_041 new file mode 160000 index 000000000..00e4b7dfa --- /dev/null +++ b/githubcom_vacp2pnimlsquic_041 @@ -0,0 +1 @@ +Subproject commit 00e4b7dfaa197cd120267aa897b33b0914166b45 diff --git a/githubcom_zevvnpeg_130 b/githubcom_zevvnpeg_130 new file mode 160000 index 000000000..409f6796d --- /dev/null +++ b/githubcom_zevvnpeg_130 @@ -0,0 +1 @@ +Subproject commit 409f6796d0e880b3f0222c964d1da7de6e450811 diff --git a/waku.nimble b/waku.nimble index 300937057..9c526ea1a 100644 --- a/waku.nimble +++ b/waku.nimble @@ -33,7 +33,7 @@ requires "nim >= 2.2.4", "dnsdisc", "dnsclient", "httputils >= 0.4.1", - "websock >= 0.3.0", + "https://github.com/status-im/nim-websock#42c37b4172519566db016810eccfce8a02cc1cdf", # Cryptography "nimcrypto == 0.6.4", # 0.6.4 used in libp2p. Version 0.7.3 makes test to crash on Ubuntu. "secp256k1", @@ -64,7 +64,7 @@ requires "https://github.com/logos-co/nim-libp2p-mix.git#6c5f43ae715443dc72048a1 requires "https://github.com/logos-messaging/nim-sds.git#2e9a7683f0e180bf112135fae3a3803eed8490d4" -requires "https://github.com/vacp2p/nim-lsquic" +requires "lsquic >= 0.4.1" requires "https://github.com/vacp2p/nim-jwt.git#057ec95eb5af0eea9c49bfe9025b3312c95dc5f2" proc getMyCPU(): string = diff --git a/waku/discovery/waku_discv5.nim b/waku/discovery/waku_discv5.nim index 29ef47166..de4f6ec08 100644 --- a/waku/discovery/waku_discv5.nim +++ b/waku/discovery/waku_discv5.nim @@ -463,7 +463,7 @@ proc setupAndStartDiscv5*( nodeTopicSubscriptionQueue: AsyncEventQueue[SubscriptionEvent], conf: Discv5Conf, dynamicBootstrapNodes: seq[RemotePeerInfo], - rng: ref HmacDrbgContext, + rng: crypto.Rng, key: crypto.PrivateKey, p2pListenAddress: IpAddress, portsShift: uint16, diff --git a/waku/discovery/waku_kademlia.nim b/waku/discovery/waku_kademlia.nim index a0488fb45..5690c45e8 100644 --- a/waku/discovery/waku_kademlia.nim +++ b/waku/discovery/waku_kademlia.nim @@ -120,7 +120,7 @@ proc lookup*( proc registerLookupService*(self: WakuKademlia, serviceId: string) = if serviceId notin self.discoveredServices: - discard self.protocol.startDiscovering(serviceId) + discard self.protocol.registerInterest(serviceId) self.discoveredServices.add(serviceId) proc advertiseService*(self: WakuKademlia, service: ServiceInfo) =