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

Merge f13e03cda2 into merged_master (Bitcoin PR #20584)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-16 20:37:42 +00:00
commit e5cb4cb00e
19 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/txmempool.cpp
View file

@ -23,7 +23,7 @@
CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee,
int64_t _nTime, unsigned int _entryHeight,
bool _spendsCoinbase, int64_t _sigOpsCost, LockPoints lp, std::set<std::pair<uint256, COutPoint>>& _setPeginsSpent)
bool _spendsCoinbase, int64_t _sigOpsCost, LockPoints lp, const std::set<std::pair<uint256, COutPoint>>& _setPeginsSpent)
: tx(_tx), nFee(_nFee), nTxWeight(GetTransactionWeight(*tx)), nUsageSize(RecursiveDynamicUsage(tx)), nTime(_nTime), entryHeight(_entryHeight),
spendsCoinbase(_spendsCoinbase), sigOpCost(_sigOpsCost), lockPoints(lp), m_epoch(0),
setPeginsSpent(_setPeginsSpent)