fix: avoid imported wallet account deletion while converting it to keycard account (#2827)
- imported wallet accounts via seed phrase or private key are not deleted anymore when migrating any of those key pairs to a keycard
This commit is contained in:
parent
6376ad6e2d
commit
2e51450393
|
@ -699,6 +699,9 @@ func TestConvertAccount(t *testing.T) {
|
||||||
|
|
||||||
err = backend.ensureAppDBOpened(keycardAccount, keycardPassword)
|
err = backend.ensureAppDBOpened(keycardAccount, keycardPassword)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
b := NewGethStatusBackend()
|
||||||
|
require.NoError(t, b.OpenAccounts())
|
||||||
}
|
}
|
||||||
|
|
||||||
func copyFile(srcFolder string, dstFolder string, fileName string, t *testing.T) {
|
func copyFile(srcFolder string, dstFolder string, fileName string, t *testing.T) {
|
||||||
|
|
|
@ -576,23 +576,18 @@ func (b *GethStatusBackend) ConvertToKeycardAccount(keyStoreDir string, account
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = accountDB.DeleteSeedAndKeyAccounts()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
dbPath := filepath.Join(b.rootDataDir, fmt.Sprintf("%s.db", account.KeyUID))
|
|
||||||
err = appdatabase.ChangeDatabasePassword(dbPath, password, newPassword)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = b.closeAppDB()
|
err = b.closeAppDB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return os.RemoveAll(keyStoreDir)
|
err = os.RemoveAll(keyStoreDir)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
dbPath := filepath.Join(b.rootDataDir, fmt.Sprintf("%s.db", account.KeyUID))
|
||||||
|
return appdatabase.ChangeDatabasePassword(dbPath, password, newPassword)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *GethStatusBackend) VerifyDatabasePassword(keyUID string, password string) error {
|
func (b *GethStatusBackend) VerifyDatabasePassword(keyUID string, password string) error {
|
||||||
|
|
Loading…
Reference in New Issue