Merge pull request #3671 from gavinandresen/txn_conflicts

Report transaction conflicts, and tentative account balance fix
2014-02-15 08:56:55 -05:00
parent 05d3ded072 731b89b8b5
commit 085c62149a
5 changed files with 128 additions and 9 deletions
--- a/src/walletdb.cpp
+++ b/src/walletdb.cpp
@@ -382,7 +382,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
            if (wtx.nOrderPos == -1)
                wss.fAnyUnordered = true;

-            pwallet->mapWallet[hash] = wtx;
+            pwallet->AddToWallet(wtx, true);
            //// debug print
            //LogPrintf("LoadWallet  %s\n", wtx.GetHash().ToString());
            //LogPrintf(" %12"PRId64"  %s  %s  %s\n",