From 86dd29058ff0476c55a19ddf686d2c29db4bb9a9 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Sat, 7 Feb 2015 21:03:08 -0700 Subject: [PATCH] disable rejecting blocks / version bump --- configure.ac | 2 +- src/clientversion.h | 2 +- src/main.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 36e60be8d7..247f8f7037 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, 15) +define(_CLIENT_VERSION_BUILD, 16) 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 dc1d84fde2..98b928e002 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 15 +#define CLIENT_VERSION_BUILD 16 diff --git a/src/main.cpp b/src/main.cpp index f902a33286..963cbd86b9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2833,8 +2833,8 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo BOOST_FOREACH(const CTxIn& in, tx.vin){ if(mapLockedInputs.count(in.prevout)){ if(mapLockedInputs[in.prevout] != tx.GetHash()){ - return state.DoS(0, error("CheckBlock() : found conflicting transaction with transaction lock"), - REJECT_INVALID, "conflicting-tx-ix"); + //return state.DoS(0, error("CheckBlock() : found conflicting transaction with transaction lock"), + // REJECT_INVALID, "conflicting-tx-ix"); } } } @@ -2896,7 +2896,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo CBitcoinAddress address2(address1); LogPrintf("CheckBlock() : Couldn't find masternode payment(%d|%d) or payee(%d|%s) nHeight %d. \n", foundPaymentAmount, masternodePaymentAmount, foundPayee, address2.ToString().c_str(), chainActive.Tip()->nHeight+1); - if(!RegTest()) return state.DoS(100, error("CheckBlock() : Couldn't find masternode payment or payee")); + //if(!RegTest()) return state.DoS(100, error("CheckBlock() : Couldn't find masternode payment or payee")); } else { LogPrintf("CheckBlock() : Found masternode payment %d\n", chainActive.Tip()->nHeight+1); }