Dev (#419)

.gitignore

@@ -113,5 +113,5 @@ $RECYCLE.BIN/
 
 logs/
 
-src/MiningCore/config\.json
-/src/MiningCore/config2.json
+src/Miningcore/config.json
+src/Miningcore/config2.json

src/Miningcore/Api/Extensions/MiningPoolExtensions.cs

@@ -12,10 +12,11 @@ namespace Miningcore.Api.Extensions
 {
     public static class MiningPoolExtensions
     {
-        public static PoolInfo ToPoolInfo(this PoolConfig poolConfig, 
+        public static PoolInfo ToPoolInfo(this PoolConfig poolConfig,
             IComponentContext ctx, IMapper mapper, Persistence.Model.PoolStats stats, IMiningPool pool)
         {
-            var poolInfo = mapper.Map<PoolInfo>(poolConfig);
+            var poolInfo = mapper.Map<PoolInfo>(poolConfig,
+                options=> options.Items.Add(AutoMapperProfile.AutofacContextItemName, ctx));
 
             // enrich with basic information
             poolInfo.Coin.Algorithm = GetPoolAlgorithm(ctx, poolConfig);

src/Miningcore/AutoMapperProfile.cs

@@ -18,6 +18,7 @@ portions of the Software.
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+using Autofac;
 using AutoMapper;
 using Miningcore.Blockchain;
 using Miningcore.Configuration;
@@ -29,6 +30,8 @@ namespace Miningcore
 {
     public class AutoMapperProfile : Profile
     {
+        public const string AutofacContextItemName = "ctx";
+
         public AutoMapperProfile()
         {
             //////////////////////
@@ -52,7 +55,17 @@ public AutoMapperProfile()
                 .ForMember(dest => dest.Created, opt => opt.Ignore());
 
             // API
-            CreateMap<PoolConfig, Api.Responses.PoolInfo>();
+            CreateMap<CoinTemplate, Api.Responses.ApiCoinConfig>()
+                .ForMember(dest => dest.Type, opt => opt.MapFrom(src => src.Symbol))
+                .ForMember(dest => dest.Algorithm, opt => opt.ResolveUsing((src, dst, member, resolutionContext)=>
+                {
+                    var ctx = (IComponentContext) resolutionContext.Items[AutofacContextItemName];
+                    return src.GetAlgorithmName(ctx);
+                }));
+
+            CreateMap<PoolConfig, Api.Responses.PoolInfo>()
+                .ForMember(dest => dest.Coin, opt => opt.MapFrom(src => src.Template));
+
             CreateMap<PoolStats, Api.Responses.PoolInfo>();
             CreateMap<PoolStats, Api.Responses.AggregatedPoolStats>();
             CreateMap<Block, Api.Responses.Block>();

src/Miningcore/Blockchain/Equihash/Subfamily/BitcoinGold/BitcoinGoldJob.cs

@@ -64,8 +64,6 @@ private Network NBitcoinNetworkType
             }
         }
 
-        #region Overrides of ZCashJob
-
         protected Transaction CreateOutputTransaction()
         {
             rewardToPool = new Money(BlockTemplate.CoinbaseValue, MoneyUnit.Satoshi);
@@ -241,7 +239,5 @@ public override void Init(EquihashBlockTemplate blockTemplate, string jobId,
                 false
             };
         }
-
-        #endregion
     }
 }

src/Miningcore/Program.cs

@@ -713,7 +713,7 @@ private static void OnProcessExit(object sender, EventArgs e)
 
         private static void Shutdown()
         {
-            logger.Info(() => "Shutdown ...");
+            logger?.Info(() => "Shutdown ...");
             Console.WriteLine("Shutdown...");
 
             foreach(var pool in pools.Values)

src/Miningcore/coins.json

@@ -413,7 +413,7 @@
       ]
     },
     "coinbaseTxVersion": 2,
-    "coinbaseTxAppendData": "Flo MiningCore",
+    "coinbaseTxAppendData": "Flo Miningcore",
     "shareMultiplier": 65536,
     "hashrateMultiplier": 1.5,
     "explorerBlockLink": "https://florincoin.info/block/0",