diff --git a/Cargo.lock b/Cargo.lock index a04903b..4ff7c90 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1948,7 +1948,7 @@ dependencies = [ [[package]] name = "neptune-cash" version = "0.0.10" -source = "git+https://github.com/Neptune-Crypto/neptune-core.git?rev=dbc660634c27cdd2c65ed760dadc123c244d6cd1#dbc660634c27cdd2c65ed760dadc123c244d6cd1" +source = "git+https://github.com/Neptune-Crypto/neptune-core.git?rev=74853d165d1def59ebb799d4679b522acd28116a#74853d165d1def59ebb799d4679b522acd28116a" dependencies = [ "aead", "aes-gcm", @@ -2021,6 +2021,7 @@ dependencies = [ "html-escaper", "lettre", "neptune-cash", + "rand", "readonly", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 964ac57..aca9555 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,8 +13,8 @@ tokio = { version = "1.37.0", features = ["full", "tracing"] } tracing = "0.1.40" tracing-subscriber = "0.3.18" -# dbc660634c27cdd2c65ed760dadc123c244d6cd1 = betanet -neptune-cash = {git = "https://github.com/Neptune-Crypto/neptune-core.git", rev = "dbc660634c27cdd2c65ed760dadc123c244d6cd1"} +# 74853d165d1def59ebb799d4679b522acd28116a = betanet +neptune-cash = {git = "https://github.com/Neptune-Crypto/neptune-core.git", rev = "74853d165d1def59ebb799d4679b522acd28116a"} tarpc = { version = "^0.34", features = [ "tokio1", "serde-transport", diff --git a/templates/web/html/page/block_info.html b/templates/web/html/page/block_info.html index fe2e73a..38df6f6 100644 --- a/templates/web/html/page/block_info.html +++ b/templates/web/html/page/block_info.html @@ -27,22 +27,6 @@ Digest {{self.block_info.digest.to_hex()}} - - Canonical -🛈 - - The canonical blockchain is the chain with the most accumulated proof-of-work and is considered the official record of transaction history. - - - - -%% if self.block_info.is_canonical { -This block is a link in the canonical blockchain. -%% } else { -This block is not in the canonical blockchain. -%% } - - Created {{self.block_info.timestamp.standard_format()}} @@ -67,6 +51,38 @@ This block is not in the canonical blockchain. Fee {{self.block_info.fee}} + + Canonical + 🛈 + + The canonical blockchain is the chain with the most accumulated proof-of-work and is considered the + official record of transaction history. + + + + + %% if self.block_info.is_canonical { + This block is in the canonical blockchain. + %% } else { + This block is not in the canonical blockchain. + %% } + + + + Sibling Blocks + 🛈 + + Blocks that exist at the same height as this block. Only one sibling can be in the canonical blockchain. + + + + +%% for sibling_digest in self.block_info.sibling_blocks.iter().map(|d| d.to_hex()) { +{{sibling_digest}}
+%% } + + +