Skip to content

refactor(libp2p): drop asMultiaddr, use composite sort #3492

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

Merged
tabcat merged 8 commits into from
May 7, 2026
Merged

refactor(libp2p): drop asMultiaddr, use composite sort #3492

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e537433
deps(utils): add @multiformats/multiaddr-matcher
tabcat May 4, 2026
5fa1bc0
feat(utils): add multiaddr sort comparators
tabcat May 4, 2026
71a4b3d
refactor(libp2p): use multiaddr sorters from @libp2p/utils
tabcat May 4, 2026
31a0b4b
test(utils): unit tests for multiaddr sort comparators
tabcat May 4, 2026
c83d22b
Merge branch 'main' into feat/address-sorter-utils
tabcat May 5, 2026
423752c
feat(utils): add defaultMultiaddrSorter
tabcat May 5, 2026
4b52925
refactor(libp2p): drop asMultiaddr, use composite sort
tabcat May 7, 2026
0157fec
Merge remote-tracking branch 'origin/main' into refactor/address-sort…
tabcat May 7, 2026
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
17 changes: 7 additions & 10 deletions packages/libp2p/src/connection-manager/address-sorter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ import {
circuitRelayAddressesLast
} from '@libp2p/utils'
import type { Address } from '@libp2p/interface'
import type { Multiaddr } from '@multiformats/multiaddr'

const asMultiaddr = (fn: (a: Multiaddr, b: Multiaddr) => -1 | 0 | 1) =>
(a: Address, b: Address): -1 | 0 | 1 => fn(a.multiaddr, b.multiaddr)

/**
* Compare function for array.sort() that moves certified addresses to the start
Expand All @@ -25,10 +21,11 @@ export function certifiedAddressesFirst (a: Address, b: Address): -1 | 0 | 1 {
}

export function defaultAddressSorter (addresses: Address[]): Address[] {
return addresses
.sort(asMultiaddr(reliableTransportsFirst))
.sort(certifiedAddressesFirst)
.sort(asMultiaddr(circuitRelayAddressesLast))
.sort(asMultiaddr(publicAddressesFirst))
.sort(asMultiaddr(loopbackAddressLast))
return addresses.sort((a, b) =>
loopbackAddressLast(a.multiaddr, b.multiaddr) ||
publicAddressesFirst(a.multiaddr, b.multiaddr) ||
circuitRelayAddressesLast(a.multiaddr, b.multiaddr) ||
certifiedAddressesFirst(a, b) ||
reliableTransportsFirst(a.multiaddr, b.multiaddr)
)
}
Loading