Skip to content

Commit

Permalink
BUILD: Build fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mjmacleod committed Jun 30, 2021
1 parent 9d49efa commit 49668c0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class CMainParams : public CChainParams {
{
CMutableTransaction txNew(CTransaction::CURRENT_VERSION);
txNew.vin.resize(1);
txNew.vin[0].prevout.SetNull();
txNew.vin[0].SetPrevOutNull();
txNew.vin[0].segregatedSignatureData.stack.clear();
txNew.vin[0].segregatedSignatureData.stack.push_back(std::vector<unsigned char>());
CVectorWriter(0, 0, txNew.vin[0].segregatedSignatureData.stack[0], 0) << VARINT(0);
Expand Down
14 changes: 7 additions & 7 deletions src/unity/unity_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,17 +219,17 @@ TransactionRecord calculateTransactionRecordForWalletTransaction(const CWalletTx
// our own transactions.
uint256 txHashPrev;
bool havePrevOut=true;
if (txin.prevout.isHash)
if (txin.GetPrevOut().isHash)
{
txHashPrev = txin.prevout.getTransactionHash();
txHashPrev = txin.GetPrevOut().getTransactionHash();
}
else
{
if (!pwallet->GetTxHash(txin.prevout, txHashPrev))
if (!pwallet->GetTxHash(txin.GetPrevOut(), txHashPrev))
{
if (!fSPV)
{
LogPrintf("Transaction with no corresponding hash found, txid [%d] [%d]\n", txin.prevout.getTransactionBlockNumber(), txin.prevout.getTransactionIndex());
LogPrintf("Transaction with no corresponding hash found, txid [%d] [%d]\n", txin.GetPrevOut().getTransactionBlockNumber(), txin.GetPrevOut().getTransactionIndex());
}
havePrevOut = false;
}
Expand All @@ -244,9 +244,9 @@ TransactionRecord calculateTransactionRecordForWalletTransaction(const CWalletTx
if (mi != pwallet->mapWallet.end())
{
const CWalletTx& prev = (*mi).second;
if (txin.prevout.n < prev.tx->vout.size())
if (txin.GetPrevOut().n < prev.tx->vout.size())
{
const auto& prevOut = prev.tx->vout[txin.prevout.n];
const auto& prevOut = prev.tx->vout[txin.GetPrevOut().n];
if (!ExtractDestination(prevOut, dest) && !prevOut.IsUnspendable())
{
LogPrintf("Unknown transaction type found, txid %s\n", wtx.GetHash().ToString());
Expand Down Expand Up @@ -1329,7 +1329,7 @@ PaymentResultStatus ILibraryController::performPaymentToRecipient(const UriRecip
// Prevent accidental double spends
for (const auto &txin : wtx.tx->vin)
{
pactiveWallet->LockCoin(txin.prevout);
pactiveWallet->LockCoin(txin.GetPrevOut());
}

return PaymentResultStatus::SUCCESS;
Expand Down

0 comments on commit 49668c0

Please sign in to comment.