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

Adjust ConvertToKeycardAccount to make it compatible with mobile version

This commit is contained in:
Roman Volosovskyi 2023-02-02 11:49:23 +01:00
parent 2485143e20
commit 551715f493
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.128.0 0.128.1

42
api/geth_backend.go
View File

@ -564,6 +564,19 @@ func (b *GethStatusBackend) ChangeDatabasePassword(keyUID string, password strin
return nil return nil
} }
func (b *GethStatusBackend) tryToDeleteAccount(address types.Address, password, newPassword string) error {
err := b.accountManager.DeleteAccount(address, newPassword)
if err != nil {
err = b.accountManager.DeleteAccount(address, password)
if err != nil && err.Error() != "no key for given address or file" {
b.log.Error("error on deleting account", "err", err)
return err
}
}
return nil
}
func (b *GethStatusBackend) ConvertToKeycardAccount(account multiaccounts.Account, s settings.Settings, password string, newPassword string) error { func (b *GethStatusBackend) ConvertToKeycardAccount(account multiaccounts.Account, s settings.Settings, password string, newPassword string) error {
err := b.multiaccountsDB.UpdateAccountKeycardPairing(account.KeyUID, account.KeycardPairing) err := b.multiaccountsDB.UpdateAccountKeycardPairing(account.KeyUID, account.KeycardPairing)
if err != nil { if err != nil {
@ -639,13 +652,32 @@ func (b *GethStatusBackend) ConvertToKeycardAccount(account multiaccounts.Accoun
// whichever reason the account is still successfully migrated // whichever reason the account is still successfully migrated
for _, acc := range knownAccounts { for _, acc := range knownAccounts {
if account.KeyUID == acc.KeyUID { if account.KeyUID == acc.KeyUID {
_ = b.accountManager.DeleteAccount(acc.Address, newPassword) err = b.tryToDeleteAccount(acc.Address, password, newPassword)
if err != nil {
return err
} }
} }
_ = b.accountManager.DeleteAccount(masterAddress, newPassword) }
_ = b.accountManager.DeleteAccount(dappsAddress, newPassword)
_ = b.accountManager.DeleteAccount(eip1581Address, newPassword) err = b.tryToDeleteAccount(masterAddress, password, newPassword)
_ = b.accountManager.DeleteAccount(walletRootAddress, newPassword) if err != nil {
return err
}
err = b.tryToDeleteAccount(dappsAddress, password, newPassword)
if err != nil {
return err
}
err = b.tryToDeleteAccount(eip1581Address, password, newPassword)
if err != nil {
return err
}
err = b.tryToDeleteAccount(walletRootAddress, password, newPassword)
if err != nil {
return err
}
return nil return nil
} }