rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-27 13:23:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

wallet2: fix wrong change being recorded for cold signed txes

Browse Source
This commit is contained in:
moneromooo-monero 2016-11-23 20:10:34 +00:00
parent dbf2ab56c5
commit 92dea04929
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/wallet2.cpp
View File

@ -2730,7 +2730,7 @@ void wallet2::add_unconfirmed_tx(const cryptonote::transaction& tx, uint64_t amo
utd.m_amount_out = 0; utd.m_amount_out = 0;
for (const auto &d: dests) for (const auto &d: dests)
utd.m_amount_out += d.amount; utd.m_amount_out += d.amount;
utd.m_amount_out += change_amount; utd.m_amount_out += change_amount; // dests does not contain change
utd.m_change = change_amount; utd.m_change = change_amount;
utd.m_sent_time = time(NULL); utd.m_sent_time = time(NULL);
utd.m_tx = (const cryptonote::transaction_prefix&)tx; utd.m_tx = (const cryptonote::transaction_prefix&)tx;
@ -3057,7 +3057,7 @@ bool wallet2::sign_tx(const std::string &unsigned_filename, const std::string &s
ptx.change_dts = sd.change_dts; ptx.change_dts = sd.change_dts;
ptx.selected_transfers = sd.selected_transfers; ptx.selected_transfers = sd.selected_transfers;
ptx.tx_key = rct::rct2sk(rct::identity()); // don't send it back to the untrusted view wallet ptx.tx_key = rct::rct2sk(rct::identity()); // don't send it back to the untrusted view wallet
ptx.dests = sd.splitted_dsts; ptx.dests = sd.dests;
ptx.construction_data = sd; ptx.construction_data = sd;
txs.push_back(ptx); txs.push_back(ptx);
@ -3656,6 +3656,7 @@ void wallet2::transfer_selected(const std::vector<cryptonote::tx_destination_ent
ptx.construction_data.extra = tx.extra; ptx.construction_data.extra = tx.extra;
ptx.construction_data.unlock_time = unlock_time; ptx.construction_data.unlock_time = unlock_time;
ptx.construction_data.use_rct = false; ptx.construction_data.use_rct = false;
ptx.construction_data.dests = dsts;
} }
void wallet2::transfer_selected_rct(std::vector<cryptonote::tx_destination_entry> dsts, const std::list<size_t> selected_transfers, size_t fake_outputs_count, void wallet2::transfer_selected_rct(std::vector<cryptonote::tx_destination_entry> dsts, const std::list<size_t> selected_transfers, size_t fake_outputs_count,
@ -3776,6 +3777,7 @@ void wallet2::transfer_selected_rct(std::vector<cryptonote::tx_destination_entry
ptx.construction_data.extra = tx.extra; ptx.construction_data.extra = tx.extra;
ptx.construction_data.unlock_time = unlock_time; ptx.construction_data.unlock_time = unlock_time;
ptx.construction_data.use_rct = true; ptx.construction_data.use_rct = true;
ptx.construction_data.dests = dsts;
} }
static size_t estimate_rct_tx_size(int n_inputs, int mixin, int n_outputs) static size_t estimate_rct_tx_size(int n_inputs, int mixin, int n_outputs)

8
src/wallet/wallet2.h
View File

@ -191,11 +191,12 @@ namespace tools
{ {
std::vector<cryptonote::tx_source_entry> sources; std::vector<cryptonote::tx_source_entry> sources;
cryptonote::tx_destination_entry change_dts; cryptonote::tx_destination_entry change_dts;
std::vector<cryptonote::tx_destination_entry> splitted_dsts; std::vector<cryptonote::tx_destination_entry> splitted_dsts; // split, includes change
std::list<size_t> selected_transfers; std::list<size_t> selected_transfers;
std::vector<uint8_t> extra; std::vector<uint8_t> extra;
uint64_t unlock_time; uint64_t unlock_time;
bool use_rct; bool use_rct;
std::vector<cryptonote::tx_destination_entry> dests; // original setup, does not include change
BEGIN_SERIALIZE_OBJECT() BEGIN_SERIALIZE_OBJECT()
FIELD(sources) FIELD(sources)
@ -205,12 +206,16 @@ namespace tools
FIELD(extra) FIELD(extra)
VARINT_FIELD(unlock_time) VARINT_FIELD(unlock_time)
FIELD(use_rct) FIELD(use_rct)
FIELD(dests)
END_SERIALIZE() END_SERIALIZE()
}; };
typedef std::vector<transfer_details> transfer_container; typedef std::vector<transfer_details> transfer_container;
typedef std::unordered_multimap<crypto::hash, payment_details> payment_container; typedef std::unordered_multimap<crypto::hash, payment_details> payment_container;
// The convention for destinations is:
// dests does not include change
// splitted_dsts (in construction_data) does
struct pending_tx struct pending_tx
{ {
cryptonote::transaction tx; cryptonote::transaction tx;
@ -1047,6 +1052,7 @@ namespace tools
ptx.construction_data.extra = tx.extra; ptx.construction_data.extra = tx.extra;
ptx.construction_data.unlock_time = unlock_time; ptx.construction_data.unlock_time = unlock_time;
ptx.construction_data.use_rct = false; ptx.construction_data.use_rct = false;
ptx.construction_data.dests = dsts;
} }