deploy: d24796e5599d63c0a010475b854649560f4fd5c2

apps/chat2/chat2.nim

@@ -4,11 +4,14 @@
 when not(compileOption("threads")):
   {.fatal: "Please, compile this program with the --threads:on option!".}
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import std/[tables, strformat, strutils, times, json, options, random]
 import confutils, chronicles, chronos, stew/shims/net as stewNet,
-       eth/keys, bearssl, stew/[byteutils, endians2, results],
+       eth/keys, bearssl, stew/[byteutils, results],
        nimcrypto/pbkdf2
 import libp2p/[switch,                   # manage transports, a single entry point for dialing and listening
                crypto/crypto,            # cryptographic functions
@@ -17,10 +20,8 @@ import libp2p/[switch,                   # manage transports, a single entry poi
                peerinfo,                 # manage the information of a peer, such as peer ID and public / private key
                peerid,                   # Implement how peers interact
                protobuf/minprotobuf,     # message serialisation/deserialisation from and to protobufs
-               protocols/protocol,       # define the protocol base type
                protocols/secure/secio,   # define the protocol of secure input / output, allows encrypted communication that uses public keys to validate signed messages instead of a certificate authority like in TLS
-               nameresolving/dnsresolver,# define DNS resolution
-               muxers/muxer]             # define an interface for stream multiplexing, allowing peers to offer many protocols over a single connection
+               nameresolving/dnsresolver]# define DNS resolution
 import   
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_lightpush,

apps/chat2bridge/chat2bridge.nim

@@ -1,10 +1,13 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[tables, times, strutils, hashes, sequtils],
   chronos, confutils, chronicles, chronicles/topics_registry, chronos/streams/tlsstream,
   metrics, metrics/chronos_httpserver,
-  stew/[byteutils, endians2],
+  stew/byteutils,
   stew/shims/net as stewNet, json_rpc/rpcserver,
   # Matterbridge client imports
   ../../waku/common/utils/matterbridge_client,

apps/wakubridge/wakubridge.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[tables, hashes, sequtils],

apps/wakunode2/wakunode2.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[options, tables, strutils, sequtils, os],
@@ -9,18 +12,17 @@ import
   system/ansi_c,
   eth/keys,
   eth/p2p/discoveryv5/enr,
-  libp2p/[builders, multihash],
+  libp2p/builders,
+  libp2p/multihash,
   libp2p/crypto/crypto,
   libp2p/protocols/ping,
-  libp2p/protocols/pubsub/[gossipsub, rpc/messages],
-  libp2p/transports/[transport, wstransport],
+  libp2p/protocols/pubsub/gossipsub,
+  libp2p/protocols/pubsub/rpc/messages,
+  libp2p/transports/wstransport,
   libp2p/nameresolving/dnsresolver
 import
   ../../waku/common/sqlite,
   ../../waku/common/utils/nat,
-  ../../waku/v2/protocol/waku_store,
-  ../../waku/v2/protocol/waku_filter,
-  ../../waku/v2/protocol/waku_peer_exchange,
   ../../waku/v2/node/peer_manager/peer_manager,
   ../../waku/v2/node/peer_manager/peer_store/waku_peer_storage,
   ../../waku/v2/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations,
@@ -35,6 +37,8 @@ import
   ../../waku/v2/node/wakuswitch, 
   ../../waku/v2/node/waku_node,
   ../../waku/v2/node/waku_metrics,
+  ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/protocol/waku_peer_exchange,
   ../../waku/v2/utils/peers,
   ../../waku/v2/utils/wakuenr,
   ./wakunode2_setup_rest,

apps/wakunode2/wakunode2_setup_rest.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   stew/shims/net,

apps/wakunode2/wakunode2_setup_rpc.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/tables,

tests/v1/test_rpc_waku.nim

@@ -3,7 +3,7 @@
 import
   std/[options, os, strutils],
   testutils/unittests, stew/byteutils, json_rpc/[rpcserver, rpcclient],
-  eth/common as eth_common, eth/[rlp, keys, p2p],
+  eth/common as eth_common, eth/[keys, p2p],
   ../../waku/v1/protocol/waku_protocol,
   ../../waku/v1/node/rpc/[hexstrings, rpc_types, waku, key_storage]
 

tests/v2/test_message_store_queue.nim

@@ -1,7 +1,7 @@
 {.used.}
 
 import
-  std/[sequtils, strutils, algorithm],
+  std/[sequtils, algorithm],
   stew/results,
   testutils/unittests
 import

tests/v2/test_message_store_queue_pagination.nim

@@ -1,7 +1,7 @@
 {.used.}
 
 import
-  std/[options, sequtils, algorithm],
+  std/[sequtils, algorithm],
   testutils/unittests, 
   nimcrypto/sha2,
   libp2p/protobuf/minprotobuf

tests/v2/test_peer_exchange.nim

@@ -4,7 +4,6 @@ import
   std/[sequtils, options],
   stew/shims/net,
   testutils/unittests,
-  chronicles,
   chronos,
   libp2p/peerid,
   libp2p/crypto/crypto,

tests/v2/test_peer_manager.nim

@@ -1,11 +1,11 @@
 {.used.}
 
 import
-  std/[options, tables, sequtils],
+  std/[options, sequtils],
   stew/shims/net as stewNet,
-  chronicles,
   testutils/unittests,
-  json_rpc/[rpcserver, rpcclient],
+  json_rpc/rpcserver,
+  json_rpc/rpcclient,
   eth/keys,
   eth/common/eth_types,
   libp2p/[builders, switch, multiaddress],

tests/v2/test_peer_storage.nim

@@ -1,7 +1,7 @@
 {.used.}
 
 import
-  std/[unittest, sets],
+  testutils/unittests,
   libp2p/crypto/crypto
 import
   ../../waku/common/sqlite,
@@ -9,6 +9,7 @@ import
   ../../waku/v2/node/peer_manager/peer_store/waku_peer_storage,
   ../test_helpers
 
+
 suite "Peer Storage":
 
   test "Store, replace and retrieve from persistent peer storage":

tests/v2/test_rest_debug_api.nim

@@ -2,7 +2,6 @@
 
 import
   stew/shims/net,
-  chronicles,
   testutils/unittests,
   presto, presto/client as presto_client,
   libp2p/peerinfo,

tests/v2/test_rest_debug_api_serdes.nim

@@ -1,9 +1,9 @@
 {.used.}
 
-import std/typetraits
-import chronicles,
-  unittest2,
-  stew/[results, byteutils],
+import
+  stew/results, 
+  stew/byteutils,
+  testutils/unittests,
   json_serialization
 import 
   ../../waku/v2/node/rest/serdes,

tests/v2/test_rest_relay_api.nim

@@ -4,7 +4,6 @@ import
   std/sequtils,
   stew/byteutils,
   stew/shims/net,
-  chronicles,
   testutils/unittests,
   presto, presto/client as presto_client,
   libp2p/crypto/crypto,

tests/v2/test_waku_bridge.nim

@@ -2,8 +2,10 @@
 
 import
   std/[sequtils, strutils, tables],
+  stew/byteutils, 
+  stew/shims/net as stewNet, 
   testutils/unittests,
-  chronicles, chronos, stew/shims/net as stewNet, stew/[byteutils, objects],
+  chronos, 
   libp2p/crypto/crypto,
   libp2p/crypto/secp,
   libp2p/peerid,

tests/v2/test_waku_discv5.nim

@@ -1,15 +1,14 @@
 {.used.}
 
 import
-  std/tables,
-  chronicles,
   chronos,
   testutils/unittests,
   stew/byteutils,
   stew/shims/net,
   libp2p/crypto/crypto,
   eth/keys,
-  eth/p2p/discoveryv5/enr,
+  eth/p2p/discoveryv5/enr
+import
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/node/discv5/waku_discv5,
   ../../waku/v2/node/waku_node,

tests/v2/test_waku_filter.nim

@@ -1,10 +1,9 @@
 {.used.}
 
 import
-  std/[options, tables, sets],
+  std/[options, tables],
   testutils/unittests,
   chronos, 
-  chronicles,
   libp2p/crypto/crypto
 import
   ../../waku/v2/node/peer_manager/peer_manager,

tests/v2/test_waku_keepalive.nim

@@ -1,18 +1,23 @@
 {.used.}
 
 import
-  std/[options, tables, sets],
-  testutils/unittests, chronos, chronicles,
+  std/options,
   stew/shims/net as stewNet,
+  testutils/unittests, 
+  chronos, 
+  chronicles,
   libp2p/switch,
   libp2p/protobuf/minprotobuf,
   libp2p/protocols/ping,
-  libp2p/stream/[bufferstream, connection],
-  libp2p/crypto/crypto,
-  libp2p/multistream,
+  libp2p/stream/bufferstream, 
+  libp2p/stream/connection,
+  libp2p/crypto/crypto
+import
   ../../waku/v2/node/waku_node,
   ../../waku/v2/utils/peers,
-  ../test_helpers, ./utils
+  ../test_helpers, 
+  ./utils
+
 
 procSuite "Waku Keepalive":
 

tests/v2/test_waku_lightpush.nim

@@ -1,9 +1,7 @@
 {.used.}
 
 import
-  std/options,
   testutils/unittests, 
-  chronicles,
   chronos, 
   libp2p/crypto/crypto
 import

tests/v2/test_waku_noise_sessions.nim

@@ -1,20 +1,17 @@
 {.used.}
 
 import
-  testutils/unittests,
-  std/random,
-  std/strutils,
-  std/tables,
+  std/[random,tables],
   stew/byteutils,
+  testutils/unittests,
+  libp2p/protobuf/minprotobuf
+import
   ../../waku/v2/node/waku_payload,
   ../../waku/v2/protocol/waku_noise/noise_types,
   ../../waku/v2/protocol/waku_noise/noise_utils,
-  ../../waku/v2/protocol/waku_noise/noise,
   ../../waku/v2/protocol/waku_noise/noise_handshake_processing,
   ../../waku/v2/protocol/waku_message,
-  libp2p/protobuf/minprotobuf,
-  ../test_helpers,
-  stew/endians2
+  ../test_helpers
 
 procSuite "Waku Noise Sessions":
   

tests/v2/test_waku_peer_exchange.nim

@@ -1,14 +1,13 @@
 {.used.}
 
 import
-  std/[options, tables, sets],
+  std/options,
   testutils/unittests,
   chronos,
   chronicles,
   stew/shims/net,
   libp2p/switch,
   libp2p/crypto/crypto,
-  libp2p/multistream,
   eth/keys,
   eth/p2p/discoveryv5/enr
 import
@@ -16,7 +15,6 @@ import
   ../../waku/v2/node/peer_manager/peer_manager,
   ../../waku/v2/node/discv5/waku_discv5,
   ../../waku/v2/protocol/waku_peer_exchange,
-  ../../waku/v2/protocol/waku_relay,
   ../test_helpers,
   ./utils
 

tests/v2/test_waku_rln_relay.nim

@@ -2,19 +2,22 @@
 {.used.}
 
 import
-  std/[options, os, sequtils, times, deques],
-  testutils/unittests, chronos, chronicles, stint,
-  stew/byteutils, stew/shims/net as stewNet,
-  libp2p/crypto/crypto,
-  json
+  std/[options, os, sequtils, times],
+  stew/byteutils, 
+  stew/shims/net as stewNet,
+  testutils/unittests, 
+  chronos, 
+  chronicles, 
+  stint,
+  libp2p/crypto/crypto
 import
-  ../../waku/v2/protocol/waku_message,
-  ../../waku/v2/protocol/waku_rln_relay/[rln, 
-      waku_rln_relay_utils,
-      waku_rln_relay_types,
-      waku_rln_relay_constants,
-      waku_rln_relay_metrics],
   ../../waku/v2/node/waku_node,
+  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/protocol/waku_rln_relay/rln, 
+  ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils,
+  ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_types,
+  ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_constants,
+  ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_metrics,
   ../test_helpers
 
 const RlnRelayPubsubTopic = "waku/2/rlnrelay/proto"

tests/v2/test_waku_store.nim

@@ -1,11 +1,9 @@
 {.used.}
 
 import
-  std/[options, tables, sets, sequtils],
-  stew/byteutils,
+  std/[options, sequtils],
   testutils/unittests, 
   chronos, 
-  chronicles,
   libp2p/crypto/crypto
 import
   ../../waku/common/sqlite,

tests/v2/test_waku_store_client.nim

@@ -1,10 +1,9 @@
 {.used.}
 
 import
-  std/[options, tables],
+  std/options,
   testutils/unittests, 
   chronos, 
-  chronicles,
   libp2p/crypto/crypto
 import
   ../../waku/common/sqlite,
@@ -13,7 +12,6 @@ import
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_store,
   ../../waku/v2/protocol/waku_store/client,
-  ../../waku/v2/protocol/waku_store/protocol_metrics,
   ./testlib/common,
   ./testlib/switch
 

tests/v2/test_waku_store_rpc_codec.nim

@@ -2,12 +2,9 @@
 
 import
   std/[options, times],
-  stew/byteutils,
-  testutils/unittests, 
-  chronos, 
-  chronicles
+  testutils/unittests,
+  chronos
 import
-  ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_store,
   ../../waku/v2/utils/time,
   ./testlib/common

tests/v2/test_waku_swap.nim

@@ -1,8 +1,7 @@
 {.used.}
 
 import
-  std/[options, tables, sets],
-  stew/byteutils,
+  std/tables,
   stew/shims/net as stewNet, 
   testutils/unittests,
   chronos, 
@@ -14,7 +13,6 @@ import
   libp2p/switch,
   eth/keys
 import
-  ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_store,
   ../../waku/v2/protocol/waku_swap/waku_swap,
   ../../waku/v2/node/storage/message/waku_store_queue,

tests/v2/test_wakunode.nim

@@ -1,8 +1,11 @@
 {.used.}
 
 import
+  stew/byteutils,
+  stew/shims/net as stewNet,
   testutils/unittests,
-  chronicles, chronos, stew/shims/net as stewNet, stew/byteutils, std/os,
+  chronicles, 
+  chronos, 
   libp2p/crypto/crypto,
   libp2p/crypto/secp,
   libp2p/multiaddress,
@@ -10,11 +13,13 @@ import
   libp2p/protocols/pubsub/rpc/messages,
   libp2p/protocols/pubsub/pubsub,
   libp2p/protocols/pubsub/gossipsub,
-  libp2p/nameresolving/mockresolver,
-  ../../waku/v2/protocol/[waku_relay, waku_message],
+  libp2p/nameresolving/mockresolver
+import
+  ../../waku/v2/node/waku_node,
   ../../waku/v2/node/peer_manager/peer_manager,
-  ../../waku/v2/utils/peers,
-  ../../waku/v2/node/waku_node
+  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/protocol/waku_relay,
+  ../../waku/v2/utils/peers
 
 
 procSuite "WakuNode":

tests/v2/test_wakunode_filter.nim

@@ -1,17 +1,14 @@
 {.used.}
 
 import
-  stew/byteutils, 
   stew/shims/net as stewNet, 
   testutils/unittests,
-  chronicles,
   chronos, 
   libp2p/crypto/crypto
 import
   ../../waku/v2/node/peer_manager/peer_manager,
   ../../waku/v2/node/waku_node,
   ../../waku/v2/protocol/waku_message,
-  ../../waku/v2/protocol/waku_filter,
   ../../waku/v2/utils/peers,
   ./testlib/common
 

tests/v2/test_wakunode_lightpush.nim

@@ -1,10 +1,8 @@
 {.used.}
 
 import
-  stew/byteutils, 
   stew/shims/net as stewNet, 
   testutils/unittests,
-  chronicles, 
   chronos, 
   libp2p/crypto/crypto,
   libp2p/switch

tests/v2/test_wakunode_rln_relay.nim

@@ -3,10 +3,10 @@
 import
   std/sequtils,
   stew/byteutils,
-  stew/shims/net as stewNet, 
+  stew/shims/net as stewNet,
   testutils/unittests,
-  chronicles, 
-  chronos, 
+  chronicles,
+  chronos,
   libp2p/crypto/crypto,
   libp2p/peerid,
   libp2p/multiaddress,
@@ -15,12 +15,12 @@ import
   libp2p/protocols/pubsub/pubsub,
   eth/keys
 import
-  ../../waku/v2/protocol/waku_rln_relay/[waku_rln_relay_utils,
-        waku_rln_relay_types,
-        waku_rln_relay_constants],
-  ../../waku/v2/protocol/[waku_relay, waku_message],
-  ../../waku/v2/utils/peers,
-  ../../waku/v2/node/waku_node
+  ../../waku/v2/node/waku_node,
+  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils,
+  ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_types,
+  ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_constants,
+  ../../waku/v2/utils/peers
 
 from std/times import epochTime
 

tests/v2/test_wakunode_store.nim

@@ -1,7 +1,6 @@
 {.used.}
 
 import
-  stew/byteutils, 
   stew/shims/net as stewNet, 
   testutils/unittests,
   chronicles, 

tests/whisper/test_shh_config.nim

@@ -10,7 +10,7 @@
 {.used.}
 
 import
-  std/[sequtils, options, unittest, times],
+  std/[sequtils, unittest, times],
   ../../waku/whisper/whisper_protocol as whisper
 
 suite "Whisper envelope validation":

waku/common/utils/matterbridge_client.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[httpclient, json, uri, options],

waku/common/utils/nat.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[strutils, options],

waku/v1/node/rpc/hexstrings.nim

@@ -25,7 +25,7 @@
 ]#
 
 import
-  stint, stew/byteutils, eth/[keys, rlp], eth/common/eth_types,
+  stint, stew/byteutils, eth/keys, eth/common/eth_types,
   ../../protocol/waku_protocol
 
 type

waku/v1/node/rpc/rpc_types.nim

@@ -1,5 +1,5 @@
 import
-  hexstrings, options, eth/[keys, rlp],
+  hexstrings, options, eth/keys,
   ../../protocol/waku_protocol
 
 #[

waku/v1/node/rpc/waku.nim

@@ -1,6 +1,6 @@
 import
   json_rpc/rpcserver, tables, options, sequtils,
-  eth/[common, rlp, keys, p2p],
+  eth/[common, keys, p2p],
   nimcrypto/[sysrand, hmac, sha2, pbkdf2],
   rpc_types, hexstrings, key_storage,
   ../../protocol/waku_protocol

waku/v1/node/wakunode1.nim

@@ -1,11 +1,14 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   confutils, chronos, json_rpc/rpcserver, 
   metrics, metrics/chronicles_support, metrics/chronos_httpserver,
   stew/shims/net as stewNet,
-  eth/[keys, p2p], eth/common/utils,
-  eth/p2p/[discovery, enode, peer_pool, bootnodes],
+  eth/[keys, p2p],
+  eth/p2p/[enode, peer_pool],
   ../../whisper/[whispernodes, whisper_protocol],
   ../protocol/[waku_protocol, waku_bridge],
   ../../common/utils/nat,

waku/v1/protocol/waku_bridge.nim

@@ -8,7 +8,10 @@
 #            MIT license (LICENSE-MIT)
 #
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   eth/p2p,

waku/v1/protocol/waku_mail.nim

@@ -8,7 +8,10 @@
 #            MIT license (LICENSE-MIT)
 #
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   chronos,

waku/v1/protocol/waku_protocol.nim

@@ -37,7 +37,10 @@
 ## However, they only make real sense after ``connectToNetwork`` was started. As
 ## else there will be no peers to send and receive messages from.
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   options, tables, times, chronos, chronicles, metrics,

waku/v2/node/discv5/waku_discv5.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[strutils, options],

waku/v2/node/dnsdisc/waku_dnsdisc.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 ## A set of utilities to integrate EIP-1459 DNS-based discovery
 ## for Waku v2 nodes.

waku/v2/node/jsonrpc/admin_api.nim

@@ -1,7 +1,10 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
-  std/[options, sequtils, sets],
+  std/sequtils,
   chronicles,
   json_rpc/rpcserver,
   libp2p/[peerinfo, switch]

waku/v2/node/jsonrpc/debug_api.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   chronicles,

waku/v2/node/jsonrpc/filter_api.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[tables, sequtils],

waku/v2/node/jsonrpc/jsonrpc_types.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[options,tables],

waku/v2/node/jsonrpc/jsonrpc_utils.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[options, json],

waku/v2/node/jsonrpc/private_api.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[tables,sequtils],

waku/v2/node/jsonrpc/relay_api.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[tables,sequtils],

waku/v2/node/jsonrpc/store_api.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/options,

waku/v2/node/message_cache.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[tables, sequtils],

waku/v2/node/peer_manager/peer_store/waku_peer_storage.nim

@@ -2,7 +2,7 @@ when (NimMajor, NimMinor) < (1, 4):
   {.push raises: [Defect].}
 else:
   {.push raises: [].}
-  
+
 
 import
   std/sets, 

waku/v2/node/peer_manager/waku_peer_store.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[tables, sequtils, sets],

waku/v2/node/rest/base64.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import stew/[results, byteutils, base64]
 

waku/v2/node/rest/client.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import presto/client
 

waku/v2/node/rest/debug/api_types.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   chronicles,

waku/v2/node/rest/debug/debug_api.nim

@@ -1,7 +1,9 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
-  stew/byteutils,
   chronicles,
   json_serialization,
   json_serialization/std/options,

waku/v2/node/rest/relay/api_types.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[sets, strformat],

waku/v2/node/rest/relay/relay_api.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[sets, sequtils],

waku/v2/node/rest/relay/topic_cache.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   stew/results,

waku/v2/node/rest/serdes.nim

@@ -1,12 +1,18 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import 
   std/typetraits,
   stew/results,
+  stew/byteutils,
   chronicles,
   serialization,
   json_serialization,
-  json_serialization/std/[options, net, sets],
+  json_serialization/std/options,
+  json_serialization/std/net,
+  json_serialization/std/sets,
   presto/common
 
 logScope: 

waku/v2/node/rest/server.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   stew/results,

waku/v2/node/rest/utils.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import std/typetraits
 import 

waku/v2/node/storage/message/message_retention_policy.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   stew/results

waku/v2/node/storage/message/message_retention_policy_capacity.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import 
   stew/results,

waku/v2/node/storage/message/message_retention_policy_time.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import 
   std/times,

waku/v2/node/storage/message/queue_store/index.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   stew/byteutils,

waku/v2/node/storage/message/queue_store/queue_store.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[options, times],

waku/v2/node/storage/message/sqlite_store.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import ./sqlite_store/sqlite_store
 

waku/v2/node/storage/message/sqlite_store/queries.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[options, sequtils],

waku/v2/node/storage/message/sqlite_store/sqlite_store.nim

@@ -1,6 +1,9 @@
 # The code in this file is an adaptation of the Sqlite KV Store found in nim-eth.
 # https://github.com/status-im/nim-eth/blob/master/eth/db/kvstore_sqlite3.nim
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import 
   std/[options, tables],

waku/v2/node/storage/message/waku_store_queue.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   ./queue_store/index,

waku/v2/node/storage/migration/migration_utils.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import 
   std/[os, algorithm, tables, strutils], 

waku/v2/node/waku_metrics.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   stew/shims/net,
@@ -8,10 +11,7 @@ import
   metrics/chronos_httpserver
 import
   ../protocol/waku_filter/protocol_metrics as filter_metrics,
-  ../protocol/waku_store/protocol_metrics as store_metrics,
-  ../protocol/waku_lightpush/protocol_metrics as lightpush_metrics,
   ../protocol/waku_swap/waku_swap,
-  ../protocol/waku_peer_exchange,
   ../utils/collector,
   ./peer_manager/peer_manager,
   ./waku_node
@@ -19,6 +19,7 @@ import
 when defined(rln) or defined(rlnzerokit):
   import ../protocol/waku_rln_relay/waku_rln_relay_metrics
 
+
 const LogInterval = 30.seconds
 
 logScope:

waku/v2/node/waku_node.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[hashes, options, tables, strutils, sequtils, os],
@@ -11,19 +14,23 @@ import
   eth/p2p/discoveryv5/enr,
   libp2p/crypto/crypto,
   libp2p/protocols/ping,
-  libp2p/protocols/pubsub/[gossipsub, rpc/messages],
+  libp2p/protocols/pubsub/gossipsub,
+  libp2p/protocols/pubsub/rpc/messages,
   libp2p/nameresolving/nameresolver,
-  libp2p/[builders, multihash],
-  libp2p/transports/[transport, tcptransport, wstransport]
+  libp2p/builders,
+  libp2p/multihash,
+  libp2p/transports/tcptransport,
+  libp2p/transports/wstransport
 import
-  ../protocol/[waku_relay, waku_message],
+  ../protocol/waku_message,
+  ../protocol/waku_relay,
   ../protocol/waku_store,
-  ../protocol/waku_store/client,
+  ../protocol/waku_store/client as store_client,
   ../protocol/waku_swap/waku_swap,
   ../protocol/waku_filter,
-  ../protocol/waku_filter/client,
+  ../protocol/waku_filter/client as filter_client,
   ../protocol/waku_lightpush,
-  ../protocol/waku_lightpush/client,
+  ../protocol/waku_lightpush/client as lightpush_client,
   ../protocol/waku_rln_relay/waku_rln_relay_types,
   ../protocol/waku_peer_exchange,
   ../utils/peers, 

waku/v2/node/waku_payload.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/options,

waku/v2/protocol/waku_filter.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   ./waku_filter/rpc,

waku/v2/protocol/waku_filter/client.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import 
   std/[options, tables, sequtils],

waku/v2/protocol/waku_filter/protocol_metrics.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import metrics
 

waku/v2/protocol/waku_filter/rpc_codec.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   libp2p/protobuf/minprotobuf,

waku/v2/protocol/waku_lightpush/client.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/options,

waku/v2/protocol/waku_lightpush/protocol.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/options,

waku/v2/protocol/waku_lightpush/protocol_metrics.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import metrics
 

waku/v2/protocol/waku_lightpush/rpc.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   ../waku_message

waku/v2/protocol/waku_lightpush/rpc_codec.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 
 import

waku/v2/protocol/waku_message.nim

@@ -6,7 +6,10 @@
 ## For payload content and encryption, see waku/v2/node/waku_payload.nim
 
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   libp2p/protobuf/minprotobuf,

waku/v2/protocol/waku_noise/noise.nim

@@ -6,17 +6,20 @@
 ## Implementation partially inspired by noise-libp2p:
 ## https://github.com/status-im/nim-libp2p/blob/master/libp2p/protocols/secure/noise.nim
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
-import std/[oids, options, strutils, tables]
+import std/[options, strutils]
+import stew/byteutils
 import chronos
 import chronicles
 import bearssl/rand
-import stew/[results, byteutils, endians2]
-import nimcrypto/[utils, sha2, hmac]
+import stew/endians2
+import nimcrypto/[sha2, hmac]
 
 import libp2p/utility
-import libp2p/errors
 import libp2p/crypto/[crypto, chacha20poly1305, hkdf]
 import libp2p/protocols/secure/secure
 

waku/v2/protocol/waku_noise/noise_handshake_processing.nim

@@ -2,16 +2,17 @@
 ## See spec for more details:
 ## https://github.com/vacp2p/rfc/tree/master/content/docs/rfcs/35
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
-import std/[oids, options, strutils, tables]
+import std/[options, strutils, tables]
 import chronos
 import chronicles
 import bearssl/rand
-import stew/[results, endians2]
-import nimcrypto/[utils, sha2, hmac]
+import stew/results
 
-import libp2p/errors
 import libp2p/crypto/[chacha20poly1305, curve25519]
 
 import ./noise_types

waku/v2/protocol/waku_noise/noise_types.nim

@@ -5,14 +5,16 @@
 ## Implementation partially inspired by noise-libp2p:
 ## https://github.com/status-im/nim-libp2p/blob/master/libp2p/protocols/secure/noise.nim
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
-import std/[options, strutils, tables]
+import std/[options, tables]
 import chronos
 import chronicles
 import bearssl
-import stew/[results, endians2]
-import nimcrypto/[utils, sha2, hmac]
+import nimcrypto/[sha2, hmac]
 
 import libp2p/errors
 import libp2p/crypto/[crypto, chacha20poly1305, curve25519]

waku/v2/protocol/waku_noise/noise_utils.nim

@@ -3,16 +3,18 @@
 ## See spec for more details:
 ## https://github.com/vacp2p/rfc/tree/master/content/docs/rfcs/35
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import std/[algorithm, base64, oids, options, strutils, tables, sequtils]
 import chronos
 import chronicles
 import bearssl/rand
 import stew/[results, endians2, byteutils]
-import nimcrypto/[utils, sha2, hmac]
+import nimcrypto/[sha2, hmac]
 
-import libp2p/errors
 import libp2p/crypto/[chacha20poly1305, curve25519, hkdf]
 
 import ./noise_types

waku/v2/protocol/waku_peer_exchange.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   ./waku_peer_exchange/rpc,

waku/v2/protocol/waku_peer_exchange/protocol.nim

@@ -10,7 +10,6 @@ import
 import
   ../../node/peer_manager/peer_manager,
   ../../node/discv5/waku_discv5,
-  ../../utils/requests,
   ../waku_message,
   ../waku_relay,
   ./rpc,

waku/v2/protocol/waku_peer_exchange/rpc_codec.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   libp2p/protobuf/minprotobuf,

waku/v2/protocol/waku_rln_relay/rln.nim

@@ -1,6 +1,9 @@
 # this module contains the Nim wrappers for the rln library https://github.com/kilic/rln/blob/3bbec368a4adc68cd5f9bfae80b17e1bbb4ef373/src/ffi.rs
 
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   os,

waku/v2/protocol/waku_rln_relay/waku_rln_relay_metrics.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   chronicles,

waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim

@@ -1,15 +1,20 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
-  std/[tables, deques],
-  options, chronos, stint,
+  std/[options, tables, deques],
+  stew/arrayops,
+  chronos, 
+  stint,
   web3,
   eth/keys,
-  libp2p/protobuf/minprotobuf,
-  stew/arrayops,
-  waku_rln_relay_constants,
+  libp2p/protobuf/minprotobuf
+import
   ../../utils/protobuf
 
+
 type RlnRelayResult*[T] = Result[T, string]
 
 when defined(rln) or (not defined(rln) and not defined(rlnzerokit)):

waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[sequtils, tables, times, os, deques],

waku/v2/protocol/waku_store/client.nim

@@ -1,4 +1,7 @@
-{.push raises: [Defect].}
+when (NimMajor, NimMinor) < (1, 4):
+  {.push raises: [Defect].}
+else:
+  {.push raises: [].}
 
 import
   std/[options, sequtils, times],