From 67acd053864942303fe3cd17d25dce6d40089f89 Mon Sep 17 00:00:00 2001
From: Aiwe <maksymivv@gmail.com>
Date: Mon, 16 Dec 2019 19:23:38 +0200
Subject: [PATCH] Update Karbo core to v. 1.7.0

---
 CryptoNoteWallet.cmake    |  2 +-
 cryptonote                |  2 +-
 src/CryptoNoteWrapper.cpp | 10 +++++-----
 src/CryptoNoteWrapper.h   |  2 +-
 src/cryptonotewallet.rc   |  6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CryptoNoteWallet.cmake b/CryptoNoteWallet.cmake
index 7a4bc2186..b43d4b472 100644
--- a/CryptoNoteWallet.cmake
+++ b/CryptoNoteWallet.cmake
@@ -2,4 +2,4 @@
 set(CN_PROJECT_NAME "KarbowanecWallet")
 set(CN_CURRENCY_DISPLAY_NAME "Karbo")
 set(CN_CURRENCY_TICKER "KRB")
-set(CN_VERSION 1.3.6)
+set(CN_VERSION 1.3.7)
diff --git a/cryptonote b/cryptonote
index 61830e281..984f492f2 160000
--- a/cryptonote
+++ b/cryptonote
@@ -1 +1 @@
-Subproject commit 61830e281248a73a12bae44877fc495d91c96520
+Subproject commit 984f492f2703cb788875de2e59c89350633ed31e
diff --git a/src/CryptoNoteWrapper.cpp b/src/CryptoNoteWrapper.cpp
index 96d8fdd9a..3d7695dc7 100644
--- a/src/CryptoNoteWrapper.cpp
+++ b/src/CryptoNoteWrapper.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2011-2015 The Cryptonote developers
-// Copyright (c) 2016-2017 The Karbowanec developers
+// Copyright (c) 2016-2019 The Karbowanec developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -235,7 +235,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
           CryptoNote::invokeJsonCommand(httpClient, "/getinfo", req, res);
           std::string err = interpret_rpc_response(true, res.status);
         if (err.empty())
-          return res.tx_count;
+          return res.transactions_count;
         else {
           qDebug() << "Failed to invoke request: " << QString::fromStdString(err);
           return 0;
@@ -257,7 +257,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
           CryptoNote::invokeJsonCommand(httpClient, "/getinfo", req, res);
           std::string err = interpret_rpc_response(true, res.status);
         if (err.empty())
-          return res.tx_pool_size;
+          return res.transactions_pool_size;
         else {
           qDebug() << "Failed to invoke request: " << QString::fromStdString(err);
           return 0;
@@ -445,7 +445,7 @@ class InprocessNode : CryptoNote::INodeObserver, public Node {
     m_coreConfig(coreConfig),
     m_netNodeConfig(netNodeConfig),
     m_protocolHandler(currency, m_dispatcher, m_core, nullptr, logManager),
-    m_core(currency, &m_protocolHandler, logManager, true),
+    m_core(currency, &m_protocolHandler, logManager, m_dispatcher, true),
     m_nodeServer(m_dispatcher, m_protocolHandler, logManager),
     m_node(m_core, m_protocolHandler) {
 
@@ -596,7 +596,7 @@ class InprocessNode : CryptoNote::INodeObserver, public Node {
   System::Dispatcher m_dispatcher;
   CryptoNote::CoreConfig m_coreConfig;
   CryptoNote::NetNodeConfig m_netNodeConfig;
-  CryptoNote::core m_core;
+  CryptoNote::Core m_core;
   CryptoNote::CryptoNoteProtocolHandler m_protocolHandler;
   CryptoNote::NodeServer m_nodeServer;
   CryptoNote::InProcessNode m_node;
diff --git a/src/CryptoNoteWrapper.h b/src/CryptoNoteWrapper.h
index 99473327c..b3f492c46 100644
--- a/src/CryptoNoteWrapper.h
+++ b/src/CryptoNoteWrapper.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2011-2015 The Cryptonote developers
-// Copyright (c) 2016-2017 The Karbowanec developers
+// Copyright (c) 2016-2019 The Karbowanec developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/cryptonotewallet.rc b/src/cryptonotewallet.rc
index 8d78a5cea..9fcf1aff7 100644
--- a/src/cryptonotewallet.rc
+++ b/src/cryptonotewallet.rc
@@ -4,11 +4,11 @@ IDI_ICON1               ICON    "images\karbowanez.ico"
 
 #define VER_FILEVERSION             1,0,0,0
 #define VER_FILEVERSION_STR         "1.0.0.0\0"
-#define VER_PRODUCTVERSION          1,3,6
-#define VER_PRODUCTVERSION_STR      "1.3.6\0"
+#define VER_PRODUCTVERSION          1,3,7
+#define VER_PRODUCTVERSION_STR      "1.3.7\0"
 #define VER_FILEDESCRIPTION_STR     "Karbo"
 #define VER_INTERNALNAME_STR        "Karbowanec"
-#define VER_LEGALCOPYRIGHT_STR      "Copyright (C) 2016-2018, Karbowanec Developers"
+#define VER_LEGALCOPYRIGHT_STR      "Copyright (C) 2016-2019, Karbowanec Developers"
 #define VER_ORIGINALFILENAME_STR    "Karbowanec.exe"
 #define VER_PRODUCTNAME_STR         "Karbowanec"