diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-24 18:52:27 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-24 18:52:30 +0200 |
| commit | 868cf431be1fc3f349d85b90772954f7919f5910 (patch) | |
| tree | eb4320fc479dc3268db1bac5a90ea141a1a256ce /src/wallet/wallet.cpp | |
| parent | 08516e0e65d589dc754b2d50527304cdc0132cb2 (diff) | |
| parent | fd9b3a71824e33728f267e6f288b6224ad1047e1 (diff) | |
| download | bitcoin-868cf431be1fc3f349d85b90772954f7919f5910.tar.xz | |
Merge #13160: wallet: Unlock spent outputs
fd9b3a71824e33728f267e6f288b6224ad1047e1 test: Output should be unlocked when spent (João Barbosa)
54c3bb4cf805ccee91efb9f8cdadea87e0797989 wallet: Unlock spent outputs (João Barbosa)
Pull request description:
Fixes #12738.
Tree-SHA512: 2c1694727aea0c658d07566c7d11d7afe91218053f84d568fac97413348fa5a977243d6cdeebd1c6550816489e35cb3a31667c8354d9b350de99f979d641d605
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 6255f28b17..842516bb0e 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -609,6 +609,8 @@ void CWallet::AddToSpends(const COutPoint& outpoint, const uint256& wtxid) { mapTxSpends.insert(std::make_pair(outpoint, wtxid)); + setLockedCoins.erase(outpoint); + std::pair<TxSpends::iterator, TxSpends::iterator> range; range = mapTxSpends.equal_range(outpoint); SyncMetaData(range); |