Skip to content

Commit 592e013

Browse files
committed
Merge bitcoin#28833: wallet: refactor: remove unused SignatureData instances in spkm's FillPSBT methods
e2ad343 wallet: remove unused `SignatureData` instances in spkm's `FillPSBT` methods (Sebastian Falbesoner) Pull request description: These are filled with signature data from a PSBT input, but not used anywhere after, hence they can be removed. Note that the same code is in the `SignPSBTInput` function where the `sigdata` result is indeed used. ACKs for top commit: achow101: ACK e2ad343 brunoerg: crACK e2ad343 Tree-SHA512: f0cabcc000bcea6bc7d7ec9d3be2e2a8accbdbffbe35252250ea2305b65a5813fde2b8096fbdd2c7cccdf417ea285183dc325fc2d210d88bce62978ce642930e
2 parents 03d95cc + e2ad343 commit 592e013

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/wallet/scriptpubkeyman.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -652,8 +652,6 @@ TransactionError LegacyScriptPubKeyMan::FillPSBT(PartiallySignedTransaction& psb
652652
// There's no UTXO so we can just skip this now
653653
continue;
654654
}
655-
SignatureData sigdata;
656-
input.FillSignatureData(sigdata);
657655
SignPSBTInput(HidingSigningProvider(this, !sign, !bip32derivs), psbtx, i, &txdata, sighash_type, nullptr, finalize);
658656

659657
bool signed_one = PSBTInputSigned(input);
@@ -2528,8 +2526,6 @@ TransactionError DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTransaction&
25282526
// There's no UTXO so we can just skip this now
25292527
continue;
25302528
}
2531-
SignatureData sigdata;
2532-
input.FillSignatureData(sigdata);
25332529

25342530
std::unique_ptr<FlatSigningProvider> keys = std::make_unique<FlatSigningProvider>();
25352531
std::unique_ptr<FlatSigningProvider> script_keys = GetSigningProvider(script, /*include_private=*/sign);

0 commit comments

Comments
 (0)