wownero
/
onion-wownero-blockchain-explorer
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add changes from pr #76

Browse Source 
4983786ed5
basicauth
moneroexamples 7 years ago
parent 513b59004f
commit b3d8279af3
5 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File

10
CMakeLists.txt
Unescape View File

@ -62,7 +62,7 @@ endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32)
add_library(unbound STATIC IMPORTED)
set_property(TARGET unbound PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libunbound.a)
set_property(TARGET unbound PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/external/unbound/libunbound.a)
endif()
# include boost headers
@ -113,9 +113,15 @@ set(LIBRARIES
unbound
curl
crypto
atomic
ssl)
if(APPLE)
set(LIBRARIES ${LIBRARIES} "-framework IOKit")
else()
set(LIBRARIES ${LIBRARIES} atomic)
endif()
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT WIN32)
set(LIBRARIES ${LIBRARIES} unwind)
endif()

6
cmake/FindMonero.cmake
Unescape View File

@ -57,12 +57,6 @@ foreach (l ${LIBS})
endforeach()
if (EXISTS ${MONERO_BUILD_DIR}/external/unbound/libunbound.a)
add_library(unbound STATIC IMPORTED)
set_property(TARGET unbound PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/external/unbound/libunbound.a)
endif()
if (EXISTS ${MONERO_BUILD_DIR}/external/easylogging++/libeasylogging.a)
add_library(easylogging STATIC IMPORTED)
set_property(TARGET easylogging

19
ext/mstch/include/mstch/mstch.hpp
Unescape View File

@ -91,17 +91,32 @@ class lambda_t {
std::function<std::string(node_renderer<N> renderer, const std::string&)> fun;
};
template <class Key, class Value>
struct map : public std::map<Key, Value>
{
map() {}
map(const map<Key, Value>& rhs) : std::map<Key, Value>(rhs) {}
map(const std::initializer_list<typename std::map<Key, Value>::value_type>& args) : std::map<Key, Value>(args) {}
map& operator=(const map& rhs)
{
std::map<Key, Value>::clear();
for (auto& i : rhs)
std::map<Key, Value>::insert(i);
return *this;
}
};
}
using node = boost::make_recursive_variant<
std::nullptr_t, std::string, int, double, bool, uint64_t, int64_t, uint32_t,
internal::lambda_t<boost::recursive_variant_>,
std::shared_ptr<internal::object_t<boost::recursive_variant_>>,
std::map<const std::string, boost::recursive_variant_>,
internal::map<const std::string, boost::recursive_variant_>,
std::vector<boost::recursive_variant_>>::type;
using object = internal::object_t<node>;
using lambda = internal::lambda_t<node>;
using map = std::map<const std::string, node>;
using map = internal::map<const std::string, node>;
using array = std::vector<node>;
std::string render(

22
src/page.h
Unescape View File

@ -182,7 +182,7 @@ namespace xmreg
{"no_nonrct_inputs" , num_nonrct_inputs},
{"mixin" , mixin_str},
{"blk_height" , blk_height},
{"version" , version},
{"version" , static_cast<uint64_t>(version)},
{"has_payment_id" , payment_id != null_hash},
{"has_payment_id8" , payment_id8 != null_hash8},
{"payment_id" , pod_to_hex(payment_id)},
@ -824,7 +824,7 @@ namespace xmreg
// initalise page tempate map with basic info about mempool
mstch::map context {
{"mempool_size" , total_no_of_mempool_tx}, // total no of mempool txs
{"mempool_size" , static_cast<uint64_t>(total_no_of_mempool_tx)}, // total no of mempool txs
{"show_cache_times" , show_cache_times},
{"mempool_refresh_time" , MempoolStatus::mempool_refresh_time}
};
@ -1238,7 +1238,7 @@ namespace xmreg
mstch::map tx_context;
if (enable_tx_cache && tx_context_cache.Contains({tx_hash, with_ring_signatures}))
if (enable_tx_cache && tx_context_cache.Contains({tx_hash, static_cast<bool>(with_ring_signatures)}))
{
// with_ring_signatures == 0 means that cache is not used
// when obtaining detailed information about tx is requested.
@ -1248,7 +1248,7 @@ namespace xmreg
auto start = std::chrono::steady_clock::now();
const tx_info_cache& tx_info_cashed
= tx_context_cache.Get({tx_hash, with_ring_signatures});
= tx_context_cache.Get({tx_hash, static_cast<bool>(with_ring_signatures)});
tx_context = tx_info_cashed.tx_map;
@ -1302,10 +1302,10 @@ namespace xmreg
// its not in blockchain, but it was there when we cashed it.
// so we update it in cash, as it should be back in mempool
tx_context = construct_tx_context(tx, with_ring_signatures);
tx_context = construct_tx_context(tx, static_cast<bool>(with_ring_signatures));
tx_context_cache.Put(
{tx_hash, with_ring_signatures},
{tx_hash, static_cast<bool>(with_ring_signatures)},
tx_info_cache {
boost::get<uint64_t>(tx_context["tx_blk_height"]),
boost::get<uint64_t>(tx_context["blk_timestamp_uint"]),
@ -1324,10 +1324,10 @@ namespace xmreg
// checking if in blockchain already
// it was before in mempool, but now maybe already in blockchain
tx_context = construct_tx_context(tx, with_ring_signatures);
tx_context = construct_tx_context(tx, static_cast<bool>(with_ring_signatures));
tx_context_cache.Put(
{tx_hash, with_ring_signatures},
{tx_hash, static_cast<bool>(with_ring_signatures)},
tx_info_cache {
boost::get<uint64_t>(tx_context["tx_blk_height"]),
boost::get<uint64_t>(tx_context["blk_timestamp_uint"]),
@ -1361,7 +1361,7 @@ namespace xmreg
// tx context. just for fun, to see if cache is any faster.
auto start = std::chrono::steady_clock::now();
tx_context = construct_tx_context(tx, with_ring_signatures);
tx_context = construct_tx_context(tx, static_cast<bool>(with_ring_signatures));
auto duration = std::chrono::duration_cast<std::chrono::microseconds>
(std::chrono::steady_clock::now() - start);
@ -1369,7 +1369,7 @@ namespace xmreg
if (enable_tx_cache)
{
tx_context_cache.Put(
{tx_hash, with_ring_signatures},
{tx_hash, static_cast<bool>(with_ring_signatures)},
tx_info_cache {
boost::get<uint64_t>(tx_context["tx_blk_height"]),
boost::get<uint64_t>(tx_context["blk_timestamp_uint"]),
@ -5124,7 +5124,7 @@ namespace xmreg
{"tx_size" , txd.size},
{"xmr_outputs" , txd.xmr_outputs},
{"xmr_inputs" , txd.xmr_inputs},
{"tx_version" , txd.version},
{"tx_version" , static_cast<uint64_t>(txd.version)},
{"rct_type" , tx.rct_signatures.type},
{"coinbase" , is_coinbase(tx)},
{"mixin" , txd.mixin_no},

2
src/tools.cpp
Unescape View File

@ -4,7 +4,7 @@
#include "tools.h"
#include <codecvt>
#include <thread>
namespace xmreg
{

Write Preview
Loading…
Cancel
Save