replace private keys with menmonic

Author: rawdaGastan

rmb-sdk-go/README.md

@@ -21,7 +21,7 @@ This connection could be established using a `direct-client`, or an `rmb-peer`.
 A process could connect to an `rmb-relay` using a direct client.\
 To create a new direct client instance, a process needs to have:
 
-- A valid private key, with an activated account on the Registrar.
+- A valid mnemonic, with an activated account on the Registrar.
 - The key type of these mnemonics.
 - A relay URL that the direct client will connect to.
 - A session id. This could be anything, but a twin must only have a unique session id per connection.

rmb-sdk-go/examples/rpc_client/README.md

@@ -6,7 +6,7 @@ This is a `Go` example for the `RMB` [rpc client](https://github.com/threefoldte
 
 To use the example, you needs to:
 
--   Set the private key variable to a valid private key, with an activated account on the Registrar.
+-   Set the mnemonics variable to a valid mnemonic, with an activated account on the Registrar.
 -   A node id to send the call to
 
 ## Usage

rmb-sdk-go/examples/rpc_client/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/hex"
 	"fmt"
 	"log"
 	"time"
@@ -16,16 +15,11 @@ type version struct {
 }
 
 func app() error {
-	privateKey := "<private key goes here>"
-
-	privateKeyBytes, err := hex.DecodeString(privateKey)
-	if err != nil {
-		return fmt.Errorf("failed to decode private key: %w", err)
-	}
+	mnemonic := "<mnemonics goes here>"
 
 	client, err := peer.NewRpcClient(
 		context.Background(),
-		privateKeyBytes,
+		mnemonic,
 		peer.WithRegistrarUrl("https://registrar.dev4.grid.tf"),
 		peer.WithRelay("wss://relay.dev.grid.tf"),
 		peer.WithSession("test-client"),

rmb-sdk-go/peer/examples/peer/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/hex"
 	"fmt"
 	"math/rand"
 
@@ -15,17 +14,12 @@ import (
 var resultsChan = make(chan bool)
 
 func app() error {
-	privateKey := "<private key here>"
+	mnemonic := "<mnemonics goes here>"
 	ctx := context.Background()
 
-	privateKeyBytes, err := hex.DecodeString(privateKey)
-	if err != nil {
-		return fmt.Errorf("failed to decode private key: %w", err)
-	}
-
 	peer, err := peer.NewPeer(
 		ctx,
-		privateKeyBytes,
+		mnemonic,
 		relayCallback,
 		peer.WithRegistrarUrl("https://registrar.dev4.grid.tf"),
 		peer.WithRelay("wss://relay.dev.grid.tf"),

rmb-sdk-go/peer/examples/peer_pingmany/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -17,8 +16,8 @@ import (
 )
 
 const (
-	relayUrl   = "ws://localhost:"
-	privateKey = "<private key>"
+	relayUrl = "ws://localhost:"
+	mnemonic = "<mnemonics goes here>"
 )
 
 type Node struct {
@@ -55,14 +54,8 @@ func main() {
 		log.Info().Uint32("twin", env.Source.Twin).Str("version", version).Msg("received response")
 	}
 
-	privateKeyBytes, err := hex.DecodeString(privateKey)
-	if err != nil {
-		log.Error().Err(err).Msg("failed to decode private key")
-		return
-	}
-
 	bus, err := peer.NewPeer(context.Background(),
-		privateKeyBytes,
+		mnemonic,
 		handler,
 		peer.WithRegistrarUrl("https://registrar.dev4.grid.tf"),
 		peer.WithKeyType(peer.KeyTypeSr25519),

rmb-sdk-go/peer/examples/router_server/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -59,20 +58,15 @@ func app() error {
 	})
 
 	// adding a peer for the router
-	privateKey := "<private key here>"
+	mnemonic := "<mnemonics goes here>"
 	ctx := context.Background()
 
-	privateKeyBytes, err := hex.DecodeString(privateKey)
-	if err != nil {
-		return fmt.Errorf("failed to decode private key: %w", err)
-	}
-
 	// this peer will be a 'calculator' session.
 	// means other peers on the network need to know that
 	// session id to use when they are making calls
-	_, err = peer.NewPeer(
+	_, err := peer.NewPeer(
 		ctx,
-		privateKeyBytes,
+		mnemonic,
 		router.Serve,
 		peer.WithRegistrarUrl("https://registrar.dev4.grid.tf"),
 		peer.WithRelay("wss://relay.dev.grid.tf"),

rmb-sdk-go/peer/examples/rpc/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/hex"
 	"fmt"
 	"time"
 
@@ -12,16 +11,11 @@ import (
 )
 
 func app() error {
-	privateKey := "<private key goes here>"
-
-	privateKeyBytes, err := hex.DecodeString(privateKey)
-	if err != nil {
-		return fmt.Errorf("failed to decode private key: %w", err)
-	}
+	mnemonic := "<mnemonics goes here>"
 
 	client, err := peer.NewRpcClient(
 		context.Background(),
-		privateKeyBytes,
+		mnemonic,
 		peer.WithRegistrarUrl("https://registrar.dev4.grid.tf"),
 		peer.WithKeyType(peer.KeyTypeSr25519),
 		peer.WithRelay("wss://relay.dev.grid.tf"),

rmb-sdk-go/peer/peer.go

@@ -137,15 +137,15 @@ func generateSecureKey(identity substrate.Identity) (*secp256k1.PrivateKey, erro
 	return priv, nil
 }
 
-func getIdentity(keyType string, privateKey []byte) (substrate.Identity, error) {
+func getIdentity(keyType string, mnemonics string) (substrate.Identity, error) { //TODO:
 	var identity substrate.Identity
 	var err error
 
 	switch keyType {
 	case KeyTypeEd25519:
-		identity, err = substrate.NewIdentityFromEd25519Key(privateKey)
+		identity, err = substrate.NewIdentityFromEd25519Phrase(mnemonics)
 	case KeyTypeSr25519:
-		// identity, err = substrate.NewIdentityFromSr25519Phrase(privateKeyBytes) //TODO:
+		identity, err = substrate.NewIdentityFromSr25519Phrase(mnemonics)
 	default:
 		return nil, fmt.Errorf("invalid key type %s, should be one of %s or %s ", keyType, KeyTypeEd25519, KeyTypeSr25519)
 	}
@@ -164,7 +164,7 @@ func getIdentity(keyType string, privateKey []byte) (substrate.Identity, error)
 // Call() will panic if called while the directClient's context is canceled.
 func NewPeer(
 	ctx context.Context,
-	privateKey []byte,
+	mnemonic string,
 	handler Handler,
 	opts ...PeerOpt,
 ) (*Peer, error) {
@@ -186,7 +186,8 @@ func NewPeer(
 	if cfg.encoder == nil {
 		cfg.encoder = encoder.NewJSONEncoder()
 	}
-	identity, err := getIdentity(cfg.keyType, privateKey)
+
+	identity, err := getIdentity(cfg.keyType, mnemonic)
 	if err != nil {
 		return nil, err
 	}
@@ -233,7 +234,7 @@ func NewPeer(
 
 	if !bytes.Equal(twin.E2EKey, publicKey) || twin.Relay == nil || relayURLs[0] != *twin.Relay { // TODO: multiple relays (slice?)
 		log.Info().Strs("Relay url/s", relayURLs).Msg("twin relay/public key didn't match, updating on registrar ...")
-		if err = UpdateTwin(twin.ID, privateKey, publicKey, relayURLs, cfg.registrarUrl); err != nil {
+		if err = UpdateTwin(twin.ID, cfg.registrarUrl, mnemonic, publicKey, relayURLs); err != nil {
 			return nil, errors.Wrap(err, "could not update twin relay information")
 		}
 	}

rmb-sdk-go/peer/rpc.go

@@ -33,7 +33,7 @@ type RpcClient struct {
 // it easy to make rpc calls
 func NewRpcClient(
 	ctx context.Context,
-	privateKey []byte,
+	mnemonic string,
 	opts ...PeerOpt) (*RpcClient, error) {
 
 	rpc := RpcClient{
@@ -42,7 +42,7 @@ func NewRpcClient(
 
 	base, err := NewPeer(
 		ctx,
-		privateKey,
+		mnemonic,
 		rpc.router,
 		opts...,
 	)

rmb-sdk-go/peer/twindb.go

@@ -1,7 +1,6 @@
 package peer
 
 import (
-	"crypto/ed25519"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -14,6 +13,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+	"github.com/vedhavyas/go-subkey"
+	subkeyEd25519 "github.com/vedhavyas/go-subkey/ed25519"
 )
 
 var (
@@ -130,14 +131,21 @@ func (t *twinDB) GetByPk(pk []byte) (uint32, error) {
 	return uint32(registrarTwin.TwinID), nil
 }
 
-func UpdateTwin(twinID uint32, privateKey, rmbEncKey []byte, relays []string, registrarUrl string) error {
+func UpdateTwin(twinID uint32, registrarUrl, mnemonic string, rmbEncKey []byte, relays []string) error {
 	client := &http.Client{}
 
+	keypair, err := subkey.DeriveKeyPair(subkeyEd25519.Scheme{}, mnemonic)
+	if err != nil {
+		return err
+	}
+
 	timestamp := time.Now().Unix()
 	challenge := []byte(fmt.Sprintf("%d:%v", timestamp, twinID))
-	signature := ed25519.Sign(privateKey, challenge)
+	signature, err := keypair.Sign(challenge)
+	if err != nil {
+		return err
+	}
 
-	fmt.Printf("rmbEncKey: %v\n", rmbEncKey)
 	updates := updateTwin{
 		Relays:    relays,
 		RMBEncKey: base64.StdEncoding.EncodeToString(rmbEncKey),