diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-03-21 12:56:11 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-03-21 12:56:11 +0200 |
| commit | def05d6353d20e513eb3b0d1815e649a92751bb0 (patch) | |
| tree | f358feba7f30609b9fc1d8f3534f5a74d80d3fcc /src | |
| parent | 0b4e75026a36a48adaff9f6973be3ab882548599 (diff) | |
| parent | eda51a0dc36946af9528ee82216d73330587e145 (diff) | |
| download | monzero-core-def05d6353d20e513eb3b0d1815e649a92751bb0.tar.gz monzero-core-def05d6353d20e513eb3b0d1815e649a92751bb0.tar.xz monzero-core-def05d6353d20e513eb3b0d1815e649a92751bb0.zip | |
Merge pull request #741
eda51a0 set fork date for September, add hyc's GPG key, remove aabramov's (Riccardo Spagni)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 8b7f298ee..cec4feece 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -81,6 +81,9 @@ static const struct { // version 2 starts from block 1009827, which is on or around the 20th of March, 2016. Fork time finalised on 2015-09-20. No fork voting occurs for the v2 fork. { 2, 1009827, 0, 1442763710 }, + + // version 3 starts from block 1141317, which is on or around the 24th of September, 2016. Fork time finalised on 2016-03-21. + { 3, 1009827, 0, 1442763710 }, }; static const uint64_t mainnet_hard_fork_version_1_till = 1009826; |