Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix PeerStore missing remote endpoints of established connection. #1226

Merged
merged 7 commits into from
Nov 27, 2024
Merged

Fix PeerStore missing remote endpoints of established connection. #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a59cd37
Fix observed address is not part of PeerStore[AddressBook].
cheatfate Nov 25, 2024
30658a0
Form full P2P address.
cheatfate Nov 25, 2024
4248228
Fix errors.
cheatfate Nov 25, 2024
a70d65d
Restore simple approach.
cheatfate Nov 25, 2024
a688510
Add `LastSeenBook` to PeerStore.
cheatfate Nov 26, 2024
ff7e490
Remove unneeded import.
cheatfate Nov 26, 2024
dd6eadd
Do not use switch2 in tests because it has limited capacity == 0.
cheatfate Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions libp2p/peerstore.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ type
KeyBook* {.public.} = ref object of PeerBook[PublicKey]

AgentBook* {.public.} = ref object of PeerBook[string]
LastSeenBook* {.public.} = ref object of PeerBook[Opt[MultiAddress]]
ProtoVersionBook* {.public.} = ref object of PeerBook[string]
SPRBook* {.public.} = ref object of PeerBook[Envelope]

Expand Down Expand Up @@ -145,10 +146,16 @@ proc del*(peerStore: PeerStore, peerId: PeerId) {.public.} =
for _, book in peerStore.books:
book.deletor(peerId)

proc updatePeerInfo*(peerStore: PeerStore, info: IdentifyInfo) =
if info.addrs.len > 0:
proc updatePeerInfo*(
peerStore: PeerStore,
info: IdentifyInfo,
observedAddr: Opt[MultiAddress] = Opt.none(MultiAddress),
) =
if len(info.addrs) > 0:
peerStore[AddressBook][info.peerId] = info.addrs

peerStore[LastSeenBook][info.peerId] = observedAddr

info.pubkey.withValue(pubkey):
peerStore[KeyBook][info.peerId] = pubkey

Expand Down Expand Up @@ -200,7 +207,7 @@ proc identify*(peerStore: PeerStore, muxer: Muxer) {.async.} =
knownAgent = shortAgent
muxer.connection.setShortAgent(knownAgent)

peerStore.updatePeerInfo(info)
peerStore.updatePeerInfo(info, stream.observedAddr)
finally:
await stream.closeWithEOF()

Expand Down
2 changes: 2 additions & 0 deletions tests/testswitch.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,8 @@ suite "Switch":
switch1.peerStore[AddressBook][switch2.peerInfo.peerId] == switch2.peerInfo.addrs
switch1.peerStore[ProtoBook][switch2.peerInfo.peerId] == switch2.peerInfo.protocols

switch1.peerStore[LastSeenBook][switch2.peerInfo.peerId].isSome()

switch1.peerInfo.peerId notin switch2.peerStore[AddressBook]
switch1.peerInfo.peerId notin switch2.peerStore[ProtoBook]

Expand Down
Loading