Merge pull request #5899

7d3bba5 wallet2_api: add missing parameter (selsta)
This commit is contained in:
luigi1111 2019-09-14 13:23:28 -05:00
commit dbe31f63e1
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 4 additions and 4 deletions

View File

@ -64,8 +64,8 @@ void SubaddressAccountImpl::refresh()
i, i,
m_wallet->m_wallet->get_subaddress_as_str({i,0}), m_wallet->m_wallet->get_subaddress_as_str({i,0}),
m_wallet->m_wallet->get_subaddress_label({i,0}), m_wallet->m_wallet->get_subaddress_label({i,0}),
cryptonote::print_money(m_wallet->m_wallet->balance(i)), cryptonote::print_money(m_wallet->m_wallet->balance(i, false)),
cryptonote::print_money(m_wallet->m_wallet->unlocked_balance(i)) cryptonote::print_money(m_wallet->m_wallet->unlocked_balance(i, false))
)); ));
} }
} }

View File

@ -993,12 +993,12 @@ void WalletImpl::setSubaddressLookahead(uint32_t major, uint32_t minor)
uint64_t WalletImpl::balance(uint32_t accountIndex) const uint64_t WalletImpl::balance(uint32_t accountIndex) const
{ {
return m_wallet->balance(accountIndex); return m_wallet->balance(accountIndex, false);
} }
uint64_t WalletImpl::unlockedBalance(uint32_t accountIndex) const uint64_t WalletImpl::unlockedBalance(uint32_t accountIndex) const
{ {
return m_wallet->unlocked_balance(accountIndex); return m_wallet->unlocked_balance(accountIndex, false);
} }
uint64_t WalletImpl::blockChainHeight() const uint64_t WalletImpl::blockChainHeight() const