From 6b8779b3bec57188c91a9f2811c695bbcfe810cc Mon Sep 17 00:00:00 2001 From: "fryorcraken.eth" Date: Thu, 9 Feb 2023 13:33:51 +1100 Subject: [PATCH] chore: fix dependencies for `@waku/core` --- package-lock.json | 86 ++++++------------- packages/core/package.json | 27 ++---- packages/core/src/lib/filter/index.ts | 2 +- packages/core/src/lib/wait_for_remote_peer.ts | 2 +- 4 files changed, 39 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index b42c735c30..71e0fb4b00 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6005,11 +6005,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/app-root-path": { - "version": "1.2.4", - "dev": true, - "license": "MIT" - }, "node_modules/@types/cacheable-request": { "version": "6.0.3", "dev": true, @@ -6247,20 +6242,16 @@ "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==", "dev": true }, - "node_modules/@types/tail": { - "version": "2.2.1", - "dev": true, - "license": "MIT" - }, "node_modules/@types/unist": { "version": "2.0.6", "dev": true, "license": "MIT" }, "node_modules/@types/uuid": { - "version": "8.3.4", - "dev": true, - "license": "MIT" + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==", + "dev": true }, "node_modules/@types/yargs": { "version": "17.0.16", @@ -29154,15 +29145,6 @@ "license": "MIT OR Apache-2.0", "dependencies": { "@chainsafe/libp2p-gossipsub": "^6.1.0", - "@libp2p/interface-connection": "^3.0.8", - "@libp2p/interface-peer-discovery": "^1.0.5", - "@libp2p/interface-peer-id": "^2.0.1", - "@libp2p/interface-peer-info": "^1.0.8", - "@libp2p/interface-peer-store": "^1.2.8", - "@libp2p/interface-pubsub": "^3.0.6", - "@libp2p/interfaces": "^3.3.1", - "@libp2p/peer-id": "^2.0.1", - "@multiformats/multiaddr": "^11.0.6", "@noble/hashes": "^1.1.3", "@waku/interfaces": "*", "@waku/proto": "*", @@ -29173,24 +29155,25 @@ "it-pipe": "^2.0.4", "p-event": "^5.0.1", "uint8arraylist": "^2.3.2", - "uint8arrays": "^4.0.2", "uuid": "^9.0.0" }, "devDependencies": { + "@libp2p/interface-connection": "^3.0.8", "@libp2p/interface-libp2p": "^1.1.1", + "@libp2p/interface-peer-id": "^2.0.1", + "@libp2p/interface-peer-store": "^1.2.8", + "@libp2p/interface-pubsub": "^3.0.6", + "@libp2p/interface-registrar": "^2.0.8", + "@multiformats/multiaddr": "^11.4.0", "@rollup/plugin-commonjs": "^22.0.0", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.3.0", - "@types/app-root-path": "^1.2.4", "@types/chai": "^4.2.15", "@types/debug": "^4.1.7", "@types/mocha": "^9.1.0", - "@types/node": "^18.11.17", - "@types/tail": "^2.0.0", - "@types/uuid": "^8.3.0", + "@types/uuid": "^9.0.0", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", - "app-root-path": "^3.0.0", "chai": "^4.3.4", "cspell": "^6.17.0", "eslint": "^8.6.0", @@ -29212,12 +29195,10 @@ "mocha": "^9.1.3", "npm-run-all": "^4.1.5", "p-timeout": "^6.0.0", - "portfinder": "^1.0.28", "prettier": "^2.1.1", "process": "^0.11.10", "puppeteer": "^13.0.1", "rollup": "^2.75.0", - "tail": "^2.2.0", "ts-loader": "^9.3.1", "ts-node": "^10.9.1", "typescript": "^4.6.3" @@ -29226,7 +29207,8 @@ "node": ">=16" }, "peerDependencies": { - "@multiformats/multiaddr": "^11.0.6" + "@multiformats/multiaddr": "^11.4.0", + "libp2p": "^0.42.2" }, "peerDependenciesMeta": { "@multiformats/multiaddr": { @@ -29238,6 +29220,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" }, @@ -29250,6 +29233,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" @@ -34021,10 +34005,6 @@ "version": "1.0.3", "dev": true }, - "@types/app-root-path": { - "version": "1.2.4", - "dev": true - }, "@types/cacheable-request": { "version": "6.0.3", "dev": true, @@ -34229,16 +34209,14 @@ "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==", "dev": true }, - "@types/tail": { - "version": "2.2.1", - "dev": true - }, "@types/unist": { "version": "2.0.6", "dev": true }, "@types/uuid": { - "version": "8.3.4", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==", "dev": true }, "@types/yargs": { @@ -34469,33 +34447,26 @@ "version": "file:packages/core", "requires": { "@chainsafe/libp2p-gossipsub": "^6.1.0", - "@libp2p/interface-connection": "^3.0.8", + "@libp2p/interface-connection": "*", "@libp2p/interface-libp2p": "^1.1.1", - "@libp2p/interface-peer-discovery": "^1.0.5", - "@libp2p/interface-peer-id": "^2.0.1", - "@libp2p/interface-peer-info": "^1.0.8", - "@libp2p/interface-peer-store": "^1.2.8", - "@libp2p/interface-pubsub": "^3.0.6", - "@libp2p/interfaces": "^3.3.1", - "@libp2p/peer-id": "^2.0.1", - "@multiformats/multiaddr": "^11.0.6", + "@libp2p/interface-peer-id": "*", + "@libp2p/interface-peer-store": "*", + "@libp2p/interface-pubsub": "*", + "@libp2p/interface-registrar": "*", + "@multiformats/multiaddr": "^11.4.0", "@noble/hashes": "^1.1.3", "@rollup/plugin-commonjs": "^22.0.0", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.3.0", - "@types/app-root-path": "^1.2.4", "@types/chai": "^4.2.15", "@types/debug": "^4.1.7", "@types/mocha": "^9.1.0", - "@types/node": "^18.11.17", - "@types/tail": "^2.0.0", - "@types/uuid": "^8.3.0", + "@types/uuid": "^9.0.0", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "@waku/interfaces": "*", "@waku/proto": "*", "@waku/utils": "*", - "app-root-path": "^3.0.0", "chai": "^4.3.4", "cspell": "^6.17.0", "debug": "^4.3.4", @@ -34522,17 +34493,14 @@ "npm-run-all": "^4.1.5", "p-event": "^5.0.1", "p-timeout": "^6.0.0", - "portfinder": "^1.0.28", "prettier": "^2.1.1", "process": "^0.11.10", "puppeteer": "^13.0.1", "rollup": "^2.75.0", - "tail": "^2.2.0", "ts-loader": "^9.3.1", "ts-node": "^10.9.1", "typescript": "^4.6.3", "uint8arraylist": "^2.3.2", - "uint8arrays": "^4.0.2", "uuid": "^9.0.0" }, "dependencies": { @@ -34540,6 +34508,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" } @@ -34547,7 +34516,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 }, "uuid": { "version": "9.0.0" diff --git a/packages/core/package.json b/packages/core/package.json index be95ad15e5..3a7f9b890b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -77,15 +77,6 @@ }, "dependencies": { "@chainsafe/libp2p-gossipsub": "^6.1.0", - "@libp2p/interface-connection": "^3.0.8", - "@libp2p/interface-peer-discovery": "^1.0.5", - "@libp2p/interface-peer-id": "^2.0.1", - "@libp2p/interface-peer-info": "^1.0.8", - "@libp2p/interface-peer-store": "^1.2.8", - "@libp2p/interface-pubsub": "^3.0.6", - "@libp2p/interfaces": "^3.3.1", - "@libp2p/peer-id": "^2.0.1", - "@multiformats/multiaddr": "^11.0.6", "@noble/hashes": "^1.1.3", "@waku/interfaces": "*", "@waku/proto": "*", @@ -96,24 +87,25 @@ "it-pipe": "^2.0.4", "p-event": "^5.0.1", "uint8arraylist": "^2.3.2", - "uint8arrays": "^4.0.2", "uuid": "^9.0.0" }, "devDependencies": { + "@libp2p/interface-connection": "^3.0.8", "@libp2p/interface-libp2p": "^1.1.1", + "@libp2p/interface-peer-id": "^2.0.1", + "@libp2p/interface-peer-store": "^1.2.8", + "@libp2p/interface-pubsub": "^3.0.6", + "@libp2p/interface-registrar": "^2.0.8", + "@multiformats/multiaddr": "^11.4.0", "@rollup/plugin-commonjs": "^22.0.0", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.3.0", - "@types/app-root-path": "^1.2.4", "@types/chai": "^4.2.15", "@types/debug": "^4.1.7", "@types/mocha": "^9.1.0", - "@types/node": "^18.11.17", - "@types/tail": "^2.0.0", - "@types/uuid": "^8.3.0", + "@types/uuid": "^9.0.0", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", - "app-root-path": "^3.0.0", "chai": "^4.3.4", "cspell": "^6.17.0", "eslint": "^8.6.0", @@ -135,18 +127,17 @@ "mocha": "^9.1.3", "npm-run-all": "^4.1.5", "p-timeout": "^6.0.0", - "portfinder": "^1.0.28", "prettier": "^2.1.1", "process": "^0.11.10", "puppeteer": "^13.0.1", "rollup": "^2.75.0", - "tail": "^2.2.0", "ts-loader": "^9.3.1", "ts-node": "^10.9.1", "typescript": "^4.6.3" }, "peerDependencies": { - "@multiformats/multiaddr": "^11.0.6" + "@multiformats/multiaddr": "^11.4.0", + "libp2p": "^0.42.2" }, "peerDependenciesMeta": { "@multiformats/multiaddr": { diff --git a/packages/core/src/lib/filter/index.ts b/packages/core/src/lib/filter/index.ts index ae511b9603..31f66e8f5b 100644 --- a/packages/core/src/lib/filter/index.ts +++ b/packages/core/src/lib/filter/index.ts @@ -1,5 +1,5 @@ import type { Stream } from "@libp2p/interface-connection"; -import { Libp2p } from "@libp2p/interface-libp2p"; +import type { Libp2p } from "@libp2p/interface-libp2p"; import type { PeerId } from "@libp2p/interface-peer-id"; import type { PeerStore } from "@libp2p/interface-peer-store"; import type { Peer } from "@libp2p/interface-peer-store"; diff --git a/packages/core/src/lib/wait_for_remote_peer.ts b/packages/core/src/lib/wait_for_remote_peer.ts index 4b6d8487f7..28a40e9de3 100644 --- a/packages/core/src/lib/wait_for_remote_peer.ts +++ b/packages/core/src/lib/wait_for_remote_peer.ts @@ -1,4 +1,4 @@ -import { PeerProtocolsChangeData } from "@libp2p/interface-peer-store"; +import type { PeerProtocolsChangeData } from "@libp2p/interface-peer-store"; import type { IRelay, PointToPointProtocol, Waku } from "@waku/interfaces"; import { Protocols } from "@waku/interfaces"; import debug from "debug";