Merge pull request #738 from status-im/remove-multihashes

Author: D4nte

.cspell.json

@@ -113,5 +113,12 @@
     "gen",
     "proto",
     "*.spec.ts"
-  ]
+  ],
+  "patterns": [
+    {
+      "name": "import",
+      "pattern": "/import .*/"
+    }
+  ],
+  "ignoreRegExpList": ["import"]
 }

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Some dependencies that were used but not declared (often transient).
 
+### Changed
+
+- Replaced deprecated `multihashes` with `multiformats`.
+
 ### Removed
 
 - No more `assert` usage.

package-lock.json

@@ -87,7 +87,7 @@
     "libp2p-websockets": "^0.16.1",
     "long": "^4.0.0",
     "multiaddr": "^10.0.1",
-    "multihashes": "^4.0.3",
+    "multiformats": "^9.6.5",
     "peer-id": "^0.16.0",
     "protobufjs": "^6.8.8",
     "uint8arrays": "^3.0.0",

package.json

@@ -8,7 +8,7 @@ import fetchNodesUntilCapabilitiesFulfilled from "./fetch_nodes";
 
 async function createEnr(waku2: Waku2): Promise<ENR> {
   const peerId = await PeerId.create({ keyType: "secp256k1" });
-  const enr = ENR.createFromPeerId(peerId);
+  const enr = await ENR.createFromPeerId(peerId);
   enr.setLocationMultiaddr(new Multiaddr("/ip4/18.223.219.100/udp/9000"));
   enr.multiaddrs = [
     new Multiaddr("/dns4/node1.do-ams.wakuv2.test.statusim.net/tcp/443/wss"),

src/lib/discovery/fetch_nodes.spec.ts

@@ -35,7 +35,7 @@ describe("ENR Interop: nwaku", function () {
     const nimPeerId = await nwaku.getPeerId();
 
     expect(nwakuInfo.enrUri).to.not.be.undefined;
-    const dec = ENR.decodeTxt(nwakuInfo.enrUri ?? "");
+    const dec = await ENR.decodeTxt(nwakuInfo.enrUri ?? "");
     expect(dec.peerId?.toB58String()).to.eq(nimPeerId.toB58String());
     expect(dec.waku2).to.deep.eq({
       relay: true,
@@ -66,7 +66,7 @@ describe("ENR Interop: nwaku", function () {
     const nimPeerId = await nwaku.getPeerId();
 
     expect(nwakuInfo.enrUri).to.not.be.undefined;
-    const dec = ENR.decodeTxt(nwakuInfo.enrUri ?? "");
+    const dec = await ENR.decodeTxt(nwakuInfo.enrUri ?? "");
     expect(dec.peerId?.toB58String()).to.eq(nimPeerId.toB58String());
     expect(dec.waku2).to.deep.eq({
       relay: true,
@@ -97,7 +97,7 @@ describe("ENR Interop: nwaku", function () {
     const nimPeerId = await nwaku.getPeerId();
 
     expect(nwakuInfo.enrUri).to.not.be.undefined;
-    const dec = ENR.decodeTxt(nwakuInfo.enrUri ?? "");
+    const dec = await ENR.decodeTxt(nwakuInfo.enrUri ?? "");
     expect(dec.peerId?.toB58String()).to.eq(nimPeerId.toB58String());
     expect(dec.waku2).to.deep.eq({
       relay: true,