GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b26d62c49a into merged_master (Bitcoin PR #18990)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 03:22:29 +00:00
commit 2efdcca333
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/validation.cpp
View file

@ -595,8 +595,9 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
size_t& nConflictingSize = ws.m_conflicting_size;
std::set<std::pair<uint256, COutPoint> >& setPeginsSpent = ws.m_set_pegins_spent;
if (!CheckTransaction(tx, state))
if (!CheckTransaction(tx, state)) {
return false; // state filled in by CheckTransaction
}
// Coinbase is only valid in a block, not as a loose transaction
if (tx.IsCoinBase())
@ -750,7 +751,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
CAmountMap fee_map;
if (!Consensus::CheckTxInputs(tx, state, m_view, GetSpendHeight(m_view), fee_map, setPeginsSpent, NULL, true, true, fedpegscripts)) {
return error("%s: Consensus::CheckTxInputs: %s, %s", __func__, tx.GetHash().ToString(), state.ToString());
return false; // state filled in by CheckTxInputs
}
// Check for non-standard pay-to-script-hash in inputs