Merge pull request #75 from moneroexamples/update_to_current_monero
Update to current monerobasicauth
moneroexamples
7 years ago
committed by
GitHub
commit
7eca176e6a
@ -1,57 +0,0 @@
|
||||
//
|
||||
// Created by mwo on 24/05/15.
|
||||
//
|
||||
// source: http://codereview.stackexchange.com/questions/13176/infix-iterator-code
|
||||
|
||||
// infix_iterator.h
|
||||
#if !defined(INFIX_ITERATOR_H_)
|
||||
#define INFIX_ITERATOR_H_
|
||||
#include <ostream>
|
||||
#include <iterator>
|
||||
#include <string>
|
||||
|
||||
template <class T, class charT=char, class traits=std::char_traits<charT> >
|
||||
class infix_ostream_iterator :
|
||||
public std::iterator<std::output_iterator_tag, void, void, void, void>
|
||||
{
|
||||
std::basic_ostream<charT,traits> *os;
|
||||
std::basic_string<charT> delimiter;
|
||||
std::basic_string<charT> real_delim;
|
||||
|
||||
public:
|
||||
|
||||
typedef charT char_type;
|
||||
typedef traits traits_type;
|
||||
typedef std::basic_ostream<charT, traits> ostream_type;
|
||||
|
||||
infix_ostream_iterator(ostream_type &s)
|
||||
: os(&s)
|
||||
{}
|
||||
|
||||
infix_ostream_iterator(ostream_type &s, charT const *d)
|
||||
: os(&s),
|
||||
real_delim(d)
|
||||
{}
|
||||
|
||||
infix_ostream_iterator<T, charT, traits> &operator=(T const &item)
|
||||
{
|
||||
*os << delimiter << item;
|
||||
delimiter = real_delim;
|
||||
return *this;
|
||||
}
|
||||
|
||||
infix_ostream_iterator<T, charT, traits> &operator*() {
|
||||
return *this;
|
||||
}
|
||||
|
||||
infix_ostream_iterator<T, charT, traits> &operator++() {
|
||||
return *this;
|
||||
}
|
||||
|
||||
infix_ostream_iterator<T, charT, traits> &operator++(int) {
|
||||
return *this;
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,36 +0,0 @@
|
||||
#ifndef MEMBER_CHECKER_H
|
||||
#define MEMBER_CHECKER_H
|
||||
|
||||
|
||||
#define DEFINE_MEMBER_CHECKER(member) \
|
||||
template<typename T, typename V = bool> \
|
||||
struct has_ ## member : false_type { }; \
|
||||
\
|
||||
template<typename T> \
|
||||
struct has_ ## member<T, \
|
||||
typename enable_if< \
|
||||
!is_same<decltype(declval<T>().member), void>::value, \
|
||||
bool \
|
||||
>::type \
|
||||
> : true_type { };
|
||||
|
||||
#define HAS_MEMBER(C, member) \
|
||||
has_ ## member<C>::value
|
||||
|
||||
|
||||
// first getter if the member veriable is present, so we return its value
|
||||
// second getter, when the member is not present, so we return empty value, e.g., empty string
|
||||
#define DEFINE_MEMBER_GETTER(member, ret_value) \
|
||||
template<typename T> \
|
||||
typename enable_if<HAS_MEMBER(T, member), ret_value>::type \
|
||||
get_ ## member (T t){ \
|
||||
return t.member; \
|
||||
} \
|
||||
\
|
||||
template<typename T> \
|
||||
typename enable_if<!HAS_MEMBER(T, member), ret_value>::type \
|
||||
get_ ## member (T t){ \
|
||||
return ret_value(); \
|
||||
}
|
||||
|
||||
#endif // MEMBER_CHECKER_H
|
||||
@ -0,0 +1,299 @@
|
||||
//
|
||||
// Created by mwo on 28/05/17.
|
||||
//
|
||||
|
||||
#include "MempoolStatus.h"
|
||||
|
||||
#include "rpccalls.h"
|
||||
|
||||
namespace xmreg
|
||||
{
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
void
|
||||
MempoolStatus::set_blockchain_variables(MicroCore *_mcore,
|
||||
Blockchain *_core_storage)
|
||||
{
|
||||
mcore = _mcore;
|
||||
core_storage = _core_storage;
|
||||
}
|
||||
|
||||
void
|
||||
MempoolStatus::start_mempool_status_thread()
|
||||
{
|
||||
|
||||
// to protect from deviation by zero below.
|
||||
mempool_refresh_time = std::max<uint64_t>(1, mempool_refresh_time);
|
||||
|
||||
if (!is_running)
|
||||
{
|
||||
m_thread = boost::thread{[]()
|
||||
{
|
||||
try
|
||||
{
|
||||
uint64_t loop_index {0};
|
||||
|
||||
// so that network status is checked every minute
|
||||
uint64_t loop_index_divider = std::max<uint64_t>(1, 60 / mempool_refresh_time);
|
||||
|
||||
while (true)
|
||||
{
|
||||
|
||||
// we just query network status every minute. No sense
|
||||
// to do it as frequently as getting mempool data.
|
||||
if (loop_index % loop_index_divider == 0)
|
||||
{
|
||||
if (!MempoolStatus::read_network_info())
|
||||
{
|
||||
network_info local_copy = current_network_info;
|
||||
|
||||
cerr << " Cant read network info "<< endl;
|
||||
|
||||
local_copy.current = false;
|
||||
|
||||
current_network_info = local_copy;
|
||||
}
|
||||
else
|
||||
{
|
||||
cout << "Current network info read, ";
|
||||
loop_index == 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (MempoolStatus::read_mempool())
|
||||
{
|
||||
vector<mempool_tx> current_mempool_txs = get_mempool_txs();
|
||||
|
||||
cout << "mempool status txs: "
|
||||
<< current_mempool_txs.size()
|
||||
<< endl;
|
||||
}
|
||||
|
||||
// when we reach top of the blockchain, update
|
||||
// the emission amount every minute.
|
||||
boost::this_thread::sleep_for(
|
||||
boost::chrono::seconds(mempool_refresh_time));
|
||||
|
||||
++loop_index;
|
||||
|
||||
} // while (true)
|
||||
}
|
||||
catch (boost::thread_interrupted&)
|
||||
{
|
||||
cout << "Mempool status thread interrupted." << endl;
|
||||
return;
|
||||
}
|
||||
|
||||
}}; // m_thread = boost::thread{[]()
|
||||
|
||||
is_running = true;
|
||||
|
||||
} // 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
|
||||
|
||||
uint64_t mempool_size_kB {0};
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
crypto::hash tx_hash_reconstructed = get_transaction_hash(tx);
|
||||
|
||||
if (mem_tx_hash != tx_hash_reconstructed)
|
||||
{
|
||||
cerr << "Hash of reconstructed tx from json does not match "
|
||||
"what we should get!"
|
||||
<< endl;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
mempool_size_kB += _tx_info.blob_size;
|
||||
|
||||
local_copy_of_mempool_txs.push_back(mempool_tx {tx_hash_reconstructed, tx});
|
||||
|
||||
mempool_tx& last_tx = local_copy_of_mempool_txs.back();
|
||||
|
||||
// key images of inputs
|
||||
vector<txin_to_key> input_key_imgs;
|
||||
|
||||
// public keys and xmr amount of outputs
|
||||
vector<pair<txout_to_key, uint64_t>> output_pub_keys;
|
||||
|
||||
// sum xmr in inputs and ouputs in the given tx
|
||||
const array<uint64_t, 4>& sum_data = summary_of_in_out_rct(
|
||||
tx, output_pub_keys, input_key_imgs);
|
||||
|
||||
last_tx.receive_time = _tx_info.receive_time;
|
||||
|
||||
last_tx.sum_outputs = sum_data[0];
|
||||
last_tx.sum_inputs = sum_data[1];
|
||||
last_tx.no_outputs = output_pub_keys.size();
|
||||
last_tx.no_inputs = input_key_imgs.size();
|
||||
last_tx.mixin_no = sum_data[2];
|
||||
last_tx.num_nonrct_inputs = sum_data[3];
|
||||
|
||||
last_tx.fee_str = xmreg::xmr_amount_to_str(_tx_info.fee, "{:0.3f}");
|
||||
last_tx.xmr_inputs_str = xmreg::xmr_amount_to_str(last_tx.sum_inputs , "{:0.3f}");
|
||||
last_tx.xmr_outputs_str = xmreg::xmr_amount_to_str(last_tx.sum_outputs, "{:0.3f}");
|
||||
last_tx.timestamp_str = xmreg::timestamp_to_str_gm(_tx_info.receive_time);
|
||||
|
||||
last_tx.txsize = fmt::format("{:0.2f}",
|
||||
static_cast<double>(_tx_info.blob_size)/1024.0);
|
||||
|
||||
} // if (hex_to_pod(_tx_info.id_hash, mem_tx_hash))
|
||||
|
||||
} // for (size_t i = 0; i < mempool_tx_info.size(); ++i)
|
||||
|
||||
|
||||
|
||||
Guard 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_no = local_copy_of_mempool_txs.size();
|
||||
mempool_size = mempool_size_kB;
|
||||
|
||||
mempool_txs = std::move(local_copy_of_mempool_txs);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
MempoolStatus::read_network_info()
|
||||
{
|
||||
rpccalls rpc {deamon_url};
|
||||
|
||||
COMMAND_RPC_GET_INFO::response rpc_network_info;
|
||||
|
||||
if (!rpc.get_network_info(rpc_network_info))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uint64_t fee_estimated;
|
||||
|
||||
string error_msg;
|
||||
|
||||
if (!rpc.get_dynamic_per_kb_fee_estimate(
|
||||
FEE_ESTIMATE_GRACE_BLOCKS,
|
||||
fee_estimated, error_msg))
|
||||
{
|
||||
cerr << "rpc.get_dynamic_per_kb_fee_estimate failed" << endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
(void) error_msg;
|
||||
|
||||
|
||||
network_info local_copy;
|
||||
|
||||
local_copy.status = network_info::get_status_uint(rpc_network_info.status);
|
||||
local_copy.height = rpc_network_info.height;
|
||||
local_copy.target_height = rpc_network_info.target_height;
|
||||
local_copy.difficulty = rpc_network_info.difficulty;
|
||||
local_copy.target = rpc_network_info.target;
|
||||
local_copy.hash_rate = (rpc_network_info.difficulty/rpc_network_info.target);
|
||||
local_copy.tx_count = rpc_network_info.tx_count;
|
||||
local_copy.tx_pool_size = rpc_network_info.tx_pool_size;
|
||||
local_copy.alt_blocks_count = rpc_network_info.alt_blocks_count;
|
||||
local_copy.outgoing_connections_count = rpc_network_info.outgoing_connections_count;
|
||||
local_copy.incoming_connections_count = rpc_network_info.incoming_connections_count;
|
||||
local_copy.white_peerlist_size = rpc_network_info.white_peerlist_size;
|
||||
local_copy.testnet = rpc_network_info.testnet;
|
||||
local_copy.cumulative_difficulty = rpc_network_info.cumulative_difficulty;
|
||||
local_copy.block_size_limit = rpc_network_info.block_size_limit;
|
||||
local_copy.start_time = rpc_network_info.start_time;
|
||||
|
||||
epee::string_tools::hex_to_pod(rpc_network_info.top_block_hash, local_copy.top_block_hash);
|
||||
local_copy.fee_per_kb = fee_estimated;
|
||||
local_copy.info_timestamp = static_cast<uint64_t>(std::time(nullptr));
|
||||
|
||||
local_copy.current = true;
|
||||
|
||||
current_network_info = local_copy;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
vector<MempoolStatus::mempool_tx>
|
||||
MempoolStatus::get_mempool_txs()
|
||||
{
|
||||
Guard lck (mempool_mutx);
|
||||
return mempool_txs;
|
||||
}
|
||||
|
||||
vector<MempoolStatus::mempool_tx>
|
||||
MempoolStatus::get_mempool_txs(uint64_t no_of_tx)
|
||||
{
|
||||
Guard lck (mempool_mutx);
|
||||
|
||||
no_of_tx = std::min<uint64_t>(no_of_tx, mempool_txs.size());
|
||||
|
||||
return vector<mempool_tx>(mempool_txs.begin(), mempool_txs.begin() + no_of_tx);
|
||||
}
|
||||
|
||||
bool
|
||||
MempoolStatus::is_thread_running()
|
||||
{
|
||||
return is_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};
|
||||
boost::thread MempoolStatus::m_thread;
|
||||
Blockchain* MempoolStatus::core_storage {nullptr};
|
||||
xmreg::MicroCore* MempoolStatus::mcore {nullptr};
|
||||
vector<MempoolStatus::mempool_tx> MempoolStatus::mempool_txs;
|
||||
atomic<MempoolStatus::network_info> MempoolStatus::current_network_info;
|
||||
atomic<uint64_t> MempoolStatus::mempool_no {0}; // no of txs
|
||||
atomic<uint64_t> MempoolStatus::mempool_size {0}; // size in bytes.
|
||||
uint64_t MempoolStatus::mempool_refresh_time {10};
|
||||
mutex MempoolStatus::mempool_mutx;
|
||||
}
|
||||
@ -0,0 +1,155 @@
|
||||
//
|
||||
// Created by mwo on 28/05/17.
|
||||
//
|
||||
|
||||
#ifndef XMRBLOCKS_MEMPOOLSTATUS_H
|
||||
#define XMRBLOCKS_MEMPOOLSTATUS_H
|
||||
|
||||
|
||||
#include "MicroCore.h"
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
#include <thread>
|
||||
#include <mutex>
|
||||
#include <atomic>
|
||||
|
||||
namespace xmreg
|
||||
{
|
||||
|
||||
struct MempoolStatus
|
||||
{
|
||||
|
||||
using Guard = std::lock_guard<std::mutex>;
|
||||
|
||||
struct mempool_tx
|
||||
{
|
||||
crypto::hash tx_hash;
|
||||
transaction tx;
|
||||
|
||||
uint64_t receive_time {0};
|
||||
uint64_t sum_inputs {0};
|
||||
uint64_t sum_outputs {0};
|
||||
uint64_t no_inputs {0};
|
||||
uint64_t no_outputs {0};
|
||||
uint64_t num_nonrct_inputs {0};
|
||||
uint64_t mixin_no {0};
|
||||
|
||||
string fee_str;
|
||||
string xmr_inputs_str;
|
||||
string xmr_outputs_str;
|
||||
string timestamp_str;
|
||||
string txsize;
|
||||
};
|
||||
|
||||
|
||||
// to keep network_info in cache
|
||||
// and to show previous info in case current querry for
|
||||
// the current info timesout.
|
||||
struct network_info
|
||||
{
|
||||
uint64_t status {0};
|
||||
uint64_t height {0};
|
||||
uint64_t target_height {0};
|
||||
uint64_t difficulty {0};
|
||||
uint64_t target {0};
|
||||
uint64_t tx_count {0};
|
||||
uint64_t tx_pool_size {0};
|
||||
uint64_t alt_blocks_count {0};
|
||||
uint64_t outgoing_connections_count {0};
|
||||
uint64_t incoming_connections_count {0};
|
||||
uint64_t white_peerlist_size {0};
|
||||
uint64_t grey_peerlist_size {0};
|
||||
bool testnet {false};
|
||||
crypto::hash top_block_hash;
|
||||
uint64_t cumulative_difficulty {0};
|
||||
uint64_t block_size_limit {0};
|
||||
uint64_t start_time {0};
|
||||
|
||||
uint64_t hash_rate {0};
|
||||
uint64_t fee_per_kb {0};
|
||||
uint64_t info_timestamp {0};
|
||||
|
||||
bool current {false};
|
||||
|
||||
static uint64_t
|
||||
get_status_uint(const string& status)
|
||||
{
|
||||
if (status == CORE_RPC_STATUS_OK)
|
||||
return 1;
|
||||
|
||||
if (status == CORE_RPC_STATUS_BUSY)
|
||||
return 2;
|
||||
|
||||
// default
|
||||
return 0;
|
||||
}
|
||||
|
||||
static string
|
||||
get_status_string(const uint64_t& status)
|
||||
{
|
||||
if (status == 1)
|
||||
return CORE_RPC_STATUS_OK;
|
||||
|
||||
if (status == 2)
|
||||
return CORE_RPC_STATUS_BUSY;
|
||||
|
||||
// default
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
static boost::thread m_thread;
|
||||
|
||||
static mutex mempool_mutx;
|
||||
|
||||
static atomic<bool> is_running;
|
||||
|
||||
static uint64_t mempool_refresh_time;
|
||||
|
||||
static atomic<uint64_t> mempool_no; // no of txs
|
||||
static atomic<uint64_t> mempool_size; // size in bytes.
|
||||
|
||||
static bf::path blockchain_path;
|
||||
static string deamon_url;
|
||||
static bool testnet;
|
||||
|
||||
// make object for accessing the blockchain here
|
||||
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 atomic<network_info> current_network_info;
|
||||
|
||||
static void
|
||||
set_blockchain_variables(MicroCore* _mcore,
|
||||
Blockchain* _core_storage);
|
||||
|
||||
static void
|
||||
start_mempool_status_thread();
|
||||
|
||||
static bool
|
||||
read_mempool();
|
||||
|
||||
static bool
|
||||
read_network_info();
|
||||
|
||||
static vector<mempool_tx>
|
||||
get_mempool_txs();
|
||||
|
||||
// get first no_of_tx from the vector
|
||||
static vector<mempool_tx>
|
||||
get_mempool_txs(uint64_t no_of_tx);
|
||||
|
||||
static bool
|
||||
is_thread_running();
|
||||
};
|
||||
|
||||
}
|
||||
#endif //XMRBLOCKS_MEMPOOLSTATUS_H
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,25 @@
|
||||
<h2 style="margin-bottom: 0px">
|
||||
Alternative blocks
|
||||
</h2>
|
||||
<h4 style="font-size: 14px; margin-top: 0px">(no of alt blocks: {{no_alt_blocks}})</h4>
|
||||
<div class="center">
|
||||
|
||||
<table class="center" style="width:80%">
|
||||
<tr>
|
||||
<td>height</td>
|
||||
<td>age</td>
|
||||
<td>hash</td>
|
||||
<td>txs no</td>
|
||||
</tr>
|
||||
{{#blocks}}
|
||||
<tr>
|
||||
<td>{{height}}</td>
|
||||
<td>{{age}}</td>
|
||||
<td>{{hash}}</td>
|
||||
<td>{{no_of_txs}}</td>
|
||||
</tr>
|
||||
{{/blocks}}
|
||||
</table>
|
||||
|
||||
|
||||
</div>
|
||||
@ -1,8 +1,22 @@
|
||||
|
||||
<div>
|
||||
|
||||
{{#txs}}
|
||||
{{>tx_details}}
|
||||
{{/txs}}
|
||||
|
||||
{{#has_error}}
|
||||
<h4 style="color:red">Attempt failed</h4>
|
||||
{{#error_tx_not_found}}
|
||||
<h4>Tx {{tx_hash}} not found. </h4>
|
||||
<div class="center" style="text-align: center;width:80%">
|
||||
<p> If this is newly made tx, it can take some time (up to minute)
|
||||
for it to get propagated to all nodes' txpools.
|
||||
<br/><br/>
|
||||
Please refresh in 10-20 seconds to check if its here then.
|
||||
</p>
|
||||
</div>
|
||||
{{/error_tx_not_found}}
|
||||
{{/has_error}}
|
||||
{{^has_error}}
|
||||
{{#txs}}
|
||||
{{>tx_details}}
|
||||
{{/txs}}
|
||||
{{/has_error}}
|
||||
</div>
|
||||
|
||||
Loading…
Reference in new issue