aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/cryptonote_core.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/cryptonote_core/cryptonote_core.cpp')
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp68
1 files changed, 36 insertions, 32 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index ede7ed748..5294431d6 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -51,8 +51,13 @@ using namespace epee;
#endif
#include "ringct/rctSigs.h"
+#undef MONERO_DEFAULT_LOG_CATEGORY
+#define MONERO_DEFAULT_LOG_CATEGORY "cn"
+
DISABLE_VS_WARNINGS(4355)
+#define MERROR_VER(x) MCERROR("verify", x)
+
namespace cryptonote
{
@@ -282,10 +287,10 @@ namespace cryptonote
const boost::filesystem::path old_files = folder;
if (boost::filesystem::exists(old_files / "blockchain.bin"))
{
- LOG_PRINT_RED_L0("Found old-style blockchain.bin in " << old_files.string());
- LOG_PRINT_RED_L0("Monero now uses a new format. You can either remove blockchain.bin to start syncing");
- LOG_PRINT_RED_L0("the blockchain anew, or use monero-blockchain-export and monero-blockchain-import to");
- LOG_PRINT_RED_L0("convert your existing blockchain.bin to the new format. See README.md for instructions.");
+ MWARNING("Found old-style blockchain.bin in " << old_files.string());
+ MWARNING("Monero now uses a new format. You can either remove blockchain.bin to start syncing");
+ MWARNING("the blockchain anew, or use monero-blockchain-export and monero-blockchain-import to");
+ MWARNING("convert your existing blockchain.bin to the new format. See README.md for instructions.");
return false;
}
}
@@ -310,7 +315,7 @@ namespace cryptonote
}
folder /= db->get_db_name();
- LOG_PRINT_L0("Loading blockchain from folder " << folder.string() << " ...");
+ MGINFO("Loading blockchain from folder " << folder.string() << " ...");
const std::string filename = folder.string();
// default to fast:async:1
@@ -326,7 +331,7 @@ namespace cryptonote
boost::split(options, db_sync_mode, boost::is_any_of(" :"));
for(const auto &option : options)
- LOG_PRINT_L0("option: " << option);
+ MDEBUG("option: " << option);
// default to fast:async:1
uint64_t DEFAULT_FLAGS = DBS_FAST_MODE;
@@ -523,12 +528,12 @@ namespace cryptonote
bool r = add_new_tx(tx, tx_hash, tx_prefixt_hash, tx_blob.size(), tvc, keeped_by_block, relayed, do_not_relay);
if(tvc.m_verifivation_failed)
- {LOG_PRINT_RED_L1("Transaction verification failed: " << tx_hash);}
+ {MERROR_VER("Transaction verification failed: " << tx_hash);}
else if(tvc.m_verifivation_impossible)
- {LOG_PRINT_RED_L1("Transaction verification impossible: " << tx_hash);}
+ {MERROR_VER("Transaction verification impossible: " << tx_hash);}
if(tvc.m_added_to_pool)
- LOG_PRINT_L1("tx added: " << tx_hash);
+ MDEBUG("tx added: " << tx_hash);
return r;
}
//-----------------------------------------------------------------------------------------------
@@ -547,33 +552,33 @@ namespace cryptonote
{
if(!tx.vin.size())
{
- LOG_PRINT_RED_L1("tx with empty inputs, rejected for tx id= " << get_transaction_hash(tx));
+ MERROR_VER("tx with empty inputs, rejected for tx id= " << get_transaction_hash(tx));
return false;
}
if(!check_inputs_types_supported(tx))
{
- LOG_PRINT_RED_L1("unsupported input types for tx id= " << get_transaction_hash(tx));
+ MERROR_VER("unsupported input types for tx id= " << get_transaction_hash(tx));
return false;
}
if(!check_outs_valid(tx))
{
- LOG_PRINT_RED_L1("tx with invalid outputs, rejected for tx id= " << get_transaction_hash(tx));
+ MERROR_VER("tx with invalid outputs, rejected for tx id= " << get_transaction_hash(tx));
return false;
}
if (tx.version > 1)
{
if (tx.rct_signatures.outPk.size() != tx.vout.size())
{
- LOG_PRINT_RED_L1("tx with mismatched vout/outPk count, rejected for tx id= " << get_transaction_hash(tx));
+ MERROR_VER("tx with mismatched vout/outPk count, rejected for tx id= " << get_transaction_hash(tx));
return false;
}
}
if(!check_money_overflow(tx))
{
- LOG_PRINT_RED_L1("tx has money overflow, rejected for tx id= " << get_transaction_hash(tx));
+ MERROR_VER("tx has money overflow, rejected for tx id= " << get_transaction_hash(tx));
return false;
}
@@ -585,7 +590,7 @@ namespace cryptonote
if(amount_in <= amount_out)
{
- LOG_PRINT_RED_L1("tx with wrong amounts: ins " << amount_in << ", outs " << amount_out << ", rejected for tx id= " << get_transaction_hash(tx));
+ MERROR_VER("tx with wrong amounts: ins " << amount_in << ", outs " << amount_out << ", rejected for tx id= " << get_transaction_hash(tx));
return false;
}
}
@@ -593,14 +598,14 @@ namespace cryptonote
if(!keeped_by_block && get_object_blobsize(tx) >= m_blockchain_storage.get_current_cumulative_blocksize_limit() - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE)
{
- LOG_PRINT_RED_L1("tx is too large " << get_object_blobsize(tx) << ", expected not bigger than " << m_blockchain_storage.get_current_cumulative_blocksize_limit() - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE);
+ MERROR_VER("tx is too large " << get_object_blobsize(tx) << ", expected not bigger than " << m_blockchain_storage.get_current_cumulative_blocksize_limit() - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE);
return false;
}
//check if tx use different key images
if(!check_tx_inputs_keyimages_diff(tx))
{
- LOG_PRINT_RED_L1("tx uses a single key image more than once");
+ MERROR_VER("tx uses a single key image more than once");
return false;
}
@@ -610,24 +615,24 @@ namespace cryptonote
switch (rv.type) {
case rct::RCTTypeNull:
// coinbase should not come here, so we reject for all other types
- LOG_PRINT_RED_L1("Unexpected Null rctSig type");
+ MERROR_VER("Unexpected Null rctSig type");
return false;
case rct::RCTTypeSimple:
if (!rct::verRctSimple(rv, true))
{
- LOG_PRINT_RED_L1("rct signature semantics check failed");
+ MERROR_VER("rct signature semantics check failed");
return false;
}
break;
case rct::RCTTypeFull:
if (!rct::verRct(rv, true))
{
- LOG_PRINT_RED_L1("rct signature semantics check failed");
+ MERROR_VER("rct signature semantics check failed");
return false;
}
break;
default:
- LOG_PRINT_RED_L1("Unknown rct type: " << rv.type);
+ MERROR_VER("Unknown rct type: " << rv.type);
return false;
}
}
@@ -992,10 +997,10 @@ namespace cryptonote
{
if(!m_starter_message_showed)
{
- LOG_PRINT_L0(ENDL << "**********************************************************************" << ENDL
+ MGINFO_YELLOW(ENDL << "**********************************************************************" << ENDL
<< "The daemon will start synchronizing with the network. It may take up to several hours." << ENDL
<< ENDL
- << "You can set the level of process detailization* through \"set_log <level>\" command*, where <level> is between 0 (no details) and 4 (very verbose)." << ENDL
+ << "You can set the level of process detailization* through \"set_log <level|categories>\" command*, where <level> is between 0 (no details) and 4 (very verbose), or custom category based levels (eg, *:WARNING)" << ENDL
<< ENDL
<< "Use \"help\" command to see the list of available commands." << ENDL
<< ENDL
@@ -1014,19 +1019,18 @@ namespace cryptonote
bool core::check_fork_time()
{
HardFork::State state = m_blockchain_storage.get_hard_fork_state();
+ const el::Level level = el::Level::Warning;
switch (state) {
case HardFork::LikelyForked:
- LOG_PRINT_RED_L0(ENDL
- << "**********************************************************************" << ENDL
- << "Last scheduled hard fork is too far in the past." << ENDL
- << "We are most likely forked from the network. Daemon update needed now." << ENDL
- << "**********************************************************************" << ENDL);
+ MCLOG_RED(level, "global", "**********************************************************************");
+ MCLOG_RED(level, "global", "Last scheduled hard fork is too far in the past.");
+ MCLOG_RED(level, "global", "We are most likely forked from the network. Daemon update needed now.");
+ MCLOG_RED(level, "global", "**********************************************************************");
break;
case HardFork::UpdateNeeded:
- LOG_PRINT_RED_L0(ENDL
- << "**********************************************************************" << ENDL
- << "Last scheduled hard fork time shows a daemon update is needed now." << ENDL
- << "**********************************************************************" << ENDL);
+ MCLOG_RED(level, "global", "**********************************************************************");
+ MCLOG_RED(level, "global", "Last scheduled hard fork time shows a daemon update is needed now.");
+ MCLOG_RED(level, "global", "**********************************************************************");
break;
default:
break;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-11 22:22:40 +0000