diff options
| author | Gavin Andresen <[email protected]> | 2014-02-14 14:40:32 -0500 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2014-02-14 14:40:32 -0500 |
| commit | 05d3ded072d782036c31c1d773c0441b87de843e (patch) | |
| tree | 1dcdec2f37f61415aa5d1b71da101e0cfbd035fd /src/main.cpp | |
| parent | Merge pull request #3659 from jgarzik/zapall (diff) | |
| parent | qt: GUI for conflicted transactions (diff) | |
| download | discoin-05d3ded072d782036c31c1d773c0441b87de843e.tar.xz discoin-05d3ded072d782036c31c1d773c0441b87de843e.zip | |
Merge pull request #3669 from gavinandresen/dead_txns
Handle "conflicted" transactions properly
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 1df9a24d5..36dd03a2b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -872,7 +872,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa } -int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const +int CMerkleTx::GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const { if (hashBlock == 0 || nIndex == -1) return 0; @@ -897,6 +897,14 @@ int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const return chainActive.Height() - pindex->nHeight + 1; } +int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const +{ + int nResult = GetDepthInMainChainINTERNAL(pindexRet); + if (nResult == 0 && !mempool.exists(GetHash())) + return -1; // Not in chain, not in mempool + + return nResult; +} int CMerkleTx::GetBlocksToMaturity() const { |