From d5d86b2a7f2d7839e66ab9af2d56a059a0b1d05d Mon Sep 17 00:00:00 2001 From: danisharora099 Date: Fri, 16 Feb 2024 20:43:32 +0530 Subject: [PATCH] move all discoveries to @waku/discovery --- package-lock.json | 109 ++++---- package.json | 4 +- .../.eslintrc.cjs | 0 .../.mocha.reporters.json | 0 .../{dns-discovery => discovery}/.mocharc.cjs | 0 .../{dns-discovery => discovery}/CHANGELOG.md | 0 .../karma.conf.cjs | 0 .../discovery/mock_local_storage/waku%3Apeers | 1 + .../{dns-discovery => discovery}/package.json | 15 +- .../rollup.config.js | 0 .../src => discovery/src/dns}/constants.ts | 0 .../src => discovery/src/dns}/dns.spec.ts | 0 .../src => discovery/src/dns}/dns.ts | 0 .../src/dns}/dns_discovery.ts | 0 .../src/dns}/dns_over_https.ts | 0 .../src => discovery/src/dns}/enrtree.spec.ts | 0 .../src => discovery/src/dns}/enrtree.ts | 0 .../src/dns}/fetch_nodes.spec.ts | 0 .../src => discovery/src/dns}/fetch_nodes.ts | 0 .../src => discovery/src/dns}/index.spec.ts | 0 .../src => discovery/src/dns}/index.ts | 0 .../src => discovery/src/dns}/testdata.json | 0 packages/discovery/src/index.ts | 3 + .../src => discovery/src/local}/index.ts | 0 .../src/local}/local_discovery.spec.ts | 0 .../src/peer-exchange}/index.ts | 0 .../src/peer-exchange}/rpc.ts | 0 .../src/peer-exchange}/waku_peer_exchange.ts | 0 .../waku_peer_exchange_discovery.ts | 0 .../tsconfig.dev.json | 0 .../tsconfig.json | 0 .../tsconfig.karma.json | 0 .../{dns-discovery => discovery}/typedoc.json | 0 packages/local-discovery/.eslintrc.cjs | 6 - .../local-discovery/.mocha.reporters.json | 6 - packages/local-discovery/.mocharc.cjs | 26 -- packages/local-discovery/CHANGELOG.md | 0 packages/local-discovery/karma.conf.cjs | 3 - packages/local-discovery/package.json | 83 ------ packages/local-discovery/rollup.config.js | 24 -- packages/local-discovery/tsconfig.dev.json | 3 - packages/local-discovery/tsconfig.json | 10 - packages/local-discovery/typedoc.json | 4 - packages/peer-exchange/.eslintrc.cjs | 6 - packages/peer-exchange/CHANGELOG.md | 263 ------------------ packages/peer-exchange/package.json | 83 ------ packages/peer-exchange/rollup.config.js | 24 -- packages/peer-exchange/tsconfig.dev.json | 3 - packages/peer-exchange/tsconfig.json | 10 - packages/peer-exchange/typedoc.json | 4 - packages/sdk/package.json | 3 +- packages/sdk/src/create.ts | 9 +- packages/tests/package.json | 3 +- .../tests/tests/dns-peer-discovery.spec.ts | 2 +- .../tests/tests/peer_exchange.node.spec.ts | 4 +- .../tests/peer_exchange.optional.spec.ts | 2 +- .../tests/sharding/peer_management.spec.ts | 2 +- .../tests/tests/waku.node.optional.spec.ts | 2 +- 58 files changed, 83 insertions(+), 634 deletions(-) rename packages/{dns-discovery => discovery}/.eslintrc.cjs (100%) rename packages/{dns-discovery => discovery}/.mocha.reporters.json (100%) rename packages/{dns-discovery => discovery}/.mocharc.cjs (100%) rename packages/{dns-discovery => discovery}/CHANGELOG.md (100%) rename packages/{dns-discovery => discovery}/karma.conf.cjs (100%) create mode 100644 packages/discovery/mock_local_storage/waku%3Apeers rename packages/{dns-discovery => discovery}/package.json (82%) rename packages/{dns-discovery => discovery}/rollup.config.js (100%) rename packages/{dns-discovery/src => discovery/src/dns}/constants.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/dns.spec.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/dns.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/dns_discovery.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/dns_over_https.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/enrtree.spec.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/enrtree.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/fetch_nodes.spec.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/fetch_nodes.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/index.spec.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/index.ts (100%) rename packages/{dns-discovery/src => discovery/src/dns}/testdata.json (100%) create mode 100644 packages/discovery/src/index.ts rename packages/{local-discovery/src => discovery/src/local}/index.ts (100%) rename packages/{local-discovery/src => discovery/src/local}/local_discovery.spec.ts (100%) rename packages/{peer-exchange/src => discovery/src/peer-exchange}/index.ts (100%) rename packages/{peer-exchange/src => discovery/src/peer-exchange}/rpc.ts (100%) rename packages/{peer-exchange/src => discovery/src/peer-exchange}/waku_peer_exchange.ts (100%) rename packages/{peer-exchange/src => discovery/src/peer-exchange}/waku_peer_exchange_discovery.ts (100%) rename packages/{dns-discovery => discovery}/tsconfig.dev.json (100%) rename packages/{dns-discovery => discovery}/tsconfig.json (100%) rename packages/{dns-discovery => discovery}/tsconfig.karma.json (100%) rename packages/{dns-discovery => discovery}/typedoc.json (100%) delete mode 100644 packages/local-discovery/.eslintrc.cjs delete mode 100644 packages/local-discovery/.mocha.reporters.json delete mode 100644 packages/local-discovery/.mocharc.cjs delete mode 100644 packages/local-discovery/CHANGELOG.md delete mode 100644 packages/local-discovery/karma.conf.cjs delete mode 100644 packages/local-discovery/package.json delete mode 100644 packages/local-discovery/rollup.config.js delete mode 100644 packages/local-discovery/tsconfig.dev.json delete mode 100644 packages/local-discovery/tsconfig.json delete mode 100644 packages/local-discovery/typedoc.json delete mode 100644 packages/peer-exchange/.eslintrc.cjs delete mode 100644 packages/peer-exchange/CHANGELOG.md delete mode 100644 packages/peer-exchange/package.json delete mode 100644 packages/peer-exchange/rollup.config.js delete mode 100644 packages/peer-exchange/tsconfig.dev.json delete mode 100644 packages/peer-exchange/tsconfig.json delete mode 100644 packages/peer-exchange/typedoc.json diff --git a/package-lock.json b/package-lock.json index aa3c64909b..0f70ca8cdc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,9 +13,7 @@ "packages/enr", "packages/core", "packages/relay", - "packages/peer-exchange", - "packages/dns-discovery", - "packages/local-discovery", + "packages/discovery", "packages/message-encryption", "packages/sdk", "packages/tests", @@ -2883,14 +2881,6 @@ "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.1.tgz", "integrity": "sha512-bt3R5iXe2O8xpp3wkmQhC73b/lC4S2ihU8Dndwcsysqbydqb8N+bpP116qMcClZ17g58iSIwtXUTcg2zT4sniA==" }, - "node_modules/@libp2p/interfaces": { - "version": "3.3.2", - "license": "Apache-2.0 OR MIT", - "engines": { - "node": ">=16.0.0", - "npm": ">=7.0.0" - } - }, "node_modules/@libp2p/logger": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/@libp2p/logger/-/logger-4.0.5.tgz", @@ -5467,8 +5457,8 @@ "node": ">= 10.0.0" } }, - "node_modules/@waku/dns-discovery": { - "resolved": "packages/dns-discovery", + "node_modules/@waku/discovery": { + "resolved": "packages/discovery", "link": true }, "node_modules/@waku/enr": { @@ -5491,10 +5481,6 @@ "resolved": "packages/message-hash", "link": true }, - "node_modules/@waku/peer-exchange": { - "resolved": "packages/peer-exchange", - "link": true - }, "node_modules/@waku/proto": { "resolved": "packages/proto", "link": true @@ -27834,9 +27820,47 @@ } } }, + "packages/discovery": { + "name": "@waku/discovery", + "version": "0.0.1", + "license": "MIT OR Apache-2.0", + "dependencies": { + "@waku/enr": "0.0.20", + "@waku/interfaces": "^0.0.21", + "@waku/proto": "^0.0.6", + "@waku/utils": "0.0.14", + "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", + "@types/node-localstorage": "^1.3.3", + "@waku/build-utils": "*", + "chai": "^4.3.10", + "chai-as-promised": "^7.1.1", + "cspell": "^8.3.2", + "mocha": "^10.3.0", + "node-localstorage": "^3.0.5", + "npm-run-all": "^4.1.5", + "rollup": "^4.9.5", + "sinon": "^17.0.1" + }, + "engines": { + "node": ">=18" + } + }, "packages/dns-discovery": { "name": "@waku/dns-discovery", "version": "0.0.20", + "extraneous": true, "license": "MIT OR Apache-2.0", "dependencies": { "@waku/enr": "0.0.20", @@ -28463,6 +28487,7 @@ "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", @@ -28550,10 +28575,9 @@ "@libp2p/ping": "^1.0.11", "@libp2p/websockets": "^8.0.11", "@waku/core": "0.0.26", - "@waku/dns-discovery": "0.0.20", + "@waku/discovery": "*", "@waku/interfaces": "0.0.21", "@waku/local-discovery": "^0.0.1", - "@waku/peer-exchange": "^0.0.19", "@waku/relay": "0.0.9", "@waku/utils": "0.0.14", "libp2p": "^1.1.2" @@ -28602,9 +28626,8 @@ "@types/mocha": "^10.0.6", "@types/sinon": "^17.0.3", "@types/tail": "^2.2.3", - "@waku/dns-discovery": "*", + "@waku/discovery": "*", "@waku/message-encryption": "*", - "@waku/peer-exchange": "*", "@waku/sdk": "*", "allure-commandline": "^2.24.1", "allure-mocha": "^2.9.2", @@ -30646,9 +30669,6 @@ "uint8arraylist": "^2.4.8" } }, - "@libp2p/interfaces": { - "version": "3.3.2" - }, "@libp2p/logger": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/@libp2p/logger/-/logger-4.0.5.tgz", @@ -32518,8 +32538,8 @@ } } }, - "@waku/dns-discovery": { - "version": "file:packages/dns-discovery", + "@waku/discovery": { + "version": "file:packages/discovery", "requires": { "@libp2p/peer-id": "^4.0.4", "@libp2p/peer-id-factory": "^4.0.5", @@ -32528,18 +32548,23 @@ "@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": "*", "@waku/enr": "0.0.20", - "@waku/interfaces": "0.0.21", + "@waku/interfaces": "^0.0.21", + "@waku/proto": "^0.0.6", "@waku/utils": "0.0.14", "chai": "^4.3.10", + "chai-as-promised": "^7.1.1", "cspell": "^8.3.2", "debug": "^4.3.4", "dns-query": "^0.11.2", "hi-base32": "^0.5.1", "mocha": "^10.3.0", + "node-localstorage": "^3.0.5", "npm-run-all": "^4.1.5", "rollup": "^4.9.5", + "sinon": "^17.0.1", "uint8arrays": "^5.0.1" } }, @@ -32980,30 +33005,6 @@ "rollup": "^4.9.5" } }, - "@waku/peer-exchange": { - "version": "file:packages/peer-exchange", - "requires": { - "@libp2p/interfaces": "^3.3.2", - "@rollup/plugin-commonjs": "^25.0.7", - "@rollup/plugin-json": "^6.0.0", - "@rollup/plugin-node-resolve": "^15.2.3", - "@waku/build-utils": "*", - "@waku/core": "0.0.26", - "@waku/enr": "0.0.20", - "@waku/interfaces": "0.0.21", - "@waku/proto": "0.0.6", - "@waku/utils": "0.0.14", - "chai": "^4.3.10", - "cspell": "^8.3.2", - "debug": "^4.3.4", - "it-all": "^3.0.4", - "it-length-prefixed": "^9.0.4", - "it-pipe": "^3.0.1", - "npm-run-all": "^4.1.5", - "rollup": "^4.9.5", - "uint8arraylist": "^2.4.3" - } - }, "@waku/proto": { "version": "file:packages/proto", "requires": { @@ -33052,10 +33053,9 @@ "@rollup/plugin-node-resolve": "^15.2.3", "@waku/build-utils": "*", "@waku/core": "0.0.26", - "@waku/dns-discovery": "0.0.20", + "@waku/discovery": "*", "@waku/interfaces": "0.0.21", "@waku/local-discovery": "^0.0.1", - "@waku/peer-exchange": "^0.0.19", "@waku/relay": "0.0.9", "@waku/utils": "0.0.14", "cspell": "^8.3.2", @@ -33077,11 +33077,10 @@ "@types/sinon": "^17.0.3", "@types/tail": "^2.2.3", "@waku/core": "*", - "@waku/dns-discovery": "*", + "@waku/discovery": "*", "@waku/enr": "*", "@waku/interfaces": "*", "@waku/message-encryption": "*", - "@waku/peer-exchange": "*", "@waku/sdk": "*", "@waku/utils": "*", "allure-commandline": "^2.24.1", diff --git a/package.json b/package.json index 7d8eba4b42..3bcc64f2ae 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,7 @@ "packages/enr", "packages/core", "packages/relay", - "packages/peer-exchange", - "packages/dns-discovery", - "packages/local-discovery", + "packages/discovery", "packages/message-encryption", "packages/sdk", "packages/tests", diff --git a/packages/dns-discovery/.eslintrc.cjs b/packages/discovery/.eslintrc.cjs similarity index 100% rename from packages/dns-discovery/.eslintrc.cjs rename to packages/discovery/.eslintrc.cjs diff --git a/packages/dns-discovery/.mocha.reporters.json b/packages/discovery/.mocha.reporters.json similarity index 100% rename from packages/dns-discovery/.mocha.reporters.json rename to packages/discovery/.mocha.reporters.json diff --git a/packages/dns-discovery/.mocharc.cjs b/packages/discovery/.mocharc.cjs similarity index 100% rename from packages/dns-discovery/.mocharc.cjs rename to packages/discovery/.mocharc.cjs diff --git a/packages/dns-discovery/CHANGELOG.md b/packages/discovery/CHANGELOG.md similarity index 100% rename from packages/dns-discovery/CHANGELOG.md rename to packages/discovery/CHANGELOG.md diff --git a/packages/dns-discovery/karma.conf.cjs b/packages/discovery/karma.conf.cjs similarity index 100% rename from packages/dns-discovery/karma.conf.cjs rename to packages/discovery/karma.conf.cjs diff --git a/packages/discovery/mock_local_storage/waku%3Apeers b/packages/discovery/mock_local_storage/waku%3Apeers new file mode 100644 index 0000000000..0637a088a0 --- /dev/null +++ b/packages/discovery/mock_local_storage/waku%3Apeers @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/packages/dns-discovery/package.json b/packages/discovery/package.json similarity index 82% rename from packages/dns-discovery/package.json rename to packages/discovery/package.json index dc8864a13a..78af6fe404 100644 --- a/packages/dns-discovery/package.json +++ b/packages/discovery/package.json @@ -1,7 +1,7 @@ { - "name": "@waku/dns-discovery", - "version": "0.0.20", - "description": "DNS Peer Discovery (EIP-1459)", + "name": "@waku/discovery", + "version": "0.0.1", + "description": "Peer Discoveries for Waku. This package provides DNS Peer Discovery (EIP-1459), Peer Exchange Discovery (https://rfc.vac.dev/spec/34/) and Local Discovery.", "types": "./dist/index.d.ts", "module": "./dist/index.js", "exports": { @@ -52,6 +52,8 @@ }, "dependencies": { "@waku/enr": "0.0.20", + "@waku/interfaces": "^0.0.21", + "@waku/proto": "^0.0.6", "@waku/utils": "0.0.14", "debug": "^4.3.4", "dns-query": "^0.11.2", @@ -66,13 +68,16 @@ "@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": "*", - "@waku/interfaces": "0.0.21", "chai": "^4.3.10", + "chai-as-promised": "^7.1.1", "cspell": "^8.3.2", "mocha": "^10.3.0", + "node-localstorage": "^3.0.5", "npm-run-all": "^4.1.5", - "rollup": "^4.9.5" + "rollup": "^4.9.5", + "sinon": "^17.0.1" }, "files": [ "dist", diff --git a/packages/dns-discovery/rollup.config.js b/packages/discovery/rollup.config.js similarity index 100% rename from packages/dns-discovery/rollup.config.js rename to packages/discovery/rollup.config.js diff --git a/packages/dns-discovery/src/constants.ts b/packages/discovery/src/dns/constants.ts similarity index 100% rename from packages/dns-discovery/src/constants.ts rename to packages/discovery/src/dns/constants.ts diff --git a/packages/dns-discovery/src/dns.spec.ts b/packages/discovery/src/dns/dns.spec.ts similarity index 100% rename from packages/dns-discovery/src/dns.spec.ts rename to packages/discovery/src/dns/dns.spec.ts diff --git a/packages/dns-discovery/src/dns.ts b/packages/discovery/src/dns/dns.ts similarity index 100% rename from packages/dns-discovery/src/dns.ts rename to packages/discovery/src/dns/dns.ts diff --git a/packages/dns-discovery/src/dns_discovery.ts b/packages/discovery/src/dns/dns_discovery.ts similarity index 100% rename from packages/dns-discovery/src/dns_discovery.ts rename to packages/discovery/src/dns/dns_discovery.ts diff --git a/packages/dns-discovery/src/dns_over_https.ts b/packages/discovery/src/dns/dns_over_https.ts similarity index 100% rename from packages/dns-discovery/src/dns_over_https.ts rename to packages/discovery/src/dns/dns_over_https.ts diff --git a/packages/dns-discovery/src/enrtree.spec.ts b/packages/discovery/src/dns/enrtree.spec.ts similarity index 100% rename from packages/dns-discovery/src/enrtree.spec.ts rename to packages/discovery/src/dns/enrtree.spec.ts diff --git a/packages/dns-discovery/src/enrtree.ts b/packages/discovery/src/dns/enrtree.ts similarity index 100% rename from packages/dns-discovery/src/enrtree.ts rename to packages/discovery/src/dns/enrtree.ts diff --git a/packages/dns-discovery/src/fetch_nodes.spec.ts b/packages/discovery/src/dns/fetch_nodes.spec.ts similarity index 100% rename from packages/dns-discovery/src/fetch_nodes.spec.ts rename to packages/discovery/src/dns/fetch_nodes.spec.ts diff --git a/packages/dns-discovery/src/fetch_nodes.ts b/packages/discovery/src/dns/fetch_nodes.ts similarity index 100% rename from packages/dns-discovery/src/fetch_nodes.ts rename to packages/discovery/src/dns/fetch_nodes.ts diff --git a/packages/dns-discovery/src/index.spec.ts b/packages/discovery/src/dns/index.spec.ts similarity index 100% rename from packages/dns-discovery/src/index.spec.ts rename to packages/discovery/src/dns/index.spec.ts diff --git a/packages/dns-discovery/src/index.ts b/packages/discovery/src/dns/index.ts similarity index 100% rename from packages/dns-discovery/src/index.ts rename to packages/discovery/src/dns/index.ts diff --git a/packages/dns-discovery/src/testdata.json b/packages/discovery/src/dns/testdata.json similarity index 100% rename from packages/dns-discovery/src/testdata.json rename to packages/discovery/src/dns/testdata.json diff --git a/packages/discovery/src/index.ts b/packages/discovery/src/index.ts new file mode 100644 index 0000000000..b8fe0faac0 --- /dev/null +++ b/packages/discovery/src/index.ts @@ -0,0 +1,3 @@ +export * from "./dns/index.js"; +export * from "./local/index.js"; +export * from "./peer-exchange/index.js"; diff --git a/packages/local-discovery/src/index.ts b/packages/discovery/src/local/index.ts similarity index 100% rename from packages/local-discovery/src/index.ts rename to packages/discovery/src/local/index.ts diff --git a/packages/local-discovery/src/local_discovery.spec.ts b/packages/discovery/src/local/local_discovery.spec.ts similarity index 100% rename from packages/local-discovery/src/local_discovery.spec.ts rename to packages/discovery/src/local/local_discovery.spec.ts diff --git a/packages/peer-exchange/src/index.ts b/packages/discovery/src/peer-exchange/index.ts similarity index 100% rename from packages/peer-exchange/src/index.ts rename to packages/discovery/src/peer-exchange/index.ts diff --git a/packages/peer-exchange/src/rpc.ts b/packages/discovery/src/peer-exchange/rpc.ts similarity index 100% rename from packages/peer-exchange/src/rpc.ts rename to packages/discovery/src/peer-exchange/rpc.ts diff --git a/packages/peer-exchange/src/waku_peer_exchange.ts b/packages/discovery/src/peer-exchange/waku_peer_exchange.ts similarity index 100% rename from packages/peer-exchange/src/waku_peer_exchange.ts rename to packages/discovery/src/peer-exchange/waku_peer_exchange.ts diff --git a/packages/peer-exchange/src/waku_peer_exchange_discovery.ts b/packages/discovery/src/peer-exchange/waku_peer_exchange_discovery.ts similarity index 100% rename from packages/peer-exchange/src/waku_peer_exchange_discovery.ts rename to packages/discovery/src/peer-exchange/waku_peer_exchange_discovery.ts diff --git a/packages/dns-discovery/tsconfig.dev.json b/packages/discovery/tsconfig.dev.json similarity index 100% rename from packages/dns-discovery/tsconfig.dev.json rename to packages/discovery/tsconfig.dev.json diff --git a/packages/dns-discovery/tsconfig.json b/packages/discovery/tsconfig.json similarity index 100% rename from packages/dns-discovery/tsconfig.json rename to packages/discovery/tsconfig.json diff --git a/packages/dns-discovery/tsconfig.karma.json b/packages/discovery/tsconfig.karma.json similarity index 100% rename from packages/dns-discovery/tsconfig.karma.json rename to packages/discovery/tsconfig.karma.json diff --git a/packages/dns-discovery/typedoc.json b/packages/discovery/typedoc.json similarity index 100% rename from packages/dns-discovery/typedoc.json rename to packages/discovery/typedoc.json diff --git a/packages/local-discovery/.eslintrc.cjs b/packages/local-discovery/.eslintrc.cjs deleted file mode 100644 index 2299ed822e..0000000000 --- a/packages/local-discovery/.eslintrc.cjs +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - parserOptions: { - tsconfigRootDir: __dirname, - project: "./tsconfig.dev.json" - } -}; diff --git a/packages/local-discovery/.mocha.reporters.json b/packages/local-discovery/.mocha.reporters.json deleted file mode 100644 index 8c00e441fc..0000000000 --- a/packages/local-discovery/.mocha.reporters.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "reporterEnabled": "spec, allure-mocha", - "allureMochaReporter": { - "outputDir": "allure-results" - } -} diff --git a/packages/local-discovery/.mocharc.cjs b/packages/local-discovery/.mocharc.cjs deleted file mode 100644 index 423c0517bd..0000000000 --- a/packages/local-discovery/.mocharc.cjs +++ /dev/null @@ -1,26 +0,0 @@ -const config = { - extension: ['ts'], - spec: 'src/**/*.spec.ts', - require: ['ts-node/register', 'isomorphic-fetch'], - loader: 'ts-node/esm', - 'node-option': [ - 'experimental-specifier-resolution=node', - 'loader=ts-node/esm' - ], - exit: true -}; - -if (process.env.CI) { - console.log("Running tests in parallel"); - config.parallel = true; - config.jobs = 6; - console.log("Activating allure reporting"); - config.reporter = 'mocha-multi-reporters'; - config.reporterOptions = { - configFile: '.mocha.reporters.json' - }; -} else { - console.log("Running tests serially. To enable parallel execution update mocha config"); -} - -module.exports = config; diff --git a/packages/local-discovery/CHANGELOG.md b/packages/local-discovery/CHANGELOG.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/local-discovery/karma.conf.cjs b/packages/local-discovery/karma.conf.cjs deleted file mode 100644 index 1acbc3dd2a..0000000000 --- a/packages/local-discovery/karma.conf.cjs +++ /dev/null @@ -1,3 +0,0 @@ -const config = require("../../karma.conf.cjs"); - -module.exports = config; diff --git a/packages/local-discovery/package.json b/packages/local-discovery/package.json deleted file mode 100644 index 5a45f72e27..0000000000 --- a/packages/local-discovery/package.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "@waku/local-discovery", - "version": "0.0.1", - "description": "Local Discovery keeps records of healthy peers in the browser's local storage for quicker bootstrapping.", - "types": "./dist/index.d.ts", - "module": "./dist/index.js", - "exports": { - ".": { - "types": "./dist/index.d.ts", - "import": "./dist/index.js" - } - }, - "type": "module", - "author": "Waku Team", - "homepage": "https://github.com/waku-org/js-waku/tree/master/packages/local-discovery#readme", - "repository": { - "type": "git", - "url": "https://github.com/waku-org/js-waku.git" - }, - "bugs": { - "url": "https://github.com/waku-org/js-waku/issues" - }, - "license": "MIT OR Apache-2.0", - "keywords": [ - "waku", - "decentralized", - "secure", - "communication", - "web3", - "ethereum", - "dapps", - "privacy" - ], - "scripts": { - "build": "run-s build:**", - "build:esm": "tsc", - "build:bundle": "rollup --config rollup.config.js", - "fix": "run-s fix:*", - "fix:lint": "eslint src *.js --fix", - "check": "run-s check:*", - "check:lint": "eslint src --ext .ts", - "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", - "check:tsc": "tsc -p tsconfig.dev.json", - "prepublish": "npm run build", - "reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build", - "test": "NODE_ENV=test run-s test:*", - "test:node": "NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha" - }, - "engines": { - "node": ">=18" - }, - "dependencies": { - "@libp2p/interface": "^1.1.2", - "@waku/interfaces": "^0.0.21", - "@waku/utils": "^0.0.14" - }, - "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.9.5", - "sinon": "^17.0.1" - }, - "files": [ - "dist", - "bundle", - "src/**/*.ts", - "!**/*.spec.*", - "!**/*.json", - "CHANGELOG.md", - "LICENSE", - "README.md" - ] -} diff --git a/packages/local-discovery/rollup.config.js b/packages/local-discovery/rollup.config.js deleted file mode 100644 index 4d0757b1c9..0000000000 --- a/packages/local-discovery/rollup.config.js +++ /dev/null @@ -1,24 +0,0 @@ -import commonjs from "@rollup/plugin-commonjs"; -import json from "@rollup/plugin-json"; -import { nodeResolve } from "@rollup/plugin-node-resolve"; -import { extractExports } from "@waku/build-utils"; - -import * as packageJson from "./package.json" assert { type: "json" }; - -const input = extractExports(packageJson); - -export default { - input, - output: { - dir: "bundle", - format: "esm" - }, - plugins: [ - commonjs(), - json(), - nodeResolve({ - browser: true, - preferBuiltins: false - }) - ] -}; diff --git a/packages/local-discovery/tsconfig.dev.json b/packages/local-discovery/tsconfig.dev.json deleted file mode 100644 index 4f7c34af3c..0000000000 --- a/packages/local-discovery/tsconfig.dev.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../tsconfig.dev" -} diff --git a/packages/local-discovery/tsconfig.json b/packages/local-discovery/tsconfig.json deleted file mode 100644 index eebbc51585..0000000000 --- a/packages/local-discovery/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "dist/", - "rootDir": "src", - "tsBuildInfoFile": "dist/.tsbuildinfo" - }, - "include": ["src"], - "exclude": ["src/**/*.spec.ts", "src/test_utils"] -} diff --git a/packages/local-discovery/typedoc.json b/packages/local-discovery/typedoc.json deleted file mode 100644 index 00aa3dc064..0000000000 --- a/packages/local-discovery/typedoc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": ["../../typedoc.base.json"], - "entryPoints": ["src/index.ts"] -} \ No newline at end of file diff --git a/packages/peer-exchange/.eslintrc.cjs b/packages/peer-exchange/.eslintrc.cjs deleted file mode 100644 index 2299ed822e..0000000000 --- a/packages/peer-exchange/.eslintrc.cjs +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - parserOptions: { - tsconfigRootDir: __dirname, - project: "./tsconfig.dev.json" - } -}; diff --git a/packages/peer-exchange/CHANGELOG.md b/packages/peer-exchange/CHANGELOG.md deleted file mode 100644 index 1b539db8ee..0000000000 --- a/packages/peer-exchange/CHANGELOG.md +++ /dev/null @@ -1,263 +0,0 @@ -# Changelog - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.12 to 0.0.13 - * @waku/enr bumped from 0.0.7 to 0.0.8 - * @waku/proto bumped from 0.0.3 to 0.0.4 - * @waku/utils bumped from * to 0.0.3 - * devDependencies - * @waku/interfaces bumped from 0.0.9 to 0.0.10 - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/enr bumped from 0.0.8 to 0.0.9 - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.14 to 0.0.15 - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.15 to 0.0.16 - * @waku/enr bumped from 0.0.9 to 0.0.10 - * @waku/utils bumped from 0.0.3 to 0.0.4 - * devDependencies - * @waku/interfaces bumped from 0.0.10 to 0.0.11 - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.16 to 0.0.17 - * @waku/enr bumped from 0.0.10 to 0.0.11 - * @waku/utils bumped from 0.0.4 to 0.0.5 - * devDependencies - * @waku/interfaces bumped from 0.0.11 to 0.0.12 - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.18 to 0.0.19 - * @waku/enr bumped from 0.0.12 to 0.0.13 - * @waku/proto bumped from * to 0.0.5 - * @waku/utils bumped from 0.0.6 to 0.0.7 - * devDependencies - * @waku/interfaces bumped from 0.0.13 to 0.0.14 - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.19 to 0.0.20 - * @waku/enr bumped from 0.0.13 to 0.0.14 - * @waku/utils bumped from 0.0.7 to 0.0.8 - * devDependencies - * @waku/interfaces bumped from 0.0.14 to 0.0.15 - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.25 to 0.0.26 - * @waku/enr bumped from 0.0.19 to 0.0.20 - * @waku/interfaces bumped from 0.0.20 to 0.0.21 - * @waku/proto bumped from 0.0.5 to 0.0.6 - * @waku/utils bumped from 0.0.13 to 0.0.14 - -## [0.0.18](https://github.com/waku-org/js-waku/compare/peer-exchange-v0.0.17...peer-exchange-v0.0.18) (2023-11-01) - - -### Features - -* Logger with log levels ([#1672](https://github.com/waku-org/js-waku/issues/1672)) ([0f7d63e](https://github.com/waku-org/js-waku/commit/0f7d63ef93716223dc8fea7e8cb09e12e267b386)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.24 to 0.0.25 - * @waku/enr bumped from 0.0.18 to 0.0.19 - * @waku/interfaces bumped from 0.0.19 to 0.0.20 - * @waku/utils bumped from 0.0.12 to 0.0.13 - -## [0.0.17](https://github.com/waku-org/js-waku/compare/peer-exchange-v0.0.16...peer-exchange-v0.0.17) (2023-10-16) - - -### Features - -* **static-sharding:** Filter peer connections per shards ([#1626](https://github.com/waku-org/js-waku/issues/1626)) ([124a29e](https://github.com/waku-org/js-waku/commit/124a29ebba59c05fbbf199d969e6ba3f9e57d45b)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.23 to 0.0.24 - * @waku/enr bumped from 0.0.17 to 0.0.18 - * @waku/interfaces bumped from 0.0.18 to 0.0.19 - * @waku/utils bumped from 0.0.11 to 0.0.12 - -## [0.0.16](https://github.com/waku-org/js-waku/compare/peer-exchange-v0.0.15...peer-exchange-v0.0.16) (2023-09-11) - - -### ⚠ BREAKING CHANGES - -* set peer-exchange with default bootstrap ([#1469](https://github.com/waku-org/js-waku/issues/1469)) - -### Features - -* Pre-emptive stream creation for protocols ([#1516](https://github.com/waku-org/js-waku/issues/1516)) ([b4f8216](https://github.com/waku-org/js-waku/commit/b4f821676120aa06f4772eed62fb105d5afae7c6)) -* Set peer-exchange with default bootstrap ([#1469](https://github.com/waku-org/js-waku/issues/1469)) ([81a52a8](https://github.com/waku-org/js-waku/commit/81a52a8097ba948783c9d798ba362af0f27e1c10)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.22 to 0.0.23 - * @waku/enr bumped from 0.0.16 to 0.0.17 - * @waku/interfaces bumped from 0.0.17 to 0.0.18 - * @waku/utils bumped from 0.0.10 to 0.0.11 - -## [0.0.15](https://github.com/waku-org/js-waku/compare/peer-exchange-v0.0.14...peer-exchange-v0.0.15) (2023-08-02) - - -### Bug Fixes - -* Improve connection manager error handling + edge cases ([#1450](https://github.com/waku-org/js-waku/issues/1450)) ([785df52](https://github.com/waku-org/js-waku/commit/785df528fe6e5010a61391994e222028dbc4e4c5)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.21 to 0.0.22 - * @waku/enr bumped from 0.0.15 to 0.0.16 - * @waku/utils bumped from 0.0.9 to 0.0.10 - * @waku/interfaces bumped from 0.0.16 to 0.0.17 - -## [0.0.14](https://github.com/waku-org/js-waku/compare/peer-exchange-v0.0.13...peer-exchange-v0.0.14) (2023-07-26) - - -### ⚠ BREAKING CHANGES - -* upgrade to libp2p@0.45 ([#1400](https://github.com/waku-org/js-waku/issues/1400)) - -### Features - -* Enable event emission for peer discovery/connection in ConnectionManager ([#1438](https://github.com/waku-org/js-waku/issues/1438)) ([6ce898d](https://github.com/waku-org/js-waku/commit/6ce898d77132f30b5d8f33b48c7f6276992a486e)) -* Upgrade to libp2p@0.45 ([#1400](https://github.com/waku-org/js-waku/issues/1400)) ([420e6c6](https://github.com/waku-org/js-waku/commit/420e6c698dd8f44d40d34e47d876da5d2e1ce85e)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from 0.0.20 to 0.0.21 - * @waku/enr bumped from 0.0.14 to 0.0.15 - * @waku/utils bumped from 0.0.8 to 0.0.9 - * @waku/interfaces bumped from 0.0.15 to 0.0.16 - -## [0.0.11](https://github.com/waku-org/js-waku/compare/peer-exchange-v0.0.10...peer-exchange-v0.0.11) (2023-05-18) - - -### ⚠ BREAKING CHANGES - -* @waku/relay ([#1316](https://github.com/waku-org/js-waku/issues/1316)) - -### Features - -* @waku/relay ([#1316](https://github.com/waku-org/js-waku/issues/1316)) ([50c2c25](https://github.com/waku-org/js-waku/commit/50c2c2540f3c5ff78d93f3fea646da0eee246e17)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from * to 0.0.18 - * @waku/enr bumped from * to 0.0.12 - * @waku/utils bumped from * to 0.0.6 - * devDependencies - * @waku/interfaces bumped from * to 0.0.13 - -## [0.0.5](https://github.com/waku-org/js-waku/compare/peer-exchange-v0.0.4...peer-exchange-v0.0.5) (2023-03-23) - - -### Features - -* Compliance test for peer-exchange discovery ([#1186](https://github.com/waku-org/js-waku/issues/1186)) ([5b0c3c3](https://github.com/waku-org/js-waku/commit/5b0c3c3cac3ddb5687d8f59457d6056527a8666c)) - - -### Bug Fixes - -* @waku/peer-exchange uses @waku/core and should depend on it ([e922ed4](https://github.com/waku-org/js-waku/commit/e922ed49ec70553227751518251152c765efd07c)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/core bumped from * to 0.0.12 - * @waku/enr bumped from 0.0.6 to 0.0.7 - * devDependencies - * @waku/interfaces bumped from 0.0.8 to 0.0.9 - -## [0.0.4](https://github.com/waku-org/js-waku/compare/peer-exchange-v0.0.3...peer-exchange-v0.0.4) (2023-03-16) - - -### ⚠ BREAKING CHANGES - -* directly convert from ENR to `PeerInfo`, remove unneeded utility -* extract decoder code -* bump typescript -* bump all prod dependencies -* bump libp2p dependencies - -### Features - -* Codec as a property of the protocol implementations ([a5ff788](https://github.com/waku-org/js-waku/commit/a5ff788eed419556e11319f22ca9e3109c81df92)) -* DNS discovery as default bootstrap discovery ([#1114](https://github.com/waku-org/js-waku/issues/1114)) ([11819fc](https://github.com/waku-org/js-waku/commit/11819fc7b14e18385d421facaf2af0832cad1da8)) - - -### Bug Fixes - -* **dns-discovery/peer-exchange:** Check if peer is already tagged ([952aadd](https://github.com/waku-org/js-waku/commit/952aadd7bbbe1a7265c5126c1678f552bef0648d)) -* Prettier and cspell ignore CHANGELOG ([#1235](https://github.com/waku-org/js-waku/issues/1235)) ([4d7b3e3](https://github.com/waku-org/js-waku/commit/4d7b3e39e6761afaf5d05a13cc4b3c23e15f9bd5)) -* Remove initialising peer-exchange while creating a node ([#1158](https://github.com/waku-org/js-waku/issues/1158)) ([1b41569](https://github.com/waku-org/js-waku/commit/1b4156902387ea35b24b3d6f5d22e4635ea8cf18)) - - -### Miscellaneous Chores - -* Bump all prod dependencies ([88cc76d](https://github.com/waku-org/js-waku/commit/88cc76d2b811e1fa4460207f38704ecfe18fb260)) -* Bump libp2p dependencies ([803ae7b](https://github.com/waku-org/js-waku/commit/803ae7bd8ed3de665026446c23cde90e7eba9d36)) -* Bump typescript ([12d86e6](https://github.com/waku-org/js-waku/commit/12d86e6abcc68e27c39ca86b4f0dc2b68cdd6000)) -* Directly convert from ENR to `PeerInfo`, remove unneeded utility ([6dbcde0](https://github.com/waku-org/js-waku/commit/6dbcde041ab8fa8c2df75cc25319a0eccf6b0454)) -* Extract decoder code ([130c49b](https://github.com/waku-org/js-waku/commit/130c49b636807063364f309da0da2a24a68f2178)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * @waku/enr bumped from * to 0.0.6 - * @waku/proto bumped from * to 0.0.3 - * devDependencies - * @waku/interfaces bumped from * to 0.0.8 - -## Changelog - -All notable changes to this project will be documented in this file. - -The file is maintained by [Release Please](https://github.com/googleapis/release-please) based on [Conventional Commits](https://www.conventionalcommits.org) specification, -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). diff --git a/packages/peer-exchange/package.json b/packages/peer-exchange/package.json deleted file mode 100644 index e6c4afb5c0..0000000000 --- a/packages/peer-exchange/package.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "@waku/peer-exchange", - "version": "0.0.19", - "description": "Peer Exchange (https://rfc.vac.dev/spec/34/) protocol for Waku", - "types": "./dist/index.d.ts", - "module": "./dist/index.js", - "exports": { - ".": { - "types": "./dist/index.d.ts", - "import": "./dist/index.js" - } - }, - "type": "module", - "author": "Waku Team", - "homepage": "https://github.com/waku-org/js-waku/tree/master/packages/peer-exchange#readme", - "repository": { - "type": "git", - "url": "https://github.com/waku-org/js-waku.git" - }, - "bugs": { - "url": "https://github.com/waku-org/js-waku/issues" - }, - "license": "MIT OR Apache-2.0", - "keywords": [ - "waku", - "decentralized", - "secure", - "communication", - "web3", - "ethereum", - "dapps", - "privacy" - ], - "scripts": { - "build": "run-s build:**", - "build:esm": "tsc", - "build:bundle": "rollup --config rollup.config.js", - "fix": "run-s fix:*", - "fix:lint": "eslint src *.js --fix", - "check": "run-s check:*", - "check:lint": "eslint src *.js", - "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", - "check:tsc": "tsc -p tsconfig.dev.json", - "prepublish": "npm run build", - "reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build" - }, - "engines": { - "node": ">=18" - }, - "dependencies": { - "@libp2p/interfaces": "^3.3.2", - "@waku/core": "0.0.26", - "@waku/enr": "0.0.20", - "@waku/interfaces": "0.0.21", - "@waku/proto": "0.0.6", - "@waku/utils": "0.0.14", - "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.9.5", - "uint8arraylist": "^2.4.3" - }, - "files": [ - "dist", - "bundle", - "src/**/*.ts", - "!**/*.spec.*", - "!**/*.json", - "CHANGELOG.md", - "LICENSE", - "README.md" - ] -} diff --git a/packages/peer-exchange/rollup.config.js b/packages/peer-exchange/rollup.config.js deleted file mode 100644 index 4d0757b1c9..0000000000 --- a/packages/peer-exchange/rollup.config.js +++ /dev/null @@ -1,24 +0,0 @@ -import commonjs from "@rollup/plugin-commonjs"; -import json from "@rollup/plugin-json"; -import { nodeResolve } from "@rollup/plugin-node-resolve"; -import { extractExports } from "@waku/build-utils"; - -import * as packageJson from "./package.json" assert { type: "json" }; - -const input = extractExports(packageJson); - -export default { - input, - output: { - dir: "bundle", - format: "esm" - }, - plugins: [ - commonjs(), - json(), - nodeResolve({ - browser: true, - preferBuiltins: false - }) - ] -}; diff --git a/packages/peer-exchange/tsconfig.dev.json b/packages/peer-exchange/tsconfig.dev.json deleted file mode 100644 index 4f7c34af3c..0000000000 --- a/packages/peer-exchange/tsconfig.dev.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../tsconfig.dev" -} diff --git a/packages/peer-exchange/tsconfig.json b/packages/peer-exchange/tsconfig.json deleted file mode 100644 index eebbc51585..0000000000 --- a/packages/peer-exchange/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "dist/", - "rootDir": "src", - "tsBuildInfoFile": "dist/.tsbuildinfo" - }, - "include": ["src"], - "exclude": ["src/**/*.spec.ts", "src/test_utils"] -} diff --git a/packages/peer-exchange/typedoc.json b/packages/peer-exchange/typedoc.json deleted file mode 100644 index 00aa3dc064..0000000000 --- a/packages/peer-exchange/typedoc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": ["../../typedoc.base.json"], - "entryPoints": ["src/index.ts"] -} \ No newline at end of file diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c5fccaaa6e..e442f77047 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -67,10 +67,9 @@ "@libp2p/ping": "^1.0.11", "@libp2p/websockets": "^8.0.11", "@waku/core": "0.0.26", - "@waku/dns-discovery": "0.0.20", "@waku/interfaces": "0.0.21", "@waku/local-discovery": "^0.0.1", - "@waku/peer-exchange": "^0.0.19", + "@waku/discovery": "*", "@waku/relay": "0.0.9", "@waku/utils": "0.0.14", "libp2p": "^1.1.2" diff --git a/packages/sdk/src/create.ts b/packages/sdk/src/create.ts index c852890caa..969e5a0271 100644 --- a/packages/sdk/src/create.ts +++ b/packages/sdk/src/create.ts @@ -15,7 +15,12 @@ import { WakuOptions, wakuStore } from "@waku/core"; -import { enrTree, wakuDnsDiscovery } from "@waku/dns-discovery"; +import { + enrTree, + wakuDnsDiscovery, + wakuLocalStorageDiscovery, + wakuPeerExchangeDiscovery +} from "@waku/discovery"; import { type CreateLibp2pOptions, DefaultPubsubTopic, @@ -28,8 +33,6 @@ import { PubsubTopic, type ShardInfo } from "@waku/interfaces"; -import { wakuLocalStorageDiscovery } from "@waku/local-discovery"; -import { wakuPeerExchangeDiscovery } from "@waku/peer-exchange"; import { RelayCreateOptions, wakuGossipSub, wakuRelay } from "@waku/relay"; import { ensureShardingConfigured } from "@waku/utils"; import { createLibp2p } from "libp2p"; diff --git a/packages/tests/package.json b/packages/tests/package.json index 9fbb1ab196..8e8157e295 100644 --- a/packages/tests/package.json +++ b/packages/tests/package.json @@ -74,9 +74,8 @@ "@types/mocha": "^10.0.6", "@types/sinon": "^17.0.3", "@types/tail": "^2.2.3", - "@waku/dns-discovery": "*", "@waku/message-encryption": "*", - "@waku/peer-exchange": "*", + "@waku/discovery": "*", "@waku/sdk": "*", "allure-commandline": "^2.24.1", "allure-mocha": "^2.9.2", diff --git a/packages/tests/tests/dns-peer-discovery.spec.ts b/packages/tests/tests/dns-peer-discovery.spec.ts index 6df774d3e4..87c09df893 100644 --- a/packages/tests/tests/dns-peer-discovery.spec.ts +++ b/packages/tests/tests/dns-peer-discovery.spec.ts @@ -8,7 +8,7 @@ import { enrTree, PeerDiscoveryDns, wakuDnsDiscovery -} from "@waku/dns-discovery"; +} from "@waku/discovery"; import { Libp2pComponents } from "@waku/interfaces"; import { createLightNode } from "@waku/sdk"; import { expect } from "chai"; diff --git a/packages/tests/tests/peer_exchange.node.spec.ts b/packages/tests/tests/peer_exchange.node.spec.ts index 07a417dcd1..12cf8a5cb2 100644 --- a/packages/tests/tests/peer_exchange.node.spec.ts +++ b/packages/tests/tests/peer_exchange.node.spec.ts @@ -1,12 +1,12 @@ import type { PeerId } from "@libp2p/interface"; import tests from "@libp2p/interface-compliance-tests/peer-discovery"; import type { Multiaddr } from "@multiformats/multiaddr"; -import type { LightNode, PeerInfo } from "@waku/interfaces"; import { PeerExchangeCodec, PeerExchangeDiscovery, WakuPeerExchange -} from "@waku/peer-exchange"; +} from "@waku/discovery"; +import type { LightNode, PeerInfo } from "@waku/interfaces"; import { createLightNode, DEFAULT_CLUSTER_ID, diff --git a/packages/tests/tests/peer_exchange.optional.spec.ts b/packages/tests/tests/peer_exchange.optional.spec.ts index 15282f6518..deadd1290d 100644 --- a/packages/tests/tests/peer_exchange.optional.spec.ts +++ b/packages/tests/tests/peer_exchange.optional.spec.ts @@ -3,8 +3,8 @@ import { Fleet, getPredefinedBootstrapNodes } from "@waku/core/lib/predefined_bootstrap_nodes"; +import { wakuPeerExchangeDiscovery } from "@waku/discovery"; import type { LightNode } from "@waku/interfaces"; -import { wakuPeerExchangeDiscovery } from "@waku/peer-exchange"; import { createLightNode, DefaultPubsubTopic } from "@waku/sdk"; import { expect } from "chai"; diff --git a/packages/tests/tests/sharding/peer_management.spec.ts b/packages/tests/tests/sharding/peer_management.spec.ts index 4cf75792bd..5e49f9bb21 100644 --- a/packages/tests/tests/sharding/peer_management.spec.ts +++ b/packages/tests/tests/sharding/peer_management.spec.ts @@ -1,6 +1,6 @@ import { bootstrap } from "@libp2p/bootstrap"; import type { PeerId } from "@libp2p/interface"; -import { wakuPeerExchangeDiscovery } from "@waku/peer-exchange"; +import { wakuPeerExchangeDiscovery } from "@waku/discovery"; import { ContentTopicInfo, createLightNode, diff --git a/packages/tests/tests/waku.node.optional.spec.ts b/packages/tests/tests/waku.node.optional.spec.ts index d9a0009349..80299b9530 100644 --- a/packages/tests/tests/waku.node.optional.spec.ts +++ b/packages/tests/tests/waku.node.optional.spec.ts @@ -1,5 +1,5 @@ import { bootstrap } from "@libp2p/bootstrap"; -import { enrTree, wakuDnsDiscovery } from "@waku/dns-discovery"; +import { enrTree, wakuDnsDiscovery } from "@waku/discovery"; import { LightNode } from "@waku/interfaces"; import { createLightNode } from "@waku/sdk"; import { expect } from "chai";