diff --git a/Cargo.lock b/Cargo.lock index 4ff7c90..74835ea 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=74853d165d1def59ebb799d4679b522acd28116a#74853d165d1def59ebb799d4679b522acd28116a" +source = "git+https://github.com/Neptune-Crypto/neptune-core.git?rev=9602321148095f9991808780b406c1789f9a3a4f#9602321148095f9991808780b406c1789f9a3a4f" dependencies = [ "aead", "aes-gcm", @@ -2021,7 +2021,6 @@ dependencies = [ "html-escaper", "lettre", "neptune-cash", - "rand", "readonly", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index aca9555..2eabf70 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" -# 74853d165d1def59ebb799d4679b522acd28116a = betanet -neptune-cash = {git = "https://github.com/Neptune-Crypto/neptune-core.git", rev = "74853d165d1def59ebb799d4679b522acd28116a"} +# 9602321148095f9991808780b406c1789f9a3a4f = betanet +neptune-cash = {git = "https://github.com/Neptune-Crypto/neptune-core.git", rev = "9602321148095f9991808780b406c1789f9a3a4f"} tarpc = { version = "^0.34", features = [ "tokio1", "serde-transport", diff --git a/templates/web/css/styles.css b/templates/web/css/styles.css index 2be874f..f217407 100644 --- a/templates/web/css/styles.css +++ b/templates/web/css/styles.css @@ -58,6 +58,7 @@ div.indent { display: inline-block; bottom: 0.1em; transition: 0s; + font-weight: bold; } /* Tooltip text */ @@ -73,6 +74,7 @@ div.indent { padding: 5px; border-radius: 6px; border: solid 1px rgb(1, 220, 220); + font-weight: normal; /* Position the tooltip text - see examples below! */ position: absolute; diff --git a/templates/web/html/page/block_info.html b/templates/web/html/page/block_info.html index 38df6f6..57c20c5 100644 --- a/templates/web/html/page/block_info.html +++ b/templates/web/html/page/block_info.html @@ -44,16 +44,38 @@ {{self.block_info.difficulty}} - Mining Reward - {{self.block_info.mining_reward}} + Cumulative Proof-Of-Work + ⓘ + estimated total # of hashes performed by miners from genesis block to this block. + + + {{self.block_info.cumulative_proof_of_work}} + + Coinbase + ⓘ + Total block reward amount paid to the miner(s) that found this block. + + + {{self.block_info.coinbase_amount}} + +%% if self.block_info.coinbase_amount != self.block_info.expected_coinbase_amount() { + + Expected Coinbase + ⓘ + Expected (maximum) block reward amount paid to the miner(s) that find a block at this block-height. + + + {{self.block_info.expected_coinbase_amount()}} + +%% } 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. @@ -62,15 +84,15 @@ %% if self.block_info.is_canonical { - This block is in the canonical blockchain. + Yes. This block is in the canonical blockchain. %% } else { - This block is not in the canonical blockchain. + No. 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. diff --git a/templates/web/html/page/root.html b/templates/web/html/page/root.html index 9c8675c..dd64f38 100644 --- a/templates/web/html/page/root.html +++ b/templates/web/html/page/root.html @@ -22,7 +22,7 @@ The blockchain tip is at height: {{self.tip_height}}
-🛈 + Provide a numeric block height or hexadecimal digest identifier to lookup any block in the Neptune blockchain. @@ -44,7 +44,7 @@ Quick Lookup: UTXO Lookup - 🛈 + An Unspent Transaction Output (UTXO) index can be found in the output of neptune-cli wallet-status. Look for the field: aocl_leaf_index diff --git a/templates/web/html/page/utxo.html b/templates/web/html/page/utxo.html index 0b24cd0..d059cb1 100644 --- a/templates/web/html/page/utxo.html +++ b/templates/web/html/page/utxo.html @@ -12,7 +12,7 @@
- 🛈 + UTXO = Unspent Transaction Output. It represents an output of transaction A which can also be an input to transaction B.