nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2853

Browse Source 
c0ae52c0 simplewallet: prevent (wrong) integrated adresses on accounts > 0 (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-12-02 09:24:53 +02:00
commit 63f0031965
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/simplewallet/simplewallet.cpp
View File

@ -5077,6 +5077,11 @@ bool simple_wallet::print_integrated_address(const std::vector<std::string> &arg
} }
if (args.size() == 0) 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<crypto::hash8>(); payment_id = crypto::rand<crypto::hash8>();
success_msg_writer() << tr("Random payment ID: ") << payment_id; 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()); success_msg_writer() << tr("Matching integrated address: ") << m_wallet->get_account().get_public_integrated_address_str(payment_id, m_wallet->testnet());
@ -5084,6 +5089,11 @@ bool simple_wallet::print_integrated_address(const std::vector<std::string> &arg
} }
if(tools::wallet2::parse_short_payment_id(args.back(), payment_id)) 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()); success_msg_writer() << m_wallet->get_account().get_public_integrated_address_str(payment_id, m_wallet->testnet());
return true; return true;
} }