From c0ae52c0810963dd678adf6a948d396223c92379 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Wed, 22 Nov 2017 16:20:11 +0000 Subject: simplewallet: prevent (wrong) integrated adresses on accounts > 0 --- src/simplewallet/simplewallet.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/simplewallet') diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index d971f4fed..d0cf4676c 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -4785,6 +4785,11 @@ bool simple_wallet::print_integrated_address(const std::vector &arg } if (args.size() == 0) { + if (m_current_subaddress_account != 0) + { + fail_msg_writer() << tr("Integrated addresses can only be created for account 0"); + return true; + } payment_id = crypto::rand(); success_msg_writer() << tr("Random payment ID: ") << payment_id; success_msg_writer() << tr("Matching integrated address: ") << m_wallet->get_account().get_public_integrated_address_str(payment_id, m_wallet->testnet()); @@ -4792,6 +4797,11 @@ bool simple_wallet::print_integrated_address(const std::vector &arg } if(tools::wallet2::parse_short_payment_id(args.back(), payment_id)) { + if (m_current_subaddress_account != 0) + { + fail_msg_writer() << tr("Integrated addresses can only be created for account 0"); + return true; + } success_msg_writer() << m_wallet->get_account().get_public_integrated_address_str(payment_id, m_wallet->testnet()); return true; } -- cgit v1.2.3