fix: mutex in account

go/internal/account/account.go

@@ -5,6 +5,7 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"strings"
+	"sync"
 
 	"github.com/aead/ecdh"
 	"github.com/ipfs/go-ipfs/keystore"
@@ -17,6 +18,7 @@ import (
 
 type Account struct {
 	ks keystore.Keystore
+	mu sync.Mutex
 }
 
 const (
@@ -30,16 +32,25 @@ const (
 
 // AccountPrivKey returns the private key associated with the current account
 func (a *Account) AccountPrivKey() (crypto.PrivKey, error) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+
 	return a.getOrGenerateNamedKey(keyAccount)
 }
 
 // AccountProofPrivKey returns the private key associated with the current account
 func (a *Account) AccountProofPrivKey() (crypto.PrivKey, error) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+
 	return a.getOrGenerateNamedKey(keyAccountProof)
 }
 
 // DevicePrivKey returns the current device private key
 func (a *Account) DevicePrivKey() (crypto.PrivKey, error) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+
 	return a.getOrGenerateNamedKey(keyDevice)
 }
 
@@ -122,6 +133,9 @@ func (a *Account) getOrGenerateNamedKey(name string) (crypto.PrivKey, error) {
 }
 
 func (a *Account) getOrGenerateDeviceKeyForGroupDevice(pk crypto.PubKey) (crypto.PrivKey, error) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+
 	groupPKRaw, err := pk.Raw()
 	if err != nil {
 		return nil, err

go/internal/ipfsutil/cfg.go

@@ -72,7 +72,7 @@ func CreateRepo(dstore ipfs_datastore.Batching, opts *BuildOpts) (ipfs_repo.Repo
 	} else {
 		portOffsetBI, err := rand.Int(rand.Reader, big.NewInt(100))
 		if err != nil {
-			panic(err)
+			return nil, errcode.TODO.Wrap(err)
 		}
 
 		portOffset := portOffsetBI.Int64() % 100

go/internal/ipfsutil/keystore_datastore.go

@@ -2,9 +2,10 @@ package ipfsutil
 
 import (
 	"github.com/ipfs/go-datastore"
-	"github.com/ipfs/go-datastore/query"
 	"github.com/ipfs/go-ipfs/keystore"
 	"github.com/libp2p/go-libp2p-core/crypto"
+
+	"berty.tech/berty/go/pkg/errcode"
 )
 
 type datastoreKeystore struct {
@@ -40,25 +41,7 @@ func (k *datastoreKeystore) Delete(name string) error {
 }
 
 func (k *datastoreKeystore) List() ([]string, error) {
-	// Not supported
-	res, err := k.ds.Query(query.Query{KeysOnly: true})
-	if err != nil {
-		return nil, err
-	}
-
-	result := []string(nil)
-
-	for {
-		val, next := res.NextSync()
-
-		result = append(result, val.Key)
-
-		if !next {
-			break
-		}
-	}
-
-	return result, nil
+	return nil, errcode.ErrNotImplemented
 }
 
 func NewDatastoreKeystore(ds datastore.Datastore) keystore.Keystore {