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 99d6a5be8b into merged_master (Bitcoin PR #17999)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:16 +00:00
commit 90081b0645
6 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/interfaces/node.cpp
View file

@ -253,8 +253,9 @@ public:
std::vector<std::unique_ptr<Wallet>> getWallets() override
{
std::vector<std::unique_ptr<Wallet>> wallets;
for (const std::shared_ptr<CWallet>& wallet : GetWallets()) {
wallets.emplace_back(MakeWallet(wallet));
for (auto& client : m_context.chain_clients) {
auto client_wallets = client->getWallets();
std::move(client_wallets.begin(), client_wallets.end(), std::back_inserter(wallets));
}
return wallets;
}