Geth updates

1.patch

@@ -0,0 +1,199 @@
+From c3f238dd5371961d309350fb0f9d5136c9fc6afa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felf=C3=B6ldi=20Zsolt?= <zsfelfoldi@gmail.com>
+Date: Mon, 5 Feb 2018 14:41:53 +0100
+Subject: [PATCH] les: limit LES peer count and improve peer configuration
+ logic (#16010)
+
+* les: limit number of LES connections
+
+* eth, cmd/utils: light vs max peer configuration logic
+---
+ cmd/utils/flags.go | 26 +++++++++++++++++++++++---
+ eth/backend.go     |  6 +++---
+ eth/config.go      |  2 +-
+ les/backend.go     |  5 ++++-
+ les/handler.go     |  9 ++++++++-
+ les/helper_test.go |  2 +-
+ les/server.go      |  4 +++-
+ 7 files changed, 43 insertions(+), 11 deletions(-)
+
+diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
+index 58bb952439..833cd95dec 100644
+--- a/cmd/utils/flags.go
++++ b/cmd/utils/flags.go
+@@ -179,7 +179,7 @@ var (
+ 	LightPeersFlag = cli.IntFlag{
+ 		Name:  "lightpeers",
+ 		Usage: "Maximum number of LES client peers",
+-		Value: 20,
++		Value: eth.DefaultConfig.LightPeers,
+ 	}
+ 	LightKDFFlag = cli.BoolFlag{
+ 		Name:  "lightkdf",
+@@ -791,20 +791,40 @@ func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config) {
+ 	setBootstrapNodes(ctx, cfg)
+ 	setBootstrapNodesV5(ctx, cfg)
+
++	lightClient := ctx.GlobalBool(LightModeFlag.Name) || ctx.GlobalString(SyncModeFlag.Name) == "light"
++	lightServer := ctx.GlobalInt(LightServFlag.Name) != 0
++	lightPeers := ctx.GlobalInt(LightPeersFlag.Name)
++
+ 	if ctx.GlobalIsSet(MaxPeersFlag.Name) {
+ 		cfg.MaxPeers = ctx.GlobalInt(MaxPeersFlag.Name)
++	} else {
++		if lightServer {
++			cfg.MaxPeers += lightPeers
++		}
++		if lightClient && ctx.GlobalIsSet(LightPeersFlag.Name) && cfg.MaxPeers < lightPeers {
++			cfg.MaxPeers = lightPeers
++		}
+ 	}
++	if !(lightClient || lightServer) {
++		lightPeers = 0
++	}
++	ethPeers := cfg.MaxPeers - lightPeers
++	if lightClient {
++		ethPeers = 0
++	}
++	log.Info("Maximum peer count", "ETH", ethPeers, "LES", lightPeers, "total", cfg.MaxPeers)
++
+ 	if ctx.GlobalIsSet(MaxPendingPeersFlag.Name) {
+ 		cfg.MaxPendingPeers = ctx.GlobalInt(MaxPendingPeersFlag.Name)
+ 	}
+-	if ctx.GlobalIsSet(NoDiscoverFlag.Name) || ctx.GlobalBool(LightModeFlag.Name) {
++	if ctx.GlobalIsSet(NoDiscoverFlag.Name) || lightClient {
+ 		cfg.NoDiscovery = true
+ 	}
+
+ 	// if we're running a light client or server, force enable the v5 peer discovery
+ 	// unless it is explicitly disabled with --nodiscover note that explicitly specifying
+ 	// --v5disc overrides --nodiscover, in which case the later only disables v4 discovery
+-	forceV5Discovery := (ctx.GlobalBool(LightModeFlag.Name) || ctx.GlobalInt(LightServFlag.Name) > 0) && !ctx.GlobalBool(NoDiscoverFlag.Name)
++	forceV5Discovery := (lightClient || lightServer) && !ctx.GlobalBool(NoDiscoverFlag.Name)
+ 	if ctx.GlobalIsSet(DiscoveryV5Flag.Name) {
+ 		cfg.DiscoveryV5 = ctx.GlobalBool(DiscoveryV5Flag.Name)
+ 	} else if forceV5Discovery {
+diff --git a/eth/backend.go b/eth/backend.go
+index c39974a2c0..bcd724c0c2 100644
+--- a/eth/backend.go
++++ b/eth/backend.go
+@@ -393,10 +393,10 @@ func (s *Ethereum) Start(srvr *p2p.Server) error {
+ 	// Figure out a max peers count based on the server limits
+ 	maxPeers := srvr.MaxPeers
+ 	if s.config.LightServ > 0 {
+-		maxPeers -= s.config.LightPeers
+-		if maxPeers < srvr.MaxPeers/2 {
+-			maxPeers = srvr.MaxPeers / 2
++		if s.config.LightPeers >= srvr.MaxPeers {
++			return fmt.Errorf("invalid peer config: light peer count (%d) >= total peer count (%d)", s.config.LightPeers, srvr.MaxPeers)
+ 		}
++		maxPeers -= s.config.LightPeers
+ 	}
+ 	// Start the networking layer and the light server if requested
+ 	s.protocolManager.Start(maxPeers)
+diff --git a/les/backend.go b/les/backend.go
+index 798e44e85c..6a324cb04b 100644
+--- a/les/backend.go
++++ b/les/backend.go
+@@ -46,6 +46,8 @@ import (
+ )
+
+ type LightEthereum struct {
++	config *eth.Config
++
+ 	odr         *LesOdr
+ 	relay       *LesTxRelay
+ 	chainConfig *params.ChainConfig
+@@ -92,6 +94,7 @@ func New(ctx *node.ServiceContext, config *eth.Config) (*LightEthereum, error) {
+ 	quitSync := make(chan struct{})
+
+ 	leth := &LightEthereum{
++		config:           config,
+ 		chainConfig:      chainConfig,
+ 		chainDb:          chainDb,
+ 		eventMux:         ctx.EventMux,
+@@ -224,7 +227,7 @@ func (s *LightEthereum) Start(srvr *p2p.Server) error {
+ 	// clients are searching for the first advertised protocol in the list
+ 	protocolVersion := AdvertiseProtocolVersions[0]
+ 	s.serverPool.start(srvr, lesTopic(s.blockchain.Genesis().Hash(), protocolVersion))
+-	s.protocolManager.Start()
++	s.protocolManager.Start(s.config.LightPeers)
+ 	return nil
+ }
+
+diff --git a/les/handler.go b/les/handler.go
+index ad2e8058f9..8cd37c7abb 100644
+--- a/les/handler.go
++++ b/les/handler.go
+@@ -109,6 +109,7 @@ type ProtocolManager struct {
+ 	downloader *downloader.Downloader
+ 	fetcher    *lightFetcher
+ 	peers      *peerSet
++	maxPeers   int
+
+ 	SubProtocols []p2p.Protocol
+
+@@ -216,7 +217,9 @@ func (pm *ProtocolManager) removePeer(id string) {
+ 	pm.peers.Unregister(id)
+ }
+
+-func (pm *ProtocolManager) Start() {
++func (pm *ProtocolManager) Start(maxPeers int) {
++	pm.maxPeers = maxPeers
++
+ 	if pm.lightSync {
+ 		go pm.syncer()
+ 	} else {
+@@ -257,6 +260,10 @@ func (pm *ProtocolManager) newPeer(pv int, nv uint64, p *p2p.Peer, rw p2p.MsgRea
+ // handle is the callback invoked to manage the life cycle of a les peer. When
+ // this function terminates, the peer is disconnected.
+ func (pm *ProtocolManager) handle(p *peer) error {
++	if pm.peers.Len() >= pm.maxPeers {
++		return p2p.DiscTooManyPeers
++	}
++
+ 	p.Log().Debug("Light Ethereum peer connected", "name", p.Name())
+
+ 	// Execute the LES handshake
+diff --git a/les/helper_test.go b/les/helper_test.go
+index 57e6939962..1c1de64ad8 100644
+--- a/les/helper_test.go
++++ b/les/helper_test.go
+@@ -176,7 +176,7 @@ func newTestProtocolManager(lightSync bool, blocks int, generator func(int, *cor
+ 		srv.fcManager = flowcontrol.NewClientManager(50, 10, 1000000000)
+ 		srv.fcCostStats = newCostStats(nil)
+ 	}
+-	pm.Start()
++	pm.Start(1000)
+ 	return pm, nil
+ }
+
+diff --git a/les/server.go b/les/server.go
+index ec2e44fecc..85ebbf8988 100644
+--- a/les/server.go
++++ b/les/server.go
+@@ -38,6 +38,7 @@ import (
+ )
+
+ type LesServer struct {
++	config          *eth.Config
+ 	protocolManager *ProtocolManager
+ 	fcManager       *flowcontrol.ClientManager // nil if our node is client only
+ 	fcCostStats     *requestCostStats
+@@ -62,6 +63,7 @@ func NewLesServer(eth *eth.Ethereum, config *eth.Config) (*LesServer, error) {
+ 	}
+
+ 	srv := &LesServer{
++		config:           config,
+ 		protocolManager:  pm,
+ 		quitSync:         quitSync,
+ 		lesTopics:        lesTopics,
+@@ -108,7 +110,7 @@ func (s *LesServer) Protocols() []p2p.Protocol {
+
+ // Start starts the LES server
+ func (s *LesServer) Start(srvr *p2p.Server) {
+-	s.protocolManager.Start()
++	s.protocolManager.Start(s.config.LightPeers)
+ 	for _, topic := range s.lesTopics {
+ 		topic := topic
+ 		go func() {

accounts/errors.go

@@ -62,7 +62,7 @@ func NewAuthNeededError(needed string) error {
 	}
 }
 
-// Error implements the standard error interfacel.
+// Error implements the standard error interface.
 func (err *AuthNeededError) Error() string {
 	return fmt.Sprintf("authentication needed: %s", err.Needed)
 }

accounts/keystore/presale.go

@@ -58,6 +58,9 @@ func decryptPreSaleKey(fileContent []byte, password string) (key *Key, err error
 	if err != nil {
 		return nil, errors.New("invalid hex in encSeed")
 	}
+	if len(encSeedBytes) < 16 {
+		return nil, errors.New("invalid encSeed, too short")
+	}
 	iv := encSeedBytes[:16]
 	cipherText := encSeedBytes[16:]
 	/*