From b77b915524e5a8bf2cc34ced0b6cb8473c3c2bd8 Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 6 Sep 2019 17:23:10 +0300 Subject: [PATCH 1/3] === build number: 56 -> 57 === --- 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 1a166f27..b685d4a8 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -7,6 +7,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 56 +#define PROJECT_VERSION_BUILD_NO 57 #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 89ac994b597ec975cd182f5e008d3c706a8912d0 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Sat, 7 Sep 2019 00:46:03 +0200 Subject: [PATCH 2/3] fixed misprint and reduced building threads number --- src/currency_core/blockchain_storage.cpp | 2 +- utils/build_script_linux.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp index 959e2765..54b2e8f4 100644 --- a/src/currency_core/blockchain_storage.cpp +++ b/src/currency_core/blockchain_storage.cpp @@ -223,7 +223,7 @@ bool blockchain_storage::init(const std::string& config_folder, const boost::pro m_config_folder = config_folder; - // remove old incompartible DB + // remove old incompatible DB const std::string old_db_folder_path = m_config_folder + "/" CURRENCY_BLOCKCHAINDATA_FOLDERNAME_OLD; if (boost::filesystem::exists(old_db_folder_path)) { diff --git a/utils/build_script_linux.sh b/utils/build_script_linux.sh index cc9fd4ba..b86876a5 100755 --- a/utils/build_script_linux.sh +++ b/utils/build_script_linux.sh @@ -40,19 +40,19 @@ if [ $? -ne 0 ]; then exit 1 fi -make -j daemon Zano; +make -j1 daemon Zano; if [ $? -ne 0 ]; then echo "Failed to make!" exit 1 fi -make -j simplewallet; +make -j1 simplewallet; if [ $? -ne 0 ]; then echo "Failed to make!" exit 1 fi -make -j connectivity_tool; +make -j1 connectivity_tool; if [ $? -ne 0 ]; then echo "Failed to make!" exit 1 From 7dd61aede6c7456ee88b737474e5422bf20df142 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Sun, 8 Sep 2019 20:02:42 +0200 Subject: [PATCH 3/3] make low fee message less dramatic --- src/currency_core/tx_pool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/currency_core/tx_pool.cpp b/src/currency_core/tx_pool.cpp index 6803ac16..b8c56fa4 100644 --- a/src/currency_core/tx_pool.cpp +++ b/src/currency_core/tx_pool.cpp @@ -164,7 +164,7 @@ namespace currency else { // this tx has no fee - LOG_ERROR("Transaction with id= " << id << " has too small fee: " << tx_fee << ", expected fee: " << m_blockchain.get_core_runtime_config().tx_pool_min_fee); + LOG_PRINT_RED_L0("Transaction with id= " << id << " has too small fee: " << tx_fee << ", expected fee: " << m_blockchain.get_core_runtime_config().tx_pool_min_fee); tvc.m_verification_failed = false; tvc.m_should_be_relayed = false; tvc.m_added_to_pool = false;