mirror of
https://git.wownero.com/wownero/onion-wownero-blockchain-explorer.git
synced 2024-08-15 00:33:12 +00:00
Merge branch 'master' into update_to_current_monero
This commit is contained in:
commit
f697355101
3 changed files with 2 additions and 2 deletions
|
@ -115,7 +115,6 @@ set(LIBRARIES
|
||||||
crypto
|
crypto
|
||||||
ssl)
|
ssl)
|
||||||
|
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set(LIBRARIES ${LIBRARIES} "-framework IOKit")
|
set(LIBRARIES ${LIBRARIES} "-framework IOKit")
|
||||||
else()
|
else()
|
||||||
|
|
|
@ -5276,7 +5276,7 @@ namespace xmreg
|
||||||
{"tx_size" , fmt::format("{:0.4f}",
|
{"tx_size" , fmt::format("{:0.4f}",
|
||||||
static_cast<double>(txd.size) / 1024.0)},
|
static_cast<double>(txd.size) / 1024.0)},
|
||||||
{"tx_fee" , xmreg::xmr_amount_to_str(txd.fee)},
|
{"tx_fee" , xmreg::xmr_amount_to_str(txd.fee)},
|
||||||
{"tx_version" , txd.version},
|
{"tx_version" , static_cast<uint64_t>(txd.version)},
|
||||||
{"blk_timestamp" , blk_timestamp},
|
{"blk_timestamp" , blk_timestamp},
|
||||||
{"blk_timestamp_uint" , blk.timestamp},
|
{"blk_timestamp_uint" , blk.timestamp},
|
||||||
{"delta_time" , age.first},
|
{"delta_time" , age.first},
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include <codecvt>
|
#include <codecvt>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
|
|
||||||
namespace xmreg
|
namespace xmreg
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue