GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 3356799ee3 into merged_master (Bitcoin PR #15778)

Browse source
This commit is contained in:
Andrew Poelstra 2020-10-28 23:03:35 +00:00
commit ad0dc00fc2
18 changed files with 46 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/interfaces/wallet.cpp
View file

@ -496,6 +496,7 @@ public:
bool IsWalletFlagSet(uint64_t flag) override { return m_wallet->IsWalletFlagSet(flag); }
OutputType getDefaultAddressType() override { return m_wallet->m_default_address_type; }
OutputType getDefaultChangeType() override { return m_wallet->m_default_change_type; }
CAmount getDefaultMaxTxFee() override { return m_wallet->m_default_max_tx_fee; }
void remove() override
{
RemoveWallet(m_wallet);