Merge 69ba5727d5 into merged_master (Bitcoin PR bitcoin/bitcoin#27180)

This commit is contained in:
Tom Trevethan 2025-04-09 18:58:26 +00:00
commit 8e8dabba5d

View file

@ -1659,9 +1659,9 @@ bool DummySignInput(const SigningProvider& provider, CMutableTransaction& tx, co
const CScript& scriptPubKey = txout.scriptPubKey;
SignatureData sigdata;
// Use max sig if watch only inputs were used or if this particular input is an external input
// to ensure a sufficient fee is attained for the requested feerate.
const CTxIn& tx_in = tx.vin[nIn];
// Use max sig if watch only inputs were used, if this particular input is an external input,
// or if this wallet uses an external signer, to ensure a sufficient fee is attained for the requested feerate.
const bool use_max_sig = coin_control && (coin_control->fAllowWatchOnly || coin_control->IsExternalSelected(tx_in.prevout) || !can_grind_r);
if (!ProduceSignature(provider, use_max_sig ? DUMMY_MAXIMUM_SIGNATURE_CREATOR : DUMMY_SIGNATURE_CREATOR, scriptPubKey, sigdata)) {
return false;