monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 20:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #5380

Browse source 
113e4877 blockchain_stats: fix sign in formatting function (moneromooo-monero)
adaea3ea various: remove unused variables (moneromooo-monero)
631ef00e blockchain: some debug info when adding txes-from-block fails (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-04-11 13:02:59 +02:00
commit 915d9e5a1f
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/blockchain_utilities/blockchain_stats.cpp
View file

@ -205,7 +205,7 @@ plot 'stats.csv' index "DATA" using (timecolumn(1,"%Y-%m-%d")):4 with lines, ''
char buf[8]; char buf[8];
unsigned int i; unsigned int i;
for (i=0; i<24; i++) { for (i=0; i<24; i++) {
sprintf(buf, "\t%02d:00", i); sprintf(buf, "\t%02u:00", i);
std::cout << buf; std::cout << buf;
} }
} }

2
src/cryptonote_basic/cryptonote_format_utils.cpp
View file

@ -1065,8 +1065,6 @@ namespace cryptonote
// prefix // prefix
get_transaction_prefix_hash(t, hashes[0]); get_transaction_prefix_hash(t, hashes[0]);
transaction &tt = const_cast<transaction&>(t);
const blobdata blob = tx_to_blob(t); const blobdata blob = tx_to_blob(t);
const unsigned int unprunable_size = t.unprunable_size; const unsigned int unprunable_size = t.unprunable_size;
const unsigned int prefix_size = t.prefix_size; const unsigned int prefix_size = t.prefix_size;

2
src/cryptonote_core/blockchain.cpp
View file

@ -3690,6 +3690,8 @@ leave:
//TODO: why is this done? make sure that keeping invalid blocks makes sense. //TODO: why is this done? make sure that keeping invalid blocks makes sense.
add_block_as_invalid(bl, id); add_block_as_invalid(bl, id);
MERROR_VER("Block with id " << id << " added as invalid because of wrong inputs in transactions"); MERROR_VER("Block with id " << id << " added as invalid because of wrong inputs in transactions");
MERROR_VER("tx_index " << tx_index << ", m_blocks_txs_check " << m_blocks_txs_check.size() << ":");
for (const auto &h: m_blocks_txs_check) MERROR_VER(" " << h);
bvc.m_verifivation_failed = true; bvc.m_verifivation_failed = true;
return_tx_to_pool(txs); return_tx_to_pool(txs);
goto leave; goto leave;