Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-29 04:26:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #495

Browse Source 
328636c fixed testnet fork point, added comment data back in (Riccardo Spagni)
aed3038 disable time-stats by default, tweak fast-block-sync description (Riccardo Spagni)
8fe1111 update v2 testnet fork height (Riccardo Spagni)
4d74510 checkpoints update (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2015-11-22 20:40:34 +02:00
commit 263cc48c48
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/blocks/checkpoints.dat
View File

Binary file not shown.

9
src/cryptonote_core/blockchain.cpp
View File

@ -78,10 +78,10 @@ static const struct {
// version 1 from the start of the blockchain
{ 1, 1, 0, 1341378000 },
// version 2 can start from block 1009827, setup on the 20th of september. No vote.
// version 2 starts from block 1009827, which is on or around the 20th of March, 2016. Fork time finalised on 2015-09-20. No fork voting occurs for the v2 fork.
{ 2, 1009827, 0, 1442763710 },
};
static const uint64_t mainnet_hard_fork_version_1_till = 750000;
static const uint64_t mainnet_hard_fork_version_1_till = 1009826;
static const struct {
uint8_t version;
@ -91,8 +91,11 @@ static const struct {
} testnet_hard_forks[] = {
// version 1 from the start of the blockchain
{ 1, 1, 0, 1341378000 },
// version 2 starts from block 624634, which is on or around the 23rd of November, 2015. Fork time finalised on 2015-11-20. No fork voting occurs for the v2 fork.
{ 2, 624634, 0, 1445355000 },
};
static const uint64_t testnet_hard_fork_version_1_till = 540000;
static const uint64_t testnet_hard_fork_version_1_till = 624633;
//------------------------------------------------------------------
Blockchain::Blockchain(tx_memory_pool& tx_pool) :

4
src/daemon/command_line_args.h
View File

@ -82,13 +82,13 @@ namespace daemon_args
};
const command_line::arg_descriptor<uint64_t> arg_fast_block_sync = {
"fast-block-sync"
, "Test fast block-sync option using temporarily embedded known block hashes."
, "Sync up most of the way by using embedded, known block hashes."
, 1
};
const command_line::arg_descriptor<uint64_t> arg_show_time_stats = {
"show-time-stats"
, "Show time-stats when processing blocks/txs and disk synchronization."
, 1
, 0
};
const command_line::arg_descriptor<uint64_t> arg_db_auto_remove_logs = {
"db-auto-remove-logs"