From e1ef3224b43e07cf38470c0102f908ee76cd79a6 Mon Sep 17 00:00:00 2001 From: Hayden Young Date: Tue, 15 Oct 2024 18:35:19 +0100 Subject: [PATCH] feat: Upgrade ccrypto. --- package-lock.json | 909 +------------------ package.json | 2 +- src/identities/providers/publickey.js | 3 +- src/key-store.js | 23 +- test/browser/setup-fixtures.js | 13 +- test/databases/replication/documents.test.js | 14 +- test/identities/identities.test.js | 14 +- test/key-store.test.js | 2 +- test/orbitdb-replication.test.js | 2 + test/orbitdb.test.js | 8 +- test/utils/create-helia.js | 2 +- 11 files changed, 62 insertions(+), 930 deletions(-) diff --git a/package-lock.json b/package-lock.json index a1f9726..f7592c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@ipld/dag-cbor": "^9.0.6", - "@libp2p/crypto": "^3.0.2", + "@libp2p/crypto": "^5.0.5", "it-pipe": "^3.0.1", "level": "^8.0.0", "lru": "^3.1.0", @@ -2249,36 +2249,6 @@ "npm": ">=8.7.0" } }, - "node_modules/@chainsafe/libp2p-gossipsub/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@chainsafe/libp2p-gossipsub/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@chainsafe/libp2p-gossipsub/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -2310,42 +2280,6 @@ "wherearewe": "^2.0.1" } }, - "node_modules/@chainsafe/libp2p-noise/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@chainsafe/libp2p-noise/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@chainsafe/libp2p-noise/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@chainsafe/libp2p-yamux": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/@chainsafe/libp2p-yamux/-/libp2p-yamux-7.0.1.tgz", @@ -2361,26 +2295,6 @@ "uint8arraylist": "^2.4.8" } }, - "node_modules/@chainsafe/libp2p-yamux/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@chainsafe/libp2p-yamux/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@chainsafe/netmask": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@chainsafe/netmask/-/netmask-2.0.0.tgz", @@ -2877,20 +2791,6 @@ "uint8arrays": "^5.0.1" } }, - "node_modules/@helia/bitswap/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@helia/bitswap/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -2917,20 +2817,6 @@ "progress-events": "^1.0.0" } }, - "node_modules/@helia/block-brokers/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@helia/block-brokers/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -2959,20 +2845,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@helia/delegated-routing-v1-http-api-client/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@helia/delegated-routing-v1-http-api-client/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -2994,20 +2866,6 @@ "progress-events": "^1.0.0" } }, - "node_modules/@helia/interface/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@helia/interface/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -3032,20 +2890,6 @@ "uint8arrays": "^5.0.2" } }, - "node_modules/@helia/routers/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@helia/routers/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -3087,36 +2931,6 @@ "uint8arrays": "^5.0.2" } }, - "node_modules/@helia/utils/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@helia/utils/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@helia/utils/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -3497,20 +3311,6 @@ "uint8arraylist": "^2.4.8" } }, - "node_modules/@libp2p/autonat/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/autonat/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -3530,26 +3330,6 @@ "@multiformats/multiaddr": "^12.2.3" } }, - "node_modules/@libp2p/bootstrap/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/bootstrap/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/circuit-relay-v2": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@libp2p/circuit-relay-v2/-/circuit-relay-v2-2.1.5.tgz", @@ -3577,11 +3357,16 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/circuit-relay-v2/node_modules/@libp2p/crypto": { + "node_modules/@libp2p/circuit-relay-v2/node_modules/multiformats": { + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", + "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", + "dev": true + }, + "node_modules/@libp2p/crypto": { "version": "5.0.5", "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, "dependencies": { "@libp2p/interface": "^2.1.3", "@noble/curves": "^1.4.0", @@ -3593,40 +3378,10 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/circuit-relay-v2/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/circuit-relay-v2/node_modules/multiformats": { + "node_modules/@libp2p/crypto/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, - "node_modules/@libp2p/crypto": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-3.0.2.tgz", - "integrity": "sha512-dZuQ+UGv1fOc5i+RQ2e/c7CUy2iE7UnmQ9XuHrLb24fe4pmb6YmGl/5TPm09O+8d5q4htOyg0RrU3GfmqmpMZQ==", - "dependencies": { - "@libp2p/interface": "^1.0.2", - "@noble/curves": "^1.1.0", - "@noble/hashes": "^1.3.1", - "multiformats": "^12.1.3", - "node-forge": "^1.1.0", - "protons-runtime": "^5.0.0", - "uint8arraylist": "^2.4.3", - "uint8arrays": "^5.0.0" - } + "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==" }, "node_modules/@libp2p/dcutr": { "version": "2.0.8", @@ -3645,26 +3400,6 @@ "uint8arraylist": "^2.4.8" } }, - "node_modules/@libp2p/dcutr/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/dcutr/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/identify": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/@libp2p/identify/-/identify-3.0.8.tgz", @@ -3688,27 +3423,10 @@ "wherearewe": "^2.0.1" } }, - "node_modules/@libp2p/identify/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/identify/node_modules/@libp2p/interface": { + "node_modules/@libp2p/interface": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, "dependencies": { "@multiformats/multiaddr": "^12.2.3", "it-pushable": "^3.2.3", @@ -3718,25 +3436,6 @@ "uint8arraylist": "^2.4.8" } }, - "node_modules/@libp2p/identify/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, - "node_modules/@libp2p/interface": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-1.2.0.tgz", - "integrity": "sha512-ImnGNl3El/AukgaojACT8i9SNW1FOsrThcQU/qA3w5tEBR5p84Uwgzl/nxa4X5vGinItUJ9jLEJmtkQJENoiGQ==", - "dependencies": { - "@multiformats/multiaddr": "^12.2.1", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/interface-internal": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/@libp2p/interface-internal/-/interface-internal-2.0.8.tgz", @@ -3750,30 +3449,10 @@ "uint8arraylist": "^2.4.8" } }, - "node_modules/@libp2p/interface-internal/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/interface-internal/node_modules/multiformats": { + "node_modules/@libp2p/interface/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, - "node_modules/@libp2p/interface/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==" + "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==" }, "node_modules/@libp2p/kad-dht": { "version": "14.0.1", @@ -3813,36 +3492,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/kad-dht/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/kad-dht/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/kad-dht/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -3866,36 +3515,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/keychain/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/keychain/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/keychain/node_modules/@noble/hashes": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz", @@ -3927,20 +3546,6 @@ "weald": "^1.0.2" } }, - "node_modules/@libp2p/logger/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/logger/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -3963,26 +3568,6 @@ "multicast-dns": "^7.2.5" } }, - "node_modules/@libp2p/mdns/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/mdns/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/mplex": { "version": "11.0.8", "resolved": "https://registry.npmjs.org/@libp2p/mplex/-/mplex-11.0.8.tgz", @@ -3999,26 +3584,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/mplex/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/mplex/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/multistream-select": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/@libp2p/multistream-select/-/multistream-select-6.0.6.tgz", @@ -4036,26 +3601,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/multistream-select/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/multistream-select/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/peer-collections": { "version": "6.0.8", "resolved": "https://registry.npmjs.org/@libp2p/peer-collections/-/peer-collections-6.0.8.tgz", @@ -4068,20 +3613,6 @@ "multiformats": "^13.2.2" } }, - "node_modules/@libp2p/peer-collections/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/peer-collections/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -4100,36 +3631,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/peer-id/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/peer-id/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/peer-id/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -4154,36 +3655,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/peer-record/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/peer-record/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/peer-record/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -4211,36 +3682,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/peer-store/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/peer-store/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/peer-store/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -4261,42 +3702,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/ping/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/ping/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/ping/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/pubsub": { "version": "10.0.8", "resolved": "https://registry.npmjs.org/@libp2p/pubsub/-/pubsub-10.0.8.tgz", @@ -4318,36 +3723,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/pubsub/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/pubsub/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/pubsub/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -4382,26 +3757,6 @@ "stream-to-it": "^1.0.1" } }, - "node_modules/@libp2p/tcp/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/tcp/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/tls": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/@libp2p/tls/-/tls-2.0.8.tgz", @@ -4423,42 +3778,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/tls/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/tls/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/tls/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/upnp-nat": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/@libp2p/upnp-nat/-/upnp-nat-2.0.8.tgz", @@ -4473,26 +3792,6 @@ "wherearewe": "^2.0.1" } }, - "node_modules/@libp2p/upnp-nat/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/upnp-nat/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/utils": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/@libp2p/utils/-/utils-6.1.1.tgz", @@ -4523,42 +3822,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/utils/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/@libp2p/utils/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/utils/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/webrtc": { "version": "5.0.13", "resolved": "https://registry.npmjs.org/@libp2p/webrtc/-/webrtc-5.0.13.tgz", @@ -4592,20 +3855,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/webrtc/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/webrtc/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -4632,26 +3881,6 @@ "ws": "^8.17.0" } }, - "node_modules/@libp2p/websockets/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, - "node_modules/@libp2p/websockets/node_modules/multiformats": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", - "integrity": "sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==", - "dev": true - }, "node_modules/@libp2p/webtransport": { "version": "5.0.13", "resolved": "https://registry.npmjs.org/@libp2p/webtransport/-/webtransport-5.0.13.tgz", @@ -4672,20 +3901,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/@libp2p/webtransport/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/@libp2p/webtransport/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -7454,7 +6669,6 @@ "version": "3.0.5", "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.5.tgz", "integrity": "sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==", - "dev": true, "dependencies": { "pvtsutils": "^1.3.2", "pvutils": "^1.1.3", @@ -10784,36 +9998,6 @@ "multiformats": "^13.1.0" } }, - "node_modules/helia/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/helia/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/helia/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -11104,36 +10288,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/ipns/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/ipns/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/ipns/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -12567,36 +11721,6 @@ "uint8arrays": "^5.1.0" } }, - "node_modules/libp2p/node_modules/@libp2p/crypto": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-5.0.5.tgz", - "integrity": "sha512-bs3PpSQS59I/YD2RnwcPv88pF/vB6GH2rw4jqb/0xm60LfRuSm0tNoCrJMuyG2pFz89WuKM+0BpnEWQi4alwCg==", - "dev": true, - "dependencies": { - "@libp2p/interface": "^2.1.3", - "@noble/curves": "^1.4.0", - "@noble/hashes": "^1.4.0", - "asn1js": "^3.0.5", - "multiformats": "^13.1.0", - "protons-runtime": "^5.4.0", - "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" - } - }, - "node_modules/libp2p/node_modules/@libp2p/interface": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-2.1.3.tgz", - "integrity": "sha512-t1i2LWcnTGJEr7fDMslA8wYwBzJP81QKBlrBHoGhXxqqpRQa9035roCh/Akuw5RUgjKE47/ezjuzo90aWsJB8g==", - "dev": true, - "dependencies": { - "@multiformats/multiaddr": "^12.2.3", - "it-pushable": "^3.2.3", - "it-stream-types": "^2.0.1", - "multiformats": "^13.1.0", - "progress-events": "^1.0.0", - "uint8arraylist": "^2.4.8" - } - }, "node_modules/libp2p/node_modules/multiformats": { "version": "13.3.0", "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.3.0.tgz", @@ -14201,6 +13325,8 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", + "dev": true, + "peer": true, "engines": { "node": ">= 6.13.0" } @@ -15383,7 +14509,6 @@ "version": "1.3.5", "resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.5.tgz", "integrity": "sha512-ARvb14YB9Nm2Xi6nBq1ZX6dAM0FsJnuk+31aUp4TrcZEdKUlSqOqsxJHUPJDNE3qiIp+iUPEIeR6Je/tgV7zsA==", - "dev": true, "dependencies": { "tslib": "^2.6.1" } @@ -15392,7 +14517,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.1.3.tgz", "integrity": "sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==", - "dev": true, "engines": { "node": ">=6.0.0" } @@ -17511,8 +16635,7 @@ "node_modules/tslib": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", - "dev": true + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "node_modules/tsyringe": { "version": "4.8.0", diff --git a/package.json b/package.json index d83539a..e4e880f 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "main": "src/index.js", "dependencies": { "@ipld/dag-cbor": "^9.0.6", - "@libp2p/crypto": "^3.0.2", + "@libp2p/crypto": "^5.0.5", "it-pipe": "^3.0.1", "level": "^8.0.0", "lru": "^3.1.0", diff --git a/src/identities/providers/publickey.js b/src/identities/providers/publickey.js index 88fac65..fcf7650 100644 --- a/src/identities/providers/publickey.js +++ b/src/identities/providers/publickey.js @@ -6,6 +6,7 @@ */ import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import { signMessage, verifyMessage } from '../../key-store.js' +import { publicKeyFromRaw } from '@libp2p/crypto/keys' const type = 'publickey' @@ -52,7 +53,7 @@ const PublicKeyIdentityProvider = ({ keystore }) => async () => { } const key = await keystore.getKey(id) || await keystore.createKey(id) - return uint8ArrayToString(key.public.marshal(), 'base16') + return uint8ArrayToString(key.publicKey.raw, 'base16') } /** diff --git a/src/key-store.js b/src/key-store.js index 9c8e919..c93da42 100644 --- a/src/key-store.js +++ b/src/key-store.js @@ -8,7 +8,7 @@ * const storage = await MemoryStorage() * const keystore = await KeyStore({ storage }) */ -import * as crypto from '@libp2p/crypto' +import { privateKeyFromRaw, publicKeyFromRaw, generateKeyPair } from '@libp2p/crypto/keys' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import { compare as uint8ArrayCompare } from 'uint8arrays/compare' @@ -16,9 +16,6 @@ import ComposedStorage from './storage/composed.js' import LevelStorage from './storage/level.js' import LRUStorage from './storage/lru.js' -const unmarshal = crypto.keys.supportedKeys.secp256k1.unmarshalSecp256k1PrivateKey -const unmarshalPubKey = crypto.keys.supportedKeys.secp256k1.unmarshalSecp256k1PublicKey - const verifySignature = async (signature, publicKey, data) => { if (!signature) { throw new Error('No signature given') @@ -38,7 +35,7 @@ const verifySignature = async (signature, publicKey, data) => { let res = false try { - const pubKey = unmarshalPubKey(uint8ArrayFromString(publicKey, 'base16')) + const pubKey = publicKeyFromRaw(uint8ArrayFromString(publicKey, 'base16')) res = await isValid(pubKey, data, uint8ArrayFromString(signature, 'base16')) } catch (e) { // Catch error: sig length wrong @@ -195,7 +192,7 @@ const KeyStore = async ({ storage, path } = {}) => { const { privateKey } = key await storage.put('private_' + id, privateKey) // Unmarshal the key and add it to the cache - const unmarshaledPrivateKey = unmarshal(privateKey) + const unmarshaledPrivateKey = privateKeyFromRaw(privateKey) await keyCache.put(id, unmarshaledPrivateKey) } @@ -213,17 +210,16 @@ const KeyStore = async ({ storage, path } = {}) => { } // Generate a private key - const keyPair = await crypto.keys.generateKeyPair('secp256k1') - const keys = await crypto.keys.unmarshalPrivateKey(keyPair.bytes) + const keyPair = await generateKeyPair('secp256k1') const key = { - publicKey: keys.public.marshal(), - privateKey: keys.marshal() + publicKey: keyPair.publicKey.raw, + privateKey: keyPair.raw } await addKey(id, key) - return keys + return keyPair } /** @@ -254,7 +250,8 @@ const KeyStore = async ({ storage, path } = {}) => { return } - key = unmarshal(storedKey) + key = privateKeyFromRaw(storedKey) + await keyCache.put(id, key) } @@ -281,7 +278,7 @@ const KeyStore = async ({ storage, path } = {}) => { throw new Error('Supported formats are `hex` and `buffer`') } - const pubKey = keys.public.marshal() + const pubKey = keys.publicKey.raw return format === 'buffer' ? pubKey : uint8ArrayToString(pubKey, 'base16') } diff --git a/test/browser/setup-fixtures.js b/test/browser/setup-fixtures.js index a72293b..83dd7b3 100644 --- a/test/browser/setup-fixtures.js +++ b/test/browser/setup-fixtures.js @@ -1,10 +1,7 @@ -import * as crypto from '@libp2p/crypto' +import { privateKeyFromRaw } from '@libp2p/crypto/keys' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { Identities, KeyStore } from '../../src/index.js' -const unmarshal = crypto.keys.supportedKeys.secp256k1.unmarshalSecp256k1PrivateKey -const unmarshalPubKey = crypto.keys.supportedKeys.secp256k1.unmarshalSecp256k1PublicKey - const keysPath = './testkeys' const isBrowser = () => typeof window !== 'undefined' @@ -52,10 +49,10 @@ before(async () => { ] for (let user of users) { - const privateKey1 = unmarshal(uint8ArrayFromString(user.privateKey, 'base16')) - const privateKey2 = unmarshal(uint8ArrayFromString(user.identity.privateKey, 'base16')) - await keystore.addKey(user.id, { privateKey: privateKey1.marshal() }) - await keystore.addKey(user.identity.id, { privateKey: privateKey2.marshal() }) + const privateKey1 = privateKeyFromRaw(uint8ArrayFromString(user.privateKey, 'base16')) + const privateKey2 = privateKeyFromRaw(uint8ArrayFromString(user.identity.privateKey, 'base16')) + await keystore.addKey(user.id, { privateKey: privateKey1.raw }) + await keystore.addKey(user.identity.id, { privateKey: privateKey2.raw }) } await keystore.close() diff --git a/test/databases/replication/documents.test.js b/test/databases/replication/documents.test.js index 62b441c..3a53ef8 100644 --- a/test/databases/replication/documents.test.js +++ b/test/databases/replication/documents.test.js @@ -11,7 +11,7 @@ import createHelia from '../../utils/create-helia.js' const keysPath = './testkeys' describe('Documents Database Replication', function () { - this.timeout(30000) + this.timeout(10000) let ipfs1, ipfs2 let keystore @@ -31,6 +31,18 @@ describe('Documents Database Replication', function () { before(async () => { [ipfs1, ipfs2] = await Promise.all([createHelia(), createHelia()]) + + ipfs1.libp2p.addEventListener("peer:connect", (event) => { + console.log(event.detail.toString()) + }) + + ipfs2.libp2p.addEventListener("peer:connect", (event) => { + console.log(event.detail.toString()) + }) + + console.log(ipfs1.libp2p.peerId.toString()) + console.log(ipfs2.libp2p.peerId.toString()) + await connectPeers(ipfs1, ipfs2) await copy(testKeysPath, keysPath) diff --git a/test/identities/identities.test.js b/test/identities/identities.test.js index acde6c5..a1ca491 100644 --- a/test/identities/identities.test.js +++ b/test/identities/identities.test.js @@ -38,7 +38,7 @@ describe('Identities', function () { identities = await Identities({ path: keysPath }) identity = await identities.createIdentity({ id }) const key = await identities.keystore.getKey(id) - const externalId = uint8ArrayToString(key.public.marshal(), 'base16') + const externalId = uint8ArrayToString(key.publicKey.raw, 'base16') assert.strictEqual(identity.id, externalId) }) }) @@ -106,7 +106,7 @@ describe('Identities', function () { identity = await identities.createIdentity({ id }) keystore = identities.keystore const key = await keystore.getKey(id) - const externalId = uint8ArrayToString(key.public.marshal(), 'base16') + const externalId = uint8ArrayToString(key.publicKey.raw, 'base16') assert.strictEqual(identity.id, externalId) }) @@ -117,7 +117,7 @@ describe('Identities', function () { it('has the correct public key', async () => { const key = await keystore.getKey(id) - const externalId = uint8ArrayToString(key.public.marshal(), 'base16') + const externalId = uint8ArrayToString(key.publicKey.raw, 'base16') const signingKey = await keystore.getKey(externalId) assert.notStrictEqual(signingKey, undefined) assert.strictEqual(identity.publicKey, keystore.getPublic(signingKey)) @@ -125,10 +125,10 @@ describe('Identities', function () { it('has a signature for the id', async () => { const key = await keystore.getKey(id) - const externalId = uint8ArrayToString(key.public.marshal(), 'base16') + const externalId = uint8ArrayToString(key.publicKey.raw, 'base16') const signingKey = await keystore.getKey(externalId) const idSignature = await signMessage(signingKey, externalId) - const publicKey = uint8ArrayToString(signingKey.public.marshal(), 'base16') + const publicKey = uint8ArrayToString(signingKey.publicKey.raw, 'base16') const verifies = await verifyMessage(idSignature, publicKey, externalId) assert.strictEqual(verifies, true) assert.strictEqual(identity.signatures.id, idSignature) @@ -136,7 +136,7 @@ describe('Identities', function () { it('has a signature for the publicKey', async () => { const key = await keystore.getKey(id) - const externalId = uint8ArrayToString(key.public.marshal(), 'base16') + const externalId = uint8ArrayToString(key.publicKey.raw, 'base16') const signingKey = await keystore.getKey(externalId) const idSignature = await signMessage(signingKey, externalId) const externalKey = await keystore.getKey(id) @@ -171,7 +171,7 @@ describe('Identities', function () { it('has the correct id', async () => { const key = await savedKeysKeyStore.getKey(id) - assert.strictEqual(identity.id, uint8ArrayToString(key.public.marshal(), 'base16')) + assert.strictEqual(identity.id, uint8ArrayToString(key.publicKey.raw, 'base16')) }) it('has the correct public key', async () => { diff --git a/test/key-store.test.js b/test/key-store.test.js index cd5a8b9..192c788 100644 --- a/test/key-store.test.js +++ b/test/key-store.test.js @@ -145,7 +145,7 @@ describe('KeyStore', () => { }) describe('Options', () => { - const unmarshal = crypto.keys.supportedKeys.secp256k1.unmarshalSecp256k1PrivateKey + const unmarshal = crypto.keys.privateKeyFromRaw const privateKey = '198594a8de39fd97017d11996d619b3746211605a9d290964badf58bc79bdb33' const publicKey = '0260baeaffa1de1e4135e5b395e0380563a622b9599d1b8e012a0f7603f516bdaa' let privateKeyBuffer, publicKeyBuffer, unmarshalledPrivateKey diff --git a/test/orbitdb-replication.test.js b/test/orbitdb-replication.test.js index 22bf910..2eff650 100644 --- a/test/orbitdb-replication.test.js +++ b/test/orbitdb-replication.test.js @@ -23,6 +23,8 @@ describe('Replicating databases', function () { after(async () => { await orbitdb1.stop() await orbitdb2.stop() + await ipfs1.blockstore.child.child.child.close() + await ipfs2.blockstore.child.child.child.close() await ipfs1.stop() await ipfs2.stop() diff --git a/test/orbitdb.test.js b/test/orbitdb.test.js index ec22fb8..df4cdf6 100644 --- a/test/orbitdb.test.js +++ b/test/orbitdb.test.js @@ -72,8 +72,8 @@ describe('OrbitDB', function () { const privateKey = await orbitdb1.keystore.getKey(orbitdb1.identity.id) notStrictEqual(privateKey, undefined) strictEqual(privateKey.constructor.name, 'Secp256k1PrivateKey') - notStrictEqual(privateKey._key, undefined) - notStrictEqual(privateKey._publicKey, undefined) + notStrictEqual(privateKey.raw, undefined) + notStrictEqual(privateKey.publicKey, undefined) }) it('has a keystore that contains a public key that matches the identity\'s public key', async () => { @@ -164,8 +164,8 @@ describe('OrbitDB', function () { const privateKey = await orbitdb1.keystore.getKey(orbitdb1.identity.id) notStrictEqual(privateKey, undefined) strictEqual(privateKey.constructor.name, 'Secp256k1PrivateKey') - notStrictEqual(privateKey._key, undefined) - notStrictEqual(privateKey._publicKey, undefined) + notStrictEqual(privateKey.raw, undefined) + notStrictEqual(privateKey.publicKey, undefined) }) it('has a keystore that contains a public key that matches the identity\'s public key', async () => { diff --git a/test/utils/create-helia.js b/test/utils/create-helia.js index 560783e..9cb0154 100644 --- a/test/utils/create-helia.js +++ b/test/utils/create-helia.js @@ -54,7 +54,7 @@ const Libp2pBrowserOptions = { discoverRelays: 1 }) ], - connectionEncryption: [noise()], + connectionEncrypters: [noise()], streamMuxers: [yamux()], connectionGater: { denyDialMultiaddr: () => false