From 8265c08e93a8707c182f8bc27f31c7ca866fc420 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Thu, 1 Jun 2017 09:24:37 +0800 Subject: [PATCH 1/9] tag checkout updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 58a7e28..748ad42 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ git clone https://github.com/monero-project/monero cd monero/ # checkout last monero version -git checkout -b v0.10.3.1 +git checkout -b last_release v0.10.3.1 make ``` From 8608271a0cca6f7bbc49fc32b6f5a830eb066042 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Thu, 1 Jun 2017 11:19:09 +0800 Subject: [PATCH 2/9] easylogging removed as dependency --- CMakeLists.txt | 1 - README.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75e18f7..8060e7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,6 @@ set(LIBRARIES common mnemonics epee - easylogging ${Boost_LIBRARIES} pthread unbound diff --git a/README.md b/README.md index 58a7e28..748ad42 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ git clone https://github.com/monero-project/monero cd monero/ # checkout last monero version -git checkout -b v0.10.3.1 +git checkout -b last_release v0.10.3.1 make ``` From 65c222df9a3b31d515acf749fc91cf86d58c13cf Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Sun, 4 Jun 2017 05:32:24 +0800 Subject: [PATCH 3/9] fluffynet subnet explorer added to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index bdf9f29..19c7ba7 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ Clearnet versions: - [https://explorer.xmr.my/](https://explorer.xmr.my/) - nice looking one, https enabled. - [https://explorer.monero-otc.com/](https://explorer.monero-otc.com/) - https enabled. - [http://monerochain.com/](http://monerochain.com/) - JSON API based, multiple nodes. + - [http://66.85.74.134:8081/](http://66.85.74.134:8081/) - fluffynet subnet explorer. Clearnet testnet Monero version: @@ -107,6 +108,7 @@ as follows: ```bash # go to home folder if still in ~/monero cd ~ + # download the source code git clone https://github.com/moneroexamples/onion-monero-blockchain-explorer.git From 20738a45ffd82838f6d2996b43e1bc6a17b5e727 Mon Sep 17 00:00:00 2001 From: Jonathan Cross Date: Mon, 5 Jun 2017 16:57:36 +0200 Subject: [PATCH 4/9] Updating README to indicate location of frontend templates --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 19c7ba7..d323650 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,8 @@ Monero C++ libraries, but also demonstrates how to use: Tor users: - - [http://dvwae436pd7nt4bc.onion](http://dvwae436pd7nt4bc.onion) + - [http://dvwae436pd7nt4bc.onion](http://dvwae436pd7nt4bc.onion) (Front-end templates are [maintained by @suhz](https://github.com/suhz/onion-monero-blockchain-explorer/tree/new_template/src/templates)). + Clearnet versions: From c44fa88f729198be1070377ef7890b06c5223dea Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Sun, 9 Jul 2017 07:23:23 +0800 Subject: [PATCH 5/9] fix: parsing integrated addresses --- src/page.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/page.h b/src/page.h index 0ff364d..ffcb70c 100644 --- a/src/page.h +++ b/src/page.h @@ -3586,8 +3586,6 @@ namespace xmreg crypto::hash8 encrypted_payment_id; - bool testnet; - if (!get_account_integrated_address_from_str(address, has_payment_id, encrypted_payment_id, From d83b9188b755960f9d2458706cd34485505fc7b7 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Tue, 11 Jul 2017 07:59:52 +0800 Subject: [PATCH 6/9] add decrypting payments id8 obtained when using integrated address --- src/page.h | 13 ++++++++++++- src/templates/my_outputs.html | 7 ++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/page.h b/src/page.h index ffcb70c..b0bbe65 100644 --- a/src/page.h +++ b/src/page.h @@ -1745,7 +1745,6 @@ namespace xmreg << e.what() << endl; } - // get block cointaining this tx block blk; @@ -1790,6 +1789,7 @@ namespace xmreg {"has_payment_id8" , txd.payment_id8 != null_hash8}, {"payment_id" , pid_str}, {"payment_id8" , pid8_str}, + {"decrypted_payment_id8", string{}}, {"tx_prove" , tx_prove} }; @@ -1814,6 +1814,17 @@ namespace xmreg return string("Cant get key_derivation"); } + // decrypt encrypted payment id, as used in integreated addresses + crypto::hash8 decrypted_payment_id8 = txd.payment_id8; + + if (decrypted_payment_id8 != null_hash8) + { + if (decrypt_payment_id(decrypted_payment_id8, pub_key, prv_view_key)) + { + context["decrypted_payment_id8"] = pod_to_hex(decrypted_payment_id8); + } + } + mstch::array outputs; uint64_t sum_xmr {0}; diff --git a/src/templates/my_outputs.html b/src/templates/my_outputs.html index 69040a1..ac02d5f 100644 --- a/src/templates/my_outputs.html +++ b/src/templates/my_outputs.html @@ -10,7 +10,12 @@ {{/has_payment_id}} {{#has_payment_id8}} -
Payment id (encrypted): {{payment_id8}}
+ {{^decrypted_payment_id8}} +
Payment id (encrypted): {{payment_id8}}
+ {{/decrypted_payment_id8}} + {{#decrypted_payment_id8}} +
Payment id (decrypted): {{decrypted_payment_id8}}
+ {{/decrypted_payment_id8}} {{/has_payment_id8}} From 28946ebc24f135dbbe07a52489c547af8ca48fda Mon Sep 17 00:00:00 2001 From: Suhaimi Amir Date: Sat, 22 Jul 2017 08:09:16 +0800 Subject: [PATCH 7/9] update MoneroExplorer.com url in README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d323650..04a346e 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Monero C++ libraries, but also demonstrates how to use: Tor users: - - [http://dvwae436pd7nt4bc.onion](http://dvwae436pd7nt4bc.onion) (Front-end templates are [maintained by @suhz](https://github.com/suhz/onion-monero-blockchain-explorer/tree/new_template/src/templates)). + - [http://dvwae436pd7nt4bc.onion](http://dvwae436pd7nt4bc.onion) (Front-end templates are [maintained by @suhz](https://github.com/suhz/onion-monero-blockchain-explorer/tree/moneroexplorer.com/src/templates)). Clearnet versions: @@ -34,7 +34,7 @@ Clearnet versions: - [https://xmrchain.net/](https://xmrchain.net/) - https enabled, most popular and very stable. - [https://monerohash.com/explorer/](https://monerohash.com/explorer/) - nice looking one, https enabled. - [http://explore.MoneroWorld.com](http://explore.moneroworld.com) - same as the second one. - - [https://explorer.xmr.my/](https://explorer.xmr.my/) - nice looking one, https enabled. + - [https://MoneroExplorer.com/](https://moneroexplorer.com/) - nice looking one, https enabled. - [https://explorer.monero-otc.com/](https://explorer.monero-otc.com/) - https enabled. - [http://monerochain.com/](http://monerochain.com/) - JSON API based, multiple nodes. - [http://66.85.74.134:8081/](http://66.85.74.134:8081/) - fluffynet subnet explorer. @@ -43,6 +43,7 @@ Clearnet testnet Monero version: - [http://139.162.32.245:8082/](http://139.162.32.245:8082/) - bleeding edge version, no https. - [https://testnet.xmrchain.com/](https://testnet.xmrchain.com/) - https enabled. + - [https://testnet.MoneroExplorer.com/](https://testnet.moneroexplorer.com/) - https enabled. i2p users (main Monero network) - down for now: From 55c891df552b0d4fe8b7975ba360f7ebbc99b074 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Fri, 11 Aug 2017 12:55:36 +0800 Subject: [PATCH 8/9] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 04a346e..3c34e83 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,6 @@ Tor users: Clearnet versions: - - [http://139.162.32.245:8081/](http://139.162.32.245:8081/) - bleeding edge version, no https. - [https://xmrchain.net/](https://xmrchain.net/) - https enabled, most popular and very stable. - [https://monerohash.com/explorer/](https://monerohash.com/explorer/) - nice looking one, https enabled. - [http://explore.MoneroWorld.com](http://explore.moneroworld.com) - same as the second one. From 4b5c4da57000ce9fb21e58a1599fbbeccb6391a3 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Wed, 23 Aug 2017 14:08:23 +0800 Subject: [PATCH 9/9] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3c34e83..2fa326c 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ Monero C++ libraries, but also demonstrates how to use: Tor users: + - [http://libwh5lvouddzei4.onion/] - bleading edge version. - [http://dvwae436pd7nt4bc.onion](http://dvwae436pd7nt4bc.onion) (Front-end templates are [maintained by @suhz](https://github.com/suhz/onion-monero-blockchain-explorer/tree/moneroexplorer.com/src/templates)).