From 4d74510a4a8d862649e69385cbf3b32f3a4cfb04 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Sat, 21 Nov 2015 15:11:21 +0200 Subject: checkpoints update --- src/blocks/checkpoints.dat | Bin 19200004 -> 26560036 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src') diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index 249956e75..407a994a2 100644 Binary files a/src/blocks/checkpoints.dat and b/src/blocks/checkpoints.dat differ -- cgit v1.2.3 From 8fe1111b5b52760218039ef236de788928de929c Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Sat, 21 Nov 2015 15:36:13 +0200 Subject: update v2 testnet fork height --- src/cryptonote_core/blockchain.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index e2249d21b..cfbec46d6 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. 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. No fork voting occurs for the v2 fork. + { 2, 1009827, 0, 1442763710 }, }; -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) : -- cgit v1.2.3 From aed3038b759d885dff412b721ce307ef3d1c49ff Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Sat, 21 Nov 2015 15:57:23 +0200 Subject: disable time-stats by default, tweak fast-block-sync description --- src/daemon/command_line_args.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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 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 arg_show_time_stats = { "show-time-stats" , "Show time-stats when processing blocks/txs and disk synchronization." - , 1 + , 0 }; const command_line::arg_descriptor arg_db_auto_remove_logs = { "db-auto-remove-logs" -- cgit v1.2.3 From 328636cdb340b092c05c5c7c43d3cecf60038bb9 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Sun, 22 Nov 2015 19:40:38 +0200 Subject: fixed testnet fork point, added comment data back in --- src/cryptonote_core/blockchain.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index cfbec46d6..8bb63ad09 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -78,7 +78,7 @@ static const struct { // version 1 from the start of the blockchain { 1, 1, 0, 1341378000 }, - // version 2 starts from block 1009827, which is on or around the 20th of March, 2016. No fork voting occurs for the v2 fork. + // 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 = 1009826; @@ -92,8 +92,8 @@ static const struct { // 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. No fork voting occurs for the v2 fork. - { 2, 1009827, 0, 1442763710 }, + // 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 = 624633; -- cgit v1.2.3