aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-03-07 15:39:18 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-03-07 17:19:50 +0000
commit84decbea483357623ad100af3dcca2274c72fec4 (patch)
tree16ec34690c7376ec6b3f30dcc3a62ed8e686eb9b
parentMerge pull request #3253 (diff)
downloadmonero-84decbea483357623ad100af3dcca2274c72fec4.tar.xz
core: add v7 for 1539500 on mainnet
-rw-r--r--README.md4
-rw-r--r--src/cryptonote_core/blockchain.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/README.md b/README.md
index 9cb7594d1..c877dec42 100644
--- a/README.md
+++ b/README.md
@@ -99,9 +99,9 @@ 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 |
-| XXXXXXX | 2018-03-XX | XX | XXXXXXXXX | XXXXXXXXX | XXXXXX
+| 1539500 | 2018-03-28 | v7 | XXXXXXXXX | XXXXXXXXX | Cryptonight variant 1, ringsize >= 7, sorted inputs
-X's indicate that these details have not been determined as of commit date, 2017-09-20.
+X's indicate that these details have not been determined as of commit date.
## Release staging schedule and protocol
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index d88cc1bf9..f10fb83c9 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -106,6 +106,9 @@ 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 },
};
static const uint64_t mainnet_hard_fork_version_1_till = 1009826;