8000 Dev r72 by oliverw · Pull Request #1318 · oliverw/miningcore · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Oct 20, 2023. It is now read-only.

Dev r72 #1318

Merged
merged 2 commits into from
Jul 17, 2022
Merged

Dev r72 #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a42cf7a
Fix broken BTG payouts
Jul 17, 2022
c58a647
Make Ergo network detection more reliable
Jul 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Miningcore/Blockchain/Bitcoin/BitcoinPayoutHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
13 changes: 9 additions & 4 deletions src/Miningcore/Blockchain/Ergo/ErgoJobManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions src/Miningcore/Blockchain/Ergo/RPC/ErgoClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!;
Expand Down
0