Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5485 

c519d1df wallet2: fix wrong change being recorded in sweep_all (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-04-24 22:41:18 +02:00
parent 973405018f c519d1df34
commit 2e2ee3d823
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View File

@ -9534,7 +9534,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
tx.ptx = test_ptx; tx.ptx = test_ptx;
tx.weight = get_transaction_weight(test_tx, txBlob.size()); tx.weight = get_transaction_weight(test_tx, txBlob.size());
tx.outs = outs; tx.outs = outs;
tx.needed_fee = needed_fee; tx.needed_fee = test_ptx.fee;
accumulated_fee += test_ptx.fee; accumulated_fee += test_ptx.fee;
accumulated_change += test_ptx.change_dts.amount; accumulated_change += test_ptx.change_dts.amount;
adding_fee = false; adding_fee = false;
@ -9932,7 +9932,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_from(const crypton
tx.ptx = test_ptx; tx.ptx = test_ptx;
tx.weight = get_transaction_weight(test_tx, txBlob.size()); tx.weight = get_transaction_weight(test_tx, txBlob.size());
tx.outs = outs; tx.outs = outs;
tx.needed_fee = needed_fee; tx.needed_fee = test_ptx.fee;
accumulated_fee += test_ptx.fee; accumulated_fee += test_ptx.fee;
accumulated_change += test_ptx.change_dts.amount; accumulated_change += test_ptx.change_dts.amount;
if (!unused_transfers_indices.empty() || !unused_dust_indices.empty()) if (!unused_transfers_indices.empty() || !unused_dust_indices.empty())