Merge pull request #922 from status-im/libp2p-0.38.0

Author: fryorcraken

package-lock.json

@@ -89,31 +89,32 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@chainsafe/libp2p-gossipsub": "^3.4.0",
-    "@chainsafe/libp2p-noise": "^7.0.1",
+    "@chainsafe/libp2p-gossipsub": "^4.1.1",
+    "@chainsafe/libp2p-noise": "^8.0.1",
     "@ethersproject/rlp": "^5.5.0",
-    "@libp2p/crypto": "^1.0.0",
+    "@libp2p/crypto": "^1.0.4",
     "@libp2p/interface-connection": "3.0.1",
     "@libp2p/interface-peer-discovery": "^1.0.0",
     "@libp2p/interface-peer-id": "^1.0.2",
     "@libp2p/interface-peer-info": "^1.0.1",
     "@libp2p/interface-peer-store": "^1.0.0",
     "@libp2p/interfaces": "^3.0.2",
-    "@libp2p/mplex": "^4.0.1",
+    "@libp2p/mplex": "^5.1.1",
     "@libp2p/peer-id": "^1.1.10",
-    "@libp2p/websockets": "^3.0.0",
-    "@multiformats/multiaddr": "^10.2.0",
+    "@libp2p/websockets": "^3.0.3",
+    "@multiformats/multiaddr": "^10.4.0",
     "@noble/secp256k1": "^1.3.4",
     "debug": "^4.3.4",
     "dns-query": "^0.11.2",
     "hi-base32": "^0.5.1",
     "it-all": "^1.0.6",
-    "it-length-prefixed": "^7.0.1",
+    "it-length-prefixed": "^8.0.2",
     "it-pipe": "^2.0.4",
     "js-sha3": "^0.8.0",
-    "libp2p": "next",
+    "libp2p": "0.38.0",
     "p-event": "^5.0.1",
-    "protons-runtime": "^1.0.4",
+    "protons-runtime": "^3.1.0",
+    "uint8arraylist": "^2.3.2",
     "uint8arrays": "^3.0.0",
     "uuid": "^8.3.2"
   },
@@ -159,7 +160,7 @@
     "portfinder": "^1.0.28",
     "prettier": "^2.1.1",
     "process": "^0.11.10",
-    "protons": "^3.0.4",
+    "protons": "^5.1.0",
     "puppeteer": "^13.0.1",
     "rollup": "^2.75.0",
     "size-limit": "^8.0.0",
@@ -169,10 +170,6 @@
     "typedoc": "^0.23.10",
     "typescript": "^4.5.5"
   },
-  "overrides": {
-    "@libp2p/interface-connection": "3.0.1",
-    "uint8arraylist": "2.3.2"
-  },
   "files": [
     "dist",
     "bundle",

package.json

@@ -4,11 +4,11 @@ import all from "it-all";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
 import { Libp2p } from "libp2p";
+import { Uint8ArrayList } from "uint8arraylist";
 
 import { PushResponse } from "../../proto/light_push";
 import { DefaultPubSubTopic } from "../constants";
 import { getPeersForProtocol, selectRandomPeer } from "../select_peer";
-import { concat } from "../utils";
 import { WakuMessage } from "../waku_message";
 
 import { PushRPC } from "./push_rpc";
@@ -76,7 +76,11 @@ export class WakuLightPush {
         async (source) => await all(source)
       );
       try {
-        const bytes = concat(res);
+        const bytes = new Uint8ArrayList();
+        res.forEach((chunk) => {
+          bytes.append(chunk);
+        });
+
         const response = PushRPC.decode(bytes).response;
 
         if (!response) {

src/lib/waku_light_push/index.ts

@@ -1,3 +1,4 @@
+import type { Uint8ArrayList } from "uint8arraylist";
 import { v4 as uuid } from "uuid";
 
 import * as proto from "../../proto/light_push";
@@ -17,7 +18,7 @@ export class PushRPC {
     });
   }
 
-  static decode(bytes: Uint8Array): PushRPC {
+  static decode(bytes: Uint8ArrayList): PushRPC {
     const res = proto.PushRPC.decode(bytes);
     return new PushRPC(res);
   }

src/lib/waku_light_push/push_rpc.ts

@@ -1,3 +1,4 @@
+import type { Uint8ArrayList } from "uint8arraylist";
 import { v4 as uuid } from "uuid";
 
 import * as protoV2Beta3 from "../../proto/store_v2beta3";
@@ -139,7 +140,7 @@ export class HistoryRPC {
     }
   }
 
-  decode(bytes: Uint8Array): HistoryRPC {
+  decode(bytes: Uint8ArrayList): HistoryRPC {
     const res = this.historyRpc.decode(bytes);
     return new HistoryRPC(res, this.storeCodec);
   }

src/lib/waku_store/history_rpc.ts

@@ -5,17 +5,18 @@ import all from "it-all";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
 import { Libp2p } from "libp2p";
+import { Uint8ArrayList } from "uint8arraylist";
 
 import * as protoV2Beta4 from "../../proto/store_v2beta4";
 import { HistoryResponse } from "../../proto/store_v2beta4";
 import { DefaultPubSubTopic, StoreCodecs } from "../constants";
 import { getPeersForProtocol, selectRandomPeer } from "../select_peer";
-import { concat, hexToBytes } from "../utils";
+import { hexToBytes } from "../utils";
 import { DecryptionMethod, WakuMessage } from "../waku_message";
 
 import { HistoryRPC, PageDirection } from "./history_rpc";
 
-import Error = HistoryResponse.Error;
+import Error = HistoryResponse.HistoryError;
 
 const dbg = debug("waku:store");
 
@@ -211,7 +212,11 @@ export class WakuStore {
         lp.decode(),
         async (source) => await all(source)
       );
-      const bytes = concat(res);
+      const bytes = new Uint8ArrayList();
+      res.forEach((chunk) => {
+        bytes.append(chunk);
+      });
+
       const reply = historyRpcQuery.decode(bytes);
 
       if (!reply.response) {