From a730d5acec642cf03043081288f5dcad4249e43e Mon Sep 17 00:00:00 2001 From: danisharora099 Date: Tue, 14 May 2024 16:51:27 +0530 Subject: [PATCH 1/2] feat: map correct fleet according to the pubsub topic configured --- package-lock.json | 78 ++++++++++++++--------------- packages/sdk/src/utils/discovery.ts | 13 ++++- 2 files changed, 50 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b0b33e003..f1ba0148d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36494,14 +36494,14 @@ }, "packages/core": { "name": "@waku/core", - "version": "0.0.28", + "version": "0.0.29", "license": "MIT OR Apache-2.0", "dependencies": { "@libp2p/ping": "^1.0.12", - "@waku/enr": "^0.0.22", - "@waku/interfaces": "0.0.23", - "@waku/proto": "0.0.6", - "@waku/utils": "0.0.16", + "@waku/enr": "^0.0.23", + "@waku/interfaces": "0.0.24", + "@waku/proto": "0.0.7", + "@waku/utils": "0.0.17", "debug": "^4.3.4", "it-all": "^3.0.4", "it-length-prefixed": "^9.0.4", @@ -36552,14 +36552,14 @@ }, "packages/discovery": { "name": "@waku/discovery", - "version": "0.0.1", + "version": "0.0.2", "license": "MIT OR Apache-2.0", "dependencies": { - "@waku/core": "0.0.28", - "@waku/enr": "0.0.22", - "@waku/interfaces": "0.0.23", - "@waku/proto": "^0.0.6", - "@waku/utils": "0.0.16", + "@waku/core": "0.0.29", + "@waku/enr": "0.0.23", + "@waku/interfaces": "0.0.24", + "@waku/proto": "^0.0.7", + "@waku/utils": "0.0.17", "debug": "^4.3.4", "dns-query": "^0.11.2", "hi-base32": "^0.5.1", @@ -36606,7 +36606,7 @@ }, "packages/enr": { "name": "@waku/enr", - "version": "0.0.22", + "version": "0.0.23", "license": "MIT OR Apache-2.0", "dependencies": { "@ethersproject/rlp": "^5.7.0", @@ -36614,7 +36614,7 @@ "@libp2p/peer-id": "^4.0.4", "@multiformats/multiaddr": "^12.0.0", "@noble/secp256k1": "^1.7.1", - "@waku/utils": "0.0.16", + "@waku/utils": "0.0.17", "debug": "^4.3.4", "js-sha3": "^0.9.2" }, @@ -36626,7 +36626,7 @@ "@types/chai": "^4.3.11", "@types/mocha": "^10.0.6", "@waku/build-utils": "*", - "@waku/interfaces": "0.0.23", + "@waku/interfaces": "0.0.24", "chai": "^4.3.10", "cspell": "^8.6.1", "fast-check": "^3.15.1", @@ -36655,10 +36655,10 @@ }, "packages/interfaces": { "name": "@waku/interfaces", - "version": "0.0.23", + "version": "0.0.24", "license": "MIT OR Apache-2.0", "dependencies": { - "@waku/proto": "^0.0.6" + "@waku/proto": "^0.0.7" }, "devDependencies": { "@chainsafe/libp2p-gossipsub": "^12.0.0", @@ -36673,14 +36673,14 @@ }, "packages/message-encryption": { "name": "@waku/message-encryption", - "version": "0.0.26", + "version": "0.0.27", "license": "MIT OR Apache-2.0", "dependencies": { "@noble/secp256k1": "^1.7.1", - "@waku/core": "0.0.28", - "@waku/interfaces": "0.0.23", - "@waku/proto": "0.0.6", - "@waku/utils": "0.0.16", + "@waku/core": "0.0.29", + "@waku/interfaces": "0.0.24", + "@waku/proto": "0.0.7", + "@waku/utils": "0.0.17", "debug": "^4.3.4", "js-sha3": "^0.9.2", "uint8arrays": "^5.0.1" @@ -36717,11 +36717,11 @@ }, "packages/message-hash": { "name": "@waku/message-hash", - "version": "0.1.12", + "version": "0.1.13", "license": "MIT OR Apache-2.0", "dependencies": { "@noble/hashes": "^1.3.2", - "@waku/utils": "0.0.16" + "@waku/utils": "0.0.17" }, "devDependencies": { "@rollup/plugin-commonjs": "^25.0.7", @@ -36731,7 +36731,7 @@ "@types/debug": "^4.1.12", "@types/mocha": "^10.0.6", "@waku/build-utils": "*", - "@waku/interfaces": "0.0.23", + "@waku/interfaces": "0.0.24", "chai": "^4.3.10", "cspell": "^8.6.1", "fast-check": "^3.15.1", @@ -36757,7 +36757,7 @@ }, "packages/proto": { "name": "@waku/proto", - "version": "0.0.6", + "version": "0.0.7", "license": "MIT OR Apache-2.0", "dependencies": { "protons-runtime": "^5.4.0" @@ -36799,15 +36799,15 @@ }, "packages/relay": { "name": "@waku/relay", - "version": "0.0.11", + "version": "0.0.12", "license": "MIT OR Apache-2.0", "dependencies": { "@chainsafe/libp2p-gossipsub": "^12.0.0", "@noble/hashes": "^1.3.2", - "@waku/core": "0.0.28", - "@waku/interfaces": "0.0.23", - "@waku/proto": "0.0.6", - "@waku/utils": "0.0.16", + "@waku/core": "0.0.29", + "@waku/interfaces": "0.0.24", + "@waku/proto": "0.0.7", + "@waku/utils": "0.0.17", "chai": "^4.3.10", "debug": "^4.3.4", "fast-check": "^3.15.1" @@ -36840,7 +36840,7 @@ }, "packages/sdk": { "name": "@waku/sdk", - "version": "0.0.24", + "version": "0.0.25", "license": "MIT OR Apache-2.0", "dependencies": { "@chainsafe/libp2p-noise": "^14.1.0", @@ -36850,12 +36850,12 @@ "@libp2p/ping": "^1.0.12", "@libp2p/websockets": "^8.0.11", "@noble/hashes": "^1.3.3", - "@waku/core": "0.0.28", - "@waku/discovery": "0.0.1", - "@waku/interfaces": "0.0.23", - "@waku/proto": "^0.0.6", - "@waku/relay": "0.0.11", - "@waku/utils": "0.0.16", + "@waku/core": "0.0.29", + "@waku/discovery": "0.0.2", + "@waku/interfaces": "0.0.24", + "@waku/proto": "^0.0.7", + "@waku/relay": "0.0.12", + "@waku/utils": "0.0.17", "libp2p": "^1.1.2" }, "devDependencies": { @@ -36940,11 +36940,11 @@ }, "packages/utils": { "name": "@waku/utils", - "version": "0.0.16", + "version": "0.0.17", "license": "MIT OR Apache-2.0", "dependencies": { "@noble/hashes": "^1.3.2", - "@waku/interfaces": "0.0.23", + "@waku/interfaces": "0.0.24", "chai": "^4.3.10", "debug": "^4.3.4", "uint8arrays": "^5.0.1" diff --git a/packages/sdk/src/utils/discovery.ts b/packages/sdk/src/utils/discovery.ts index 979ab18380..55c2213ec4 100644 --- a/packages/sdk/src/utils/discovery.ts +++ b/packages/sdk/src/utils/discovery.ts @@ -5,7 +5,11 @@ import { wakuLocalPeerCacheDiscovery, wakuPeerExchangeDiscovery } from "@waku/discovery"; -import { type Libp2pComponents, PubsubTopic } from "@waku/interfaces"; +import { + DefaultPubsubTopic, + type Libp2pComponents, + PubsubTopic +} from "@waku/interfaces"; const DEFAULT_NODE_REQUIREMENTS = { lightPush: 1, @@ -16,8 +20,13 @@ const DEFAULT_NODE_REQUIREMENTS = { export function defaultPeerDiscoveries( pubsubTopics: PubsubTopic[] ): ((components: Libp2pComponents) => PeerDiscovery)[] { + // TODO: add a check to see if it is indeed TWN or if it is a custom network + const dnsFleet = pubsubTopics.includes(DefaultPubsubTopic) + ? enrTree["TEST"] + : enrTree["SANDBOX"]; + const discoveries = [ - wakuDnsDiscovery([enrTree["SANDBOX"]], DEFAULT_NODE_REQUIREMENTS), + wakuDnsDiscovery([dnsFleet], DEFAULT_NODE_REQUIREMENTS), wakuLocalPeerCacheDiscovery(), wakuPeerExchangeDiscovery(pubsubTopics) ]; From 00c77c6e125c12c3e6c03fc8f6c2383a4684fd87 Mon Sep 17 00:00:00 2001 From: danisharora099 Date: Tue, 14 May 2024 16:57:00 +0530 Subject: [PATCH 2/2] chore: mention issue in TODO --- packages/sdk/src/utils/discovery.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sdk/src/utils/discovery.ts b/packages/sdk/src/utils/discovery.ts index 55c2213ec4..1b0680f230 100644 --- a/packages/sdk/src/utils/discovery.ts +++ b/packages/sdk/src/utils/discovery.ts @@ -21,6 +21,7 @@ export function defaultPeerDiscoveries( pubsubTopics: PubsubTopic[] ): ((components: Libp2pComponents) => PeerDiscovery)[] { // TODO: add a check to see if it is indeed TWN or if it is a custom network + // https://github.com/waku-org/js-waku/issues/2014 const dnsFleet = pubsubTopics.includes(DefaultPubsubTopic) ? enrTree["TEST"] : enrTree["SANDBOX"];