Skip to content

Commit 1092fed

Browse files
achingbrainachingbrain
authored
chore: update to latest libp2p version (#88)
Updates everything to use the V1 API
1 parent 262657e commit 1092fed

File tree

13 files changed

+83
-56
lines changed

13 files changed

+83
-56
lines changed

‎examples/js-libp2p-example-browser-pubsub/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ This example leverages the [vite bundler](https://vitejs.dev/) to compile and se
2121

2222
## Setup
2323

24-
1. Install example depenedencies and build the project
24+
1. Install example dependencies
2525
```console
2626
$ npm install
27-
$ npm run build
2827
```
2928
2. Open 2 terminal windows in the `./src` directory.
3029

‎examples/js-libp2p-example-browser-pubsub/index.js

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { gossipsub } from '@chainsafe/libp2p-gossipsub'
22
import { noise } from '@chainsafe/libp2p-noise'
33
import { yamux } from '@chainsafe/libp2p-yamux'
4+
import { circuitRelayTransport } from '@libp2p/circuit-relay-v2'
5+
import { dcutr } from '@libp2p/dcutr'
6+
import { identify } from '@libp2p/identify'
47
import { webRTC } from '@libp2p/webrtc'
58
import { webSockets } from '@libp2p/websockets'
69
import * as filters from '@libp2p/websockets/filters'
710
import { multiaddr } from '@multiformats/multiaddr'
811
import { createLibp2p } from 'libp2p'
9-
import { circuitRelayTransport } from 'libp2p/circuit-relay'
10-
import { identifyService } from 'libp2p/identify'
1112
import { fromString, toString } from 'uint8arrays'
1213

1314
const DOM = {
@@ -63,16 +64,17 @@ const libp2p = await createLibp2p({
6364
streamMuxers: [yamux()],
6465
connectionGater: {
6566
denyDialMultiaddr: () => {
66-
// by default we refuse to dial local addresses from the browser since they
67-
// are usually sent by remote peers broadcasting undialable multiaddrs but
68-
// here we are explicitly connecting to a local node so do not deny dialing
69-
// any discovered address
67+
// by default we refuse to dial local addresses from browsers since they
68+
// are usually sent by remote peers broadcasting undialable multiaddrs and
69+
// cause errors to appear in the console but in this example we are
70+
// explicitly connecting to a local node so allow all addresses
7071
return false
7172
}
7273
},
7374
services: {
74-
identify: identifyService(),
75-
pubsub: gossipsub()
75+
identify: identify(),
76+
pubsub: gossipsub(),
77+
dcutr: dcutr()
7678
},
7779
connectionManager: {
7880
minConnections: 0
@@ -87,6 +89,18 @@ function updatePeerList () {
8789
.map(peerId => {
8890
const el = document.createElement('li')
8991
el.textContent = peerId.toString()
92+
93+
const addrList = document.createElement('ul')
94+
95+
for (const conn of libp2p.getConnections(peerId)) {
96+
const addr = document.createElement('li')
97+
addr.textContent = conn.remoteAddr.toString()
98+
99+
addrList.appendChild(addr)
100+
}
101+
102+
el.appendChild(addrList)
103+
90104
return el
91105
})
92106
DOM.peerConnectionsList().replaceChildren(...peerList)

‎examples/js-libp2p-example-browser-pubsub/package.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@
1313
},
1414
"dependencies": {
1515
"@chainsafe/libp2p-gossipsub": "^10.1.0",
16-
"@chainsafe/libp2p-noise": "^13.0.0",
17-
"@chainsafe/libp2p-yamux": "^5.0.0",
18-
"@libp2p/webrtc": "^3.2.3",
19-
"@libp2p/websockets": "^7.0.9",
20-
"@multiformats/multiaddr": "^12.0.0",
21-
"libp2p": "^0.46.16",
16+
"@chainsafe/libp2p-noise": "^14.0.0",
17+
"@chainsafe/libp2p-yamux": "^6.0.1",
18+
"@libp2p/circuit-relay-v2": "^1.0.4",
19+
"@libp2p/dcutr": "^1.0.3",
20+
"@libp2p/identify": "^1.0.3",
21+
"@libp2p/mplex": "^10.0.4",
22+
"@libp2p/webrtc": "^4.0.5",
23+
"@libp2p/websockets": "^8.0.4",
24+
"@multiformats/multiaddr": "^12.1.11",
25+
"libp2p": "^1.0.5",
2226
"vite": "^4.2.1"
2327
},
2428
"devDependencies": {

‎examples/js-libp2p-example-browser-pubsub/relay.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
import { noise } from '@chainsafe/libp2p-noise'
44
import { yamux } from '@chainsafe/libp2p-yamux'
5+
import { circuitRelayServer } from '@libp2p/circuit-relay-v2'
6+
import { identify } from '@libp2p/identify'
7+
import { mplex } from '@libp2p/mplex'
58
import { webSockets } from '@libp2p/websockets'
69
import * as filters from '@libp2p/websockets/filters'
710
import { createLibp2p } from 'libp2p'
8-
import { circuitRelayServer } from 'libp2p/circuit-relay'
9-
import { identifyService } from 'libp2p/identify'
1011

1112
const server = await createLibp2p({
1213
addresses: {
@@ -18,10 +19,17 @@ const server = await createLibp2p({
1819
})
1920
],
2021
connectionEncryption: [noise()],
21-
streamMuxers: [yamux()],
22+
streamMuxers: [yamux(), mplex()],
2223
services: {
23-
identify: identifyService(),
24-
relay: circuitRelayServer()
24+
identify: identify(),
25+
relay: circuitRelayServer({
26+
reservations: {
27+
maxReservations: Infinity
28+
}
29+
})
30+
},
31+
connectionManager: {
32+
minConnections: 0
2533
}
2634
})
2735

‎examples/js-libp2p-example-browser-pubsub/test/index.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* eslint-disable no-console */
22
import { noise } from '@chainsafe/libp2p-noise'
33
import { yamux } from '@chainsafe/libp2p-yamux'
4+
import { circuitRelayServer } from '@libp2p/circuit-relay-v2'
5+
import { identify } from '@libp2p/identify'
46
import { webSockets } from '@libp2p/websockets'
57
import * as filters from '@libp2p/websockets/filters'
68
import { createLibp2p } from 'libp2p'
7-
import { circuitRelayServer } from 'libp2p/circuit-relay'
8-
import { identifyService } from 'libp2p/identify'
99
import { setup, expect } from 'test-ipfs-example/browser'
1010

1111
// Setup
@@ -39,7 +39,7 @@ async function spawnRelay () {
3939
connectionEncryption: [noise()],
4040
streamMuxers: [yamux()],
4141
services: {
42-
identify: identifyService(),
42+
identify: identify(),
4343
relay: circuitRelayServer()
4444
}
4545
})

‎examples/js-libp2p-example-chat/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
## Setup
1818

19-
1. Install example depenedencies
19+
1. Install example dependencies
2020
```console
2121
$ npm install
2222
```

‎examples/js-libp2p-example-chat/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
"test": "test-node-example test/*"
1717
},
1818
"dependencies": {
19-
"@chainsafe/libp2p-noise": "^13.0.0",
20-
"@chainsafe/libp2p-yamux": "^5.0.0",
21-
"@libp2p/peer-id-factory": "^3.0.0",
22-
"@libp2p/tcp": "^8.0.0",
23-
"@libp2p/websockets": "^7.0.0",
24-
"@multiformats/multiaddr": "^12.1.5",
19+
"@chainsafe/libp2p-noise": "^14.0.0",
20+
"@chainsafe/libp2p-yamux": "^6.0.1",
21+
"@libp2p/peer-id-factory": "^4.0.0",
22+
"@libp2p/tcp": "^9.0.4",
23+
"@libp2p/websockets": "^8.0.4",
24+
"@multiformats/multiaddr": "^12.1.11",
2525
"@nodeutils/defaults-deep": "^1.1.0",
2626
"it-length-prefixed": "^9.0.1",
2727
"it-map": "^3.0.3",
2828
"it-pipe": "^3.0.1",
29-
"libp2p": "^0.46.16",
29+
"libp2p": "^1.0.5",
3030
"p-defer": "^4.0.0",
3131
"uint8arrays": "^4.0.6"
3232
},

‎examples/js-libp2p-example-circuit-relay/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ It can be configured as follows:
4141
```js
4242
import { noise } from '@chainsafe/libp2p-noise'
4343
import { yamux } from '@chainsafe/libp2p-yamux'
44+
import { circuitRelayServer } from '@libp2p/circuit-relay-v2'
45+
import { identify } from '@libp2p/identify'
4446
import { webSockets } from '@libp2p/websockets'
4547
import { createLibp2p } from 'libp2p'
46-
import { circuitRelayServer } from 'libp2p/circuit-relay'
47-
import { identifyService } from 'libp2p/identify'
4848

4949
const node = await createLibp2p({
5050
addresses: {
@@ -62,7 +62,7 @@ const node = await createLibp2p({
6262
yamux()
6363
],
6464
services: {
65-
identify: identifyService(),
65+
identify: identify(),
6666
relay: circuitRelayServer()
6767
}
6868
})
@@ -98,11 +98,11 @@ see the following:
9898
```js
9999
import { noise } from '@chainsafe/libp2p-noise'
100100
import { yamux } from '@chainsafe/libp2p-yamux'
101+
import { circuitRelayTransport } from '@libp2p/circuit-relay-v2'
102+
import { identify } from '@libp2p/identify'
101103
import { webSockets } from '@libp2p/websockets'
102104
import { multiaddr } from '@multiformats/multiaddr'
103105
import { createLibp2p } from 'libp2p'
104-
import { circuitRelayTransport } from 'libp2p/circuit-relay'
105-
import { identifyService } from 'libp2p/identify'
106106

107107
const relayAddr = process.argv[2]
108108
if (!relayAddr) {
@@ -123,7 +123,7 @@ const node = await createLibp2p({
123123
yamux()
124124
],
125125
services: {
126-
identify: identifyService()
126+
identify: identify()
127127
}
128128
})
129129

‎examples/js-libp2p-example-circuit-relay/dialer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import { noise } from '@chainsafe/libp2p-noise'
44
import { yamux } from '@chainsafe/libp2p-yamux'
5+
import { circuitRelayTransport } from '@libp2p/circuit-relay-v2'
6+
import { identify } from '@libp2p/identify'
57
import { webSockets } from '@libp2p/websockets'
68
import { multiaddr } from '@multiformats/multiaddr'
79
import { createLibp2p } from 'libp2p'
8-
import { circuitRelayTransport } from 'libp2p/circuit-relay'
9-
import { identifyService } from 'libp2p/identify'
1010

1111
async function main () {
1212
const autoRelayNodeAddr = process.argv[2]
@@ -26,7 +26,7 @@ async function main () {
2626
yamux()
2727
],
2828
services: {
29-
identify: identifyService()
29+
identify: identify()
3030
}
3131
})
3232

‎examples/js-libp2p-example-circuit-relay/listener.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import { noise } from '@chainsafe/libp2p-noise'
44
import { yamux } from '@chainsafe/libp2p-yamux'
5+
import { circuitRelayTransport } from '@libp2p/circuit-relay-v2'
6+
import { identify } from '@libp2p/identify'
57
import { webSockets } from '@libp2p/websockets'
68
import { multiaddr } from '@multiformats/multiaddr'
79
import { createLibp2p } from 'libp2p'
8-
import { circuitRelayTransport } from 'libp2p/circuit-relay'
9-
import { identifyService } from 'libp2p/identify'
1010

1111
async function main () {
1212
const relayAddr = process.argv[2]
@@ -28,7 +28,7 @@ async function main () {
2828
yamux()
2929
],
3030
services: {
31-
identify: identifyService()
31+
identify: identify()
3232
}
3333
})
3434

0 commit comments

Comments
 (0)