mirror of
https://git.wownero.com/wownero/onion-wownero-blockchain-explorer.git
synced 2024-08-15 00:33:12 +00:00
read_mempool added to MempoolStatus thread
This commit is contained in:
parent
304f1a3490
commit
20a6df212a
2 changed files with 107 additions and 10 deletions
|
@ -4,6 +4,8 @@
|
|||
|
||||
#include "MempoolStatus.h"
|
||||
|
||||
#include "rpccalls.h"
|
||||
|
||||
namespace xmreg
|
||||
{
|
||||
|
||||
|
@ -12,17 +14,15 @@ using namespace std;
|
|||
|
||||
void
|
||||
MempoolStatus::set_blockchain_variables(MicroCore *_mcore,
|
||||
Blockchain *_core_storage) {
|
||||
Blockchain *_core_storage)
|
||||
{
|
||||
mcore = _mcore;
|
||||
core_storage = _core_storage;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
MempoolStatus::start_mempool_status_thread()
|
||||
{
|
||||
|
||||
if (!is_running)
|
||||
{
|
||||
m_thread = boost::thread{[]()
|
||||
|
@ -31,15 +31,20 @@ MempoolStatus::start_mempool_status_thread()
|
|||
{
|
||||
while (true)
|
||||
{
|
||||
|
||||
cout << "mempool status: " << endl;
|
||||
|
||||
if (MempoolStatus::read_mempool())
|
||||
{
|
||||
vector<mempool_tx> current_mempool_txs = get_mempool_txs();
|
||||
cout << "mempool status: " << current_mempool_txs.size() << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
cerr << "Cant read_mempool()" << endl;
|
||||
}
|
||||
|
||||
// when we reach top of the blockchain, update
|
||||
// the emission amount every minute.
|
||||
boost::this_thread::sleep_for(boost::chrono::seconds(10));
|
||||
|
||||
|
||||
} // while (true)
|
||||
}
|
||||
catch (boost::thread_interrupted&)
|
||||
|
@ -55,6 +60,82 @@ MempoolStatus::start_mempool_status_thread()
|
|||
} // if (!is_running)
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
MempoolStatus::read_mempool()
|
||||
{
|
||||
rpccalls rpc {deamon_url};
|
||||
|
||||
string error_msg;
|
||||
|
||||
// we populate this variable instead of global mempool_txs
|
||||
// mempool_txs will be changed only when this function completes.
|
||||
// this ensures that we don't sent out partial mempool txs to
|
||||
// other places.
|
||||
vector<mempool_tx> local_copy_of_mempool_txs;
|
||||
|
||||
// get txs in the mempool
|
||||
std::vector<tx_info> mempool_tx_info;
|
||||
|
||||
if (!rpc.get_mempool(mempool_tx_info))
|
||||
{
|
||||
cerr << "Getting mempool failed " << endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
// if dont have tx_blob member, construct tx
|
||||
// from json obtained from the rpc call
|
||||
|
||||
for (size_t i = 0; i < mempool_tx_info.size(); ++i)
|
||||
{
|
||||
// get transaction info of the tx in the mempool
|
||||
const tx_info& _tx_info = mempool_tx_info.at(i);
|
||||
|
||||
crypto::hash mem_tx_hash = null_hash;
|
||||
|
||||
if (epee::string_tools::hex_to_pod(_tx_info.id_hash, mem_tx_hash))
|
||||
{
|
||||
transaction tx;
|
||||
|
||||
if (!xmreg::make_tx_from_json(_tx_info.tx_json, tx))
|
||||
{
|
||||
cerr << "Cant make tx from _tx_info.tx_json" << endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (_tx_info.id_hash != epee::string_tools::pod_to_hex(get_transaction_hash(tx)))
|
||||
{
|
||||
cerr << "Hash of reconstructed tx from json does not match "
|
||||
"what we should get!"
|
||||
<< endl;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
local_copy_of_mempool_txs.emplace_back(_tx_info.receive_time, tx);
|
||||
|
||||
} // if (hex_to_pod(_tx_info.id_hash, mem_tx_hash))
|
||||
|
||||
} // for (size_t i = 0; i < mempool_tx_info.size(); ++i)
|
||||
|
||||
std::lock_guard<std::mutex> lck (mempool_mutx);
|
||||
|
||||
// clear current mempool txs vector
|
||||
// repopulate it with each execution of read_mempool()
|
||||
// not very efficient but good enough for now.
|
||||
mempool_txs = std::move(local_copy_of_mempool_txs);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
vector<MempoolStatus::mempool_tx>
|
||||
MempoolStatus::get_mempool_txs()
|
||||
{
|
||||
std::lock_guard<std::mutex> lck (mempool_mutx);
|
||||
return mempool_txs;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
MempoolStatus::is_thread_running()
|
||||
{
|
||||
|
@ -64,9 +145,10 @@ MempoolStatus::is_thread_running()
|
|||
bf::path MempoolStatus::blockchain_path {"/home/mwo/.bitmonero/lmdb"};
|
||||
string MempoolStatus::deamon_url {"http:://127.0.0.1:18081"};
|
||||
bool MempoolStatus::testnet {false};
|
||||
atomic<bool> MempoolStatus::is_running {false};
|
||||
atomic<bool> MempoolStatus::is_running {false};
|
||||
boost::thread MempoolStatus::m_thread;
|
||||
Blockchain* MempoolStatus::core_storage {nullptr};
|
||||
xmreg::MicroCore* MempoolStatus::mcore {nullptr};
|
||||
|
||||
vector<MempoolStatus::mempool_tx> MempoolStatus::mempool_txs;
|
||||
mutex MempoolStatus::mempool_mutx;
|
||||
}
|
|
@ -22,8 +22,12 @@ namespace xmreg
|
|||
struct MempoolStatus
|
||||
{
|
||||
|
||||
using mempool_tx = pair<uint64_t, transaction>;
|
||||
|
||||
static boost::thread m_thread;
|
||||
|
||||
static mutex mempool_mutx;
|
||||
|
||||
static atomic<bool> is_running;
|
||||
|
||||
static bf::path blockchain_path;
|
||||
|
@ -34,6 +38,11 @@ struct MempoolStatus
|
|||
static MicroCore* mcore;
|
||||
static Blockchain* core_storage;
|
||||
|
||||
// vector of mempool transactions that all threads
|
||||
// can refer to
|
||||
// <recieved_time, transaction>
|
||||
static vector<mempool_tx> mempool_txs;
|
||||
|
||||
static void
|
||||
set_blockchain_variables(MicroCore* _mcore,
|
||||
Blockchain* _core_storage);
|
||||
|
@ -41,6 +50,12 @@ struct MempoolStatus
|
|||
static void
|
||||
start_mempool_status_thread();
|
||||
|
||||
static bool
|
||||
read_mempool();
|
||||
|
||||
static vector<mempool_tx>
|
||||
get_mempool_txs();
|
||||
|
||||
static bool
|
||||
is_thread_running();
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue