diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-03-27 12:23:58 -0700 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-03-27 12:23:59 -0700 |
| commit | 5ba6eef272e705f2ecaee3149ecc3d8fa6eaeadf (patch) | |
| tree | 13d15cc979b9beeea543529fccc3b1a1455f4272 /src/wallet/wallet2.cpp | |
| parent | 7d4a93fab3f4bfbb19e0f1ff1feeeadde649b116 (diff) | |
| parent | 0349347e6d2805e632d5972a50ae418296e9c479 (diff) | |
| download | monzero-core-5ba6eef272e705f2ecaee3149ecc3d8fa6eaeadf.tar.gz monzero-core-5ba6eef272e705f2ecaee3149ecc3d8fa6eaeadf.tar.xz monzero-core-5ba6eef272e705f2ecaee3149ecc3d8fa6eaeadf.zip | |
Merge pull request #6288
0349347e ringdb: use a different iv for key and data in rings table (moneromooo-monero)
7b882087 simplewallet: reword mixin in user message in terms of ring size (moneromooo-monero)
f507a43a wallet2: do not remove known rings when a tx fails (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 7ee32a436..97711c7cd 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -2934,7 +2934,6 @@ void wallet2::update_pool_state(std::vector<std::tuple<cryptonote::transaction, pit->second.m_state = wallet2::unconfirmed_transfer_details::failed; // the inputs aren't spent anymore, since the tx failed - remove_rings(pit->second.m_tx); for (size_t vini = 0; vini < pit->second.m_tx.vin.size(); ++vini) { if (pit->second.m_tx.vin[vini].type() == typeid(txin_to_key)) |