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

Make IsSegWitOutput return true for taproot outputs

Browse source
This commit is contained in:
Pieter Wuille 2021-07-09 09:58:34 -07:00
parent a88fa1a555
commit 8465978f23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/script/sign.cpp
View file

@ -612,15 +612,18 @@ bool IsSolvable(const SigningProvider& provider, const CScript& script)
bool IsSegWitOutput(const SigningProvider& provider, const CScript& script) bool IsSegWitOutput(const SigningProvider& provider, const CScript& script)
{ {
std::vector<valtype> solutions; int version;
auto whichtype = Solver(script, solutions); valtype program;
if (whichtype == TxoutType::WITNESS_V0_SCRIPTHASH || whichtype == TxoutType::WITNESS_V0_KEYHASH || whichtype == TxoutType::WITNESS_UNKNOWN) return true; if (script.IsWitnessProgram(version, program)) return true;
if (whichtype == TxoutType::SCRIPTHASH) { if (script.IsPayToScriptHash()) {
auto h160 = uint160(solutions[0]); std::vector<valtype> solutions;
CScript subscript; auto whichtype = Solver(script, solutions);
if (provider.GetCScript(CScriptID{h160}, subscript)) { if (whichtype == TxoutType::SCRIPTHASH) {
whichtype = Solver(subscript, solutions); auto h160 = uint160(solutions[0]);
if (whichtype == TxoutType::WITNESS_V0_SCRIPTHASH || whichtype == TxoutType::WITNESS_V0_KEYHASH || whichtype == TxoutType::WITNESS_UNKNOWN) return true; CScript subscript;
if (provider.GetCScript(CScriptID{h160}, subscript)) {
if (subscript.IsWitnessProgram(version, program)) return true;
}
} }
} }
return false; return false;