Merge pull request #1130 from oliverw/oliverw

- Implement support for Postgres TLS
- Don't expose Ergo Wallet Password through API
- Don't expose confidential Tls information through API
- Fixed a bug that would delay job updates to all miners if the previous update was delayed due to a dead connection
- Remove artificial outbound stratum message length and optimize memory usage
- Re-introduce Ethereum Job backlog
- Build script fixes (@warren-ru)

Author: Oliver Weichhold

src/.idea/.idea.Miningcore/.idea/dataSources.xml

@@ -66,7 +66,7 @@ public async Task<decimal> GetMinerBalanceAsync(string poolId, string address)
         if(string.IsNullOrEmpty(address))
             throw new ApiException("Invalid or missing miner address", HttpStatusCode.NotFound);
 
-        var result = await cf.Run(con=> minerRepo.GetSettings(con, null, pool.Id, address));
+        var result = await cf.Run(con=> minerRepo.GetSettingsAsync(con, null, pool.Id, address));
 
         if(result == null)
             throw new ApiException("No settings found", HttpStatusCode.NotFound);
@@ -98,9 +98,9 @@ public async Task<decimal> GetMinerBalanceAsync(string poolId, string address)
 
         var result = await cf.RunTx(async (con, tx) =>
         {
-            await minerRepo.UpdateSettings(con, tx, mapped);
+            await minerRepo.UpdateSettingsAsync(con, tx, mapped);
 
-            return await minerRepo.GetSettings(con, tx, mapped.PoolId, mapped.Address);
+            return await minerRepo.GetSettingsAsync(con, tx, mapped.PoolId, mapped.Address);
         });
 
         logger.Info(()=> $"Updated settings for pool {pool.Id}, miner {address}");

src/.idea/.idea.Miningcore/.idea/inspectionProfiles/Project_Default.xml

@@ -38,11 +38,12 @@ public ClusterApiController(IComponentContext ctx) : base(ctx)
     public async Task<Responses.Block[]> PageBlocksPagedAsync(
         [FromQuery] int page, [FromQuery] int pageSize = 15, [FromQuery] BlockStatus[] state = null)
     {
-        var blockStates = state != null && state.Length > 0 ?
+        var ct = HttpContext.RequestAborted;
+        var blockStates = state is { Length: > 0 } ?
             state :
             new[] { BlockStatus.Confirmed, BlockStatus.Pending, BlockStatus.Orphaned };
 
-        var blocks = (await cf.Run(con => blocksRepo.PageBlocksAsync(con, blockStates, page, pageSize)))
+        var blocks = (await cf.Run(con => blocksRepo.PageBlocksAsync(con, blockStates, page, pageSize, ct)))
             .Select(mapper.Map<Responses.Block>)
             .Where(x => enabledPools.Contains(x.PoolId))
             .ToArray();

src/.idea/.idea.Miningcore/.idea/sqldialects.xml

@@ -1,7 +1,9 @@
 using AutoMapper;
 using Miningcore.Api.Responses;
 using Miningcore.Blockchain;
+using Miningcore.Blockchain.Ergo.Configuration;
 using Miningcore.Configuration;
+using Miningcore.Extensions;
 using Miningcore.Mining;
 
 namespace Miningcore.Api.Extensions;
@@ -28,9 +30,19 @@ public static PoolInfo ToPoolInfo(this PoolConfig poolConfig, IMapper mapper, Pe
         {
             var extra = poolInfo.PaymentProcessing.Extra;
 
-            //extra.StripValue(nameof(EthereumPoolPaymentProcessingConfigExtra.CoinbasePassword));
+            extra.StripValue(nameof(ErgoPaymentProcessingConfigExtra.WalletPassword));
         }
 
+        if(poolInfo.Ports != null)
+        {
+            foreach(var port in poolInfo.Ports.Keys)
+            {
+                var portInfo = poolInfo.Ports[port];
+
+                portInfo.TlsPfxFile = null;
+                portInfo.TlsPfxPassword = null;
+            }
+        }
         return poolInfo;
     }
 }

src/Miningcore/Api/Controllers/AdminApiController.cs

@@ -2,7 +2,6 @@
 using Miningcore.Blockchain;
 using Miningcore.Configuration;
 using Miningcore.Mining;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Miningcore.Api.Responses;

src/Miningcore/Api/Controllers/ClusterApiController.cs

@@ -3,6 +3,7 @@
 using Miningcore.Configuration;
 using Miningcore.Persistence.Model;
 using Miningcore.Persistence.Model.Projections;
+using Newtonsoft.Json.Linq;
 using MinerStats = Miningcore.Persistence.Model.Projections.MinerStats;
 
 namespace Miningcore;
@@ -13,6 +14,9 @@ public class AutoMapperProfile : Profile
 
     public AutoMapperProfile()
     {
+        // Fix for Automapper 11 which chokes on recursive objects such as JToken
+        CreateMap<JToken, JToken>().ConvertUsing(x=> x);
+
         //////////////////////
         // outgoing mappings
 

src/Miningcore/Api/Controllers/PoolApiController.cs

@@ -1,12 +1,10 @@
-using JetBrains.Annotations;
 using Miningcore.Configuration;
 
 namespace Miningcore;
 
 public class CoinFamilyAttribute : Attribute
 {
-    [UsedImplicitly]
-    public CoinFamilyAttribute(IDictionary<string, object> values)
+        public CoinFamilyAttribute(IDictionary<string, object> values)
     {
         if(values.ContainsKey(nameof(SupportedFamilies)))
             SupportedFamilies = (CoinFamily[]) values[nameof(SupportedFamilies)];