aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-09-18 20:26:38 +0200
committerRiccardo Spagni <ric@spagni.net>2016-09-18 20:26:39 +0200
commit68e6678ab77f6ba731a8517eb3941b4e554acfc5 (patch)
tree43cd3974ef9c418660f3f882ca1e86137e71236d /src/cryptonote_core
parentMerge branch 'NanoAkron-armv8-march-crypto' (diff)
parentfix v5 height (diff)
downloadmonero-68e6678ab77f6ba731a8517eb3941b4e554acfc5.tar.xz
Merge pull request #1099
c2faab5 fix v5 height (Riccardo Spagni) 70bd7d8 remove dead backup seed nodes, add new ones (Riccardo Spagni) cebbcf0 fix v5 fork date description (Riccardo Spagni) eb60fa2 update version (Riccardo Spagni) c41098a updated fork heights for v4 and v5 (Riccardo Spagni) c69b8a1 update block headers (Riccardo Spagni) f148af2 add checkpoints (Riccardo Spagni) c15da0e switch wallet API from std thread/mutex to boost (Riccardo Spagni) 8a274ea switch wallet API from std thread/mutex to boost (Riccardo Spagni)
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/blockchain.cpp7
-rw-r--r--src/cryptonote_core/checkpoints.cpp2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 83e6e40b0..badb1a335 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -85,6 +85,12 @@ static const struct {
// version 3 starts from block 1141317, which is on or around the 24th of September, 2016. Fork time finalised on 2016-03-21.
{ 3, 1141317, 0, 1458558528 },
+
+ // version 4 starts from block 1220517, which is on or around the 5th of January, 2017. Fork time finalised on 2016-09-18.
+ { 4, 1220517, 0, 1483574400 },
+
+ // version 5 starts from block 1406997, which is on or around the 20th of September, 2017. Fork time finalised on 2016-09-18.
+ { 5, 1406997, 0, 1505865600 },
};
static const uint64_t mainnet_hard_fork_version_1_till = 1009826;
@@ -100,6 +106,7 @@ static const struct {
// 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 },
+ // versions 3-5 were passed in rapid succession from September 18th, 2016
{ 3, 800500, 0, 1472415034 },
{ 4, 801220, 0, 1472415035 },
{ 5, 802660, 0, 1472415036 },
diff --git a/src/cryptonote_core/checkpoints.cpp b/src/cryptonote_core/checkpoints.cpp
index c038a4802..1d5959c46 100644
--- a/src/cryptonote_core/checkpoints.cpp
+++ b/src/cryptonote_core/checkpoints.cpp
@@ -184,6 +184,8 @@ namespace cryptonote
ADD_CHECKPOINT(825000, "56503f9ad766774b575be3aff73245e9d159be88132c93d1754764f28da2ff60");
ADD_CHECKPOINT(900000, "d9958d0e7dcf91a5a7b11de225927bf7efc6eb26240315ce12372be902cc1337");
ADD_CHECKPOINT(913193, "5292d5d56f6ba4de33a58d9a34d263e2cb3c6fee0aed2286fd4ac7f36d53c85f");
+ ADD_CHECKPOINT(1000000, "a886ef5149902d8342475fee9bb296341b891ac67c4842f47a833f23c00ed721");
+ ADD_CHECKPOINT(1100000, "3fd720c5c8b3072fc1ccda922dec1ef25f9ed88a1e6ad4103d0fe00b180a5903");
return true;
}