mirror of
https://github.com/transatoshi-mw/grin-explorer.git
synced 2025-10-21 13:33:41 +00:00
return back search by unspent output feature
This commit is contained in:
22
src/data.rs
22
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(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
67
src/main.rs
67
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/<commit>")]
|
||||
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?<input>")]
|
||||
fn search(input: Option<&str>) -> Either<Template, Redirect> {
|
||||
pub async fn search(input: Option<&str>) -> Either<Template, Redirect> {
|
||||
// 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<Template, Redirect> {
|
||||
} 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="<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()
|
||||
|
@@ -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)
|
||||
|
@@ -11,6 +11,7 @@
|
||||
<div class="value-text"><i class="bi bi-dot"></i> Block Number</div>
|
||||
<div class="value-text"><i class="bi bi-dot"></i> Block Hash</div>
|
||||
<div class="value-text"><i class="bi bi-dot"></i> Kernel</div>
|
||||
<div class="value-text"><i class="bi bi-dot"></i> Unspent Output</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
52
templates/output.html.tera
Normal file
52
templates/output.html.tera
Normal file
@@ -0,0 +1,52 @@
|
||||
{% extends "base" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<code>
|
||||
|
||||
<div class="card rounded-0">
|
||||
<div class="card-body">
|
||||
<div class="d-flex justify-content-between">
|
||||
<div class="darkorange-text"><i class="bi bi-card-text"></i> OUTPUT</div>
|
||||
{% if output.status == "Unconfirmed" %}
|
||||
<span class="badge text-bg-warning px-2 py-2">UNCONFIRMED</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<br>
|
||||
<div class="d-flex justify-content-between">
|
||||
<div class="value-text">Commitment </div>
|
||||
<div class="value-text text-break text-end">{{ output.commit }}</div>
|
||||
</div>
|
||||
{% if output.status != "Unconfirmed" %}
|
||||
<br>
|
||||
<div class="d-flex justify-content-between">
|
||||
<div class="value-text">Block Height </div>
|
||||
<div class="value-text text-end">
|
||||
<a class="text-decoration-none" href="/block/{{ output.height }}">
|
||||
{{ output.height }} <i class="bi bi-box-arrow-up-right"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<br>
|
||||
<div class="d-flex justify-content-between">
|
||||
<div class="value-text">Type </div>
|
||||
<div class="value-text text-end">{{ output.out_type }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if output.status != "Unconfirmed" %}
|
||||
<div class="card border-top-0 rounded-0">
|
||||
<div class="card-body" align="left">
|
||||
<div class="darkorange-text"><i class="bi bi-layout-text-sidebar-reverse"></i> RAW DATA</div>
|
||||
<br>
|
||||
<div class="value-text">{{ output.raw_data }}</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</code>
|
||||
|
||||
{% endblock %}
|
||||
|
@@ -21,6 +21,7 @@
|
||||
<div class="value-text"><i class="bi bi-dot"></i> Block Number</div>
|
||||
<div class="value-text"><i class="bi bi-dot"></i> Block Hash</div>
|
||||
<div class="value-text"><i class="bi bi-dot"></i> Kernel</div>
|
||||
<div class="value-text"><i class="bi bi-dot"></i> Unspent Output</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
Reference in New Issue
Block a user