Update to new core

seredat · Mar 30, 2018 · f43e9e1 · f43e9e1
1 parent fa8476f
commit f43e9e1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CryptoNoteWallet.cmake b/CryptoNoteWallet.cmake
@@ -2,4 +2,4 @@
 set(CN_PROJECT_NAME "karbowanec")
 set(CN_CURRENCY_DISPLAY_NAME "Karbo")
 set(CN_CURRENCY_TICKER "KRB")
-set(CN_VERSION 1.2.1)
+set(CN_VERSION 1.2.2)
diff --git a/cryptonote b/cryptonote
diff --git a/src/cryptonotewallet.rc b/src/cryptonotewallet.rc
@@ -2,10 +2,10 @@ IDI_ICON1               ICON    "images\karbowanez.ico"
 
 #include <windows.h>
 
-#define VER_FILEVERSION             1,0,0,5
-#define VER_FILEVERSION_STR         "1.0.0.5\0"
-#define VER_PRODUCTVERSION          1,2,1
-#define VER_PRODUCTVERSION_STR      "1.2.1\0"
+#define VER_FILEVERSION             1,0,0,6
+#define VER_FILEVERSION_STR         "1.0.0.6\0"
+#define VER_PRODUCTVERSION          1,2,2
+#define VER_PRODUCTVERSION_STR      "1.2.2\0"
 #define VER_FILEDESCRIPTION_STR     "Karbo"
 #define VER_INTERNALNAME_STR        "Karbowanec"
 #define VER_LEGALCOPYRIGHT_STR      "Copyright (C) 2016-2017, Karbowanec Developers"

diff --git a/src/karbowanecwallet.desktop b/src/karbowanecwallet.desktop
@@ -21,4 +21,4 @@ Type=Application
 Icon=karbowanec
 MimeType=x-scheme-handler/karbowanec;
 Categories=Office;Finance;
-Version=1.2.1
+Version=1.2.2
+2 −2		CMakeLists.txt
+2 −0		include/IWallet.h
+1 −1		src/CMakeLists.txt
+29 −0		src/Common/ConsoleHandler.cpp
+10 −2		src/Common/ConsoleHandler.h
+16 −0		src/Common/StringTools.cpp
+2 −0		src/Common/StringTools.h
+21 −11		src/CryptoNoteConfig.h
+47 −3		src/CryptoNoteCore/Blockchain.cpp
+6 −1		src/CryptoNoteCore/CryptoNoteBasicImpl.cpp
+147 −80		src/CryptoNoteCore/Currency.cpp
+4 −0		src/CryptoNoteCore/Currency.h
+4 −2		src/CryptoNoteProtocol/CryptoNoteProtocolHandler.cpp
+69 −0		src/Daemon/DaemonCommandsHandler.cpp
+9 −0		src/Daemon/DaemonCommandsHandler.h
+1 −1		src/HTTP/HttpParser.cpp
+4 −2		src/JsonRpcServer/JsonRpcServer.cpp
+3 −1		src/JsonRpcServer/JsonRpcServer.h
+49 −0		src/Logging/LoggerMessage.cpp
+116 −1		src/P2p/NetNode.cpp
+17 −1		src/P2p/NetNode.h
+12 −0		src/P2p/NetNodeCommon.h
+3 −1		src/PaymentGateService/PaymentGateService.cpp
+15 −1		src/PaymentGateService/PaymentServiceConfiguration.cpp
+4 −0		src/PaymentGateService/PaymentServiceConfiguration.h
+3 −0		src/Platform/Linux/System/Dispatcher.h
+1 −1		src/Platform/OSX/System/Context.h
+12 −14		src/Rpc/CoreRpcServerCommandsDefinitions.h
+4 −5		src/Rpc/HttpServer.cpp
+13 −8		src/Rpc/RpcServer.cpp
+2 −2		src/Rpc/RpcServer.h
+63 −16		src/SimpleWallet/PasswordContainer.cpp
+3 −1		src/SimpleWallet/PasswordContainer.h
+87 −41		src/SimpleWallet/SimpleWallet.cpp
+6 −7		src/SimpleWallet/SimpleWallet.h
+59 −0		src/Wallet/WalletGreen.cpp
+3 −0		src/Wallet/WalletGreen.h
+137 −21		src/Wallet/WalletRpcServer.cpp
+4 −1		src/Wallet/WalletRpcServer.h
+50 −2		src/Wallet/WalletRpcServerCommandsDefinitions.h
+3 −4		src/WalletLegacy/WalletLegacy.cpp
+5 −7		src/crypto/slow-hash.c
+2 −2		src/version.h.in