Skip to content

Commit 425a42c

Browse files
authored
fix: use @chainsafe/libp2p-noise and @chainsafe/libp2p-yamux (#3308)
Reverts use of `@libp2p/noise` and `@libp2p/yamux` now that v3-compatible versions of `@chainsafe/libp2p-noise` and `@chainsafe/libp2p-yamux` are available.
1 parent 71e8ee1 commit 425a42c

File tree

102 files changed

+53
-5942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+53
-5942
lines changed

.release-please-manifest.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"packages/protocol-ping": "3.0.1",
3939
"packages/record": "4.0.8",
4040
"packages/stream-multiplexer-mplex": "12.0.1",
41-
"packages/stream-multiplexer-yamux": "8.0.1",
4241
"packages/transport-circuit-relay-v2": "4.0.1",
4342
"packages/transport-memory": "2.0.1",
4443
"packages/transport-tcp": "11.0.1",
@@ -48,6 +47,5 @@
4847
"packages/upnp-nat": "4.0.1",
4948
"packages/utils": "7.0.1",
5049
"packages/integration-tests": "1.0.1",
51-
"packages/connection-encrypter-noise": "17.0.1",
5250
"interop": "1.0.1"
5351
}

.release-please.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"packages": {
1212
"interop": {},
1313
"packages/config": {},
14-
"packages/connection-encrypter-noise": {},
1514
"packages/connection-encrypter-plaintext": {},
1615
"packages/connection-encrypter-tls": {},
1716
"packages/crypto": {},
@@ -51,7 +50,6 @@
5150
"packages/protocol-ping": {},
5251
"packages/record": {},
5352
"packages/stream-multiplexer-mplex": {},
54-
"packages/stream-multiplexer-yamux": {},
5553
"packages/transport-circuit-relay-v2": {},
5654
"packages/transport-memory": {},
5755
"packages/transport-tcp": {},

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ List of packages currently in existence for libp2p
149149
| [`@libp2p/websockets`](//github.com/libp2p/js-libp2p/tree/main/packages/transport-websockets) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Fwebsockets.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@libp2p/websockets) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Fwebsockets?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Fwebsockets) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p/main.yml?branch=main&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p/actions?query=branch%3Amain+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/transport-websockets/branch/main/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/transport-websockets) |
150150
| [`@libp2p/webtransport`](//github.com/libp2p/js-libp2p/tree/main/packages/transport-webtransport) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Fwebtransport.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@libp2p/webtransport) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Fwebtransport?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Fwebtransport) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p/main.yml?branch=main&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p/actions?query=branch%3Amain+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/transport-webtransport/branch/main/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/transport-webtransport) |
151151
| **secure channels** |
152-
| [`@libp2p/noise`](//github.com/ChainSafe/js-libp2p-noise) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Fnoise.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@libp2p/noise) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Fnoise?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Fnoise) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/ChainSafe/js-libp2p-noise/js-test-and-release.yml?branch=master&label=ci&style=flat-square)](//github.com/ChainSafe/js-libp2p-noise/actions?query=branch%3Amaster+workflow%3Aci+) | [![codecov](https://codecov.io/gh/ChainSafe/js-libp2p-noise/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/ChainSafe/js-libp2p-noise) |
152+
| [`@chainsafe/libp2p-noise`](//github.com/ChainSafe/js-libp2p-noise) | [![npm](https://img.shields.io/npm/v/%40chainsafe%2Flibp2p-noise.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@chainsafe/libp2p-noise) | [![Deps](https://img.shields.io/librariesio/release/npm/%40chainsafe%2Flibp2p-noise?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40chainsafe%2Flibp2p-noise) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/ChainSafe/js-libp2p-noise/js-test-and-release.yml?branch=master&label=ci&style=flat-square)](//github.com/ChainSafe/js-libp2p-noise/actions?query=branch%3Amaster+workflow%3Aci+) | [![codecov](https://codecov.io/gh/ChainSafe/js-libp2p-noise/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/ChainSafe/js-libp2p-noise) |
153153
| [`@libp2p/plaintext`](//github.com/libp2p/js-libp2p/tree/main/packages/connection-encrypter-plaintext) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Fplaintext.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@libp2p/plaintext) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Fplaintext?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Fplaintext) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p/main.yml?branch=main&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p/actions?query=branch%3Amain+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/connection-encrypter-plaintext/branch/main/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/connection-encrypter-plaintext) |
154154
| [`@libp2p/tls`](//github.com/libp2p/js-libp2p/tree/main/packages/connection-encrypter-tls) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Ftls.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@libp2p/tls) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Ftls?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Ftls) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p/main.yml?branch=main&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p/actions?query=branch%3Amain+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/connection-encrypter-tls/branch/main/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/connection-encrypter-tls) |
155155
| **stream multiplexers** |
156-
| [`@libp2p/yamux`](//github.com/ChainSafe/js-libp2p-yamux) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Fyamux.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@libp2p/yamux) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Fyamux?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Fyamux) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/ChainSafe/js-libp2p-yamux/js-test-and-release.yml?branch=master&label=ci&style=flat-square)](//github.com/ChainSafe/js-libp2p-yamux/actions?query=branch%3Amaster+workflow%3Aci+) | [![codecov](https://codecov.io/gh/ChainSafe/js-libp2p-yamux/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/ChainSafe/js-libp2p-yamux) |
156+
| [`@chainsafe/libp2p-yamux`](//github.com/ChainSafe/js-libp2p-yamux) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Fyamux.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@chainsafe/libp2p-yamux) | [![Deps](https://img.shields.io/librariesio/release/npm/%40chainsafe%2Flibp2p-yamux?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40chainsafe%2Flibp2p-yamux) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/ChainSafe/js-libp2p-yamux/js-test-and-release.yml?branch=master&label=ci&style=flat-square)](//github.com/ChainSafe/js-libp2p-yamux/actions?query=branch%3Amaster+workflow%3Aci+) | [![codecov](https://codecov.io/gh/ChainSafe/js-libp2p-yamux/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/ChainSafe/js-libp2p-yamux) |
157157
| [`@libp2p/mplex`](//github.com/libp2p/js-libp2p/tree/main/packages/stream-multiplexer-mplex) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Fmplex.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@libp2p/mplex) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Fmplex?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Fmplex) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p/main.yml?branch=main&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p/actions?query=branch%3Amain+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/stream-multiplexer-mplex/branch/main/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/stream-multiplexer-mplex) |
158158
| **peer discovery** |
159159
| [`@libp2p/bootstrap`](//github.com/libp2p/js-libp2p/tree/main/packages/peer-discovery-bootstrap) | [![npm](https://img.shields.io/npm/v/%40libp2p%2Fbootstrap.svg?maxAge=86400&style=flat-square)](//npmjs.com/package/@libp2p/bootstrap) | [![Deps](https://img.shields.io/librariesio/release/npm/%40libp2p%2Fbootstrap?logo=Libraries.io&logoColor=white&style=flat-square)](//libraries.io/npm/%40libp2p%2Fbootstrap) | [![GitHub CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p/main.yml?branch=main&label=ci&style=flat-square)](//github.com/libp2p/js-libp2p/actions?query=branch%3Amain+workflow%3Aci+) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/peer-discovery-bootstrap/branch/main/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p/tree/main/packages/peer-discovery-bootstrap) |

interop/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"dep-check": "aegir dep-check"
1212
},
1313
"devDependencies": {
14-
"@libp2p/noise": "^17.0.1",
15-
"@libp2p/yamux": "^8.0.1",
14+
"@chainsafe/libp2p-noise": "^17.0.0",
15+
"@chainsafe/libp2p-yamux": "^8.0.0",
1616
"@libp2p/circuit-relay-v2": "^4.0.1",
1717
"@libp2p/identify": "^4.0.1",
1818
"@libp2p/interface": "^3.0.0",

interop/test/fixtures/get-libp2p.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/* eslint-disable complexity */
22

33
// import { quic } from '@chainsafe/libp2p-quic'
4+
import { noise } from '@chainsafe/libp2p-noise'
5+
import { yamux } from '@chainsafe/libp2p-yamux'
46
import { circuitRelayTransport } from '@libp2p/circuit-relay-v2'
57
import { identify } from '@libp2p/identify'
68
import { mplex } from '@libp2p/mplex'
7-
import { noise } from '@libp2p/noise'
89
import { ping } from '@libp2p/ping'
910
import { tcp } from '@libp2p/tcp'
1011
import { tls } from '@libp2p/tls'
1112
import { webRTC, webRTCDirect } from '@libp2p/webrtc'
1213
import { webSockets } from '@libp2p/websockets'
1314
import { webTransport } from '@libp2p/webtransport'
14-
import { yamux } from '@libp2p/yamux'
1515
import { createLibp2p } from 'libp2p'
1616
import type { Identify } from '@libp2p/identify'
1717
import type { Libp2p } from '@libp2p/interface'

interop/test/fixtures/relay.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { noise } from '@chainsafe/libp2p-noise'
2+
import { yamux } from '@chainsafe/libp2p-yamux'
13
import { circuitRelayServer } from '@libp2p/circuit-relay-v2'
24
import { identify } from '@libp2p/identify'
3-
import { noise } from '@libp2p/noise'
45
import { webSockets } from '@libp2p/websockets'
5-
import { yamux } from '@libp2p/yamux'
66
import { createLibp2p } from 'libp2p'
77
import type { Libp2p } from '@libp2p/interface'
88

interop/tsconfig.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
"test"
99
],
1010
"references": [
11-
{
12-
"path": "../packages/connection-encrypter-noise"
13-
},
1411
{
1512
"path": "../packages/connection-encrypter-tls"
1613
},
@@ -29,9 +26,6 @@
2926
{
3027
"path": "../packages/stream-multiplexer-mplex"
3128
},
32-
{
33-
"path": "../packages/stream-multiplexer-yamux"
34-
},
3529
{
3630
"path": "../packages/transport-circuit-relay-v2"
3731
},

packages/connection-encrypter-noise/.aegir.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

packages/connection-encrypter-noise/CHANGELOG.md

Lines changed: 0 additions & 59 deletions
This file was deleted.

packages/connection-encrypter-noise/CODE_OF_CONDUCT.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)