aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-11-21 15:36:13 +0200
committerRiccardo Spagni <ric@spagni.net>2015-11-21 15:36:13 +0200
commit8fe1111b5b52760218039ef236de788928de929c (patch)
tree48419469d226590bfb43d1a2af554a8b991b5c9a /src/cryptonote_core
parentcheckpoints update (diff)
downloadmonero-8fe1111b5b52760218039ef236de788928de929c.tar.xz
update v2 testnet fork height
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/blockchain.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index e2249d21b..cfbec46d6 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -78,10 +78,10 @@ static const struct {
// version 1 from the start of the blockchain
{ 1, 1, 0, 1341378000 },
- // version 2 can start from block 1009827, setup on the 20th of september. No vote.
+ // version 2 starts from block 1009827, which is on or around the 20th of March, 2016. No fork voting occurs for the v2 fork.
{ 2, 1009827, 0, 1442763710 },
};
-static const uint64_t mainnet_hard_fork_version_1_till = 750000;
+static const uint64_t mainnet_hard_fork_version_1_till = 1009826;
static const struct {
uint8_t version;
@@ -91,8 +91,11 @@ static const struct {
} testnet_hard_forks[] = {
// version 1 from the start of the blockchain
{ 1, 1, 0, 1341378000 },
+
+ // version 2 starts from block 624634, which is on or around the 23rd of November, 2015. No fork voting occurs for the v2 fork.
+ { 2, 1009827, 0, 1442763710 },
};
-static const uint64_t testnet_hard_fork_version_1_till = 540000;
+static const uint64_t testnet_hard_fork_version_1_till = 624633;
//------------------------------------------------------------------
Blockchain::Blockchain(tx_memory_pool& tx_pool) :