aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-08-07 15:13:59 +0200
committerRiccardo Spagni <ric@spagni.net>2017-08-07 15:13:59 +0200
commitdc2747439cd4aeb2aea0c14b3192d4a4766126f4 (patch)
tree2dc58a2ee24e569e334a7523be31a378fd4a15dd /src/cryptonote_core
parentMerge pull request #2242 (diff)
parentblockchain: add testnet v6 fork height at 971400 (diff)
downloadmonero-dc2747439cd4aeb2aea0c14b3192d4a4766126f4.tar.xz
Merge pull request #2243
4d873046 blockchain: add testnet v6 fork height at 971400 (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/blockchain.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 794dee8aa..792bee8d1 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -118,6 +118,8 @@ static const struct {
{ 3, 800500, 0, 1472415034 },
{ 4, 801219, 0, 1472415035 },
{ 5, 802660, 0, 1472415036 + 86400*180 }, // add 5 months on testnet to shut the update warning up since there's a large gap to v6
+
+ { 6, 971400, 0, 1501709789 },
};
static const uint64_t testnet_hard_fork_version_1_till = 624633;