fixed circulating supply calculation; more rebranding; bumped version number to v0.3.0
This commit is contained in:
@@ -209,7 +209,7 @@ namespace cryptonote
|
||||
static const command_line::arg_descriptor<std::string> arg_block_rate_notify = {
|
||||
"block-rate-notify"
|
||||
, "Run a program when the block rate undergoes large fluctuations. This might "
|
||||
"be a sign of large amounts of hash rate going on and off the Monero network, "
|
||||
"be a sign of large amounts of hash rate going on and off the Salvium network, "
|
||||
"and thus be of potential interest in predicting attacks. %t will be replaced "
|
||||
"by the number of minutes for the observation window, %b by the number of "
|
||||
"blocks observed within that window, and %e by the number of blocks that was "
|
||||
@@ -1294,6 +1294,7 @@ namespace cryptonote
|
||||
std::vector<transaction> txs;
|
||||
std::vector<crypto::hash> missed_txs;
|
||||
uint64_t coinbase_amount = get_outs_money_amount(b.miner_tx);
|
||||
coinbase_amount += b.miner_tx.amount_burnt;
|
||||
this->get_transactions(b.tx_hashes, txs, missed_txs, true);
|
||||
uint64_t tx_fee_amount = 0;
|
||||
for(const auto& tx: txs)
|
||||
@@ -1829,7 +1830,7 @@ namespace cryptonote
|
||||
{
|
||||
std::string main_message;
|
||||
if (m_offline)
|
||||
main_message = "The daemon is running offline and will not attempt to sync to the Monero network.";
|
||||
main_message = "The daemon is running offline and will not attempt to sync to the Salvium network.";
|
||||
else
|
||||
main_message = "The daemon will start synchronizing with the network. This may take a long time to complete.";
|
||||
MGINFO_YELLOW(ENDL << "**********************************************************************" << ENDL
|
||||
@@ -2072,7 +2073,7 @@ namespace cryptonote
|
||||
MDEBUG("blocks in the last " << seconds[n] / 60 << " minutes: " << b << " (probability " << p << ")");
|
||||
if (p < threshold)
|
||||
{
|
||||
MWARNING("There were " << b << (b == max_blocks_checked ? " or more" : "") << " blocks in the last " << seconds[n] / 60 << " minutes, there might be large hash rate changes, or we might be partitioned, cut off from the Monero network or under attack, or your computer's time is off. Or it could be just sheer bad luck.");
|
||||
MWARNING("There were " << b << (b == max_blocks_checked ? " or more" : "") << " blocks in the last " << seconds[n] / 60 << " minutes, there might be large hash rate changes, or we might be partitioned, cut off from the Salvium network or under attack, or your computer's time is off. Or it could be just sheer bad luck.");
|
||||
|
||||
std::shared_ptr<tools::Notify> block_rate_notify = m_block_rate_notify;
|
||||
if (block_rate_notify)
|
||||
|
||||
Reference in New Issue
Block a user