Merge remote-tracking branch 'benma/regression'

Author: benma

backend/accounts.go

@@ -1073,35 +1073,9 @@ func (backend *Backend) maybeAddP2TR(keystore keystore.Keystore, accounts []*con
 // perform migrations, updates etc. We use it to add taproot subaccounts to Bitcoin accounts that
 // were created (persisted) before the introduction of taproot support.
 func (backend *Backend) updatePersistedAccounts(
-	keystore keystore.Keystore, accountsConfig *config.AccountsConfig) error {
+	keystore keystore.Keystore, accounts []*config.Account) error {
 
-	// setWatch, if the keystore Watchonly flag is enabled, sets the `Watch`
-	// flag to `true`, turning this account into a watch-only account.
-	setWatch := func() error {
-		rootFingerprint, err := keystore.RootFingerprint()
-		if err != nil {
-			return err
-		}
-		if !accountsConfig.IsKeystoreWatchonly(rootFingerprint) {
-			return nil
-		}
-		for _, account := range accountsConfig.Accounts {
-			// If the account was added in the background as part of scanning, we don't mark it
-			// watchonly. Otherwise the account would appear automatically once it received funds,
-			// even if it was not visible before and the keystore is never connected again.
-			if !account.HiddenBecauseUnused && account.Watch == nil {
-				t := true
-				account.Watch = &t
-			}
-		}
-		return nil
-	}
-
-	if err := setWatch(); err != nil {
-		return err
-	}
-
-	return backend.maybeAddP2TR(keystore, accountsConfig.Accounts)
+	return backend.maybeAddP2TR(keystore, accounts)
 }
 
 // The accountsAndKeystoreLock must be held when calling this function.

backend/accounts_test.go

@@ -1381,16 +1381,6 @@ func TestWatchonly(t *testing.T) {
 		// Disable watchonly, all accounts disappear.
 		require.NoError(t, b.SetWatchonly(rootFingerprint, false))
 		checkShownAccountsLen(t, b, 0, 3)
-
-		// Re-enable watchonly - accounts do not show up yet.
-		require.NoError(t, b.SetWatchonly(rootFingerprint, true))
-		checkShownAccountsLen(t, b, 0, 3)
-
-		// Reconnecting the keystore brings back the watched accounts.
-		b.registerKeystore(ks)
-		checkShownAccountsLen(t, b, 3, 3)
-		b.DeregisterKeystore()
-		checkShownAccountsLen(t, b, 3, 3)
 	})
 
 	// Disable keystore's watchonly setting while keystore is connected does not make the accounts
@@ -1533,4 +1523,48 @@ func TestWatchonly(t *testing.T) {
 		checkShownAccountsLen(t, b, 3, 6)
 	})
 
+	// Adding new accounts after the keytore has been connected: new account is watched if the
+	// keystore is already watched.
+	t.Run("", func(t *testing.T) {
+		b := newBackend(t, testnetDisabled, regtestDisabled)
+		defer b.Close()
+
+		ks := makeBitBox02Multi()
+
+		rootFingerprint, err := ks.RootFingerprint()
+		require.NoError(t, err)
+
+		b.registerKeystore(ks)
+		checkShownAccountsLen(t, b, 3, 3)
+		require.NoError(t, b.SetWatchonly(rootFingerprint, true))
+
+		// An account may already have been added as part of autodiscover, so we add two.
+		newAccountCode1, err := b.CreateAndPersistAccountConfig(
+			coinpkg.CodeBTC,
+			"Bitcoin account name",
+			ks,
+		)
+		require.NoError(t, err)
+		require.Equal(t, accountsTypes.Code("v0-55555555-btc-1"), newAccountCode1)
+
+		expectedNewAccountCode2 := accountsTypes.Code("v0-55555555-btc-2")
+		// Make sure the account to be added has not been added yet (autodiscover), so we know we
+		// are testing the correct setting of the Watch flag when a new account is persisted.
+		require.Nil(t, b.Config().AccountsConfig().Lookup(expectedNewAccountCode2))
+
+		newAccountCode2, err := b.CreateAndPersistAccountConfig(
+			coinpkg.CodeBTC,
+			"Bitcoin account name 2",
+			ks,
+		)
+		require.NoError(t, err)
+		require.Equal(t, expectedNewAccountCode2, newAccountCode2)
+
+		require.NoError(t, err)
+
+		b.DeregisterKeystore()
+
+		// Accounts, including the newly added ones, remain loaded.
+		checkShownAccountsLen(t, b, 5, 5)
+	})
 }

backend/backend.go

@@ -640,7 +640,7 @@ func (backend *Backend) registerKeystore(keystore keystore.Keystore) {
 		// needed on the persisted accounts.
 		accounts := backend.filterAccounts(accountsConfig, belongsToKeystore)
 		if len(accounts) != 0 {
-			return backend.updatePersistedAccounts(keystore, accountsConfig)
+			return backend.updatePersistedAccounts(keystore, accounts)
 		}
 		return backend.persistDefaultAccountConfigs(keystore, accountsConfig)
 	})
@@ -920,7 +920,7 @@ func (backend *Backend) SetWatchonly(rootFingerprint []byte, watchonly bool) err
 	return backend.AccountSetWatch(
 		func(account *config.Account) bool {
 			// Apply to each currently loaded account.
-			return accounts.lookup(account.Code) != nil
+			return !account.HiddenBecauseUnused && accounts.lookup(account.Code) != nil
 		},
 		&t,
 	)