Add back shh.identityfile removed in c06d58a. Part of #692

cmd/statusd/main.go

@@ -55,6 +55,7 @@ var (
 	// don't change the name of this flag, https://github.com/ethereum/go-ethereum/blob/master/metrics/metrics.go#L41
 	_ = flag.Bool("metrics", false, "Expose ethereum metrics with debug_metrics jsonrpc call.")
 	// shh stuff
+	identityFile = flag.String("shh.identityfile", "", "Protocol identity file (private key used for asymmetric encryption)")
 	passwordFile = flag.String("shh.passwordfile", "", "Password file (password is used for symmetric encryption)")
 	minPow       = flag.Float64("shh.pow", params.WhisperMinimumPoW, "PoW for messages to be added to queue, in float format")
 	ttl          = flag.Int("shh.ttl", params.WhisperTTL, "Time to live for messages, in seconds")

cmd/statusd/whispercfg.go

@@ -13,10 +13,17 @@ import (
 func whisperConfig(nodeConfig *params.NodeConfig) (*params.NodeConfig, error) {
 	whisperConfig := nodeConfig.WhisperConfig
 	whisperConfig.Enabled = true
+	whisperConfig.IdentityFile = *identityFile
 	whisperConfig.EnableMailServer = *enableMailServer
 	whisperConfig.MinimumPoW = *minPow
 	whisperConfig.TTL = *ttl
 
+	if whisperConfig.IdentityFile != "" {
+		if _, err := whisperConfig.ReadIdentityFile(); err != nil {
+			return nil, fmt.Errorf("read identity file: %v", err)
+		}
+	}
+
 	if whisperConfig.EnableMailServer {
 		if *passwordFile == "" {
 			return nil, errors.New("passwordfile should be specified if MailServer is enabled")

geth/params/config.go

@@ -2,6 +2,7 @@ package params
 
 import (
 	"bytes"
+	"crypto/ecdsa"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -11,6 +12,7 @@ import (
 	"strings"
 
 	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/status-im/status-go/geth/log"
 	"github.com/status-im/status-go/static"
 )
@@ -33,6 +35,8 @@ var (
 	ErrMissingNetworkID           = errors.New("missing required 'NetworkID' parameter")
 	ErrEmptyPasswordFile          = errors.New("password file cannot be empty")
 	ErrNoPasswordFileValueSet     = errors.New("password file path not set")
+	ErrNoIdentityFileValueSet     = errors.New("identity file path not set")
+	ErrEmptyIdentityFile          = errors.New("identity file cannot be empty")
 	ErrEmptyAuthorizationKeyFile  = errors.New("authorization key file cannot be empty")
 	ErrAuthorizationKeyFileNotSet = errors.New("authorization key file is not set")
 )
@@ -84,6 +88,10 @@ type WhisperConfig struct {
 	// Enabled flag specifies whether protocol is enabled
 	Enabled bool
 
+	// IdentityFile path to private key, that will be loaded as identity into Whisper.
+	// Currently, it's used by Push Notification service.
+	IdentityFile string
+
 	// PasswordFile contains a password for symmetric encryption with MailServer.
 	PasswordFile string
 
@@ -129,6 +137,24 @@ func (c *WhisperConfig) ReadPasswordFile() error {
 	return nil
 }
 
+// ReadIdentityFile reads and loads identity private key
+func (c *WhisperConfig) ReadIdentityFile() (*ecdsa.PrivateKey, error) {
+	if len(c.IdentityFile) == 0 {
+		return nil, ErrNoIdentityFileValueSet
+	}
+
+	identity, err := crypto.LoadECDSA(c.IdentityFile)
+	if err != nil {
+		return nil, err
+	}
+
+	if identity == nil {
+		return nil, ErrEmptyIdentityFile
+	}
+
+	return identity, nil
+}
+
 // String dumps config object as nicely indented JSON
 func (c *WhisperConfig) String() string {
 	data, _ := json.MarshalIndent(c, "", "    ") // nolint: gas