{% if output.status != "Unconfirmed" %}
-
+
RAW DATA
diff --git a/templates/search.html.tera b/templates/search.html.tera
index dbda3b0..bccf71f 100644
--- a/templates/search.html.tera
+++ b/templates/search.html.tera
@@ -4,7 +4,7 @@
-
+
From 080a02ebe027480e077c2def09f2270f500bf760 Mon Sep 17 00:00:00 2001
From: aglkm <39521015+aglkm@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:47:07 +0300
Subject: [PATCH 08/13] add search info
---
templates/error.html.tera | 7 ++++---
templates/search.html.tera | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/templates/error.html.tera b/templates/error.html.tera
index e06a486..d44052e 100644
--- a/templates/error.html.tera
+++ b/templates/error.html.tera
@@ -8,9 +8,10 @@
No results found.
Supported search inputs:
-
-
-
+
+
+
+
diff --git a/templates/search.html.tera b/templates/search.html.tera
index bccf71f..bc55ba2 100644
--- a/templates/search.html.tera
+++ b/templates/search.html.tera
@@ -18,9 +18,10 @@
Supported search inputs:
-
-
-
+
+
+
+
From 5f6ad8ca2ca65ebf101e2ef157443e7f431223d8 Mon Sep 17 00:00:00 2001
From: aglkm <39521015+aglkm@users.noreply.github.com>
Date: Wed, 5 Jun 2024 06:20:40 +0300
Subject: [PATCH 09/13] remove search by outputs feature
---
src/data.rs | 23 -----------------
src/main.rs | 45 +++------------------------------
src/requests.rs | 36 --------------------------
templates/error.html.tera | 1 -
templates/output.html.tera | 52 --------------------------------------
templates/search.html.tera | 1 -
6 files changed, 4 insertions(+), 154 deletions(-)
delete mode 100644 templates/output.html.tera
diff --git a/src/data.rs b/src/data.rs
index a22439c..5622eea 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -133,29 +133,6 @@ impl Kernel {
}
-// Output data
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Output {
- pub height: String,
- pub commit: String,
- pub out_type: String,
- pub status: String,
- pub raw_data: String,
-}
-
-impl Output {
- pub fn new() -> Output {
- Output {
- height: String::new(),
- commit: String::new(),
- out_type: String::new(),
- status: String::new(),
- raw_data: String::new(),
- }
- }
-}
-
-
// Transactions data
#[derive(Debug)]
pub struct Transactions {
diff --git a/src/main.rs b/src/main.rs
index 905ab14..4d2ac5a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,7 +19,6 @@ use crate::data::Dashboard;
use crate::data::Block;
use crate::data::Transactions;
use crate::data::Kernel;
-use crate::data::Output;
use crate::requests::CONFIG;
@@ -150,33 +149,11 @@ async fn kernel(excess: &str) -> Template {
}
-// Rendering page for a specified output.
-#[get("/output/
")]
-async fn output(commit: &str) -> Template {
- let mut output = Output::new();
-
- let _ = requests::get_output(&commit, &mut output).await;
-
- if output.commit.is_empty() == false {
- return Template::render("output", context! {
- route: "output",
- cg_api: CONFIG.coingecko_api.clone(),
- output,
- })
- }
-
- return Template::render("error", context! {
- route: "error",
- cg_api: CONFIG.coingecko_api.clone(),
- })
-}
-
-
// Handling search request.
// Using Option<&str> to match '/search' query without input params.
// https://github.com/rwf2/Rocket/issues/608
#[get("/search? {
+fn search(input: Option<&str>) -> Either {
// Unwrap Option and forward to Search page if no parameters
let input = match input {
Some(value) => value,
@@ -197,23 +174,9 @@ pub async fn search(input: Option<&str>) -> Either {
} else if input.len() == 64 {
return Either::Right(Redirect::to(uri!(block_header_by_hash(input))));
- // Kernel or Output
+ // Kernel
} else if input.len() == 66 {
- // First search for Kernel
- let mut kernel = Kernel::new();
-
- let _ = requests::get_kernel(&input, &mut kernel).await;
-
- if kernel.excess.is_empty() == false {
- return Either::Left(Template::render("kernel", context! {
- route: "kernel",
- cg_api: CONFIG.coingecko_api.clone(),
- kernel,
- }));
- } else {
- // If Kernel not found, then search for Output
- return Either::Right(Redirect::to(uri!(output(input))));
- }
+ return Either::Right(Redirect::to(uri!(kernel(input))));
}
}
@@ -683,7 +646,7 @@ async fn main() {
block_weight, block_details_by_height, block_header_by_hash,
soft_supply, production_cost, reward_ratio, breakeven_cost,
last_block_age, block_list_by_height, block_list_index, search, kernel,
- output, api_owner, api_foreign])
+ api_owner, api_foreign])
.mount("/static", FileServer::from("static"))
.attach(Template::fairing())
.launch()
diff --git a/src/requests.rs b/src/requests.rs
index 4baa48f..2ffe83e 100644
--- a/src/requests.rs
+++ b/src/requests.rs
@@ -17,7 +17,6 @@ use crate::data::Block;
use crate::data::Transactions;
use crate::data::ExplorerConfig;
use crate::data::Kernel;
-use crate::data::Output;
// Static explorer config structure
@@ -448,41 +447,6 @@ pub async fn get_kernel(excess: &str, kernel: &mut Kernel) -> Result<(), anyhow:
}
-// Get output.
-pub async fn get_output(commit: &str, output: &mut Output) -> Result<(), anyhow::Error> {
- // First check whether output is broadcasted but not confirmed yet (in mempool)
- let mut resp = call("get_unconfirmed_transactions", "[]", "1", "foreign").await?;
-
- if resp["result"]["Ok"].is_null() == false {
- for tx in resp["result"]["Ok"].as_array().unwrap() {
- for out in tx["tx"]["body"]["outputs"].as_array().unwrap() {
- if out["commit"].as_str().unwrap() == commit {
- // Only Plain outputs in the mempool
- output.out_type = "Plain".to_string();
- output.commit = out["commit"].as_str().unwrap().to_string();
- output.status = "Unconfirmed".to_string();
- // Found it, no need to continue
- return Ok(());
- }
- }
- }
- }
-
- let params = &format!("[[\"{}\"], null, null, true, true]", commit)[..];
-
- resp = call("get_outputs", params, "1", "foreign").await?;
-
- if resp["result"]["Ok"][0].is_null() == false {
- output.height = resp["result"]["Ok"][0]["block_height"].to_string();
- output.commit = resp["result"]["Ok"][0]["commit"].as_str().unwrap().to_string();
- output.out_type = resp["result"]["Ok"][0]["output_type"].as_str().unwrap().to_string();
- output.raw_data = serde_json::to_string_pretty(&resp).unwrap()
- }
-
- Ok(())
-}
-
-
// Collecting block kernels for transactions stats.
pub async fn get_block_kernels(height: &String, blocks: &mut Vec)
-> Result<(), anyhow::Error> {
diff --git a/templates/error.html.tera b/templates/error.html.tera
index d44052e..536b6b0 100644
--- a/templates/error.html.tera
+++ b/templates/error.html.tera
@@ -11,7 +11,6 @@
-
diff --git a/templates/output.html.tera b/templates/output.html.tera
deleted file mode 100644
index 0509c62..0000000
--- a/templates/output.html.tera
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends "base" %}
-
-{% block content %}
-
-
-
-
-
-
-
- {% if output.status == "Unconfirmed" %}
-
UNCONFIRMED
- {% endif %}
-
-
-
-
Commitment
-
{{ output.commit }}
-
- {% if output.status != "Unconfirmed" %}
-
-
- {% endif %}
-
-
-
Type
-
{{ output.out_type }}
-
-
-
-
-
RAW DATA
-
-
{{ output.raw_data }}
-
-
-
-{% endblock %}
-
diff --git a/templates/search.html.tera b/templates/search.html.tera
index bc55ba2..33f5509 100644
--- a/templates/search.html.tera
+++ b/templates/search.html.tera
@@ -21,7 +21,6 @@
-
From da61d470e79bc293ca6c42b5d364f342b597e43b Mon Sep 17 00:00:00 2001
From: aglkm <39521015+aglkm@users.noreply.github.com>
Date: Wed, 5 Jun 2024 06:31:54 +0300
Subject: [PATCH 10/13] disallow get_outputs rpc
---
src/main.rs | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index 4d2ac5a..c452509 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -223,7 +223,8 @@ async fn api_owner(data: &str) -> String {
// Foreign API.
-// All methods are whitelisted.
+// All methods are whitelisted, except get_outputs.
+// get_outputs consumes CPU and blocks certain other rpc calls.
#[post("/v2/foreign", data="
")]
async fn api_foreign(data: &str) -> String {
if CONFIG.public_api == "enabled" {
@@ -239,14 +240,18 @@ async fn api_foreign(data: &str) -> String {
_ => return "{\"error\":\"bad syntax\"}".to_string(),
};
- let resp = requests::call(method, v["params"].to_string().as_str(), v["id"].to_string().as_str(), "foreign").await;
+ if method != "get_outputs" {
+ let resp = requests::call(method, v["params"].to_string().as_str(), v["id"].to_string().as_str(), "foreign").await;
- let result = match resp {
- Ok(value) => value,
- Err(_err) => return "{\"error\":\"rpc call failed\"}".to_string(),
- };
+ let result = match resp {
+ Ok(value) => value,
+ Err(_err) => return "{\"error\":\"rpc call failed\"}".to_string(),
+ };
- result.to_string()
+ return result.to_string();
+ }
+
+ "{\"error\":\"not allowed\"}".to_string()
} else {
"{\"error\":\"not allowed\"}".to_string()
}
From 239683070ba3cf3af6ef8fb17354743ec2291cbb Mon Sep 17 00:00:00 2001
From: aglkm <39521015+aglkm@users.noreply.github.com>
Date: Tue, 18 Jun 2024 13:18:50 +0300
Subject: [PATCH 11/13] better error handling if chain dir not found
---
src/requests.rs | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/requests.rs b/src/requests.rs
index 2ffe83e..38264e2 100644
--- a/src/requests.rs
+++ b/src/requests.rs
@@ -168,23 +168,18 @@ pub async fn get_market(dashboard: Arc>) -> Result<(), Error> {
data.supply = supply.to_formatted_string(&Locale::en);
// https://john-tromp.medium.com/a-case-for-using-soft-total-supply-1169a188d153
- data.soft_supply = format!("{:.2}",
- supply.to_string().parse::().unwrap() / 3150000000.0 * 100.0);
+ data.soft_supply = format!("{:.2}", supply.to_string().parse::().unwrap() / 3150000000.0 * 100.0);
if CONFIG.coingecko_api == "enabled" && val != Value::Null {
// Check if CoingGecko API returned error
if let Some(status) = val.get("status") {
- println!("{} {}.", "[ WARNING ]".yellow(),
- status["error_message"].as_str().unwrap().to_string());
+ println!("{} {}.", "[ WARNING ]".yellow(), status["error_message"].as_str().unwrap().to_string());
} else {
- data.price_usd = format!("{:.3}", val["grin"]["usd"].to_string().parse::()
- .unwrap());
- data.price_btc = format!("{:.8}", val["grin"]["btc"].to_string().parse::()
- .unwrap());
+ data.price_usd = format!("{:.3}", val["grin"]["usd"].to_string().parse::().unwrap());
+ data.price_btc = format!("{:.8}", val["grin"]["btc"].to_string().parse::().unwrap());
data.volume_usd = (val["grin"]["usd_24h_vol"].to_string().parse::().unwrap() as u64)
.to_formatted_string(&Locale::en);
- data.volume_btc = format!("{:.2}", val["grin"]["btc_24h_vol"].to_string().parse::()
- .unwrap());
+ data.volume_btc = format!("{:.2}", val["grin"]["btc_24h_vol"].to_string().parse::().unwrap());
data.cap_usd = (((supply as f64) * data.price_usd.parse::().unwrap()) as u64)
.to_formatted_string(&Locale::en);
data.cap_btc = (((supply as f64) * data.price_btc.parse::().unwrap()) as u64)
@@ -200,16 +195,18 @@ pub async fn get_market(dashboard: Arc>) -> Result<(), Error> {
// Collecting: disk_usage.
pub fn get_disk_usage(dashboard: Arc>) -> Result<(), Error> {
let mut data = dashboard.lock().unwrap();
- let chain_data;
+ let chain_dir;
if CONFIG.coingecko_api == "enabled" {
- chain_data = format!("{}/main/chain_data", CONFIG.grin_dir);
+ chain_dir = format!("{}/main/chain_data", CONFIG.grin_dir);
} else {
- chain_data = format!("{}/test/chain_data", CONFIG.grin_dir);
+ chain_dir = format!("{}/test/chain_data", CONFIG.grin_dir);
}
- data.disk_usage = format!("{:.2}", (get_size(chain_data).unwrap() as f64)
- / 1000.0 / 1000.0 / 1000.0);
+ match get_size(chain_dir.clone()) {
+ Ok(chain_size) => data.disk_usage = format!("{:.2}", (chain_size as f64) / 1000.0 / 1000.0 / 1000.0),
+ Err(e) => println!("{} {}: \"{}\".", "[ ERROR ]".red(), e, chain_dir),
+ }
Ok(())
}
@@ -222,8 +219,7 @@ pub async fn get_mining_stats(dashboard: Arc>) -> Result<(), an
if height.is_empty() == false && height.parse::().unwrap() > 1440 {
let params1 = &format!("[{}, null, null]", height)[..];
- let params2 = &format!("[{}, null, null]", height.parse::().unwrap()
- - difficulty_window)[..];
+ let params2 = &format!("[{}, null, null]", height.parse::().unwrap() - difficulty_window)[..];
let resp1 = call("get_block", params1, "1", "foreign").await?;
let resp2 = call("get_block", params2, "1", "foreign").await?;
@@ -243,7 +239,7 @@ pub async fn get_mining_stats(dashboard: Arc>) -> Result<(), an
// KG/s
if hashrate > 1000.0 {
- data.hashrate = format!("{:.2} KG/s", hashrate / 1000.0);
+ data.hashrate = format!("{:.2} kG/s", hashrate / 1000.0);
// G/s
} else {
data.hashrate = format!("{:.2} G/s", hashrate);
From 9f3446ddf29eebb5f8f2e5b773c5e7049b79a800 Mon Sep 17 00:00:00 2001
From: aglkm <39521015+aglkm@users.noreply.github.com>
Date: Wed, 19 Jun 2024 16:23:00 +0300
Subject: [PATCH 12/13] enhanced logging and external connection
---
Cargo.lock | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
Cargo.toml | 1 +
Explorer.toml | 21 ++++++++++--
README.md | 9 +++--
Rocket.toml | 1 -
src/main.rs | 17 +++++----
src/requests.rs | 56 +++++++++++++++++++++---------
7 files changed, 163 insertions(+), 33 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index daf2511..34f5b43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,6 +41,55 @@ dependencies = [
"libc",
]
+[[package]]
+name = "anstream"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "anyhow"
version = "1.0.86"
@@ -234,6 +283,12 @@ dependencies = [
"phf_codegen",
]
+[[package]]
+name = "colorchoice"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+
[[package]]
name = "colored"
version = "2.1.0"
@@ -482,6 +537,29 @@ dependencies = [
"cfg-if",
]
+[[package]]
+name = "env_filter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
[[package]]
name = "equivalent"
version = "1.0.1"
@@ -743,6 +821,7 @@ dependencies = [
"colored",
"config",
"either",
+ "env_logger",
"fs_extra",
"futures",
"humantime",
@@ -982,6 +1061,12 @@ dependencies = [
"windows-sys 0.52.0",
]
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
[[package]]
name = "itoa"
version = "1.0.11"
@@ -2540,6 +2625,12 @@ dependencies = [
"percent-encoding",
]
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
[[package]]
name = "valuable"
version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 648f13c..49b7b81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,6 +20,7 @@ lazy_static = "1.4.0"
shellexpand = "3.1.0"
either = "1.11.0"
anyhow = "1.0.86"
+env_logger = "0.11.3"
[dependencies.reqwest]
version = "0.11.23"
diff --git a/Explorer.toml b/Explorer.toml
index ac73530..a5cf240 100644
--- a/Explorer.toml
+++ b/Explorer.toml
@@ -7,13 +7,13 @@ port = "3413"
# Node protocol. Either HTTP or HTTPS.
proto = "http"
-# API username.
+# API username. Comment out if user is not required.
user = "grin"
-# API secret path.
+# API secret path. Comment out if secret is not required.
api_secret_path = "~/.grin/main/.api_secret"
-# Foreign API secret path.
+# Foreign API secret path. Comment out if secret is not required.
foreign_api_secret_path = "~/.grin/main/.foreign_api_secret"
# Path to Grin directory.
@@ -26,6 +26,21 @@ coingecko_api = "enabled"
public_api = "enabled"
+# Grinnode config
+# ip = "grinnode.live"
+# port = "3413"
+# proto = "https"
+# coingecko_api = "enabled"
+# public_api = "enabled"
+
+
+# Grincoin config
+# ip = "grincoin.org"
+# proto = "https"
+# coingecko_api = "enabled"
+# public_api = "enabled"
+
+
# Testnet config
# ip = "127.0.0.1"
# port = "13413"
diff --git a/README.md b/README.md
index 3c8d9f1..c2cc644 100644
--- a/README.md
+++ b/README.md
@@ -22,15 +22,14 @@ Grin is the very first, simple and fair MimbleWimble blockchain implementation.
cd grin-explorer
cargo build --release
```
-4. Run executable: `./target/release/grin-explorer`
+4. Run executable: `RUST_LOG=rocket=warn,grin_explorer ./target/release/grin-explorer`
You will see the following output:
```
- [ INFO ] Starting up Explorer.
- [ INFO ] Starting up Rocket engine.
- 🚀 Rocket has launched from http://127.0.0.1:8000
- [ OK ] Explorer Ready.
+ [2024-06-19T13:12:34Z INFO grin_explorer] starting up.
+ [2024-06-19T13:12:34Z WARN rocket::launch] 🚀 Rocket has launched from http://127.0.0.1:8000
+ [2024-06-19T13:12:34Z INFO grin_explorer] ready.
```
5. Open explorer in your browser: http://127.0.0.1:8000
diff --git a/Rocket.toml b/Rocket.toml
index 6077f33..1da001a 100644
--- a/Rocket.toml
+++ b/Rocket.toml
@@ -1,6 +1,5 @@
[default]
address = "127.0.0.1"
-log_level = "critical"
# Uncomment and change default port number (8000) if another instance of the explorer is needed to run.
# E.g. Mainnet (8000) and Testnet (8001) instances.
diff --git a/src/main.rs b/src/main.rs
index c452509..a7c9f72 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,6 @@ use rocket::fs::FileServer;
use rocket::State;
use std::sync::{Arc, Mutex};
use std::time::Duration;
-use colored::Colorize;
use rocket::tokio;
use rocket::response::Redirect;
use either::Either;
@@ -396,7 +395,11 @@ fn last_block_age(blocks: &State>>>) -> String {
fn disk_usage(dashboard: &State>>) -> String {
let data = dashboard.lock().unwrap();
- format!("{} GB", data.disk_usage)
+ if data.disk_usage.is_empty() == false {
+ return format!("{} GB", data.disk_usage);
+ } else {
+ return format!(">>) -> String {
// Main
#[rocket::main]
async fn main() {
- println!("{} Starting up Explorer.", "[ INFO ]".cyan());
+ env_logger::init();
+
+ info!("starting up.");
let dash = Arc::new(Mutex::new(Dashboard::new()));
let dash_clone = dash.clone();
@@ -622,12 +627,12 @@ async fn main() {
Ok(_v) => {
if ready == false {
ready = true;
- println!("{} Explorer Ready.", "[ OK ]".green());
+ info!("ready.");
}
},
Err(e) => {
ready = false;
- println!("{} {}.", "[ ERROR ]".red(), e);
+ error!("{}", e);
},
}
@@ -635,8 +640,6 @@ async fn main() {
}
});
- println!("{} Starting up Rocket engine.", "[ INFO ]".cyan());
-
// Starting Rocket engine.
let _ = rocket::build()
.manage(dash)
diff --git a/src/requests.rs b/src/requests.rs
index 38264e2..c26acec 100644
--- a/src/requests.rs
+++ b/src/requests.rs
@@ -43,11 +43,17 @@ lazy_static! {
}
}
- cfg.api_secret = fs::read_to_string(format!("{}",
- shellexpand::tilde(&cfg.api_secret_path))).unwrap();
- cfg.foreign_api_secret = fs::read_to_string(format!("{}",
- shellexpand::tilde(&cfg.foreign_api_secret_path))).unwrap();
- cfg.grin_dir = format!("{}", shellexpand::tilde(&cfg.grin_dir));
+ if cfg.api_secret_path.is_empty() == false {
+ cfg.api_secret = fs::read_to_string(format!("{}", shellexpand::tilde(&cfg.api_secret_path))).unwrap();
+ }
+
+ if cfg.foreign_api_secret_path.is_empty() == false {
+ cfg.foreign_api_secret = fs::read_to_string(format!("{}", shellexpand::tilde(&cfg.foreign_api_secret_path))).unwrap();
+ }
+
+ if cfg.grin_dir.is_empty() == false {
+ cfg.grin_dir = format!("{}", shellexpand::tilde(&cfg.grin_dir));
+ }
cfg
};
@@ -59,13 +65,16 @@ pub async fn call(method: &str, params: &str, id: &str, rpc_type: &str) -> Resul
let rpc_url;
let secret;
- if rpc_type == "owner" {
- rpc_url = format!("{}://{}:{}/v2/owner", CONFIG.proto, CONFIG.ip, CONFIG.port);
- secret = CONFIG.api_secret.clone();
+ if CONFIG.port.is_empty() == false {
+ rpc_url = format!("{}://{}:{}/v2/{}", CONFIG.proto, CONFIG.ip, CONFIG.port, rpc_type);
+ } else {
+ rpc_url = format!("{}://{}/v2/{}", CONFIG.proto, CONFIG.ip, rpc_type);
}
- else {
- rpc_url = format!("{}://{}:{}/v2/foreign", CONFIG.proto, CONFIG.ip, CONFIG.port);
- secret = CONFIG.foreign_api_secret.clone();
+
+ if rpc_type == "owner" {
+ secret = CONFIG.api_secret.clone();
+ } else {
+ secret = CONFIG.foreign_api_secret.clone();
}
let client = reqwest::Client::new();
@@ -76,6 +85,11 @@ pub async fn call(method: &str, params: &str, id: &str, rpc_type: &str) -> Resul
.send()
.await?;
+ match result.error_for_status_ref() {
+ Ok(_res) => (),
+ Err(err) => { error!("rpc failed, status code: {:?}", err.status().unwrap()); },
+ }
+
let val: Value = serde_json::from_str(&result.text().await.unwrap())?;
Ok(val)
@@ -173,7 +187,7 @@ pub async fn get_market(dashboard: Arc>) -> Result<(), Error> {
if CONFIG.coingecko_api == "enabled" && val != Value::Null {
// Check if CoingGecko API returned error
if let Some(status) = val.get("status") {
- println!("{} {}.", "[ WARNING ]".yellow(), status["error_message"].as_str().unwrap().to_string());
+ warn!("{}", status["error_message"].as_str().unwrap().to_string());
} else {
data.price_usd = format!("{:.3}", val["grin"]["usd"].to_string().parse::().unwrap());
data.price_btc = format!("{:.8}", val["grin"]["btc"].to_string().parse::().unwrap());
@@ -205,7 +219,13 @@ pub fn get_disk_usage(dashboard: Arc>) -> Result<(), Error> {
match get_size(chain_dir.clone()) {
Ok(chain_size) => data.disk_usage = format!("{:.2}", (chain_size as f64) / 1000.0 / 1000.0 / 1000.0),
- Err(e) => println!("{} {}: \"{}\".", "[ ERROR ]".red(), e, chain_dir),
+ Err(e) => {
+ if CONFIG.ip == "127.0.0.1" || CONFIG.ip == "0.0.0.0" {
+ error!("{}: \"{}\"", e, chain_dir);
+ } else {
+ // Ignore error for external node connection
+ }
+ },
}
Ok(())
@@ -237,7 +257,7 @@ pub async fn get_mining_stats(dashboard: Arc>) -> Result<(), an
// https://forum.grin.mw/t/difference-c31-and-c32-c33/7018/7
let hashrate = (net_diff as f64) * 42.0 / 60.0 / 16384.0;
- // KG/s
+ // kG/s
if hashrate > 1000.0 {
data.hashrate = format!("{:.2} kG/s", hashrate / 1000.0);
// G/s
@@ -255,10 +275,12 @@ pub async fn get_mining_stats(dashboard: Arc>) -> Result<(), an
// Assuming $0.07 per kW/h
data.production_cost = format!("{:.3}", 120.0 / 1000.0 * 0.07 * (1.0 / coins_per_hour));
- data.reward_ratio = format!("{:.2}", data.price_usd.parse::().unwrap()
+ if data.price_usd.is_empty() == false {
+ data.reward_ratio = format!("{:.2}", data.price_usd.parse::().unwrap()
/ data.production_cost.parse::().unwrap());
- data.breakeven_cost = format!("{:.2}", data.price_usd.parse::().unwrap()
- / (120.0 / 1000.0 * (1.0 / coins_per_hour)));
+ data.breakeven_cost = format!("{:.2}", data.price_usd.parse::().unwrap()
+ / (120.0 / 1000.0 * (1.0 / coins_per_hour)));
+ }
}
}
}
From 4aaf39cf5f7c5c01d305ac1a6197497be3445ba7 Mon Sep 17 00:00:00 2001
From: aglkm <39521015+aglkm@users.noreply.github.com>
Date: Thu, 20 Jun 2024 15:16:34 +0300
Subject: [PATCH 13/13] return back search by unspent output feature
---
src/data.rs | 22 +++++++++++++
src/main.rs | 67 +++++++++++++++++++++++++++++---------
src/requests.rs | 36 ++++++++++++++++++++
templates/error.html.tera | 1 +
templates/output.html.tera | 52 +++++++++++++++++++++++++++++
templates/search.html.tera | 1 +
6 files changed, 163 insertions(+), 16 deletions(-)
create mode 100644 templates/output.html.tera
diff --git a/src/data.rs b/src/data.rs
index 5622eea..8f0b454 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -188,3 +188,25 @@ impl ExplorerConfig {
}
}
+// Output data
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Output {
+ pub height: String,
+ pub commit: String,
+ pub out_type: String,
+ pub status: String,
+ pub raw_data: String,
+}
+
+impl Output {
+ pub fn new() -> Output {
+ Output {
+ height: String::new(),
+ commit: String::new(),
+ out_type: String::new(),
+ status: String::new(),
+ raw_data: String::new(),
+ }
+ }
+}
+
diff --git a/src/main.rs b/src/main.rs
index a7c9f72..77afd63 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,6 +18,7 @@ use crate::data::Dashboard;
use crate::data::Block;
use crate::data::Transactions;
use crate::data::Kernel;
+use crate::data::Output;
use crate::requests::CONFIG;
@@ -148,11 +149,33 @@ async fn kernel(excess: &str) -> Template {
}
+// Rendering page for a specified output.
+#[get("/output/")]
+async fn output(commit: &str) -> Template {
+ let mut output = Output::new();
+
+ let _ = requests::get_output(&commit, &mut output).await;
+
+ if output.commit.is_empty() == false {
+ return Template::render("output", context! {
+ route: "output",
+ cg_api: CONFIG.coingecko_api.clone(),
+ output,
+ })
+ }
+
+ return Template::render("error", context! {
+ route: "error",
+ cg_api: CONFIG.coingecko_api.clone(),
+ })
+}
+
+
// Handling search request.
// Using Option<&str> to match '/search' query without input params.
// https://github.com/rwf2/Rocket/issues/608
#[get("/search? {
+pub async fn search(input: Option<&str>) -> Either {
// Unwrap Option and forward to Search page if no parameters
let input = match input {
Some(value) => value,
@@ -173,9 +196,26 @@ fn search(input: Option<&str>) -> Either {
} else if input.len() == 64 {
return Either::Right(Redirect::to(uri!(block_header_by_hash(input))));
- // Kernel
+ // Kernel or Unspent Output
} else if input.len() == 66 {
- return Either::Right(Redirect::to(uri!(kernel(input))));
+ // First search for Kernel.
+ // If found, redirect to Kernel page, otherwise search for Unspent Output.
+ // As we can't distinguish between Kernel and Output, this will produce a redundant
+ // get_kernel call, but will allow for better UI (no need to ask user to input the type
+ // of the search request).
+ let mut kernel = Kernel::new();
+
+ let _ = requests::get_kernel(&input, &mut kernel).await;
+
+ if kernel.excess.is_empty() == false {
+ // Here we are redirecting to kernel page and call get_kernel again there.
+ // Kernel page is a separate route and we want it to be accessed directly and
+ // via search functionality.
+ return Either::Right(Redirect::to(uri!(kernel(input))));
+ } else {
+ // If Kernel not found, then search for Unspent Output
+ return Either::Right(Redirect::to(uri!(output(input))));
+ }
}
}
@@ -222,8 +262,7 @@ async fn api_owner(data: &str) -> String {
// Foreign API.
-// All methods are whitelisted, except get_outputs.
-// get_outputs consumes CPU and blocks certain other rpc calls.
+// All methods are whitelisted.
#[post("/v2/foreign", data="")]
async fn api_foreign(data: &str) -> String {
if CONFIG.public_api == "enabled" {
@@ -239,18 +278,14 @@ async fn api_foreign(data: &str) -> String {
_ => return "{\"error\":\"bad syntax\"}".to_string(),
};
- if method != "get_outputs" {
- let resp = requests::call(method, v["params"].to_string().as_str(), v["id"].to_string().as_str(), "foreign").await;
+ let resp = requests::call(method, v["params"].to_string().as_str(), v["id"].to_string().as_str(), "foreign").await;
- let result = match resp {
- Ok(value) => value,
- Err(_err) => return "{\"error\":\"rpc call failed\"}".to_string(),
- };
+ let result = match resp {
+ Ok(value) => value,
+ Err(_err) => return "{\"error\":\"rpc call failed\"}".to_string(),
+ };
- return result.to_string();
- }
-
- "{\"error\":\"not allowed\"}".to_string()
+ return result.to_string();
} else {
"{\"error\":\"not allowed\"}".to_string()
}
@@ -654,7 +689,7 @@ async fn main() {
block_weight, block_details_by_height, block_header_by_hash,
soft_supply, production_cost, reward_ratio, breakeven_cost,
last_block_age, block_list_by_height, block_list_index, search, kernel,
- api_owner, api_foreign])
+ output, api_owner, api_foreign])
.mount("/static", FileServer::from("static"))
.attach(Template::fairing())
.launch()
diff --git a/src/requests.rs b/src/requests.rs
index c26acec..9681f5a 100644
--- a/src/requests.rs
+++ b/src/requests.rs
@@ -17,6 +17,7 @@ use crate::data::Block;
use crate::data::Transactions;
use crate::data::ExplorerConfig;
use crate::data::Kernel;
+use crate::data::Output;
// Static explorer config structure
@@ -419,6 +420,41 @@ pub async fn get_block_header(hash: &str, height: &mut String)
}
+// Get output.
+pub async fn get_output(commit: &str, output: &mut Output) -> Result<(), anyhow::Error> {
+ // First check whether output is broadcasted but not confirmed yet (in mempool)
+ let mut resp = call("get_unconfirmed_transactions", "[]", "1", "foreign").await?;
+
+ if resp["result"]["Ok"].is_null() == false {
+ for tx in resp["result"]["Ok"].as_array().unwrap() {
+ for out in tx["tx"]["body"]["outputs"].as_array().unwrap() {
+ if out["commit"].as_str().unwrap() == commit {
+ // Only Plain outputs in the mempool
+ output.out_type = "Plain".to_string();
+ output.commit = out["commit"].as_str().unwrap().to_string();
+ output.status = "Unconfirmed".to_string();
+ // Found it, no need to continue
+ return Ok(());
+ }
+ }
+ }
+ }
+
+ let params = &format!("[[\"{}\"], null, null, true, true]", commit)[..];
+
+ resp = call("get_outputs", params, "1", "foreign").await?;
+
+ if resp["result"]["Ok"][0].is_null() == false {
+ output.height = resp["result"]["Ok"][0]["block_height"].to_string();
+ output.commit = resp["result"]["Ok"][0]["commit"].as_str().unwrap().to_string();
+ output.out_type = resp["result"]["Ok"][0]["output_type"].as_str().unwrap().to_string();
+ output.raw_data = serde_json::to_string_pretty(&resp).unwrap()
+ }
+
+ Ok(())
+}
+
+
// Get kernel.
pub async fn get_kernel(excess: &str, kernel: &mut Kernel) -> Result<(), anyhow::Error> {
// First check whether kernel is broadcasted but not confirmed yet (in mempool)
diff --git a/templates/error.html.tera b/templates/error.html.tera
index 536b6b0..d44052e 100644
--- a/templates/error.html.tera
+++ b/templates/error.html.tera
@@ -11,6 +11,7 @@