[Merged by Bors] - p2p: enable dht based disovery #4736

dshulyak · 2023-07-21T09:04:50Z

this makes use of "native" libp2p discovery by enabling kad dht, peers exchange (adjusting score) and relay servers. the primary reason is to benefit from hole punching and multiple transports support (quic, webrtc).

in general peers will be obtained by one of the following methods:

getting more peers from dht. in order for peer to be added to public dht it needs to have dialable address and advertise it to the neighbors. this is pretty much analogous to our current setup, but it also supports multiple addresses so we can enable quic in next change. as it is udp based it may work on nat/firewall devices where tcp was restricted.
peer exchange (as a part of gossipsub) will advertise peers to other nodes as part of PRUNE message, once other node sees relayed address it will initiate holepunch. if peer is not publicly dialable it will request relay reservation from the bootnodes. once received this reservation will be communicated to bootnode as one of the peer addresses.
additionally we will persist peers in p2p/connected.txt every 30minutes, and try to reconnect with them on startup to decrease load on bootnodes/relays.

configuration changes:

p2p-bootnode option needs to be set explicitly on bootnodes in order to start dht in server mode, and adjust gossipsub configuration
p2p-reachability can be either public or private. we have to set public on bootnodes, otherwise autonat might be confused by out setup, beside that it is only useful for testing.
p2p-holepunching will enable relay client and holepunching. enabled by default
p2p-disable-legacy-discovery disables our own discovery. it can be run in parallel, but we will have no reason to keep it if all works as expected
p2p-private-network disables dht filtering by public address, it is mostly useful for testing
relay-server section:
- enable enable relay server, has to be enabled on bootnodes
- reservations number of relay reservations, 512 by default
- ttl reservation ttl, 20 minutes

example of the p2p config section:

"p2p": {
        "listen": "/ip4/0.0.0.0/tcp/5000",
        "p2p-disable-legacy-discovery": true,
        "relay-server": {
            "enable": "true"
        },
        "p2p-reachability": "public",
        "p2p-bootnode": true,
}

dshulyak · 2023-07-21T09:05:19Z

bors try

codecov · 2023-07-21T09:22:09Z

Codecov Report

Merging #4736 (07433d1) into develop (a975106) will decrease coverage by 0.3%.
The diff coverage is 58.4%.

@@            Coverage Diff            @@
##           develop   #4736     +/-   ##
=========================================
- Coverage     77.2%   77.0%   -0.3%     
=========================================
  Files          257     259      +2     
  Lines        28975   29284    +309     
=========================================
+ Hits         22377   22549    +172     
- Misses        5206    5311    +105     
- Partials      1392    1424     +32

Files Changed	Coverage Δ
p2p/host.go	`35.9% <22.6%> (-8.7%)`	⬇️
p2p/pubsub/pubsub.go	`87.5% <25.0%> (-4.7%)`	⬇️
p2p/persist.go	`56.3% <56.3%> (ø)`
p2p/upgrade.go	`68.3% <66.0%> (-2.0%)`	⬇️
p2p/dhtdiscovery/discovery.go	`71.0% <71.0%> (ø)`

... and 1 file with indirect coverage changes

bors · 2023-07-21T09:27:51Z

try

Build failed:

ci-status

dshulyak · 2023-07-21T10:42:28Z

bors try

dshulyak · 2023-07-21T10:58:56Z

spacemeshos/go-spacemesh-dev:8ef576f

bors · 2023-07-21T11:15:01Z

try

Build failed:

systest-status

dshulyak · 2023-07-21T12:04:37Z

bors try

dshulyak · 2023-07-21T12:38:50Z

config for testing

{
    "api": {
        "grpc-public-services": [],
        "grpc-private-services": []
    },
    "p2p": {
        "listen": "/ip4/0.0.0.0/tcp/5000",
        "p2p-disable-legacy-discovery": true,
        "bootnodes": [
            "/dns4/holepunch-101-bootnode-0.spacemesh.network/tcp/5000/p2p/12D3KooWQMAAL9nkgXJgTM2psJLMbWRgZLjAxJozx7dNkKYczs2V",
            "/dns4/holepunch-101-bootnode-1.spacemesh.network/tcp/5000/p2p/12D3KooWF2bhnqsnu2UjxJGZs8KCbzvd91vnud29KaG9rzTNFH78",
            "/dns4/holepunch-101-bootnode-2.spacemesh.network/tcp/5000/p2p/12D3KooWQKosE9LZraMfFPg9QRYyKwxT4ipsar37oT6wRy8WqWos",
            "/dns4/holepunch-101-bootnode-3.spacemesh.network/tcp/5000/p2p/12D3KooWKMQ5j15x2gzfXfX7uisss7uwkPnqJyoHcfyiYfHgSo3F"
        ]
    },
    "genesis": {
        "genesis-time": "2023-07-21T17:00:00.00Z",
        "genesis-extra-data": "holepunch",
        "genesis-accounts": {}
    }
}

bors · 2023-07-21T12:49:29Z

try

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

…shos#4728)"" This reverts commit f87546d.

dshulyak · 2023-07-31T06:43:23Z

bors try

bors · 2023-07-31T07:00:31Z

try

Build failed:

ci-status

countvonzero

general question. when you enable legacy with dht, how do you differentiate the peers discovered via each mechanism?

p2p/dhtdiscovery/discovery.go

p2p/upgrade.go

dshulyak · 2023-07-31T10:03:20Z

general question. when you enable legacy with dht, how do you differentiate the peers discovered via each mechanism?

there is no differentiation, if two discoveries run in parallel each will use its own protocol (new - kad dht, old - peerexchange). if some of the peers don't talk one of the protocols then that discovery will skip that peer

dshulyak · 2023-07-31T10:09:26Z

bors merge

dshulyak · 2023-07-31T11:08:47Z

bors cancel

dshulyak · 2023-07-31T11:08:52Z

bors merge

dshulyak · 2023-07-31T11:31:21Z

bors cancel

dshulyak · 2023-07-31T11:31:25Z

bors merge

this makes use of "native" libp2p discovery by enabling kad dht, peers exchange (adjusting score) and relay servers. the primary reason is to benefit from hole punching and multiple transports support (quic, webrtc). in general peers will be obtained by one of the following methods: - getting more peers from dht. in order for peer to be added to public dht it needs to have dialable address and advertise it to the neighbors. this is pretty much analogous to our current setup, but it also supports multiple addresses so we can enable quic in next change. as it is udp based it may work on nat/firewall devices where tcp was restricted. - peer exchange (as a part of gossipsub) will advertise peers to other nodes as part of PRUNE message, once other node sees relayed address it will initiate holepunch. if peer is not publicly dialable it will request relay reservation from the bootnodes. once received this reservation will be communicated to bootnode as one of the peer addresses. - additionally we will persist peers in p2p/connected.txt every 30minutes, and try to reconnect with them on startup to decrease load on bootnodes/relays. configuration changes: - `p2p-bootnode` option needs to be set explicitly on bootnodes in order to start dht in server mode, and adjust gossipsub configuration - `p2p-reachability` can be either `public` or `private`. we have to set `public` on bootnodes, otherwise autonat might be confused by out setup, beside that it is only useful for testing. - `p2p-holepunching` will enable relay client and holepunching. enabled by default - `p2p-disable-legacy-discovery` disables our own discovery. it can be run in parallel, but we will have no reason to keep it if all works as expected - `p2p-private-network` disables dht filtering by public address, it is mostly useful for testing - `relay-server` section: - `enable` enable relay server, has to be enabled on bootnodes - `reservations` number of relay reservations, 512 by default - `ttl` reservation ttl, 20 minutes example of the p2p config section: ```json "p2p": { "listen": "/ip4/0.0.0.0/tcp/5000", "p2p-disable-legacy-discovery": true, "relay-server": { "enable": "true" }, "p2p-reachability": "public", "p2p-bootnode": true, } ```

bors · 2023-07-31T12:03:50Z

Build failed:

ci-status

dshulyak · 2023-07-31T13:02:13Z

bors merge

countvonzero · 2023-07-31T13:14:59Z

bors merge

this makes use of "native" libp2p discovery by enabling kad dht, peers exchange (adjusting score) and relay servers. the primary reason is to benefit from hole punching and multiple transports support (quic, webrtc). in general peers will be obtained by one of the following methods: - getting more peers from dht. in order for peer to be added to public dht it needs to have dialable address and advertise it to the neighbors. this is pretty much analogous to our current setup, but it also supports multiple addresses so we can enable quic in next change. as it is udp based it may work on nat/firewall devices where tcp was restricted. - peer exchange (as a part of gossipsub) will advertise peers to other nodes as part of PRUNE message, once other node sees relayed address it will initiate holepunch. if peer is not publicly dialable it will request relay reservation from the bootnodes. once received this reservation will be communicated to bootnode as one of the peer addresses. - additionally we will persist peers in p2p/connected.txt every 30minutes, and try to reconnect with them on startup to decrease load on bootnodes/relays. configuration changes: - `p2p-bootnode` option needs to be set explicitly on bootnodes in order to start dht in server mode, and adjust gossipsub configuration - `p2p-reachability` can be either `public` or `private`. we have to set `public` on bootnodes, otherwise autonat might be confused by out setup, beside that it is only useful for testing. - `p2p-holepunching` will enable relay client and holepunching. enabled by default - `p2p-disable-legacy-discovery` disables our own discovery. it can be run in parallel, but we will have no reason to keep it if all works as expected - `p2p-private-network` disables dht filtering by public address, it is mostly useful for testing - `relay-server` section: - `enable` enable relay server, has to be enabled on bootnodes - `reservations` number of relay reservations, 512 by default - `ttl` reservation ttl, 20 minutes example of the p2p config section: ```json "p2p": { "listen": "/ip4/0.0.0.0/tcp/5000", "p2p-disable-legacy-discovery": true, "relay-server": { "enable": "true" }, "p2p-reachability": "public", "p2p-bootnode": true, } ```

bors · 2023-07-31T14:01:57Z

Pull request successfully merged into develop.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

dshulyak added 5 commits July 20, 2023 09:28

basic dht discoveryy

9116abd

integrating

dd5c3f1

command line optss

4a38e73

adjust systest

8279431

sysytest

ab677f3

bors bot added a commit that referenced this pull request Jul 21, 2023

Try #4736:

42aa547

tidy

866c2ab

dshulyak changed the title ~~p2p: enable dht based disovery method~~ p2p: enable dht based disovery Jul 21, 2023

improve discovery

25d7fa8

dshulyak added 7 commits July 21, 2023 11:31

tidyy again

df023d1

forgot how systest flags work

9a9823a

try client

878a997

default bootstrappers

7650c13

nice cancel

3afb63f

ddont apply filters

e7a1d24

debug

c883c1c

bors bot added a commit that referenced this pull request Jul 21, 2023

Try #4736:

8ef576f

bors bot added a commit that referenced this pull request Jul 21, 2023

Try #4736:

7fedd33

dshulyak added 2 commits July 21, 2023 14:36

no need to call connect twice

3c57ba8

Merge branch 'develop' into dht-discovery

92f55ba

dshulyak force-pushed the dht-discovery branch from 8547a2a to 92f55ba Compare July 21, 2023 12:38

added sanity test for discovery

5bd4517

dshulyak marked this pull request as ready for review July 22, 2023 08:33

dshulyak requested review from countvonzero, fasmat and poszu as code owners July 22, 2023 08:34

dshulyak added 4 commits July 22, 2023 10:39

linter

8331894

Revert "Revert "fix flaky test: TestSpacemeshApp_NodeService (spaceme…

acc86f7

…shos#4728)"" This reverts commit f87546d.

Merge branch 'develop' into dht-discovery

3b49b81

bad merge

5ac077f

bors bot added a commit that referenced this pull request Jul 31, 2023

Try #4736:

c3a04f7

countvonzero approved these changes Jul 31, 2023

View reviewed changes

p2p/dhtdiscovery/discovery.go Show resolved Hide resolved

p2p/upgrade.go Outdated Show resolved Hide resolved

review

035a5d9

Merge branch 'develop' into dht-discovery

07433d1

bors bot changed the title ~~p2p: enable dht based disovery~~ [Merged by Bors] - p2p: enable dht based disovery Jul 31, 2023

bors bot closed this Jul 31, 2023

pigmej mentioned this pull request Aug 29, 2023

Change the p2p discovery spacemeshos/pm#251

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Merged by Bors] - p2p: enable dht based disovery #4736

[Merged by Bors] - p2p: enable dht based disovery #4736

dshulyak commented Jul 21, 2023 •

edited

dshulyak commented Jul 21, 2023

codecov bot commented Jul 21, 2023 •

edited

bors bot commented Jul 21, 2023

dshulyak commented Jul 21, 2023

dshulyak commented Jul 21, 2023

bors bot commented Jul 21, 2023

dshulyak commented Jul 21, 2023

dshulyak commented Jul 21, 2023 •

edited

bors bot commented Jul 21, 2023

dshulyak commented Jul 31, 2023

bors bot commented Jul 31, 2023

countvonzero left a comment

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

bors bot commented Jul 31, 2023

dshulyak commented Jul 31, 2023

countvonzero commented Jul 31, 2023

bors bot commented Jul 31, 2023

[Merged by Bors] - p2p: enable dht based disovery #4736

[Merged by Bors] - p2p: enable dht based disovery #4736

Conversation

dshulyak commented Jul 21, 2023 • edited

dshulyak commented Jul 21, 2023

codecov bot commented Jul 21, 2023 • edited

Codecov Report

bors bot commented Jul 21, 2023

try

dshulyak commented Jul 21, 2023

dshulyak commented Jul 21, 2023

bors bot commented Jul 21, 2023

try

dshulyak commented Jul 21, 2023

dshulyak commented Jul 21, 2023 • edited

bors bot commented Jul 21, 2023

try

dshulyak commented Jul 31, 2023

bors bot commented Jul 31, 2023

try

countvonzero left a comment

Choose a reason for hiding this comment

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

dshulyak commented Jul 31, 2023

bors bot commented Jul 31, 2023

dshulyak commented Jul 31, 2023

countvonzero commented Jul 31, 2023

bors bot commented Jul 31, 2023

dshulyak commented Jul 21, 2023 •

edited

codecov bot commented Jul 21, 2023 •

edited

dshulyak commented Jul 21, 2023 •

edited