qt: update address warnings when wallet is encrypted

src/interfaces/wallet.h

@@ -291,11 +291,7 @@ class Wallet
     virtual std::unique_ptr<Handler> handleStatusChanged(StatusChangedFn fn) = 0;
 
     //! Register handler for address book changed messages.
-    using AddressBookChangedFn = std::function<void(const CTxDestination& address,
-        const std::string& label,
-        bool is_mine,
-        const std::string& purpose,
-        ChangeType status)>;
+    using AddressBookChangedFn = std::function<void(const CTxDestination& address, const std::string& label, bool is_mine, const std::string& purpose, ChangeType status, bool is_active)>;
     virtual std::unique_ptr<Handler> handleAddressBookChanged(AddressBookChangedFn fn) = 0;
 
     //! Register handler for transaction changed messages.

src/qt/addresstablemodel.cpp

@@ -109,7 +109,7 @@ class AddressTablePriv
         std::sort(cachedAddressTable.begin(), cachedAddressTable.end(), AddressTableEntryLessThan());
     }
 
-    void updateEntry(const QString &address, const QString &label, bool isMine, const QString &purpose, int status)
+    void updateEntry(const QString& address, const QString& label, bool isMine, const QString& purpose, int status, bool isActive)
     {
         // Find address / label in model
         QList<AddressTableEntry>::iterator lower = std::lower_bound(
@@ -130,7 +130,7 @@ class AddressTablePriv
                 break;
             }
             parent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex);
-            cachedAddressTable.insert(lowerIndex, AddressTableEntry(newEntryType, label, address, /*TODO:*/ false));
+            cachedAddressTable.insert(lowerIndex, AddressTableEntry(newEntryType, label, address, isActive));
             parent->endInsertRows();
             break;
         case CT_UPDATED:
@@ -357,11 +357,10 @@ QModelIndex AddressTableModel::index(int row, int column, const QModelIndex &par
     }
 }
 
-void AddressTableModel::updateEntry(const QString &address,
-        const QString &label, bool isMine, const QString &purpose, int status)
+void AddressTableModel::updateEntry(const QString& address, const QString& label, bool isMine, const QString& purpose, int status, bool isActive)
 {
     // Update address book model from Bitcoin core
-    priv->updateEntry(address, label, isMine, purpose, status);
+    priv->updateEntry(address, label, isMine, purpose, status, isActive);
 }
 
 QString AddressTableModel::addRow(const QString &type, const QString &label, const QString &address, const OutputType address_type)

src/qt/addresstablemodel.h

@@ -101,7 +101,7 @@ class AddressTableModel : public QAbstractTableModel
 public Q_SLOTS:
     /* Update address list from core.
      */
-    void updateEntry(const QString &address, const QString &label, bool isMine, const QString &purpose, int status);
+    void updateEntry(const QString& address, const QString& label, bool isMine, const QString& purpose, int status, bool isActive);
 
     friend class AddressTablePriv;
 };

src/qt/bitcoingui.cpp

@@ -1418,6 +1418,9 @@ void BitcoinGUI::updateWalletStatus()
     WalletModel * const walletModel = walletView->getWalletModel();
     setEncryptionStatus(walletModel->getEncryptionStatus());
     setHDStatus(walletModel->wallet().privateKeysDisabled(), walletModel->wallet().hdEnabled());
+
+    // Refresh requests table and address book to show warnings on old unencrypted keys
+    walletView->refreshAddressTables();
 }
 #endif // ENABLE_WALLET
 

src/qt/signverifymessagedialog.cpp

@@ -90,7 +90,7 @@ void SignVerifyMessageDialog::on_addressBookButton_SM_clicked()
 {
     if (model && model->getAddressTableModel())
     {
-        model->refresh(platformStyle, /*pk_hash_only=*/true);
+        model->RefreshAddressTableModel(platformStyle, /*pk_hash_only=*/true);
         AddressBookPage dlg(platformStyle, AddressBookPage::ForSelection, AddressBookPage::ReceivingTab, this);
         dlg.setModel(model->getAddressTableModel());
         if (dlg.exec())

src/qt/walletmodel.cpp

@@ -137,11 +137,10 @@ void WalletModel::updateTransaction()
     fForceCheckBalanceChanged = true;
 }
 
-void WalletModel::updateAddressBook(const QString &address, const QString &label,
-        bool isMine, const QString &purpose, int status)
+void WalletModel::updateAddressBook(const QString& address, const QString& label, bool isMine, const QString& purpose, int status, bool isActive)
 {
     if(addressTableModel)
-        addressTableModel->updateEntry(address, label, isMine, purpose, status);
+        addressTableModel->updateEntry(address, label, isMine, purpose, status, isActive);
 }
 
 void WalletModel::updateWatchOnlyFlag(bool fHaveWatchonly)
@@ -375,21 +374,14 @@ static void NotifyKeyStoreStatusChanged(WalletModel *walletmodel)
     assert(invoked);
 }
 
-static void NotifyAddressBookChanged(WalletModel *walletmodel,
-        const CTxDestination &address, const std::string &label, bool isMine,
-        const std::string &purpose, ChangeType status)
+static void NotifyAddressBookChanged(WalletModel* walletmodel, const CTxDestination& address, const std::string& label, bool isMine, const std::string& purpose, ChangeType status, bool isActive)
 {
     QString strAddress = QString::fromStdString(EncodeDestination(address));
     QString strLabel = QString::fromStdString(label);
     QString strPurpose = QString::fromStdString(purpose);
 
-    qDebug() << "NotifyAddressBookChanged: " + strAddress + " " + strLabel + " isMine=" + QString::number(isMine) + " purpose=" + strPurpose + " status=" + QString::number(status);
-    bool invoked = QMetaObject::invokeMethod(walletmodel, "updateAddressBook",
-                              Q_ARG(QString, strAddress),
-                              Q_ARG(QString, strLabel),
-                              Q_ARG(bool, isMine),
-                              Q_ARG(QString, strPurpose),
-                              Q_ARG(int, status));
+    qDebug() << "NotifyAddressBookChanged: " + strAddress + " " + strLabel + " isMine=" + QString::number(isMine) + " purpose=" + strPurpose + " status=" + QString::number(status) + " isActive=" + QString::number(isActive);
+    bool invoked = QMetaObject::invokeMethod(walletmodel, "updateAddressBook", Q_ARG(QString, strAddress), Q_ARG(QString, strLabel), Q_ARG(bool, isMine), Q_ARG(QString, strPurpose), Q_ARG(int, status), Q_ARG(bool, isActive));
     assert(invoked);
 }
 
@@ -428,7 +420,7 @@ void WalletModel::subscribeToCoreSignals()
     // Connect signals to wallet
     m_handler_unload = m_wallet->handleUnload(std::bind(&NotifyUnload, this));
     m_handler_status_changed = m_wallet->handleStatusChanged(std::bind(&NotifyKeyStoreStatusChanged, this));
-    m_handler_address_book_changed = m_wallet->handleAddressBookChanged(std::bind(NotifyAddressBookChanged, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5));
+    m_handler_address_book_changed = m_wallet->handleAddressBookChanged(std::bind(NotifyAddressBookChanged, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6));
     m_handler_transaction_changed = m_wallet->handleTransactionChanged(std::bind(NotifyTransactionChanged, this, std::placeholders::_1, std::placeholders::_2));
     m_handler_show_progress = m_wallet->handleShowProgress(std::bind(ShowProgress, this, std::placeholders::_1, std::placeholders::_2));
     m_handler_watch_only_changed = m_wallet->handleWatchOnlyChanged(std::bind(NotifyWatchonlyChanged, this, std::placeholders::_1));
@@ -601,11 +593,16 @@ bool WalletModel::isMultiwallet() const
     return m_node.walletLoader().getWallets().size() > 1;
 }
 
-void WalletModel::refresh(const PlatformStyle* platformStyle, bool pk_hash_only)
+void WalletModel::RefreshAddressTableModel(const PlatformStyle* platformStyle, bool pk_hash_only)
 {
     addressTableModel = new AddressTableModel(platformStyle, this, pk_hash_only);
 }
 
+void WalletModel::RefreshRecentRequestsTableModel(const PlatformStyle* platformStyle)
+{
+    recentRequestsTableModel = new RecentRequestsTableModel(platformStyle, this);
+}
+
 uint256 WalletModel::getLastBlockProcessed() const
 {
     return m_client_model ? m_client_model->getBestBlockHash() : uint256{};

src/qt/walletmodel.h

@@ -149,7 +149,8 @@ class WalletModel : public QObject
 
     bool isMultiwallet() const;
 
-    void refresh(const PlatformStyle* platformStyle, bool pk_hash_only = false);
+    void RefreshAddressTableModel(const PlatformStyle* platformStyle, bool pk_hash_only = false);
+    void RefreshRecentRequestsTableModel(const PlatformStyle* platformStyle);
 
     uint256 getLastBlockProcessed() const;
 
@@ -236,7 +237,7 @@ public Q_SLOTS:
     /* New transaction, or transaction changed status */
     void updateTransaction();
     /* New, updated or removed address book entry */
-    void updateAddressBook(const QString &address, const QString &label, bool isMine, const QString &purpose, int status);
+    void updateAddressBook(const QString& address, const QString& label, bool isMine, const QString& purpose, int status, bool isActive);
     /* Watch-only added */
     void updateWatchOnlyFlag(bool fHaveWatchonly);
     /* Current, immature or unconfirmed balance might have changed - emit 'balanceChanged' if so */

src/qt/walletview.cpp

@@ -200,6 +200,14 @@ void WalletView::showOutOfSyncWarning(bool fShow)
     overviewPage->showOutOfSyncWarning(fShow);
 }
 
+void WalletView::refreshAddressTables()
+{
+    walletModel->RefreshRecentRequestsTableModel(platformStyle);
+    receiveCoinsPage->setModel(walletModel);
+    walletModel->RefreshAddressTableModel(platformStyle);
+    usedReceivingAddressesPage->setModel(walletModel->getAddressTableModel());
+}
+
 void WalletView::encryptWallet()
 {
     auto dlg = new AskPassphraseDialog(AskPassphraseDialog::Encrypt, this);

src/qt/walletview.h

@@ -48,6 +48,7 @@ class WalletView : public QStackedWidget
     bool handlePaymentRequest(const SendCoinsRecipient& recipient);
 
     void showOutOfSyncWarning(bool fShow);
+    void refreshAddressTables();
 
 private:
     ClientModel* clientModel{nullptr};

src/wallet/interfaces.cpp

@@ -502,7 +502,7 @@ class WalletImpl : public Wallet
     {
         return MakeSignalHandler(m_wallet->NotifyAddressBookChanged.connect(
             [fn](const CTxDestination& address, const std::string& label, bool is_mine,
-                 const std::string& purpose, ChangeType status) { fn(address, label, is_mine, purpose, status); }));
+                 const std::string& purpose, ChangeType status, bool is_active) { fn(address, label, is_mine, purpose, status, is_active); }));
     }
     std::unique_ptr<Handler> handleTransactionChanged(TransactionChangedFn fn) override
     {

src/wallet/wallet.cpp

@@ -2404,6 +2404,7 @@ bool CWallet::SetAddressBookWithDB(WalletBatch& batch, const CTxDestination& add
 {
     bool fUpdated = false;
     bool is_mine;
+    bool is_active = false;
     {
         LOCK(cs_wallet);
         std::map<CTxDestination, CAddressBookData>::iterator mi = m_address_book.find(address);
@@ -2412,9 +2413,9 @@ bool CWallet::SetAddressBookWithDB(WalletBatch& batch, const CTxDestination& add
         if (!strPurpose.empty()) /* update purpose only if requested */
             m_address_book[address].purpose = strPurpose;
         is_mine = IsMine(address) != ISMINE_NO;
+        is_active = IsDestinationActive(address);
     }
-    NotifyAddressBookChanged(address, strName, is_mine,
-                             strPurpose, (fUpdated ? CT_UPDATED : CT_NEW));
+    NotifyAddressBookChanged(address, strName, is_mine, strPurpose, (fUpdated ? CT_UPDATED : CT_NEW), is_active);
     if (!strPurpose.empty() && !batch.WritePurpose(EncodeDestination(address), strPurpose))
         return false;
     return batch.WriteName(EncodeDestination(address), strName);
@@ -2449,7 +2450,7 @@ bool CWallet::DelAddressBook(const CTxDestination& address)
         is_mine = IsMine(address) != ISMINE_NO;
     }
 
-    NotifyAddressBookChanged(address, "", is_mine, "", CT_DELETED);
+    NotifyAddressBookChanged(address, "", is_mine, "", CT_DELETED, false);
 
     batch.ErasePurpose(EncodeDestination(address));
     return batch.EraseName(EncodeDestination(address));

src/wallet/wallet.h

@@ -743,10 +743,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
      * Address book entry changed.
      * @note called without lock cs_wallet held.
      */
-    boost::signals2::signal<void(const CTxDestination& address,
-                                 const std::string& label, bool isMine,
-                                 const std::string& purpose, ChangeType status)>
-        NotifyAddressBookChanged;
+    boost::signals2::signal<void(const CTxDestination& address, const std::string& label, bool isMine, const std::string& purpose, ChangeType status, bool isActive)> NotifyAddressBookChanged;
 
     /**
      * Wallet transaction added, removed or updated.