Merge 572b36d4ff into merged_master (Bitcoin PR bitcoin/bitcoin#21736)

This commit is contained in:
Andrew Poelstra 2021-06-30 22:34:04 +00:00
commit d6417d70e8

View file

@ -495,7 +495,7 @@ protected:
* This function is invoked once by ExpandHelper.
*
* @param pubkeys The evaluations of the m_pubkey_args field.
* @param script The evaluations of m_subdescriptor_args (one for each m_subdescriptor_args element).
* @param scripts The evaluations of m_subdescriptor_args (one for each m_subdescriptor_args element).
* @param out A FlatSigningProvider to put scripts or public keys in that are necessary to the solver.
* The origin info of the provided pubkeys is automatically added.
* @return A vector with scriptPubKeys for this descriptor.