highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-24 05:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: compare address returned by displayaddress

Browse Source 
Update external signer documentation to reflect this requirement, which HWI already implements.
This commit is contained in:
Sjors Provoost
2021-11-23 16:12:55 +01:00
parent 6c1a2cc09a
commit dc55531087
7 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/wallet/external_signer_scriptpubkeyman.cpp
View File

@@ -9,6 +9,7 @@
#include <wallet/external_signer_scriptpubkeyman.h>
#include <iostream>
#include <key_io.h>
#include <memory>
#include <stdexcept>
#include <string>
@@ -51,15 +52,19 @@ ExternalSigner ExternalSignerScriptPubKeyMan::GetExternalSigner() {
return signers[0];
}
bool ExternalSignerScriptPubKeyMan::DisplayAddress(const CScript scriptPubKey, const ExternalSigner &signer) const
bool ExternalSignerScriptPubKeyMan::DisplayAddress(const CTxDestination& dest, const ExternalSigner &signer) const
{
// TODO: avoid the need to infer a descriptor from inside a descriptor wallet
const CScript& scriptPubKey = GetScriptForDestination(dest);
auto provider = GetSolvingProvider(scriptPubKey);
auto descriptor = InferDescriptor(scriptPubKey, *provider);
signer.DisplayAddress(descriptor->ToString());
// TODO inspect result
return true;
const UniValue& result = signer.DisplayAddress(descriptor->ToString());
const UniValue& ret_address = result.find_value("address");
if (!ret_address.isStr()) return false;
return ret_address.getValStr() == EncodeDestination(dest);
}
// If sign is true, transaction must previously have been filled