version bump
This commit is contained in:
parent
4064c2f5ef
commit
77bade91be
@ -3,7 +3,7 @@ AC_PREREQ([2.60])
|
|||||||
define(_CLIENT_VERSION_MAJOR, 0)
|
define(_CLIENT_VERSION_MAJOR, 0)
|
||||||
define(_CLIENT_VERSION_MINOR, 11)
|
define(_CLIENT_VERSION_MINOR, 11)
|
||||||
define(_CLIENT_VERSION_REVISION, 1)
|
define(_CLIENT_VERSION_REVISION, 1)
|
||||||
define(_CLIENT_VERSION_BUILD, 7)
|
define(_CLIENT_VERSION_BUILD, 8)
|
||||||
define(_CLIENT_VERSION_IS_RELEASE, true)
|
define(_CLIENT_VERSION_IS_RELEASE, true)
|
||||||
define(_COPYRIGHT_YEAR, 2015)
|
define(_COPYRIGHT_YEAR, 2015)
|
||||||
AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin])
|
AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin])
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#define CLIENT_VERSION_MAJOR 0
|
#define CLIENT_VERSION_MAJOR 0
|
||||||
#define CLIENT_VERSION_MINOR 11
|
#define CLIENT_VERSION_MINOR 11
|
||||||
#define CLIENT_VERSION_REVISION 1
|
#define CLIENT_VERSION_REVISION 1
|
||||||
#define CLIENT_VERSION_BUILD 7
|
#define CLIENT_VERSION_BUILD 8
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -222,7 +222,7 @@ class CDarksendSession
|
|||||||
class CDarkSendPool
|
class CDarkSendPool
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static const int MIN_PEER_PROTO_VERSION = 70057;
|
static const int MIN_PEER_PROTO_VERSION = 70058;
|
||||||
|
|
||||||
// clients entries
|
// clients entries
|
||||||
std::vector<CDarkSendEntry> myEntries;
|
std::vector<CDarkSendEntry> myEntries;
|
||||||
|
@ -212,7 +212,7 @@ int64_t CreateNewLock(CTransaction tx)
|
|||||||
nTxAge = GetInputAge(i);
|
nTxAge = GetInputAge(i);
|
||||||
if(nTxAge < 6)
|
if(nTxAge < 6)
|
||||||
{
|
{
|
||||||
LogPrintf("ProcessMessageInstantX::txlreq - Transaction not found / too new: %d / %s\n", nTxAge, tx.GetHash().ToString().c_str());
|
LogPrintf("CreateNewLock - Transaction not found / too new: %d / %s\n", nTxAge, tx.GetHash().ToString().c_str());
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -225,7 +225,7 @@ int64_t CreateNewLock(CTransaction tx)
|
|||||||
int nBlockHeight = (chainActive.Tip()->nHeight - nTxAge)+4;
|
int nBlockHeight = (chainActive.Tip()->nHeight - nTxAge)+4;
|
||||||
|
|
||||||
if (!mapTxLocks.count(tx.GetHash())){
|
if (!mapTxLocks.count(tx.GetHash())){
|
||||||
LogPrintf("InstantX::ProcessConsensusVote - New Transaction Lock %s !\n", tx.GetHash().ToString().c_str());
|
LogPrintf("CreateNewLock - New Transaction Lock %s !\n", tx.GetHash().ToString().c_str());
|
||||||
|
|
||||||
CTransactionLock newLock;
|
CTransactionLock newLock;
|
||||||
newLock.nBlockHeight = nBlockHeight;
|
newLock.nBlockHeight = nBlockHeight;
|
||||||
@ -234,7 +234,7 @@ int64_t CreateNewLock(CTransaction tx)
|
|||||||
mapTxLocks.insert(make_pair(tx.GetHash(), newLock));
|
mapTxLocks.insert(make_pair(tx.GetHash(), newLock));
|
||||||
} else {
|
} else {
|
||||||
mapTxLocks[tx.GetHash()].nBlockHeight = nBlockHeight;
|
mapTxLocks[tx.GetHash()].nBlockHeight = nBlockHeight;
|
||||||
if(fDebug) LogPrintf("InstantX::ProcessConsensusVote - Transaction Lock Exists %s !\n", tx.GetHash().ToString().c_str());
|
if(fDebug) LogPrintf("CreateNewLock - Transaction Lock Exists %s !\n", tx.GetHash().ToString().c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
return nBlockHeight;
|
return nBlockHeight;
|
||||||
@ -284,7 +284,7 @@ bool ProcessConsensusVote(CConsensusVote& ctx)
|
|||||||
|
|
||||||
if(n > 10)
|
if(n > 10)
|
||||||
{
|
{
|
||||||
LogPrintf("InstantX::ProcessConsensusVote - Masternode not in the top 10\n");
|
LogPrintf("InstantX::ProcessConsensusVote - Masternode not in the top 10 (%d)\n", n);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -508,7 +508,7 @@ int CTransactionLock::CountSignatures()
|
|||||||
The votes have no proof it's the correct blockheight
|
The votes have no proof it's the correct blockheight
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(nBlockHeight == 0) return 0;
|
if(nBlockHeight == 0) return -1;
|
||||||
|
|
||||||
int n = 0;
|
int n = 0;
|
||||||
BOOST_FOREACH(CConsensusVote v, vecConsensusVotes){
|
BOOST_FOREACH(CConsensusVote v, vecConsensusVotes){
|
||||||
|
@ -23,7 +23,7 @@ class CConsensusVote;
|
|||||||
class CTransaction;
|
class CTransaction;
|
||||||
class CTransactionLock;
|
class CTransactionLock;
|
||||||
|
|
||||||
static const int MIN_INSTANTX_PROTO_VERSION = 70057;
|
static const int MIN_INSTANTX_PROTO_VERSION = 70058;
|
||||||
|
|
||||||
extern map<uint256, CTransaction> mapTxLockReq;
|
extern map<uint256, CTransaction> mapTxLockReq;
|
||||||
extern map<uint256, CTransactionLock> mapTxLocks;
|
extern map<uint256, CTransactionLock> mapTxLocks;
|
||||||
|
@ -27,7 +27,7 @@ extern const std::string CLIENT_DATE;
|
|||||||
// network protocol versioning
|
// network protocol versioning
|
||||||
//
|
//
|
||||||
|
|
||||||
static const int PROTOCOL_VERSION = 70057;
|
static const int PROTOCOL_VERSION = 70058;
|
||||||
|
|
||||||
// intial proto version, to be increased after version/verack negotiation
|
// intial proto version, to be increased after version/verack negotiation
|
||||||
static const int INIT_PROTO_VERSION = 209;
|
static const int INIT_PROTO_VERSION = 209;
|
||||||
|
Loading…
Reference in New Issue
Block a user