aboutsummaryrefslogtreecommitdiff
path: root/src/walletdb.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2014-02-13 20:12:51 -0500
committerGavin Andresen <[email protected]>2014-02-14 18:13:42 -0500
commit731b89b8b53cb2ea4d2d5c8f2875def515766ea1 (patch)
tree161b262a14cf8396ca47f9b3ddbc0790465c3760 /src/walletdb.cpp
parentqt: GUI for conflicted transactions (diff)
downloaddiscoin-731b89b8b53cb2ea4d2d5c8f2875def515766ea1.tar.xz
discoin-731b89b8b53cb2ea4d2d5c8f2875def515766ea1.zip
Track and report wallet transaction clones
Adds a "walletconflicts" array to transaction info; if a wallet transaction is mutated, the alternate transaction id or ids are reported there (usually the array will be empty). Metadata from the original transaction is copied to the mutant, so the transaction time and "from" account of the mutant are reported correctly.
Diffstat (limited to 'src/walletdb.cpp')
-rw-r--r--src/walletdb.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp
index 56349fcfb..0b21ce7a6 100644
--- 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",