status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: `DeleteAccount` and `AddMigratedKeyPair` declaration change 

Both functions `DeleteAccount` and `AddMigratedKeyPair` require password to be provided
in order to delete account from the keystore properly (removing account from the cache and
deleting corresponding local keystore file).

Password parameter can be also an empty string, since there are cases when an account is
not added to the keystore (in case of keycard account), so we have nothing to delete.
This commit is contained in:
Sale Djenic 2023-02-01 09:46:15 +01:00 committed by saledjenic
parent efee11d28a
commit 242c85cd6a
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
services/accounts/accounts.go
View File

@ -72,23 +72,35 @@ func (api *API) GetAccounts(ctx context.Context) ([]*accounts.Account, error) {
return accounts, nil
}
func (api *API) DeleteAccount(ctx context.Context, address types.Address) error {
func (api *API) DeleteAccount(ctx context.Context, address types.Address, password string) error {
if len(password) > 0 {
acc, err := api.db.GetAccountByAddress(address)
if err != nil {
return err
}
if acc.Type != accounts.AccountTypeWatch {
err = api.manager.DeleteAccount(address, "")
err = api.manager.DeleteAccount(address, password)
var e *account.ErrCannotLocateKeyFile
if err != nil && !errors.As(err, &e) {
return err
}
allAccountsOfKeypairWithKeyUID, err := api.db.GetAccountsByKeyUID(acc.KeyUID)
if err != nil {
return err
}
lastAcccountOfKeypairWithTheSameKey := len(allAccountsOfKeypairWithKeyUID) == 1
if lastAcccountOfKeypairWithTheSameKey {
err = api.manager.DeleteAccount(types.Address(common.HexToAddress(acc.DerivedFrom)), password)
var e *account.ErrCannotLocateKeyFile
if err != nil && !errors.As(err, &e) {
return err
}
}
return (*api.messenger).DeleteAccount(address)
}
}
func (api *API) DeleteAccountForMigratedKeypair(ctx context.Context, address types.Address) error {
return (*api.messenger).DeleteAccount(address)
}
@ -429,7 +441,7 @@ func (api *API) VerifyPassword(password string) bool {
return err == nil
}
func (api *API) AddMigratedKeyPair(ctx context.Context, kcUID string, kpName string, keyUID string, accountAddresses []string, keyStoreDir string) error {
func (api *API) AddMigratedKeyPair(ctx context.Context, kcUID string, kpName string, keyUID string, accountAddresses []string, password string) error {
var addresses []types.Address
for _, addr := range accountAddresses {
addresses = append(addresses, types.Address(common.HexToAddress(addr)))
@ -441,10 +453,13 @@ func (api *API) AddMigratedKeyPair(ctx context.Context, kcUID string, kpName str
}
// Once we migrate a keypair, corresponding keystore files need to be deleted.
if len(password) > 0 {
for _, addr := range addresses {
// This action deletes an account from the keystore, no need to check for error in this context here, cause if this
// action fails from whichever reason the account is still successfully migrated since keystore won't be used any more.
_ = api.manager.DeleteAccount(addr, "")
err = api.manager.DeleteAccount(addr, password)
if err != nil {
return err
}
}
}
return nil
}