Merge remote-tracking branch 'origin/develop' into frontend

README.md

@@ -7,10 +7,6 @@ Be sure to properly clone the repository:
 
 `$ git clone --recursive https://github.com/hyle-team/zano.git`
 
-or, if already cloned:
-
-`$ cd zano/ && git submodule init && git submodule update`
-
 ### Dependencies
 | component / version | minimum <br>(not recommended but may work) | recommended | most recent of what we have ever tested |
 |--|--|--|--|
@@ -66,6 +62,3 @@ To build GUI application:
     h. Unfold the certificate in Keychain Access window and double click underlying private key "Zano". Select "Access Control" tab, then select "Allow all applications to access this item". Click "Save Changes".
 2. Revise building script, comment out unwanted steps and run it:  `utils/build_script_mac_osx.sh`
 3. The application should be here: `/buid_mac_osx_64/release/src`
-
-
-Good luck!

contrib/epee/include/math_helper.h

@@ -32,7 +32,7 @@
 
 #include <list>
 #include <numeric>
-#include <boost/timer.hpp>
+#include <boost/timer/timer.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/random_generator.hpp>
 

src/simplewallet/simplewallet.cpp

@@ -153,6 +153,11 @@ namespace
     return message_writer(color ? epee::log_space::console_color_green : epee::log_space::console_color_default, false, std::string(), LOG_LEVEL_2);
   }
 
+    message_writer success_msg_writer(epee::log_space::console_colors color)
+  {
+    return message_writer(color, false, std::string(), LOG_LEVEL_2);
+  }
+
   message_writer fail_msg_writer()
   {
     return message_writer(epee::log_space::console_color_red, true, "Error: ", LOG_LEVEL_0);
@@ -1576,6 +1581,12 @@ int main(int argc, char* argv[])
         wal.init(daemon_address);
         if (command_line::get_arg(vm, arg_generate_new_wallet).size())
           return EXIT_FAILURE;
+
+        if (command_line::get_arg(vm, arg_do_pos_mining))
+        {
+          success_msg_writer(epee::log_space::console_color_cyan) << "IMORTANT NOTICE! Instance started with \"do-pos-mining\" parameter, running copy of this wallet on other host at the same time may cause key image conflicts";
+        }
+
         if (!offline_mode)
           wal.refresh();
         LOG_PRINT_GREEN("Loaded ok", LOG_LEVEL_0);

src/version.h.in

@@ -2,6 +2,6 @@
 
 #define BUILD_COMMIT_ID "@VERSION@"
 #define PROJECT_VERSION "1.0"
-#define PROJECT_VERSION_BUILD_NO 31
+#define PROJECT_VERSION_BUILD_NO 33
 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"

utils/test_api_files/getblocktemplate.json

@@ -0,0 +1,13 @@
+{
+  "jsonrpc": "2.0",
+  "id": "0",
+  "method": "getblocktemplate",
+  "params": {
+    "extra_text": "Some text info about miner",
+    "wallet_address": "ZxBvJDuQjMG9R2j4WnYUhBYNrwZPwuyXrC7FHdVmWqaESgowDvgfWtiXeNGu8Px9B24pkmjsA39fzSSiEQG1ekB225ZnrMTBp",
+    "stakeholder_address": "ZxBvJDuQjMG9R2j4WnYUhBYNrwZPwuyXrC7FHdVmWqaESgowDvgfWtiXeNGu8Px9B24pkmjsA39fzSSiEQG1ekB225ZnrMTBp",
+    "pos_block": false,
+    "pos_amount": 0,
+    "pos_index": 0
+  }
+}