update// reformated code in connection.cpp
This commit is contained in:
@@ -5,42 +5,47 @@
|
||||
#include "firsttimewizard.h"
|
||||
#include "ui_createhushconfdialog.h"
|
||||
#include "controller.h"
|
||||
|
||||
|
||||
#include "../lib/silentdragonlitelib.h"
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
||||
ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc) {
|
||||
ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc)
|
||||
{
|
||||
this->main = main;
|
||||
this->rpc = rpc;
|
||||
|
||||
d = new QDialog(main);
|
||||
connD = new Ui_ConnectionDialog();
|
||||
connD->setupUi(d);
|
||||
QPixmap logo(":/img/res/logobig.gif");
|
||||
connD->topIcon->setBasePixmap(logo.scaled(256, 256, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
||||
|
||||
connD->topIcon->setBasePixmap(
|
||||
logo.scaled(
|
||||
256,
|
||||
256,
|
||||
Qt::KeepAspectRatio,
|
||||
Qt::SmoothTransformation
|
||||
)
|
||||
);
|
||||
isSyncing = new QAtomicInteger<bool>();
|
||||
}
|
||||
|
||||
ConnectionLoader::~ConnectionLoader() {
|
||||
ConnectionLoader::~ConnectionLoader()
|
||||
{
|
||||
delete isSyncing;
|
||||
delete connD;
|
||||
delete d;
|
||||
}
|
||||
|
||||
void ConnectionLoader::loadConnection() {
|
||||
void ConnectionLoader::loadConnection()
|
||||
{
|
||||
QTimer::singleShot(1, [=]() { this->doAutoConnect(); });
|
||||
if (!Settings::getInstance()->isHeadless())
|
||||
d->exec();
|
||||
}
|
||||
|
||||
void ConnectionLoader::doAutoConnect() {
|
||||
void ConnectionLoader::doAutoConnect()
|
||||
{
|
||||
qDebug() << "Doing autoconnect";
|
||||
|
||||
auto config = std::shared_ptr<ConnectionConfig>(new ConnectionConfig());
|
||||
config->dangerous = true;
|
||||
config->server = Settings::getInstance()->getSettings().server;
|
||||
@@ -49,16 +54,24 @@ void ConnectionLoader::doAutoConnect() {
|
||||
main->logger->write(QObject::tr("Attempting to initialize library with ") + config->server);
|
||||
|
||||
// Check to see if there's an existing wallet
|
||||
if (litelib_wallet_exists(Settings::getDefaultChainName().toStdString().c_str())) {
|
||||
if (litelib_wallet_exists(Settings::getDefaultChainName().toStdString().c_str()))
|
||||
{
|
||||
main->logger->write(QObject::tr("Using existing wallet."));
|
||||
char* resp = litelib_initialize_existing(config->dangerous, config->server.toStdString().c_str());
|
||||
char* resp = litelib_initialize_existing(
|
||||
config->dangerous,
|
||||
config->server.toStdString().c_str()
|
||||
);
|
||||
QString response = litelib_process_response(resp);
|
||||
|
||||
if (response.toUpper().trimmed() != "OK") {
|
||||
if (response.toUpper().trimmed() != "OK")
|
||||
{
|
||||
showError(response);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
main->logger->write(QObject::tr("Create/restore wallet."));
|
||||
createOrRestore(config->dangerous, config->server);
|
||||
d->show();
|
||||
@@ -72,7 +85,6 @@ void ConnectionLoader::doAutoConnect() {
|
||||
// If success, set the connection
|
||||
main->logger->write("Connection is online.");
|
||||
connection->setInfo(reply);
|
||||
|
||||
isSyncing = new QAtomicInteger<bool>();
|
||||
isSyncing->store(true);
|
||||
|
||||
@@ -80,10 +92,8 @@ void ConnectionLoader::doAutoConnect() {
|
||||
syncTimer = new QTimer(main);
|
||||
connection->doRPCWithDefaultErrorHandling("sync", "", [=](auto) {
|
||||
isSyncing->store(false);
|
||||
|
||||
// Cancel the timer
|
||||
syncTimer->deleteLater();
|
||||
|
||||
// When sync is done, set the connection
|
||||
this->doRPCSetConnection(connection);
|
||||
});
|
||||
@@ -94,10 +104,13 @@ void ConnectionLoader::doAutoConnect() {
|
||||
if (isSyncing != nullptr && isSyncing->load()) {
|
||||
// Get the sync status
|
||||
connection->doRPC("syncstatus", "", [=](json reply) {
|
||||
if (isSyncing != nullptr && reply.find("synced_blocks") != reply.end()) {
|
||||
if (isSyncing != nullptr && reply.find("synced_blocks") != reply.end())
|
||||
{
|
||||
qint64 synced = reply["synced_blocks"].get<json::number_unsigned_t>();
|
||||
qint64 total = reply["total_blocks"].get<json::number_unsigned_t>();
|
||||
me->showInformation("Synced " + QString::number(synced) + " / " + QString::number(total));
|
||||
me->showInformation(
|
||||
"Synced " + QString::number(synced) + " / " + QString::number(total)
|
||||
);
|
||||
}
|
||||
},
|
||||
[=](QString err) {
|
||||
@@ -114,104 +127,110 @@ void ConnectionLoader::doAutoConnect() {
|
||||
});
|
||||
}
|
||||
|
||||
void ConnectionLoader::createOrRestore(bool dangerous, QString server) {
|
||||
void ConnectionLoader::createOrRestore(bool dangerous, QString server)
|
||||
{
|
||||
// Close the startup dialog, since we'll be showing the wizard
|
||||
d->hide();
|
||||
|
||||
// Create a wizard
|
||||
FirstTimeWizard wizard(dangerous, server);
|
||||
|
||||
wizard.exec();
|
||||
}
|
||||
|
||||
void ConnectionLoader::doRPCSetConnection(Connection* conn) {
|
||||
void ConnectionLoader::doRPCSetConnection(Connection* conn)
|
||||
{
|
||||
qDebug() << "Connectionloader finished, setting connection";
|
||||
rpc->setConnection(conn);
|
||||
|
||||
d->accept();
|
||||
|
||||
QTimer::singleShot(1, [=]() { delete this; });
|
||||
}
|
||||
|
||||
Connection* ConnectionLoader::makeConnection(std::shared_ptr<ConnectionConfig> config) {
|
||||
Connection* ConnectionLoader::makeConnection(std::shared_ptr<ConnectionConfig> config)
|
||||
{
|
||||
return new Connection(main, config);
|
||||
}
|
||||
|
||||
// Update the UI with the status
|
||||
void ConnectionLoader::showInformation(QString info, QString detail) {
|
||||
void ConnectionLoader::showInformation(QString info, QString detail)
|
||||
{
|
||||
connD->status->setText(info);
|
||||
connD->statusDetail->setText(detail);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Show error will close the loading dialog and show an error.
|
||||
*/
|
||||
void ConnectionLoader::showError(QString explanation) {
|
||||
void ConnectionLoader::showError(QString explanation)
|
||||
{
|
||||
rpc->noConnection();
|
||||
|
||||
QMessageBox::critical(main, QObject::tr("Connection Error"), explanation, QMessageBox::Ok);
|
||||
QMessageBox::critical(
|
||||
main,
|
||||
QObject::tr("Connection Error"),
|
||||
explanation,
|
||||
QMessageBox::Ok
|
||||
);
|
||||
d->close();
|
||||
}
|
||||
|
||||
QString litelib_process_response(char* resp) {
|
||||
QString litelib_process_response(char* resp)
|
||||
{
|
||||
char* resp_copy = new char[strlen(resp) + 1];
|
||||
strcpy(resp_copy, resp);
|
||||
//a safer version of strcpy
|
||||
strncpy(resp_copy, resp, strlen(resp)+1);
|
||||
litelib_rust_free_string(resp);
|
||||
|
||||
QString reply = QString::fromStdString(resp_copy);
|
||||
memset(resp_copy, '-', strlen(resp_copy));
|
||||
delete[] resp_copy;
|
||||
|
||||
return reply;
|
||||
}
|
||||
|
||||
/***********************************************************************************
|
||||
* Connection, Executor and Callback Class
|
||||
************************************************************************************/
|
||||
void Executor::run() {
|
||||
void Executor::run()
|
||||
{
|
||||
char* resp = litelib_execute(this->cmd.toStdString().c_str(), this->args.toStdString().c_str());
|
||||
|
||||
QString reply = litelib_process_response(resp);
|
||||
|
||||
//qDebug() << "RPC Reply=" << reply;
|
||||
auto parsed = json::parse(reply.toStdString().c_str(), nullptr, false);
|
||||
if (parsed.is_discarded() || parsed.is_null()) {
|
||||
auto parsed = json::parse(
|
||||
reply.toStdString().c_str(),
|
||||
nullptr,
|
||||
false
|
||||
);
|
||||
if (parsed.is_discarded() || parsed.is_null())
|
||||
emit handleError(reply);
|
||||
} else {
|
||||
|
||||
else
|
||||
emit responseReady(parsed);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Callback::processRPCCallback(json resp) {
|
||||
void Callback::processRPCCallback(json resp)
|
||||
{
|
||||
this->cb(resp);
|
||||
|
||||
// Destroy self
|
||||
delete this;
|
||||
}
|
||||
|
||||
void Callback::processError(QString resp) {
|
||||
void Callback::processError(QString resp)
|
||||
{
|
||||
this->errCb(resp);
|
||||
|
||||
// Destroy self
|
||||
delete this;
|
||||
}
|
||||
|
||||
Connection::Connection(MainWindow* m, std::shared_ptr<ConnectionConfig> conf) {
|
||||
Connection::Connection(MainWindow* m, std::shared_ptr<ConnectionConfig> conf)
|
||||
{
|
||||
this->config = conf;
|
||||
this->main = m;
|
||||
|
||||
// Register the JSON type as a type that can be passed between signals and slots.
|
||||
qRegisterMetaType<json>("json");
|
||||
}
|
||||
|
||||
void Connection::doRPC(const QString cmd, const QString args, const std::function<void(json)>& cb,
|
||||
const std::function<void(QString)>& errCb) {
|
||||
if (shutdownInProgress) {
|
||||
void Connection::doRPC(const QString cmd, const QString args, const std::function<void(json)>& cb, const std::function<void(QString)>& errCb)
|
||||
{
|
||||
if (shutdownInProgress)
|
||||
// Ignoring RPC because shutdown in progress
|
||||
return;
|
||||
}
|
||||
|
||||
//qDebug() << "Doing RPC: " << cmd;
|
||||
|
||||
@@ -223,24 +242,27 @@ void Connection::doRPC(const QString cmd, const QString args, const std::functio
|
||||
|
||||
QObject::connect(runner, &Executor::responseReady, c, &Callback::processRPCCallback);
|
||||
QObject::connect(runner, &Executor::handleError, c, &Callback::processError);
|
||||
|
||||
QThreadPool::globalInstance()->start(runner);
|
||||
}
|
||||
|
||||
void Connection::doRPCWithDefaultErrorHandling(const QString cmd, const QString args, const std::function<void(json)>& cb) {
|
||||
void Connection::doRPCWithDefaultErrorHandling(const QString cmd, const QString args, const std::function<void(json)>& cb)
|
||||
{
|
||||
doRPC(cmd, args, cb, [=] (QString err) {
|
||||
this->showTxError(err);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void Connection::doRPCIgnoreError(const QString cmd, const QString args, const std::function<void(json)>& cb) {
|
||||
void Connection::doRPCIgnoreError(const QString cmd, const QString args, const std::function<void(json)>& cb)
|
||||
{
|
||||
doRPC(cmd, args, cb, [=] (auto) {
|
||||
// Ignored error handling
|
||||
});
|
||||
}
|
||||
|
||||
void Connection::showTxError(const QString& error) {
|
||||
if (error.isNull()) return;
|
||||
void Connection::showTxError(const QString& error)
|
||||
{
|
||||
if (error.isNull())
|
||||
return;
|
||||
|
||||
// Prevent multiple dialog boxes from showing, because they're all called async
|
||||
static bool shown = false;
|
||||
@@ -248,14 +270,19 @@ void Connection::showTxError(const QString& error) {
|
||||
return;
|
||||
|
||||
shown = true;
|
||||
QMessageBox::critical(main, QObject::tr("Transaction Error"), QObject::tr("There was an error sending the transaction. The error was:") + "\n\n"
|
||||
+ error, QMessageBox::StandardButton::Ok);
|
||||
QMessageBox::critical(
|
||||
main,
|
||||
QObject::tr("Transaction Error"),
|
||||
QObject::tr("There was an error sending the transaction. The error was:") + "\n\n" + error,
|
||||
QMessageBox::StandardButton::Ok
|
||||
);
|
||||
shown = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prevent all future calls from going through
|
||||
*/
|
||||
void Connection::shutdown() {
|
||||
void Connection::shutdown()
|
||||
{
|
||||
shutdownInProgress = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user