Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
cryptozoidberg 2019-09-08 20:03:29 +02:00
commit 7aed4b508c
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/currency_core/blockchain_storage.cpp
View file

@ -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))
{

2
src/currency_core/tx_pool.cpp
View file

@ -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;

2
src/version.h.in
View file

@ -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 "]"

6
utils/build_script_linux.sh
View file

@ -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