From 7d71e702d8e3f6cb78c432b8b95ecdc31d0a5f79 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Wed, 7 Feb 2018 18:35:01 +0100
Subject: [PATCH] Integrate privVal client with node secret

---
 cmd/priv_val_server/main.go |  9 ++++++---
 node/node.go                | 32 ++++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/cmd/priv_val_server/main.go b/cmd/priv_val_server/main.go
index b494a442c..904447c09 100644
--- a/cmd/priv_val_server/main.go
+++ b/cmd/priv_val_server/main.go
@@ -13,6 +13,7 @@ import (
 func main() {
 	var (
 		chainID     = flag.String("chain-id", "mychain", "chain id")
+		numClients  = flag.Int("clients", 1, "number of concurrently connected clients")
 		privValPath = flag.String("priv", "", "priv val file path")
 		socketAddr  = flag.String("socket.addr", ":46659", "socket bind addr")
 
@@ -20,17 +21,19 @@ func main() {
 	)
 	flag.Parse()
 
-	logger.Info("args", "chainID", *chainID, "privPath", *privValPath)
+	logger.Info("Reading args privValidatorSocketServer", "chainID", *chainID, "privPath", *privValPath)
 
 	privVal := priv_val.LoadPrivValidatorJSON(*privValPath)
 
 	pvss := priv_val.NewPrivValidatorSocketServer(
 		logger,
-		*socketAddr,
 		*chainID,
+		*socketAddr,
+		*numClients,
 		privVal,
+		nil,
 	)
-	// pvss.Start()
+	pvss.Start()
 
 	cmn.TrapSignal(func() {
 		pvss.Stop()
diff --git a/node/node.go b/node/node.go
index 859cc1df1..64e8c02c1 100644
--- a/node/node.go
+++ b/node/node.go
@@ -79,13 +79,13 @@ type NodeProvider func(*cfg.Config, log.Logger) (*Node, error)
 func DefaultNewNode(config *cfg.Config, logger log.Logger) (*Node, error) {
 	var privVal types.PrivValidator
 	privVal = types.LoadOrGenPrivValidatorFS(config.PrivValidatorFile())
-	/*
-		if config.PrivValidatorAddr != "" {
-			pvsc := priv_val.NewPrivValidatorSocketClient(logger.With("module", "priv_val"),
-				config.PrivValidatorAddr)
-			pvsc.Start()
-			privVal = pvsc
-		}
+	/* TODO
+	if config.PrivValidatorAddr != "" {
+		pvsc := priv_val.NewPrivValidatorSocketClient(logger.With("module", "priv_val"),
+			config.PrivValidatorAddr)
+		pvsc.Start()
+		privVal = pvsc
+	}
 	*/
 	fmt.Println("PRIV", config.PrivValidatorAddr)
 
@@ -94,7 +94,8 @@ func DefaultNewNode(config *cfg.Config, logger log.Logger) (*Node, error) {
 		proxy.DefaultClientCreator(config.ProxyApp, config.ABCI, config.DBDir()),
 		DefaultGenesisDocProviderFunc(config),
 		DefaultDBProvider,
-		logger)
+		logger,
+	)
 }
 
 //------------------------------------------------------------------------------
@@ -183,6 +184,21 @@ func NewNode(config *cfg.Config,
 	// reload the state (it may have been updated by the handshake)
 	state = sm.LoadState(stateDB)
 
+	/* TODO
+	// Generate node PrivKey
+	privKey := crypto.GenPrivKeyEd25519()
+
+	if config.PrivValidatorAddr != "" {
+		pvsc := priv_val.NewPrivValidatorSocketClient(
+			logger.With("module", "priv_val"),
+			config.PrivValidatorAddr,
+			&privKey,
+		)
+		pvsc.Start()
+		privValidator = pvsc
+	}
+	*/
+
 	// Decide whether to fast-sync or not
 	// We don't fast-sync when the only validator is us.
 	fastSync := config.FastSync