highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-07 21:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use GetWalletTx in SelectCoins instead of access mapWallet

Browse Source
This commit is contained in:
furszy
2022-05-19 09:59:28 -03:00
parent b4e2d4d4ee
commit 8dea74a8ff
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/wallet/spend.cpp
View File

@@ -441,15 +441,14 @@ std::optional<SelectionResult> SelectCoins(const CWallet& wallet, const std::vec
for (const COutPoint& outpoint : vPresetInputs) { for (const COutPoint& outpoint : vPresetInputs) {
int input_bytes = -1; int input_bytes = -1;
CTxOut txout; CTxOut txout;
std::map<uint256, CWalletTx>::const_iterator it = wallet.mapWallet.find(outpoint.hash); auto ptr_wtx = wallet.GetWalletTx(outpoint.hash);
if (it != wallet.mapWallet.end()) { if (ptr_wtx) {
const CWalletTx& wtx = it->second;
// Clearly invalid input, fail // Clearly invalid input, fail
if (wtx.tx->vout.size() <= outpoint.n) { if (ptr_wtx->tx->vout.size() <= outpoint.n) {
return std::nullopt; return std::nullopt;
} }
input_bytes = GetTxSpendSize(wallet, wtx, outpoint.n, false); input_bytes = GetTxSpendSize(wallet, *ptr_wtx, outpoint.n, false);
txout = wtx.tx->vout.at(outpoint.n); txout = ptr_wtx->tx->vout.at(outpoint.n);
} else { } else {
// The input is external. We did not find the tx in mapWallet. // The input is external. We did not find the tx in mapWallet.
if (!coin_control.GetExternalOutput(outpoint, txout)) { if (!coin_control.GetExternalOutput(outpoint, txout)) {