From 3f9fd047fd3ad9f88f0116bd8bc7867fe3505647 Mon Sep 17 00:00:00 2001 From: DenioD Date: Sat, 26 Oct 2019 23:16:41 +0200 Subject: [PATCH] some updates, rebranding --- lib/Cargo.lock | 6 +++--- lib/Cargo.toml | 2 +- src/connection.cpp | 13 +++++++++++-- src/controller.cpp | 8 ++++++-- src/mainwindow.cpp | 2 +- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/lib/Cargo.lock b/lib/Cargo.lock index 9710859..6d809c1 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -1051,7 +1051,7 @@ version = "0.1.0" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=3a74fda1da22f35da8dc5973eb782338899810cb)", + "silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=89ee34ba526d9d45a72787b07af9407bd96a337c)", ] [[package]] @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "silentdragonlitelib" version = "0.1.0" -source = "git+https://github.com/DenioD/silentdragonlite-cli?rev=3a74fda1da22f35da8dc5973eb782338899810cb#3a74fda1da22f35da8dc5973eb782338899810cb" +source = "git+https://github.com/DenioD/silentdragonlite-cli?rev=89ee34ba526d9d45a72787b07af9407bd96a337c#89ee34ba526d9d45a72787b07af9407bd96a337c" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bellman 0.1.0 (git+https://github.com/DenioD/librustzcash.git?rev=caaee693c47c2ee9ecd1e1546b8fe3c714f342bc)", @@ -2481,7 +2481,7 @@ dependencies = [ "checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" -"checksum silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=3a74fda1da22f35da8dc5973eb782338899810cb)" = "" +"checksum silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=89ee34ba526d9d45a72787b07af9407bd96a337c)" = "" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" "checksum sodiumoxide 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585232e78a4fc18133eef9946d3080befdf68b906c51b621531c37e91787fa2b" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 8313af5..327b017 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -11,4 +11,4 @@ crate-type = ["staticlib"] [dependencies] libc = "0.2.58" lazy_static = "1.4.0" -silentdragonlitelib = { git = "https://github.com/DenioD/silentdragonlite-cli", rev = "3a74fda1da22f35da8dc5973eb782338899810cb" } +silentdragonlitelib = { git = "https://github.com/DenioD/silentdragonlite-cli", rev = "89ee34ba526d9d45a72787b07af9407bd96a337c" } diff --git a/src/connection.cpp b/src/connection.cpp index f8afba3..fffb37e 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -51,10 +51,19 @@ void ConnectionLoader::doAutoConnect() { // Check to see if there's an existing wallet if (litelib_wallet_exists(Settings::getChainName().toStdString().c_str())) { main->logger->write(QObject::tr("Using existing wallet.")); - 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") { + showError(response); + return; + } } else { main->logger->write(QObject::tr("Create/restore wallet.")); - 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); + + d->show(); } diff --git a/src/controller.cpp b/src/controller.cpp index 07bb4a7..3c01f1b 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -336,7 +336,7 @@ void Controller::refreshTransactions() { for (auto& it : reply.get()) { QString address; - double total_amount; + quint64 total_amount; QList items; // First, check if there's outgoing metadata @@ -346,11 +346,14 @@ void Controller::refreshTransactions() { QString address = QString::fromStdString(o["address"]); double amount = -1 * o ["value"].get() /100000000; // Sent items are -ve + // Check for Memos + QString memo; if (!o["memo"].is_null()) { memo = QString::fromStdString(o["memo"]); - } + } + items.push_back(TransactionItemDetail{address, amount, memo}); total_amount += amount; } @@ -380,6 +383,7 @@ void Controller::refreshTransactions() { "" }); + TransactionItem tx{ "Receive", it["datetime"].get(), diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 83e8045..3616ff4 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -39,7 +39,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); - logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("./komodo/HUSH3/silentdragonlite-debug.log")); + logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite-cli-wallet.log")); // Status Bar setupStatusBar();