From d8e20ba4844201c0f2dd83c91d0fd614bc5c6cc8 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Mon, 15 Apr 2013 02:47:01 +0000 Subject: [PATCH] Check for required block height in IsGood to ensure nodes not meeting the requirement are indexed properly --- bitcoin.cpp | 2 -- db.h | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bitcoin.cpp b/bitcoin.cpp index beeecea..6494c1f 100644 --- a/bitcoin.cpp +++ b/bitcoin.cpp @@ -7,8 +7,6 @@ #include "uint256.h" #define BITCOIN_SEED_NONCE 0x0539a019ca550825 -#define REQUIRE_HEIGHT 140700 -#define MIN_VERSION 40000 using namespace std; diff --git a/db.h b/db.h index 003e7ec..1a6ef1b 100644 --- a/db.h +++ b/db.h @@ -12,6 +12,9 @@ #define MIN_RETRY 1000 +#define REQUIRE_HEIGHT 140700 +#define REQUIRE_VERSION 40000 + std::string static inline ToString(const CService &ip) { std::string str = ip.ToString(); while (str.size() < 22) str += ' '; @@ -90,7 +93,8 @@ public: if (ip.GetPort() != 8333) return false; if (!(services & NODE_NETWORK)) return false; if (!ip.IsRoutable()) return false; - if (clientVersion && clientVersion < 32400) return false; + if (clientVersion && clientVersion < REQUIRE_VERSION) return false; + if (blocks && blocks < REQUIRE_HEIGHT) return false; if (total <= 3 && success * 2 >= total) return true;