From 0a56fa03686010e96deccce23c76f0c15b9b6f23 Mon Sep 17 00:00:00 2001 From: ExploShot Date: Fri, 10 Sep 2021 11:54:22 +0200 Subject: [PATCH] Upgrade to latest core changes --- CMakeLists.txt | 4 ++-- src/CryptoNoteWrapper/WalletGreenWorker.cpp | 6 +++--- src/Settings/Settings.cpp | 11 ++++++++++- src/qwertycoinwallet.desktop | 2 +- src/qwertycoinwallet.qss | 2 -- src/version.h.in | 4 ++-- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9471b6..51c8410 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,8 @@ set(HUNTER_CONFIGURATION_TYPES Release;Debug CACHE STRING "Hunter configuration set(HUNTER_JOBS_NUMBER 4 CACHE STRING "Hunter jobs number") include(hunter/HunterGate) HunterGate( - URL "https://github.com/cpp-pm/hunter/archive/v0.23.254.tar.gz" - SHA1 "017e688b9848c1f695303e8cfe9f35d40e154112" + URL "https://github.com/cpp-pm/hunter/archive/v0.23.314.tar.gz" + SHA1 "95c47c92f68edb091b5d6d18924baabe02a6962a" FILEPATH "${CMAKE_CURRENT_LIST_DIR}/cmake/hunter/HunterConfig.cmake" ) diff --git a/src/CryptoNoteWrapper/WalletGreenWorker.cpp b/src/CryptoNoteWrapper/WalletGreenWorker.cpp index eeff391..5fb3c56 100644 --- a/src/CryptoNoteWrapper/WalletGreenWorker.cpp +++ b/src/CryptoNoteWrapper/WalletGreenWorker.cpp @@ -846,11 +846,11 @@ QString WalletGreenWorker::getBalanceProof(quint64& _amount, QString& _message) Crypto::cn_fast_hash(prefix_data.data(), prefix_data.size(), prefix_hash); // generate proof entries - std::vector proofs(selected_transfers.size()); + std::vector proofs(selected_transfers.size()); for (size_t i = 0; i < selected_transfers.size(); ++i) { const CryptoNote::TransactionOutputInformation &td = selected_transfers[i]; - CryptoNote::reserve_proof_entry& proof = proofs[i]; + CryptoNote::RESERVE_PROOF_ENTRY& proof = proofs[i]; proof.key_image = kimages[i]; proof.txid = td.transactionHash; proof.index_in_tx = td.outputInTransaction; @@ -893,7 +893,7 @@ QString WalletGreenWorker::getBalanceProof(quint64& _amount, QString& _message) Crypto::generate_signature(prefix_hash, keys.address.spendPublicKey, keys.spendSecretKey, signature); // serialize & encode - CryptoNote::reserve_proof p; + CryptoNote::RESERVE_PROOF p; p.proofs.assign(proofs.begin(), proofs.end()); memcpy(&p.signature, &signature, sizeof(signature)); diff --git a/src/Settings/Settings.cpp b/src/Settings/Settings.cpp index 44899d6..35565b4 100644 --- a/src/Settings/Settings.cpp +++ b/src/Settings/Settings.cpp @@ -76,7 +76,16 @@ Settings& Settings::instance() { Settings::Settings() : m_p2pBindPort(0), m_cmdLineParser(nullptr) { - m_defaultNodeList << "node-00.qwertycoin.org:8197" << "node-01.qwertycoin.org:8197" << "node-02.qwertycoin.org:8197" << "node-03.qwertycoin.org:8197" << "node-04.qwertycoin.org:8197" << "node-05.qwertycoin.org:8197" << "explorer.qwertycoin.org:8197" << "loop.qwertycoin.org:8197"; + m_defaultNodeList << "node-00.qwertycoin.org:8197" + << "node-01.qwertycoin.org:8197" + << "node-02.qwertycoin.org:8197" + << "node-03.qwertycoin.org:8197" + << "node-04.qwertycoin.org:8197" + << "node-05.qwertycoin.org:8197" + << "node-06.qwertycoin.org:8197" + << "node-07.qwertycoin.org:8197" + << "node-08.qwertycoin.org:8197" + << "node-09.qwertycoin.org:8197"; Style* lightStyle = new LightStyle(); Style* darkStyle = new DarkStyle(); diff --git a/src/qwertycoinwallet.desktop b/src/qwertycoinwallet.desktop index 2bffd2f..3e0e3d6 100644 --- a/src/qwertycoinwallet.desktop +++ b/src/qwertycoinwallet.desktop @@ -8,4 +8,4 @@ Type=Application Icon=Qwertycoin MimeType=x-scheme-handler/qwertycoin; Categories=Office;Finance; -Version=1.2.0 +Version=6.0.8 diff --git a/src/qwertycoinwallet.qss b/src/qwertycoinwallet.qss index a976d2c..508eff6 100644 --- a/src/qwertycoinwallet.qss +++ b/src/qwertycoinwallet.qss @@ -34,7 +34,6 @@ QDateTimeEdit { selection-color: #000000; } - QDateTimeEdit::drop-down { width: 20; border-top-right-radius: 2px; @@ -51,7 +50,6 @@ QLineEdit, QDoubleSpinBox, QSpinBox, QComboBox, QDateTimeEdit { padding-left: 5px; } - QComboBox { border: 1px solid %borderColorDark%; background-color: transparent; diff --git a/src/version.h.in b/src/version.h.in index b8eb16f..3d0edb2 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,8 +8,8 @@ #define PROJECT_COPYRIGHT "@PROJECT_COPYRIGHT@" #define APP_VER_MAJOR 6 #define APP_VER_MINOR 0 -#define APP_VER_REV 3 -#define APP_VER_BUILD 6073 +#define APP_VER_REV 7 +#define APP_VER_BUILD 6101 #define BUILD_COMMIT_ID "@PROJECT_GIT_COMMIT_ID@" #define PROJECT_VERSION STR(APP_VER_MAJOR) "." STR(APP_VER_MINOR) "." STR(APP_VER_REV)