qml: Add PaymentRequest to WalletQmlModel

Author: johnny9

src/Makefile.qt.include

@@ -43,6 +43,7 @@ QT_MOC_CPP = \
   qml/models/moc_networktraffictower.cpp \
   qml/models/moc_nodemodel.cpp \
   qml/models/moc_options_model.cpp \
+  qml/models/moc_paymentrequest.cpp \
   qml/models/moc_peerdetailsmodel.cpp \
   qml/models/moc_peerlistsortproxy.cpp \\
   qml/models/moc_sendrecipient.cpp \
@@ -136,6 +137,7 @@ BITCOIN_QT_H = \
   qml/models/networktraffictower.h \
   qml/models/nodemodel.h \
   qml/models/options_model.h \
+  qml/models/paymentrequest.h \
   qml/models/peerdetailsmodel.h \
   qml/models/peerlistsortproxy.h \
   qml/models/transaction.h \
@@ -338,6 +340,7 @@ BITCOIN_QML_BASE_CPP = \
   qml/models/networktraffictower.cpp \
   qml/models/nodemodel.cpp \
   qml/models/options_model.cpp \
+  qml/models/paymentrequest.cpp \
   qml/models/peerdetailsmodel.cpp \
   qml/models/peerlistsortproxy.cpp \
   qml/models/transaction.cpp \

src/qml/models/paymentrequest.cpp

@@ -0,0 +1,107 @@
+// Copyright (c) 2024-2025 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <qml/bitcoinamount.h>
+#include <qml/models/paymentrequest.h>
+
+#include <addresstype.h>
+#include <key_io.h>
+
+PaymentRequest::PaymentRequest(QObject* parent)
+    : QObject(parent)
+{
+    m_amount = new BitcoinAmount(this);
+    m_label = "";
+    m_message = "";
+    m_id = "";
+}
+
+QString PaymentRequest::address() const
+{
+    return QString::fromStdString(EncodeDestination(m_destination));
+}
+
+QString PaymentRequest::label() const
+{
+    return m_label;
+}
+
+void PaymentRequest::setLabel(const QString& label)
+{
+    if (m_label == label)
+        return;
+
+    m_label = label;
+    Q_EMIT labelChanged();
+}
+
+QString PaymentRequest::message() const
+{
+    return m_message;
+}
+
+void PaymentRequest::setMessage(const QString& message)
+{
+    if (m_message == message)
+        return;
+
+    m_message = message;
+    Q_EMIT messageChanged();
+}
+
+BitcoinAmount* PaymentRequest::amount() const
+{
+    return m_amount;
+}
+
+QString PaymentRequest::id() const
+{
+    return m_id;
+}
+
+void PaymentRequest::setId(const unsigned int id)
+{
+    m_id = QString::number(id);
+    Q_EMIT idChanged();
+}
+
+void PaymentRequest::setDestination(const CTxDestination& destination)
+{
+    m_destination = destination;
+    Q_EMIT addressChanged();
+}
+
+CTxDestination PaymentRequest::destination() const
+{
+    return m_destination;
+}
+
+void PaymentRequest::setAmountError(const QString& error)
+{
+    if (m_amountError == error)
+        return;
+
+    m_amountError = error;
+    Q_EMIT amountErrorChanged();
+}
+
+QString PaymentRequest::amountError() const
+{
+    return m_amountError;
+}
+
+void PaymentRequest::clear()
+{
+    m_destination = CNoDestination();
+    m_label.clear();
+    m_message.clear();
+    m_amount->clear();
+    m_amountError.clear();
+    m_id.clear();
+    Q_EMIT addressChanged();
+    Q_EMIT labelChanged();
+    Q_EMIT messageChanged();
+    Q_EMIT amountErrorChanged();
+    Q_EMIT idChanged();
+}

src/qml/models/paymentrequest.h

@@ -0,0 +1,63 @@
+// Copyright (c) 2024-2025 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_QML_MODELS_PAYMENTREQUEST_H
+#define BITCOIN_QML_MODELS_PAYMENTREQUEST_H
+
+#include <qml/bitcoinamount.h>
+
+#include <addresstype.h>
+
+#include <QObject>
+
+class PaymentRequest : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString address READ address NOTIFY addressChanged)
+    Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
+    Q_PROPERTY(QString message READ message WRITE setMessage NOTIFY messageChanged)
+    Q_PROPERTY(BitcoinAmount* amount READ amount CONSTANT)
+    Q_PROPERTY(QString amountError READ amountError NOTIFY amountErrorChanged)
+    Q_PROPERTY(QString id READ id NOTIFY idChanged)
+
+public:
+    explicit PaymentRequest(QObject* parent = nullptr);
+
+    QString address() const;
+
+    QString label() const;
+    void setLabel(const QString& label);
+
+    QString message() const;
+    void setMessage(const QString& message);
+
+    BitcoinAmount* amount() const;
+    QString amountError() const;
+    void setAmountError(const QString& error);
+
+    QString id() const;
+    void setId(unsigned int id);
+
+    void setDestination(const CTxDestination& destination);
+    CTxDestination destination() const;
+
+    Q_INVOKABLE void clear();
+
+Q_SIGNALS:
+    void addressChanged();
+    void labelChanged();
+    void messageChanged();
+    void amountErrorChanged();
+    void idChanged();
+
+private:
+    CTxDestination m_destination;
+    QString m_label;
+    QString m_message;
+    QString m_amountError;
+    BitcoinAmount* m_amount;
+    QString m_id;
+};
+
+#endif // BITCOIN_QML_MODELS_PAYMENTREQUEST_H

src/qml/models/walletqmlmodel.cpp

@@ -1,11 +1,12 @@
 
-// Copyright (c) 2024 The Bitcoin Core developers
+// Copyright (c) 2024-2025 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <qml/models/walletqmlmodel.h>
 
 #include <qml/models/activitylistmodel.h>
+#include <qml/models/paymentrequest.h>
 #include <qml/models/sendrecipient.h>
 #include <qml/models/sendrecipientslistmodel.h>
 #include <qml/models/walletqmlmodeltransaction.h>
@@ -20,6 +21,8 @@
 
 #include <QTimer>
 
+unsigned int WalletQmlModel::m_next_payment_request_id{1};
+
 WalletQmlModel::WalletQmlModel(std::unique_ptr<interfaces::Wallet> wallet, QObject *parent)
     : QObject(parent)
 {
@@ -71,6 +74,29 @@ QString WalletQmlModel::name() const
     return QString::fromStdString(m_wallet->getWalletName());
 }
 
+void WalletQmlModel::commitPaymentRequest()
+{
+    if (!m_current_payment_request) {
+        return;
+    }
+
+    if (m_current_payment_request->id().isEmpty()) {
+        m_current_payment_request->setId(m_next_payment_request_id++);
+    }
+
+    if (m_current_payment_request->address().isEmpty()) {
+        // TODO: handle issues with getting the new address (wallet unlock?)
+        auto destination = m_wallet->getNewDestination(OutputType::BECH32M,
+                                                       m_current_payment_request->label().toStdString())
+                               .value();
+        std::string address = EncodeDestination(destination);
+        m_current_payment_request->setDestination(destination);
+    }
+
+    m_wallet->setAddressReceiveRequest(
+        m_current_payment_request->destination(), m_current_payment_request->id().toStdString(), m_current_payment_request->message().toStdString());
+}
+
 std::set<interfaces::WalletTx> WalletQmlModel::getWalletTxs() const
 {
     if (!m_wallet) {

src/qml/models/walletqmlmodel.h

@@ -7,6 +7,7 @@
 
 #include <qml/models/activitylistmodel.h>
 #include <qml/models/coinslistmodel.h>
+#include <qml/models/paymentrequest.h>
 #include <qml/models/sendrecipient.h>
 #include <qml/models/sendrecipientslistmodel.h>
 #include <qml/models/walletqmlmodeltransaction.h>
@@ -30,6 +31,7 @@ class WalletQmlModel : public QObject
     Q_PROPERTY(CoinsListModel* coinsListModel READ coinsListModel CONSTANT)
     Q_PROPERTY(SendRecipientsListModel* recipients READ sendRecipientList CONSTANT)
     Q_PROPERTY(WalletQmlModelTransaction* currentTransaction READ currentTransaction NOTIFY currentTransactionChanged)
+    Q_PROPERTY(PaymentRequest* currentPaymentRequest READ currentPaymentRequest CONSTANT)
 
 public:
     WalletQmlModel(std::unique_ptr<interfaces::Wallet> wallet, QObject* parent = nullptr);
@@ -39,6 +41,8 @@ class WalletQmlModel : public QObject
     QString name() const;
     QString balance() const;
     CAmount balanceSatoshi() const;
+    Q_INVOKABLE void commitPaymentRequest();
+    PaymentRequest* currentPaymentRequest() const { return m_current_payment_request; }
 
     ActivityListModel* activityListModel() const { return m_activity_list_model; }
     CoinsListModel* coinsListModel() const { return m_coins_list_model; }
@@ -73,7 +77,10 @@ class WalletQmlModel : public QObject
     void currentTransactionChanged();
 
 private:
+    static unsigned int m_next_payment_request_id;
+
     std::unique_ptr<interfaces::Wallet> m_wallet;
+    PaymentRequest* m_current_payment_request{nullptr};
     ActivityListModel* m_activity_list_model{nullptr};
     CoinsListModel* m_coins_list_model{nullptr};
     SendRecipientsListModel* m_send_recipients{nullptr};