Merge 3faf3429e9 into merged_master (Bitcoin PR #19299)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:06 +00:00
commit 235e1f0ec5
5 changed files with 5 additions and 5 deletions

View file

@ -5,10 +5,12 @@
#include <fs.h>
#ifndef WIN32
#include <cstring>
#include <fcntl.h>
#include <string>
#include <sys/file.h>
#include <sys/utsname.h>
#include <unistd.h>
#else
#ifndef NOMINMAX
#define NOMINMAX
@ -31,7 +33,8 @@ FILE *fopen(const fs::path& p, const char *mode)
#ifndef WIN32
static std::string GetErrorReason() {
static std::string GetErrorReason()
{
return std::strerror(errno);
}

View file

@ -8,6 +8,7 @@
#include <optional.h> // For Optional and nullopt
#include <primitives/transaction.h> // For CTransactionRef
#include <functional>
#include <memory>
#include <stddef.h>
#include <stdint.h>

View file

@ -400,7 +400,6 @@ void CoinControlDialog::updateLabels(CCoinControl& m_coin_control, WalletModel *
// nPayAmount
CAmount nPayAmount = 0;
bool fDust = false;
CMutableTransaction txDummy;
for (const CAmount &amount : CoinControlDialog::payAmounts)
{
nPayAmount += amount;
@ -409,7 +408,6 @@ void CoinControlDialog::updateLabels(CCoinControl& m_coin_control, WalletModel *
{
// Assumes a p2pkh script size
CTxOut txout(::policyAsset, amount, CScript() << std::vector<unsigned char>(24, 0));
txDummy.vout.push_back(txout);
fDust |= IsDust(txout, model->node().getDustRelayFee());
}
}

View file

@ -148,7 +148,6 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
//
TransactionRecord sub(hash, nTime);
CTxDestination address;
sub.idx = i; // vout index
sub.amount = wtx.txout_amounts[i];
sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY;

View file

@ -754,7 +754,6 @@ void CWallet::SetSpentKeyState(WalletBatch& batch, const uint256& hash, unsigned
bool CWallet::IsSpentKey(const uint256& hash, unsigned int n) const
{
AssertLockHeld(cs_wallet);
CTxDestination dst;
const CWalletTx* srctx = GetWalletTx(hash);
if (srctx) {
assert(srctx->tx->vout.size() > n);