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

Merge 2b3e5bf4c0 into merged_master (Bitcoin PR #21613)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-29 21:03:11 +00:00
commit dc314b7d34
8 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/scriptpubkeyman.cpp
View file

@ -85,7 +85,7 @@ bool HaveKeys(const std::vector<valtype>& pubkeys, const LegacyScriptPubKeyMan&
//! Recursively solve script and return spendable/watchonly/invalid status.
//!
//! @param keystore legacy key and script store
//! @param script script to solve
//! @param scriptPubKey script to solve
//! @param sigversion script type (top-level / redeemscript / witnessscript)
//! @param recurse_scripthash whether to recurse into nested p2sh and p2wsh
//! scripts or simply treat any script that has been