Disallow encryption of watchonly wallets

achow101 · hebasto · commit 7b7bbc145aed · 2022-11-21T10:31:30.000Z
Watchonly wallets do not have any private keys to encrypt. It does not make sense to encrypt such wallets, so disable the option to encrypt them. This avoids an assertion that can be hit when encrypting watchonly descriptor wallets. Github-Pull: bitcoin-core/gui#631 Rebased-From: 4c49541
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -1310,6 +1310,12 @@ void BitcoinGUI::setEncryptionStatus(int status)
 {
     switch(status)
     {
+    case WalletModel::NoKeys:
+        labelWalletEncryptionIcon->hide();
+        encryptWalletAction->setChecked(false);
+        changePassphraseAction->setEnabled(false);
+        encryptWalletAction->setEnabled(false);
+        break;
     case WalletModel::Unencrypted:
         labelWalletEncryptionIcon->hide();
         encryptWalletAction->setChecked(false);
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -305,6 +305,11 @@ WalletModel::EncryptionStatus WalletModel::getEncryptionStatus() const
 {
     if(!m_wallet->isCrypted())
     {
+        // A previous bug allowed for watchonly wallets to be encrypted (encryption keys set, but nothing is actually encrypted).
+        // To avoid misrepresenting the encryption status of such wallets, we only return NoKeys for watchonly wallets that are unencrypted.
+        if (m_wallet->privateKeysDisabled()) {
+            return NoKeys;
+        }
         return Unencrypted;
     }
     else if(m_wallet->isLocked())
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -71,6 +71,7 @@ class WalletModel : public QObject
 
     enum EncryptionStatus
     {
+        NoKeys,       // wallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)
         Unencrypted,  // !wallet->IsCrypted()
         Locked,       // wallet->IsCrypted() && wallet->IsLocked()
         Unlocked      // wallet->IsCrypted() && !wallet->IsLocked()

Original file line number	Diff line number	Diff line change
`@@ -1310,6 +1310,12 @@ void BitcoinGUI::setEncryptionStatus(int status)`
`1310`	`1310`	`{`
`1311`	`1311`	`switch(status)`
`1312`	`1312`	`{`
	`1313`	`+ case WalletModel::NoKeys:`
	`1314`	`+ labelWalletEncryptionIcon->hide();`
	`1315`	`+ encryptWalletAction->setChecked(false);`
	`1316`	`+ changePassphraseAction->setEnabled(false);`
	`1317`	`+ encryptWalletAction->setEnabled(false);`
	`1318`	`+ break;`
`1313`	`1319`	`case WalletModel::Unencrypted:`
`1314`	`1320`	`labelWalletEncryptionIcon->hide();`
`1315`	`1321`	`encryptWalletAction->setChecked(false);`
Original file line number	Diff line number	Diff line change
`@@ -305,6 +305,11 @@ WalletModel::EncryptionStatus WalletModel::getEncryptionStatus() const`
`305`	`305`	`{`
`306`	`306`	`if(!m_wallet->isCrypted())`
`307`	`307`	`{`
	`308`	`+ // A previous bug allowed for watchonly wallets to be encrypted (encryption keys set, but nothing is actually encrypted).`
	`309`	`+ // To avoid misrepresenting the encryption status of such wallets, we only return NoKeys for watchonly wallets that are unencrypted.`
	`310`	`+ if (m_wallet->privateKeysDisabled()) {`
	`311`	`+ return NoKeys;`
	`312`	`+ }`
`308`	`313`	`return Unencrypted;`
`309`	`314`	`}`
`310`	`315`	`else if(m_wallet->isLocked())`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ class WalletModel : public QObject`
`71`	`71`
`72`	`72`	`enum EncryptionStatus`
`73`	`73`	`{`
	`74`	`+ NoKeys, // wallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)`
`74`	`75`	`Unencrypted, // !wallet->IsCrypted()`
`75`	`76`	`Locked, // wallet->IsCrypted() && wallet->IsLocked()`
`76`	`77`	`Unlocked // wallet->IsCrypted() && !wallet->IsLocked()`