cmd/swarm, p2p, swarm: Enable ENR in binary/execadapter #19309
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zelig
approved these changes
Mar 21, 2019
nonsense
referenced
this pull request
in ethersphere/swarm
May 8, 2019
* cmd/swarm, p2p, swarm: Enable ENR in binary/execadapter * cmd/p2p/swarm: Remove comments + config.Enode nomarshal * p2p/simulations: Remove superfluous error check * p2p/simulation: Move init enode comment * swarm/api: Check error in config test * swarm, p2p/simulations, cmd/swarm: Use nodekey in binary record sign * cmd/swarm: Make nodekey available for swarm api config
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains some preliminary changes to allow for using ENR to transmit the swarm overlay address between peers.
Currently, ENR is not being sent over the p2p handshake. The necessary changes for this to happen is pending an EIP submission (and approval, and implementation). This is described in this PR by @fjl which incidentally also contains a hack by him that provides a functional demonstration on how ENR record will be available through
PeerInfoand on thep2p.Peerobject:#19220
In the meantime, the aim is to include the maximum amount of changes here that can be made towards the goal without relying on the implementation of the EIP. Some of the changes are cherry-picked from an experimental branch https://github.com/ethersphere/go-ethereum/tree/enr-bzz-poc building on the in the above mentioned PR.
In the experimental branch all handshake related code has been removed, and includes a temporary POC test
swarm/network/simulation/protocol_new_test.go:TestENRthat demonstrates a successfulWaitTillHealthy()only using ENR.My proposed steps towards the basic but sound transition to handshake-free Swarm are:
BEFORE EIP
Preliminary changes in swarm/network and embed ENR in simulatioñ(done)AFTER EIP
swarm/networkswarm/network:BzzAddrswarm/network:BzzPeerandswarm/network:Peerp2p/protocolsp2p/protocolstoswarmpackage