diff --git a/CMakeLists.txt b/CMakeLists.txt index b5e9188..70707d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ endif() if (NOT MONERO_DIR) - set(MONERO_DIR ~/monero) + set(MONERO_DIR ~/wownero) endif() message(STATUS MONERO_DIR ": ${MONERO_DIR}") diff --git a/cmake/FindMonero.cmake b/cmake/FindMonero.cmake index 64ceb39..b80a55e 100644 --- a/cmake/FindMonero.cmake +++ b/cmake/FindMonero.cmake @@ -45,7 +45,7 @@ foreach (l ${LIBS}) find_library(Xmr_${L}_LIBRARY NAMES ${l} 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 ) @@ -83,7 +83,7 @@ include_directories( ${MONERO_SOURCE_DIR}/src/crypto ${MONERO_SOURCE_DIR}/src/crypto/wallet ${MONERO_SOURCE_DIR}/external - ${MONERO_SOURCE_DIR}/external/randomx/src + ${MONERO_SOURCE_DIR}/external/randomwow/src ${MONERO_SOURCE_DIR}/build ${MONERO_SOURCE_DIR}/external/easylogging++ ${MONERO_SOURCE_DIR}/contrib/epee/include diff --git a/main.cpp b/main.cpp index 3c208e1..9772e2a 100644 --- a/main.cpp +++ b/main.cpp @@ -214,9 +214,9 @@ main(int ac, const char* av[]) string daemon_url {*daemon_url_opt}; - if (testnet && daemon_url == "127.0.0.1:18081") - daemon_url = "127.0.0.1:28081"; - if (stagenet && daemon_url == "127.0.0.1:18081") + if (testnet && daemon_url == "127.0.0.1:34568") + daemon_url = "127.0.0.1:11181"; + if (stagenet && daemon_url == "127.0.0.1:34568") daemon_url = "127.0.0.1:38081"; uint64_t mempool_info_timeout {5000}; @@ -490,7 +490,7 @@ main(int ac, const char* av[]) || post_body.count("txprvkey") == 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"); } diff --git a/src/CmdLineOptions.cpp b/src/CmdLineOptions.cpp index 31b846e..2326021 100644 --- a/src/CmdLineOptions.cpp +++ b/src/CmdLineOptions.cpp @@ -18,7 +18,7 @@ namespace xmreg p.add("txhash", -1); options_description desc( - "xmrblocks, Onion Monero Blockchain Explorer"); + "xmrblocks, Onion Wownero Blockchain Explorer"); desc.add_options() ("help,h", value()->default_value(false)->implicit_value(true), @@ -44,7 +44,7 @@ namespace xmreg ("enable-autorefresh-option", value()->default_value(false)->implicit_value(true), "enable users to have the index page on autorefresh") ("enable-emission-monitor", value()->default_value(false)->implicit_value(true), - "enable Monero total emission monitoring thread") + "enable Wownero total emission monitoring thread") ("port,p", value()->default_value("8081"), "default explorer port") ("bindaddr,x", value()->default_value("0.0.0.0"), @@ -64,7 +64,7 @@ namespace xmreg ("concurrency,c", value()->default_value(0), "number of threads handling http queries. Default is 0 which means it is based you on the cpu") ("bc-path,b", value(), - "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(), "path to crt file for ssl (https) functionality") ("ssl-key-file", value(), @@ -72,7 +72,7 @@ namespace xmreg ("daemon-login", value(), "Specify username[:password] for daemon RPC client") ("daemon-url,d", value()->default_value("127.0.0.1:18081"), - "Monero daemon url") + "Wownero daemon url") ("enable-mixin-guess", value()->default_value(false)->implicit_value(true), "enable guessing real outputs in key images based on viewkey"); diff --git a/src/CurrentBlockchainStatus.cpp b/src/CurrentBlockchainStatus.cpp index 602eec4..cf3a252 100644 --- a/src/CurrentBlockchainStatus.cpp +++ b/src/CurrentBlockchainStatus.cpp @@ -297,13 +297,13 @@ CurrentBlockchainStatus::is_thread_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}; 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}; diff --git a/src/MempoolStatus.cpp b/src/MempoolStatus.cpp index 24cc6e3..46ae220 100644 --- a/src/MempoolStatus.cpp +++ b/src/MempoolStatus.cpp @@ -328,8 +328,8 @@ MempoolStatus::is_thread_running() return is_running; } -bf::path MempoolStatus::blockchain_path {"/home/mwo/.bitmonero/lmdb"}; -string MempoolStatus::daemon_url {"http:://127.0.0.1:18081"}; +bf::path MempoolStatus::blockchain_path {"/home/mwo/.wownero/lmdb"}; +string MempoolStatus::daemon_url {"http:://127.0.0.1:34568"}; cryptonote::network_type MempoolStatus::nettype {cryptonote::network_type::MAINNET}; atomic MempoolStatus::is_running {false}; boost::thread MempoolStatus::m_thread; diff --git a/src/page.h b/src/page.h index 5c293e9..fa95100 100644 --- a/src/page.h +++ b/src/page.h @@ -2103,7 +2103,7 @@ show_my_outputs(string tx_hash_str, {"blk_height" , tx_blk_height_str}, {"tx_size" , fmt::format("{:0.4f}", static_cast(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}, {"delta_time" , age.first}, {"outputs_no" , static_cast(txd.output_pub_keys.size())}, @@ -2684,7 +2684,7 @@ show_my_outputs(string tx_hash_str, context["show_inputs"] = show_key_images; context["inputs_no"] = static_cast(inputs.size()); 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}; @@ -2717,7 +2717,7 @@ show_my_outputs(string tx_hash_str, } context["possible_spending"] = xmreg::xmr_amount_to_str( - possible_spending, "{:0.12f}", false); + possible_spending, "{:0.11f}", false); } // 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}, {"tx_blk_height" , tx_blk_height}, {"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)}, - {"payed_for_kB" , fmt::format("{:0.12f}", payed_for_kB)}, + {"payed_for_kB" , fmt::format("{:0.11f}", payed_for_kB)}, {"tx_version" , static_cast(txd.version)}, {"blk_timestamp" , blk_timestamp}, {"blk_timestamp_uint" , blk.timestamp}, diff --git a/src/rpccalls.h b/src/rpccalls.h index 093c0da..ea40d8a 100644 --- a/src/rpccalls.h +++ b/src/rpccalls.h @@ -86,7 +86,7 @@ public: using login_opt = boost::optional; - 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 {}, uint64_t _timeout = 200000); diff --git a/src/templates/checkrawoutputkeys.html b/src/templates/checkrawoutputkeys.html index 572bbdc..c12d66d 100644 --- a/src/templates/checkrawoutputkeys.html +++ b/src/templates/checkrawoutputkeys.html @@ -15,7 +15,7 @@

Output keys for address: {{address}}

Viewkey: {{viewkey}}

{{#has_total_xmr}} -

Total xmr: {{total_xmr}}

+

Total wow: {{total_xmr}}

{{/has_total_xmr}}
diff --git a/src/templates/footer.html b/src/templates/footer.html index 4e0cbe6..682d09a 100644 --- a/src/templates/footer.html +++ b/src/templates/footer.html @@ -2,7 +2,7 @@
source code | 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}}
diff --git a/src/templates/header.html b/src/templates/header.html index 55fe829..4ac17a8 100644 --- a/src/templates/header.html +++ b/src/templates/header.html @@ -18,7 +18,7 @@
-

Onion Monero Blockchain Explorer

+

Wownero Blockchain Explorer

(no javascript - no cookies - no web analytics trackers - no images - open sourced)

diff --git a/src/templates/index2.html b/src/templates/index2.html index f2c6a4c..c12edd1 100644 --- a/src/templates/index2.html +++ b/src/templates/index2.html @@ -55,7 +55,7 @@ {{#emission}}

- Monero emission (fees) is {{amount}} ({{fee_amount}}) as of {{blk_no}} block + Wownero emission is {{amount}} ({{fee_amount}}) as of {{blk_no}} block

{{/emission}} diff --git a/src/templates/my_outputs.html b/src/templates/my_outputs.html index bea4c72..f9f9715 100644 --- a/src/templates/my_outputs.html +++ b/src/templates/my_outputs.html @@ -69,7 +69,7 @@

- Sum XMR from matched outputs (i.e., incoming XMR): + Sum WOW from matched outputs (i.e., incoming WOW): {{#found_our_outputs}} {{sum_xmr}} {{/found_our_outputs}} @@ -142,7 +142,7 @@

- 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}}
Possible spending is: {{possible_spending}} (tx fee included) @@ -155,7 +155,7 @@
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).

diff --git a/src/templates/partials/tx_details.html b/src/templates/partials/tx_details.html index eab2853..8776a49 100644 --- a/src/templates/partials/tx_details.html +++ b/src/templates/partials/tx_details.html @@ -55,7 +55,7 @@ -

{{outputs_no}} output(s) for total of {{outputs_xmr_sum}} xmr

+

{{outputs_no}} output(s) for total of {{outputs_xmr_sum}} wow

@@ -83,7 +83,7 @@
-

Check which outputs belong to given Monero address/subaddress and viewkey

+

Check which outputs belong to given Wownero address/subaddress and viewkey

For RingCT transactions, outputs' amounts are also decoded
@@ -91,7 +91,7 @@

-
+

@@ -105,10 +105,10 @@
-

Prove to someone that you have sent them Monero in this transaction

+

Prove to someone that you have sent them Wownero in this transaction

Tx private key can be obtained using get_tx_key - command in monero-wallet-cli command line tool + command in wownero-wallet-cli command line tool
Note: address/subaddress and tx private key are sent to the server, as the calculations are done on the server side
@@ -142,14 +142,14 @@ {{/enable_mixins_details}} {{^inputs_xmr_sum_not_zero}} -

{{inputs_no}} input(s) for total of {{inputs_xmr_sum}} xmr

+

{{inputs_no}} input(s) for total of {{inputs_xmr_sum}} wow

{{/inputs_xmr_sum_not_zero}} {{#inputs_xmr_sum_not_zero}} {{^have_any_unknown_amount}} -

{{inputs_no}} inputs(s) for total of {{inputs_xmr_sum}} xmr

+

{{inputs_no}} inputs(s) for total of {{inputs_xmr_sum}} wow

{{/have_any_unknown_amount}} {{#have_any_unknown_amount}} -

{{inputs_no}} inputs(s) for total of at least {{inputs_xmr_sum}} xmr

+

{{inputs_no}} inputs(s) for total of at least {{inputs_xmr_sum}} wow

{{/have_any_unknown_amount}} {{/inputs_xmr_sum_not_zero}} diff --git a/src/templates/rawtx.html b/src/templates/rawtx.html index 6419c9f..058b034 100644 --- a/src/templates/rawtx.html +++ b/src/templates/rawtx.html @@ -9,12 +9,12 @@
Paste here either a hex string of raw transaction
- (the tx_blob response in the wallet RPC, or the raw_monero_tx + (the tx_blob response in the wallet RPC, or the raw_wownero_tx file saved by the wallet CLI with --do-not-relay option specified),
or base64 encoded, unsigned or signed transaction data

- (In Linux, can get the raw tx data: cat raw_monero_tx | xclip -selection clipboard)
- (In Windows, can get the raw tx data: certutil.exe -encode -f raw_monero_tx encoded.txt & type "encoded.txt" | clip)
+ (In Linux, can get the raw tx data: cat raw_wownero_tx | xclip -selection clipboard)
+ (In Windows, can get the raw tx data: certutil.exe -encode -f raw_wownero_tx encoded.txt & type "encoded.txt" | clip)

diff --git a/src/tools.h b/src/tools.h index 164d2a1..94d1c38 100644 --- a/src/tools.h +++ b/src/tools.h @@ -8,7 +8,7 @@ #define PATH_SEPARARTOR '/' #define XMR_AMOUNT(value) \ - static_cast(value) / 1e12 + static_cast(value) / 1e11 #define REMOVE_HASH_BRAKETS(a_hash) \ a_hash.substr(1, a_hash.size()-2) @@ -228,7 +228,7 @@ get_payment_id(const transaction& tx, inline double get_xmr(uint64_t core_amount) { - return static_cast(core_amount) / 1e12; + return static_cast(core_amount) / 1e11; } array