rpc, gui: bumpfee signer support #21576

3531 | -        uint256 txid;
3532 | -        if (feebumper::CommitTransaction(*pwallet, hash, std::move(mtx), errors, txid) != feebumper::Result::OK) {
3533 | -            throw JSONRPCError(RPC_WALLET_ERROR, errors[0].original);
3534 | -        }
3535 | +            // First fill transaction with our data without signing,
3536 | +            // so external signers are not asked sign more than once.

---

3534 | -        }
3535 | +            // First fill transaction with our data without signing,
3536 | +            // so external signers are not asked sign more than once.
3537 | +            bool complete;
3538 | +            pwallet->FillPSBT(psbtx, complete, SIGHASH_ALL, false, true);
3539 | +            const TransactionError err = pwallet->FillPSBT(psbtx, complete, SIGHASH_ALL, true, false);

---

3540 | +            if (err != TransactionError::OK) {
3541 | +                throw JSONRPCTransactionError(err);
3542 | +            }
3543 |  
3544 | -        result.pushKV("txid", txid.GetHex());
3545 | +            CMutableTransaction mtx;

---

3520 | @@ -3521,16 +3521,39 @@ static RPCHelpMan bumpfee_helper(std::string method_name)
3521 |      // If wallet private keys are enabled, return the new transaction id,
3522 |      // otherwise return the base64-encoded unsigned PSBT of the new transaction.

---

4194 | @@ -4174,10 +4195,10 @@ static RPCHelpMan send()
4195 |              PartiallySignedTransaction psbtx(rawTx);
4196 |  
4197 |              // First fill transaction with our data without signing,
4198 | -            // so external signers are not asked sign more than once.
4199 | +            // so external signers are not asked to sign more than once.
4200 |              bool complete;
4201 | -            pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, false, true);
4202 | -            const TransactionError err = pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, true, false);
4203 | +            pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, false /* sign */, true /* bip32derivs */);

---

3555 | +
3556 | +            if (!complete) {
3557 | +                throw JSONRPCError(RPC_WALLET_ERROR, "Transaction incomplete. Try psbtbumpfee instead.");
3558 | +            }
3559 | +            CTransactionRef tx(MakeTransactionRef(std::move(mtx)));
3560 | +            result.pushKV("txid", tx->GetHash().GetHex());

---

1128 | +            // so external signers are not asked to sign more than once.
1129 |              bool complete;
1130 | -            pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, false, true);
1131 | -            const TransactionError err = pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, true, false);
1132 | +            pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, /* sign */ false, /* bip32derivs */ true);
1133 | +            const TransactionError err = pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, /* sign */ true, /* bip32derivs */ false);

---

 250 | +        bool complete;
 251 | +        wallet.FillPSBT(psbtx, complete, SIGHASH_ALL, false /* sign */, true /* bip32derivs */);
 252 | +        const TransactionError err = wallet.FillPSBT(psbtx, complete, SIGHASH_ALL, true /* sign */, false  /* bip32derivs */);
 253 | +        if (err != TransactionError::OK) return false;
 254 | +        complete = FinalizeAndExtractPSBT(psbtx, mtx);
 255 | +        return complete;

---