mirror of
https://github.com/monero-project/monero.git
synced 2024-12-27 17:19:24 -05:00
Merge pull request #9011
03d51b7
wallet2: fix refresh function parameters (selsta)
This commit is contained in:
commit
83d0d2338f
@ -3919,7 +3919,7 @@ std::shared_ptr<std::map<std::pair<uint64_t, uint64_t>, size_t>> wallet2::create
|
|||||||
return cache;
|
return cache;
|
||||||
}
|
}
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blocks_fetched, bool& received_money, bool check_pool, uint64_t max_blocks, bool try_incremental)
|
void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blocks_fetched, bool& received_money, bool check_pool, bool try_incremental, uint64_t max_blocks)
|
||||||
{
|
{
|
||||||
if (m_offline)
|
if (m_offline)
|
||||||
{
|
{
|
||||||
|
@ -1058,7 +1058,7 @@ private:
|
|||||||
bool is_deprecated() const;
|
bool is_deprecated() const;
|
||||||
void refresh(bool trusted_daemon);
|
void refresh(bool trusted_daemon);
|
||||||
void refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blocks_fetched);
|
void refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blocks_fetched);
|
||||||
void refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blocks_fetched, bool& received_money, bool check_pool = true, uint64_t max_blocks = std::numeric_limits<uint64_t>::max(), bool try_incremental = true);
|
void refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blocks_fetched, bool& received_money, bool check_pool = true, bool try_incremental = true, uint64_t max_blocks = std::numeric_limits<uint64_t>::max());
|
||||||
bool refresh(bool trusted_daemon, uint64_t & blocks_fetched, bool& received_money, bool& ok);
|
bool refresh(bool trusted_daemon, uint64_t & blocks_fetched, bool& received_money, bool& ok);
|
||||||
|
|
||||||
void set_refresh_type(RefreshType refresh_type) { m_refresh_type = refresh_type; }
|
void set_refresh_type(RefreshType refresh_type) { m_refresh_type = refresh_type; }
|
||||||
|
@ -154,7 +154,7 @@ namespace tools
|
|||||||
uint64_t blocks_fetched = 0;
|
uint64_t blocks_fetched = 0;
|
||||||
try {
|
try {
|
||||||
bool received_money = false;
|
bool received_money = false;
|
||||||
if (m_wallet) m_wallet->refresh(m_wallet->is_trusted_daemon(), 0, blocks_fetched, received_money, true, REFRESH_INFICATIVE_BLOCK_CHUNK_SIZE, true);
|
if (m_wallet) m_wallet->refresh(m_wallet->is_trusted_daemon(), 0, blocks_fetched, received_money, true, true, REFRESH_INFICATIVE_BLOCK_CHUNK_SIZE);
|
||||||
} catch (const std::exception& ex) {
|
} catch (const std::exception& ex) {
|
||||||
LOG_ERROR("Exception at while refreshing, what=" << ex.what());
|
LOG_ERROR("Exception at while refreshing, what=" << ex.what());
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user