diff options
| author | lash <nolash@users.noreply.github.com> | 2019-03-22 12:55:47 +0800 |
|---|---|---|
| committer | Viktor Trón <viktor.tron@gmail.com> | 2019-03-22 12:55:47 +0800 |
| commit | 09924cbcaab5106951fb67648315131bb4024ac5 (patch) | |
| tree | efeb2e96b97b6537ce5680a26934176567da00b3 /swarm/network | |
| parent | 358535188852bd9d8e351ccbb0d1fa608284a77b (diff) | |
| download | go-tangerine-09924cbcaab5106951fb67648315131bb4024ac5.tar go-tangerine-09924cbcaab5106951fb67648315131bb4024ac5.tar.gz go-tangerine-09924cbcaab5106951fb67648315131bb4024ac5.tar.bz2 go-tangerine-09924cbcaab5106951fb67648315131bb4024ac5.tar.lz go-tangerine-09924cbcaab5106951fb67648315131bb4024ac5.tar.xz go-tangerine-09924cbcaab5106951fb67648315131bb4024ac5.tar.zst go-tangerine-09924cbcaab5106951fb67648315131bb4024ac5.zip | |
cmd/swarm, p2p, swarm: Enable ENR in binary/execadapter (#19309)
* 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
Diffstat (limited to 'swarm/network')
| -rw-r--r-- | swarm/network/network.go | 35 | ||||
| -rw-r--r-- | swarm/network/simulation/node.go | 18 |
2 files changed, 44 insertions, 9 deletions
diff --git a/swarm/network/network.go b/swarm/network/network.go index 1f9108941..c5c7e9b2f 100644 --- a/swarm/network/network.go +++ b/swarm/network/network.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/ethereum/go-ethereum/p2p/enr" ) // BzzAddr implements the PeerAddr interface @@ -68,3 +69,37 @@ func PrivateKeyToBzzKey(prvKey *ecdsa.PrivateKey) []byte { pubkeyBytes := crypto.FromECDSAPub(&prvKey.PublicKey) return crypto.Keccak256Hash(pubkeyBytes).Bytes() } + +type EnodeParams struct { + PrivateKey *ecdsa.PrivateKey + EnodeKey *ecdsa.PrivateKey + Lightnode bool + Bootnode bool +} + +func NewEnodeRecord(params *EnodeParams) (*enr.Record, error) { + + if params.PrivateKey == nil { + return nil, fmt.Errorf("all param private keys must be defined") + } + + bzzkeybytes := PrivateKeyToBzzKey(params.PrivateKey) + + var record enr.Record + record.Set(NewENRAddrEntry(bzzkeybytes)) + record.Set(ENRLightNodeEntry(params.Lightnode)) + record.Set(ENRBootNodeEntry(params.Bootnode)) + return &record, nil +} + +func NewEnode(params *EnodeParams) (*enode.Node, error) { + record, err := NewEnodeRecord(params) + if err != nil { + return nil, err + } + err = enode.SignV4(record, params.EnodeKey) + if err != nil { + return nil, fmt.Errorf("ENR create fail: %v", err) + } + return enode.New(enode.V4ID{}, record) +} diff --git a/swarm/network/simulation/node.go b/swarm/network/simulation/node.go index 1ab9ddfd0..2d618a29d 100644 --- a/swarm/network/simulation/node.go +++ b/swarm/network/simulation/node.go @@ -102,16 +102,16 @@ func (s *Simulation) AddNode(opts ...AddNodeOption) (id enode.ID, err error) { // most importantly the bzz overlay address // // for now we have no way of setting bootnodes or lightnodes in sims - // so we just set them as false + // so we just let them be set to false // they should perhaps be possible to override them with AddNodeOption - bzzKey := network.PrivateKeyToBzzKey(conf.PrivateKey) - bzzAddr := network.NewENRAddrEntry(bzzKey) - - var lightnode network.ENRLightNodeEntry - var bootnode network.ENRBootNodeEntry - conf.Record.Set(bzzAddr) - conf.Record.Set(&lightnode) - conf.Record.Set(&bootnode) + enodeParams := &network.EnodeParams{ + PrivateKey: conf.PrivateKey, + } + record, err := network.NewEnodeRecord(enodeParams) + if err != nil { + return enode.ID{}, err + } + conf.Record = *record // Add the bzz address to the node config node, err := s.Net.NewNodeWithConfig(conf) |