aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-03-18 15:53:26 +0200
committerRiccardo Spagni <ric@spagni.net>2018-03-18 15:53:26 +0200
commitebbd001a89ddbe0de1d1af297a04db8911f15e09 (patch)
treedaebb2469033a2723fb1b6818133db9adc3e71ba
parentMerge pull request #3421 (diff)
parentMove v7 fork to 1546000 to give more update time (diff)
downloadmonero-ebbd001a89ddbe0de1d1af297a04db8911f15e09.tar.xz
Merge pull request #3424
bb20f104 Move v7 fork to 1546000 to give more update time (moneromooo-monero)
-rw-r--r--README.md2
-rw-r--r--src/cryptonote_core/blockchain.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index ac3b19acb..114afcd4e 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ Dates are provided in the format YYYY-MM-DD.
| 1220516 | 2017-01-05 | v4 | v0.10.1 | v0.10.2.1 | Allow normal and RingCT transactions |
| 1288616 | 2017-04-15 | v5 | v0.10.3.0 | v0.10.3.1 | Adjusted minimum blocksize and fee algorithm |
| 1400000 | 2017-09-16 | v6 | v0.11.0.0 | v0.11.0.0 | Allow only RingCT transactions, allow only >= ringsize 5 |
-| 1539500 | 2018-03-28 | v7 | XXXXXXXXX | XXXXXXXXX | Cryptonight variant 1, ringsize >= 7, sorted inputs
+| 1546000 | 2018-04-06 | v7 | v0.12.0.0 | v0.12.0.0 | Cryptonight variant 1, ringsize >= 7, sorted inputs
X's indicate that these details have not been determined as of commit date.
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 4fa6d94f1..3db516847 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -107,8 +107,8 @@ static const struct {
// version 6 starts from block 1400000, which is on or around the 16th of September, 2017. Fork time finalised on 2017-08-18.
{ 6, 1400000, 0, 1503046577 },
- // version 7 starts from block 1539500, which is on or around the 28th of March, 2018. Fork time finalised on 2018-03-07.
- { 7, 1539500, 0, 1520436050 },
+ // version 7 starts from block 1546000, which is on or around the 6th of April, 2018. Fork time finalised on 2018-03-17.
+ { 7, 1546000, 0, 1521303150 },
};
static const uint64_t mainnet_hard_fork_version_1_till = 1009826;