Merge pull request #1318 from oliverw/dev

Dev r72
oliverw · Jul 17, 2022 · 8d40733 · 8d40733
2 parents 0989ed7 + c58a647
commit 8d40733
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/Miningcore/Blockchain/Bitcoin/BitcoinPayoutHandler.cs b/src/Miningcore/Blockchain/Bitcoin/BitcoinPayoutHandler.cs
@@ -205,7 +205,7 @@ public virtual async Task PayoutAsync(IMiningPool pool, Balance[] balances, Canc
 
         var comment = $"{identifier} Payment";
 
-        if(!(extraPoolConfig?.HasBrokenSendMany == true || poolConfig.Template.As<BitcoinTemplate>().HasBrokenSendMany))
+        if(!(extraPoolConfig?.HasBrokenSendMany == true || poolConfig.Template is BitcoinTemplate { HasBrokenSendMany: true }))
         {
             if(extraPoolPaymentProcessingConfig?.MinersPayTxFees == true)
             {

diff --git a/src/Miningcore/Blockchain/Ergo/ErgoJobManager.cs b/src/Miningcore/Blockchain/Ergo/ErgoJobManager.cs
@@ -364,11 +364,16 @@ protected override async Task PostStartInitAsync(CancellationToken ct)
         blockVersion = info.Parameters.BlockVersion;
 
         // chain detection
-        var m = ErgoConstants.RegexChain.Match(info.Name);
-        if(!m.Success)
-            throw new PoolStartupException($"Unable to identify network type ({info.Name}", poolConfig.Id);
+        if(!string.IsNullOrEmpty(info.Network))
+            network = info.Network.ToLower();
+        else
+        {
+            var m = ErgoConstants.RegexChain.Match(info.Name);
+            if(!m.Success)
+                throw new PoolStartupException($"Unable to identify network type ({info.Name}", poolConfig.Id);
 
-        network = m.Groups[1].Value.ToLower();
+            network = m.Groups[1].Value.ToLower();
+        }
 
         // Payment-processing setup
         if(clusterConfig.PaymentProcessing?.Enabled == true && poolConfig.PaymentProcessing?.Enabled == true)

diff --git a/src/Miningcore/Blockchain/Ergo/RPC/ErgoClient.cs b/src/Miningcore/Blockchain/Ergo/RPC/ErgoClient.cs
@@ -10897,6 +10897,10 @@ public partial class NodeInfo
         [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
         public string Name { get; set; } = default!;
 
+        [Newtonsoft.Json.JsonProperty("network", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
+        public string Network { get; set; } = default!;
+
         [Newtonsoft.Json.JsonProperty("appVersion", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
         public string AppVersion { get; set; } = default!;