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

Merge b1a672d158 into merged_master (Bitcoin PR bitcoin/bitcoin#22337)

Browse source
This commit is contained in:
Byron Hambly 2023-04-07 11:14:41 +00:00
commit a20c67310c
17 changed files with 92 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/wallet/interfaces.cpp
View file

@ -16,6 +16,7 @@
#include <uint256.h>
#include <util/check.h>
#include <util/system.h>
#include <util/translation.h>
#include <util/ui_change_type.h>
#include <wallet/context.h>
#include <wallet/feebumper.h>
@ -142,7 +143,7 @@ public:
bool getNewDestination(const OutputType type, const std::string label, CTxDestination& dest, bool add_blinding_key = false) override
{
LOCK(m_wallet->cs_wallet);
std::string error;
bilingual_str error;
return m_wallet->GetNewDestination(type, label, dest, error, add_blinding_key);
}
bool getPubKey(const CScript& script, const CKeyID& address, CPubKey& pub_key) override