Merge 3b5fb6e77a into merged_master (Bitcoin PR bitcoin/bitcoin#26213)

This commit is contained in:
Tom Trevethan 2025-03-26 12:30:53 +00:00
commit 5baaf035fa
5 changed files with 16 additions and 10 deletions

View file

@ -363,7 +363,7 @@ static RPCHelpMan createrawtransaction()
std::optional<bool> rbf;
if (!request.params[3].isNull()) {
rbf = request.params[3].isTrue();
rbf = request.params[3].get_bool();
}
auto tip = WITH_LOCK(::cs_main, return chainman.ActiveChain().Tip());
CMutableTransaction rawTx = ConstructTransaction(request.params[0], request.params[1], request.params[2], rbf, tip);
@ -1894,7 +1894,7 @@ static RPCHelpMan createpsbt()
std::optional<bool> rbf;
if (!request.params[3].isNull()) {
rbf = request.params[3].isTrue();
rbf = request.params[3].get_bool();
}
std::map<CTxOut, PSBTOutput> psbt_outs;
auto tip = WITH_LOCK(::cs_main, return chainman.ActiveChain().Tip());