V2.2.6 Release

CMakeLists.txt

@@ -31,7 +31,7 @@ endif(WIN32)
 
 find_package(Boost 1.55 REQUIRED COMPONENTS date_time filesystem program_options regex serialization system thread chrono)
 if ((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 54))
-	message(SEND_ERROR "Boost version 1.54 is unsupported, more details are available here http://goo.gl/RrCFmA")
+  message(SEND_ERROR "Boost version 1.54 is unsupported, more details are available here http://goo.gl/RrCFmA")
 endif ()
 
 include_directories(${Boost_INCLUDE_DIRS})
@@ -77,18 +77,14 @@ set(CRYPTONOTE_SOURCES
   cryptonote/src/crypto/crypto-ops.c
   cryptonote/src/crypto/crypto.cpp
   cryptonote/src/crypto/groestl.c
-  cryptonote/src/crypto/hash-extra-blake.c
-  cryptonote/src/crypto/hash-extra-groestl.c
-  cryptonote/src/crypto/hash-extra-jh.c
-  cryptonote/src/crypto/hash-extra-skein.c
   cryptonote/src/crypto/hash.c
   cryptonote/src/crypto/jh.c
   cryptonote/src/crypto/keccak.c
-  cryptonote/src/crypto/oaes_lib.c
   cryptonote/src/crypto/random.c
   cryptonote/src/crypto/skein.c
-  cryptonote/src/crypto/slow-hash.c
-  cryptonote/src/crypto/slow-hash.cpp
+  cryptonote/src/crypto/cn_slow_hash_soft.cpp
+  cryptonote/src/crypto/cn_slow_hash_hard_intel.cpp
+  cryptonote/src/crypto/cn_slow_hash_hard_arm.cpp
   cryptonote/src/crypto/tree-hash.c
   cryptonote/src/CryptoNoteCore/BlockchainIndices.cpp
   cryptonote/src/CryptoNoteCore/BlockchainMessages.cpp
@@ -178,6 +174,7 @@ set(CRYPTONOTE_SOURCES
 
 file(GLOB_RECURSE SOURCES src/*.cpp)
 file(GLOB_RECURSE HEADERS src/*.h)
+file(GLOB_RECURSE HEADERS src/*.hpp)
 file(GLOB_RECURSE FORMS src/gui/ui/*.ui)
 file(GLOB_RECURSE Mnemonics cryptonote/src/mnemonics/*)
 
@@ -189,11 +186,11 @@ qt5_add_resources(RCC ${QRC})
 
 if (WIN32)
   if (NOT MSVC)
-	message(FATAL_ERROR "Only MSVC is supported on this platform")
+  message(FATAL_ERROR "Only MSVC is supported on this platform")
   endif ()
   add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600 /DSTATICLIB)
   include_directories(cryptonote/src/platform/msc)
-
+  set( CMAKE_CXX_FLAGS "-bigobj -EHsc")
   set(PLATFORM_DIR Windows)
   set(BUILD_PLATFORM WIN32)
   set(BUILD_RESOURCES src/cryptonotewallet.rc)
@@ -226,7 +223,7 @@ elseif (UNIX)
 
     set(BUILD_PLATFORM MACOSX_BUNDLE)
     set(BUILD_RESOURCES ${APPLICATION_ICON})
-	
+  
     GET_TARGET_PROPERTY(QT_LIB_DIR "${Qt5Widgets_LIBRARIES}" LOCATION)
     GET_FILENAME_COMPONENT(QT_LIB_DIR "${QT_LIB_DIR}" PATH)
   else(APPLE)

CryptoNoteWallet.cmake

@@ -1,5 +1,4 @@
-
 set(CN_PROJECT_NAME "Qwertycoin")
 set(CN_CURRENCY_DISPLAY_NAME "Qwertycoin")
 set(CN_CURRENCY_TICKER "QWC")
-set(CN_VERSION 2.2.2)
+set(CN_VERSION 2.2.6)

src/CryptoNoteWrapper.cpp

@@ -1,6 +1,5 @@
 // Copyright (c) 2011-2015 The Cryptonote developers
 // Copyright (c) 2016-2017 The Karbowanec developers
-// Copyright (c) 2018 The Qwertycoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -398,6 +397,14 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
         }
   }
 
+  CryptoNote::BlockHeaderInfo getLastLocalBlockHeaderInfo() {
+    return m_node.getLastLocalBlockHeaderInfo();
+  }
+
+  uint8_t getCurrentBlockMajorVersion() {
+    return getLastLocalBlockHeaderInfo().majorVersion;
+  }
+
   CryptoNote::IWalletLegacy* createWallet() override {
     return new CryptoNote::WalletLegacy(m_currency, m_node, m_logManager);
   }
@@ -556,6 +563,14 @@ class InprocessNode : CryptoNote::INodeObserver, public Node {
     return m_nodeServer.getPeerlistManager().get_gray_peers_count();
   }
 
+  CryptoNote::BlockHeaderInfo getLastLocalBlockHeaderInfo() {
+    return m_node.getLastLocalBlockHeaderInfo();
+  }
+
+  uint8_t getCurrentBlockMajorVersion() {
+    return getLastLocalBlockHeaderInfo().majorVersion;
+  }
+
   CryptoNote::IWalletLegacy* createWallet() override {
     return new CryptoNote::WalletLegacy(m_currency, m_node, m_logManager);
   }

src/CryptoNoteWrapper.h

@@ -1,6 +1,5 @@
 // Copyright (c) 2011-2015 The Cryptonote developers
 // Copyright (c) 2016-2017 The Karbowanec developers
-// Copyright (c) 2018 The Qwertycoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -10,6 +9,7 @@
 #include <memory>
 #include <string>
 #include <system_error>
+#include <INode.h>
 
 namespace CryptoNote {
 
@@ -48,6 +48,8 @@ class Node {
   virtual uint64_t getIncomingConnectionsCount() = 0;
   virtual uint64_t getWhitePeerlistSize() = 0;
   virtual uint64_t getGreyPeerlistSize() = 0;
+  virtual uint8_t getCurrentBlockMajorVersion() = 0;
+  virtual CryptoNote::BlockHeaderInfo getLastLocalBlockHeaderInfo() = 0;
 
   virtual void startMining(const std::string& address, size_t threads_count) = 0;
   virtual void stopMining() = 0;

src/NodeAdapter.cpp

@@ -1,6 +1,5 @@
 // Copyright (c) 2011-2015 The Cryptonote developers
 // Copyright (c) 2016-2017 The Karbowanec developers
-// Copyright (c) 2018 The Qwertycoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -264,6 +263,14 @@ quint64 NodeAdapter::getGreyPeerlistSize() {
   return m_node->getGreyPeerlistSize();
 }
 
+CryptoNote::BlockHeaderInfo NodeAdapter::getLastLocalBlockHeaderInfo() {
+  return m_node->getLastLocalBlockHeaderInfo();
+}
+
+uint8_t NodeAdapter::getCurrentBlockMajorVersion() {
+  return getLastLocalBlockHeaderInfo().majorVersion;
+}
+
 void NodeAdapter::peerCountUpdated(Node& _node, size_t _count) {
   Q_UNUSED(_node);
   Q_EMIT peerCountUpdatedSignal(_count);

src/NodeAdapter.h

@@ -1,6 +1,5 @@
 // Copyright (c) 2011-2015 The Cryptonote developers
 // Copyright (c) 2016-2017 The Karbowanec developers
-// Copyright (c) 2018 The Qwertycoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -53,6 +52,8 @@ class NodeAdapter : public QObject, public INodeCallback {
   quint64 getIncomingConnectionsCount();
   quint64 getWhitePeerlistSize();
   quint64 getGreyPeerlistSize();
+  uint8_t getCurrentBlockMajorVersion();
+  CryptoNote::BlockHeaderInfo getLastLocalBlockHeaderInfo();
   void peerCountUpdated(Node& _node, size_t _count) Q_DECL_OVERRIDE;
   void localBlockchainUpdated(Node& _node, uint64_t _height) Q_DECL_OVERRIDE;
   void lastKnownBlockHeightUpdated(Node& _node, uint64_t _height) Q_DECL_OVERRIDE;

src/Settings.cpp

@@ -91,7 +91,7 @@ void Settings::load() {
   }
 
   QStringList defaultPoolList;
-  defaultPoolList << "qwertycoin.site:3333";
+  defaultPoolList << "qwertycoin.site:3333" << "qwcpool.partyvibe.com:2000" << "qwerty.mineallcrypto.com:6076";
   if (!m_settings.contains(OPTION_MINING_POOLS)) {
     setMiningPoolList(QStringList() << defaultPoolList);
   } else {

src/Worker.cpp

@@ -8,6 +8,10 @@
 #include <QThread>
 
 #include <crypto/hash.h>
+#include <crypto/cn_slow_hash.hpp>
+#include "NodeAdapter.h"
+#include "CryptoNoteWrapper.h"
+#include <CryptoNoteConfig.h>
 
 #include "Worker.h"
 
@@ -32,7 +36,6 @@ void Worker::run() {
   Job localJob;
   quint32 localNonce;
   Crypto::Hash hash;
-  Crypto::cn_context context;
   while (!m_isStopped) {
     {
       QReadLocker lock(&m_jobLock);
@@ -50,7 +53,15 @@ void Worker::run() {
     localNonce = ++m_nonce;
     localJob.blob.replace(39, sizeof(localNonce), reinterpret_cast<char*>(&localNonce), sizeof(localNonce));
     std::memset(&hash, 0, sizeof(hash));
-    Crypto::cn_slow_hash(context, localJob.blob.data(), localJob.blob.size(), hash);
+  cn_pow_hash_v2 ctx;
+    if (NodeAdapter::instance().getCurrentBlockMajorVersion() < CryptoNote::BLOCK_MAJOR_VERSION_4) {
+      cn_pow_hash_v1 ctx_v1 = cn_pow_hash_v1::make_borrowed(ctx);
+      ctx_v1.hash(localJob.blob.data(), localJob.blob.size(), hash.data);
+    }
+    else {
+      ctx.hash(localJob.blob.data(), localJob.blob.size(), hash.data);
+    }
+
     ++m_hashCounter;
     if (Q_UNLIKELY(((quint32*)&hash)[7] < localJob.target)) {
       m_observer->processShare(localJob.jobId, localNonce, QByteArray(reinterpret_cast<char*>(&hash), sizeof(hash)));

src/cryptonotewallet.rc

@@ -2,13 +2,13 @@ IDI_ICON1               ICON    "images\qwertycoinz.ico"
 
 #include <windows.h>
 
-#define VER_FILEVERSION             1,0,0,7
-#define VER_FILEVERSION_STR         "1.0.0.7\0"
-#define VER_PRODUCTVERSION          2,2,3
-#define VER_PRODUCTVERSION_STR      "2.2.3\0"
+#define VER_FILEVERSION             2,2,6,0
+#define VER_FILEVERSION_STR         "2.2.6.0\0"
+#define VER_PRODUCTVERSION          2,2,6
+#define VER_PRODUCTVERSION_STR      "2.2.6\0"
 #define VER_FILEDESCRIPTION_STR     "Qwertycoin"
 #define VER_INTERNALNAME_STR        "Qwertycoin"
-#define VER_LEGALCOPYRIGHT_STR      "Copyright (C) 2018, Qwertycoin Developers"
+#define VER_LEGALCOPYRIGHT_STR      "Copyright (C) 2017-2018, The Qwertycoin Group"
 #define VER_ORIGINALFILENAME_STR    "Qwertycoin.exe"
 #define VER_PRODUCTNAME_STR         "Qwertycoin"
 

src/gui/SendFrame.cpp

@@ -1,7 +1,6 @@
 // Copyright (c) 2011-2015 The Cryptonote developers
 // Copyright (c) 2015-2016 XDN developers
 // Copyright (c) 2016-2017 The Karbowanec developers
-// Copyright (c) 2018 The Qwertycoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -39,15 +38,15 @@ SendFrame::SendFrame(QWidget* _parent) : QFrame(_parent), m_ui(new Ui::SendFrame
   connect(&WalletAdapter::instance(), &WalletAdapter::walletActualBalanceUpdatedSignal, this, &SendFrame::walletActualBalanceUpdated,
     Qt::QueuedConnection);
   connect(&WalletAdapter::instance(), &WalletAdapter::walletCloseCompletedSignal, this, &SendFrame::reset);
-  connect(&WalletAdapter::instance(), &WalletAdapter::walletSynchronizationCompletedSignal, this, &SendFrame::walletSynchronized,
-    Qt::QueuedConnection);
+  connect(&WalletAdapter::instance(), &WalletAdapter::walletSynchronizationCompletedSignal, this, &SendFrame::walletSynchronized
+    , Qt::QueuedConnection);
   connect(&WalletAdapter::instance(), &WalletAdapter::walletSynchronizationProgressUpdatedSignal,
     this, &SendFrame::walletSynchronizationInProgress, Qt::QueuedConnection);
 
   m_ui->m_tickerLabel->setText(CurrencyAdapter::instance().getCurrencyTicker().toUpper());
   m_ui->m_feeSpin->setSuffix(" " + CurrencyAdapter::instance().getCurrencyTicker().toUpper());
   m_ui->m_donateSpin->setSuffix(" " + CurrencyAdapter::instance().getCurrencyTicker().toUpper());
-  m_ui->m_feeSpin->setMinimum(CurrencyAdapter::instance().formatAmount(CurrencyAdapter::instance().getMinimumFee()).toDouble());
+
   m_ui->m_remote_label->hide();
   m_ui->m_sendButton->setEnabled(false);
 
@@ -65,7 +64,7 @@ SendFrame::SendFrame(QWidget* _parent) : QFrame(_parent), m_ui(new Ui::SendFrame
 }
 
 SendFrame::~SendFrame() {
-  m_transfers.clear();
+    m_transfers.clear();
     m_glassFrame->deleteLater();
 }
 
@@ -109,8 +108,7 @@ void SendFrame::clearAllClicked() {
   addRecipientClicked();
   amountValueChange();
   m_ui->m_paymentIdEdit->clear();
-  m_ui->m_mixinSlider->setValue(1);
-  m_ui->m_feeSpin->setValue(m_ui->m_feeSpin->minimum());
+  m_ui->m_mixinSlider->setValue(5);
 }
 
 void SendFrame::reset() {
@@ -140,11 +138,11 @@ void SendFrame::amountValueChange() {
         for(QVector<quint64>::iterator it = fees.begin(); it != fees.end(); ++it) {
             remote_node_fee += *it;
         }
-        if (remote_node_fee < CurrencyAdapter::instance().getMinimumFee()) {
-            remote_node_fee = CurrencyAdapter::instance().getMinimumFee();
-        }
-        if (remote_node_fee > 10000000000000) {
-            remote_node_fee = 10000000000000;
+    if (remote_node_fee < CurrencyAdapter::instance().getMinimumFee()) {
+      remote_node_fee = CurrencyAdapter::instance().getMinimumFee();
+    }
+        if (remote_node_fee > 10000000) {
+            remote_node_fee = 10000000;
         }
     }
 
@@ -198,6 +196,7 @@ void SendFrame::openUriClicked() {
 }
 
 void SendFrame::parsePaymentRequest(QString _request) {
+    MainWindow::instance().showNormal(); //raise window if minimized
     if(_request.startsWith("qwertycoin://", Qt::CaseInsensitive))
     {
        _request.replace(0, 13, "qwertycoin:");

src/gui/SendFrame.h

@@ -1,7 +1,6 @@
 // Copyright (c) 2011-2016 The Cryptonote developers
 // Copyright (c) 2015-2016 XDN developers
 // Copyright (c) 2016 The Karbowanec developers
-// Copyright (c) 2018 The Qwertycoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/gui/ui/sendframe.ui

@@ -87,16 +87,19 @@
         </size>
        </property>
        <property name="maximum">
-        <number>10</number>
+        <number>20</number>
        </property>
-       <property name="pageStep">
+        <property name="minimum">
+          <number>1</number>
+        </property>
+        <property name="pageStep">
         <number>1</number>
        </property>
        <property name="value">
         <number>1</number>
        </property>
        <property name="sliderPosition">
-        <number>5</number>
+        <number>1</number>
        </property>
        <property name="tracking">
         <bool>false</bool>