From c8c4cc48f2c330776d7d10d47cab9851e65ffe5e Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Wed, 11 Feb 2015 13:39:33 -0700 Subject: [PATCH] fix propagation of spork messages --- configure.ac | 2 +- src/clientversion.h | 2 +- src/spork.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a99214efa..3b0fb5cd3 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 11) define(_CLIENT_VERSION_REVISION, 1) -define(_CLIENT_VERSION_BUILD, 20) +define(_CLIENT_VERSION_BUILD, 21) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2015) AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin]) diff --git a/src/clientversion.h b/src/clientversion.h index 3892935db..9da6bccd0 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -12,7 +12,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 11 #define CLIENT_VERSION_REVISION 1 -#define CLIENT_VERSION_BUILD 20 +#define CLIENT_VERSION_BUILD 21 diff --git a/src/spork.cpp b/src/spork.cpp index dbba0c528..06dafa851 100644 --- a/src/spork.cpp +++ b/src/spork.cpp @@ -36,7 +36,7 @@ void ProcessSpork(CNode* pfrom, std::string& strCommand, CDataStream& vRecv) if(chainActive.Tip() == NULL) return; uint256 hash = spork.GetHash(); - if(mapSporks.count(hash)) { + if(mapSporks.count(hash) && mapSporksActive.count(spork.nSporkID)) { if(mapSporksActive[spork.nSporkID].nTimeSigned >= spork.nTimeSigned){ if(fDebug) LogPrintf("spork - seen %s block %d \n", hash.ToString().c_str(), chainActive.Tip()->nHeight); return; @@ -53,6 +53,7 @@ void ProcessSpork(CNode* pfrom, std::string& strCommand, CDataStream& vRecv) return; } + mapSporks[hash] = spork; mapSporksActive[spork.nSporkID] = spork; sporkManager.Relay(spork);