DeleteMultiaccount method

VERSION

@@ -1 +1 @@
-0.55.1
+0.55.2

api/backend_test.go

@@ -614,3 +614,80 @@ func TestLoginWithKey(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, crypto.PubkeyToAddress(chatKey.PublicKey), extkey.Address)
 }
+
+func TestDeleteMulticcount(t *testing.T) {
+	backend := NewGethStatusBackend()
+
+	rootDataDir, err := ioutil.TempDir("", "test-keystore-dir")
+	require.NoError(t, err)
+	defer os.Remove(rootDataDir)
+
+	keyStoreDir := filepath.Join(rootDataDir, "keystore")
+
+	backend.rootDataDir = rootDataDir
+
+	err = backend.AccountManager().InitKeystore(keyStoreDir)
+	require.NoError(t, err)
+
+	backend.AccountManager()
+	accs, err := backend.AccountManager().
+		AccountsGenerator().
+		GenerateAndDeriveAddresses(12, 1, "", []string{"m/44'/60'/0'/0"})
+	require.NoError(t, err)
+
+	generateAccount := accs[0]
+	accountInfo, err := backend.AccountManager().
+		AccountsGenerator().
+		StoreAccount(generateAccount.ID, "123123")
+	require.NoError(t, err)
+
+	account := multiaccounts.Account{
+		Name:           "foo",
+		Timestamp:      1,
+		PhotoPath:      "path",
+		KeycardPairing: "pairing",
+		KeyUID:         generateAccount.KeyUID,
+	}
+
+	err = backend.ensureAppDBOpened(account, "123123")
+	require.NoError(t, err)
+
+	settings := accounts.Settings{
+		Address:           types.HexToAddress(accountInfo.Address),
+		CurrentNetwork:    "mainnet_rpc",
+		DappsAddress:      types.HexToAddress(accountInfo.Address),
+		EIP1581Address:    types.HexToAddress(accountInfo.Address),
+		InstallationID:    "d3efcff6-cffa-560e-a547-21d3858cbc51",
+		KeyUID:            account.KeyUID,
+		LatestDerivedPath: 0,
+		Name:              "Jittery Cornflowerblue Kingbird",
+		Networks:          &networks,
+		PhotoPath:         "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAAjklEQVR4nOzXwQmFMBAAUZXUYh32ZB32ZB02sxYQQSZGsod55/91WFgSS0RM+SyjA56ZRZhFmEWYRRT6h+M6G16zrxv6fdJpmUWYRbxsYr13dKfanpN0WmYRZhGzXz6AWYRZRIfbaX26fT9Jk07LLMIsosPt9I/dTDotswizCG+nhFmEWYRZhFnEHQAA///z1CFkYamgfQAAAABJRU5ErkJggg==",
+		PreviewPrivacy:    false,
+		PublicKey:         accountInfo.PublicKey,
+		SigningPhrase:     "yurt joey vibe",
+		WalletRootAddress: types.HexToAddress(accountInfo.Address)}
+
+	err = backend.saveAccountsAndSettings(
+		settings,
+		&params.NodeConfig{},
+		nil)
+	require.NoError(t, err)
+
+	err = backend.OpenAccounts()
+	require.NoError(t, err)
+
+	err = backend.SaveAccount(account)
+	require.NoError(t, err)
+
+	files, err := ioutil.ReadDir(rootDataDir)
+	require.NoError(t, err)
+	require.NotEqual(t, 3, len(files))
+
+	err = backend.DeleteMulticcount(account.KeyUID, keyStoreDir)
+	require.NoError(t, err)
+
+	files, err = ioutil.ReadDir(rootDataDir)
+	require.NoError(t, err)
+	require.Equal(t, 3, len(files))
+}

api/geth_backend.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"os"
 	"path/filepath"
 	"sync"
 	"time"
@@ -178,6 +179,35 @@ func (b *GethStatusBackend) SaveAccount(account multiaccounts.Account) error {
 	return b.multiaccountsDB.SaveAccount(account)
 }
 
+func (b *GethStatusBackend) DeleteMulticcount(keyUID string, keyStoreDir string) error {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	if b.multiaccountsDB == nil {
+		return errors.New("accounts db wasn't initialized")
+	}
+
+	err := b.multiaccountsDB.DeleteAccount(keyUID)
+	if err != nil {
+		return err
+	}
+
+	dbFiles := []string{
+		filepath.Join(b.rootDataDir, fmt.Sprintf("app-%x.sql", keyUID)),
+		filepath.Join(b.rootDataDir, fmt.Sprintf("app-%x.sql-shm", keyUID)),
+		filepath.Join(b.rootDataDir, fmt.Sprintf("app-%x.sql-wal", keyUID)),
+	}
+	for _, path := range dbFiles {
+		if _, err := os.Stat(path); err == nil {
+			err = os.Remove(path)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return os.RemoveAll(keyStoreDir)
+}
+
 func (b *GethStatusBackend) ensureAppDBOpened(account multiaccounts.Account, password string) (err error) {
 	b.mu.Lock()
 	defer b.mu.Unlock()

mobile/status.go

@@ -344,6 +344,16 @@ func SaveAccountAndLogin(accountData, password, settingsJSON, configJSON, subacc
 	return makeJSONResponse(nil)
 }
 
+// DeleteMultiaccount
+func DeleteMultiaccount(keyUID, keyStoreDir string) string {
+	err := statusBackend.DeleteMulticcount(keyUID, keyStoreDir)
+	if err != nil {
+		return makeJSONResponse(err)
+	}
+
+	return makeJSONResponse(nil)
+}
+
 // InitKeystore initialize keystore before doing any operations with keys.
 func InitKeystore(keydir string) string {
 	err := statusBackend.AccountManager().InitKeystore(keydir)