DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #3669 from gavinandresen/dead_txns

Browse Source 
Handle "conflicted" transactions properly
This commit is contained in:
Gavin Andresen
2014-02-14 14:40:32 -05:00
parent e051e65c21 9a3d936fc2
commit 05d3ded072
18 changed files with 231 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet.h
View File

@@ -701,8 +701,11 @@ public:
// Quick answer in most cases
if (!IsFinalTx(*this))
return false;
if (GetDepthInMainChain() >= 1)
int nDepth = GetDepthInMainChain();
if (nDepth >= 1)
return true;
if (nDepth < 0)
return false;
if (!bSpendZeroConfChange || !IsFromMe()) // using wtx's cached debit
return false;
@@ -718,8 +721,11 @@ public:
if (!IsFinalTx(*ptx))
return false;
if (ptx->GetDepthInMainChain() >= 1)
int nPDepth = ptx->GetDepthInMainChain();
if (nPDepth >= 1)
continue;
if (nPDepth < 0)
return false;
if (!pwallet->IsFromMe(*ptx))
return false;