add onlyannounce flag

cmd/geth/main.go

@@ -81,6 +81,7 @@ var (
 		utils.FastSyncFlag,
 		utils.LightModeFlag,
 		utils.ULCModeConfigFlag,
+		utils.OnlyAnnounceModeFlag,
 		utils.SyncModeFlag,
 		utils.GCModeFlag,
 		utils.LightServFlag,

cmd/utils/flags.go

@@ -169,6 +169,10 @@ var (
 		Name:  "ulcconfig",
 		Usage: "Config file to use for ULC mode",
 	}
+	OnlyAnnounceModeFlag = cli.BoolFlag{
+		Name:  "onlyannounce",
+		Usage: "Les server sends only announce",
+	}
 	defaultSyncMode = eth.DefaultConfig.SyncMode
 	SyncModeFlag    = TextMarshalerFlag{
 		Name:  "syncmode",
@@ -1062,6 +1066,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	if ctx.GlobalIsSet(LightPeersFlag.Name) {
 		cfg.LightPeers = ctx.GlobalInt(LightPeersFlag.Name)
 	}
+	if ctx.GlobalIsSet(OnlyAnnounceModeFlag.Name) {
+		cfg.OnlyAnnounce = ctx.GlobalBool(OnlyAnnounceModeFlag.Name)
+	}
 	if ctx.GlobalIsSet(NetworkIdFlag.Name) {
 		cfg.NetworkId = ctx.GlobalUint64(NetworkIdFlag.Name)
 	}

eth/config.go

@@ -86,6 +86,7 @@ type Config struct {
 	// Light client options
 	LightServ  int `toml:",omitempty"` // Maximum percentage of time allowed for serving LES requests
 	LightPeers int `toml:",omitempty"` // Maximum number of LES client peers
+	OnlyAnnounce bool `toml:",omitempty"` // Maximum number of LES client peers
 
 	// Ultra Light client options
 	ULC *ULCConfig `toml:",omitempty"`

les/peer.go

@@ -409,7 +409,7 @@ func (p *peer) Handshake(td *big.Int, head common.Hash, headNum uint64, genesis
 	send = send.add("headNum", headNum)
 	send = send.add("genesisHash", genesis)
 	if server != nil {
-		if !server.onlyAnnounse {
+		if !server.onlyAnnounce {
 			//only announce server. It sends only announse requests
 			send = send.add("serveHeaders", nil)
 			send = send.add("serveChainSince", uint64(0))

les/peer_test.go

@@ -191,10 +191,6 @@ func TestPeerHandshakeClientReceiveOnlyAnnounceRequestsHeaders(t *testing.T) {
 		version: protocol_version,
 		rw: &rwStub{
 			ReadHook: func(l keyValueList) keyValueList {
-				//l = l.add("serveHeaders", nil)
-				//l = l.add("serveChainSince", uint64(0))
-				//l = l.add("serveStateSince", uint64(0))
-				//l = l.add("txRelay", nil)
 				l = l.add("flowControl/BL", uint64(0))
 				l = l.add("flowControl/MRR", uint64(0))
 				l = l.add("flowControl/MRC", RequestCostList{})

les/server.go

@@ -45,7 +45,7 @@ type LesServer struct {
 	lesTopics       []discv5.Topic
 	privateKey      *ecdsa.PrivateKey
 	quitSync        chan struct{}
-	onlyAnnounse    bool
+	onlyAnnounce    bool
 
 	chtIndexer, bloomTrieIndexer *core.ChainIndexer
 }
@@ -84,6 +84,7 @@ func NewLesServer(eth *eth.Ethereum, config *eth.Config) (*LesServer, error) {
 		lesTopics:        lesTopics,
 		chtIndexer:       light.NewChtIndexer(eth.ChainDb(), false),
 		bloomTrieIndexer: light.NewBloomTrieIndexer(eth.ChainDb(), false),
+		onlyAnnounce:	  config.OnlyAnnounce,
 	}
 
 	logger := log.New()