diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 5a38209..f234e2f 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -37,7 +37,8 @@ namespace Checkpoints ( 2360000, uint256("0x1a1a661bfa9d99dfbce66ece6490a3de416a113d8cd29577874e2f9d14be824c") ) ( 2439896, uint256("0x1f7e98043d927f3f8c51514d6bb47325bfcffb85a448fb43f9b254be43180cab") ) ( 2461312, uint256("0xa7170d7e3044c6132ee915279ff20b59c14206e13b4ede786d065d17eeb1c8aa") ) - ( 2468161, uint256("0x9a702ca9e42bf7e436d01cce2afac6b23a227d1bca3878575983e644c053d47b") ); + ( 2468161, uint256("0x9a702ca9e42bf7e436d01cce2afac6b23a227d1bca3878575983e644c053d47b") ) + ( 3069661, uint256("0x04e4abb0d2ba8472ac4e304e296bb99d58f44f6482c312648baec93ac17802b0") ); ; static MapCheckpoints mapCheckpointsTestnet = diff --git a/src/clientversion.h b/src/clientversion.h index 55746b3..a04aa3a 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -9,7 +9,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 8 #define CLIENT_VERSION_REVISION 9 -#define CLIENT_VERSION_BUILD 8 +#define CLIENT_VERSION_BUILD 9 // Converts the parameter X to a string after macro replacement on X has been performed. // Don't merge these into one macro! diff --git a/src/main.cpp b/src/main.cpp index a53d260..f2da2d6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2580,6 +2580,10 @@ bool CBlock::AcceptBlock() if (nVersion < 3 && ((!fTestNet && nHeight > 14060) || (fTestNet && nHeight > 0))) return error("CheckBlock() : rejected nVersion < 3 block"); + // HardFork from height 3086001, reject block.nVersion < 5 except testnet + if (!fTestNet && 3086001 <= nHeight && nVersion < 5) + return DoS(100, error("CheckBlock() : (hard fork) reject nVersion < 5 block from height 3086001")); + // Enforce rule that the coinbase starts with serialized block height CScript expect = CScript() << nHeight; if (!std::equal(expect.begin(), expect.end(), vtx[0].vin[0].scriptSig.begin())) diff --git a/src/main.h b/src/main.h index 82a5847..368f878 100644 --- a/src/main.h +++ b/src/main.h @@ -854,7 +854,7 @@ class CBlock { public: // header - static const int CURRENT_VERSION=4; + static const int CURRENT_VERSION=5; int nVersion; uint256 hashPrevBlock; uint256 hashMerkleRoot; diff --git a/src/net.cpp b/src/net.cpp index ac7b344..681b91a 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1154,7 +1154,6 @@ void MapPort() // The second name should resolve to a list of seed addresses. static const char *strDNSSeed[][2] = { {"kumaseed", "kumaseed.tamami-foundation.org"}, - {"LApool", "kumacoin.seed.lapool.me"}, {"guest0", "108.61.183.37"}, {"guest1", "123.217.155.249"}, {"guest2", "79.137.57.54"}, diff --git a/src/version.h b/src/version.h index 30850f1..24f455b 100644 --- a/src/version.h +++ b/src/version.h @@ -46,7 +46,7 @@ static const int MEMPOOL_GD_VERSION = 60002; #define DISPLAY_VERSION_MAJOR 1 #define DISPLAY_VERSION_MINOR 9 -#define DISPLAY_VERSION_REVISION 7 +#define DISPLAY_VERSION_REVISION 8 #define DISPLAY_VERSION_BUILD 0 #endif