From aae14a107ac45e2773ecf87bddab277573c2ceff Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 2 Apr 2017 11:10:11 +0100 Subject: simplewallet: allow setting confirm-missing-payment-id in watch wallets These can create transactions, even though they cannot sign them. --- src/simplewallet/simplewallet.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/simplewallet/simplewallet.cpp') diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index f5a469af4..67dacda91 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -559,12 +559,6 @@ bool simple_wallet::set_refresh_type(const std::vector &args/* = st bool simple_wallet::set_confirm_missing_payment_id(const std::vector &args/* = std::vector()*/) { - if (m_wallet->watch_only()) - { - fail_msg_writer() << tr("wallet is watch-only and cannot transfer"); - return true; - } - const auto pwd_container = get_and_verify_password(); if (pwd_container) { -- cgit v1.2.3 From 9ae566d0ddeeefdfbd35726f7074d32166f5c047 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 2 Apr 2017 11:11:18 +0100 Subject: simplewallet: fix cold signing of split transactions They'd be rejected as suspicious as the change goes to more than one destination. However, split transactions will most likely include fake zero amount change to random addresses, so we only consider change with non zero amount for this. --- src/simplewallet/simplewallet.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/simplewallet/simplewallet.cpp') diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 67dacda91..9215ec821 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3035,6 +3035,7 @@ bool simple_wallet::accept_loaded_tx(const std::function get_num_txes, size_t min_mixin = ~0; std::unordered_map dests; const std::string wallet_address = m_wallet->get_account().get_public_address_str(m_wallet->testnet()); + int first_known_non_zero_change_index = -1; for (size_t n = 0; n < get_num_txes(); ++n) { const tools::wallet2::tx_construction_data &cd = get_tx(n); @@ -3069,10 +3070,15 @@ bool simple_wallet::accept_loaded_tx(const std::function get_num_txes, fail_msg_writer() << tr("Claimed change is larger than payment to the change address"); return false; } - if (memcmp(&cd.change_dts.addr, &get_tx(0).change_dts.addr, sizeof(cd.change_dts.addr))) + if (cd.change_dts.amount > 0) { - fail_msg_writer() << tr("Change does to more than one address"); - return false; + if (first_known_non_zero_change_index == -1) + first_known_non_zero_change_index = n; + if (memcmp(&cd.change_dts.addr, &get_tx(first_known_non_zero_change_index).change_dts.addr, sizeof(cd.change_dts.addr))) + { + fail_msg_writer() << tr("Change goes to more than one address"); + return false; + } } change += cd.change_dts.amount; it->second -= cd.change_dts.amount; -- cgit v1.2.3