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_: account address derivation in mobile user upgrade

This commit is contained in:
frank 2024-08-21 14:39:29 +08:00 committed by Andrea Maria Piana
parent 605ceae989
commit f95892564a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/old_mobile_user_upgrading_from_v1_to_v2_test.go
View File

@ -40,6 +40,7 @@ const (
// Wallet: 0, Chat: 0, Type: 'seed', Path: m/44'/60'/0'/0/0, Name: 'seed', Derived_from: '', Pubkey: 0x04FDE3E5... // Wallet: 0, Chat: 0, Type: 'seed', Path: m/44'/60'/0'/0/0, Name: 'seed', Derived_from: '', Pubkey: 0x04FDE3E5...
// seed phrase for 0xB7A1233D1309CE665A3A4DB088E4A046EB333545: vocal blouse script census island armor seek catch wool narrow peasant attract // seed phrase for 0xB7A1233D1309CE665A3A4DB088E4A046EB333545: vocal blouse script census island armor seek catch wool narrow peasant attract
// private key for 0x516312D69737C5E6EF16F22E0097FF5D9F0C4196: c3ad0b50652318f845565c13761e5369ce75dcbc2a94616e15b829d4b07410fe // private key for 0x516312D69737C5E6EF16F22E0097FF5D9F0C4196: c3ad0b50652318f845565c13761e5369ce75dcbc2a94616e15b829d4b07410fe
// status account seed phrase: coin globe kit hamster notable proof orphan always mistake usual morning usage
srcFolder = "../static/test-mobile-release-1.20.x-aa6e4b2-account/" srcFolder = "../static/test-mobile-release-1.20.x-aa6e4b2-account/"
) )
@ -173,6 +174,7 @@ func (s *OldMobileUserUpgradingFromV1ToV2Test) TestAddWalletAccountAfterUpgradin
profileKp := profileKps[0] profileKp := profileKps[0]
s.Require().True(profileKp.DerivedFrom == walletRootAddress.Hex()) s.Require().True(profileKp.DerivedFrom == walletRootAddress.Hex())
s.Require().False(masterAddress.Hex() == walletRootAddress.Hex()) s.Require().False(masterAddress.Hex() == walletRootAddress.Hex())
s.T().Logf("masterAddress: %s, walletRootAddress: %s", masterAddress.Hex(), walletRootAddress.Hex())
// simulate mobile frontend adding a wallet account // simulate mobile frontend adding a wallet account
suggestedPath, err := db.ResolveSuggestedPathForKeypair(oldMobileUserKeyUID) suggestedPath, err := db.ResolveSuggestedPathForKeypair(oldMobileUserKeyUID)
@ -184,6 +186,8 @@ func (s *OldMobileUserUpgradingFromV1ToV2Test) TestAddWalletAccountAfterUpgradin
s.Require().NoError(err) s.Require().NoError(err)
s.Require().Len(infoMap, 1) s.Require().Len(infoMap, 1)
deriveAccountInfo := infoMap[suggestedPath] deriveAccountInfo := infoMap[suggestedPath]
expectedDerivedAddress := "0xf44F8Ebc5b088e0eA8a0f7309A4a0c525AD783DA"
s.Require().Equal(expectedDerivedAddress, deriveAccountInfo.Address)
derivedAddress := types.HexToAddress(deriveAccountInfo.Address) derivedAddress := types.HexToAddress(deriveAccountInfo.Address)
accountsAPI := b.StatusNode().AccountService().AccountsAPI() accountsAPI := b.StatusNode().AccountService().AccountsAPI()
err = accountsAPI.AddAccount(context.Background(), oldMobileUserPasswd, &accounts.Account{ err = accountsAPI.AddAccount(context.Background(), oldMobileUserPasswd, &accounts.Account{

16
multiaccounts/accounts/database.go
View File

@ -1740,17 +1740,27 @@ func (db *Database) ResolveSuggestedPathForKeypair(keyUID string) (suggestedPath
nextIndex := kp.LastUsedDerivationIndex + 1 nextIndex := kp.LastUsedDerivationIndex + 1
for i := nextIndex; i < numOfAddressesToGenerater; i++ { for i := nextIndex; i < numOfAddressesToGenerater; i++ {
suggestedPath := fmt.Sprintf("%s%d", statusWalletRootPath, i) suggestedPath = fmt.Sprintf("%s%d", statusWalletRootPath, i)
relativePath := fmt.Sprintf("m/%d", i)
found := false found := false
for _, acc := range kp.Accounts { for _, acc := range kp.Accounts {
if acc.Path != suggestedPath { if acc.Path != suggestedPath && acc.Path != relativePath {
continue continue
} }
found = true found = true
break break
} }
if !found { if !found {
// relate custom migration https://github.com/status-im/status-go/pull/5279/files#diff-e62600839ff3a2748953a173d3627e2c48a252b0a962a25a873b778313f81494
if kp.Type == KeypairTypeProfile {
walletRootAddress, err := db.GetWalletRootAddress()
if err != nil {
return relativePath, err
}
if kp.DerivedFrom == walletRootAddress.Hex() { // derive from wallet root
return relativePath, nil
}
}
return suggestedPath, nil return suggestedPath, nil
} }
} }