From e66a6517bdb395874c3d858a61f66e9135947b31 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Thu, 22 Apr 2021 21:33:06 +0200 Subject: [PATCH 1/2] fix: interface core test swarm peers with webrtc does not dial the correct address --- packages/interface-ipfs-core/src/swarm/peers.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/interface-ipfs-core/src/swarm/peers.js b/packages/interface-ipfs-core/src/swarm/peers.js index 1d4c5197a9..c26f21d68a 100644 --- a/packages/interface-ipfs-core/src/swarm/peers.js +++ b/packages/interface-ipfs-core/src/swarm/peers.js @@ -126,10 +126,7 @@ module.exports = (common, options) => { } })).api - // TODO: the webrtc-star transport only keeps the last listened on address around - // so the browser has to use 1 as the array index - // await nodeA.swarm.connect(nodeB.peerId.addresses[0]) - await nodeA.swarm.connect(nodeB.peerId.addresses[isBrowser ? 1 : 0]) + await nodeB.swarm.connect(nodeA.peerId.addresses[0]) await delay(1000) const peersA = await nodeA.swarm.peers() From 0f1877b4b1218d731b801e017823cb10d6199901 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Fri, 23 Apr 2021 14:00:58 +0200 Subject: [PATCH 2/2] chore: update webrtc star --- packages/ipfs-core/package.json | 2 +- packages/ipfs-daemon/package.json | 2 +- packages/ipfs/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index 48f8743167..fd49716f4c 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -105,7 +105,7 @@ "libp2p-noise": "^2.0.5", "libp2p-record": "^0.10.3", "libp2p-tcp": "^0.15.4", - "libp2p-webrtc-star": "^0.22.0", + "libp2p-webrtc-star": "^0.22.2", "libp2p-websockets": "^0.15.6", "mafmt": "^9.0.0", "merge-options": "^3.0.4", diff --git a/packages/ipfs-daemon/package.json b/packages/ipfs-daemon/package.json index 438f6986a3..351fa31abd 100644 --- a/packages/ipfs-daemon/package.json +++ b/packages/ipfs-daemon/package.json @@ -43,7 +43,7 @@ "libp2p": "^0.31.0-rc.6", "libp2p-delegated-content-routing": "^0.10.0", "libp2p-delegated-peer-routing": "^0.9.0", - "libp2p-webrtc-star": "^0.22.0", + "libp2p-webrtc-star": "^0.22.2", "multiaddr": "^9.0.1" }, "devDependencies": { diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index c520761d8f..69ae0b8dd5 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -60,7 +60,7 @@ "ipfs-utils": "^6.0.4", "ipfsd-ctl": "^8.0.1", "iso-url": "^1.0.0", - "libp2p-webrtc-star": "^0.22.0", + "libp2p-webrtc-star": "^0.22.2", "merge-options": "^3.0.4", "mock-ipfs-pinning-service": "^0.1.2", "rimraf": "^3.0.2",