diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-02 19:58:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-02 19:59:50 +0200 |
| commit | 3203a0832adf72f4303c7ab1a7a6046a6dd14778 (patch) | |
| tree | 9222e3cb6e0a9e602fedec702d7497e397d06c00 /src/wallet | |
| parent | 987efae1fd222320329ff1293afd4986c28df9fd (diff) | |
| parent | 5d34e16d3a1e6ef37d5e6d254063c342b0e5fe39 (diff) | |
| download | bitcoin-3203a0832adf72f4303c7ab1a7a6046a6dd14778.tar.xz | |
Merge pull request #5881
5d34e16 Add txn_clone.py test (Tom Harding)
defd2d5 Better txn_doublespend.py test (Tom Harding)
b2b3619 Implement CTransaction::IsEquivalentTo(...) (Tom Harding)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 238f62a575..44e28de0cd 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -419,6 +419,7 @@ void CWallet::SyncMetaData(pair<TxSpends::iterator, TxSpends::iterator> range) const uint256& hash = it->second; CWalletTx* copyTo = &mapWallet[hash]; if (copyFrom == copyTo) continue; + if (!copyFrom->IsEquivalentTo(*copyTo)) continue; copyTo->mapValue = copyFrom->mapValue; copyTo->vOrderForm = copyFrom->vOrderForm; // fTimeReceivedIsTxTime not copied on purpose |