From 00aa23162c3300dfce19fc995e0eed0296e73a62 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Sat, 25 Feb 2017 22:16:58 +0100 Subject: Daemon rpc login support requires #1803 --- src/libwalletqt/Wallet.cpp | 11 ++++++++++- src/libwalletqt/Wallet.h | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 8913d4c3..2957618a 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -178,10 +178,17 @@ bool Wallet::init(const QString &daemonAddress, quint64 upperTransactionLimit, b m_walletImpl->setRecoveringFromSeed(true); m_walletImpl->setRefreshFromBlockHeight(restoreHeight); } - m_walletImpl->init(daemonAddress.toStdString(), upperTransactionLimit); + m_walletImpl->init(daemonAddress.toStdString(), upperTransactionLimit, m_daemonUsername.toStdString(), m_daemonPassword.toStdString()); return true; } +void Wallet::setDaemonLogin(const QString &daemonUsername, const QString &daemonPassword) +{ + // store daemon login + m_daemonUsername = daemonUsername; + m_daemonPassword = daemonPassword; +} + void Wallet::initAsync(const QString &daemonAddress, quint64 upperTransactionLimit, bool isRecovering, quint64 restoreHeight) { qDebug() << "initAsync: " + daemonAddress; @@ -593,6 +600,8 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent) m_daemonBlockChainTargetHeightTime.restart(); m_initialized = false; m_connectionStatusRunning = false; + m_daemonUsername = ""; + m_daemonPassword = ""; } Wallet::~Wallet() diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index a11cabe9..a01d5c37 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -106,6 +106,9 @@ public: //! initializes wallet asynchronously Q_INVOKABLE void initAsync(const QString &daemonAddress, quint64 upperTransactionLimit = 0, bool isRecovering = false, quint64 restoreHeight = 0); + // Set daemon rpc user/pass + Q_INVOKABLE void setDaemonLogin(const QString &daemonUsername = "", const QString &daemonPassword = ""); + //! create a view only wallet Q_INVOKABLE bool createViewOnly(const QString &path, const QString &password) const; @@ -271,6 +274,8 @@ private: mutable AddressBookModel * m_addressBookModel; QMutex m_connectionStatusMutex; bool m_connectionStatusRunning; + QString m_daemonUsername; + QString m_daemonPassword; }; -- cgit v1.2.3