From 026e734ab09d7649d8579e1a259a61e505cee9e6 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Thu, 24 Aug 2017 13:29:32 +0800 Subject: [PATCH] mempool changed to txpool https://github.com/moneroexamples/onion-monero-blockchain-explorer/issues/64 --- main.cpp | 6 ++++++ src/templates/index2.html | 4 ++-- src/templates/mempool.html | 4 ++-- src/templates/mempool_error.html | 8 ++++---- src/templates/pushrawtx.html | 2 +- src/templates/tx.html | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/main.cpp b/main.cpp index fe7e2e9..f085994 100644 --- a/main.cpp +++ b/main.cpp @@ -431,6 +431,12 @@ main(int ac, const char* av[]) return xmrblocks.mempool(true); }); + // alias to "/mempool" + CROW_ROUTE(app, "/txpool") + ([&](const crow::request& req) { + return xmrblocks.mempool(true); + }); + // CROW_ROUTE(app, "/altblocks") // ([&](const crow::request& req) { // return xmrblocks.altblocks(); diff --git a/src/templates/index2.html b/src/templates/index2.html index 1393eb3..ae7f4cf 100644 --- a/src/templates/index2.html +++ b/src/templates/index2.html @@ -2,9 +2,9 @@

- Server time: {{server_timestamp}} | Memory pool + Server time: {{server_timestamp}} | Transaction pool {{#enable_pusher}} - | Tx pusher + | Transaction pusher {{/enable_pusher}} {{#enable_key_image_checker}} | Key images checker diff --git a/src/templates/mempool.html b/src/templates/mempool.html index 18299e0..361865e 100644 --- a/src/templates/mempool.html +++ b/src/templates/mempool.html @@ -1,5 +1,5 @@

- Memory pool + Transaction pool

(no of txs: {{mempool_size}}, size: {{mempool_size_kB}} kB, updated every {{ mempool_refresh_time }} seconds)

@@ -30,7 +30,7 @@ {{^mempool_fits_on_front_page}} {{#partial_mempool_shown}}
- Only {{no_of_mempool_tx_of_frontpage}} txs shown. Click here to see all of them + Only {{no_of_mempool_tx_of_frontpage}} txs shown. Click here to see all of them
{{/partial_mempool_shown}} diff --git a/src/templates/mempool_error.html b/src/templates/mempool_error.html index a003cae..7e35a88 100644 --- a/src/templates/mempool_error.html +++ b/src/templates/mempool_error.html @@ -1,15 +1,15 @@

- Memory pool + Transaction pool

-

Mempool data preparation for the front page failed. +

Txpool data preparation for the front page failed. Its processing {{#network_info}}{{^is_pool_size_zero}}({{tx_pool_size}} txs){{/is_pool_size_zero}}{{/network_info}} took longer than expected and it timed out. - To view the mempool without time constrain, - go to dedicated mempool page: memory pool + To view the txpool without time constrain, + go to dedicated txpool page: memory pool

diff --git a/src/templates/pushrawtx.html b/src/templates/pushrawtx.html index eb4d272..1c7f7d2 100644 --- a/src/templates/pushrawtx.html +++ b/src/templates/pushrawtx.html @@ -18,7 +18,7 @@ {{^has_error}}

Success

- Your tx should be already in the mempool waiting to be included + Your tx should be already in the txpool waiting to be included in an upcoming block.

diff --git a/src/templates/tx.html b/src/templates/tx.html index e5807d5..8f7e88f 100644 --- a/src/templates/tx.html +++ b/src/templates/tx.html @@ -7,7 +7,7 @@

Tx {{tx_hash}} not found.

If this is newly made tx, it can take some time (up to minute) - for it to get propagated to all nodes' mempools. + for it to get propagated to all nodes' txpools.

Please refresh in 10-20 seconds to check if its here then.