cmd/mist, cmd/ethereum: add CLI arguments for node key

5 files changed, 72 insertions, 16 deletions

diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go
index 87fdd2838..594acdf7f 100644
--- a/cmd/ethereum/flags.go
+++ b/cmd/ethereum/flags.go
@@ -21,6 +21,7 @@
 package main
 
 import (
+	"crypto/ecdsa"
 	"flag"
 	"fmt"
 	"log"
@@ -28,6 +29,7 @@ import (
 	"os/user"
 	"path"
 
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/vm"
 )
@@ -50,6 +52,7 @@ var (
 	MaxPeer         int
 	GenAddr         bool
 	BootNodes       string
+	NodeKey         *ecdsa.PrivateKey
 	SecretFile      string
 	ExportDir       string
 	NonInteractive  bool
@@ -83,6 +86,7 @@ func defaultDataDir() string {
 var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini")
 
 func Init() {
+	// TODO: move common flag processing to cmd/util
 	flag.Usage = func() {
 		fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line\n", os.Args[0])
 		flag.PrintDefaults()
@@ -92,18 +96,12 @@ func Init() {
 	flag.StringVar(&Identifier, "id", "", "Custom client identifier")
 	flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use")
 	flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
-	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
-	flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)")
-	flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP")
-	flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers")
+
 	flag.IntVar(&RpcPort, "rpcport", 8545, "port to start json-rpc server on")
 	flag.IntVar(&WsPort, "wsport", 40404, "port to start websocket rpc server on")
 	flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
 	flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")
 	flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
-	flag.StringVar(&BootNodes, "bootnodes", "", "space-separated node URLs for discovery bootstrap")
-	flag.BoolVar(&SHH, "shh", true, "whisper protocol (on)")
-	flag.BoolVar(&Dial, "dial", true, "dial out connections (on)")
 	flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
 	flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)")
 	flag.StringVar(&ExportDir, "export", "", "exports the session keyring to files in the directory given")
@@ -125,8 +123,35 @@ func Init() {
 	flag.BoolVar(&StartJsConsole, "js", false, "launches javascript console")
 	flag.BoolVar(&PrintVersion, "version", false, "prints version number")
 
+	// Network stuff
+	var (
+		nodeKeyFile = flag.String("nodekey", "", "network private key file")
+		nodeKeyHex  = flag.String("nodekeyhex", "", "network private key (for testing)")
+	)
+	flag.BoolVar(&Dial, "dial", true, "dial out connections (default on)")
+	flag.BoolVar(&SHH, "shh", true, "run whisper protocol (default on)")
+	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
+	flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)")
+	flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for NAT-PMP")
+	flag.StringVar(&BootNodes, "bootnodes", "", "space-separated node URLs for discovery bootstrap")
+	flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers")
+
 	flag.Parse()
 
+	var err error
+	switch {
+	case *nodeKeyFile != "" && *nodeKeyHex != "":
+		log.Fatal("Options -nodekey and -nodekeyhex are mutually exclusive")
+	case *nodeKeyFile != "":
+		if NodeKey, err = crypto.LoadECDSA(*nodeKeyFile); err != nil {
+			log.Fatalf("-nodekey: %v", err)
+		}
+	case *nodeKeyHex != "":
+		if NodeKey, err = crypto.HexToECDSA(*nodeKeyHex); err != nil {
+			log.Fatalf("-nodekeyhex: %v", err)
+		}
+	}
+
 	if VmType >= int(vm.MaxVmTy) {
 		log.Fatal("Invalid VM type ", VmType)
 	}
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 14e67fe4a..3f616c094 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -75,6 +75,7 @@ func main() {
 		Shh:        SHH,
 		Dial:       Dial,
 		BootNodes:  BootNodes,
+		NodeKey:    NodeKey,
 	})
 
 	if err != nil {
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go
index 3a7d2ac54..dd72b5043 100644
--- a/cmd/mist/flags.go
+++ b/cmd/mist/flags.go
@@ -21,6 +21,7 @@
 package main
 
 import (
+	"crypto/ecdsa"
 	"flag"
 	"fmt"
 	"log"
@@ -31,6 +32,7 @@ import (
 	"runtime"
 
 	"bitbucket.org/kardianos/osext"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/vm"
 )
@@ -44,7 +46,6 @@ var (
 	StartWebSockets bool
 	RpcPort         int
 	WsPort          int
-	UseUPnP         bool
 	NatType         string
 	OutboundPort    string
 	ShowGenesis     bool
@@ -52,6 +53,7 @@ var (
 	MaxPeer         int
 	GenAddr         bool
 	BootNodes       string
+	NodeKey         *ecdsa.PrivateKey
 	SecretFile      string
 	ExportDir       string
 	NonInteractive  bool
@@ -99,6 +101,7 @@ func defaultDataDir() string {
 var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini")
 
 func Init() {
+	// TODO: move common flag processing to cmd/utils
 	flag.Usage = func() {
 		fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line\n", os.Args[0])
 		flag.PrintDefaults()
@@ -108,30 +111,49 @@ func Init() {
 	flag.StringVar(&Identifier, "id", "", "Custom client identifier")
 	flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use")
 	flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
-	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
-	flag.BoolVar(&UseUPnP, "upnp", true, "enable UPnP support")
-	flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers")
 	flag.IntVar(&RpcPort, "rpcport", 8545, "port to start json-rpc server on")
 	flag.IntVar(&WsPort, "wsport", 40404, "port to start websocket rpc server on")
 	flag.BoolVar(&StartRpc, "rpc", true, "start rpc server")
 	flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")
 	flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
-	flag.StringVar(&BootNodes, "bootnodes", "", "space-separated node URLs for discovery bootstrap")
 	flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
 	flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)")
 	flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)")
 	flag.StringVar(&ExportDir, "export", "", "exports the session keyring to files in the directory given")
 	flag.StringVar(&LogFile, "logfile", "", "log file (defaults to standard output)")
 	flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use")
-	flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP")
 	flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file")
 	flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)")
 	flag.IntVar(&LogLevel, "loglevel", int(logger.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)")
 
 	flag.StringVar(&AssetPath, "asset_path", defaultAssetPath(), "absolute path to GUI assets directory")
 
+	// Network stuff
+	var (
+		nodeKeyFile = flag.String("nodekey", "", "network private key file")
+		nodeKeyHex  = flag.String("nodekeyhex", "", "network private key (for testing)")
+	)
+	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
+	flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for NAT-PMP")
+	flag.StringVar(&BootNodes, "bootnodes", "", "space-separated node URLs for discovery bootstrap")
+	flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers")
+
 	flag.Parse()
 
+	var err error
+	switch {
+	case *nodeKeyFile != "" && *nodeKeyHex != "":
+		log.Fatal("Options -nodekey and -nodekeyhex are mutually exclusive")
+	case *nodeKeyFile != "":
+		if NodeKey, err = crypto.LoadECDSA(*nodeKeyFile); err != nil {
+			log.Fatalf("-nodekey: %v", err)
+		}
+	case *nodeKeyHex != "":
+		if NodeKey, err = crypto.HexToECDSA(*nodeKeyHex); err != nil {
+			log.Fatalf("-nodekeyhex: %v", err)
+		}
+	}
+
 	if VmType >= int(vm.MaxVmTy) {
 		log.Fatal("Invalid VM type ", VmType)
 	}
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 5bae33088..4d6bac9b7 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -62,6 +62,7 @@ func run() error {
 		NATType:    NatType,
 		PMPGateway: PMPGateway,
 		BootNodes:  BootNodes,
+		NodeKey:    NodeKey,
 		KeyRing:    KeyRing,
 		Dial:       true,
 	})
diff --git a/eth/backend.go b/eth/backend.go
index f5ebc9033..e8555061d 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -1,6 +1,7 @@
 package eth
 
 import (
+	"crypto/ecdsa"
 	"fmt"
 	"strings"
 	"sync"
@@ -37,6 +38,10 @@ type Config struct {
 	// discovery node URLs.
 	BootNodes string
 
+	// This key is used to identify the node on the network.
+	// If nil, an ephemeral key is used.
+	NodeKey *ecdsa.PrivateKey
+
 	Shh  bool
 	Dial bool
 
@@ -150,9 +155,11 @@ func New(config *Config) (*Ethereum, error) {
 	if err != nil {
 		return nil, err
 	}
-	netprv, err := crypto.GenerateKey()
-	if err != nil {
-		return nil, fmt.Errorf("could not generate server key: %v", err)
+	netprv := config.NodeKey
+	if netprv == nil {
+		if netprv, err = crypto.GenerateKey(); err != nil {
+			return nil, fmt.Errorf("could not generate server key: %v", err)
+		}
 	}
 	eth.net = &p2p.Server{
 		PrivateKey:     netprv,