|
|
|
|
@ -3,10 +3,6 @@
|
|
|
|
|
|
|
|
|
|
#include "Wallet.h"
|
|
|
|
|
|
|
|
|
|
#include <chrono>
|
|
|
|
|
#include <stdexcept>
|
|
|
|
|
#include <thread>
|
|
|
|
|
|
|
|
|
|
#include "PendingTransaction.h"
|
|
|
|
|
#include "UnsignedTransaction.h"
|
|
|
|
|
#include "TransactionHistory.h"
|
|
|
|
|
@ -32,8 +28,6 @@
|
|
|
|
|
#include <QVector>
|
|
|
|
|
#include <QMutexLocker>
|
|
|
|
|
|
|
|
|
|
#include "utils/ScopeGuard.h"
|
|
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
static const int DAEMON_BLOCKCHAIN_HEIGHT_CACHE_TTL_SECONDS = 5;
|
|
|
|
|
static const int DAEMON_BLOCKCHAIN_TARGET_HEIGHT_CACHE_TTL_SECONDS = 30;
|
|
|
|
|
@ -107,20 +101,6 @@ bool Wallet::disconnected() const
|
|
|
|
|
return m_disconnected;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool Wallet::refreshing() const
|
|
|
|
|
{
|
|
|
|
|
return m_refreshing;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Wallet::refreshingSet(bool value)
|
|
|
|
|
{
|
|
|
|
|
if (m_refreshing.exchange(value) != value)
|
|
|
|
|
{
|
|
|
|
|
emit refreshingChanged();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void Wallet::setConnectionStatus(ConnectionStatus value)
|
|
|
|
|
{
|
|
|
|
|
if (m_connectionStatus == value)
|
|
|
|
|
@ -265,7 +245,7 @@ void Wallet::initAsync(
|
|
|
|
|
emit walletCreationHeightChanged();
|
|
|
|
|
qDebug() << "init async finished - starting refresh";
|
|
|
|
|
connected(true);
|
|
|
|
|
startRefresh();
|
|
|
|
|
m_walletImpl->startRefresh();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
if (future.first)
|
|
|
|
|
@ -476,14 +456,56 @@ bool Wallet::importOutputs(const QString& path) {
|
|
|
|
|
return m_walletImpl->importOutputs(path.toStdString());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Wallet::startRefresh()
|
|
|
|
|
bool Wallet::refresh()
|
|
|
|
|
{
|
|
|
|
|
m_refreshEnabled = true;
|
|
|
|
|
qDebug() << "refresh async";
|
|
|
|
|
m_walletImpl->refreshAsync();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Wallet::pauseRefresh()
|
|
|
|
|
void Wallet::startRefresh() const
|
|
|
|
|
{
|
|
|
|
|
m_refreshEnabled = false;
|
|
|
|
|
m_walletImpl->startRefresh();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Wallet::pauseRefresh() const
|
|
|
|
|
{
|
|
|
|
|
m_walletImpl->pauseRefresh();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString Wallet::getMultisigInfo() {
|
|
|
|
|
return QString::fromStdString(m_walletImpl->getMultisigInfo());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString Wallet::makeMultisig(QList<QString> &info, uint32_t threashold) {
|
|
|
|
|
std::vector<std::string> infos;
|
|
|
|
|
for(int i = 0; i < info.length(); i++) {
|
|
|
|
|
infos.push_back(info[i].toStdString());
|
|
|
|
|
}
|
|
|
|
|
QString multisig_info;
|
|
|
|
|
return multisig_info.fromStdString(m_walletImpl->makeMultisig(infos, threashold));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool Wallet::finalizeMultisig(QList<QString> &multisigInfos) {
|
|
|
|
|
std::vector<std::string> infos;
|
|
|
|
|
for(int i = 0; i < multisigInfos.length(); i++) {
|
|
|
|
|
infos.push_back(multisigInfos[i].toStdString());
|
|
|
|
|
}
|
|
|
|
|
return m_walletImpl->finalizeMultisig(infos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool Wallet::exportMultisigImages(QString &image) {
|
|
|
|
|
std::string img = image.toStdString();
|
|
|
|
|
auto ret = m_walletImpl->exportMultisigImages(img);
|
|
|
|
|
image.fromStdString(img);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Wallet::importMultisigImages(QList<QString> &images) {
|
|
|
|
|
std::vector<std::string> imgs;
|
|
|
|
|
for(int i = 0; i < images.length(); i++) {
|
|
|
|
|
imgs.push_back(images[i].toStdString());
|
|
|
|
|
}
|
|
|
|
|
m_walletImpl->importMultisigImages(imgs);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PendingTransaction *Wallet::createTransaction(const QString &dst_addr, const QString &payment_id,
|
|
|
|
|
@ -594,29 +616,6 @@ bool Wallet::submitTxFile(const QString &fileName) const
|
|
|
|
|
return m_walletImpl->importKeyImages(fileName.toStdString() + "_keyImages");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool Wallet::refresh(bool historyAndSubaddresses /* = true */)
|
|
|
|
|
{
|
|
|
|
|
refreshingSet(true);
|
|
|
|
|
const auto cleanup = sg::make_scope_guard([this]() noexcept {
|
|
|
|
|
refreshingSet(false);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
QMutexLocker locker(&m_asyncMutex);
|
|
|
|
|
|
|
|
|
|
bool result = m_walletImpl->refresh();
|
|
|
|
|
if (historyAndSubaddresses)
|
|
|
|
|
{
|
|
|
|
|
m_history->refresh(currentSubaddressAccount());
|
|
|
|
|
m_subaddress->refresh(currentSubaddressAccount());
|
|
|
|
|
m_subaddressAccount->getAll();
|
|
|
|
|
}
|
|
|
|
|
if (result)
|
|
|
|
|
emit updated();
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Wallet::commitTransactionAsync(PendingTransaction *t)
|
|
|
|
|
{
|
|
|
|
|
m_scheduler.run([this, t] {
|
|
|
|
|
@ -1100,8 +1099,6 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
|
|
|
|
|
, m_subaddressAccount(nullptr)
|
|
|
|
|
, m_subaddressAccountModel(nullptr)
|
|
|
|
|
, m_coinsModel(nullptr)
|
|
|
|
|
, m_refreshEnabled(false)
|
|
|
|
|
, m_refreshing(false)
|
|
|
|
|
, m_scheduler(this)
|
|
|
|
|
{
|
|
|
|
|
m_history = new TransactionHistory(m_walletImpl->history(), this);
|
|
|
|
|
@ -1120,17 +1117,12 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
|
|
|
|
|
m_connectionStatusRunning = false;
|
|
|
|
|
m_daemonUsername = "";
|
|
|
|
|
m_daemonPassword = "";
|
|
|
|
|
|
|
|
|
|
startRefreshThread();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Wallet::~Wallet()
|
|
|
|
|
{
|
|
|
|
|
qDebug("~Wallet: Closing wallet");
|
|
|
|
|
|
|
|
|
|
pauseRefresh();
|
|
|
|
|
m_walletImpl->stop();
|
|
|
|
|
|
|
|
|
|
m_scheduler.shutdownWaitForFinished();
|
|
|
|
|
|
|
|
|
|
delete m_addressBook;
|
|
|
|
|
@ -1160,32 +1152,3 @@ Wallet::~Wallet()
|
|
|
|
|
m_walletListener = NULL;
|
|
|
|
|
qDebug("m_walletImpl deleted");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Wallet::startRefreshThread()
|
|
|
|
|
{
|
|
|
|
|
const auto future = m_scheduler.run([this] {
|
|
|
|
|
constexpr const std::chrono::seconds refreshInterval{10};
|
|
|
|
|
constexpr const std::chrono::milliseconds intervalResolution{100};
|
|
|
|
|
|
|
|
|
|
auto last = std::chrono::steady_clock::now();
|
|
|
|
|
while (!m_scheduler.stopping())
|
|
|
|
|
{
|
|
|
|
|
if (m_refreshEnabled)
|
|
|
|
|
{
|
|
|
|
|
const auto now = std::chrono::steady_clock::now();
|
|
|
|
|
const auto elapsed = now - last;
|
|
|
|
|
if (elapsed >= refreshInterval)
|
|
|
|
|
{
|
|
|
|
|
refresh(false);
|
|
|
|
|
last = std::chrono::steady_clock::now();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::this_thread::sleep_for(intervalResolution);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
if (!future.first)
|
|
|
|
|
{
|
|
|
|
|
throw std::runtime_error("failed to start auto refresh thread");
|
|
|
|
|
}
|
|
|
|
|
}
|
mrdeveloper