Merge cf24152596 into merged_master (Bitcoin PR bitcoin/bitcoin#21206)

This commit is contained in:
Byron Hambly 2023-05-31 08:50:41 +00:00
commit e6cdd99eec
17 changed files with 260 additions and 177 deletions

View file

@ -1074,7 +1074,7 @@ DBErrors WalletBatch::FindWalletTx(std::vector<uint256>& vTxHash, std::list<CWal
uint256 hash;
ssKey >> hash;
vTxHash.push_back(hash);
vWtx.emplace_back(nullptr /* tx */);
vWtx.emplace_back(/*tx=*/nullptr, TxStateInactive{});
ssValue >> vWtx.back();
}
}