Merge 4c7dc0620a into merged_master (Elements PR ElementsProject/elements#1046)

This commit is contained in:
Andrew Poelstra 2021-09-22 02:06:25 +00:00
commit daa471ddd2
10 changed files with 305 additions and 53 deletions

View file

@ -89,9 +89,15 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx)
}
}
for (const PSBTOutput& output : psbtx.outputs) {
result.outputs.resize(psbtx.outputs.size());
for (unsigned int i = 0; i < psbtx.outputs.size(); ++i) {
const PSBTOutput& output = psbtx.outputs[i];
PSBTOutputAnalysis& output_analysis = result.outputs[i];
CTxOut txout = output.GetTxOut();
if (output.IsBlinded()) {
output_analysis.is_blind = output.IsBlinded();
output_analysis.proof_result = VerifyBlindProofs(output);
if (output_analysis.is_blind) {
has_blinded_outputs = true;
if (!output.IsFullyBlinded()) {
result.next = PSBTRole::BLINDER;