diff --git a/package-lock.json b/package-lock.json
index 93816b0cc1..ab01c333b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2972,8 +2972,7 @@
     },
     "node_modules/@libp2p/interfaces": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/@libp2p/interfaces/-/interfaces-3.3.2.tgz",
-      "integrity": "sha512-p/M7plbrxLzuQchvNwww1Was7ZeGE2NaOFulMaZBYIihU8z3fhaV+a033OqnC/0NTX/yhfdNOG7znhYq3XoR/g==",
+      "license": "Apache-2.0 OR MIT",
       "engines": {
         "node": ">=16.0.0",
         "npm": ">=7.0.0"
@@ -4608,9 +4607,9 @@
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.202",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
-      "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz",
+      "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==",
       "dev": true
     },
     "node_modules/@types/markdown-it": {
@@ -5241,9 +5240,8 @@
     },
     "node_modules/@waku/create-app": {
       "version": "0.1.1-504bcd4",
-      "resolved": "https://registry.npmjs.org/@waku/create-app/-/create-app-0.1.1-504bcd4.tgz",
-      "integrity": "sha512-rTGTHLEtEgdmxBTU9ZduEWcZgZG7JsQqIxjHhn3rQNmtggeXjZ5xWo/FAKYcx3Bc1B9igQVUMS/v8NvAGuDd4A==",
       "dev": true,
+      "license": "MIT OR Apache-2.0",
       "dependencies": {
         "commander": "^9.4.1",
         "enquirer": "^2.3.6",
@@ -5304,8 +5302,7 @@
     },
     "node_modules/@waku/dns-discovery": {
       "version": "0.0.21",
-      "resolved": "https://registry.npmjs.org/@waku/dns-discovery/-/dns-discovery-0.0.21.tgz",
-      "integrity": "sha512-l6TVLNiP9HjVrSCWRVP4pKGAADkPzMY2+/tFxnLI1lx3NWmBrkwsEsZHKlfGpdDTT3130nxXkvENcswqWLsc1w==",
+      "license": "MIT OR Apache-2.0",
       "dependencies": {
         "@waku/enr": "0.0.21",
         "@waku/utils": "0.0.15",
@@ -5328,8 +5325,7 @@
     },
     "node_modules/@waku/local-peer-cache-discovery": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@waku/local-peer-cache-discovery/-/local-peer-cache-discovery-1.0.0.tgz",
-      "integrity": "sha512-He3xudQF8cMbQUU2q9nUlinSW8FSwKX51DLwhPhblVVwhrfdmjvfhjCaMaq2YDoA+y88CIqQG0bLxxl5QADpWQ==",
+      "license": "MIT OR Apache-2.0",
       "dependencies": {
         "@libp2p/interface": "^1.1.2",
         "@waku/interfaces": "^0.0.22",
@@ -5349,8 +5345,7 @@
     },
     "node_modules/@waku/peer-exchange": {
       "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/@waku/peer-exchange/-/peer-exchange-0.0.20.tgz",
-      "integrity": "sha512-Tbdw80VAk4Or6sKUX4LPCkuDo4zYB1/6hOLOMbSo1ck7w8ADNkcByyD5W/wVCmE4wM8Yen2Awb/auIsqunM8LQ==",
+      "license": "MIT OR Apache-2.0",
       "dependencies": {
         "@libp2p/interfaces": "^3.3.2",
         "@waku/core": "0.0.27",
@@ -8208,23 +8203,29 @@
         "node": ">= 0.10"
       }
     },
-<<<<<<< HEAD
     "node_modules/cosmiconfig": {
-      "version": "8.0.0",
-      "dev": true,
-      "license": "MIT",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "dependencies": {
+        "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
         "parse-json": "^5.0.0",
-        "path-type": "^4.0.0"
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=10"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "engines": {
+        "node": ">= 6"
       }
     },
-=======
->>>>>>> 5296bfbad8d98d2ee40e6570a6ad4546c86b9fcf
     "node_modules/cpu-features": {
       "version": "0.0.9",
       "hasInstallScript": true,
@@ -9071,20 +9072,6 @@
       "version": "1.1.4",
       "license": "MIT"
     },
-    "node_modules/depcheck/node_modules/cosmiconfig": {
-      "version": "7.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/depcheck/node_modules/emoji-regex": {
       "version": "8.0.0",
       "license": "MIT"
@@ -9171,13 +9158,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/depcheck/node_modules/yaml": {
-      "version": "1.10.2",
-      "license": "ISC",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/depcheck/node_modules/yargs": {
       "version": "16.2.0",
       "license": "MIT",
@@ -27306,49 +27286,6 @@
         }
       }
     },
-    "packages/dns-discovery": {
-      "name": "@waku/dns-discovery",
-      "version": "0.0.20",
-      "extraneous": true,
-      "license": "MIT OR Apache-2.0",
-      "dependencies": {
-        "@waku/enr": "0.0.21",
-        "@waku/utils": "0.0.15",
-        "debug": "^4.3.4",
-        "dns-query": "^0.11.2",
-        "hi-base32": "^0.5.1",
-        "uint8arrays": "^5.0.1"
-      },
-      "devDependencies": {
-        "@libp2p/peer-id": "^4.0.4",
-        "@libp2p/peer-id-factory": "^4.0.5",
-        "@multiformats/multiaddr": "^12.0.0",
-        "@rollup/plugin-commonjs": "^25.0.7",
-        "@rollup/plugin-json": "^6.0.0",
-        "@rollup/plugin-node-resolve": "^15.2.3",
-        "@types/chai": "^4.3.11",
-        "@waku/build-utils": "*",
-        "@waku/interfaces": "0.0.22",
-        "chai": "^4.3.10",
-        "cspell": "^8.3.2",
-        "mocha": "^10.3.0",
-        "npm-run-all": "^4.1.5",
-        "rollup": "^4.12.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@waku/enr": "0.0.21",
-        "@waku/interfaces": "0.0.22",
-        "@waku/utils": "0.0.15"
-      },
-      "peerDependenciesMeta": {
-        "@waku/interfaces": {
-          "optional": true
-        }
-      }
-    },
     "packages/enr": {
       "name": "@waku/enr",
       "version": "0.0.21",
@@ -27413,439 +27350,6 @@
         "node": ">=18"
       }
     },
-    "packages/local-peer-cache-discovery": {
-      "name": "@waku/local-peer-cache-discovery",
-      "version": "0.0.1",
-      "extraneous": true,
-      "license": "MIT OR Apache-2.0",
-      "dependencies": {
-        "@libp2p/interface": "^1.1.2",
-        "@waku/interfaces": "^0.0.22",
-        "@waku/utils": "^0.0.15"
-      },
-      "devDependencies": {
-        "@rollup/plugin-commonjs": "^25.0.7",
-        "@rollup/plugin-json": "^6.0.0",
-        "@rollup/plugin-node-resolve": "^15.2.3",
-        "@types/chai": "^4.3.11",
-        "@types/node-localstorage": "^1.3.3",
-        "@waku/build-utils": "*",
-        "chai": "^4.3.10",
-        "chai-as-promised": "^7.1.1",
-        "cspell": "^7.3.2",
-        "mocha": "^10.2.0",
-        "node-localstorage": "^3.0.5",
-        "npm-run-all": "^4.1.5",
-        "rollup": "^4.12.0",
-        "sinon": "^17.0.1"
-      },
-      "engines": {
-        "node": ">=18"
-<<<<<<< HEAD
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/cspell-bundled-dicts": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspell/dict-ada": "^4.0.2",
-        "@cspell/dict-aws": "^4.0.0",
-        "@cspell/dict-bash": "^4.1.2",
-        "@cspell/dict-companies": "^3.0.27",
-        "@cspell/dict-cpp": "^5.0.9",
-        "@cspell/dict-cryptocurrencies": "^4.0.0",
-        "@cspell/dict-csharp": "^4.0.2",
-        "@cspell/dict-css": "^4.0.12",
-        "@cspell/dict-dart": "^2.0.3",
-        "@cspell/dict-django": "^4.1.0",
-        "@cspell/dict-docker": "^1.1.7",
-        "@cspell/dict-dotnet": "^5.0.0",
-        "@cspell/dict-elixir": "^4.0.3",
-        "@cspell/dict-en_us": "^4.3.11",
-        "@cspell/dict-en-common-misspellings": "^1.0.2",
-        "@cspell/dict-en-gb": "1.1.33",
-        "@cspell/dict-filetypes": "^3.0.2",
-        "@cspell/dict-fonts": "^4.0.0",
-        "@cspell/dict-fsharp": "^1.0.1",
-        "@cspell/dict-fullstack": "^3.1.5",
-        "@cspell/dict-gaming-terms": "^1.0.4",
-        "@cspell/dict-git": "^2.0.0",
-        "@cspell/dict-golang": "^6.0.4",
-        "@cspell/dict-haskell": "^4.0.1",
-        "@cspell/dict-html": "^4.0.5",
-        "@cspell/dict-html-symbol-entities": "^4.0.0",
-        "@cspell/dict-java": "^5.0.6",
-        "@cspell/dict-k8s": "^1.0.2",
-        "@cspell/dict-latex": "^4.0.0",
-        "@cspell/dict-lorem-ipsum": "^4.0.0",
-        "@cspell/dict-lua": "^4.0.2",
-        "@cspell/dict-makefile": "^1.0.0",
-        "@cspell/dict-node": "^4.0.3",
-        "@cspell/dict-npm": "^5.0.12",
-        "@cspell/dict-php": "^4.0.4",
-        "@cspell/dict-powershell": "^5.0.2",
-        "@cspell/dict-public-licenses": "^2.0.5",
-        "@cspell/dict-python": "^4.1.10",
-        "@cspell/dict-r": "^2.0.1",
-        "@cspell/dict-ruby": "^5.0.1",
-        "@cspell/dict-rust": "^4.0.1",
-        "@cspell/dict-scala": "^5.0.0",
-        "@cspell/dict-software-terms": "^3.3.9",
-        "@cspell/dict-sql": "^2.1.2",
-        "@cspell/dict-svelte": "^1.0.2",
-        "@cspell/dict-swift": "^2.0.1",
-        "@cspell/dict-typescript": "^3.1.2",
-        "@cspell/dict-vue": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/cspell-json-reporter": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspell/cspell-types": "7.3.9"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/cspell-pipe": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/cspell-resolver": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "global-dirs": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/cspell-service-bus": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/cspell-types": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/dict-cryptocurrencies": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/dict-en-common-misspellings": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/dict-git": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/dynamic-import": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "import-meta-resolve": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/@cspell/strong-weak-map": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspell/cspell-json-reporter": "7.3.9",
-        "@cspell/cspell-pipe": "7.3.9",
-        "@cspell/cspell-types": "7.3.9",
-        "@cspell/dynamic-import": "7.3.9",
-        "chalk": "^5.3.0",
-        "chalk-template": "^1.1.0",
-        "commander": "^11.1.0",
-        "cspell-gitignore": "7.3.9",
-        "cspell-glob": "7.3.9",
-        "cspell-io": "7.3.9",
-        "cspell-lib": "7.3.9",
-        "fast-glob": "^3.3.2",
-        "fast-json-stable-stringify": "^2.1.0",
-        "file-entry-cache": "^7.0.1",
-        "get-stdin": "^9.0.0",
-        "semver": "^7.5.4",
-        "strip-ansi": "^7.1.0",
-        "vscode-uri": "^3.0.8"
-      },
-      "bin": {
-        "cspell": "bin.mjs",
-        "cspell-esm": "bin.mjs"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/streetsidesoftware/cspell?sponsor=1"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell-dictionary": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspell/cspell-pipe": "7.3.9",
-        "@cspell/cspell-types": "7.3.9",
-        "cspell-trie-lib": "7.3.9",
-        "fast-equals": "^4.0.3",
-        "gensequence": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell-dictionary/node_modules/fast-equals": {
-      "version": "4.0.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell-gitignore": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cspell-glob": "7.3.9",
-        "find-up": "^5.0.0"
-      },
-      "bin": {
-        "cspell-gitignore": "bin.mjs"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell-glob": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "micromatch": "^4.0.5"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell-grammar": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspell/cspell-pipe": "7.3.9",
-        "@cspell/cspell-types": "7.3.9"
-      },
-      "bin": {
-        "cspell-grammar": "bin.mjs"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell-io": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspell/cspell-service-bus": "7.3.9",
-        "node-fetch": "^2.7.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell-lib": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspell/cspell-bundled-dicts": "7.3.9",
-        "@cspell/cspell-pipe": "7.3.9",
-        "@cspell/cspell-resolver": "7.3.9",
-        "@cspell/cspell-types": "7.3.9",
-        "@cspell/dynamic-import": "7.3.9",
-        "@cspell/strong-weak-map": "7.3.9",
-        "clear-module": "^4.1.2",
-        "comment-json": "^4.2.3",
-        "configstore": "^6.0.0",
-        "cosmiconfig": "8.0.0",
-        "cspell-dictionary": "7.3.9",
-        "cspell-glob": "7.3.9",
-        "cspell-grammar": "7.3.9",
-        "cspell-io": "7.3.9",
-        "cspell-trie-lib": "7.3.9",
-        "fast-equals": "^5.0.1",
-        "find-up": "^6.3.0",
-        "gensequence": "^6.0.0",
-        "import-fresh": "^3.3.0",
-        "resolve-from": "^5.0.0",
-        "vscode-languageserver-textdocument": "^1.0.11",
-        "vscode-uri": "^3.0.8"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell-lib/node_modules/find-up": {
-      "version": "6.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^7.1.0",
-        "path-exists": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/cspell-trie-lib": {
-      "version": "7.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspell/cspell-pipe": "7.3.9",
-        "@cspell/cspell-types": "7.3.9",
-        "gensequence": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/file-entry-cache": {
-      "version": "7.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "flat-cache": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/import-meta-resolve": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/locate-path": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^6.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/p-limit": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "yocto-queue": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/p-locate": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/path-exists": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      }
-    },
-    "packages/local-peer-cache-discovery/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-=======
-      },
-      "peerDependencies": {
-        "@libp2p/interface": "^1.1.2",
-        "@waku/interfaces": "0.0.22",
-        "@waku/utils": "0.0.15"
-      },
-      "peerDependenciesMeta": {
-        "@libp2p/interface": {
-          "optional": true
-        },
-        "@waku/interfaces": {
-          "optional": true
-        }
->>>>>>> 5296bfbad8d98d2ee40e6570a6ad4546c86b9fcf
-      }
-    },
     "packages/message-encryption": {
       "name": "@waku/message-encryption",
       "version": "0.0.25",
@@ -27930,50 +27434,6 @@
         }
       }
     },
-    "packages/peer-exchange": {
-      "name": "@waku/peer-exchange",
-      "version": "0.0.19",
-      "extraneous": true,
-      "license": "MIT OR Apache-2.0",
-      "dependencies": {
-        "@libp2p/interfaces": "^3.3.2",
-        "@waku/core": "0.0.27",
-        "@waku/enr": "0.0.21",
-        "@waku/interfaces": "0.0.22",
-        "@waku/proto": "0.0.6",
-        "@waku/utils": "0.0.15",
-        "debug": "^4.3.4",
-        "it-all": "^3.0.4",
-        "it-length-prefixed": "^9.0.4",
-        "it-pipe": "^3.0.1"
-      },
-      "devDependencies": {
-        "@rollup/plugin-commonjs": "^25.0.7",
-        "@rollup/plugin-json": "^6.0.0",
-        "@rollup/plugin-node-resolve": "^15.2.3",
-        "@waku/build-utils": "*",
-        "chai": "^4.3.10",
-        "cspell": "^8.3.2",
-        "npm-run-all": "^4.1.5",
-        "rollup": "^4.12.0",
-        "uint8arraylist": "^2.4.3"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@waku/core": "0.0.27",
-        "@waku/enr": "0.0.21",
-        "@waku/interfaces": "0.0.22",
-        "@waku/proto": "0.0.6",
-        "@waku/utils": "0.0.15"
-      },
-      "peerDependenciesMeta": {
-        "@waku/interfaces": {
-          "optional": true
-        }
-      }
-    },
     "packages/proto": {
       "name": "@waku/proto",
       "version": "0.0.6",
@@ -28771,22 +28231,6 @@
         "node": ">=8"
       }
     },
-    "packages/rln/node_modules/cosmiconfig": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "packages/rln/node_modules/cross-fetch": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
@@ -29609,15 +29053,6 @@
         "node": ">=8"
       }
     },
-    "packages/rln/node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "packages/rln/node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -31594,9 +31029,7 @@
       }
     },
     "@libp2p/interfaces": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/@libp2p/interfaces/-/interfaces-3.3.2.tgz",
-      "integrity": "sha512-p/M7plbrxLzuQchvNwww1Was7ZeGE2NaOFulMaZBYIihU8z3fhaV+a033OqnC/0NTX/yhfdNOG7znhYq3XoR/g=="
+      "version": "3.3.2"
     },
     "@libp2p/logger": {
       "version": "4.0.6",
@@ -32681,9 +32114,9 @@
       "dev": true
     },
     "@types/lodash": {
-      "version": "4.14.202",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
-      "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz",
+      "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==",
       "dev": true
     },
     "@types/markdown-it": {
@@ -33108,8 +32541,6 @@
     },
     "@waku/create-app": {
       "version": "0.1.1-504bcd4",
-      "resolved": "https://registry.npmjs.org/@waku/create-app/-/create-app-0.1.1-504bcd4.tgz",
-      "integrity": "sha512-rTGTHLEtEgdmxBTU9ZduEWcZgZG7JsQqIxjHhn3rQNmtggeXjZ5xWo/FAKYcx3Bc1B9igQVUMS/v8NvAGuDd4A==",
       "dev": true,
       "requires": {
         "commander": "^9.4.1",
@@ -33178,8 +32609,6 @@
     },
     "@waku/dns-discovery": {
       "version": "0.0.21",
-      "resolved": "https://registry.npmjs.org/@waku/dns-discovery/-/dns-discovery-0.0.21.tgz",
-      "integrity": "sha512-l6TVLNiP9HjVrSCWRVP4pKGAADkPzMY2+/tFxnLI1lx3NWmBrkwsEsZHKlfGpdDTT3130nxXkvENcswqWLsc1w==",
       "requires": {
         "@waku/enr": "0.0.21",
         "@waku/utils": "0.0.15",
@@ -33230,288 +32659,10 @@
     },
     "@waku/local-peer-cache-discovery": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@waku/local-peer-cache-discovery/-/local-peer-cache-discovery-1.0.0.tgz",
-      "integrity": "sha512-He3xudQF8cMbQUU2q9nUlinSW8FSwKX51DLwhPhblVVwhrfdmjvfhjCaMaq2YDoA+y88CIqQG0bLxxl5QADpWQ==",
       "requires": {
         "@libp2p/interface": "^1.1.2",
         "@waku/interfaces": "^0.0.22",
-<<<<<<< HEAD
-        "@waku/utils": "^0.0.15",
-        "chai": "^4.3.10",
-        "chai-as-promised": "^7.1.1",
-        "cspell": "^7.3.2",
-        "mocha": "^10.2.0",
-        "node-localstorage": "^3.0.5",
-        "npm-run-all": "^4.1.5",
-        "rollup": "^4.12.0",
-        "sinon": "^17.0.1"
-      },
-      "dependencies": {
-        "@cspell/cspell-bundled-dicts": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "@cspell/dict-ada": "^4.0.2",
-            "@cspell/dict-aws": "^4.0.0",
-            "@cspell/dict-bash": "^4.1.2",
-            "@cspell/dict-companies": "^3.0.27",
-            "@cspell/dict-cpp": "^5.0.9",
-            "@cspell/dict-cryptocurrencies": "^4.0.0",
-            "@cspell/dict-csharp": "^4.0.2",
-            "@cspell/dict-css": "^4.0.12",
-            "@cspell/dict-dart": "^2.0.3",
-            "@cspell/dict-django": "^4.1.0",
-            "@cspell/dict-docker": "^1.1.7",
-            "@cspell/dict-dotnet": "^5.0.0",
-            "@cspell/dict-elixir": "^4.0.3",
-            "@cspell/dict-en_us": "^4.3.11",
-            "@cspell/dict-en-common-misspellings": "^1.0.2",
-            "@cspell/dict-en-gb": "1.1.33",
-            "@cspell/dict-filetypes": "^3.0.2",
-            "@cspell/dict-fonts": "^4.0.0",
-            "@cspell/dict-fsharp": "^1.0.1",
-            "@cspell/dict-fullstack": "^3.1.5",
-            "@cspell/dict-gaming-terms": "^1.0.4",
-            "@cspell/dict-git": "^2.0.0",
-            "@cspell/dict-golang": "^6.0.4",
-            "@cspell/dict-haskell": "^4.0.1",
-            "@cspell/dict-html": "^4.0.5",
-            "@cspell/dict-html-symbol-entities": "^4.0.0",
-            "@cspell/dict-java": "^5.0.6",
-            "@cspell/dict-k8s": "^1.0.2",
-            "@cspell/dict-latex": "^4.0.0",
-            "@cspell/dict-lorem-ipsum": "^4.0.0",
-            "@cspell/dict-lua": "^4.0.2",
-            "@cspell/dict-makefile": "^1.0.0",
-            "@cspell/dict-node": "^4.0.3",
-            "@cspell/dict-npm": "^5.0.12",
-            "@cspell/dict-php": "^4.0.4",
-            "@cspell/dict-powershell": "^5.0.2",
-            "@cspell/dict-public-licenses": "^2.0.5",
-            "@cspell/dict-python": "^4.1.10",
-            "@cspell/dict-r": "^2.0.1",
-            "@cspell/dict-ruby": "^5.0.1",
-            "@cspell/dict-rust": "^4.0.1",
-            "@cspell/dict-scala": "^5.0.0",
-            "@cspell/dict-software-terms": "^3.3.9",
-            "@cspell/dict-sql": "^2.1.2",
-            "@cspell/dict-svelte": "^1.0.2",
-            "@cspell/dict-swift": "^2.0.1",
-            "@cspell/dict-typescript": "^3.1.2",
-            "@cspell/dict-vue": "^3.0.0"
-          }
-        },
-        "@cspell/cspell-json-reporter": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "@cspell/cspell-types": "7.3.9"
-          }
-        },
-        "@cspell/cspell-pipe": {
-          "version": "7.3.9",
-          "dev": true
-        },
-        "@cspell/cspell-resolver": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "global-dirs": "^3.0.1"
-          }
-        },
-        "@cspell/cspell-service-bus": {
-          "version": "7.3.9",
-          "dev": true
-        },
-        "@cspell/cspell-types": {
-          "version": "7.3.9",
-          "dev": true
-        },
-        "@cspell/dict-cryptocurrencies": {
-          "version": "4.0.0",
-          "dev": true
-        },
-        "@cspell/dict-en-common-misspellings": {
-          "version": "1.0.2",
-          "dev": true
-        },
-        "@cspell/dict-git": {
-          "version": "2.0.0",
-          "dev": true
-        },
-        "@cspell/dynamic-import": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "import-meta-resolve": "^3.1.1"
-          }
-        },
-        "@cspell/strong-weak-map": {
-          "version": "7.3.9",
-          "dev": true
-        },
-        "cspell": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "@cspell/cspell-json-reporter": "7.3.9",
-            "@cspell/cspell-pipe": "7.3.9",
-            "@cspell/cspell-types": "7.3.9",
-            "@cspell/dynamic-import": "7.3.9",
-            "chalk": "^5.3.0",
-            "chalk-template": "^1.1.0",
-            "commander": "^11.1.0",
-            "cspell-gitignore": "7.3.9",
-            "cspell-glob": "7.3.9",
-            "cspell-io": "7.3.9",
-            "cspell-lib": "7.3.9",
-            "fast-glob": "^3.3.2",
-            "fast-json-stable-stringify": "^2.1.0",
-            "file-entry-cache": "^7.0.1",
-            "get-stdin": "^9.0.0",
-            "semver": "^7.5.4",
-            "strip-ansi": "^7.1.0",
-            "vscode-uri": "^3.0.8"
-          }
-        },
-        "cspell-dictionary": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "@cspell/cspell-pipe": "7.3.9",
-            "@cspell/cspell-types": "7.3.9",
-            "cspell-trie-lib": "7.3.9",
-            "fast-equals": "^4.0.3",
-            "gensequence": "^6.0.0"
-          },
-          "dependencies": {
-            "fast-equals": {
-              "version": "4.0.3",
-              "dev": true
-            }
-          }
-        },
-        "cspell-gitignore": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "cspell-glob": "7.3.9",
-            "find-up": "^5.0.0"
-          }
-        },
-        "cspell-glob": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "micromatch": "^4.0.5"
-          }
-        },
-        "cspell-grammar": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "@cspell/cspell-pipe": "7.3.9",
-            "@cspell/cspell-types": "7.3.9"
-          }
-        },
-        "cspell-io": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "@cspell/cspell-service-bus": "7.3.9",
-            "node-fetch": "^2.7.0"
-          }
-        },
-        "cspell-lib": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "@cspell/cspell-bundled-dicts": "7.3.9",
-            "@cspell/cspell-pipe": "7.3.9",
-            "@cspell/cspell-resolver": "7.3.9",
-            "@cspell/cspell-types": "7.3.9",
-            "@cspell/dynamic-import": "7.3.9",
-            "@cspell/strong-weak-map": "7.3.9",
-            "clear-module": "^4.1.2",
-            "comment-json": "^4.2.3",
-            "configstore": "^6.0.0",
-            "cosmiconfig": "8.0.0",
-            "cspell-dictionary": "7.3.9",
-            "cspell-glob": "7.3.9",
-            "cspell-grammar": "7.3.9",
-            "cspell-io": "7.3.9",
-            "cspell-trie-lib": "7.3.9",
-            "fast-equals": "^5.0.1",
-            "find-up": "^6.3.0",
-            "gensequence": "^6.0.0",
-            "import-fresh": "^3.3.0",
-            "resolve-from": "^5.0.0",
-            "vscode-languageserver-textdocument": "^1.0.11",
-            "vscode-uri": "^3.0.8"
-          },
-          "dependencies": {
-            "find-up": {
-              "version": "6.3.0",
-              "dev": true,
-              "requires": {
-                "locate-path": "^7.1.0",
-                "path-exists": "^5.0.0"
-              }
-            }
-          }
-        },
-        "cspell-trie-lib": {
-          "version": "7.3.9",
-          "dev": true,
-          "requires": {
-            "@cspell/cspell-pipe": "7.3.9",
-            "@cspell/cspell-types": "7.3.9",
-            "gensequence": "^6.0.0"
-          }
-        },
-        "file-entry-cache": {
-          "version": "7.0.2",
-          "dev": true,
-          "requires": {
-            "flat-cache": "^3.2.0"
-          }
-        },
-        "import-meta-resolve": {
-          "version": "3.1.1",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "7.2.0",
-          "dev": true,
-          "requires": {
-            "p-locate": "^6.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "4.0.0",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "6.0.0",
-          "dev": true,
-          "requires": {
-            "p-limit": "^4.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "5.0.0",
-          "dev": true
-        },
-        "yocto-queue": {
-          "version": "1.0.0",
-          "dev": true
-        }
-=======
         "@waku/utils": "^0.0.15"
->>>>>>> 5296bfbad8d98d2ee40e6570a6ad4546c86b9fcf
       }
     },
     "@waku/message-encryption": {
@@ -33566,8 +32717,6 @@
     },
     "@waku/peer-exchange": {
       "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/@waku/peer-exchange/-/peer-exchange-0.0.20.tgz",
-      "integrity": "sha512-Tbdw80VAk4Or6sKUX4LPCkuDo4zYB1/6hOLOMbSo1ck7w8ADNkcByyD5W/wVCmE4wM8Yen2Awb/auIsqunM8LQ==",
       "requires": {
         "@libp2p/interfaces": "^3.3.2",
         "@waku/core": "0.0.27",
@@ -34246,19 +33395,6 @@
             "xdg-basedir": "^4.0.0"
           }
         },
-        "cosmiconfig": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-          "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-          "dev": true,
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.2.1",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.10.0"
-          }
-        },
         "cross-fetch": {
           "version": "3.1.5",
           "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
@@ -34853,12 +33989,6 @@
           "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
           "dev": true
         },
-        "yaml": {
-          "version": "1.10.2",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-          "dev": true
-        },
         "yargs": {
           "version": "16.2.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -36687,19 +35817,25 @@
         "vary": "^1"
       }
     },
-<<<<<<< HEAD
     "cosmiconfig": {
-      "version": "8.0.0",
-      "dev": true,
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "requires": {
+        "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
         "parse-json": "^5.0.0",
-        "path-type": "^4.0.0"
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "dependencies": {
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
+        }
       }
     },
-=======
->>>>>>> 5296bfbad8d98d2ee40e6570a6ad4546c86b9fcf
     "cpu-features": {
       "version": "0.0.9",
       "optional": true,
@@ -37236,16 +36372,6 @@
         "color-name": {
           "version": "1.1.4"
         },
-        "cosmiconfig": {
-          "version": "7.1.0",
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.2.1",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.10.0"
-          }
-        },
         "emoji-regex": {
           "version": "8.0.0"
         },
@@ -37293,9 +36419,6 @@
             "strip-ansi": "^6.0.0"
           }
         },
-        "yaml": {
-          "version": "1.10.2"
-        },
         "yargs": {
           "version": "16.2.0",
           "requires": {