Merge pull request #80 from ConcealNetwork/dev

Update titles for private keys
ConcealNetwork · Jun 11, 2019 · a25c232 · a25c232
2 parents 2cf5cfa + 18ec3a4
commit a25c232
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -50,20 +50,21 @@ If the build is successful the binaries will be in the src folder.
 
 ##### Prerequisites
 
-- Install [Visual Studio 2017 Community Edition](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15&page=inlineinstall)
+- Install [Visual Studio 2019 Community Edition](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=16)
 - Install [CMake](https://cmake.org/download/)
-- When installing Visual Studio, you need to install **Desktop development with C++** and the **VC++ v140 toolchain** components. The option to install the v140 toolchain can be found by expanding the "Desktop development with C++" node on the right. You will need this for the project to build correctly.
-- Install [Boost 1.67.0](https://boost.teeks99.com/bin/1.67.0/), ensuring you download the installer for MSVC 14.1.
+- When installing Visual Studio, you need to install **Desktop development with C++** and the **MSVC v142 - VS 2019 C++ x64/x86 build tools** components. The option to install the v142 build tools can be found by expanding the "Desktop development with C++" node on the right. You will need this for the project to build correctly.
+- Use the premade binaries for [MSVC 14.2](https://github.com/ConcealNetwork)
+- Install [Boost 1.70.0](https://sourceforge.net/projects/boost/files/boost-binaries/1.70.0/boost_1_70_0-msvc-14.1-64.exe/download), ensuring you download the installer for MSVC 14.2.
 
 ##### Building
 
-- From the start menu, open 'x64 Native Tools Command Prompt for vs2017' or run "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsMSBuildCmd.bat" from any command prompt.
+- From the start menu, open 'x64 Native Tools Command Prompt for vs2019' or run "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsMSBuildCmd.bat" from any command prompt.
 
 - `git clone https://github.com/ConcealNetwork/conceal-core`
 - `cd conceal-core`
 - `mkdir build`
 - `cd build`
-- `cmake -G "Visual Studio 15 2017 Win64" -DBOOST_LIBRARYDIR:PATH=c:/local/boost_1_67_0 ..` (Or your boost installed dir.)
+- `cmake -G "Visual Studio 16 2017" -A x64 -DBOOST_LIBRARYDIR="c:\local\boost_1_70_0\lib64-msvc-14.2 ..` (Or your boost installed dir.)
 - `msbuild concealX.sln /p:Configuration=Release /m`
 
 If the build is successful the binaries will be in the src/Release folder.

diff --git a/src/CryptoNoteCore/Currency.h b/src/CryptoNoteCore/Currency.h
@@ -341,7 +341,7 @@ class CurrencyBuilder : boost::noncopyable {
   CurrencyBuilder& upgradeHeightV6(uint64_t val) { m_currency.m_upgradeHeightV6 = val; return *this; }
   CurrencyBuilder& upgradeHeightV7(uint64_t val) { m_currency.m_upgradeHeightV7 = val; return *this; }  
   CurrencyBuilder& upgradeVotingThreshold(unsigned int val);
-  CurrencyBuilder& upgradeVotingWindow(size_t val) { m_currency.m_upgradeVotingWindow = val; return *this; }
+  CurrencyBuilder& upgradeVotingWindow(uint32_t val) { m_currency.m_upgradeVotingWindow = val; return *this; }
   CurrencyBuilder& upgradeWindow(size_t val);
 
   CurrencyBuilder& transactionMaxSize(size_t val) { m_currency.m_transactionMaxSize = val; return *this; }

diff --git a/src/PaymentGate/PaymentServiceJsonRpcMessages.cpp b/src/PaymentGate/PaymentServiceJsonRpcMessages.cpp
@@ -16,7 +16,7 @@ void Save::Response::serialize(CryptoNote::ISerializer& /*serializer*/) {
 }
 
 void Reset::Request::serialize(CryptoNote::ISerializer& serializer) {
-  serializer(viewSecretKey, "viewSecretKey");
+  serializer(viewSecretKey, "secretViewKey");
 }
 
 void Reset::Response::serialize(CryptoNote::ISerializer& serializer) {
@@ -26,7 +26,7 @@ void GetViewKey::Request::serialize(CryptoNote::ISerializer& serializer) {
 }
 
 void GetViewKey::Response::serialize(CryptoNote::ISerializer& serializer) {
-  serializer(viewSecretKey, "viewSecretKey");
+  serializer(viewSecretKey, "secretViewKey");
 }
 
 void GetStatus::Request::serialize(CryptoNote::ISerializer& serializer) {
@@ -47,8 +47,8 @@ void GetAddresses::Response::serialize(CryptoNote::ISerializer& serializer) {
 }
 
 void CreateAddress::Request::serialize(CryptoNote::ISerializer& serializer) {
-  bool hasSecretKey = serializer(spendSecretKey, "spendSecretKey");
-  bool hasPublicKey = serializer(spendPublicKey, "spendPublicKey");
+  bool hasSecretKey = serializer(spendSecretKey, "privateSpendKey");
+  bool hasPublicKey = serializer(spendPublicKey, "publicSpendKey");
 
   if (hasSecretKey && hasPublicKey) {
     //TODO: replace it with error codes
@@ -76,8 +76,8 @@ void GetSpendKeys::Request::serialize(CryptoNote::ISerializer& serializer) {
 }
 
 void GetSpendKeys::Response::serialize(CryptoNote::ISerializer& serializer) {
-  serializer(spendSecretKey, "spendSecretKey");
-  serializer(spendPublicKey, "spendPublicKey");
+  serializer(spendSecretKey, "privateSpendKey");
+  serializer(spendPublicKey, "publicSpendKey");
 }
 
 void GetBalance::Request::serialize(CryptoNote::ISerializer& serializer) {

diff --git a/src/Platform/Windows/System/Dispatcher.cpp b/src/Platform/Windows/System/Dispatcher.cpp
@@ -26,6 +26,7 @@
 #endif
 #include <winsock2.h>
 #include "ErrorMessage.h"
+#include <stdexcept>
 
 namespace System {
 

diff --git a/src/Platform/Windows/System/Ipv4Resolver.cpp b/src/Platform/Windows/System/Ipv4Resolver.cpp
@@ -15,6 +15,7 @@
 #include <System/ErrorMessage.h>
 #include <System/InterruptedException.h>
 #include <System/Ipv4Address.h>
+#include <stdexcept>
 
 namespace System {
 

diff --git a/src/Platform/Windows/System/TcpConnection.cpp b/src/Platform/Windows/System/TcpConnection.cpp
@@ -15,6 +15,7 @@
 #include <System/Ipv4Address.h>
 #include "Dispatcher.h"
 #include "ErrorMessage.h"
+#include <stdexcept>
 
 namespace System {
 

diff --git a/src/Platform/Windows/System/TcpConnector.cpp b/src/Platform/Windows/System/TcpConnector.cpp
@@ -16,6 +16,7 @@
 #include "Dispatcher.h"
 #include "ErrorMessage.h"
 #include "TcpConnection.h"
+#include <stdexcept>
 
 namespace System {
 

diff --git a/src/Platform/Windows/System/TcpListener.cpp b/src/Platform/Windows/System/TcpListener.cpp
@@ -16,6 +16,7 @@
 #include "Dispatcher.h"
 #include "ErrorMessage.h"
 #include "TcpConnection.h"
+#include <stdexcept>
 
 namespace System {
 

diff --git a/src/SimpleWallet/SimpleWallet.cpp b/src/SimpleWallet/SimpleWallet.cpp
@@ -1027,11 +1027,11 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
     std::string guiKeys = Tools::Base58::encode_addr(CryptoNote::parameters::CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX, secretKeysData);
 
     logger(INFO, BRIGHT_WHITE) <<
-      "Generated new wallet: " << m_wallet->getAddress() << std::endl <<
-      "View secret key: " << Common::podToHex(keys.viewSecretKey) << std::endl <<
-      "Spend secret key: " << Common::podToHex(keys.spendSecretKey) << std::endl <<
-      "GUI key: " << guiKeys << std::endl <<
-      "Mnemonic seed: " << generate_mnemonic(keys.spendSecretKey) << std::endl << std::endl;
+      "Wallet Address: " << m_wallet->getAddress() << std::endl <<
+      "Private View Key: " << Common::podToHex(keys.viewSecretKey) << std::endl <<
+      "Private Spend Key: " << Common::podToHex(keys.spendSecretKey) << std::endl <<
+      // "GUI Key: " << guiKeys << std::endl <<
+      "Mnemonic Seed: " << generate_mnemonic(keys.spendSecretKey) << std::endl << std::endl;
 
   }
   catch (const std::exception& e) {