load both pub/priv p2p keys

Signed-off-by: Leo Chen <leo@harmony.one>

cmd/bootnode/main.go

@@ -64,7 +64,7 @@ func main() {
 	// Init logging.
 	loggingInit(*logFolder, *ip, *port)
 
-	privKey, err := utils.LoadKeyFromFile(*keyFile)
+	privKey, _, err := utils.LoadKeyFromFile(*keyFile)
 	if err != nil {
 		panic(err)
 	}

cmd/client/txgen/main.go

@@ -72,7 +72,7 @@ func main() {
 
 	var bcPeer *p2p.Peer
 	var shardIDLeaderMap map[uint32]p2p.Peer
-	priKey, err := utils.LoadKeyFromFile(*keyFile)
+	priKey, _, err := utils.LoadKeyFromFile(*keyFile)
 	if err != nil {
 		panic(err)
 	}

internal/utils/utils.go

@@ -150,19 +150,20 @@ func Load(path string, v interface{}) error {
 }
 
 // LoadPrivateKey parses the key string in base64 format and return PrivKey
-func LoadPrivateKey(key string) (p2p_crypto.PrivKey, error) {
+func LoadPrivateKey(key string) (p2p_crypto.PrivKey, p2p_crypto.PubKey, error) {
 	if key != "" {
 		k1, err := p2p_crypto.ConfigDecodeKey(key)
 		if err != nil {
-			return nil, fmt.Errorf("failed to decode key: %v", err)
+			return nil, nil, fmt.Errorf("failed to decode key: %v", err)
 		}
 		priKey, err := p2p_crypto.UnmarshalPrivateKey(k1)
 		if err != nil {
-			return nil, fmt.Errorf("failed to unmarshal private key: %v", err)
+			return nil, nil, fmt.Errorf("failed to unmarshal private key: %v", err)
 		}
-		return priKey, nil
+		pubKey := priKey.GetPublic()
+		return priKey, pubKey, nil
 	}
-	return nil, fmt.Errorf("empty key string")
+	return nil, nil, fmt.Errorf("empty key string")
 }
 
 // SavePrivateKey convert the PrivKey to base64 format and return string
@@ -194,13 +195,13 @@ func SaveKeyToFile(keyfile string, key p2p_crypto.PrivKey) (err error) {
 // LoadKeyFromFile load private key from keyfile
 // If the private key is not loadable or no file, it will generate
 // a new random private key
-func LoadKeyFromFile(keyfile string) (key p2p_crypto.PrivKey, err error) {
+func LoadKeyFromFile(keyfile string) (key p2p_crypto.PrivKey, pk p2p_crypto.PubKey, err error) {
 	var keyStruct PrivKeyStore
 	err = Load(keyfile, &keyStruct)
 	if err != nil {
 		log.Print("No priviate key can be loaded from file", "keyfile", keyfile)
 		log.Print("Using random private key")
-		key, _, err = GenKeyP2PRand()
+		key, pk, err = GenKeyP2PRand()
 		if err != nil {
 			log.Panic("LoadKeyFromFile", "GenKeyP2PRand Error", err)
 		}
@@ -208,8 +209,8 @@ func LoadKeyFromFile(keyfile string) (key p2p_crypto.PrivKey, err error) {
 		if err != nil {
 			log.Print("LoadKeyFromFile", "failed to save key to keyfile", err)
 		}
-		return key, nil
+		return key, pk, nil
 	}
-	key, err = LoadPrivateKey(keyStruct.Key)
-	return key, err
+	key, pk, err = LoadPrivateKey(keyStruct.Key)
+	return key, pk, err
 }

internal/utils/utils_test.go

@@ -107,7 +107,7 @@ func TestSaveLoadPrivateKey(t *testing.T) {
 		t.Fatalf("failed to save private key: %v", err)
 	}
 
-	pk1, err := LoadPrivateKey(str)
+	pk1, _, err := LoadPrivateKey(str)
 	if err != nil {
 		t.Fatalf("failed to load key: %v", err)
 	}
@@ -135,7 +135,7 @@ func TestSaveLoadKeyFile(t *testing.T) {
 		t.Fatalf("failed to save key to file: %v", err)
 	}
 
-	key1, err := LoadKeyFromFile(filename)
+	key1, _, err := LoadKeyFromFile(filename)
 	if err != nil {
 		t.Fatalf("failed to load key from file (%s): %v", filename, err)
 	}
@@ -144,7 +144,7 @@ func TestSaveLoadKeyFile(t *testing.T) {
 		t.Fatalf("loaded key is not equal to the saved one")
 	}
 
-	key2, err := LoadKeyFromFile(nonexist)
+	key2, _, err := LoadKeyFromFile(nonexist)
 
 	if err != nil {
 		t.Fatalf("failed to load key from non-exist file: %v", err)