GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f4b603cff6 into merged_master (Bitcoin PR #17993)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:53 +00:00
commit bfa1cef745
11 changed files with 71 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/interfaces/wallet.cpp
View file

@ -366,13 +366,13 @@ public:
}
return result;
}
bool tryGetBalances(WalletBalances& balances, int& num_blocks) override
bool tryGetBalances(WalletBalances& balances, uint256& block_hash) override
{
TRY_LOCK(m_wallet->cs_wallet, locked_wallet);
if (!locked_wallet) {
return false;
}
num_blocks = m_wallet->GetLastBlockHeight();
block_hash = m_wallet->GetLastBlockHash();
balances = getBalances();
return true;
}