Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-04 18:47:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #494

Browse Source 
00aa231 Daemon rpc login support requires #1803 (Jaquee)
This commit is contained in:
Riccardo Spagni
2017-03-03 16:14:33 +02:00
parent e826f7c1ec 00aa23162c
commit 5b1588b077
5 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libwalletqt/Wallet.cpp
View File

@@ -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;
@@ -603,6 +610,8 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
m_daemonBlockChainTargetHeightTime.restart();
m_initialized = false;
m_connectionStatusRunning = false;
m_daemonUsername = "";
m_daemonPassword = "";
}
Wallet::~Wallet()

5
src/libwalletqt/Wallet.h
View File

@@ -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;
@@ -275,6 +278,8 @@ private:
mutable AddressBookModel * m_addressBookModel;
QMutex m_connectionStatusMutex;
bool m_connectionStatusRunning;
QString m_daemonUsername;
QString m_daemonPassword;
};