diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 4766ff701..7fbcd2c33 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3633,7 +3633,7 @@ bool wallet2::get_rct_distribution(uint64_t &start_height, std::vector cryptonote::COMMAND_RPC_GET_OUTPUT_DISTRIBUTION::response res = AUTO_VAL_INIT(res); req.amounts.push_back(0); req.from_height = 0; - req.cumulative = true; + req.cumulative = false; req.binary = true; req.compress = true; @@ -3661,6 +3661,8 @@ bool wallet2::get_rct_distribution(uint64_t &start_height, std::vector MWARNING("Failed to request output distribution: results are not for amount 0"); return false; } + for (size_t i = 1; i < res.distributions[0].data.distribution.size(); ++i) + res.distributions[0].data.distribution[i] += res.distributions[0].data.distribution[i-1]; start_height = res.distributions[0].data.start_height; distribution = std::move(res.distributions[0].data.distribution); return true; @@ -6581,7 +6583,7 @@ void wallet2::commit_tx(pending_tx& ptx) COMMAND_RPC_SEND_RAW_TX::request req; req.tx_as_hex = epee::string_tools::buff_to_hex_nodelimer(tx_to_blob(ptx.tx)); req.do_not_relay = false; - req.do_sanity_checks = false; + req.do_sanity_checks = true; COMMAND_RPC_SEND_RAW_TX::response daemon_send_resp; { @@ -8176,8 +8178,8 @@ void wallet2::get_outs(std::vector> // check we're clear enough of rct start, to avoid corner cases below THROW_WALLET_EXCEPTION_IF(rct_offsets.size() <= CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE, error::get_output_distribution, "Not enough rct outputs"); - THROW_WALLET_EXCEPTION_IF(rct_offsets.back() <= max_rct_index, - error::get_output_distribution, "Daemon reports suspicious number of rct outputs"); + //THROW_WALLET_EXCEPTION_IF(rct_offsets.back() <= max_rct_index, + //error::get_output_distribution, "Daemon reports suspicious number of rct outputs"); } // get histogram for the amounts we need