diff options
| author | Felix Lange <fjl@twurst.com> | 2016-04-04 05:08:09 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-04-04 05:10:11 +0800 |
| commit | 659c0cb9e878dc5e2af51e163c911337206885e5 (patch) | |
| tree | 150731ac69ea788e8a82eef02eeafe68acaa2ce6 /p2p | |
| parent | 96c7c39ae4a031a508b0470ff2b1a95f0f3f9e51 (diff) | |
| download | dexon-659c0cb9e878dc5e2af51e163c911337206885e5.tar dexon-659c0cb9e878dc5e2af51e163c911337206885e5.tar.gz dexon-659c0cb9e878dc5e2af51e163c911337206885e5.tar.bz2 dexon-659c0cb9e878dc5e2af51e163c911337206885e5.tar.lz dexon-659c0cb9e878dc5e2af51e163c911337206885e5.tar.xz dexon-659c0cb9e878dc5e2af51e163c911337206885e5.tar.zst dexon-659c0cb9e878dc5e2af51e163c911337206885e5.zip | |
p2p: enable EIP-8 handshake sending
With the Ethereum Homestead fork is now behind us, we can
assume that everyone runs an EIP-8 capable client.
Diffstat (limited to 'p2p')
| -rw-r--r-- | p2p/rlpx.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/p2p/rlpx.go b/p2p/rlpx.go index ddfafe9a4..2a9bdc121 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -31,7 +31,6 @@ import ( "io" mrand "math/rand" "net" - "os" "sync" "time" @@ -262,8 +261,6 @@ func (h *encHandshake) staticSharedSecret(prv *ecdsa.PrivateKey) ([]byte, error) return ecies.ImportECDSA(prv).GenerateShared(h.remotePub, sskLen, sskLen) } -var configSendEIP = os.Getenv("RLPX_EIP8") != "" - // initiatorEncHandshake negotiates a session token on conn. // it should be called on the dialing side of the connection. // @@ -274,12 +271,7 @@ func initiatorEncHandshake(conn io.ReadWriter, prv *ecdsa.PrivateKey, remoteID d if err != nil { return s, err } - var authPacket []byte - if configSendEIP { - authPacket, err = sealEIP8(authMsg, h) - } else { - authPacket, err = authMsg.sealPlain(h) - } + authPacket, err := sealEIP8(authMsg, h) if err != nil { return s, err } |