Dev

src/MiningCore.Tests/Blockchain/Bitcoin/BitcoinJobTests.cs

@@ -42,7 +42,7 @@ public void BitcoinJob_Should_Accept_Valid_Share()
             var clock = new MockMasterClock { CurrentTime = DateTimeOffset.FromUnixTimeSeconds(1508869874).UtcDateTime };
 
             job.Init(bt, "1", poolConfig, clusterConfig, clock, poolAddressDestination, BitcoinNetworkType.RegTest,
-                false, 1, sha256d, sha256d, sha256dReverse);
+                false, 1, 1, sha256d, sha256d, sha256dReverse);
 
             // set clock to submission time
             clock.CurrentTime = DateTimeOffset.FromUnixTimeSeconds(1508869907).UtcDateTime;
@@ -78,7 +78,7 @@ public void BitcoinJob_Should_Not_Accept_Invalid_Share()
             var clock = new MockMasterClock { CurrentTime = DateTimeOffset.FromUnixTimeSeconds(1508869874).UtcDateTime };
 
             job.Init(bt, "1", poolConfig, clusterConfig, clock, poolAddressDestination, BitcoinNetworkType.RegTest,
-                false, 1, sha256d, sha256d, sha256dReverse);
+                false, 1, 1, sha256d, sha256d, sha256dReverse);
 
             // set clock to submission time
             clock.CurrentTime = DateTimeOffset.FromUnixTimeSeconds(1508869907).UtcDateTime;

src/MiningCore.Tests/Blockchain/ZCash/ZCashJobTests.cs

@@ -49,7 +49,7 @@ public void ZCashJob_Testnet_Validate_FoundersRewardAddress_At_Height()
             var clock = new MockMasterClock { CurrentTime = DateTimeOffset.FromUnixTimeSeconds(1508869874).UtcDateTime };
 
             job.Init(bt, "1", poolConfig, clusterConfig, clock, poolAddressDestination, BitcoinNetworkType.Test,
-                false, 1, sha256d, sha256d, sha256dReverse);
+                false, 1, 1, sha256d, sha256d, sha256dReverse);
 
             bt.Height = 1;
             Assert.Equal(job.GetFoundersRewardAddress(), "t2UNzUUx8mWBCRYPRezvA363EYXyEpHokyi");

src/MiningCore.Tests/Crypto/HashingTests.cs

@@ -33,6 +33,22 @@ public void Blake_Hash_Should_Throw_On_Null_Input()
             Assert.Throws<ArgumentNullException>(() => hasher.Digest(null));
         }
 
+        [Fact]
+        public void Blake2s_Hash_Should_Match()
+        {
+            var hasher = new Blake2s();
+            var result = hasher.Digest(testValue2).ToHexString();
+
+            Assert.Equal("c3ee938582d70ccd9a323b6097357449365d1fdfbbe2ecd7ee44e4bdbbb24392", result);
+        }
+
+        [Fact]
+        public void Blake2s_Hash_Should_Throw_On_Null_Input()
+        {
+            var hasher = new Blake2s();
+            Assert.Throws<ArgumentNullException>(() => hasher.Digest(null));
+        }
+
         [Fact]
         public void Groestl_Hash_Should_Match()
         {

src/MiningCore/Api/ApiServer.cs

@@ -412,6 +412,8 @@ private async Task GetMinerInfoAsync(HttpContext context, Match m)
                 return;
             }
 
+            var perfMode = context.GetQueryParameter<string>("perfMode", "day");
+
             var statsResult = cf.RunTx((con, tx) =>
                 statsRepo.GetMinerStats(con, tx, pool.Id, address), true, IsolationLevel.Serializable);
 
@@ -432,7 +434,7 @@ private async Task GetMinerInfoAsync(HttpContext context, Match m)
                         stats.LastPaymentLink = string.Format(baseUrl, statsResult.LastPayment.TransactionConfirmationData);
                 }
 
-                stats.Performance24H = GetMinerPerformanceInternal("day", pool, address);
+                stats.PerformanceSamples = GetMinerPerformanceInternal(perfMode, pool, address);
             }
 
             await SendJson(context, stats);

src/MiningCore/Api/Extensions/MiningPoolExtensions.cs

@@ -42,13 +42,10 @@ public static PoolInfo ToPoolInfo(this PoolConfig pool, IMapper mapper, Persiste
 
         private static string GetPoolAlgorithm(PoolConfig pool)
         {
-            var result = pool.Coin.Algorithm;
+            string result = null;
 
-            if (string.IsNullOrEmpty(result))
-            {
-                if (CoinMetaData.CoinAlgorithm.TryGetValue(pool.Coin.Type, out var getter))
-                    result = getter(pool.Coin.Type);
-            }
+            if (CoinMetaData.CoinAlgorithm.TryGetValue(pool.Coin.Type, out var getter))
+                result = getter(pool.Coin.Type, pool.Coin.Algorithm);
 
             // Capitalize
             if (!string.IsNullOrEmpty(result) && result.Length > 1)

src/MiningCore/Api/Responses/GetMinerStatsResponse.cs

@@ -50,6 +50,6 @@ public class MinerStats
         public DateTime? LastPayment { get; set; }
         public string LastPaymentLink { get; set; }
         public WorkerPerformanceStatsContainer Performance { get; set; }
-        public WorkerPerformanceStatsContainer[] Performance24H { get; set; }
+        public WorkerPerformanceStatsContainer[] PerformanceSamples { get; set; }
     }
 }

src/MiningCore/Blockchain/Bitcoin/BitcoinConstants.cs

@@ -110,13 +110,17 @@ public static class BitcoinCommands
         public const string GetMiningInfo = "getmininginfo";
         public const string GetPeerInfo = "getpeerinfo";
         public const string ValidateAddress = "validateaddress";
-        public const string GetDifficulty = "getdifficulty";
         public const string GetBlockTemplate = "getblocktemplate";
         public const string GetBlockSubsidy = "getblocksubsidy";
         public const string SubmitBlock = "submitblock";
         public const string GetBlockchainInfo = "getblockchaininfo";
         public const string GetBlock = "getblock";
         public const string GetTransaction = "gettransaction";
         public const string SendMany = "sendmany";
+
+        // Legacy commands
+        public const string GetInfo = "getinfo";
+        public const string GetDifficulty = "getdifficulty";
+        public const string GetConnectionCount = "getconnectioncount";
     }
 }

src/MiningCore/Blockchain/Bitcoin/BitcoinJob.cs

@@ -46,6 +46,7 @@ public class BitcoinJob<TBlockTemplate>
         protected IMasterClock clock;
         protected IHashAlgorithm coinbaseHasher;
         protected double shareMultiplier;
+        protected decimal blockRewardMultiplier;
         protected int extraNoncePlaceHolderLength;
         protected IHashAlgorithm headerHasher;
         protected bool isPoS;
@@ -239,7 +240,7 @@ protected virtual Script GenerateScriptSigInitial()
 
         protected virtual Transaction CreateOutputTransaction()
         {
-            rewardToPool = new Money(BlockTemplate.CoinbaseValue, MoneyUnit.Satoshi);
+            rewardToPool = new Money(BlockTemplate.CoinbaseValue * blockRewardMultiplier, MoneyUnit.Satoshi);
 
             var tx = new Transaction();
 
@@ -411,7 +412,7 @@ protected virtual byte[] BuildRawTransactionBuffer()
         public virtual void Init(TBlockTemplate blockTemplate, string jobId,
             PoolConfig poolConfig, ClusterConfig clusterConfig, IMasterClock clock,
             IDestination poolAddressDestination, BitcoinNetworkType networkType,
-            bool isPoS, double shareMultiplier,
+            bool isPoS, double shareMultiplier, decimal blockrewardMultiplier,
             IHashAlgorithm coinbaseHasher, IHashAlgorithm headerHasher, IHashAlgorithm blockHasher)
         {
             Contract.RequiresNonNull(blockTemplate, nameof(blockTemplate));
@@ -436,6 +437,7 @@ public virtual void Init(TBlockTemplate blockTemplate, string jobId,
             extraNoncePlaceHolderLength = BitcoinConstants.ExtranoncePlaceHolderLength;
             this.isPoS = isPoS;
             this.shareMultiplier = shareMultiplier;
+            this.blockRewardMultiplier = blockrewardMultiplier;
 
             this.coinbaseHasher = coinbaseHasher;
             this.headerHasher = headerHasher;