Skip to content

chore: Remove legacy mobile v1 migration workaround #6988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+0 −92
Open

chore: Remove legacy mobile v1 migration workaround #6988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 0 additions & 67 deletions api/geth_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,68 +558,6 @@ func (b *GethStatusBackend) LoginAccount(request *requests.Login) error {
return nil
}

// This is a workaround to make user be able to login again, the root cause is where the node config migration
// failed caused by adding new columns to the node config table, it's been fixed in PR: https://github.com/status-im/status-go/pull/6248.
// Details for the issue: it prevent user from login, it happens when old mobile user ignore upgrade the app to the version which introduced the node config migration
// and choose to upgrade a higher version instead, after upgrading, user first attempt to login will fail because the node config migration will fail.
// and second attempt to login will cause an empty node config saved in the db.
func (b *GethStatusBackend) workaroundToFixBadMigration(request *requests.Login) (err error) {
if !gocommon.IsMobilePlatform() { // this issue only happens on mobile platform
return nil
}

b.mu.Lock()
defer b.mu.Unlock()

var (
currentConf *params.NodeConfig
defaultNodeConf *params.NodeConfig
)
currentConf, err = nodecfg.GetNodeConfigFromDB(b.appDB)
if err != nil {
return err
}

// check if we saved a empty node config because of node config migration failed
if currentConf.NetworkID == 0 &&
currentConf.NodeKey == "" {
// check if exist old node config
oldNodeConf := &params.NodeConfig{}
err = b.appDB.QueryRow("SELECT node_config FROM settings WHERE synthetic_id = 'id'").Scan(&sqlite.JSONBlob{Data: oldNodeConf})
if err != nil && err != sql.ErrNoRows {
return err
}
if err == sql.ErrNoRows {
return errors.New("failed to migrate node config as there's no data in settings")
}

// the createAccount contains all the fields that are needed to create the default node config
createAccount := b.convertLoginRequestToAccountRequest(request)
defaultNodeConf, err = DefaultNodeConfig(oldNodeConf.ShhextConfig.InstallationID, request.KeyUID, createAccount)
if err != nil {
return err
}

b.overridePartialWithOldNodeConfig(defaultNodeConf, oldNodeConf)
var tx *sql.Tx
tx, err = b.appDB.BeginTx(context.Background(), &sql.TxOptions{})
if err != nil {
return err
}
defer func() {
if err == nil {
err = tx.Commit()
return
}
// don't shadow original error
_ = tx.Rollback()
}()
err = nodecfg.SaveConfigWithTx(tx, defaultNodeConf)
}

return nil
}

func (b *GethStatusBackend) overridePartialWithOldNodeConfig(conf *params.NodeConfig, oldNodeConf *params.NodeConfig) {
// rootDataDir should be set by InitializeApplication or UpdateRootDataDir already
conf.RootDataDir = b.rootDataDir
Expand Down Expand Up @@ -686,11 +624,6 @@ func (b *GethStatusBackend) loginAccount(request *requests.Login) error {
return errors.Wrap(err, "failed to open database")
}

//relate PR: https://github.com/status-im/status-go/pull/6248
if err := b.workaroundToFixBadMigration(request); err != nil {
return errors.Wrap(err, "failed to workaround bad migration")
}

defaultCfg := &params.NodeConfig{
// why we need this? relate PR: https://github.com/status-im/status-go/pull/4014
KeycardPairingDataFile: filepath.Join(b.rootDataDir, DefaultKeycardPairingDataFileRelativePath),
Expand Down
25 changes: 0 additions & 25 deletions api/old_mobile_v1_user_login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/stretchr/testify/suite"
"go.uber.org/zap"

"github.com/status-im/status-go/common"
"github.com/status-im/status-go/protocol/requests"
"github.com/status-im/status-go/t/utils"
)
Expand Down Expand Up @@ -51,27 +50,3 @@ func (s *OldMobileV1_10_UserLoginTest) TestLoginWithSuccessNodeConfigMigration()
s.Require().NoError(b.LoginAccount(loginRequest))
s.Require().NoError(b.Logout())
}

// without workaroundToFixBadMigration, this test would login fail
func (s *OldMobileV1_10_UserLoginTest) TestLoginWithFailNodeConfigMigration() {
bkFunc := common.IsMobilePlatform
common.IsMobilePlatform = func() bool {
return true
}
defer func() {
common.IsMobilePlatform = bkFunc
}()

s.tmpdir = s.T().TempDir()
copyDir(v1_10_AfterUpgradeFolder, s.tmpdir, s.T())

b := NewGethStatusBackend(s.logger)
b.UpdateRootDataDir(s.tmpdir)
s.Require().NoError(b.OpenAccounts(true))
loginRequest := &requests.Login{
KeyUID: v1_10_keyUID,
Password: v1_10_passwd,
}
err := b.LoginAccount(loginRequest)
s.Require().NoError(err)
}
Loading