[panthalassa] fixed build errors and failing tests

cli/main.go

@@ -289,10 +289,15 @@ func main() {
 				return
 			}
 
+			rawStore, err := exportedAccount.Marshal()
+			if err != nil {
+				panic(err)
+			}
+
 			err = db.Write("account", id.String(), &Account{
 				ID:           id.String(),
 				Name:         accountName,
-				AccountStore: exportedAccount,
+				AccountStore: string(rawStore),
 				Profile:      string(rawProfile),
 			})
 

client/client_key_store.go

@@ -30,6 +30,7 @@ func (s *DoubleRatchetKeyStore) Get(k dr.Key, msgNum uint) (mk dr.Key, ok bool)
 	}
 
 	resp := <-respCha
+
 	if resp.Error != nil {
 		resp.Close(nil)
 		return dr.Key{}, false

client/client_key_store_test.go

@@ -76,7 +76,7 @@ func TestDoubleRatchetKeyStore_GetSuccess(t *testing.T) {
 
 				mustBeEqual(`{"key":"0000000000000000000100010000000000010001000000000000000100000001","msg_num":7}`, rpcCall.Data)
 
-				requireNil(api.Receive(rpcCall.Id, `{"error":"","payload":"{\"key\":\"{\\\"iv\\\":\\\"f+ZgKGwhkz82bokcs7HI8A==\\\",\\\"cipher_text\\\":\\\"Qu0SeXs/ahOjqcwPRIrK0sR9ngirapvt33x3SNLayFs=\\\",\\\"mac\\\":\\\"vJhCluH/bWdkcaA3vtTzDDsYFVO0A7UcL7wbPbvYdG0=\\\",\\\"v\\\":1}\"}"}`))
+				requireNil(api.Receive(rpcCall.Id, `{"error":"","payload":"{\"key\":\"{\\\"iv\\\":\\\"3Zd2O1KxUz2OZnWQPrTgCg==\\\",\\\"cipher_text\\\":\\\"q4FO26h5TICATqwwp9RXXXes1jX8asn+0TkL5Khx8Oc=\\\",\\\"mac\\\":\\\"XwX884HeXuodY3vgoKvmZcGkW0oPu2fBvRafxAsMu/I=\\\",\\\"v\\\":2}\"}"}`))
 
 			}
 		}

keyManager/keyManager.go

@@ -4,6 +4,7 @@ import (
 	"encoding/hex"
 	"errors"
 
+	"encoding/json"
 	aes "github.com/Bit-Nation/panthalassa/crypto/aes"
 	scrypt "github.com/Bit-Nation/panthalassa/crypto/scrypt"
 	ks "github.com/Bit-Nation/panthalassa/keyStore"
@@ -30,6 +31,19 @@ type Store struct {
 	Version           uint8             `json:"version"`
 }
 
+// marshal
+func (s Store) Marshal() ([]byte, error) {
+	return json.Marshal(s)
+}
+
+func UnmarshalStore(data []byte) (Store, error) {
+	var s Store
+	if err := json.Unmarshal(data, &s); err != nil {
+		return Store{}, err
+	}
+	return s, nil
+}
+
 //Open encrypted keystore with password
 func OpenWithPassword(store Store, pw string) (*KeyManager, error) {
 

mobile_interface.go

@@ -90,8 +90,13 @@ func Start(config string, password string, client UpStream) error {
 		return err
 	}
 
+	store, err := keyManager.UnmarshalStore([]byte(c.EncryptedKeyManager))
+	if err != nil {
+		return err
+	}
+
 	// open key manager with password
-	km, err := keyManager.OpenWithPassword(c.EncryptedKeyManager, password)
+	km, err := keyManager.OpenWithPassword(store, password)
 	if err != nil {
 		return err
 	}
@@ -108,8 +113,13 @@ func StartFromMnemonic(config string, mnemonic string, client UpStream) error {
 		return err
 	}
 
+	store, err := keyManager.UnmarshalStore([]byte(c.EncryptedKeyManager))
+	if err != nil {
+		return err
+	}
+
 	// create key manager
-	km, err := keyManager.OpenWithMnemonic(c.EncryptedKeyManager, mnemonic)
+	km, err := keyManager.OpenWithMnemonic(store, mnemonic)
 	if err != nil {
 		return err
 	}
@@ -207,6 +217,8 @@ func Stop() error {
 	//Stop panthalassa
 	err := panthalassaInstance.Stop()
 	if err != nil {
+		//Reset singleton
+		panthalassaInstance = nil
 		return err
 	}
 

panthalassa.go

@@ -30,7 +30,21 @@ func (p *Panthalassa) Stop() error {
 
 //Export account with the given password
 func (p *Panthalassa) Export(pw, pwConfirm string) (string, error) {
-	return p.km.Export(pw, pwConfirm)
+
+	// export
+	store, err := p.km.Export(pw, pwConfirm)
+	if err != nil {
+		return "", err
+	}
+
+	// marshal key store
+	rawStore, err := store.Marshal()
+	if err != nil {
+		return "", err
+	}
+
+	return string(rawStore), nil
+
 }
 
 // add friend to peer store

profile/profile.go

@@ -231,7 +231,7 @@ func SignProfile(name, location, image string, km km.KeyManager) (Profile, error
 }
 
 // sign's a profile without the need to start panthalassa
-func SignWithKeyManagerStore(name, location, image, keyManagerStore, password string) (Profile, error) {
+func SignWithKeyManagerStore(name, location, image string, keyManagerStore km.Store, password string) (Profile, error) {
 
 	keyManager, err := km.OpenWithPassword(keyManagerStore, password)
 	if err != nil {

utils.go

@@ -26,7 +26,20 @@ func NewAccountKeys(pw, pwConfirm string) (string, error) {
 	}
 
 	km := keyManager.CreateFromKeyStore(ks)
-	return km.Export(pw, pwConfirm)
+
+	// export store
+	store, err := km.Export(pw, pwConfirm)
+	if err != nil {
+		return "", err
+	}
+
+	rawStore, err := store.Marshal()
+	if err != nil {
+		return "", err
+	}
+
+	return string(rawStore), nil
+
 }
 
 //Create new account store from mnemonic
@@ -47,7 +60,18 @@ func NewAccountKeysFromMnemonic(mne, pw, pwConfirm string) (string, error) {
 
 	//Create keyManager
 	km := keyManager.CreateFromKeyStore(ks)
-	return km.Export(pw, pwConfirm)
+
+	store, err := km.Export(pw, pwConfirm)
+	if err != nil {
+		return "", err
+	}
+
+	rawStore, err := store.Marshal()
+	if err != nil {
+		return "", err
+	}
+
+	return string(rawStore), nil
 }
 
 //Check if mnemonic is valid
@@ -65,7 +89,12 @@ func IsValidMnemonic(mne string) bool {
 // sign profile
 func SignProfileStandAlone(name, location, image, keyManagerStore, password string) (string, error) {
 
-	p, err := profile.SignWithKeyManagerStore(name, location, image, keyManagerStore, password)
+	store, err := keyManager.UnmarshalStore([]byte(keyManagerStore))
+	if err != nil {
+		return "", err
+	}
+
+	p, err := profile.SignWithKeyManagerStore(name, location, image, store, password)
 
 	if err != nil {
 		return "", err