mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Merge a7129f827c into merged_master (Bitcoin PR bitcoin/bitcoin#24313)
This commit is contained in:
commit
0f50b83d1e
13 changed files with 68 additions and 38 deletions
|
|
@ -258,7 +258,7 @@ public:
|
|||
return value.empty() ? m_wallet->EraseAddressReceiveRequest(batch, dest, id)
|
||||
: m_wallet->SetAddressReceiveRequest(batch, dest, id, value);
|
||||
}
|
||||
bool displayAddress(const CTxDestination& dest) override
|
||||
util::Result<void> displayAddress(const CTxDestination& dest) override
|
||||
{
|
||||
LOCK(m_wallet->cs_wallet);
|
||||
return m_wallet->DisplayAddress(dest);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue