foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues Activity

descriptors: Move InferScript's pubkey validity checks to InferPubkey

Browse source
This commit is contained in:
Andrew Chow 2023-10-05 12:33:04 -04:00
parent b7485f11ab
commit 37b9b73477
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/script/descriptor.cpp
View file

@ -1413,8 +1413,16 @@ std::unique_ptr<PubkeyProvider> ParsePubkey(uint32_t key_exp_index, const Span<c
return std::make_unique<OriginPubkeyProvider>(key_exp_index, std::move(info), std::move(provider), apostrophe); return std::make_unique<OriginPubkeyProvider>(key_exp_index, std::move(info), std::move(provider), apostrophe);
} }
std::unique_ptr<PubkeyProvider> InferPubkey(const CPubKey& pubkey, ParseScriptContext, const SigningProvider& provider) std::unique_ptr<PubkeyProvider> InferPubkey(const CPubKey& pubkey, ParseScriptContext ctx, const SigningProvider& provider)
{ {
// Key cannot be hybrid
if (!pubkey.IsValidNonHybrid()) {
return nullptr;
}
// Uncompressed is only allowed in TOP and P2SH contexts
if (ctx != ParseScriptContext::TOP && ctx != ParseScriptContext::P2SH && !pubkey.IsCompressed()) {
return nullptr;
}
std::unique_ptr<PubkeyProvider> key_provider = std::make_unique<ConstPubkeyProvider>(0, pubkey, false); std::unique_ptr<PubkeyProvider> key_provider = std::make_unique<ConstPubkeyProvider>(0, pubkey, false);
KeyOriginInfo info; KeyOriginInfo info;
if (provider.GetKeyOrigin(pubkey.GetID(), info)) { if (provider.GetKeyOrigin(pubkey.GetID(), info)) {
@ -1497,11 +1505,9 @@ struct KeyParser {
} }
} else if (!miniscript::IsTapscript(m_script_ctx)) { } else if (!miniscript::IsTapscript(m_script_ctx)) {
CPubKey pubkey(begin, end); CPubKey pubkey(begin, end);
if (pubkey.IsValidNonHybrid()) { if (auto pubkey_provider = InferPubkey(pubkey, ParseContext(), *m_in)) {
if (auto pubkey_provider = InferPubkey(pubkey, ParseContext(), *m_in)) { m_keys.push_back(std::move(pubkey_provider));
m_keys.push_back(std::move(pubkey_provider)); return key;
return key;
}
} }
} }
return {}; return {};
@ -1855,10 +1861,8 @@ std::unique_ptr<DescriptorImpl> InferScript(const CScript& script, ParseScriptCo
if (txntype == TxoutType::PUBKEY && (ctx == ParseScriptContext::TOP || ctx == ParseScriptContext::P2SH || ctx == ParseScriptContext::P2WSH)) { if (txntype == TxoutType::PUBKEY && (ctx == ParseScriptContext::TOP || ctx == ParseScriptContext::P2SH || ctx == ParseScriptContext::P2WSH)) {
CPubKey pubkey(data[0]); CPubKey pubkey(data[0]);
if (pubkey.IsValidNonHybrid()) { if (auto pubkey_provider = InferPubkey(pubkey, ctx, provider)) {
if (auto pubkey_provider = InferPubkey(pubkey, ctx, provider)) { return std::make_unique<PKDescriptor>(std::move(pubkey_provider));
return std::make_unique<PKDescriptor>(std::move(pubkey_provider));
}
} }
} }
if (txntype == TxoutType::PUBKEYHASH && (ctx == ParseScriptContext::TOP || ctx == ParseScriptContext::P2SH || ctx == ParseScriptContext::P2WSH)) { if (txntype == TxoutType::PUBKEYHASH && (ctx == ParseScriptContext::TOP || ctx == ParseScriptContext::P2SH || ctx == ParseScriptContext::P2WSH)) {
@ -1876,7 +1880,7 @@ std::unique_ptr<DescriptorImpl> InferScript(const CScript& script, ParseScriptCo
CKeyID keyid(hash); CKeyID keyid(hash);
CPubKey pubkey; CPubKey pubkey;
if (provider.GetPubKey(keyid, pubkey)) { if (provider.GetPubKey(keyid, pubkey)) {
if (auto pubkey_provider = InferPubkey(pubkey, ctx, provider)) { if (auto pubkey_provider = InferPubkey(pubkey, ParseScriptContext::P2WPKH, provider)) {
return std::make_unique<WPKHDescriptor>(std::move(pubkey_provider)); return std::make_unique<WPKHDescriptor>(std::move(pubkey_provider));
} }
} }