From eca24f7cf66ea59c8ba1b52295e6d1c19d8efeb9 Mon Sep 17 00:00:00 2001 From: Joel Gustafson Date: Fri, 21 Jun 2024 17:55:59 -0400 Subject: [PATCH] packages/gossiplog: change push protocol from /canvas/sync/v1/${topic}/push to /canvas/push/v1/${topic} --- packages/gossiplog/src/service/index.ts | 2 +- packages/relay-server/src/index.ts | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/gossiplog/src/service/index.ts b/packages/gossiplog/src/service/index.ts index 307f423fb..c423052b3 100644 --- a/packages/gossiplog/src/service/index.ts +++ b/packages/gossiplog/src/service/index.ts @@ -47,7 +47,7 @@ import { equals } from "uint8arrays" import { SignedMessage } from "../SignedMessage.js" export const getSyncProtocol = (topic: string) => `/canvas/sync/v1/${topic}` -export const getPushProtocol = (topic: string) => `/canvas/sync/v1/${topic}/push` +export const getPushProtocol = (topic: string) => `/canvas/push/v1/${topic}` export type GossipLogServiceComponents = { peerId: PeerId diff --git a/packages/relay-server/src/index.ts b/packages/relay-server/src/index.ts index 3d3ba4fec..6bf2c21f9 100644 --- a/packages/relay-server/src/index.ts +++ b/packages/relay-server/src/index.ts @@ -86,7 +86,7 @@ getLibp2p().then(async (libp2p) => { const [_, topic] = key.split("/") const results: { id: Uint8Array - addresses: { isCertified: boolean; multiaddr: Uint8Array }[] + addresses: Uint8Array[] protocols: string[] peerRecordEnvelope: Uint8Array | null }[] = [] @@ -94,14 +94,11 @@ getLibp2p().then(async (libp2p) => { for (const peerId of topicIndex.get(topic) ?? []) { const id = peerIdFromString(peerId) const peer = await libp2p.peerStore.get(id) - const addresses = peer.addresses.map(({ isCertified, multiaddr }) => ({ - isCertified, - multiaddr: multiaddr.bytes, - })) + const addresses = peer.addresses.map(({ multiaddr }) => multiaddr.bytes) results.push({ id: id.toBytes(), - addresses, + addresses: addresses, protocols: peer.protocols, peerRecordEnvelope: peer.peerRecordEnvelope ?? null, })