rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 11:23:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow pruning before v10

Browse Source 
This check is now not needed anymore, and would prevent people
from using --prune-blockchain when starting a new sync
This commit is contained in:
moneromooo-monero 2019-04-01 13:57:15 +00:00
parent 423d3bb86b
commit eda2661aa2
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/blockchain_utilities/blockchain_prune.cpp
View File

@ -611,24 +611,6 @@ int main(int argc, char* argv[])
} }
already_pruned = true; already_pruned = true;
} }
if (n == 0)
{
const uint64_t blockchain_height = core_storage[0]->get_current_blockchain_height();
const crypto::hash hash = core_storage[0]->get_block_id_by_height(blockchain_height - 1);
cryptonote::block block;
if (core_storage[0]->get_block_by_hash(hash, block))
{
if (block.major_version < 10)
{
time_t now = time(NULL);
if (now < 1555286400) // 15 april 2019
{
MERROR("Pruning before v10 will confuse peers. Wait for v10 first");
return 1;
}
}
}
}
} }
core_storage[0]->deinit(); core_storage[0]->deinit();
core_storage[0].reset(NULL); core_storage[0].reset(NULL);

6
src/cryptonote_core/blockchain.cpp
View File

@ -3767,12 +3767,6 @@ leave:
//------------------------------------------------------------------ //------------------------------------------------------------------
bool Blockchain::prune_blockchain(uint32_t pruning_seed) bool Blockchain::prune_blockchain(uint32_t pruning_seed)
{ {
uint8_t hf_version = m_hardfork->get_current_version();
if (hf_version < 10)
{
MERROR("Most of the network will only be ready for pruned blockchains from v10, not pruning");
return false;
}
return m_db->prune_blockchain(pruning_seed); return m_db->prune_blockchain(pruning_seed);
} }
//------------------------------------------------------------------ //------------------------------------------------------------------

2
src/daemon/rpc_command_executor.cpp
View File

@ -2175,7 +2175,7 @@ bool t_rpc_command_executor::check_blockchain_pruning()
if (res.pruning_seed) if (res.pruning_seed)
{ {
tools::success_msg_writer() << "Blockchain pruning checked"; tools::success_msg_writer() << "Blockchain is pruned";
} }
else else
{ {