aboutsummaryrefslogtreecommitdiff
path: root/src/libwalletqt/Wallet.cpp
diff options
context:
space:
mode:
authorstoffu <stoffu@protonmail.ch>2018-06-04 17:05:29 +0900
committerstoffu <stoffu@protonmail.ch>2018-08-24 12:54:43 +0900
commit9bb6a25f311bccff3d089ae0b0a4156b16d6e109 (patch)
tree8faa3a811497f4be297d3d9ebd1188a391a38006 /src/libwalletqt/Wallet.cpp
parentc3f41ae0038a2338566e702264c3095857acac1c (diff)
downloadmonzero-gui-9bb6a25f311bccff3d089ae0b0a4156b16d6e109.tar.gz
monzero-gui-9bb6a25f311bccff3d089ae0b0a4156b16d6e109.tar.xz
monzero-gui-9bb6a25f311bccff3d089ae0b0a4156b16d6e109.zip
Add support for creating hardware wallet
Diffstat (limited to 'src/libwalletqt/Wallet.cpp')
-rw-r--r--src/libwalletqt/Wallet.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 0047f8dd..2c6e92c9 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -172,12 +172,18 @@ bool Wallet::store(const QString &path)
return m_walletImpl->store(path.toStdString());
}
-bool Wallet::init(const QString &daemonAddress, quint64 upperTransactionLimit, bool isRecovering, quint64 restoreHeight)
+bool Wallet::init(const QString &daemonAddress, quint64 upperTransactionLimit, bool isRecovering, bool isRecoveringFromDevice, quint64 restoreHeight)
{
qDebug() << "init non async";
if (isRecovering){
qDebug() << "RESTORING";
m_walletImpl->setRecoveringFromSeed(true);
+ }
+ if (isRecoveringFromDevice){
+ qDebug() << "RESTORING FROM DEVICE";
+ m_walletImpl->setRecoveringFromDevice(true);
+ }
+ if (isRecovering || isRecoveringFromDevice) {
m_walletImpl->setRefreshFromBlockHeight(restoreHeight);
}
m_walletImpl->init(daemonAddress.toStdString(), upperTransactionLimit, m_daemonUsername.toStdString(), m_daemonPassword.toStdString());
@@ -191,7 +197,7 @@ void Wallet::setDaemonLogin(const QString &daemonUsername, const QString &daemon
m_daemonPassword = daemonPassword;
}
-void Wallet::initAsync(const QString &daemonAddress, quint64 upperTransactionLimit, bool isRecovering, quint64 restoreHeight)
+void Wallet::initAsync(const QString &daemonAddress, quint64 upperTransactionLimit, bool isRecovering, bool isRecoveringFromDevice, quint64 restoreHeight)
{
qDebug() << "initAsync: " + daemonAddress;
// Change status to disconnected if connected
@@ -201,7 +207,7 @@ void Wallet::initAsync(const QString &daemonAddress, quint64 upperTransactionLim
}
QFuture<bool> future = QtConcurrent::run(this, &Wallet::init,
- daemonAddress, upperTransactionLimit, isRecovering, restoreHeight);
+ daemonAddress, upperTransactionLimit, isRecovering, isRecoveringFromDevice, restoreHeight);
QFutureWatcher<bool> * watcher = new QFutureWatcher<bool>();
connect(watcher, &QFutureWatcher<bool>::finished,