d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

wallet2: fix misc issues when the ringdb can't be initialized

Browse source
This commit is contained in:
moneromooo-monero 2018-05-01 10:52:47 +01:00 committed by Matthew Incognito
parent 022ec18c48
commit 4e75860da2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/wallet/wallet2.cpp
View file

@ -5485,7 +5485,7 @@ void wallet2::set_ring_database(const std::string &filename)
bool wallet2::add_rings(const crypto::chacha_key &key, const cryptonote::transaction_prefix &tx)
{
if (!m_ringdb)
return true;
return false;
return m_ringdb->add_rings(key, tx);
}
@ -5499,7 +5499,7 @@ bool wallet2::add_rings(const cryptonote::transaction_prefix &tx)
bool wallet2::remove_rings(const cryptonote::transaction_prefix &tx)
{
if (!m_ringdb)
return true;
return false;
crypto::chacha_key key;
generate_chacha_key_from_secret_keys(key);
return m_ringdb->remove_rings(key, tx);
@ -5508,7 +5508,7 @@ bool wallet2::remove_rings(const cryptonote::transaction_prefix &tx)
bool wallet2::get_ring(const crypto::chacha_key &key, const crypto::key_image &key_image, std::vector<uint64_t> &outs)
{
if (!m_ringdb)
return true;
return false;
return m_ringdb->get_ring(key, key_image, outs);
}
@ -5546,7 +5546,7 @@ bool wallet2::get_ring(const crypto::key_image &key_image, std::vector<uint64_t>
bool wallet2::set_ring(const crypto::key_image &key_image, const std::vector<uint64_t> &outs, bool relative)
{
if (!m_ringdb)
return true;
return false;
crypto::chacha_key key;
generate_chacha_key_from_secret_keys(key);
@ -5559,7 +5559,7 @@ bool wallet2::find_and_save_rings(bool force)
if (!force && m_ring_history_saved)
return true;
if (!m_ringdb)
return true;
return false;
COMMAND_RPC_GET_TRANSACTIONS::request req = AUTO_VAL_INIT(req);
COMMAND_RPC_GET_TRANSACTIONS::response res = AUTO_VAL_INIT(res);
@ -5618,14 +5618,14 @@ bool wallet2::find_and_save_rings(bool force)
bool wallet2::blackball_output(const crypto::public_key &output)
{
if (!m_ringdb)
return true;
return false;
return m_ringdb->blackball(output);
}
bool wallet2::set_blackballed_outputs(const std::vector<crypto::public_key> &outputs, bool add)
{
if (!m_ringdb)
return true;
return false;
bool ret = true;
if (!add)
ret &= m_ringdb->clear_blackballs();
@ -5637,14 +5637,14 @@ bool wallet2::set_blackballed_outputs(const std::vector<crypto::public_key> &out
bool wallet2::unblackball_output(const crypto::public_key &output)
{
if (!m_ringdb)
return true;
return false;
return m_ringdb->unblackball(output);
}
bool wallet2::is_output_blackballed(const crypto::public_key &output) const
{
if (!m_ringdb)
return true;
return false;
return m_ringdb->blackballed(output);
}