Skip to content

Commit fd3a1b1

Browse files
committed
Merge branch 'main' into feat/config-validation
2 parents f8e3193 + 02c69d2 commit fd3a1b1

File tree

429 files changed

+5461
-2240
lines changed

Some content is hidden

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

429 files changed

+5461
-2240
lines changed

.github/workflows/examples.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ jobs:
3434
- '@libp2p/tcp@$PWD/packages/transport-tcp'
3535
- '@libp2p/websockets@$PWD/packages/transport-websockets'
3636
- 'libp2p@$PWD/packages/libp2p'
37-
# disabled until @libp2p/identify and @libp2p/circuit-relay are published
38-
# - name: js-libp2p-example-circuit-relay
39-
# repo: https://github.com/libp2p/js-libp2p-example-circuit-relay.git
40-
# deps:
41-
# - '@libp2p/circuit-relay@$PWD/packages/transport-circuit-relay'
42-
# - '@libp2p/identify@$PWD/packages/protocol-identify'
43-
# - '@libp2p/websockets@$PWD/packages/transport-websockets'
44-
# - 'libp2p@$PWD/packages/libp2p'
37+
- name: js-libp2p-example-circuit-relay
38+
repo: https://github.com/libp2p/js-libp2p-example-circuit-relay.git
39+
deps:
40+
- '@libp2p/circuit-relay-v2@$PWD/packages/transport-circuit-relay-v2'
41+
- '@libp2p/identify@$PWD/packages/protocol-identify'
42+
- '@libp2p/websockets@$PWD/packages/transport-websockets'
43+
- 'libp2p@$PWD/packages/libp2p'
4544
- name: js-libp2p-example-connection-encryption
4645
repo: https://github.com/libp2p/js-libp2p-example-connection-encryption.git
4746
deps:
47+
- '@libp2p/plaintext@$PWD/packages/connection-encrypter-plaintext'
4848
- '@libp2p/tcp@$PWD/packages/transport-tcp'
4949
- 'libp2p@$PWD/packages/libp2p'
5050
steps:

.github/workflows/main.yml

+14-10
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
node-version: ${{ matrix.node }}
5151
- uses: ipfs/aegir/actions/cache-node-modules@master
5252
- run: npm run --if-present test:node
53-
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
53+
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
5454
with:
5555
flags: node
5656
files: .coverage/*,packages/*/.coverage/*
@@ -65,7 +65,7 @@ jobs:
6565
node-version: lts/*
6666
- uses: ipfs/aegir/actions/cache-node-modules@master
6767
- run: npm run --if-present test:chrome
68-
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
68+
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
6969
with:
7070
flags: chrome
7171
files: .coverage/*,packages/*/.coverage/*
@@ -80,7 +80,7 @@ jobs:
8080
node-version: lts/*
8181
- uses: ipfs/aegir/actions/cache-node-modules@master
8282
- run: npm run --if-present test:chrome-webworker
83-
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
83+
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
8484
with:
8585
flags: chrome-webworker
8686
files: .coverage/*,packages/*/.coverage/*
@@ -95,7 +95,7 @@ jobs:
9595
node-version: lts/*
9696
- uses: ipfs/aegir/actions/cache-node-modules@master
9797
- run: npm run --if-present test:firefox
98-
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
98+
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
9999
with:
100100
flags: firefox
101101
files: .coverage/*,packages/*/.coverage/*
@@ -110,7 +110,7 @@ jobs:
110110
node-version: lts/*
111111
- uses: ipfs/aegir/actions/cache-node-modules@master
112112
- run: npm run --if-present test:firefox-webworker
113-
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
113+
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
114114
with:
115115
flags: firefox-webworker
116116
files: .coverage/*,packages/*/.coverage/*
@@ -126,7 +126,7 @@ jobs:
126126
- uses: ipfs/aegir/actions/cache-node-modules@master
127127
- run: npx playwright install-deps
128128
- run: npm run --if-present test:webkit
129-
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
129+
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
130130
with:
131131
flags: webkit
132132
files: .coverage/*,packages/*/.coverage/*
@@ -141,7 +141,7 @@ jobs:
141141
node-version: lts/*
142142
- uses: ipfs/aegir/actions/cache-node-modules@master
143143
- run: npx xvfb-maybe npm run --if-present test:electron-main
144-
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
144+
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
145145
with:
146146
flags: electron-main
147147
files: .coverage/*,packages/*/.coverage/*
@@ -156,7 +156,7 @@ jobs:
156156
node-version: lts/*
157157
- uses: ipfs/aegir/actions/cache-node-modules@master
158158
- run: npx xvfb-maybe npm run --if-present test:electron-renderer
159-
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
159+
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
160160
with:
161161
flags: electron-renderer
162162
files: .coverage/*,packages/*/.coverage/*
@@ -218,11 +218,15 @@ jobs:
218218
transport-interop
219219
]
220220
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
221+
permissions:
222+
contents: write
223+
id-token: write
224+
pull-requests: write
221225
steps:
222-
- uses: GoogleCloudPlatform/release-please-action@v2
226+
- uses: google-github-actions/release-please-action@v3
223227
id: release
224228
with:
225-
token: ${{ secrets.GITHUB_TOKEN }}
229+
token: ${{ secrets.UCI_GITHUB_TOKEN || github.token }}
226230
command: manifest
227231
release-type: node
228232
manifest-file: .release-please-manifest.json

.release-please-manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"interop":"1.0.14","packages/crypto":"2.0.8","packages/interface":"0.1.6","packages/interface-compliance-tests":"4.1.5","packages/interface-internal":"0.1.9","packages/kad-dht":"10.0.15","packages/keychain":"3.0.8","packages/libp2p":"0.46.21","packages/logger":"3.1.0","packages/metrics-prometheus":"2.0.12","packages/multistream-select":"4.0.6","packages/peer-collections":"4.0.8","packages/peer-discovery-bootstrap":"9.0.12","packages/peer-discovery-mdns":"9.0.14","packages/peer-id":"3.0.6","packages/peer-id-factory":"3.0.8","packages/peer-record":"6.0.9","packages/peer-store":"9.0.9","packages/protocol-perf":"2.0.1","packages/pubsub":"8.0.10","packages/pubsub-floodsub":"8.0.13","packages/stream-multiplexer-mplex":"9.0.12","packages/transport-tcp":"8.0.13","packages/transport-webrtc":"3.2.11","packages/transport-websockets":"7.0.13","packages/transport-webtransport":"3.1.10","packages/utils":"4.0.7"}
1+
{"interop":"2.0.9","packages/connection-encrypter-plaintext":"1.0.6","packages/crypto":"3.0.1","packages/interface":"1.0.1","packages/interface-compliance-tests":"5.0.6","packages/interface-internal":"1.0.2","packages/kad-dht":"11.0.6","packages/keychain":"4.0.2","packages/libp2p":"1.0.9","packages/logger":"4.0.1","packages/metrics-prometheus":"3.0.6","packages/multistream-select":"5.0.1","packages/peer-collections":"5.1.0","packages/peer-discovery-bootstrap":"10.0.6","packages/peer-discovery-mdns":"10.0.6","packages/peer-id":"4.0.1","packages/peer-id-factory":"4.0.0","packages/peer-record":"7.0.0","packages/peer-store":"10.0.1","packages/protocol-autonat":"1.0.4","packages/protocol-dcutr":"1.0.4","packages/protocol-fetch":"1.0.4","packages/protocol-identify":"1.0.5","packages/protocol-perf":"3.0.6","packages/protocol-ping":"1.0.5","packages/pubsub":"9.0.1","packages/pubsub-floodsub":"9.0.2","packages/stream-multiplexer-mplex":"10.0.6","packages/transport-circuit-relay-v2":"1.0.6","packages/transport-tcp":"9.0.6","packages/transport-webrtc":"4.0.9","packages/transport-websockets":"8.0.6","packages/transport-webtransport":"4.0.9","packages/upnp-nat":"1.0.4","packages/utils":"5.0.2"}

.release-please.json

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"last-release-sha": "17d980c902fa5314e954508255a41c0854416d47",
32
"plugins": ["node-workspace"],
4-
"group-pull-request-title-pattern": "chore: release ${component}",
53
"packages": {
64
"interop": {},
75
"packages/connection-encrypter-plaintext": {},

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535

3636
> JavaScript implementation of libp2p, a modular peer to peer network stack
3737
38-
3938
### Project status
4039

4140
This project has been used in production for years in Ethereum, IPFS, and more. It is actively maintained by multiple organizations and continues to be improved! The API might change, but we strictly follow semver.
4241

4342
The documentation in the main branch may contain changes from a pre-release.
43+
4444
If you are looking for the documentation of the latest release, you can view the latest release on [**npm**](https://www.npmjs.com/package/libp2p), or select the tag in github that matches the version you are looking for.
4545

4646
**Want to get started?** Check our [GETTING\_STARTED.md](./doc/GETTING_STARTED.md) guide and [examples](https://github.com/libp2p/js-libp2p-examples).

doc/CONFIGURATION.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ import { mplex } from '@libp2p/mplex'
318318
import { yamux } from '@chainsafe/libp2p-yamux'
319319
import { noise } from '@chainsafe/libp2p-noise'
320320
import { gossipsub } from 'libp2p-gossipsub'
321-
import { SignaturePolicy } from '@libp2p/interface/pubsub'
321+
import { SignaturePolicy } from '@libp2p/interface'
322322
import { identify } from '@libp2p/identify'
323323

324324
const node = await createLibp2p({

doc/METRICS.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const node = await createLibp2p({
6262
To define component metrics first get a reference to the metrics object:
6363

6464
```ts
65-
import type { Metrics } from '@libp2p/interface/metrics'
65+
import type { Metrics } from '@libp2p/interface'
6666

6767
interface MyClassComponents {
6868
metrics: Metrics
@@ -84,7 +84,7 @@ class MyClass {
8484
A tracked metric can be created by calling either `registerMetric` on the metrics object:
8585

8686
```ts
87-
import type { Metrics } from '@libp2p/interface/metrics'
87+
import type { Metrics } from '@libp2p/interface'
8888
import { prometheusMetrics } from '@libp2p/prometheus-metrics'
8989

9090
const metrics: Metrics = prometheusMetrics()()
@@ -117,7 +117,7 @@ stopTimer()
117117
A metric that is expensive to calculate can be created by passing a `calculate` function that will only be invoked when metrics are being scraped:
118118

119119
```ts
120-
import type { Metrics } from '@libp2p/interface/metrics'
120+
import type { Metrics } from '@libp2p/interface'
121121
import { prometheusMetrics } from '@libp2p/prometheus-metrics'
122122

123123
const metrics: Metrics = prometheusMetrics()()
@@ -132,7 +132,7 @@ metrics.registerMetric('my_metric', {
132132
If several metrics should be grouped together (e.g. for graphing purposes) `registerMetricGroup` can be used instead:
133133

134134
```ts
135-
import type { Metrics } from '@libp2p/interface/metrics'
135+
import type { Metrics } from '@libp2p/interface'
136136
import { prometheusMetrics } from '@libp2p/prometheus-metrics'
137137

138138
const metrics: Metrics = prometheusMetrics()()

0 commit comments

Comments
 (0)