Merge pull request #30

98f98c2 Update version/height requirements (Pieter Wuille)
This commit is contained in:
Pieter Wuille 2015-07-29 15:17:37 +02:00
commit 5b5a942b1f
No known key found for this signature in database
GPG key ID: 57896D2FF8F0B657

4
db.h
View file

@ -12,11 +12,11 @@
#define MIN_RETRY 1000
#define REQUIRE_VERSION 40000
#define REQUIRE_VERSION 70001
static inline int GetRequireHeight(const bool testnet = fTestNet)
{
return testnet ? 0 : 230000;
return testnet ? 500000 : 350000;
}
std::string static inline ToString(const CService &ip) {