aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-11-22 19:40:38 +0200
committerRiccardo Spagni <ric@spagni.net>2015-11-22 19:40:38 +0200
commit328636cdb340b092c05c5c7c43d3cecf60038bb9 (patch)
tree28dac19236caa63c0b024c946f11eb41216eadc6 /src/cryptonote_core
parentdisable time-stats by default, tweak fast-block-sync description (diff)
downloadmonero-328636cdb340b092c05c5c7c43d3cecf60038bb9.tar.xz
fixed testnet fork point, added comment data back in
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/blockchain.cpp6
1 files changed, 3 insertions, 3 deletions
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;