From e676acf9295a3039ba0325076377297b85faee3e Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 23 May 2019 18:56:17 +0300 Subject: [PATCH 1/6] === build number: 31 -> 32 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 548d6490..e288d207 100644 --- a/src/version.h.in +++ b/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 32 #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 "]" From c4a3493b3277d0d2773f16ab131ee87d12cbf0bc Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 23 May 2019 20:05:32 +0200 Subject: [PATCH 2/6] === build number: 32 -> 33 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index e288d207..6b13dd94 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -2,6 +2,6 @@ #define BUILD_COMMIT_ID "@VERSION@" #define PROJECT_VERSION "1.0" -#define PROJECT_VERSION_BUILD_NO 32 +#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 "]" From c485037324c3f328dcab0afa77cdb1be056a4b39 Mon Sep 17 00:00:00 2001 From: AlekseiBo Date: Fri, 24 May 2019 12:19:50 +0200 Subject: [PATCH 3/6] Remove good luck (#30) --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 1804c829..4aeb041e 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,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! From 18e0bdfa779c3c70ebf1e78580548b0337e6df71 Mon Sep 17 00:00:00 2001 From: AlekseiBo Date: Fri, 24 May 2019 12:21:04 +0200 Subject: [PATCH 4/6] Update cloning instruction (#29) --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 4aeb041e..c078209d 100644 --- a/README.md +++ b/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
(not recommended but may work) | recommended | most recent of what we have ever tested | |--|--|--|--| From 027cc985acc79d99fe25ba1e4da428cfc33b1a7e Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Fri, 24 May 2019 14:02:24 +0200 Subject: [PATCH 5/6] added getblocktemplate --- utils/test_api_files/getblocktemplate.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 utils/test_api_files/getblocktemplate.json diff --git a/utils/test_api_files/getblocktemplate.json b/utils/test_api_files/getblocktemplate.json new file mode 100644 index 00000000..541ab967 --- /dev/null +++ b/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 + } +} \ No newline at end of file From 8c065fd974acf14e12c67a811a2da809893833e0 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Fri, 24 May 2019 15:51:10 +0200 Subject: [PATCH 6/6] added notice for pos_mining in wallet, removed warnings with new boost --- contrib/epee/include/math_helper.h | 2 +- src/simplewallet/simplewallet.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/contrib/epee/include/math_helper.h b/contrib/epee/include/math_helper.h index dc7d74dc..aea4f91a 100644 --- a/contrib/epee/include/math_helper.h +++ b/contrib/epee/include/math_helper.h @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 49210f4a..fb7c5f35 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/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);