|
|
|
@ -82,10 +82,10 @@ static UniValue FinishTransaction(const std::shared_ptr<CWallet> pwallet, const
|
|
|
|
|
PartiallySignedTransaction psbtx(rawTx);
|
|
|
|
|
|
|
|
|
|
// First fill transaction with our data without signing,
|
|
|
|
|
// so external signers are not asked sign more than once.
|
|
|
|
|
// so external signers are not asked to sign more than once.
|
|
|
|
|
bool complete;
|
|
|
|
|
pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, false, true);
|
|
|
|
|
const TransactionError err{pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, true, false)};
|
|
|
|
|
pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, /*sign=*/false, /*bip32derivs=*/true);
|
|
|
|
|
const TransactionError err{pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, /*sign=*/true, /*bip32derivs=*/false)};
|
|
|
|
|
if (err != TransactionError::OK) {
|
|
|
|
|
throw JSONRPCTransactionError(err);
|
|
|
|
|
}
|
|
|
|
@ -1100,7 +1100,7 @@ static RPCHelpMan bumpfee_helper(std::string method_name)
|
|
|
|
|
} else {
|
|
|
|
|
PartiallySignedTransaction psbtx(mtx);
|
|
|
|
|
bool complete = false;
|
|
|
|
|
const TransactionError err = pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, false /* sign */, true /* bip32derivs */);
|
|
|
|
|
const TransactionError err = pwallet->FillPSBT(psbtx, complete, SIGHASH_DEFAULT, /*sign=*/false, /*bip32derivs=*/true);
|
|
|
|
|
CHECK_NONFATAL(err == TransactionError::OK);
|
|
|
|
|
CHECK_NONFATAL(!complete);
|
|
|
|
|
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
|
|
|
|
@ -1675,7 +1675,7 @@ RPCHelpMan walletcreatefundedpsbt()
|
|
|
|
|
// Fill transaction with out data but don't sign
|
|
|
|
|
bool bip32derivs = request.params[4].isNull() ? true : request.params[4].get_bool();
|
|
|
|
|
bool complete = true;
|
|
|
|
|
const TransactionError err{wallet.FillPSBT(psbtx, complete, 1, false, bip32derivs)};
|
|
|
|
|
const TransactionError err{wallet.FillPSBT(psbtx, complete, 1, /*sign=*/false, /*bip32derivs=*/bip32derivs)};
|
|
|
|
|
if (err != TransactionError::OK) {
|
|
|
|
|
throw JSONRPCTransactionError(err);
|
|
|
|
|
}
|
|
|
|
|