From 88f337009d6492407c6cbffda3212f89946c87c4 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Thu, 9 Jun 2016 10:34:11 -0700 Subject: [PATCH] Merge #877: Revert "V0.12.0.x fix budget submission" * Revert "V0.12.0.x fix budget submission" --- configure.ac | 2 +- src/clientversion.h | 2 +- src/masternode-budget.cpp | 8 +++++++- src/masternode-budget.h | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 018e1ef52ca96..56cc3db206e3f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 12) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 57) +define(_CLIENT_VERSION_BUILD, 58) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2016) AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash]) diff --git a/src/clientversion.h b/src/clientversion.h index a4fd639b7a55a..87c80685ecd3a 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,7 +17,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 12 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 57 +#define CLIENT_VERSION_BUILD 58 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp index 3ca5559ab53a7..3f89a577fcac4 100644 --- a/src/masternode-budget.cpp +++ b/src/masternode-budget.cpp @@ -32,7 +32,7 @@ int GetBudgetPaymentCycleBlocks(){ return 50; //ten times per day } -bool IsBudgetCollateralValid(uint256 nTxCollateralHash, uint256 nExpectedHash, std::string& strError, int64_t nTime, int& nConf) +bool IsBudgetCollateralValid(uint256 nTxCollateralHash, uint256 nExpectedHash, std::string& strError, int64_t& nTime, int& nConf) { CTransaction txCollateral; uint256 nBlockHash; @@ -64,6 +64,12 @@ bool IsBudgetCollateralValid(uint256 nTxCollateralHash, uint256 nExpectedHash, s return false; } + // RETRIEVE CONFIRMATIONS AND NTIME + /* + - nTime starts as zero and is passed-by-reference out of this function and stored in the external proposal + - nTime is never validated via the hashing mechanism and comes from a full-validated source (the blockchain) + */ + int conf = GetIXConfirmations(nTxCollateralHash); if (nBlockHash != uint256(0)) { BlockMap::iterator mi = mapBlockIndex.find(nBlockHash); diff --git a/src/masternode-budget.h b/src/masternode-budget.h index 4c9bcd8e19993..e75d36b7440a9 100644 --- a/src/masternode-budget.h +++ b/src/masternode-budget.h @@ -46,7 +46,7 @@ void DumpBudgets(); int GetBudgetPaymentCycleBlocks(); //Check the collateral transaction for the budget proposal/finalized budget -bool IsBudgetCollateralValid(uint256 nTxCollateralHash, uint256 nExpectedHash, std::string& strError, int64_t nTime, int& nConf); +bool IsBudgetCollateralValid(uint256 nTxCollateralHash, uint256 nExpectedHash, std::string& strError, int64_t& nTime, int& nConf); /** Save Budget Manager (budget.dat) */