Unverified Commit 0f9146d9 authored by squbs's avatar squbs

updated to v1.14.6.0

parent a572809e
......@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 14)
define(_CLIENT_VERSION_REVISION, 5)
define(_CLIENT_VERSION_BUILD, 2)
define(_CLIENT_VERSION_REVISION, 6)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2017)
define(_COPYRIGHT_HOLDERS,[The %s developers])
......
......@@ -5,7 +5,7 @@ includedir=${prefix}/include
Name: STRAKS Core consensus library
Description: Library for the STRAKS consensus protocol.
Version: 1.14.5
Version: 1.14.6
Libs: -L${libdir} -lstraksconsensus
Cflags: -I${includedir}
Requires.private: libcrypto
......@@ -126,7 +126,7 @@ public:
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nOverrideRuleChangeActivationThreshold = 1;
// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("000000000000000000000000000000000000000000000000016cc33045d3009c");
consensus.nMinimumChainWork = uint256S("000000000000000000000000000000000000000000000000021a7c8a44c5ed11");
// By default assume that the signatures in ancestors of this block are valid.
consensus.defaultAssumeValid = uint256S("0x0");
......@@ -182,7 +182,8 @@ NEW **mainnet** merkle root: 15343d9e3cfff44854ec63cc588d5a1ed6ea971085c2be97acb
{
{ 0, uint256S("00000df14d859c4b3219d93978bcf02afc123d2344a2ed39033e1208948aa7c0")},
{ 19760, uint256S("000000000008cdaee7a7cc3e8e5336ce2426eb7079f9a43a4dbf15ac8c08cbec")},
{ 34000, uint256S("00000000008fa092d7379523824d65470e1f62afdd9e4efe225b2a80461c16a1")}
{ 34000, uint256S("00000000008fa092d7379523824d65470e1f62afdd9e4efe225b2a80461c16a1")},
{ 50400, uint256S("00000000003c5729841f6d3f44d267e6be7e6b9a7cd4c9b2480a396f22e7561e")}
}
};
......@@ -269,7 +270,7 @@ public:
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nOverrideRuleChangeActivationThreshold = 1;
// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("0000000000000000000000000000000000000000000000000000004b872a38d6");
consensus.nMinimumChainWork = uint256S("00000000000000000000000000000000000000000000000000000051f7897c65");
// By default assume that the signatures in ancestors of this block are valid.
consensus.defaultAssumeValid = uint256S("0x0");
......
......@@ -9,7 +9,7 @@
/* #undef AC_APPLE_UNIVERSAL_BUILD */
/* Version Build */
#define CLIENT_VERSION_BUILD 2
#define CLIENT_VERSION_BUILD 0
/* Version is release */
#define CLIENT_VERSION_IS_RELEASE true
......@@ -21,7 +21,7 @@
#define CLIENT_VERSION_MINOR 14
/* Build revision */
#define CLIENT_VERSION_REVISION 5
#define CLIENT_VERSION_REVISION 6
/* Copyright holder(s) before %s replacement */
#define COPYRIGHT_HOLDERS "The %s developers"
......@@ -319,7 +319,7 @@
#define PACKAGE_NAME "STRAKS Core"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "STRAKS Core 1.14.5"
#define PACKAGE_STRING "STRAKS Core 1.14.6"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "straks"
......@@ -328,7 +328,7 @@
#define PACKAGE_URL "https://straks.info/"
/* Define to the version of this package. */
#define PACKAGE_VERSION "1.14.5"
#define PACKAGE_VERSION "1.14.6"
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
......
......@@ -387,8 +387,7 @@ bool CMasternodePayments::GetWinningMasternode(int nBlockHeight, CTxIn& vinOut)
bool CMasternodePayments::AddWinningMasternode(CMasternodePaymentWinner& winnerIn)
{
uint256 blockHash = uint256();
//UintToArith256(blockHash) = 0;
if(!GetBlockHash(blockHash, winnerIn.nBlockHeight-576)) {
if(!GetBlockHash(blockHash, winnerIn.nBlockHeight-15)) {
return false;
}
......
......@@ -467,7 +467,7 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe
}
if (nRet != 0)
{
LogPrintf("connect() to %s failed after select(): %s\n", addrConnect.ToString(), NetworkErrorString(nRet));
if(fDebug) LogPrintf("connect() to %s failed after select(): %s\n", addrConnect.ToString(), NetworkErrorString(nRet));
CloseSocket(hSocket);
return false;
}
......@@ -478,7 +478,7 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe
else
#endif
{
LogPrintf("connect() to %s failed: %s\n", addrConnect.ToString(), NetworkErrorString(WSAGetLastError()));
if(fDebug) LogPrintf("connect() to %s failed: %s\n", addrConnect.ToString(), NetworkErrorString(WSAGetLastError()));
CloseSocket(hSocket);
return false;
}
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment