diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-04 17:06:37 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-04 17:06:37 +0200 |
| commit | 815c8a48ab38586baf7963f7a4d9a87263811855 (patch) | |
| tree | 36fa875b076db18a0d2775a5b96e61dc01cd0616 /src/cryptonote_core | |
| parent | Merge pull request #5132 (diff) | |
| parent | tests: add a CNv4 JIT test (diff) | |
| download | monero-815c8a48ab38586baf7963f7a4d9a87263811855.tar.xz | |
Merge pull request #5174
0de14396 tests: add a CNv4 JIT test (moneromooo-monero)
24d281c3 crypto: plug CNv4 JIT into cn_slow_hash (moneromooo-monero)
78ab59ea crypto: clear cache after generating random program (moneromooo-monero)
b9a61884 performance_tests: add tests for new Cryptonight variants (moneromooo-monero)
fff23bf7 CNv4 JIT compiler for x86-64 and tests (SChernykh)
3dde67d8 blockchain: add v10 fork heights (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 0de4d49de..444c4293d 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -115,6 +115,9 @@ static const struct { // version 9 starts from block 1686275, which is on or around the 19th of October, 2018. Fork time finalised on 2018-09-02. { 9, 1686275, 0, 1535889548 }, + + // version 10 starts from block 1788000, which is on or around the 9th of March, 2019. Fork time finalised on 2019-02-10. + { 10, 1788000, 0, 1549792439 }, }; static const uint64_t mainnet_hard_fork_version_1_till = 1009826; @@ -139,6 +142,7 @@ static const struct { { 7, 1057027, 0, 1512211236 }, { 8, 1057058, 0, 1533211200 }, { 9, 1057778, 0, 1533297600 }, + { 10, 1154318, 0, 1550153694 }, }; static const uint64_t testnet_hard_fork_version_1_till = 624633; @@ -160,6 +164,7 @@ static const struct { { 7, 37000, 0, 1521600000 }, { 8, 176456, 0, 1537821770 }, { 9, 177176, 0, 1537821771 }, + { 10, 269000, 0, 1550153694 }, }; //------------------------------------------------------------------ |