Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/config-validation
Browse files Browse the repository at this point in the history
  • Loading branch information
achingbrain committed Jan 12, 2024
2 parents 1eb436e + 8bbd436 commit 1b072f4
Show file tree
Hide file tree
Showing 107 changed files with 1,666 additions and 1,139 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ updates:
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 10
open-pull-requests-limit: 20
commit-message:
prefix: "deps"
prefix-development: "deps(dev)"
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"interop":"2.0.14","packages/connection-encrypter-plaintext":"1.0.10","packages/crypto":"3.0.4","packages/interface":"1.1.1","packages/interface-compliance-tests":"5.1.1","packages/interface-internal":"1.0.5","packages/kad-dht":"12.0.2","packages/keychain":"4.0.5","packages/libp2p":"1.1.1","packages/logger":"4.0.4","packages/metrics-prometheus":"3.0.10","packages/multistream-select":"5.1.1","packages/peer-collections":"5.1.3","packages/peer-discovery-bootstrap":"10.0.10","packages/peer-discovery-mdns":"10.0.10","packages/peer-id":"4.0.4","packages/peer-id-factory":"4.0.3","packages/peer-record":"7.0.4","packages/peer-store":"10.0.5","packages/protocol-autonat":"1.0.7","packages/protocol-dcutr":"1.0.7","packages/protocol-fetch":"1.0.7","packages/protocol-identify":"1.0.9","packages/protocol-perf":"3.0.10","packages/protocol-ping":"1.0.8","packages/pubsub":"9.0.5","packages/pubsub-floodsub":"9.0.6","packages/stream-multiplexer-mplex":"10.0.10","packages/transport-circuit-relay-v2":"1.0.10","packages/transport-tcp":"9.0.10","packages/transport-webrtc":"4.0.14","packages/transport-websockets":"8.0.10","packages/transport-webtransport":"4.0.14","packages/upnp-nat":"1.0.8","packages/utils":"5.2.0"}
{"interop":"2.0.15","packages/connection-encrypter-plaintext":"1.0.11","packages/crypto":"4.0.0","packages/interface":"1.1.1","packages/interface-compliance-tests":"5.1.2","packages/interface-internal":"1.0.6","packages/kad-dht":"12.0.3","packages/keychain":"4.0.6","packages/libp2p":"1.1.2","packages/logger":"4.0.4","packages/metrics-prometheus":"3.0.11","packages/multistream-select":"5.1.1","packages/peer-collections":"5.1.4","packages/peer-discovery-bootstrap":"10.0.11","packages/peer-discovery-mdns":"10.0.11","packages/peer-id":"4.0.4","packages/peer-id-factory":"4.0.4","packages/peer-record":"7.0.5","packages/peer-store":"10.0.6","packages/protocol-autonat":"1.0.8","packages/protocol-dcutr":"1.0.8","packages/protocol-fetch":"1.0.8","packages/protocol-identify":"1.0.10","packages/protocol-perf":"3.0.11","packages/protocol-ping":"1.0.9","packages/pubsub":"9.0.6","packages/pubsub-floodsub":"9.0.7","packages/stream-multiplexer-mplex":"10.0.11","packages/transport-circuit-relay-v2":"1.0.11","packages/transport-tcp":"9.0.11","packages/transport-webrtc":"4.0.15","packages/transport-websockets":"8.0.11","packages/transport-webtransport":"4.0.15","packages/upnp-nat":"1.0.9","packages/utils":"5.2.1"}
8 changes: 4 additions & 4 deletions doc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
},
"dependencies": {
"@chainsafe/libp2p-yamux": "^6.0.1",
"@libp2p/interface": "^1.0.0",
"@libp2p/mplex": "^10.0.0",
"@libp2p/interface": "^1.1.1",
"@libp2p/mplex": "^10.0.10",
"@libp2p/prometheus-metrics": "^3.0.0",
"@libp2p/tcp": "^9.0.0",
"@libp2p/tcp": "^9.0.10",
"aegir": "^42.0.0",
"libp2p": "^1.0.0",
"libp2p": "^1.1.1",
"prom-client": "^15.0.0"
},
"private": true
Expand Down
14 changes: 14 additions & 0 deletions interop/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,20 @@
* @libp2p/webtransport bumped from ^4.0.12 to ^4.0.13
* libp2p bumped from ^1.0.12 to ^1.1.0

### Dependencies

* The following workspace dependencies were updated
* dependencies
* @libp2p/circuit-relay-v2 bumped from ^1.0.10 to ^1.0.11
* @libp2p/identify bumped from ^1.0.9 to ^1.0.10
* @libp2p/mplex bumped from ^10.0.10 to ^10.0.11
* @libp2p/ping bumped from ^1.0.8 to ^1.0.9
* @libp2p/tcp bumped from ^9.0.10 to ^9.0.11
* @libp2p/webrtc bumped from ^4.0.14 to ^4.0.15
* @libp2p/websockets bumped from ^8.0.10 to ^8.0.11
* @libp2p/webtransport bumped from ^4.0.14 to ^4.0.15
* libp2p bumped from ^1.1.1 to ^1.1.2

## [2.0.14](https://github.com/libp2p/js-libp2p/compare/multidim-interop-v2.0.13...multidim-interop-v2.0.14) (2024-01-06)


Expand Down
24 changes: 14 additions & 10 deletions interop/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@libp2p/multidim-interop",
"version": "2.0.14",
"version": "2.0.15",
"description": "Multidimensional interop tests",
"author": "Glen De Cauwsemaecker <glen@littlebearlabs.io> / @marcopolo",
"license": "Apache-2.0 OR MIT",
Expand All @@ -12,6 +12,10 @@
"bugs": {
"url": "https://github.com/libp2p/js-libp2p/issues"
},
"publishConfig": {
"access": "public",
"provenance": true
},
"type": "module",
"types": "./dist/src/index.d.ts",
"files": [
Expand Down Expand Up @@ -53,18 +57,18 @@
"dependencies": {
"@chainsafe/libp2p-noise": "^14.0.0",
"@chainsafe/libp2p-yamux": "^6.0.1",
"@libp2p/circuit-relay-v2": "^1.0.10",
"@libp2p/identify": "^1.0.9",
"@libp2p/mplex": "^10.0.10",
"@libp2p/ping": "^1.0.8",
"@libp2p/tcp": "^9.0.10",
"@libp2p/webrtc": "^4.0.14",
"@libp2p/websockets": "^8.0.10",
"@libp2p/webtransport": "^4.0.14",
"@libp2p/circuit-relay-v2": "^1.0.11",
"@libp2p/identify": "^1.0.10",
"@libp2p/mplex": "^10.0.11",
"@libp2p/ping": "^1.0.9",
"@libp2p/tcp": "^9.0.11",
"@libp2p/webrtc": "^4.0.15",
"@libp2p/websockets": "^8.0.11",
"@libp2p/webtransport": "^4.0.15",
"@multiformats/mafmt": "^12.1.6",
"@multiformats/multiaddr": "^12.1.10",
"aegir": "^42.0.0",
"libp2p": "^1.1.1",
"libp2p": "^1.1.2",
"redis": "^4.5.1"
},
"browser": {
Expand Down
7 changes: 7 additions & 0 deletions packages/connection-encrypter-plaintext/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
* @libp2p/logger bumped from ^4.0.2 to ^4.0.3
* @libp2p/peer-id-factory bumped from ^4.0.1 to ^4.0.2

### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @libp2p/interface-compliance-tests bumped from ^5.1.1 to ^5.1.2
* @libp2p/peer-id-factory bumped from ^4.0.3 to ^4.0.4

## [1.0.10](https://github.com/libp2p/js-libp2p/compare/plaintext-v1.0.9...plaintext-v1.0.10) (2024-01-06)


Expand Down
10 changes: 5 additions & 5 deletions packages/connection-encrypter-plaintext/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@libp2p/plaintext",
"version": "1.0.10",
"version": "1.0.11",
"description": "An insecure connection encrypter",
"license": "Apache-2.0 OR MIT",
"homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/connection-encrypter-plaintext#readme",
Expand Down Expand Up @@ -56,15 +56,15 @@
"it-protobuf-stream": "^1.1.1",
"it-stream-types": "^2.0.1",
"protons-runtime": "^5.0.0",
"uint8arraylist": "^2.4.3"
"uint8arraylist": "^2.4.7"
},
"devDependencies": {
"@libp2p/interface-compliance-tests": "^5.1.1",
"@libp2p/interface-compliance-tests": "^5.1.2",
"@libp2p/logger": "^4.0.4",
"@libp2p/peer-id-factory": "^4.0.3",
"@libp2p/peer-id-factory": "^4.0.4",
"@multiformats/multiaddr": "^12.1.10",
"aegir": "^42.0.0",
"protons": "^7.3.0",
"sinon": "^17.0.0"
"sinon": "^17.0.1"
}
}
11 changes: 11 additions & 0 deletions packages/crypto/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@
* dependencies
* @libp2p/interface bumped from ^1.0.2 to ^1.1.0

## [4.0.0](https://github.com/libp2p/js-libp2p/compare/crypto-v3.0.4...crypto-v4.0.0) (2024-01-12)


### ⚠ BREAKING CHANGES

* Legacy RSA operations are now in @libp2p/rsa, streaming AES-CTR ciphers are in @libp2p/aes-ctr

### Bug Fixes

* remove node-forge dependency from @libp2p/crypto ([#2355](https://github.com/libp2p/js-libp2p/issues/2355)) ([856ccd7](https://github.com/libp2p/js-libp2p/commit/856ccd7082a42ad0c33486e9b6885452aa886c64))

## [3.0.4](https://github.com/libp2p/js-libp2p/compare/crypto-v3.0.3...crypto-v3.0.4) (2024-01-06)


Expand Down
21 changes: 7 additions & 14 deletions packages/crypto/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@libp2p/crypto",
"version": "3.0.4",
"version": "4.0.0",
"description": "Crypto primitives for libp2p",
"license": "Apache-2.0 OR MIT",
"homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/crypto#readme",
Expand Down Expand Up @@ -51,10 +51,6 @@
"types": "./src/index.d.ts",
"import": "./dist/src/index.js"
},
"./aes": {
"types": "./dist/src/aes/index.d.ts",
"import": "./dist/src/aes/index.js"
},
"./hmac": {
"types": "./dist/src/hmac/index.d.ts",
"import": "./dist/src/hmac/index.js"
Expand All @@ -69,10 +65,7 @@
"parserOptions": {
"project": true,
"sourceType": "module"
},
"ignorePatterns": [
"src/*.d.ts"
]
}
},
"scripts": {
"clean": "aegir clean",
Expand All @@ -92,11 +85,11 @@
"dependencies": {
"@libp2p/interface": "^1.1.1",
"@noble/curves": "^1.1.0",
"@noble/hashes": "^1.3.1",
"@noble/hashes": "^1.3.3",
"asn1js": "^3.0.5",
"multiformats": "^13.0.0",
"node-forge": "^1.1.0",
"protons-runtime": "^5.0.0",
"uint8arraylist": "^2.4.3",
"uint8arraylist": "^2.4.7",
"uint8arrays": "^5.0.0"
},
"devDependencies": {
Expand All @@ -106,12 +99,12 @@
"protons": "^7.3.0"
},
"browser": {
"./dist/src/aes/ciphers.js": "./dist/src/aes/ciphers-browser.js",
"./dist/src/ciphers/aes-gcm.js": "./dist/src/ciphers/aes-gcm.browser.js",
"./dist/src/hmac/index.js": "./dist/src/hmac/index-browser.js",
"./dist/src/keys/ecdh.js": "./dist/src/keys/ecdh-browser.js",
"./dist/src/keys/ed25519.js": "./dist/src/keys/ed25519-browser.js",
"./dist/src/keys/rsa.js": "./dist/src/keys/rsa-browser.js",
"./dist/src/keys/secp256k1.js": "./dist/src/keys/secp256k1-browser.js"
"./dist/src/keys/secp256k1.js": "./dist/src/keys/secp256k1-browser.js",
"./dist/src/webcrypto.js": "./dist/src/webcrypto-browser.js"
}
}
15 changes: 0 additions & 15 deletions packages/crypto/src/aes/cipher-mode.ts

This file was deleted.

31 changes: 0 additions & 31 deletions packages/crypto/src/aes/ciphers-browser.ts

This file was deleted.

4 changes: 0 additions & 4 deletions packages/crypto/src/aes/ciphers.ts

This file was deleted.

70 changes: 0 additions & 70 deletions packages/crypto/src/aes/index.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/crypto/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
* To enable the Web Crypto API and allow `@libp2p/crypto` to work fully, please serve your page over HTTPS.
*/

import * as aes from './aes/index.js'
import * as hmac from './hmac/index.js'
import * as keys from './keys/index.js'
import pbkdf2 from './pbkdf2.js'
import randomBytes from './random-bytes.js'

export { aes }
export { hmac }
export { keys }
export { randomBytes }
Expand Down
2 changes: 1 addition & 1 deletion packages/crypto/src/keys/ed25519-browser.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ed25519 as ed } from '@noble/curves/ed25519'
import type { Uint8ArrayKeyPair } from './interface'
import type { Uint8ArrayKeyPair } from './interface.js'
import type { Uint8ArrayList } from 'uint8arraylist'

const PUBLIC_KEY_BYTE_LENGTH = 32
Expand Down
Loading

0 comments on commit 1b072f4

Please sign in to comment.