diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-11-22 20:40:34 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-11-22 20:43:35 +0200 |
| commit | 263cc48c4894496cd34733d2b04018b953d0d1ac (patch) | |
| tree | 489249d15353635565890b20d1aaf863faa364b1 | |
| parent | Merge pull request #496 (diff) | |
| parent | fixed testnet fork point, added comment data back in (diff) | |
| download | monero-263cc48c4894496cd34733d2b04018b953d0d1ac.tar.xz | |
Merge pull request #495
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)
| -rw-r--r-- | src/blocks/checkpoints.dat | bin | 19200004 -> 26560036 bytes | |||
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 9 | ||||
| -rw-r--r-- | src/daemon/command_line_args.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat Binary files differindex 249956e75..407a994a2 100644 --- a/src/blocks/checkpoints.dat +++ b/src/blocks/checkpoints.dat diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index e2249d21b..8bb63ad09 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -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) : diff --git a/src/daemon/command_line_args.h b/src/daemon/command_line_args.h index 8da470c86..48571cb96 100644 --- a/src/daemon/command_line_args.h +++ b/src/daemon/command_line_args.h @@ -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" |