diff --git a/src/CoiniumServ/Coin/Config/CoinConfig.cs b/src/CoiniumServ/Coin/Config/CoinConfig.cs index fd7634b3e..f95c1e0bc 100644 --- a/src/CoiniumServ/Coin/Config/CoinConfig.cs +++ b/src/CoiniumServ/Coin/Config/CoinConfig.cs @@ -22,6 +22,7 @@ #endregion using System; +using CoiniumServ.Daemon.Responses; using Serilog; namespace CoiniumServ.Coin.Config @@ -32,6 +33,7 @@ public class CoinConfig : ICoinConfig public string Name { get; private set; } public string Symbol { get; private set; } public string Algorithm { get; private set; } + public string BlockExplorer { get; private set; } public dynamic Options { get; private set; } public CoinConfig(dynamic config) @@ -41,6 +43,7 @@ public CoinConfig(dynamic config) Name = config.name; Symbol = config.symbol; Algorithm = config.algorithm; + BlockExplorer = string.IsNullOrEmpty(config.blockExplorer) ? "https://altexplorer.net" : config.blockExplorer; Options = config; if (Name == null || Symbol == null || Algorithm == null) // make sure we have valid name, symbol and algorithm data. diff --git a/src/CoiniumServ/Coin/Config/ICoinConfig.cs b/src/CoiniumServ/Coin/Config/ICoinConfig.cs index 1a615c281..daeabb538 100644 --- a/src/CoiniumServ/Coin/Config/ICoinConfig.cs +++ b/src/CoiniumServ/Coin/Config/ICoinConfig.cs @@ -42,6 +42,11 @@ public interface ICoinConfig:IConfig /// string Algorithm { get; } + /// + /// Block explorer for the coin. + /// + string BlockExplorer { get; } + /// /// Extra options provided that will be passed to coin algorithm. /// diff --git a/src/CoiniumServ/Persistance/Blocks/PendingBlock.cs b/src/CoiniumServ/Persistance/Blocks/PendingBlock.cs index c942b5a37..7545de775 100644 --- a/src/CoiniumServ/Persistance/Blocks/PendingBlock.cs +++ b/src/CoiniumServ/Persistance/Blocks/PendingBlock.cs @@ -42,12 +42,12 @@ public BlockStatus Status public string BlockHash { - get { return IsFinalized ? Finalized.BlockHash : "Many.."; } + get { return IsFinalized ? Finalized.BlockHash : Candidates.First().BlockHash; } } public string TransactionHash { - get { return IsFinalized ? Finalized.BlockHash : "Many.."; } + get { return IsFinalized ? Finalized.BlockHash : Candidates.First().TransactionHash; } } public decimal Reward diff --git a/src/CoiniumServ/config/coins/anoncoin.json b/src/CoiniumServ/config/coins/anoncoin.json index fcc48d534..5537bddf9 100644 --- a/src/CoiniumServ/config/coins/anoncoin.json +++ b/src/CoiniumServ/config/coins/anoncoin.json @@ -1,5 +1,6 @@ { "name": "Anoncoin", "symbol": "ANC", - "algorithm": "scrypt" + "algorithm": "scrypt", + "blockExplorer": "http://ancblockchain.com" } \ No newline at end of file diff --git a/src/CoiniumServ/config/coins/bitcoin.json b/src/CoiniumServ/config/coins/bitcoin.json index f0413e78d..5fb561e4a 100644 --- a/src/CoiniumServ/config/coins/bitcoin.json +++ b/src/CoiniumServ/config/coins/bitcoin.json @@ -1,5 +1,6 @@ { "name": "Bitcoin", "symbol": "BTC", - "algorithm": "sha256" + "algorithm": "sha256", + "blockExplorer": "https://blockchain.info" } \ No newline at end of file diff --git a/src/CoiniumServ/config/coins/catcoin.json b/src/CoiniumServ/config/coins/catcoin.json index 6c951e38e..273a2929b 100644 --- a/src/CoiniumServ/config/coins/catcoin.json +++ b/src/CoiniumServ/config/coins/catcoin.json @@ -1,5 +1,6 @@ { "name": "Catcoin", "symbol": "CAT", - "algorithm": "scrypt" + "algorithm": "scrypt", + "blockExplorer": "http://catchain.info" } \ No newline at end of file diff --git a/src/CoiniumServ/config/coins/darkcoin.json b/src/CoiniumServ/config/coins/darkcoin.json index fa806d4b5..cf7c848cd 100644 --- a/src/CoiniumServ/config/coins/darkcoin.json +++ b/src/CoiniumServ/config/coins/darkcoin.json @@ -2,5 +2,6 @@ "name": "Darkcoin", "symbol": "DRK", "algorithm": "x11", + "blockExplorer": "http://explorer.darkcoin.io", "mposDiffMultiplier": 256 } diff --git a/src/CoiniumServ/config/coins/digibyte.json b/src/CoiniumServ/config/coins/digibyte.json index ed65fed61..d3ada82fb 100644 --- a/src/CoiniumServ/config/coins/digibyte.json +++ b/src/CoiniumServ/config/coins/digibyte.json @@ -1,5 +1,6 @@ { "name": "Digibyte", "symbol": "DGB", - "algorithm": "scrypt" + "algorithm": "scrypt", + "blockExplorer": "https://altexplorer.net" } \ No newline at end of file diff --git a/src/CoiniumServ/config/coins/dogecoin.json b/src/CoiniumServ/config/coins/dogecoin.json index 50962d3c4..2b71597d0 100644 --- a/src/CoiniumServ/config/coins/dogecoin.json +++ b/src/CoiniumServ/config/coins/dogecoin.json @@ -2,6 +2,7 @@ "name": "Dogecoin", "symbol": "DOGE", "algorithm": "scrypt", + "blockExplorer": "https://dogechain.info", "peerMagic": "c0c0c0c0", "peerMagicTestnet": "fcc1b7dc" } diff --git a/src/CoiniumServ/config/coins/earthcoin.json b/src/CoiniumServ/config/coins/earthcoin.json index 272ebda3d..52097aeed 100644 --- a/src/CoiniumServ/config/coins/earthcoin.json +++ b/src/CoiniumServ/config/coins/earthcoin.json @@ -1,5 +1,6 @@ { "name": "Earthcoin", "symbol": "EAC", - "algorithm": "scrypt" + "algorithm": "scrypt", + "blockExplorer": "http://earthchain.info" } \ No newline at end of file diff --git a/src/CoiniumServ/config/coins/einsteinium.json b/src/CoiniumServ/config/coins/einsteinium.json index d2575ef45..44977b585 100644 --- a/src/CoiniumServ/config/coins/einsteinium.json +++ b/src/CoiniumServ/config/coins/einsteinium.json @@ -1,5 +1,6 @@ { "name": "Einsteinium", "symbol": "EMC2", - "algorithm": "scrypt" + "algorithm": "scrypt", + "blockExplorer": "https://altexplorer.net" } diff --git a/src/CoiniumServ/config/coins/feathercoin.json b/src/CoiniumServ/config/coins/feathercoin.json index 26959d836..6bef39daa 100644 --- a/src/CoiniumServ/config/coins/feathercoin.json +++ b/src/CoiniumServ/config/coins/feathercoin.json @@ -1,5 +1,6 @@ { "name": "Feathercoin", "symbol": "FTC", - "algorithm": "scrypt" + "algorithm": "scrypt", + "blockExplorer": "https://explorer.feathercoin.com" } diff --git a/src/CoiniumServ/config/coins/litecoin.json b/src/CoiniumServ/config/coins/litecoin.json index 588af554f..23257b933 100644 --- a/src/CoiniumServ/config/coins/litecoin.json +++ b/src/CoiniumServ/config/coins/litecoin.json @@ -2,6 +2,7 @@ "name": "Litecoin", "symbol": "LTC", "algorithm": "scrypt", + "blockExplorer": "http://block-explorer.com", "peerMagic": "fbc0b6db", "peerMagicTestnet": "fcc1b7dc" } \ No newline at end of file diff --git a/src/CoiniumServ/web/default/pool.cshtml b/src/CoiniumServ/web/default/pool.cshtml index 6be7dd3d6..ac63c5b62 100644 --- a/src/CoiniumServ/web/default/pool.cshtml +++ b/src/CoiniumServ/web/default/pool.cshtml @@ -93,7 +93,7 @@ @foreach (var block in Model.Pool.Statistics.Blocks.Latest) { - @block.Height + @block.Height @switch (block.Status) {