master
lza_menace 2 years ago
parent d66972065f
commit 4513845a19

@ -14,7 +14,7 @@ endif()
if (NOT MONERO_DIR) if (NOT MONERO_DIR)
set(MONERO_DIR ~/monero) set(MONERO_DIR ~/wownero)
endif() endif()
message(STATUS MONERO_DIR ": ${MONERO_DIR}") message(STATUS MONERO_DIR ": ${MONERO_DIR}")

@ -45,7 +45,7 @@ foreach (l ${LIBS})
find_library(Xmr_${L}_LIBRARY find_library(Xmr_${L}_LIBRARY
NAMES ${l} NAMES ${l}
PATHS ${CMAKE_LIBRARY_PATH} PATHS ${CMAKE_LIBRARY_PATH}
PATH_SUFFIXES "/src/${l}" "/src/" "/external/db_drivers/lib${l}" "/lib" "/src/crypto" "/src/crypto/wallet" "/contrib/epee/src" "/external/easylogging++/" "/external/${l}" "external/miniupnp/miniupnpc" PATH_SUFFIXES "/src/${l}" "/src/" "/external/db_drivers/lib${l}" "/lib" "/src/crypto" "/src/crypto/wallet" "/contrib/epee/src" "/external/easylogging++/" "/external/${l}" "external/miniupnp/miniupnpc" "/external/randomwow"
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
@ -83,7 +83,7 @@ include_directories(
${MONERO_SOURCE_DIR}/src/crypto ${MONERO_SOURCE_DIR}/src/crypto
${MONERO_SOURCE_DIR}/src/crypto/wallet ${MONERO_SOURCE_DIR}/src/crypto/wallet
${MONERO_SOURCE_DIR}/external ${MONERO_SOURCE_DIR}/external
${MONERO_SOURCE_DIR}/external/randomx/src ${MONERO_SOURCE_DIR}/external/randomwow/src
${MONERO_SOURCE_DIR}/build ${MONERO_SOURCE_DIR}/build
${MONERO_SOURCE_DIR}/external/easylogging++ ${MONERO_SOURCE_DIR}/external/easylogging++
${MONERO_SOURCE_DIR}/contrib/epee/include ${MONERO_SOURCE_DIR}/contrib/epee/include

@ -214,9 +214,9 @@ main(int ac, const char* av[])
string daemon_url {*daemon_url_opt}; string daemon_url {*daemon_url_opt};
if (testnet && daemon_url == "127.0.0.1:18081") if (testnet && daemon_url == "127.0.0.1:34568")
daemon_url = "127.0.0.1:28081"; daemon_url = "127.0.0.1:11181";
if (stagenet && daemon_url == "127.0.0.1:18081") if (stagenet && daemon_url == "127.0.0.1:34568")
daemon_url = "127.0.0.1:38081"; daemon_url = "127.0.0.1:38081";
uint64_t mempool_info_timeout {5000}; uint64_t mempool_info_timeout {5000};
@ -490,7 +490,7 @@ main(int ac, const char* av[])
|| post_body.count("txprvkey") == 0 || post_body.count("txprvkey") == 0
|| post_body.count("txhash") == 0) || post_body.count("txhash") == 0)
{ {
return string("xmr address, tx private key or " return string("wow address, tx private key or "
"tx hash not provided"); "tx hash not provided");
} }

@ -18,7 +18,7 @@ namespace xmreg
p.add("txhash", -1); p.add("txhash", -1);
options_description desc( options_description desc(
"xmrblocks, Onion Monero Blockchain Explorer"); "xmrblocks, Onion Wownero Blockchain Explorer");
desc.add_options() desc.add_options()
("help,h", value<bool>()->default_value(false)->implicit_value(true), ("help,h", value<bool>()->default_value(false)->implicit_value(true),
@ -44,7 +44,7 @@ namespace xmreg
("enable-autorefresh-option", value<bool>()->default_value(false)->implicit_value(true), ("enable-autorefresh-option", value<bool>()->default_value(false)->implicit_value(true),
"enable users to have the index page on autorefresh") "enable users to have the index page on autorefresh")
("enable-emission-monitor", value<bool>()->default_value(false)->implicit_value(true), ("enable-emission-monitor", value<bool>()->default_value(false)->implicit_value(true),
"enable Monero total emission monitoring thread") "enable Wownero total emission monitoring thread")
("port,p", value<string>()->default_value("8081"), ("port,p", value<string>()->default_value("8081"),
"default explorer port") "default explorer port")
("bindaddr,x", value<string>()->default_value("0.0.0.0"), ("bindaddr,x", value<string>()->default_value("0.0.0.0"),
@ -64,7 +64,7 @@ namespace xmreg
("concurrency,c", value<size_t>()->default_value(0), ("concurrency,c", value<size_t>()->default_value(0),
"number of threads handling http queries. Default is 0 which means it is based you on the cpu") "number of threads handling http queries. Default is 0 which means it is based you on the cpu")
("bc-path,b", value<string>(), ("bc-path,b", value<string>(),
"path to lmdb folder of the blockchain, e.g., ~/.bitmonero/lmdb") "path to lmdb folder of the blockchain, e.g., ~/.wownero/lmdb")
("ssl-crt-file", value<string>(), ("ssl-crt-file", value<string>(),
"path to crt file for ssl (https) functionality") "path to crt file for ssl (https) functionality")
("ssl-key-file", value<string>(), ("ssl-key-file", value<string>(),
@ -72,7 +72,7 @@ namespace xmreg
("daemon-login", value<string>(), ("daemon-login", value<string>(),
"Specify username[:password] for daemon RPC client") "Specify username[:password] for daemon RPC client")
("daemon-url,d", value<string>()->default_value("127.0.0.1:18081"), ("daemon-url,d", value<string>()->default_value("127.0.0.1:18081"),
"Monero daemon url") "Wownero daemon url")
("enable-mixin-guess", value<bool>()->default_value(false)->implicit_value(true), ("enable-mixin-guess", value<bool>()->default_value(false)->implicit_value(true),
"enable guessing real outputs in key images based on viewkey"); "enable guessing real outputs in key images based on viewkey");

@ -297,13 +297,13 @@ CurrentBlockchainStatus::is_thread_running()
return is_running; return is_running;
} }
bf::path CurrentBlockchainStatus::blockchain_path {"/home/mwo/.bitmonero/lmdb"}; bf::path CurrentBlockchainStatus::blockchain_path {"/home/mwo/.wownero/lmdb"};
cryptonote::network_type CurrentBlockchainStatus::nettype {cryptonote::network_type::MAINNET}; cryptonote::network_type CurrentBlockchainStatus::nettype {cryptonote::network_type::MAINNET};
string CurrentBlockchainStatus::output_file {"emission_amount.txt"}; string CurrentBlockchainStatus::output_file {"emission_amount.txt"};
string CurrentBlockchainStatus::daemon_url {"http:://127.0.0.1:18081"}; string CurrentBlockchainStatus::daemon_url {"http:://127.0.0.1:234568"};
uint64_t CurrentBlockchainStatus::blockchain_chunk_size {10000}; uint64_t CurrentBlockchainStatus::blockchain_chunk_size {10000};

@ -328,8 +328,8 @@ MempoolStatus::is_thread_running()
return is_running; return is_running;
} }
bf::path MempoolStatus::blockchain_path {"/home/mwo/.bitmonero/lmdb"}; bf::path MempoolStatus::blockchain_path {"/home/mwo/.wownero/lmdb"};
string MempoolStatus::daemon_url {"http:://127.0.0.1:18081"}; string MempoolStatus::daemon_url {"http:://127.0.0.1:34568"};
cryptonote::network_type MempoolStatus::nettype {cryptonote::network_type::MAINNET}; cryptonote::network_type MempoolStatus::nettype {cryptonote::network_type::MAINNET};
atomic<bool> MempoolStatus::is_running {false}; atomic<bool> MempoolStatus::is_running {false};
boost::thread MempoolStatus::m_thread; boost::thread MempoolStatus::m_thread;

@ -2103,7 +2103,7 @@ show_my_outputs(string tx_hash_str,
{"blk_height" , tx_blk_height_str}, {"blk_height" , tx_blk_height_str},
{"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, "{:0.12f}", true)}, {"tx_fee" , xmreg::xmr_amount_to_str(txd.fee, "{:0.11f}", true)},
{"blk_timestamp" , blk_timestamp}, {"blk_timestamp" , blk_timestamp},
{"delta_time" , age.first}, {"delta_time" , age.first},
{"outputs_no" , static_cast<uint64_t>(txd.output_pub_keys.size())}, {"outputs_no" , static_cast<uint64_t>(txd.output_pub_keys.size())},
@ -2684,7 +2684,7 @@ show_my_outputs(string tx_hash_str,
context["show_inputs"] = show_key_images; context["show_inputs"] = show_key_images;
context["inputs_no"] = static_cast<uint64_t>(inputs.size()); context["inputs_no"] = static_cast<uint64_t>(inputs.size());
context["sum_mixin_xmr"] = xmreg::xmr_amount_to_str( context["sum_mixin_xmr"] = xmreg::xmr_amount_to_str(
sum_mixin_xmr, "{:0.12f}", false); sum_mixin_xmr, "{:0.11f}", false);
uint64_t possible_spending {0}; uint64_t possible_spending {0};
@ -2717,7 +2717,7 @@ show_my_outputs(string tx_hash_str,
} }
context["possible_spending"] = xmreg::xmr_amount_to_str( context["possible_spending"] = xmreg::xmr_amount_to_str(
possible_spending, "{:0.12f}", false); possible_spending, "{:0.11f}", false);
} // if (enable_mixin_guess) } // if (enable_mixin_guess)
@ -6135,9 +6135,9 @@ construct_tx_context(transaction tx, uint16_t with_ring_signatures = 0)
{"blk_height" , tx_blk_height_str}, {"blk_height" , tx_blk_height_str},
{"tx_blk_height" , tx_blk_height}, {"tx_blk_height" , tx_blk_height},
{"tx_size" , fmt::format("{:0.4f}", tx_size)}, {"tx_size" , fmt::format("{:0.4f}", tx_size)},
{"tx_fee" , xmreg::xmr_amount_to_str(txd.fee, "{:0.12f}", false)}, {"tx_fee" , xmreg::xmr_amount_to_str(txd.fee, "{:0.11f}", false)},
{"tx_fee_micro" , xmreg::xmr_amount_to_str(txd.fee*1e6, "{:0.4f}", false)}, {"tx_fee_micro" , xmreg::xmr_amount_to_str(txd.fee*1e6, "{:0.4f}", false)},
{"payed_for_kB" , fmt::format("{:0.12f}", payed_for_kB)}, {"payed_for_kB" , fmt::format("{:0.11f}", payed_for_kB)},
{"tx_version" , static_cast<uint64_t>(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},

@ -86,7 +86,7 @@ public:
using login_opt = boost::optional<epee::net_utils::http::login>; using login_opt = boost::optional<epee::net_utils::http::login>;
rpccalls(string _daemon_url = "http:://127.0.0.1:18081", rpccalls(string _daemon_url = "http:://127.0.0.1:34568",
login_opt _login = login_opt {}, login_opt _login = login_opt {},
uint64_t _timeout = 200000); uint64_t _timeout = 200000);

@ -15,7 +15,7 @@
<h4>Output keys for address: {{address}}</h4> <h4>Output keys for address: {{address}}</h4>
<h4>Viewkey: {{viewkey}}</h4> <h4>Viewkey: {{viewkey}}</h4>
{{#has_total_xmr}} {{#has_total_xmr}}
<h4>Total xmr: {{total_xmr}}</h4> <h4>Total wow: {{total_xmr}}</h4>
{{/has_total_xmr}} {{/has_total_xmr}}
<div class="center"> <div class="center">

@ -2,7 +2,7 @@
<h6 style="margin-top:10px"> <h6 style="margin-top:10px">
<a href="https://github.com/moneroexamples/onion-monero-blockchain-explorer">source code</a> <a href="https://github.com/moneroexamples/onion-monero-blockchain-explorer">source code</a>
| explorer version (api): {{git_branch_name}}-{{last_git_commit_date}}-{{last_git_commit_hash}} ({{api}}) | explorer version (api): {{git_branch_name}}-{{last_git_commit_date}}-{{last_git_commit_hash}} ({{api}})
| monero version: {{monero_version_full}} | wownero version: {{monero_version_full}}
</h6> </h6>
</div> </div>
</body> </body>

@ -18,7 +18,7 @@
<div> <div>
<div class="center"> <div class="center">
<h1 class="center"><a href="/">Onion Monero Blockchain Explorer</a></h1> <h1 class="center"><a href="/">Wownero Blockchain Explorer</a></h1>
<h4 style="font-size: 15px; margin: 0px">(no javascript - no cookies - no web analytics trackers - no images - open sourced)</h4> <h4 style="font-size: 15px; margin: 0px">(no javascript - no cookies - no web analytics trackers - no images - open sourced)</h4>
</div> </div>

@ -55,7 +55,7 @@
{{#emission}} {{#emission}}
<h3 style="font-size: 12px; margin-top: 2px"> <h3 style="font-size: 12px; margin-top: 2px">
Monero emission (fees) is {{amount}} ({{fee_amount}}) as of {{blk_no}} block Wownero emission is {{amount}} ({{fee_amount}}) as of {{blk_no}} block
</h3> </h3>
{{/emission}} {{/emission}}

@ -69,7 +69,7 @@
</table> </table>
<h3> <h3>
Sum XMR from matched outputs (i.e., incoming XMR): Sum WOW from matched outputs (i.e., incoming WOW):
{{#found_our_outputs}} {{#found_our_outputs}}
{{sum_xmr}} {{sum_xmr}}
{{/found_our_outputs}} {{/found_our_outputs}}
@ -142,7 +142,7 @@
</div> </div>
<h3> <h3>
Sum XMR from matched and marked by * ring member's outputs: {{sum_mixin_xmr}} Sum WOW from matched and marked by * ring member's outputs: {{sum_mixin_xmr}}
<br/> <br/>
<span style="font-size: 16px"> Possible spending is: <span style="font-size: 16px"> Possible spending is:
{{possible_spending}} (tx fee included) {{possible_spending}} (tx fee included)
@ -155,7 +155,7 @@
<br/> <br/>
<span style="font-size: 14px"> <span style="font-size: 14px">
Number of possible our mixins is {{no_all_possible_mixins}} Number of possible our mixins is {{no_all_possible_mixins}}
for {{all_possible_mixins_amount}} xmr for {{all_possible_mixins_amount}} wow
(amount as uint64). (amount as uint64).
</span> </span>
</h3> </h3>

@ -55,7 +55,7 @@
</table> </table>
<h3>{{outputs_no}} output(s) for total of {{outputs_xmr_sum}} xmr</h3> <h3>{{outputs_no}} output(s) for total of {{outputs_xmr_sum}} wow</h3>
<div class="center"> <div class="center">
<table class="center"> <table class="center">
<tr> <tr>
@ -83,7 +83,7 @@
<input type="radio" id="tab-1" name="tab-group-1" checked> <input type="radio" id="tab-1" name="tab-group-1" checked>
<label for="tab-1">Decode outputs</label> <label for="tab-1">Decode outputs</label>
<div class="content tab-1"> <div class="content tab-1">
<h4 style="margin: 0px">Check which outputs belong to given Monero address/subaddress and viewkey</h4> <h4 style="margin: 0px">Check which outputs belong to given Wownero address/subaddress and viewkey</h4>
<h5 style="margin: 0px"> <h5 style="margin: 0px">
For RingCT transactions, outputs' amounts are also decoded For RingCT transactions, outputs' amounts are also decoded
<br/> <br/>
@ -91,7 +91,7 @@
</h5> </h5>
<form action="/myoutputs" method="post" style="width:100%; margin-top:2px" class="style-1"> <form action="/myoutputs" method="post" style="width:100%; margin-top:2px" class="style-1">
<input type="hidden" name="tx_hash" value="{{tx_hash}}"><br/> <input type="hidden" name="tx_hash" value="{{tx_hash}}"><br/>
<input type="text" name="xmr_address" size="110" placeholder="Monero address/subaddress"><br/> <input type="text" name="xmr_address" size="110" placeholder="Wownero address/subaddress"><br/>
<input type="text" name="viewkey" size="110" placeholder="Private viewkey" style="margin-top:5px"><br/> <input type="text" name="viewkey" size="110" placeholder="Private viewkey" style="margin-top:5px"><br/>
<input type="hidden" name="raw_tx_data" value="{{raw_tx_data}}"> <input type="hidden" name="raw_tx_data" value="{{raw_tx_data}}">
<!--above raw_tx_data field only used when checking raw tx data through tx pusher--> <!--above raw_tx_data field only used when checking raw tx data through tx pusher-->
@ -105,10 +105,10 @@
<label for="tab-2">Prove sending</label> <label for="tab-2">Prove sending</label>
<div class="content tab-2"> <div class="content tab-2">
<h4 style="margin: 0px">Prove to someone that you have sent them Monero in this transaction</h4> <h4 style="margin: 0px">Prove to someone that you have sent them Wownero in this transaction</h4>
<h5 style="margin: 0px"> <h5 style="margin: 0px">
Tx private key can be obtained using <i>get_tx_key</i> Tx private key can be obtained using <i>get_tx_key</i>
command in <i>monero-wallet-cli</i> command line tool command in <i>wownero-wallet-cli</i> command line tool
<br/> <br/>
Note: address/subaddress and tx private key are sent to the server, as the calculations are done on the server side Note: address/subaddress and tx private key are sent to the server, as the calculations are done on the server side
</h5> </h5>
@ -142,14 +142,14 @@
{{/enable_mixins_details}} {{/enable_mixins_details}}
{{^inputs_xmr_sum_not_zero}} {{^inputs_xmr_sum_not_zero}}
<h3>{{inputs_no}} input(s) for total of {{inputs_xmr_sum}} xmr</h3> <h3>{{inputs_no}} input(s) for total of {{inputs_xmr_sum}} wow</h3>
{{/inputs_xmr_sum_not_zero}} {{/inputs_xmr_sum_not_zero}}
{{#inputs_xmr_sum_not_zero}} {{#inputs_xmr_sum_not_zero}}
{{^have_any_unknown_amount}} {{^have_any_unknown_amount}}
<h3>{{inputs_no}} inputs(s) for total of {{inputs_xmr_sum}} xmr</h3> <h3>{{inputs_no}} inputs(s) for total of {{inputs_xmr_sum}} wow</h3>
{{/have_any_unknown_amount}} {{/have_any_unknown_amount}}
{{#have_any_unknown_amount}} {{#have_any_unknown_amount}}
<h3>{{inputs_no}} inputs(s) for total of at least {{inputs_xmr_sum}} xmr</h3> <h3>{{inputs_no}} inputs(s) for total of at least {{inputs_xmr_sum}} wow</h3>
{{/have_any_unknown_amount}} {{/have_any_unknown_amount}}
{{/inputs_xmr_sum_not_zero}} {{/inputs_xmr_sum_not_zero}}

@ -9,12 +9,12 @@
<div class="center"> <div class="center">
<form action="/checkandpush" method="post" style="width:100%; margin-top:15px" class="style-1"> <form action="/checkandpush" method="post" style="width:100%; margin-top:15px" class="style-1">
Paste here either a hex string of raw transaction<br/> Paste here either a hex string of raw transaction<br/>
(the <i>tx_blob</i> response in the wallet RPC, or the <i>raw_monero_tx</i> (the <i>tx_blob</i> response in the wallet RPC, or the <i>raw_wownero_tx</i>
file saved by the wallet CLI with <i>--do-not-relay</i> option specified),<br/> file saved by the wallet CLI with <i>--do-not-relay</i> option specified),<br/>
or base64 encoded, unsigned or signed transaction data<br/> or base64 encoded, unsigned or signed transaction data<br/>
<br/> <br/>
(In Linux, can get the raw tx data: <i>cat raw_monero_tx | xclip -selection clipboard</i>)<br/> (In Linux, can get the raw tx data: <i>cat raw_wownero_tx | xclip -selection clipboard</i>)<br/>
(In Windows, can get the raw tx data: <i>certutil.exe -encode -f raw_monero_tx encoded.txt & type "encoded.txt" | clip</i>)<br/> (In Windows, can get the raw tx data: <i>certutil.exe -encode -f raw_wownero_tx encoded.txt & type "encoded.txt" | clip</i>)<br/>
<textarea name="rawtxdata" rows="20" cols="80"></textarea> <textarea name="rawtxdata" rows="20" cols="80"></textarea>
<br/> <br/>

@ -8,7 +8,7 @@
#define PATH_SEPARARTOR '/' #define PATH_SEPARARTOR '/'
#define XMR_AMOUNT(value) \ #define XMR_AMOUNT(value) \
static_cast<double>(value) / 1e12 static_cast<double>(value) / 1e11
#define REMOVE_HASH_BRAKETS(a_hash) \ #define REMOVE_HASH_BRAKETS(a_hash) \
a_hash.substr(1, a_hash.size()-2) a_hash.substr(1, a_hash.size()-2)
@ -228,7 +228,7 @@ get_payment_id(const transaction& tx,
inline double inline double
get_xmr(uint64_t core_amount) get_xmr(uint64_t core_amount)
{ {
return static_cast<double>(core_amount) / 1e12; return static_cast<double>(core_amount) / 1e11;
} }
array<size_t, 5> array<size_t, 5>

Loading…
Cancel
Save