diff --git a/package-lock.json b/package-lock.json index 1afd6fc1c0..31a354e205 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,10 +1,10 @@ { - "name": "root", + "name": "@waku/root", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "root", + "name": "@waku/root", "workspaces": [ "packages/*" ], @@ -22422,7 +22422,6 @@ "dependencies": { "@chainsafe/libp2p-gossipsub": "^4.1.1", "@chainsafe/libp2p-noise": "^8.0.1", - "@ethersproject/rlp": "^5.5.0", "@libp2p/crypto": "^1.0.4", "@libp2p/interface-connection": "3.0.1", "@libp2p/interface-peer-discovery": "^1.0.0", @@ -22436,6 +22435,7 @@ "@libp2p/websockets": "^3.0.3", "@multiformats/multiaddr": "^11.0.6", "@noble/secp256k1": "^1.3.4", + "@waku/byte-utils": "*", "@waku/interfaces": "*", "debug": "^4.3.4", "it-all": "^1.0.6", @@ -22446,7 +22446,7 @@ "p-event": "^5.0.1", "protons-runtime": "^3.1.0", "uint8arraylist": "^2.3.2", - "uint8arrays": "^3.0.0", + "uint8arrays": "^4.0.2", "uuid": "^8.3.2" }, "devDependencies": { @@ -22524,7 +22524,16 @@ "npm": ">=7.0.0" } }, - "packages/core/node_modules/@multiformats/multiaddr/node_modules/uint8arrays": { + "packages/core/node_modules/multiformats": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-10.0.2.tgz", + "integrity": "sha512-nJEHLFOYhO4L+aNApHhCnWqa31FyqAHv9Q77AhmwU3KsM2f1j7tuJpCk5ByZ33smzycNCpSG5klNIejIyfFx2A==", + "engines": { + "node": ">=16.0.0", + "npm": ">=7.0.0" + } + }, + "packages/core/node_modules/uint8arrays": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.2.tgz", "integrity": "sha512-8CWXXZdOvVrIL4SeY/Gnp+idxxiGK4XFkP4FY26Sx/fpTz/b6vv4BVWELMDzQweSyyhdcuAcU14H6izzB6k1Cw==", @@ -22536,15 +22545,6 @@ "npm": ">=7.0.0" } }, - "packages/core/node_modules/multiformats": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-10.0.2.tgz", - "integrity": "sha512-nJEHLFOYhO4L+aNApHhCnWqa31FyqAHv9Q77AhmwU3KsM2f1j7tuJpCk5ByZ33smzycNCpSG5klNIejIyfFx2A==", - "engines": { - "node": ">=16.0.0", - "npm": ">=7.0.0" - } - }, "packages/create": { "name": "@waku/create", "version": "0.0.1", @@ -22597,7 +22597,7 @@ "debug": "^4.3.4", "dns-query": "^0.11.2", "hi-base32": "^0.5.1", - "uint8arrays": "^3.0.0" + "uint8arrays": "^4.0.2" }, "devDependencies": { "@libp2p/peer-id-factory": "^1.0.15", @@ -22656,24 +22656,22 @@ "npm": ">=7.0.0" } }, - "packages/dns-discovery/node_modules/@multiformats/multiaddr/node_modules/uint8arrays": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.2.tgz", - "integrity": "sha512-8CWXXZdOvVrIL4SeY/Gnp+idxxiGK4XFkP4FY26Sx/fpTz/b6vv4BVWELMDzQweSyyhdcuAcU14H6izzB6k1Cw==", - "dev": true, - "dependencies": { - "multiformats": "^10.0.0" - }, + "packages/dns-discovery/node_modules/multiformats": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-10.0.2.tgz", + "integrity": "sha512-nJEHLFOYhO4L+aNApHhCnWqa31FyqAHv9Q77AhmwU3KsM2f1j7tuJpCk5ByZ33smzycNCpSG5klNIejIyfFx2A==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" } }, - "packages/dns-discovery/node_modules/multiformats": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-10.0.2.tgz", - "integrity": "sha512-nJEHLFOYhO4L+aNApHhCnWqa31FyqAHv9Q77AhmwU3KsM2f1j7tuJpCk5ByZ33smzycNCpSG5klNIejIyfFx2A==", - "dev": true, + "packages/dns-discovery/node_modules/uint8arrays": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.2.tgz", + "integrity": "sha512-8CWXXZdOvVrIL4SeY/Gnp+idxxiGK4XFkP4FY26Sx/fpTz/b6vv4BVWELMDzQweSyyhdcuAcU14H6izzB6k1Cw==", + "dependencies": { + "multiformats": "^10.0.0" + }, "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -22684,10 +22682,14 @@ "version": "0.0.1", "license": "MIT OR Apache-2.0", "dependencies": { + "@ethersproject/rlp": "^5.5.0", "@libp2p/crypto": "^1.0.4", + "@libp2p/interface-peer-id": "^1.0.2", + "@libp2p/peer-id": "^1.1.10", "@multiformats/multiaddr": "^11.0.6", - "@noble/secp256k1": "^1.7.0", - "@waku/byte-utils": "*" + "@noble/secp256k1": "^1.3.4", + "@waku/byte-utils": "*", + "js-sha3": "^0.8.0" }, "devDependencies": { "@libp2p/peer-id-factory": "^1.0.15", @@ -22716,7 +22718,8 @@ "semantic-release": "^19.0.5", "semantic-release-monorepo": "^7.0.5", "ts-loader": "^9.4.1", - "typescript": "^4.6.3" + "typescript": "^4.6.3", + "uint8arrays": "^4.0.2" }, "engines": { "node": ">=16" @@ -27129,7 +27132,6 @@ "requires": { "@chainsafe/libp2p-gossipsub": "^4.1.1", "@chainsafe/libp2p-noise": "^8.0.1", - "@ethersproject/rlp": "^5.5.0", "@libp2p/crypto": "^1.0.4", "@libp2p/interface-connection": "3.0.1", "@libp2p/interface-peer-discovery": "^1.0.0", @@ -27161,6 +27163,7 @@ "@types/uuid": "^8.3.0", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", + "@waku/byte-utils": "*", "@waku/interfaces": "*", "app-root-path": "^3.0.0", "chai": "^4.3.4", @@ -27205,7 +27208,7 @@ "ts-node": "^10.9.1", "typescript": "^4.6.3", "uint8arraylist": "^2.3.2", - "uint8arrays": "^3.0.0", + "uint8arrays": "^4.0.2", "uuid": "^8.3.2" }, "dependencies": { @@ -27220,22 +27223,20 @@ "multiformats": "^10.0.0", "uint8arrays": "^4.0.2", "varint": "^6.0.0" - }, - "dependencies": { - "uint8arrays": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.2.tgz", - "integrity": "sha512-8CWXXZdOvVrIL4SeY/Gnp+idxxiGK4XFkP4FY26Sx/fpTz/b6vv4BVWELMDzQweSyyhdcuAcU14H6izzB6k1Cw==", - "requires": { - "multiformats": "^10.0.0" - } - } } }, "multiformats": { "version": "10.0.2", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-10.0.2.tgz", "integrity": "sha512-nJEHLFOYhO4L+aNApHhCnWqa31FyqAHv9Q77AhmwU3KsM2f1j7tuJpCk5ByZ33smzycNCpSG5klNIejIyfFx2A==" + }, + "uint8arrays": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.2.tgz", + "integrity": "sha512-8CWXXZdOvVrIL4SeY/Gnp+idxxiGK4XFkP4FY26Sx/fpTz/b6vv4BVWELMDzQweSyyhdcuAcU14H6izzB6k1Cw==", + "requires": { + "multiformats": "^10.0.0" + } } } }, @@ -27309,7 +27310,7 @@ "semantic-release": "^19.0.5", "semantic-release-monorepo": "^7.0.5", "typescript": "^4.6.3", - "uint8arrays": "^3.0.0" + "uint8arrays": "^4.0.2" }, "dependencies": { "@chainsafe/is-ip": { @@ -27330,34 +27331,33 @@ "multiformats": "^10.0.0", "uint8arrays": "^4.0.2", "varint": "^6.0.0" - }, - "dependencies": { - "uint8arrays": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.2.tgz", - "integrity": "sha512-8CWXXZdOvVrIL4SeY/Gnp+idxxiGK4XFkP4FY26Sx/fpTz/b6vv4BVWELMDzQweSyyhdcuAcU14H6izzB6k1Cw==", - "dev": true, - "requires": { - "multiformats": "^10.0.0" - } - } } }, "multiformats": { "version": "10.0.2", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-10.0.2.tgz", - "integrity": "sha512-nJEHLFOYhO4L+aNApHhCnWqa31FyqAHv9Q77AhmwU3KsM2f1j7tuJpCk5ByZ33smzycNCpSG5klNIejIyfFx2A==", - "dev": true + "integrity": "sha512-nJEHLFOYhO4L+aNApHhCnWqa31FyqAHv9Q77AhmwU3KsM2f1j7tuJpCk5ByZ33smzycNCpSG5klNIejIyfFx2A==" + }, + "uint8arrays": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.2.tgz", + "integrity": "sha512-8CWXXZdOvVrIL4SeY/Gnp+idxxiGK4XFkP4FY26Sx/fpTz/b6vv4BVWELMDzQweSyyhdcuAcU14H6izzB6k1Cw==", + "requires": { + "multiformats": "^10.0.0" + } } } }, "@waku/enr": { "version": "file:packages/enr", "requires": { + "@ethersproject/rlp": "^5.5.0", "@libp2p/crypto": "^1.0.4", + "@libp2p/interface-peer-id": "^1.0.2", + "@libp2p/peer-id": "^1.1.10", "@libp2p/peer-id-factory": "^1.0.15", "@multiformats/multiaddr": "^11.0.6", - "@noble/secp256k1": "^1.7.0", + "@noble/secp256k1": "^1.3.4", "@rollup/plugin-commonjs": "^22.0.0", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.3.0", @@ -27378,13 +27378,15 @@ "eslint-plugin-functional": "^4.0.2", "eslint-plugin-import": "^2.25.3", "eslint-plugin-prettier": "^4.0.0", + "js-sha3": "^0.8.0", "npm-run-all": "^4.1.5", "prettier": "^2.1.1", "rollup": "^2.75.0", "semantic-release": "^19.0.5", "semantic-release-monorepo": "^7.0.5", "ts-loader": "^9.4.1", - "typescript": "^4.6.3" + "typescript": "^4.6.3", + "uint8arrays": "^4.0.2" }, "dependencies": { "@multiformats/multiaddr": { diff --git a/packages/core/package.json b/packages/core/package.json index edac1035b0..bfc6ffbcdf 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -97,7 +97,6 @@ "@waku/byte-utils": "*", "@chainsafe/libp2p-gossipsub": "^4.1.1", "@chainsafe/libp2p-noise": "^8.0.1", - "@ethersproject/rlp": "^5.5.0", "@libp2p/crypto": "^1.0.4", "@libp2p/interface-connection": "3.0.1", "@libp2p/interface-peer-discovery": "^1.0.0", @@ -121,7 +120,7 @@ "p-event": "^5.0.1", "protons-runtime": "^3.1.0", "uint8arraylist": "^2.3.2", - "uint8arrays": "^3.0.0", + "uint8arrays": "^4.0.2", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/dns-discovery/package.json b/packages/dns-discovery/package.json index 41e6c74cda..9b35af0419 100644 --- a/packages/dns-discovery/package.json +++ b/packages/dns-discovery/package.json @@ -10,6 +10,13 @@ "import": "./dist/index.js" } }, + "typesVersions": { + "*": { + "*": [ + "dist/*" + ] + } + }, "type": "module", "author": "Waku Team", "homepage": "https://github.com/waku-org/js-waku/tree/master/packages/dns-discovery#readme", @@ -56,7 +63,7 @@ "hi-base32": "^0.5.1", "debug": "^4.3.4", "dns-query": "^0.11.2", - "uint8arrays": "^3.0.0", + "uint8arrays": "^4.0.2", "@libp2p/interface-peer-discovery": "^1.0.0", "@libp2p/interface-peer-info": "^1.0.1", "@libp2p/interfaces": "^3.0.2", diff --git a/packages/dns-discovery/src/enrtree.ts b/packages/dns-discovery/src/enrtree.ts index c13af9bfe6..a1fdbe9fc1 100644 --- a/packages/dns-discovery/src/enrtree.ts +++ b/packages/dns-discovery/src/enrtree.ts @@ -1,6 +1,6 @@ import { utf8ToBytes } from "@waku/byte-utils"; import { ENR } from "@waku/enr"; -import { keccak256, verifySignature } from "@waku/enr/crypto"; +import { keccak256, verifySignature } from "@waku/enr/crypt"; import base32 from "hi-base32"; import { fromString } from "uint8arrays/from-string"; diff --git a/packages/enr/package.json b/packages/enr/package.json index 1c3e3fc2ad..a45aee339e 100644 --- a/packages/enr/package.json +++ b/packages/enr/package.json @@ -9,7 +9,7 @@ "types": "./dist/index.d.ts", "import": "./dist/index.js" }, - "./crypto": { + "./crypt": { "types": "./dist/crypto.d.ts", "import": "./dist/crypto.js" } @@ -58,12 +58,17 @@ "node": ">=16" }, "dependencies": { + "@ethersproject/rlp": "^5.5.0", "@libp2p/crypto": "^1.0.4", + "@libp2p/interface-peer-id": "^1.0.2", + "@libp2p/peer-id": "^1.1.10", "@multiformats/multiaddr": "^11.0.6", - "@noble/secp256k1": "^1.7.0", - "@waku/byte-utils": "*" + "@noble/secp256k1": "^1.3.4", + "@waku/byte-utils": "*", + "js-sha3": "^0.8.0" }, "devDependencies": { + "uint8arrays": "^4.0.2", "@libp2p/peer-id-factory": "^1.0.15", "@rollup/plugin-commonjs": "^22.0.0", "@rollup/plugin-json": "^4.1.0",