Resolve implicit access rules requirements

Directory.Packages.props

@@ -17,7 +17,6 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.13" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
     <PackageVersion Include="Polly" Version="8.3.0" />
     <PackageVersion Include="prometheus-net" Version="8.2.1" />

apps/DataAggregator/packages.lock.json

@@ -458,27 +458,6 @@
           "Newtonsoft.Json": "12.0.1"
         }
       },
-      "Nito.AsyncEx.Tasks": {
-        "type": "Transitive",
-        "resolved": "5.1.2",
-        "contentHash": "jEkCfR2/M26OK/U4G7SEN063EU/F4LiVA06TtpZILMdX/quIHCg+wn31Zerl2LC+u1cyFancjTY3cNAr2/89PA==",
-        "dependencies": {
-          "Nito.Disposables": "2.2.1"
-        }
-      },
-      "Nito.Collections.Deque": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "CU0/Iuv5VDynK8I8pDLwkgF0rZhbQoZahtodfL0M3x2gFkpBRApKs8RyMyNlAi1mwExE4gsmqQXk4aFVvW9a4Q=="
-      },
-      "Nito.Disposables": {
-        "type": "Transitive",
-        "resolved": "2.2.1",
-        "contentHash": "6sZ5uynQeAE9dPWBQGKebNmxbY4xsvcc5VplB5WkYEESUS7oy4AwnFp0FhqxTSKm/PaFrFqLrYr696CYN8cugg==",
-        "dependencies": {
-          "System.Collections.Immutable": "1.7.1"
-        }
-      },
       "Npgsql": {
         "type": "Transitive",
         "resolved": "8.0.2",
@@ -635,7 +614,6 @@
           "Microsoft.Extensions.Hosting": "[8.0.0, )",
           "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )",
           "Newtonsoft.Json": "[13.0.3, )",
-          "Nito.AsyncEx.Coordination": "[5.1.2, )",
           "RadixDlt.CoreApiSdk": "[1.10.0-develop, )"
         }
       },
@@ -831,16 +809,6 @@
         "resolved": "13.0.3",
         "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
-      "Nito.AsyncEx.Coordination": {
-        "type": "CentralTransitive",
-        "requested": "[5.1.2, )",
-        "resolved": "5.1.2",
-        "contentHash": "QMyUfsaxov//0ZMbOHWr9hJaBFteZd66DV1ay4J5wRODDb8+K/uHC7+3VsOflo6SVw/29mu8OWZp8vMDSuzc0w==",
-        "dependencies": {
-          "Nito.AsyncEx.Tasks": "5.1.2",
-          "Nito.Collections.Deque": "1.1.1"
-        }
-      },
       "Npgsql.EntityFrameworkCore.PostgreSQL": {
         "type": "CentralTransitive",
         "requested": "[8.0.2, )",

apps/DatabaseMigrations/packages.lock.json

@@ -391,27 +391,6 @@
           "System.CodeDom": "4.4.0"
         }
       },
-      "Nito.AsyncEx.Tasks": {
-        "type": "Transitive",
-        "resolved": "5.1.2",
-        "contentHash": "jEkCfR2/M26OK/U4G7SEN063EU/F4LiVA06TtpZILMdX/quIHCg+wn31Zerl2LC+u1cyFancjTY3cNAr2/89PA==",
-        "dependencies": {
-          "Nito.Disposables": "2.2.1"
-        }
-      },
-      "Nito.Collections.Deque": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "CU0/Iuv5VDynK8I8pDLwkgF0rZhbQoZahtodfL0M3x2gFkpBRApKs8RyMyNlAi1mwExE4gsmqQXk4aFVvW9a4Q=="
-      },
-      "Nito.Disposables": {
-        "type": "Transitive",
-        "resolved": "2.2.1",
-        "contentHash": "6sZ5uynQeAE9dPWBQGKebNmxbY4xsvcc5VplB5WkYEESUS7oy4AwnFp0FhqxTSKm/PaFrFqLrYr696CYN8cugg==",
-        "dependencies": {
-          "System.Collections.Immutable": "1.7.1"
-        }
-      },
       "Npgsql": {
         "type": "Transitive",
         "resolved": "8.0.2",
@@ -568,7 +547,6 @@
           "Microsoft.Extensions.Hosting": "[8.0.0, )",
           "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )",
           "Newtonsoft.Json": "[13.0.3, )",
-          "Nito.AsyncEx.Coordination": "[5.1.2, )",
           "RadixDlt.CoreApiSdk": "[1.10.0-develop, )"
         }
       },
@@ -756,16 +734,6 @@
         "resolved": "13.0.3",
         "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
-      "Nito.AsyncEx.Coordination": {
-        "type": "CentralTransitive",
-        "requested": "[5.1.2, )",
-        "resolved": "5.1.2",
-        "contentHash": "QMyUfsaxov//0ZMbOHWr9hJaBFteZd66DV1ay4J5wRODDb8+K/uHC7+3VsOflo6SVw/29mu8OWZp8vMDSuzc0w==",
-        "dependencies": {
-          "Nito.AsyncEx.Tasks": "5.1.2",
-          "Nito.Collections.Deque": "1.1.1"
-        }
-      },
       "Npgsql.EntityFrameworkCore.PostgreSQL": {
         "type": "CentralTransitive",
         "requested": "[8.0.2, )",

apps/GatewayApi/Controllers/StatusController.cs

@@ -91,9 +91,9 @@ public StatusController(IStatusHandler statusHandler, INetworkConfigurationProvi
     }
 
     [HttpPost("network-configuration")]
-    public async Task<GatewayModel.NetworkConfigurationResponse> NetworkConfiguration(CancellationToken token)
+    public GatewayModel.NetworkConfigurationResponse NetworkConfiguration()
     {
-        var networkConfiguration = await _networkConfigurationProvider.GetNetworkConfiguration(token);
+        var networkConfiguration = _networkConfigurationProvider.GetNetworkConfiguration();
         var wellKnownAddresses = networkConfiguration.WellKnownAddresses;
 
         return new GatewayModel.NetworkConfigurationResponse(

apps/GatewayApi/OpenApiDocumentHandler.cs

@@ -193,7 +193,7 @@ private static async Task<PlaceholderReplacements> GetPlaceholderReplacementsAsy
         CancellationToken token)
     {
         var placeholderReplacements = new PlaceholderReplacements();
-        var networkConfiguration = await networkConfigurationProvider.GetNetworkConfiguration(token);
+        var networkConfiguration = networkConfigurationProvider.GetNetworkConfiguration();
 
         try
         {

apps/GatewayApi/packages.lock.json

@@ -490,27 +490,6 @@
           "Newtonsoft.Json": "12.0.1"
         }
       },
-      "Nito.AsyncEx.Tasks": {
-        "type": "Transitive",
-        "resolved": "5.1.2",
-        "contentHash": "jEkCfR2/M26OK/U4G7SEN063EU/F4LiVA06TtpZILMdX/quIHCg+wn31Zerl2LC+u1cyFancjTY3cNAr2/89PA==",
-        "dependencies": {
-          "Nito.Disposables": "2.2.1"
-        }
-      },
-      "Nito.Collections.Deque": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "CU0/Iuv5VDynK8I8pDLwkgF0rZhbQoZahtodfL0M3x2gFkpBRApKs8RyMyNlAi1mwExE4gsmqQXk4aFVvW9a4Q=="
-      },
-      "Nito.Disposables": {
-        "type": "Transitive",
-        "resolved": "2.2.1",
-        "contentHash": "6sZ5uynQeAE9dPWBQGKebNmxbY4xsvcc5VplB5WkYEESUS7oy4AwnFp0FhqxTSKm/PaFrFqLrYr696CYN8cugg==",
-        "dependencies": {
-          "System.Collections.Immutable": "1.7.1"
-        }
-      },
       "Npgsql": {
         "type": "Transitive",
         "resolved": "8.0.2",
@@ -693,7 +672,6 @@
           "Microsoft.Extensions.Hosting": "[8.0.0, )",
           "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )",
           "Newtonsoft.Json": "[13.0.3, )",
-          "Nito.AsyncEx.Coordination": "[5.1.2, )",
           "RadixDlt.CoreApiSdk": "[1.10.0-develop, )"
         }
       },
@@ -889,16 +867,6 @@
         "resolved": "13.0.3",
         "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
-      "Nito.AsyncEx.Coordination": {
-        "type": "CentralTransitive",
-        "requested": "[5.1.2, )",
-        "resolved": "5.1.2",
-        "contentHash": "QMyUfsaxov//0ZMbOHWr9hJaBFteZd66DV1ay4J5wRODDb8+K/uHC7+3VsOflo6SVw/29mu8OWZp8vMDSuzc0w==",
-        "dependencies": {
-          "Nito.AsyncEx.Tasks": "5.1.2",
-          "Nito.Collections.Deque": "1.1.1"
-        }
-      },
       "Npgsql.EntityFrameworkCore.PostgreSQL": {
         "type": "CentralTransitive",
         "requested": "[8.0.2, )",

src/RadixDlt.NetworkGateway.Abstractions/Network/INetworkConfigurationProvider.cs

@@ -63,9 +63,10 @@
  */
 
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Nito.AsyncEx;
+using Polly;
 using RadixDlt.NetworkGateway.Abstractions.Configuration;
 using RadixDlt.NetworkGateway.Abstractions.CoreCommunications;
 using RadixDlt.NetworkGateway.Abstractions.Extensions;
@@ -80,16 +81,17 @@ namespace RadixDlt.NetworkGateway.Abstractions.Network;
 
 public interface INetworkConfigurationProvider
 {
-    public Task<NetworkConfiguration> GetNetworkConfiguration(CancellationToken token = default);
+    public NetworkConfiguration GetNetworkConfiguration();
 }
 
-public sealed class NetworkConfigurationProvider : INetworkConfigurationProvider
+public sealed class NetworkConfigurationProvider : IHostedService, INetworkConfigurationProvider
 {
     private readonly ILogger<NetworkConfigurationProvider> _logger;
     private readonly NetworkOptions _networkOptions;
     private readonly IServiceProvider _serviceProvider;
     private readonly IEnumerable<INetworkConfigurationReaderObserver> _observers;
-    private readonly AsyncLazy<NetworkConfiguration> _factory;
+
+    private NetworkConfiguration? _networkConfiguration;
 
     public NetworkConfigurationProvider(
         IOptions<NetworkOptions> networkOptions,
@@ -101,15 +103,32 @@ public NetworkConfigurationProvider(
         _serviceProvider = serviceProvider;
         _observers = observers;
         _logger = logger;
-        _factory = new AsyncLazy<NetworkConfiguration>(ReadNetworkConfiguration, AsyncLazyFlags.RetryOnFailure);
     }
 
-    public Task<NetworkConfiguration> GetNetworkConfiguration(CancellationToken token = default)
+    public NetworkConfiguration GetNetworkConfiguration()
+    {
+        if (_networkConfiguration == null)
+        {
+            throw new Exception("Network configuration is not available.");
+        }
+
+        return _networkConfiguration;
+    }
+
+    public async Task StartAsync(CancellationToken cancellationToken)
+    {
+        var policy = Policy.Handle<Exception>()
+            .WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
+
+        await policy.ExecuteAsync(async () => _networkConfiguration = await ReadNetworkConfiguration(cancellationToken));
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken)
     {
-        return _factory.Task;
+        return Task.CompletedTask;
     }
 
-    private async Task<NetworkConfiguration> ReadNetworkConfiguration()
+    private async Task<NetworkConfiguration> ReadNetworkConfiguration(CancellationToken cancellationToken)
     {
         using var scope = _serviceProvider.CreateScope();
         var coreApiNode = scope.ServiceProvider.GetRequiredService<IOptionsMonitor<NetworkOptions>>().CurrentValue.CoreApiNodes.GetRandomEnabledNode();
@@ -118,8 +137,8 @@ private async Task<NetworkConfiguration> ReadNetworkConfiguration()
 
         try
         {
-            var configuration = await coreApiProvider.StatusApi.StatusNetworkConfigurationPostAsync();
-            var status = await coreApiProvider.StatusApi.StatusNetworkStatusPostAsync(new CoreModel.NetworkStatusRequest(_networkOptions.NetworkName));
+            var configuration = await coreApiProvider.StatusApi.StatusNetworkConfigurationPostAsync(cancellationToken);
+            var status = await coreApiProvider.StatusApi.StatusNetworkStatusPostAsync(new CoreModel.NetworkStatusRequest(_networkOptions.NetworkName), cancellationToken);
 
             var addressTypeDefinitions = new List<AddressTypeDefinition>();
 

src/RadixDlt.NetworkGateway.Abstractions/RadixDlt.NetworkGateway.Abstractions.csproj

@@ -5,7 +5,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" /> <!-- can't use .Abstractions as we rely on .ValidateOnStart() -->
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Newtonsoft.Json" />
-    <PackageReference Include="Nito.AsyncEx.Coordination" />
   </ItemGroup>
 
   <ItemGroup>

src/RadixDlt.NetworkGateway.Abstractions/ServiceCollectionExtensions.cs

@@ -77,9 +77,16 @@ public static IServiceCollection AddNetworkGatewayAbstractions(this IServiceColl
         return services;
     }
 
-    public static IServiceCollection AddNetworkGatewayCoreServices(this IServiceCollection services)
+    public static IServiceCollection AddNetworkConfigurationProvider(this IServiceCollection services)
     {
-        services.TryAddSingleton<INetworkConfigurationProvider, NetworkConfigurationProvider>();
+        // NetworkConfigurationProvider is registered as HostedService as we want to fetch network configuration on app starup using  StartAsync() method.
+        // NetworkConfigurationProvider is registered as singleton as we want to reuse fetched network configuration once it's fetched.
+        // To provide better separation it's also registered as INetworkConfigurationProvider (no need to share NetworkConfigurationProvider which contains also HostedService methods).
+        // https://stackoverflow.com/questions/58397807/how-to-resolve-hostedservice-in-controller
+
+        services.AddSingleton<NetworkConfigurationProvider>();
+        services.AddSingleton<INetworkConfigurationProvider, NetworkConfigurationProvider>(serviceProvider => serviceProvider.GetRequiredService<NetworkConfigurationProvider>());
+        services.AddHostedService<NetworkConfigurationProvider>(serviceProvider => serviceProvider.GetRequiredService<NetworkConfigurationProvider>());
 
         return services;
     }

src/RadixDlt.NetworkGateway.Abstractions/packages.lock.json

@@ -53,16 +53,6 @@
         "resolved": "13.0.3",
         "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
-      "Nito.AsyncEx.Coordination": {
-        "type": "Direct",
-        "requested": "[5.1.2, )",
-        "resolved": "5.1.2",
-        "contentHash": "QMyUfsaxov//0ZMbOHWr9hJaBFteZd66DV1ay4J5wRODDb8+K/uHC7+3VsOflo6SVw/29mu8OWZp8vMDSuzc0w==",
-        "dependencies": {
-          "Nito.AsyncEx.Tasks": "5.1.2",
-          "Nito.Collections.Deque": "1.1.1"
-        }
-      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",
@@ -308,27 +298,6 @@
         "resolved": "8.0.0",
         "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g=="
       },
-      "Nito.AsyncEx.Tasks": {
-        "type": "Transitive",
-        "resolved": "5.1.2",
-        "contentHash": "jEkCfR2/M26OK/U4G7SEN063EU/F4LiVA06TtpZILMdX/quIHCg+wn31Zerl2LC+u1cyFancjTY3cNAr2/89PA==",
-        "dependencies": {
-          "Nito.Disposables": "2.2.1"
-        }
-      },
-      "Nito.Collections.Deque": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "CU0/Iuv5VDynK8I8pDLwkgF0rZhbQoZahtodfL0M3x2gFkpBRApKs8RyMyNlAi1mwExE4gsmqQXk4aFVvW9a4Q=="
-      },
-      "Nito.Disposables": {
-        "type": "Transitive",
-        "resolved": "2.2.1",
-        "contentHash": "6sZ5uynQeAE9dPWBQGKebNmxbY4xsvcc5VplB5WkYEESUS7oy4AwnFp0FhqxTSKm/PaFrFqLrYr696CYN8cugg==",
-        "dependencies": {
-          "System.Collections.Immutable": "1.7.1"
-        }
-      },
       "Polly.Core": {
         "type": "Transitive",
         "resolved": "8.3.0",
@@ -339,11 +308,6 @@
         "resolved": "1.2.0.556",
         "contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ=="
       },
-      "System.Collections.Immutable": {
-        "type": "Transitive",
-        "resolved": "1.7.1",
-        "contentHash": "B43Zsz5EfMwyEbnObwRxW5u85fzJma3lrDeGcSAV1qkhSRTNY5uXAByTn9h9ddNdhM+4/YoLc/CI43umjwIl9Q=="
-      },
       "System.Diagnostics.DiagnosticSource": {
         "type": "Transitive",
         "resolved": "8.0.0",

src/RadixDlt.NetworkGateway.DataAggregator/NodeServices/ApiReaders/NetworkStatusReader.cs

@@ -95,7 +95,7 @@ public NetworkStatusReader(
         {
             return await _coreApiProvider.StatusApi.StatusNetworkStatusPostAsync(
                 new CoreModel.NetworkStatusRequest(
-                    network: (await _networkConfigurationProvider.GetNetworkConfiguration(token)).Name
+                    network: _networkConfigurationProvider.GetNetworkConfiguration().Name
                 ),
                 token
             );

src/RadixDlt.NetworkGateway.DataAggregator/NodeServices/ApiReaders/TransactionStreamReader.cs

@@ -96,7 +96,7 @@ public TransactionStreamReader(
         {
             return await _coreApiProvider.StreamApi.StreamTransactionsPostWithHttpInfoAsync(
                 new CoreModel.StreamTransactionsRequest(
-                    network: (await _networkConfigurationProvider.GetNetworkConfiguration(token)).Name,
+                    network: _networkConfigurationProvider.GetNetworkConfiguration().Name,
                     fromStateVersion: fromStateVersion,
                     limit: count,
                     transactionFormatOptions: new CoreModel.TransactionFormatOptions

src/RadixDlt.NetworkGateway.DataAggregator/ServiceCollectionExtensions.cs

@@ -95,7 +95,7 @@ public static DataAggregatorBuilder AddNetworkGatewayDataAggregatorCore(this ISe
     {
         services
             .AddNetworkGatewayAbstractions()
-            .AddNetworkGatewayCoreServices();
+            .AddNetworkConfigurationProvider();
 
         services
             .AddValidatableOptionsAtSection<NetworkOptions, NetworkOptionsValidator>("DataAggregator:Network")

src/RadixDlt.NetworkGateway.DataAggregator/Services/LedgerTransactionsProcessor.cs

@@ -122,7 +122,7 @@ public LedgerTransactionsProcessor(
 
     public async Task ProcessTransactions(CancellationToken token)
     {
-        var networkConfiguration = await _networkConfigurationProvider.GetNetworkConfiguration(token);
+        var networkConfiguration = _networkConfigurationProvider.GetNetworkConfiguration();
         var lastCommittedTransactionSummary = await _topOfLedgerProvider.GetTopOfLedger(token);
         await _observers.ForEachAsync(x => x.PreHandleLedgerExtension(_clock.UtcNow));