diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-21 09:03:37 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-21 09:03:37 -0500 |
| commit | c846c8650eb8a4822f85b8464410fdc6f8e55a8f (patch) | |
| tree | 944e16375599f34b85cec42b6e9aee01c14d00fb /src/cryptonote_core/cryptonote_core.cpp | |
| parent | 4540afc51b0ef567ffe00a231bf3b3b518a415c2 (diff) | |
| parent | 571546067f1b1d0f51a2a796e2509c93133e1cf4 (diff) | |
| download | monzero-core-c846c8650eb8a4822f85b8464410fdc6f8e55a8f.tar.gz monzero-core-c846c8650eb8a4822f85b8464410fdc6f8e55a8f.tar.xz monzero-core-c846c8650eb8a4822f85b8464410fdc6f8e55a8f.zip | |
Merge pull request #6445
5715460 Always reject duplicate key-images from second txid (vtnerd)
babf25d Allow unrestricted rpc calls to get full txpool info (vtnerd)
Diffstat (limited to 'src/cryptonote_core/cryptonote_core.cpp')
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 10bbff457..3ff3c77e2 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -428,9 +428,9 @@ namespace cryptonote return m_blockchain_storage.get_split_transactions_blobs(txs_ids, txs, missed_txs); } //----------------------------------------------------------------------------------------------- - bool core::get_txpool_backlog(std::vector<tx_backlog_entry>& backlog) const + bool core::get_txpool_backlog(std::vector<tx_backlog_entry>& backlog, bool include_sensitive_txes) const { - m_mempool.get_transaction_backlog(backlog); + m_mempool.get_transaction_backlog(backlog, include_sensitive_txes); return true; } //----------------------------------------------------------------------------------------------- @@ -1544,9 +1544,9 @@ namespace cryptonote return m_blockchain_storage.get_db().get_block_cumulative_difficulty(height); } //----------------------------------------------------------------------------------------------- - size_t core::get_pool_transactions_count() const + size_t core::get_pool_transactions_count(bool include_sensitive_txes) const { - return m_mempool.get_transactions_count(); + return m_mempool.get_transactions_count(include_sensitive_txes); } //----------------------------------------------------------------------------------------------- bool core::have_block(const crypto::hash& id) const |