From 6f3a6d00d84a6f045e250ed374aba702c25c2b53 Mon Sep 17 00:00:00 2001
From: "fryorcraken.eth" <git@fryorcraken.xyz>
Date: Thu, 9 Feb 2023 13:44:44 +1100
Subject: [PATCH] chore: fix dependencies for `@waku/enr`

---
 package-lock.json         | 14 +++++++++-----
 packages/enr/package.json | 10 +++++-----
 packages/enr/src/enr.ts   |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 08e7e660ab..54ea045d18 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12083,7 +12083,6 @@
       "dependencies": {
         "@ethersproject/rlp": "^5.5.0",
         "@libp2p/crypto": "^1.0.11",
-        "@libp2p/interface-peer-id": "^2.0.1",
         "@libp2p/peer-id": "^2.0.1",
         "@multiformats/multiaddr": "^11.0.6",
         "@noble/secp256k1": "^1.3.4",
@@ -12092,6 +12091,7 @@
         "js-sha3": "^0.8.0"
       },
       "devDependencies": {
+        "@libp2p/interface-peer-id": "^2.0.1",
         "@libp2p/peer-id-factory": "^2.0.1",
         "@rollup/plugin-commonjs": "^22.0.0",
         "@rollup/plugin-json": "^4.1.0",
@@ -12122,6 +12122,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@libp2p/interface-peer-id/-/interface-peer-id-2.0.1.tgz",
       "integrity": "sha512-k01hKHTAZWMOiBC+yyFsmBguEMvhPkXnQtqLtFqga2fVZu8Zve7zFAtQYLhQjeJ4/apeFtO6ddTS8mCE6hl4OA==",
+      "dev": true,
       "dependencies": {
         "multiformats": "^11.0.0"
       },
@@ -12134,6 +12135,7 @@
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.1.tgz",
       "integrity": "sha512-atWruyH34YiknSdL5yeIir00EDlJRpHzELYQxG7Iy29eCyL+VrZHpPrX5yqlik3jnuqpLpRKVZ0SGVb9UzKaSA==",
+      "dev": true,
       "engines": {
         "node": ">=16.0.0",
         "npm": ">=7.0.0"
@@ -14709,8 +14711,8 @@
       "version": "file:packages/dns-discovery",
       "requires": {
         "@libp2p/interface-peer-discovery": "^1.0.5",
-        "@libp2p/interface-peer-info": "*",
-        "@libp2p/interface-peer-store": "*",
+        "@libp2p/interface-peer-info": "^1.0.8",
+        "@libp2p/interface-peer-store": "^1.2.8",
         "@libp2p/interfaces": "^3.3.1",
         "@libp2p/peer-id": "^2.0.1",
         "@libp2p/peer-id-factory": "^2.0.1",
@@ -14746,7 +14748,7 @@
       "requires": {
         "@ethersproject/rlp": "^5.5.0",
         "@libp2p/crypto": "^1.0.11",
-        "@libp2p/interface-peer-id": "^2.0.1",
+        "@libp2p/interface-peer-id": "*",
         "@libp2p/peer-id": "^2.0.1",
         "@libp2p/peer-id-factory": "^2.0.1",
         "@multiformats/multiaddr": "^11.0.6",
@@ -14780,6 +14782,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/@libp2p/interface-peer-id/-/interface-peer-id-2.0.1.tgz",
           "integrity": "sha512-k01hKHTAZWMOiBC+yyFsmBguEMvhPkXnQtqLtFqga2fVZu8Zve7zFAtQYLhQjeJ4/apeFtO6ddTS8mCE6hl4OA==",
+          "dev": true,
           "requires": {
             "multiformats": "^11.0.0"
           }
@@ -14787,7 +14790,8 @@
         "multiformats": {
           "version": "11.0.1",
           "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.1.tgz",
-          "integrity": "sha512-atWruyH34YiknSdL5yeIir00EDlJRpHzELYQxG7Iy29eCyL+VrZHpPrX5yqlik3jnuqpLpRKVZ0SGVb9UzKaSA=="
+          "integrity": "sha512-atWruyH34YiknSdL5yeIir00EDlJRpHzELYQxG7Iy29eCyL+VrZHpPrX5yqlik3jnuqpLpRKVZ0SGVb9UzKaSA==",
+          "dev": true
         }
       }
     },
diff --git a/packages/enr/package.json b/packages/enr/package.json
index 6ad55a0d36..12dc58b7ec 100644
--- a/packages/enr/package.json
+++ b/packages/enr/package.json
@@ -55,7 +55,6 @@
   "dependencies": {
     "@ethersproject/rlp": "^5.5.0",
     "@libp2p/crypto": "^1.0.11",
-    "@libp2p/interface-peer-id": "^2.0.1",
     "@libp2p/peer-id": "^2.0.1",
     "@multiformats/multiaddr": "^11.0.6",
     "@noble/secp256k1": "^1.3.4",
@@ -64,16 +63,16 @@
     "js-sha3": "^0.8.0"
   },
   "devDependencies": {
-    "@waku/interfaces": "*",
-    "uint8arrays": "^4.0.2",
+    "@libp2p/interface-peer-id": "^2.0.1",
     "@libp2p/peer-id-factory": "^2.0.1",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@typescript-eslint/eslint-plugin": "^5.8.1",
     "@typescript-eslint/parser": "^5.8.1",
-    "cspell": "^6.17.0",
+    "@waku/interfaces": "*",
     "chai": "^4.3.6",
+    "cspell": "^6.17.0",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
@@ -84,7 +83,8 @@
     "prettier": "^2.1.1",
     "rollup": "^2.75.0",
     "ts-loader": "^9.4.1",
-    "typescript": "^4.6.3"
+    "typescript": "^4.6.3",
+    "uint8arrays": "^4.0.2"
   },
   "typedoc": {
     "entryPoint": "./src/index.ts"
diff --git a/packages/enr/src/enr.ts b/packages/enr/src/enr.ts
index 51033bd39c..337bb06a43 100644
--- a/packages/enr/src/enr.ts
+++ b/packages/enr/src/enr.ts
@@ -1,6 +1,6 @@
 import * as RLP from "@ethersproject/rlp";
 import type { PeerId } from "@libp2p/interface-peer-id";
-import { Multiaddr } from "@multiformats/multiaddr";
+import type { Multiaddr } from "@multiformats/multiaddr";
 import {
   convertToBytes,
   convertToString,