From 012d8cff6783d2b85dc074148fe19f382a2457ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 11:06:54 +0000 Subject: [PATCH 1/4] deps: bump @libp2p/interface-peer-store from 1.2.9 to 2.0.0 Bumps [@libp2p/interface-peer-store](https://github.com/libp2p/js-libp2p-interfaces) from 1.2.9 to 2.0.0. - [Release notes](https://github.com/libp2p/js-libp2p-interfaces/releases) - [Commits](https://github.com/libp2p/js-libp2p-interfaces/compare/@libp2p/interface-peer-store-v1.2.9...@libp2p/interface-peer-store-v2.0.0) --- updated-dependencies: - dependency-name: "@libp2p/interface-peer-store" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/libp2p-daemon-client/package.json | 2 +- packages/libp2p-daemon-server/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libp2p-daemon-client/package.json b/packages/libp2p-daemon-client/package.json index 6cf218b1..0d2b5679 100644 --- a/packages/libp2p-daemon-client/package.json +++ b/packages/libp2p-daemon-client/package.json @@ -152,7 +152,7 @@ "@libp2p/daemon-server": "^5.0.0", "@libp2p/interface-dht": "^2.0.0", "@libp2p/interface-mocks": "^10.0.3", - "@libp2p/interface-peer-store": "^1.0.0", + "@libp2p/interface-peer-store": "^2.0.0", "@libp2p/interface-pubsub": "^4.0.0", "aegir": "^38.1.6", "it-all": "^3.0.1", diff --git a/packages/libp2p-daemon-server/package.json b/packages/libp2p-daemon-server/package.json index 54b585d2..38139470 100644 --- a/packages/libp2p-daemon-server/package.json +++ b/packages/libp2p-daemon-server/package.json @@ -142,7 +142,7 @@ "@libp2p/interface-connection": "^5.0.1", "@libp2p/interface-dht": "^2.0.0", "@libp2p/interface-peer-id": "^2.0.0", - "@libp2p/interface-peer-store": "^1.2.8", + "@libp2p/interface-peer-store": "^2.0.0", "@libp2p/interface-pubsub": "^4.0.0", "@libp2p/interface-registrar": "^2.0.1", "@libp2p/interface-transport": "^3.0.0", From e67959244df3e3b9cc925b3baf717fc0b08d8cc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 11:10:36 +0000 Subject: [PATCH 2/4] deps: bump @libp2p/interface-transport from 3.0.0 to 4.0.0 Bumps [@libp2p/interface-transport](https://github.com/libp2p/js-libp2p-interfaces) from 3.0.0 to 4.0.0. - [Release notes](https://github.com/libp2p/js-libp2p-interfaces/releases) - [Commits](https://github.com/libp2p/js-libp2p-interfaces/compare/@libp2p/interface-transport-v3.0.0...@libp2p/interface-transport-v4.0.0) --- updated-dependencies: - dependency-name: "@libp2p/interface-transport" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/libp2p-daemon-client/package.json | 2 +- packages/libp2p-daemon-protocol/package.json | 2 +- packages/libp2p-daemon-server/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libp2p-daemon-client/package.json b/packages/libp2p-daemon-client/package.json index 6cf218b1..9a0d3200 100644 --- a/packages/libp2p-daemon-client/package.json +++ b/packages/libp2p-daemon-client/package.json @@ -138,7 +138,7 @@ "@libp2p/interface-connection": "^5.0.1", "@libp2p/interface-peer-id": "^2.0.0", "@libp2p/interface-peer-info": "^1.0.1", - "@libp2p/interface-transport": "^3.0.0", + "@libp2p/interface-transport": "^4.0.0", "@libp2p/interfaces": "^3.2.0", "@libp2p/logger": "^2.0.0", "@libp2p/peer-id": "^2.0.0", diff --git a/packages/libp2p-daemon-protocol/package.json b/packages/libp2p-daemon-protocol/package.json index 93aa2cda..27fe0c45 100644 --- a/packages/libp2p-daemon-protocol/package.json +++ b/packages/libp2p-daemon-protocol/package.json @@ -157,7 +157,7 @@ "release": "aegir release" }, "dependencies": { - "@libp2p/interface-transport": "^3.0.0", + "@libp2p/interface-transport": "^4.0.0", "it-handshake": "^4.0.0", "protons-runtime": "^5.0.0", "uint8arraylist": "^2.3.2" diff --git a/packages/libp2p-daemon-server/package.json b/packages/libp2p-daemon-server/package.json index 54b585d2..d0465b79 100644 --- a/packages/libp2p-daemon-server/package.json +++ b/packages/libp2p-daemon-server/package.json @@ -145,7 +145,7 @@ "@libp2p/interface-peer-store": "^1.2.8", "@libp2p/interface-pubsub": "^4.0.0", "@libp2p/interface-registrar": "^2.0.1", - "@libp2p/interface-transport": "^3.0.0", + "@libp2p/interface-transport": "^4.0.0", "@libp2p/interfaces": "^3.2.0", "@libp2p/logger": "^2.0.0", "@libp2p/peer-id": "^2.0.0", From d749d6fc1e1a3e8a5abd0eb6abfef3fd50a72f3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 11:21:30 +0000 Subject: [PATCH 3/4] deps(dev): bump @libp2p/interface-mocks from 10.0.3 to 11.0.0 Bumps [@libp2p/interface-mocks](https://github.com/libp2p/js-libp2p-interfaces) from 10.0.3 to 11.0.0. - [Release notes](https://github.com/libp2p/js-libp2p-interfaces/releases) - [Commits](https://github.com/libp2p/js-libp2p-interfaces/compare/@libp2p/interface-mocks-v10.0.3...@libp2p/interface-mocks-v11.0.0) --- updated-dependencies: - dependency-name: "@libp2p/interface-mocks" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/libp2p-daemon-client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libp2p-daemon-client/package.json b/packages/libp2p-daemon-client/package.json index 6cf218b1..b584a5d2 100644 --- a/packages/libp2p-daemon-client/package.json +++ b/packages/libp2p-daemon-client/package.json @@ -151,7 +151,7 @@ "devDependencies": { "@libp2p/daemon-server": "^5.0.0", "@libp2p/interface-dht": "^2.0.0", - "@libp2p/interface-mocks": "^10.0.3", + "@libp2p/interface-mocks": "^11.0.0", "@libp2p/interface-peer-store": "^1.0.0", "@libp2p/interface-pubsub": "^4.0.0", "aegir": "^38.1.6", From e77edd0ad95d617fa67276610e7f922e2b746354 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 24 Apr 2023 18:54:45 +0100 Subject: [PATCH 4/4] chore: update implementation --- packages/libp2p-daemon-client/package.json | 2 +- packages/libp2p-daemon-client/test/index.spec.ts | 3 +-- packages/libp2p-daemon-client/test/stream.spec.ts | 3 +-- packages/libp2p-daemon-server/package.json | 2 +- packages/libp2p-daemon-server/src/index.ts | 4 +++- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/libp2p-daemon-client/package.json b/packages/libp2p-daemon-client/package.json index 13a2a5f7..79e1d2cd 100644 --- a/packages/libp2p-daemon-client/package.json +++ b/packages/libp2p-daemon-client/package.json @@ -142,7 +142,7 @@ "@libp2p/interfaces": "^3.2.0", "@libp2p/logger": "^2.0.0", "@libp2p/peer-id": "^2.0.0", - "@libp2p/tcp": "^7.0.0", + "@libp2p/tcp": "^7.0.1", "@multiformats/multiaddr": "^12.0.0", "it-stream-types": "^2.0.1", "multiformats": "^11.0.0", diff --git a/packages/libp2p-daemon-client/test/index.spec.ts b/packages/libp2p-daemon-client/test/index.spec.ts index 1b7fca4a..2449af44 100644 --- a/packages/libp2p-daemon-client/test/index.spec.ts +++ b/packages/libp2p-daemon-client/test/index.spec.ts @@ -9,7 +9,7 @@ import { StubbedInstance, stubInterface } from 'sinon-ts' import { isPeerId } from '@libp2p/interface-peer-id' import { peerIdFromString } from '@libp2p/peer-id' import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-mocks' -import type { PeerStore, AddressBook } from '@libp2p/interface-peer-store' +import type { PeerStore } from '@libp2p/interface-peer-store' const defaultMultiaddr = multiaddr('/ip4/0.0.0.0/tcp/0') @@ -23,7 +23,6 @@ describe('daemon client', function () { beforeEach(async function () { libp2p = stubInterface() libp2p.peerStore = stubInterface() - libp2p.peerStore.addressBook = stubInterface() server = createServer(defaultMultiaddr, libp2p) diff --git a/packages/libp2p-daemon-client/test/stream.spec.ts b/packages/libp2p-daemon-client/test/stream.spec.ts index 6c0991ac..5683513a 100644 --- a/packages/libp2p-daemon-client/test/stream.spec.ts +++ b/packages/libp2p-daemon-client/test/stream.spec.ts @@ -8,7 +8,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { StubbedInstance, stubInterface } from 'sinon-ts' import { peerIdFromString } from '@libp2p/peer-id' import { mockRegistrar, connectionPair } from '@libp2p/interface-mocks' -import type { PeerStore, AddressBook } from '@libp2p/interface-peer-store' +import type { PeerStore } from '@libp2p/interface-peer-store' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import all from 'it-all' @@ -26,7 +26,6 @@ describe('daemon stream client', function () { beforeEach(async function () { libp2p = stubInterface() libp2p.peerStore = stubInterface() - libp2p.peerStore.addressBook = stubInterface() server = createServer(defaultMultiaddr, libp2p) diff --git a/packages/libp2p-daemon-server/package.json b/packages/libp2p-daemon-server/package.json index 7472e1d6..d2434d23 100644 --- a/packages/libp2p-daemon-server/package.json +++ b/packages/libp2p-daemon-server/package.json @@ -149,7 +149,7 @@ "@libp2p/interfaces": "^3.2.0", "@libp2p/logger": "^2.0.0", "@libp2p/peer-id": "^2.0.0", - "@libp2p/tcp": "^7.0.0", + "@libp2p/tcp": "^7.0.1", "@multiformats/multiaddr": "^12.0.0", "it-drain": "^3.0.1", "it-length-prefixed": "^9.0.0", diff --git a/packages/libp2p-daemon-server/src/index.ts b/packages/libp2p-daemon-server/src/index.ts index c9810b25..5393fe04 100644 --- a/packages/libp2p-daemon-server/src/index.ts +++ b/packages/libp2p-daemon-server/src/index.ts @@ -104,7 +104,9 @@ export class Server implements Libp2pServer { const addrs = request.connect.addrs.map((a) => multiaddr(a)) const peerId = peerIdFromBytes(peer) - await this.libp2p.peerStore.addressBook.set(peerId, addrs) + await this.libp2p.peerStore.merge(peerId, { + multiaddrs: addrs + }) return await this.libp2p.dial(peerId) }