maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Adjusting coinbase maturity

Browse source 
See: https://github.com/dogecoin/dogecoin/pull/325

Adjusted to take effect at block 145k
This commit is contained in:
Jackson Palmer 2014-03-12 19:30:26 -07:00
parent af55789ca7
commit 99786bfe02
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main.cpp
View file

@ -937,11 +937,21 @@ int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const
}
int CMerkleTx::GetHeightInMainChain(CBlockIndex* &pindexRet) const
{
return GetDepthInMainChain(pindexRet) + pindexBest->nHeight - 1;
}
int CMerkleTx::GetBlocksToMaturity() const
{
if (!IsCoinBase())
return 0;
return max(0, (COINBASE_MATURITY+20) - GetDepthInMainChain());
if(GetHeightInMainChain() >= COINBASE_MATURITY_SWITCH)
return max(0, (COINBASE_MATURITY_NEW+20) - GetDepthInMainChain());
else
return max(0, (COINBASE_MATURITY+20) - GetDepthInMainChain());
}
@ -1516,7 +1526,10 @@ bool CTransaction::CheckInputs(CValidationState &state, CCoinsViewCache &inputs,
// If prev is coinbase, check that it's matured
if (coins.IsCoinBase()) {
if (nSpendHeight - coins.nHeight < COINBASE_MATURITY)
int minDepth = COINBASE_MATURITY;
if(coins.nHeight >= COINBASE_MATURITY_SWITCH)
minDepth = COINBASE_MATURITY_NEW;
if (nSpendHeight - coins.nHeight < minDepth)
return state.Invalid(error("CheckInputs() : tried to spend coinbase at depth %d", nSpendHeight - coins.nHeight));
}

6
src/main.h
View file

@ -59,6 +59,10 @@ static const int64 MAX_MONEY = 10000000000 * COIN; // DogeCoin: maximum of 100B
inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
/** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
static const int COINBASE_MATURITY = 30;
/** Coinbase maturity after block 145000 **/
static const int COINBASE_MATURITY_NEW = 60*4;
/** Block at which COINBASE_MATURITY_NEW comes into effect **/
static const int COINBASE_MATURITY_SWITCH = 145000;
/** Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. */
static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC
/** Maximum number of script-checking threads allowed */
@ -1161,6 +1165,8 @@ public:
int SetMerkleBranch(const CBlock* pblock=NULL);
int GetDepthInMainChain(CBlockIndex* &pindexRet) const;
int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
int GetHeightInMainChain(CBlockIndex* &pindexRet) const;
int GetHeightInMainChain() const { CBlockIndex *pindexRet; return GetHeightInMainChain(pindexRet); }
bool IsInMainChain() const { return GetDepthInMainChain() > 0; }
int GetBlocksToMaturity() const;
bool AcceptToMemoryPool(bool fCheckInputs=true, bool fLimitFree=true);