Merge pull request #344 from raistlinthewiz/develop

Added block-explorer link support for coin-configs
bonesoul · Aug 7, 2014 · 78c181a · 78c181a
2 parents 6a72bfd + 62b0896
commit 78c181a
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 10 deletions.
diff --git 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
@@ -42,6 +42,11 @@ public interface ICoinConfig:IConfig
         /// </summary>
         string Algorithm { get; }
 
+        /// <summary>
+        /// Block explorer for the coin.
+        /// </summary>
+        string BlockExplorer { get; }
+
         /// <summary>
         /// Extra options provided that will be passed to coin algorithm.
         /// </summary>

diff --git 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
@@ -1,5 +1,6 @@
 {
     "name": "Anoncoin",
     "symbol": "ANC",
-    "algorithm": "scrypt"
+    "algorithm": "scrypt",
+    "blockExplorer": "http://ancblockchain.com"
 }
diff --git 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"
 }
diff --git 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"
 }
diff --git 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
@@ -1,5 +1,6 @@
 {
     "name": "Digibyte",
     "symbol": "DGB",
-    "algorithm": "scrypt"
+    "algorithm": "scrypt",
+    "blockExplorer": "https://altexplorer.net"
 }
diff --git 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
@@ -1,5 +1,6 @@
 {
     "name": "Earthcoin",
     "symbol": "EAC",
-    "algorithm": "scrypt"
+    "algorithm": "scrypt",
+    "blockExplorer": "http://earthchain.info"
 }
diff --git 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
@@ -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
@@ -2,6 +2,7 @@
     "name": "Litecoin",
     "symbol": "LTC",
     "algorithm": "scrypt",
+    "blockExplorer": "http://block-explorer.com",
     "peerMagic": "fbc0b6db",
     "peerMagicTestnet": "fcc1b7dc"
 }
diff --git 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)
                             {
                                 <tr>
-                                    <td><a href="https://chain.so/block/LTCTEST/@block.Height" target="_blank">@block.Height</a></td>
+                                    <td><a href="@Model.Pool.Config.Coin.BlockExplorer/block/@block.BlockHash" target="_blank">@block.Height</a></td>
                                     <td>
                                         @switch (block.Status)
                                         {