Browse Source

Add feedelta to TxMempoolInfo

0.14
Pieter Wuille 9 years ago
parent
commit
c3efb58622
  1. 8
      src/txmempool.cpp
  2. 3
      src/txmempool.h

8
src/txmempool.cpp

@ -833,6 +833,10 @@ void CTxMemPool::queryHashes(vector<uint256>& vtxid)
} }
} }
static TxMempoolInfo GetInfo(CTxMemPool::indexed_transaction_set::const_iterator it) {
return TxMempoolInfo{it->GetSharedTx(), it->GetTime(), CFeeRate(it->GetFee(), it->GetTxSize()), it->GetModifiedFee() - it->GetFee()};
}
std::vector<TxMempoolInfo> CTxMemPool::infoAll() const std::vector<TxMempoolInfo> CTxMemPool::infoAll() const
{ {
LOCK(cs); LOCK(cs);
@ -841,7 +845,7 @@ std::vector<TxMempoolInfo> CTxMemPool::infoAll() const
std::vector<TxMempoolInfo> ret; std::vector<TxMempoolInfo> ret;
ret.reserve(mapTx.size()); ret.reserve(mapTx.size());
for (auto it : iters) { for (auto it : iters) {
ret.push_back(TxMempoolInfo{it->GetSharedTx(), it->GetTime(), CFeeRate(it->GetFee(), it->GetTxSize())}); ret.push_back(GetInfo(it));
} }
return ret; return ret;
@ -862,7 +866,7 @@ TxMempoolInfo CTxMemPool::info(const uint256& hash) const
indexed_transaction_set::const_iterator i = mapTx.find(hash); indexed_transaction_set::const_iterator i = mapTx.find(hash);
if (i == mapTx.end()) if (i == mapTx.end())
return TxMempoolInfo(); return TxMempoolInfo();
return TxMempoolInfo{i->GetSharedTx(), i->GetTime(), CFeeRate(i->GetFee(), i->GetTxSize())}; return GetInfo(i);
} }
CFeeRate CTxMemPool::estimateFee(int nBlocks) const CFeeRate CTxMemPool::estimateFee(int nBlocks) const

3
src/txmempool.h

@ -329,6 +329,9 @@ struct TxMempoolInfo
/** Feerate of the transaction. */ /** Feerate of the transaction. */
CFeeRate feeRate; CFeeRate feeRate;
/** The fee delta. */
int64_t nFeeDelta;
}; };
/** /**

Loading…
Cancel
Save