monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplewallet: fix sweep_all misreporting sweeped amount for rct outputs

Browse source 
RingCT outputs will be 0 in the vin, so we need to get the actual
amount from elsewhere.
This commit is contained in:
moneromooo-monero 2016-10-15 19:18:52 +01:00
parent 985f61a4ec
commit 8231997b66
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/simplewallet/simplewallet.cpp
View file

@ -2897,11 +2897,8 @@ bool simple_wallet::sweep_unmixable(const std::vector<std::string> &args_)
for (size_t n = 0; n < ptx_vector.size(); ++n) for (size_t n = 0; n < ptx_vector.size(); ++n)
{ {
total_fee += ptx_vector[n].fee; total_fee += ptx_vector[n].fee;
for (const auto &vin: ptx_vector[n].tx.vin) for (auto i: ptx_vector[n].selected_transfers)
{ total_unmixable += m_wallet->get_transfer_details(i).amount();
if (vin.type() == typeid(txin_to_key))
total_unmixable += boost::get<txin_to_key>(vin).amount;
}
} }
std::string prompt_str = tr("Sweeping ") + print_money(total_unmixable); std::string prompt_str = tr("Sweeping ") + print_money(total_unmixable);
@ -3152,11 +3149,8 @@ bool simple_wallet::sweep_all(const std::vector<std::string> &args_)
for (size_t n = 0; n < ptx_vector.size(); ++n) for (size_t n = 0; n < ptx_vector.size(); ++n)
{ {
total_fee += ptx_vector[n].fee; total_fee += ptx_vector[n].fee;
for (const auto &vin: ptx_vector[n].tx.vin) for (auto i: ptx_vector[n].selected_transfers)
{ total_sent += m_wallet->get_transfer_details(i).amount();
if (vin.type() == typeid(txin_to_key))
total_sent += boost::get<txin_to_key>(vin).amount;
}
} }
std::string prompt_str; std::string prompt_str;

6
src/wallet/wallet2.cpp
View file

@ -3978,6 +3978,12 @@ uint64_t wallet2::get_num_rct_outputs()
return resp_t.result.histogram[0].instances; return resp_t.result.histogram[0].instances;
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
const wallet2::transfer_details &wallet2::get_transfer_details(size_t idx) const
{
THROW_WALLET_EXCEPTION_IF(idx >= m_transfers.size(), error::wallet_internal_error, "Bad transfer index");
return m_transfers[idx];
}
//----------------------------------------------------------------------------------------------------
std::vector<size_t> wallet2::select_available_unmixable_outputs(bool trusted_daemon) std::vector<size_t> wallet2::select_available_unmixable_outputs(bool trusted_daemon)
{ {
// request all outputs with less than 3 instances // request all outputs with less than 3 instances

1
src/wallet/wallet2.h
View file

@ -447,6 +447,7 @@ namespace tools
bool get_tx_key(const crypto::hash &txid, crypto::secret_key &tx_key) const; bool get_tx_key(const crypto::hash &txid, crypto::secret_key &tx_key) const;
uint64_t get_num_rct_outputs(); uint64_t get_num_rct_outputs();
const transfer_details &get_transfer_details(size_t idx) const;
void get_hard_fork_info(uint8_t version, uint64_t &earliest_height); void get_hard_fork_info(uint8_t version, uint64_t &earliest_height);
bool use_fork_rules(uint8_t version, int64_t early_blocks = 0); bool use_fork_rules(uint8_t version, int64_t early_blocks = 0);