diff --git a/config.nims b/config.nims
index babfd687a..51744dedb 100644
--- a/config.nims
+++ b/config.nims
@@ -119,3 +119,8 @@ if defined(android):
   switch("passC", "--sysroot=" & sysRoot)
   switch("passL", "--sysroot=" & sysRoot)
   switch("cincludes", sysRoot & "/usr/include/")
+# begin Nimble config (version 2)
+--noNimblePath
+when withDir(thisDir(), system.fileExists("nimble.paths")):
+  include "nimble.paths"
+# end Nimble config
diff --git a/nimble.lock b/nimble.lock
index 4591bef39..0eb3b588b 100644
--- a/nimble.lock
+++ b/nimble.lock
@@ -1,70 +1,301 @@
 {
   "version": 2,
   "packages": {
-    "chronicles": {
-      "version": "0.12.1",
-      "vcsRevision": "54f5b726025e8c7385e3a6529d3aa27454c6e6ff",
-      "url": "https://github.com/status-im/nim-chronicles.git",
+    "unittest2": {
+      "version": "0.2.5",
+      "vcsRevision": "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189",
+      "url": "https://github.com/status-im/nim-unittest2",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "02bb3751ba9ddc3c17bfd89f2e41cb6bfb8fc0c9"
+      }
+    },
+    "bearssl": {
+      "version": "0.2.6",
+      "vcsRevision": "11e798b62b8e6beabe958e048e9e24c7e0f9ee63",
+      "url": "https://github.com/status-im/nim-bearssl",
       "downloadMethod": "git",
       "dependencies": [
-        "testutils",
-        "json_serialization"
-      ]
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "7e068f119664cf47ad0cfb74ef4c56fb6b616523"
+      }
+    },
+    "bearssl_pkey_decoder": {
+      "version": "0.1.0",
+      "vcsRevision": "21dd3710df9345ed2ad8bf8f882761e07863b8e0",
+      "url": "https://github.com/vacp2p/bearssl_pkey_decoder",
+      "downloadMethod": "git",
+      "dependencies": [
+        "bearssl"
+      ],
+      "checksums": {
+        "sha1": "21b42e2e6ddca6c875d3fc50f36a5115abf51714"
+      }
+    },
+    "results": {
+      "version": "0.5.1",
+      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
+      "url": "https://github.com/arnetheduck/nim-results",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7"
+      }
+    },
+    "stew": {
+      "version": "0.4.2",
+      "vcsRevision": "b66168735d6f3841c5239c3169d3fe5fe98b1257",
+      "url": "https://github.com/status-im/nim-stew",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "928e82cb8d2f554e8f10feb2349ee9c32fee3a8c"
+      }
+    },
+    "faststreams": {
+      "version": "0.5.0",
+      "vcsRevision": "ce27581a3e881f782f482cb66dc5b07a02bd615e",
+      "url": "https://github.com/status-im/nim-faststreams",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "ee61e507b805ae1df7ec936f03f2d101b0d72383"
+      }
+    },
+    "serialization": {
+      "version": "0.5.2",
+      "vcsRevision": "b0f2fa32960ea532a184394b0f27be37bd80248b",
+      "url": "https://github.com/status-im/nim-serialization",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "unittest2",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "fa35c1bb76a0a02a2379fe86eaae0957c7527cb8"
+      }
+    },
+    "json_serialization": {
+      "version": "0.4.4",
+      "vcsRevision": "c343b0e243d9e17e2c40f3a8a24340f7c4a71d44",
+      "url": "https://github.com/status-im/nim-json-serialization",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "serialization",
+        "stew",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "8b3115354104858a0ac9019356fb29720529c2bd"
+      }
+    },
+    "testutils": {
+      "version": "0.8.0",
+      "vcsRevision": "e4d37dc1652d5c63afb89907efb5a5e812261797",
+      "url": "https://github.com/status-im/nim-testutils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "d1678f50aa47d113b4e77d41eec2190830b523fa"
+      }
+    },
+    "chronicles": {
+      "version": "0.12.2",
+      "vcsRevision": "27ec507429a4eb81edc20f28292ee8ec420be05b",
+      "url": "https://github.com/status-im/nim-chronicles",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "serialization",
+        "json_serialization",
+        "testutils"
+      ],
+      "checksums": {
+        "sha1": "02febb20d088120b2836d3306cfa21f434f88f65"
+      }
+    },
+    "httputils": {
+      "version": "0.4.0",
+      "vcsRevision": "c53852d9e24205b6363bba517fa8ee7bde823691",
+      "url": "https://github.com/status-im/nim-http-utils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "298bc5b6fe4e5aa9c3b7e2ebfa17191675020f10"
+      }
     },
     "chronos": {
       "version": "4.0.4",
-      "vcsRevision": "85af4db764ecd3573c4704139560df3943216cf1",
-      "url": "https://github.com/status-im/nim-chronos.git",
+      "vcsRevision": "712f9937e46a9ba1949230e8e119d776aea1c6bb",
+      "url": "https://github.com/status-im/nim-chronos",
       "downloadMethod": "git",
       "dependencies": [
+        "results",
         "stew",
         "bearssl",
-        "unittest2",
-        "results"
-      ]
+        "httputils",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "03e96742e7148c38767c028c23a99cf316672f1c"
+      }
     },
     "confutils": {
       "version": "0.1.0",
-      "vcsRevision": "e214b3992a31acece6a9aada7d0a1ad37c928f3b",
-      "url": "https://github.com/status-im/nim-confutils.git",
+      "vcsRevision": "5286ed67d363a3630ece85a0e8c1141d1d52b434",
+      "url": "https://github.com/status-im/nim-confutils",
       "downloadMethod": "git",
       "dependencies": [
         "stew",
-        "serialization"
-      ]
+        "serialization",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "591f70a7e803788d34ae99e8be71a30f2a2a028d"
+      }
     },
     "db_connector": {
       "version": "0.1.0",
       "vcsRevision": "74aef399e5c232f95c9fc5c987cebac846f09d62",
-      "url": "https://github.com/nim-lang/db_connector.git",
+      "url": "https://github.com/nim-lang/db_connector",
       "downloadMethod": "git",
-      "dependencies": []
+      "dependencies": [],
+      "checksums": {
+        "sha1": "b20053975976f94afac253d67cc6ef9200b32d02"
+      }
     },
     "dnsclient": {
       "version": "0.3.4",
       "vcsRevision": "23214235d4784d24aceed99bbfe153379ea557c8",
-      "url": "https://github.com/ba0f3/dnsclient.nim.git",
+      "url": "https://github.com/ba0f3/dnsclient.nim",
       "downloadMethod": "git",
-      "dependencies": []
+      "dependencies": [],
+      "checksums": {
+        "sha1": "65262c7e533ff49d6aca5539da4bc6c6ce132f40"
+      }
     },
-    "dnsdisc": {
-      "version": "0.1.0",
-      "vcsRevision": "b71d029f4da4ec56974d54c04518bada00e1b623",
-      "url": "https://github.com/status-im/nim-dnsdisc.git",
+    "nimcrypto": {
+      "version": "0.7.3",
+      "vcsRevision": "423ea4fed8de6f4544b7e3b30d868f527ed3b947",
+      "url": "https://github.com/cheatfate/nimcrypto",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "580910605aca0ea60b40bfaa116d0b8af1091314"
+      }
+    },
+    "stint": {
+      "version": "0.8.2",
+      "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58",
+      "url": "https://github.com/status-im/nim-stint",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "d8f871fd617e7857192d4609fe003b48942a8ae5"
+      }
+    },
+    "secp256k1": {
+      "version": "0.6.0.3.2",
+      "vcsRevision": "b526c4b436809aa1cfe650026d796cf7b8328b91",
+      "url": "https://github.com/status-im/nim-secp256k1",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results",
+        "nimcrypto"
+      ],
+      "checksums": {
+        "sha1": "e6e50bd4a29cb473b070eb5359d87d8946d96075"
+      }
+    },
+    "nat_traversal": {
+      "version": "0.0.1",
+      "vcsRevision": "860e18c37667b5dd005b94c63264560c35d88004",
+      "url": "https://github.com/status-im/nim-nat-traversal",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results"
+      ],
+      "checksums": {
+        "sha1": "1a376d3e710590ef2c48748a546369755f0a7c97"
+      }
+    },
+    "metrics": {
+      "version": "0.1.2",
+      "vcsRevision": "11d0cddfb0e711aa2a8c75d1892ae24a64c299fc",
+      "url": "https://github.com/status-im/nim-metrics",
       "downloadMethod": "git",
       "dependencies": [
         "chronos",
-        "chronicles",
-        "stew",
-        "eth",
-        "dnsclient",
-        "metrics"
-      ]
+        "results",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "5cdac99d85d3c146d170e85064c88fb28f377842"
+      }
+    },
+    "sqlite3_abi": {
+      "version": "3.51.1.0",
+      "vcsRevision": "6797c31836bff377bf50f1ac7bf8122449bf99ba",
+      "url": "https://github.com/arnetheduck/nim-sqlite3-abi",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "6e108cbacb20ba361ebd1de9f3da6e4b30f9181d"
+      }
+    },
+    "minilru": {
+      "version": "0.1.0",
+      "vcsRevision": "e3d6e6eb5f119a0b22fdab418f7a588be462ea66",
+      "url": "https://github.com/status-im/nim-minilru",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "a2981b7ff1b7e0fd61e64844f35fe98fd35de1b2"
+      }
+    },
+    "snappy": {
+      "version": "0.1.0",
+      "vcsRevision": "00bfcef94f8ef6981df5d5b994897f6695badfb2",
+      "url": "https://github.com/status-im/nim-snappy",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "unittest2",
+        "results",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "e572d60d6a3178c5b1cde2400c51ad771812cd3d"
+      }
     },
     "eth": {
-      "version": "1.0.0",
+      "version": "0.9.0",
       "vcsRevision": "d9135e6c3c5d6d819afdfb566aa8d958756b73a8",
-      "url": "https://github.com/status-im/nim-eth.git",
+      "url": "https://github.com/status-im/nim-eth",
       "downloadMethod": "git",
       "dependencies": [
         "nimcrypto",
@@ -76,80 +307,158 @@
         "nat_traversal",
         "metrics",
         "sqlite3_abi",
+        "confutils",
+        "testutils",
+        "unittest2",
         "results",
-        "unittest2"
-      ]
+        "minilru",
+        "snappy"
+      ],
+      "checksums": {
+        "sha1": "2e01b0cfff9523d110562af70d19948280f8013e"
+      }
     },
-    "faststreams": {
-      "version": "0.3.0",
-      "vcsRevision": "c3ac3f639ed1d62f59d3077d376a29c63ac9750c",
-      "url": "https://github.com/status-im/nim-faststreams.git",
+    "dnsdisc": {
+      "version": "0.1.0",
+      "vcsRevision": "203abd2b3e758e0ea3ae325769b20a7e1bcd1010",
+      "url": "https://github.com/status-im/nim-dnsdisc",
       "downloadMethod": "git",
       "dependencies": [
+        "bearssl",
+        "chronicles",
+        "chronos",
+        "eth",
+        "secp256k1",
         "stew",
         "testutils",
-        "unittest2"
-      ]
+        "unittest2",
+        "nimcrypto",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "c8aeb7a29b378d9ed5201c8f0273000b46552e26"
+      }
     },
     "ffi": {
-      "version": "0.1.3",
-      "vcsRevision": "06111de155253b34e47ed2aaed1d61d08d62cc1b",
-      "url": "https://github.com/logos-messaging/nim-ffi.git",
+      "version": "0.1.0",
+      "vcsRevision": "c2cc2d7ea1e0f7eb6f64661b7777ec0c2fd1d753",
+      "url": "https://github.com/logos-messaging/nim-ffi",
       "downloadMethod": "git",
-      "dependencies": []
+      "dependencies": [
+        "chronos"
+      ],
+      "checksums": {
+        "sha1": "4c96b0a56f219e86037662f4ddd89d0483852ae8"
+      }
     },
-    "http_utils": {
-      "version": "0.3.0",
-      "vcsRevision": "79cbab1460f4c0cdde2084589d017c43a3d7b4f1",
-      "url": "https://github.com/status-im/nim-http-utils.git",
+    "zlib": {
+      "version": "0.1.0",
+      "vcsRevision": "c71efff5fd1721362b3363dc7d0e2a4c0dbc6453",
+      "url": "https://github.com/status-im/nim-zlib",
       "downloadMethod": "git",
       "dependencies": [
         "stew",
         "results"
-      ]
+      ],
+      "checksums": {
+        "sha1": "b98773348eda614ff6b252213dcd852fc9d68e89"
+      }
+    },
+    "websock": {
+      "version": "0.2.1",
+      "vcsRevision": "35ae76f1559e835c80f9c1a3943bf995d3dd9eb5",
+      "url": "https://github.com/status-im/nim-websock",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronos",
+        "httputils",
+        "chronicles",
+        "stew",
+        "nimcrypto",
+        "bearssl",
+        "results",
+        "zlib"
+      ],
+      "checksums": {
+        "sha1": "1cb5efa10cd389bc01d0707c242ae010c76a03cd"
+      }
     },
     "json_rpc": {
-      "version": "0.4.3",
-      "vcsRevision": "9665c265035f49f5ff94bbffdeadde68e19d6221",
-      "url": "https://github.com/status-im/nim-json-rpc.git",
+      "version": "0.5.4",
+      "vcsRevision": "b6e40a776fa2d00b97a9366761fb7da18f31ae5c",
+      "url": "https://github.com/status-im/nim-json-rpc",
       "downloadMethod": "git",
       "dependencies": [
-        "json_serialization",
+        "stew",
+        "nimcrypto",
+        "stint",
         "chronos",
-        "websock",
+        "httputils",
         "chronicles",
-        "unittest2",
-        "stew"
-      ]
-    },
-    "json_serialization": {
-      "version": "0.2.6",
-      "vcsRevision": "b65fd6a7e64c864dabe40e7dfd6c7d07db0014ac",
-      "url": "https://github.com/status-im/nim-json-serialization.git",
-      "downloadMethod": "git",
-      "dependencies": [
+        "websock",
         "serialization",
-        "stew"
-      ]
+        "json_serialization",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "d8e8be795fcf098f4ce03b5826f6b3153f6a6e07"
+      }
     },
     "jwt": {
       "version": "0.2",
       "vcsRevision": "18f8378de52b241f321c1f9ea905456e89b95c6f",
       "url": "https://github.com/vacp2p/nim-jwt.git",
       "downloadMethod": "git",
-      "dependencies": []
+      "dependencies": [
+        "bearssl",
+        "bearssl_pkey_decoder"
+      ],
+      "checksums": {
+        "sha1": "bcfd6fc9c5e10a52b87117219b7ab5c98136bc8e"
+      }
     },
     "libbacktrace": {
-      "version": "0.0.8",
+      "version": "0.0.9",
       "vcsRevision": "d8bd4ce5c46bb6d2f984f6b3f3d7380897d95ecb",
-      "url": "https://github.com/status-im/nim-libbacktrace.git",
+      "url": "https://github.com/status-im/nim-libbacktrace",
       "downloadMethod": "git",
-      "dependencies": []
+      "dependencies": [],
+      "checksums": {
+        "sha1": "ae3e8ecc27d80fd02b4538c7bdc9edf470d5023e"
+      }
+    },
+    "ngtcp2": {
+      "version": "0.39.0",
+      "vcsRevision": "791eb859145f9f268eb23eb9cbe777bdd7699c4d",
+      "url": "https://github.com/status-im/nim-ngtcp2",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "48fa97d200e6d4213ae389a2a6e0677f5d8795a5"
+      }
+    },
+    "quic": {
+      "version": "0.5.2",
+      "vcsRevision": "6d8678a159bfb902f9725f0081d542134cd93916",
+      "url": "https://github.com/vacp2p/nim-quic",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "chronos",
+        "nimcrypto",
+        "ngtcp2",
+        "unittest2",
+        "chronicles",
+        "bearssl"
+      ],
+      "checksums": {
+        "sha1": "a32e3d6a43b2552ebe8f27457094feb9bf3f6651"
+      }
     },
     "libp2p": {
-      "version": "1.6.0",
+      "version": "1.14.3",
       "vcsRevision": "eb7e6ff89889e41b57515f891ba82986c54809fb",
-      "url": "https://github.com/vacp2p/nim-libp2p.git",
+      "url": "https://github.com/vacp2p/nim-libp2p",
       "downloadMethod": "git",
       "dependencies": [
         "nimcrypto",
@@ -161,217 +470,117 @@
         "secp256k1",
         "stew",
         "websock",
+        "unittest2",
         "results",
-        "lsquic",
-        "unittest2"
-      ]
+        "quic",
+        "jwt"
+      ],
+      "checksums": {
+        "sha1": "04eed030305ed9ec128b6699066f0988eb75ec89"
+      }
     },
     "lsquic": {
-      "version": "0.1.0",
+      "version": "0.0.1",
       "vcsRevision": "f3fe33462601ea34eb2e8e9c357c92e61f8d121b",
-      "url": "https://github.com/vacp2p/nim-lsquic.git",
-      "downloadMethod": "git",
-      "dependencies": []
-    },
-    "metrics": {
-      "version": "0.0.1",
-      "vcsRevision": "ecf64c6078d1276d3b7d9b3d931fbdb70004db11",
-      "url": "https://github.com/status-im/nim-metrics.git",
+      "url": "https://github.com/vacp2p/nim-lsquic",
       "downloadMethod": "git",
       "dependencies": [
-        "chronos"
-      ]
-    },
-    "minilru": {
-      "version": "1.0.0",
-      "vcsRevision": "0c4b2bce959591f0a862e9b541ba43c6d0cf3476",
-      "url": "https://github.com/status-im/nim-minilru.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "results"
-      ]
-    },
-    "nat_traversal": {
-      "version": "0.0.1",
-      "vcsRevision": "860e18c37667b5dd005b94c63264560c35d88004",
-      "url": "https://github.com/status-im/nim-nat-traversal.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "chronicles",
+        "zlib",
         "stew",
-        "results"
-      ]
-    },
-    "nimcrypto": {
-      "version": "0.6.0",
-      "vcsRevision": "721fb99ee099b632eb86dfad1f0d96ee87583774",
-      "url": "https://github.com/cheatfate/nimcrypto.git",
-      "downloadMethod": "git",
-      "dependencies": []
+        "chronos",
+        "nimcrypto",
+        "unittest2",
+        "chronicles"
+      ],
+      "checksums": {
+        "sha1": "407b39ad3e84ad794b76df8d63ecafb749af6f4f"
+      }
     },
     "presto": {
-      "version": "0.1.0",
-      "vcsRevision": "92b1c7ff141e6920e1f8a98a14c35c1fa098e3be",
-      "url": "https://github.com/status-im/nim-presto.git",
+      "version": "0.1.1",
+      "vcsRevision": "d66043dd7ede146442e6c39720c76a20bde5225f",
+      "url": "https://github.com/status-im/nim-presto",
       "downloadMethod": "git",
       "dependencies": [
         "chronos",
         "chronicles",
-        "stew",
-        "results"
-      ]
+        "metrics",
+        "results",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "8df97c45683abe2337bdff43b844c4fbcc124ca2"
+      }
+    },
+    "unicodedb": {
+      "version": "0.13.2",
+      "vcsRevision": "66f2458710dc641dd4640368f9483c8a0ec70561",
+      "url": "https://github.com/nitely/nim-unicodedb",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "739102d885d99bb4571b1955f5f12aee423c935b"
+      }
     },
     "regex": {
-      "version": "0.26.1",
+      "version": "0.26.3",
       "vcsRevision": "4593305ed1e49731fc75af1dc572dd2559aad19c",
-      "url": "https://github.com/nitely/nim-regex.git",
+      "url": "https://github.com/nitely/nim-regex",
       "downloadMethod": "git",
       "dependencies": [
         "unicodedb"
-      ]
-    },
-    "results": {
-      "version": "0.5.1",
-      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
-      "url": "https://github.com/arnetheduck/nim-results.git",
-      "downloadMethod": "git",
-      "dependencies": []
-    },
-    "secp256k1": {
-      "version": "0.6.0",
-      "vcsRevision": "9dd3df62124aae79d564da636bb22627c53c7676",
-      "url": "https://github.com/status-im/nim-secp256k1.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "results"
-      ]
-    },
-    "serialization": {
-      "version": "0.2.4",
-      "vcsRevision": "6f525d5447d97256750ca7856faead03e562ed20",
-      "url": "https://github.com/status-im/nim-serialization.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "faststreams"
-      ]
-    },
-    "sqlite3_abi": {
-      "version": "1.3.2",
-      "vcsRevision": "bdf01cf4236fb40788f0733466cdf6708783cbac",
-      "url": "https://github.com/arnetheduck/nim-sqlite3-abi.git",
-      "downloadMethod": "git",
-      "dependencies": []
-    },
-    "stew": {
-      "version": "0.2.0",
-      "vcsRevision": "e5740014961438610d336cd81706582dbf2c96f0",
-      "url": "https://github.com/status-im/nim-stew.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "results"
-      ]
-    },
-    "stint": {
-      "version": "0.9.0",
-      "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58",
-      "url": "https://github.com/status-im/nim-stint.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew"
-      ]
+      ],
+      "checksums": {
+        "sha1": "4d24e7d7441137cd202e16f2359a5807ddbdc31f"
+      }
     },
     "taskpools": {
-      "version": "0.0.5",
+      "version": "0.1.0",
       "vcsRevision": "9e8ccc754631ac55ac2fd495e167e74e86293edb",
-      "url": "https://github.com/status-im/nim-taskpools.git",
+      "url": "https://github.com/status-im/nim-taskpools",
       "downloadMethod": "git",
-      "dependencies": []
-    },
-    "testutils": {
-      "version": "0.5.0",
-      "vcsRevision": "94d68e796c045d5b37cabc6be32d7bfa168f8857",
-      "url": "https://github.com/status-im/nim-testutils.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "unittest2"
-      ]
+      "dependencies": [],
+      "checksums": {
+        "sha1": "09e1b2fdad55b973724d61227971afc0df0b7a81"
+      }
     },
     "toml_serialization": {
-      "version": "0.2.12",
-      "vcsRevision": "fea85b27f0badcf617033ca1bc05444b5fd8aa7a",
-      "url": "https://github.com/status-im/nim-toml-serialization.git",
+      "version": "0.2.18",
+      "vcsRevision": "b5b387e6fb2a7cc75d54a269b07cc6218361bd46",
+      "url": "https://github.com/status-im/nim-toml-serialization",
       "downloadMethod": "git",
       "dependencies": [
+        "faststreams",
         "serialization",
         "stew"
-      ]
-    },
-    "unicodedb": {
-      "version": "0.12.0",
-      "vcsRevision": "66f2458710dc641dd4640368f9483c8a0ec70561",
-      "url": "https://github.com/nitely/nim-unicodedb.git",
-      "downloadMethod": "git",
-      "dependencies": []
-    },
-    "unittest2": {
-      "version": "0.2.3",
-      "vcsRevision": "8b51e99b4a57fcfb31689230e75595f024543024",
-      "url": "https://github.com/status-im/nim-unittest2.git",
-      "downloadMethod": "git",
-      "dependencies": []
+      ],
+      "checksums": {
+        "sha1": "76ae1c2af5dd092849b41750ff29217980dc9ca3"
+      }
     },
     "web3": {
-      "version": "0.4.2",
-      "vcsRevision": "81ee8ce479d86acb73be7c4f365328e238d9b4a3",
-      "url": "https://github.com/status-im/nim-web3.git",
+      "version": "0.8.0",
+      "vcsRevision": "cdfe5601d2812a58e54faf53ee634452d01e5918",
+      "url": "https://github.com/status-im/nim-web3",
       "downloadMethod": "git",
       "dependencies": [
         "chronicles",
         "chronos",
+        "bearssl",
+        "eth",
+        "faststreams",
         "json_rpc",
+        "serialization",
         "json_serialization",
         "nimcrypto",
+        "stew",
         "stint",
-        "stew",
-        "eth",
         "results"
-      ]
-    },
-    "websock": {
-      "version": "0.2.0",
-      "vcsRevision": "ebe308a79a7b440a11dfbe74f352be86a3883508",
-      "url": "https://github.com/status-im/nim-websock.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "chronos",
-        "http_utils",
-        "chronicles",
-        "stew",
-        "nimcrypto",
-        "bearssl",
-        "zlib"
-      ]
-    },
-    "zlib": {
-      "version": "0.1.0",
-      "vcsRevision": "daa8723fd32299d4ca621c837430c29a5a11e19a",
-      "url": "https://github.com/status-im/nim-zlib.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew"
-      ]
-    },
-    "bearssl": {
-      "version": "0.2.5",
-      "vcsRevision": "11e798b62b8e6beabe958e048e9e24c7e0f9ee63",
-      "url": "https://github.com/status-im/nim-bearssl.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "unittest2"
-      ]
+      ],
+      "checksums": {
+        "sha1": "26a112af032ef1536f97da2ca7364af618a11b80"
+      }
     }
   },
   "tasks": {}
-}
+}
\ No newline at end of file
diff --git a/nimble.lock2 b/nimble.lock2
index 0eb3b588b..4591bef39 100644
--- a/nimble.lock2
+++ b/nimble.lock2
@@ -1,301 +1,70 @@
 {
   "version": 2,
   "packages": {
-    "unittest2": {
-      "version": "0.2.5",
-      "vcsRevision": "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189",
-      "url": "https://github.com/status-im/nim-unittest2",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "02bb3751ba9ddc3c17bfd89f2e41cb6bfb8fc0c9"
-      }
-    },
-    "bearssl": {
-      "version": "0.2.6",
-      "vcsRevision": "11e798b62b8e6beabe958e048e9e24c7e0f9ee63",
-      "url": "https://github.com/status-im/nim-bearssl",
-      "downloadMethod": "git",
-      "dependencies": [
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "7e068f119664cf47ad0cfb74ef4c56fb6b616523"
-      }
-    },
-    "bearssl_pkey_decoder": {
-      "version": "0.1.0",
-      "vcsRevision": "21dd3710df9345ed2ad8bf8f882761e07863b8e0",
-      "url": "https://github.com/vacp2p/bearssl_pkey_decoder",
-      "downloadMethod": "git",
-      "dependencies": [
-        "bearssl"
-      ],
-      "checksums": {
-        "sha1": "21b42e2e6ddca6c875d3fc50f36a5115abf51714"
-      }
-    },
-    "results": {
-      "version": "0.5.1",
-      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
-      "url": "https://github.com/arnetheduck/nim-results",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7"
-      }
-    },
-    "stew": {
-      "version": "0.4.2",
-      "vcsRevision": "b66168735d6f3841c5239c3169d3fe5fe98b1257",
-      "url": "https://github.com/status-im/nim-stew",
-      "downloadMethod": "git",
-      "dependencies": [
-        "results",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "928e82cb8d2f554e8f10feb2349ee9c32fee3a8c"
-      }
-    },
-    "faststreams": {
-      "version": "0.5.0",
-      "vcsRevision": "ce27581a3e881f782f482cb66dc5b07a02bd615e",
-      "url": "https://github.com/status-im/nim-faststreams",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "ee61e507b805ae1df7ec936f03f2d101b0d72383"
-      }
-    },
-    "serialization": {
-      "version": "0.5.2",
-      "vcsRevision": "b0f2fa32960ea532a184394b0f27be37bd80248b",
-      "url": "https://github.com/status-im/nim-serialization",
-      "downloadMethod": "git",
-      "dependencies": [
-        "faststreams",
-        "unittest2",
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "fa35c1bb76a0a02a2379fe86eaae0957c7527cb8"
-      }
-    },
-    "json_serialization": {
-      "version": "0.4.4",
-      "vcsRevision": "c343b0e243d9e17e2c40f3a8a24340f7c4a71d44",
-      "url": "https://github.com/status-im/nim-json-serialization",
-      "downloadMethod": "git",
-      "dependencies": [
-        "faststreams",
-        "serialization",
-        "stew",
-        "results"
-      ],
-      "checksums": {
-        "sha1": "8b3115354104858a0ac9019356fb29720529c2bd"
-      }
-    },
-    "testutils": {
-      "version": "0.8.0",
-      "vcsRevision": "e4d37dc1652d5c63afb89907efb5a5e812261797",
-      "url": "https://github.com/status-im/nim-testutils",
-      "downloadMethod": "git",
-      "dependencies": [
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "d1678f50aa47d113b4e77d41eec2190830b523fa"
-      }
-    },
     "chronicles": {
-      "version": "0.12.2",
-      "vcsRevision": "27ec507429a4eb81edc20f28292ee8ec420be05b",
-      "url": "https://github.com/status-im/nim-chronicles",
+      "version": "0.12.1",
+      "vcsRevision": "54f5b726025e8c7385e3a6529d3aa27454c6e6ff",
+      "url": "https://github.com/status-im/nim-chronicles.git",
       "downloadMethod": "git",
       "dependencies": [
-        "faststreams",
-        "serialization",
-        "json_serialization",
-        "testutils"
-      ],
-      "checksums": {
-        "sha1": "02febb20d088120b2836d3306cfa21f434f88f65"
-      }
-    },
-    "httputils": {
-      "version": "0.4.0",
-      "vcsRevision": "c53852d9e24205b6363bba517fa8ee7bde823691",
-      "url": "https://github.com/status-im/nim-http-utils",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "results",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "298bc5b6fe4e5aa9c3b7e2ebfa17191675020f10"
-      }
+        "testutils",
+        "json_serialization"
+      ]
     },
     "chronos": {
       "version": "4.0.4",
-      "vcsRevision": "712f9937e46a9ba1949230e8e119d776aea1c6bb",
-      "url": "https://github.com/status-im/nim-chronos",
+      "vcsRevision": "85af4db764ecd3573c4704139560df3943216cf1",
+      "url": "https://github.com/status-im/nim-chronos.git",
       "downloadMethod": "git",
       "dependencies": [
-        "results",
         "stew",
         "bearssl",
-        "httputils",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "03e96742e7148c38767c028c23a99cf316672f1c"
-      }
+        "unittest2",
+        "results"
+      ]
     },
     "confutils": {
       "version": "0.1.0",
-      "vcsRevision": "5286ed67d363a3630ece85a0e8c1141d1d52b434",
-      "url": "https://github.com/status-im/nim-confutils",
+      "vcsRevision": "e214b3992a31acece6a9aada7d0a1ad37c928f3b",
+      "url": "https://github.com/status-im/nim-confutils.git",
       "downloadMethod": "git",
       "dependencies": [
         "stew",
-        "serialization",
-        "results"
-      ],
-      "checksums": {
-        "sha1": "591f70a7e803788d34ae99e8be71a30f2a2a028d"
-      }
+        "serialization"
+      ]
     },
     "db_connector": {
       "version": "0.1.0",
       "vcsRevision": "74aef399e5c232f95c9fc5c987cebac846f09d62",
-      "url": "https://github.com/nim-lang/db_connector",
+      "url": "https://github.com/nim-lang/db_connector.git",
       "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "b20053975976f94afac253d67cc6ef9200b32d02"
-      }
+      "dependencies": []
     },
     "dnsclient": {
       "version": "0.3.4",
       "vcsRevision": "23214235d4784d24aceed99bbfe153379ea557c8",
-      "url": "https://github.com/ba0f3/dnsclient.nim",
+      "url": "https://github.com/ba0f3/dnsclient.nim.git",
       "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "65262c7e533ff49d6aca5539da4bc6c6ce132f40"
-      }
+      "dependencies": []
     },
-    "nimcrypto": {
-      "version": "0.7.3",
-      "vcsRevision": "423ea4fed8de6f4544b7e3b30d868f527ed3b947",
-      "url": "https://github.com/cheatfate/nimcrypto",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "580910605aca0ea60b40bfaa116d0b8af1091314"
-      }
-    },
-    "stint": {
-      "version": "0.8.2",
-      "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58",
-      "url": "https://github.com/status-im/nim-stint",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "d8f871fd617e7857192d4609fe003b48942a8ae5"
-      }
-    },
-    "secp256k1": {
-      "version": "0.6.0.3.2",
-      "vcsRevision": "b526c4b436809aa1cfe650026d796cf7b8328b91",
-      "url": "https://github.com/status-im/nim-secp256k1",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "results",
-        "nimcrypto"
-      ],
-      "checksums": {
-        "sha1": "e6e50bd4a29cb473b070eb5359d87d8946d96075"
-      }
-    },
-    "nat_traversal": {
-      "version": "0.0.1",
-      "vcsRevision": "860e18c37667b5dd005b94c63264560c35d88004",
-      "url": "https://github.com/status-im/nim-nat-traversal",
-      "downloadMethod": "git",
-      "dependencies": [
-        "results"
-      ],
-      "checksums": {
-        "sha1": "1a376d3e710590ef2c48748a546369755f0a7c97"
-      }
-    },
-    "metrics": {
-      "version": "0.1.2",
-      "vcsRevision": "11d0cddfb0e711aa2a8c75d1892ae24a64c299fc",
-      "url": "https://github.com/status-im/nim-metrics",
+    "dnsdisc": {
+      "version": "0.1.0",
+      "vcsRevision": "b71d029f4da4ec56974d54c04518bada00e1b623",
+      "url": "https://github.com/status-im/nim-dnsdisc.git",
       "downloadMethod": "git",
       "dependencies": [
         "chronos",
-        "results",
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "5cdac99d85d3c146d170e85064c88fb28f377842"
-      }
-    },
-    "sqlite3_abi": {
-      "version": "3.51.1.0",
-      "vcsRevision": "6797c31836bff377bf50f1ac7bf8122449bf99ba",
-      "url": "https://github.com/arnetheduck/nim-sqlite3-abi",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "6e108cbacb20ba361ebd1de9f3da6e4b30f9181d"
-      }
-    },
-    "minilru": {
-      "version": "0.1.0",
-      "vcsRevision": "e3d6e6eb5f119a0b22fdab418f7a588be462ea66",
-      "url": "https://github.com/status-im/nim-minilru",
-      "downloadMethod": "git",
-      "dependencies": [
-        "results",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "a2981b7ff1b7e0fd61e64844f35fe98fd35de1b2"
-      }
-    },
-    "snappy": {
-      "version": "0.1.0",
-      "vcsRevision": "00bfcef94f8ef6981df5d5b994897f6695badfb2",
-      "url": "https://github.com/status-im/nim-snappy",
-      "downloadMethod": "git",
-      "dependencies": [
-        "faststreams",
-        "unittest2",
-        "results",
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "e572d60d6a3178c5b1cde2400c51ad771812cd3d"
-      }
+        "chronicles",
+        "stew",
+        "eth",
+        "dnsclient",
+        "metrics"
+      ]
     },
     "eth": {
-      "version": "0.9.0",
+      "version": "1.0.0",
       "vcsRevision": "d9135e6c3c5d6d819afdfb566aa8d958756b73a8",
-      "url": "https://github.com/status-im/nim-eth",
+      "url": "https://github.com/status-im/nim-eth.git",
       "downloadMethod": "git",
       "dependencies": [
         "nimcrypto",
@@ -307,158 +76,80 @@
         "nat_traversal",
         "metrics",
         "sqlite3_abi",
-        "confutils",
-        "testutils",
-        "unittest2",
         "results",
-        "minilru",
-        "snappy"
-      ],
-      "checksums": {
-        "sha1": "2e01b0cfff9523d110562af70d19948280f8013e"
-      }
+        "unittest2"
+      ]
     },
-    "dnsdisc": {
-      "version": "0.1.0",
-      "vcsRevision": "203abd2b3e758e0ea3ae325769b20a7e1bcd1010",
-      "url": "https://github.com/status-im/nim-dnsdisc",
+    "faststreams": {
+      "version": "0.3.0",
+      "vcsRevision": "c3ac3f639ed1d62f59d3077d376a29c63ac9750c",
+      "url": "https://github.com/status-im/nim-faststreams.git",
       "downloadMethod": "git",
       "dependencies": [
-        "bearssl",
-        "chronicles",
-        "chronos",
-        "eth",
-        "secp256k1",
         "stew",
         "testutils",
-        "unittest2",
-        "nimcrypto",
-        "results"
-      ],
-      "checksums": {
-        "sha1": "c8aeb7a29b378d9ed5201c8f0273000b46552e26"
-      }
+        "unittest2"
+      ]
     },
     "ffi": {
-      "version": "0.1.0",
-      "vcsRevision": "c2cc2d7ea1e0f7eb6f64661b7777ec0c2fd1d753",
-      "url": "https://github.com/logos-messaging/nim-ffi",
+      "version": "0.1.3",
+      "vcsRevision": "06111de155253b34e47ed2aaed1d61d08d62cc1b",
+      "url": "https://github.com/logos-messaging/nim-ffi.git",
       "downloadMethod": "git",
-      "dependencies": [
-        "chronos"
-      ],
-      "checksums": {
-        "sha1": "4c96b0a56f219e86037662f4ddd89d0483852ae8"
-      }
+      "dependencies": []
     },
-    "zlib": {
-      "version": "0.1.0",
-      "vcsRevision": "c71efff5fd1721362b3363dc7d0e2a4c0dbc6453",
-      "url": "https://github.com/status-im/nim-zlib",
+    "http_utils": {
+      "version": "0.3.0",
+      "vcsRevision": "79cbab1460f4c0cdde2084589d017c43a3d7b4f1",
+      "url": "https://github.com/status-im/nim-http-utils.git",
       "downloadMethod": "git",
       "dependencies": [
         "stew",
         "results"
-      ],
-      "checksums": {
-        "sha1": "b98773348eda614ff6b252213dcd852fc9d68e89"
-      }
-    },
-    "websock": {
-      "version": "0.2.1",
-      "vcsRevision": "35ae76f1559e835c80f9c1a3943bf995d3dd9eb5",
-      "url": "https://github.com/status-im/nim-websock",
-      "downloadMethod": "git",
-      "dependencies": [
-        "chronos",
-        "httputils",
-        "chronicles",
-        "stew",
-        "nimcrypto",
-        "bearssl",
-        "results",
-        "zlib"
-      ],
-      "checksums": {
-        "sha1": "1cb5efa10cd389bc01d0707c242ae010c76a03cd"
-      }
+      ]
     },
     "json_rpc": {
-      "version": "0.5.4",
-      "vcsRevision": "b6e40a776fa2d00b97a9366761fb7da18f31ae5c",
-      "url": "https://github.com/status-im/nim-json-rpc",
+      "version": "0.4.3",
+      "vcsRevision": "9665c265035f49f5ff94bbffdeadde68e19d6221",
+      "url": "https://github.com/status-im/nim-json-rpc.git",
       "downloadMethod": "git",
       "dependencies": [
-        "stew",
-        "nimcrypto",
-        "stint",
-        "chronos",
-        "httputils",
-        "chronicles",
-        "websock",
-        "serialization",
         "json_serialization",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "d8e8be795fcf098f4ce03b5826f6b3153f6a6e07"
-      }
+        "chronos",
+        "websock",
+        "chronicles",
+        "unittest2",
+        "stew"
+      ]
+    },
+    "json_serialization": {
+      "version": "0.2.6",
+      "vcsRevision": "b65fd6a7e64c864dabe40e7dfd6c7d07db0014ac",
+      "url": "https://github.com/status-im/nim-json-serialization.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "serialization",
+        "stew"
+      ]
     },
     "jwt": {
       "version": "0.2",
       "vcsRevision": "18f8378de52b241f321c1f9ea905456e89b95c6f",
       "url": "https://github.com/vacp2p/nim-jwt.git",
       "downloadMethod": "git",
-      "dependencies": [
-        "bearssl",
-        "bearssl_pkey_decoder"
-      ],
-      "checksums": {
-        "sha1": "bcfd6fc9c5e10a52b87117219b7ab5c98136bc8e"
-      }
+      "dependencies": []
     },
     "libbacktrace": {
-      "version": "0.0.9",
+      "version": "0.0.8",
       "vcsRevision": "d8bd4ce5c46bb6d2f984f6b3f3d7380897d95ecb",
-      "url": "https://github.com/status-im/nim-libbacktrace",
+      "url": "https://github.com/status-im/nim-libbacktrace.git",
       "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "ae3e8ecc27d80fd02b4538c7bdc9edf470d5023e"
-      }
-    },
-    "ngtcp2": {
-      "version": "0.39.0",
-      "vcsRevision": "791eb859145f9f268eb23eb9cbe777bdd7699c4d",
-      "url": "https://github.com/status-im/nim-ngtcp2",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "48fa97d200e6d4213ae389a2a6e0677f5d8795a5"
-      }
-    },
-    "quic": {
-      "version": "0.5.2",
-      "vcsRevision": "6d8678a159bfb902f9725f0081d542134cd93916",
-      "url": "https://github.com/vacp2p/nim-quic",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew",
-        "chronos",
-        "nimcrypto",
-        "ngtcp2",
-        "unittest2",
-        "chronicles",
-        "bearssl"
-      ],
-      "checksums": {
-        "sha1": "a32e3d6a43b2552ebe8f27457094feb9bf3f6651"
-      }
+      "dependencies": []
     },
     "libp2p": {
-      "version": "1.14.3",
+      "version": "1.6.0",
       "vcsRevision": "eb7e6ff89889e41b57515f891ba82986c54809fb",
-      "url": "https://github.com/vacp2p/nim-libp2p",
+      "url": "https://github.com/vacp2p/nim-libp2p.git",
       "downloadMethod": "git",
       "dependencies": [
         "nimcrypto",
@@ -470,117 +161,217 @@
         "secp256k1",
         "stew",
         "websock",
-        "unittest2",
         "results",
-        "quic",
-        "jwt"
-      ],
-      "checksums": {
-        "sha1": "04eed030305ed9ec128b6699066f0988eb75ec89"
-      }
+        "lsquic",
+        "unittest2"
+      ]
     },
     "lsquic": {
-      "version": "0.0.1",
+      "version": "0.1.0",
       "vcsRevision": "f3fe33462601ea34eb2e8e9c357c92e61f8d121b",
-      "url": "https://github.com/vacp2p/nim-lsquic",
+      "url": "https://github.com/vacp2p/nim-lsquic.git",
+      "downloadMethod": "git",
+      "dependencies": []
+    },
+    "metrics": {
+      "version": "0.0.1",
+      "vcsRevision": "ecf64c6078d1276d3b7d9b3d931fbdb70004db11",
+      "url": "https://github.com/status-im/nim-metrics.git",
       "downloadMethod": "git",
       "dependencies": [
-        "zlib",
+        "chronos"
+      ]
+    },
+    "minilru": {
+      "version": "1.0.0",
+      "vcsRevision": "0c4b2bce959591f0a862e9b541ba43c6d0cf3476",
+      "url": "https://github.com/status-im/nim-minilru.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results"
+      ]
+    },
+    "nat_traversal": {
+      "version": "0.0.1",
+      "vcsRevision": "860e18c37667b5dd005b94c63264560c35d88004",
+      "url": "https://github.com/status-im/nim-nat-traversal.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronicles",
         "stew",
-        "chronos",
-        "nimcrypto",
-        "unittest2",
-        "chronicles"
-      ],
-      "checksums": {
-        "sha1": "407b39ad3e84ad794b76df8d63ecafb749af6f4f"
-      }
+        "results"
+      ]
+    },
+    "nimcrypto": {
+      "version": "0.6.0",
+      "vcsRevision": "721fb99ee099b632eb86dfad1f0d96ee87583774",
+      "url": "https://github.com/cheatfate/nimcrypto.git",
+      "downloadMethod": "git",
+      "dependencies": []
     },
     "presto": {
-      "version": "0.1.1",
-      "vcsRevision": "d66043dd7ede146442e6c39720c76a20bde5225f",
-      "url": "https://github.com/status-im/nim-presto",
+      "version": "0.1.0",
+      "vcsRevision": "92b1c7ff141e6920e1f8a98a14c35c1fa098e3be",
+      "url": "https://github.com/status-im/nim-presto.git",
       "downloadMethod": "git",
       "dependencies": [
         "chronos",
         "chronicles",
-        "metrics",
-        "results",
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "8df97c45683abe2337bdff43b844c4fbcc124ca2"
-      }
-    },
-    "unicodedb": {
-      "version": "0.13.2",
-      "vcsRevision": "66f2458710dc641dd4640368f9483c8a0ec70561",
-      "url": "https://github.com/nitely/nim-unicodedb",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "739102d885d99bb4571b1955f5f12aee423c935b"
-      }
+        "stew",
+        "results"
+      ]
     },
     "regex": {
-      "version": "0.26.3",
+      "version": "0.26.1",
       "vcsRevision": "4593305ed1e49731fc75af1dc572dd2559aad19c",
-      "url": "https://github.com/nitely/nim-regex",
+      "url": "https://github.com/nitely/nim-regex.git",
       "downloadMethod": "git",
       "dependencies": [
         "unicodedb"
-      ],
-      "checksums": {
-        "sha1": "4d24e7d7441137cd202e16f2359a5807ddbdc31f"
-      }
+      ]
     },
-    "taskpools": {
-      "version": "0.1.0",
-      "vcsRevision": "9e8ccc754631ac55ac2fd495e167e74e86293edb",
-      "url": "https://github.com/status-im/nim-taskpools",
+    "results": {
+      "version": "0.5.1",
+      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
+      "url": "https://github.com/arnetheduck/nim-results.git",
       "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "09e1b2fdad55b973724d61227971afc0df0b7a81"
-      }
+      "dependencies": []
     },
-    "toml_serialization": {
-      "version": "0.2.18",
-      "vcsRevision": "b5b387e6fb2a7cc75d54a269b07cc6218361bd46",
-      "url": "https://github.com/status-im/nim-toml-serialization",
+    "secp256k1": {
+      "version": "0.6.0",
+      "vcsRevision": "9dd3df62124aae79d564da636bb22627c53c7676",
+      "url": "https://github.com/status-im/nim-secp256k1.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results"
+      ]
+    },
+    "serialization": {
+      "version": "0.2.4",
+      "vcsRevision": "6f525d5447d97256750ca7856faead03e562ed20",
+      "url": "https://github.com/status-im/nim-serialization.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "faststreams"
+      ]
+    },
+    "sqlite3_abi": {
+      "version": "1.3.2",
+      "vcsRevision": "bdf01cf4236fb40788f0733466cdf6708783cbac",
+      "url": "https://github.com/arnetheduck/nim-sqlite3-abi.git",
+      "downloadMethod": "git",
+      "dependencies": []
+    },
+    "stew": {
+      "version": "0.2.0",
+      "vcsRevision": "e5740014961438610d336cd81706582dbf2c96f0",
+      "url": "https://github.com/status-im/nim-stew.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results"
+      ]
+    },
+    "stint": {
+      "version": "0.9.0",
+      "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58",
+      "url": "https://github.com/status-im/nim-stint.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew"
+      ]
+    },
+    "taskpools": {
+      "version": "0.0.5",
+      "vcsRevision": "9e8ccc754631ac55ac2fd495e167e74e86293edb",
+      "url": "https://github.com/status-im/nim-taskpools.git",
+      "downloadMethod": "git",
+      "dependencies": []
+    },
+    "testutils": {
+      "version": "0.5.0",
+      "vcsRevision": "94d68e796c045d5b37cabc6be32d7bfa168f8857",
+      "url": "https://github.com/status-im/nim-testutils.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "unittest2"
+      ]
+    },
+    "toml_serialization": {
+      "version": "0.2.12",
+      "vcsRevision": "fea85b27f0badcf617033ca1bc05444b5fd8aa7a",
+      "url": "https://github.com/status-im/nim-toml-serialization.git",
       "downloadMethod": "git",
       "dependencies": [
-        "faststreams",
         "serialization",
         "stew"
-      ],
-      "checksums": {
-        "sha1": "76ae1c2af5dd092849b41750ff29217980dc9ca3"
-      }
+      ]
+    },
+    "unicodedb": {
+      "version": "0.12.0",
+      "vcsRevision": "66f2458710dc641dd4640368f9483c8a0ec70561",
+      "url": "https://github.com/nitely/nim-unicodedb.git",
+      "downloadMethod": "git",
+      "dependencies": []
+    },
+    "unittest2": {
+      "version": "0.2.3",
+      "vcsRevision": "8b51e99b4a57fcfb31689230e75595f024543024",
+      "url": "https://github.com/status-im/nim-unittest2.git",
+      "downloadMethod": "git",
+      "dependencies": []
     },
     "web3": {
-      "version": "0.8.0",
-      "vcsRevision": "cdfe5601d2812a58e54faf53ee634452d01e5918",
-      "url": "https://github.com/status-im/nim-web3",
+      "version": "0.4.2",
+      "vcsRevision": "81ee8ce479d86acb73be7c4f365328e238d9b4a3",
+      "url": "https://github.com/status-im/nim-web3.git",
       "downloadMethod": "git",
       "dependencies": [
         "chronicles",
         "chronos",
-        "bearssl",
-        "eth",
-        "faststreams",
         "json_rpc",
-        "serialization",
         "json_serialization",
         "nimcrypto",
-        "stew",
         "stint",
+        "stew",
+        "eth",
         "results"
-      ],
-      "checksums": {
-        "sha1": "26a112af032ef1536f97da2ca7364af618a11b80"
-      }
+      ]
+    },
+    "websock": {
+      "version": "0.2.0",
+      "vcsRevision": "ebe308a79a7b440a11dfbe74f352be86a3883508",
+      "url": "https://github.com/status-im/nim-websock.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronos",
+        "http_utils",
+        "chronicles",
+        "stew",
+        "nimcrypto",
+        "bearssl",
+        "zlib"
+      ]
+    },
+    "zlib": {
+      "version": "0.1.0",
+      "vcsRevision": "daa8723fd32299d4ca621c837430c29a5a11e19a",
+      "url": "https://github.com/status-im/nim-zlib.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew"
+      ]
+    },
+    "bearssl": {
+      "version": "0.2.5",
+      "vcsRevision": "11e798b62b8e6beabe958e048e9e24c7e0f9ee63",
+      "url": "https://github.com/status-im/nim-bearssl.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "unittest2"
+      ]
     }
   },
   "tasks": {}
-}
\ No newline at end of file
+}
diff --git a/waku.nimble b/waku.nimble
index 58daa87f5..74ecda750 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -73,7 +73,14 @@ proc buildModule(filePath, params = "", lang = "c"): bool =
   # allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims"
   var extra_params = params
   for i in 2 ..< paramCount() - 1:
-    extra_params &= " " & paramStr(i)
+    let param = paramStr(i)
+    # Skip nimble config files and task names - only pass compiler flags
+    if param.endsWith(".nimble") or param.endsWith(".nims") or param.endsWith(".out"):
+      continue
+    # Only pass actual compiler flags (those starting with -)
+    if not param.startsWith("-"):
+      continue
+    extra_params &= " " & param
 
   if not fileExists(filePath):
     echo "File to build not found: " & filePath
@@ -91,7 +98,14 @@ proc buildBinary(name: string, srcDir = "./", params = "", lang = "c") =
   # allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims"
   var extra_params = params
   for i in 2 ..< paramCount():
-    extra_params &= " " & paramStr(i)
+    let param = paramStr(i)
+    # Skip nimble config files and task names - only pass compiler flags
+    if param.endsWith(".nimble") or param.endsWith(".nims") or param.endsWith(".out"):
+      continue
+    # Only pass actual compiler flags (those starting with -)
+    if not param.startsWith("-"):
+      continue
+    extra_params &= " " & param
   exec "nim " & lang & " --out:build/" & name & " --mm:refc " & extra_params & " " &
     srcDir & name & ".nim"
 
diff --git a/waku/utils/requests.nim b/waku/utils/requests.nim
index 5e5b9d960..d9afd2887 100644
--- a/waku/utils/requests.nim
+++ b/waku/utils/requests.nim
@@ -7,4 +7,4 @@ import bearssl/rand, stew/byteutils
 proc generateRequestId*(rng: ref HmacDrbgContext): string =
   var bytes: array[10, byte]
   hmacDrbgGenerate(rng[], bytes)
-  return toHex(bytes)
+  return byteutils.toHex(bytes)
diff --git a/waku/waku_filter_v2/client.nim b/waku/waku_filter_v2/client.nim
index 323cc6da8..cc77f4304 100644
--- a/waku/waku_filter_v2/client.nim
+++ b/waku/waku_filter_v2/client.nim
@@ -10,8 +10,9 @@ import
   bearssl/rand,
   stew/byteutils
 import
-  waku/
-    [node/peer_manager, waku_core, events/delivery_events, common/broker/broker_context],
+  waku /
+    [node/peer_manager, waku_core, events/delivery_events,
+        common/broker/broker_context],
   ./common,
   ./protocol_metrics,
   ./rpc_codec,
@@ -29,7 +30,7 @@ type WakuFilterClient* = ref object of LPProtocol
 func generateRequestId(rng: ref HmacDrbgContext): string =
   var bytes: array[10, byte]
   hmacDrbgGenerate(rng[], bytes)
-  return toHex(bytes)
+  return byteutils.toHex(bytes)
 
 proc sendSubscribeRequest(
     wfc: WakuFilterClient,
@@ -62,7 +63,8 @@ proc sendSubscribeRequest(
   except CatchableError:
     let errMsg =
       "exception in waku_filter_v2 client writeLP: " & getCurrentExceptionMsg()
-    trace "exception in waku_filter_v2 client writeLP", error = getCurrentExceptionMsg()
+    trace "exception in waku_filter_v2 client writeLP",
+        error = getCurrentExceptionMsg()
     waku_filter_errors.inc(labelValues = [errMsg])
     return err(FilterSubscribeError.badResponse(errMsg))
 
@@ -72,7 +74,8 @@ proc sendSubscribeRequest(
   except CatchableError:
     let errMsg =
       "exception in waku_filter_v2 client readLp: " & getCurrentExceptionMsg()
-    trace "exception in waku_filter_v2 client readLp", error = getCurrentExceptionMsg()
+    trace "exception in waku_filter_v2 client readLp",
+        error = getCurrentExceptionMsg()
     waku_filter_errors.inc(labelValues = [errMsg])
     return err(FilterSubscribeError.badResponse(errMsg))
 
@@ -123,7 +126,8 @@ proc subscribe*(
 
   let requestId = generateRequestId(wfc.rng)
   let filterSubscribeRequest = FilterSubscribeRequest.subscribe(
-    requestId = requestId, pubsubTopic = pubsubTopic, contentTopics = contentTopicSeq
+    requestId = requestId, pubsubTopic = pubsubTopic,
+    contentTopics = contentTopicSeq
   )
 
   ?await wfc.sendSubscribeRequest(servicePeer, filterSubscribeRequest)
@@ -146,7 +150,8 @@ proc unsubscribe*(
 
   let requestId = generateRequestId(wfc.rng)
   let filterSubscribeRequest = FilterSubscribeRequest.unsubscribe(
-    requestId = requestId, pubsubTopic = pubsubTopic, contentTopics = contentTopicSeq
+    requestId = requestId, pubsubTopic = pubsubTopic,
+    contentTopics = contentTopicSeq
   )
 
   ?await wfc.sendSubscribeRequest(servicePeer, filterSubscribeRequest)
@@ -168,7 +173,8 @@ proc registerPushHandler*(wfc: WakuFilterClient, handler: FilterPushHandler) =
   wfc.pushHandlers.add(handler)
 
 proc initProtocolHandler(wfc: WakuFilterClient) =
-  proc handler(conn: Connection, proto: string) {.async: (raises: [CancelledError]).} =
+  proc handler(conn: Connection, proto: string) {.async: (raises: [
+      CancelledError]).} =
     ## Notice that the client component is acting as a server of WakuFilterPushCodec messages
     while not conn.atEof():
       var buf: seq[byte]
diff --git a/waku/waku_store_sync/reconciliation.nim b/waku/waku_store_sync/reconciliation.nim
index 0cc15d0df..f18201d0e 100644
--- a/waku/waku_store_sync/reconciliation.nim
+++ b/waku/waku_store_sync/reconciliation.nim
@@ -79,7 +79,7 @@ proc messageIngress*(
   let id = SyncID(time: msg.timestamp, hash: msgHash)
 
   self.storage.insert(id, pubsubTopic, msg.contentTopic).isOkOr:
-    error "failed to insert new message", msg_hash = $id.hash.toHex(), error = $error
+    error "failed to insert new message", msg_hash = byteutils.toHex(id.hash), error = $error
 
 proc messageIngress*(
     self: SyncReconciliation,
@@ -87,7 +87,7 @@ proc messageIngress*(
     pubsubTopic: PubsubTopic,
     msg: WakuMessage,
 ) =
-  trace "message ingress", msg_hash = msgHash.toHex(), msg = msg
+  trace "message ingress", msg_hash = byteutils.toHex(msgHash), msg = msg
 
   if msg.ephemeral:
     return
@@ -95,7 +95,7 @@ proc messageIngress*(
   let id = SyncID(time: msg.timestamp, hash: msgHash)
 
   self.storage.insert(id, pubsubTopic, msg.contentTopic).isOkOr:
-    error "failed to insert new message", msg_hash = $id.hash.toHex(), error = $error
+    error "failed to insert new message", msg_hash = byteutils.toHex(id.hash), error = $error
 
 proc messageIngress*(
     self: SyncReconciliation,
@@ -104,7 +104,7 @@ proc messageIngress*(
     contentTopic: ContentTopic,
 ) =
   self.storage.insert(id, pubsubTopic, contentTopic).isOkOr:
-    error "failed to insert new message", msg_hash = $id.hash.toHex(), error = $error
+    error "failed to insert new message", msg_hash = byteutils.toHex(id.hash), error = $error
 
 proc preProcessPayload(
     self: SyncReconciliation, payload: RangesData