Merge pull request #743

a1c3829 also maybe do the block height this time, you know, just so that it actually works. (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2016-03-21 13:22:54 +02:00
commit bdc07f029a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -83,7 +83,7 @@ static const struct {
{ 2, 1009827, 0, 1442763710 }, { 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. // 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, 1458558528 }, { 3, 1141317, 0, 1458558528 },
}; };
static const uint64_t mainnet_hard_fork_version_1_till = 1009826; static const uint64_t mainnet_hard_fork_version_1_till = 1009826;