block-core · DavidGershony · May 27, 2025 · May 22, 2025
diff --git a/src/Angor.Test/Angor.Test.csproj b/src/Angor.Test/Angor.Test.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
     <PackageReference Include="Microsoft.JSInterop" Version="8.0.11" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />

diff --git a/src/Angor.Test/Services/TestSignService.cs b/src/Angor.Test/Services/TestSignService.cs
@@ -29,8 +29,15 @@ public TestSignService()
                 },
             });
 
+            var mockIHttpClientFactory = new Mock<IHttpClientFactory>();
+            mockIHttpClientFactory.Setup(x => x.CreateClient(It.IsAny<string>()))
+                .Returns(new HttpClient(new HttpClientHandler())
+                {
+                    BaseAddress = new Uri("https://mempool.space/api/v1/")
+                });
+
             var communicationFactory = new NostrCommunicationFactory(new NullLogger<NostrWebsocketClient>(), new NullLogger<NostrCommunicationFactory>()); 
-            var networkService = new NetworkService(mockNetworkStorage.Object, new HttpClient { BaseAddress = new Uri("https://angor.io") }, new NullLogger<NetworkService>(), mockNetworkConfiguration.Object); 
+            var networkService = new NetworkService(mockNetworkStorage.Object, mockIHttpClientFactory.Object, new NullLogger<NetworkService>(), mockNetworkConfiguration.Object); 
             var subscriptionsHanding = new RelaySubscriptionsHandling(new NullLogger<RelaySubscriptionsHandling>(), communicationFactory, networkService); 
 
             _signService = new SignService(communicationFactory, networkService, subscriptionsHanding);

diff --git a/src/Angor/Client/Angor.Client.csproj b/src/Angor/Client/Angor.Client.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
     <PackageReference Include="Blockcore.Core" Version="1.1.41" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.71" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
     <PackageReference Include="Microsoft.JSInterop" Version="8.0.11" />
     <PackageReference Include="NBitcoin" Version="7.0.46" />
     <PackageReference Include="Blockcore.Nostr.Client" Version="2.0.1" />

diff --git a/src/Angor/Client/Program.cs b/src/Angor/Client/Program.cs
@@ -9,16 +9,17 @@
 using Blazored.SessionStorage;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using System.Globalization;
 using Angor.Shared.Protocol;
 using Angor.Shared.Protocol.Scripts;
 using Angor.Shared.Protocol.TransactionBuilders;
 
+
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
 
-builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddHttpClient();
+
 
 builder.Services.AddBlazoredLocalStorage();
 builder.Services.AddBlazoredSessionStorage();

diff --git a/src/Angor/Shared/Angor.Shared.csproj b/src/Angor/Shared/Angor.Shared.csproj
@@ -11,7 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="Blockcore.Core" Version="1.1.41" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
     <PackageReference Include="NBitcoin" Version="7.0.46" />
     <PackageReference Include="Blockcore.Nostr.Client" Version="2.0.1" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />

diff --git a/src/Angor/Shared/Services/MempoolSpaceIndexerApi.cs b/src/Angor/Shared/Services/MempoolSpaceIndexerApi.cs
@@ -11,19 +11,17 @@ namespace Angor.Shared.Services;
 public class MempoolSpaceIndexerApi : IIndexerService
 {
     private readonly ILogger<MempoolSpaceIndexerApi> _logger;
-
-    private readonly INetworkConfiguration _networkConfiguration;
-    private readonly HttpClient _httpClient;
+
+    private readonly IHttpClientFactory _clientFactory;
     private readonly INetworkService _networkService;
 
     private const string AngorApiRoute = "/api/v1/query/Angor";
     private const string MempoolApiRoute = "/api/v1";
 
-    public MempoolSpaceIndexerApi(ILogger<MempoolSpaceIndexerApi> logger, INetworkConfiguration networkConfiguration, HttpClient httpClient, INetworkService networkService)
+    public MempoolSpaceIndexerApi(ILogger<MempoolSpaceIndexerApi> logger, IHttpClientFactory clientFactory, INetworkService networkService)
     {
         _logger = logger;
-        _networkConfiguration = networkConfiguration;
-        _httpClient = httpClient;
+        _clientFactory = clientFactory;
         _networkService = networkService;
     }
 
@@ -112,13 +110,22 @@ private class Outspent
         public UtxoStatus Status { get; set; }
     }
 
-    public async Task<List<ProjectIndexerData>> GetProjectsAsync(int? offset, int limit)
+    private HttpClient GetIndexerClient()
     {
         var indexer = _networkService.GetPrimaryIndexer();
+        var client = _clientFactory.CreateClient();
+        client.BaseAddress = new Uri(indexer.Url);
+        return client;
+    }
+
+    public async Task<List<ProjectIndexerData>> GetProjectsAsync(int? offset, int limit)
+    {
         var url = offset == null ? 
-            $"{indexer.Url}{AngorApiRoute}/projects?limit={limit}" : 
-            $"{indexer.Url}{AngorApiRoute}/projects?offset={offset}&limit={limit}";
-        var response = await _httpClient.GetAsync(url);
+            $"{AngorApiRoute}/projects?limit={limit}" : 
+            $"{AngorApiRoute}/projects?offset={offset}&limit={limit}";
+
+        var response = await GetIndexerClient()
+            .GetAsync(url);
         _networkService.CheckAndHandleError(response);
         response.EnsureSuccessStatusCode();
         return await response.Content.ReadFromJsonAsync<List<ProjectIndexerData>>() ?? new List<ProjectIndexerData>();
@@ -136,8 +143,8 @@ public async Task<List<ProjectIndexerData>> GetProjectsAsync(int? offset, int li
             return null;
         }
 
-        var indexer = _networkService.GetPrimaryIndexer();
-        var response = await _httpClient.GetAsync($"{indexer.Url}{AngorApiRoute}/projects/{projectId}");
+        var response = await GetIndexerClient()
+            .GetAsync($"{AngorApiRoute}/projects/{projectId}");
         _networkService.CheckAndHandleError(response);
 
         if (response.StatusCode == HttpStatusCode.NotFound)
@@ -155,8 +162,8 @@ public async Task<List<ProjectIndexerData>> GetProjectsAsync(int? offset, int li
             return null;
         }
 
-        var indexer = _networkService.GetPrimaryIndexer();
-        var response = await _httpClient.GetAsync($"{indexer.Url}{AngorApiRoute}/projects/{projectId}/stats");
+        var response = await GetIndexerClient()
+            .GetAsync($"{AngorApiRoute}/projects/{projectId}/stats");
         _networkService.CheckAndHandleError(response);
 
         if (response.StatusCode == HttpStatusCode.NotFound)
@@ -169,27 +176,26 @@ public async Task<List<ProjectIndexerData>> GetProjectsAsync(int? offset, int li
 
     public async Task<List<ProjectInvestment>> GetInvestmentsAsync(string projectId)
     {
-        var indexer = _networkService.GetPrimaryIndexer();
-        var response = await _httpClient.GetAsync($"{indexer.Url}{AngorApiRoute}/projects/{projectId}/investments");
+        var response = await GetIndexerClient()
+            .GetAsync($"{AngorApiRoute}/projects/{projectId}/investments");
         _networkService.CheckAndHandleError(response);
         response.EnsureSuccessStatusCode();
         return await response.Content.ReadFromJsonAsync<List<ProjectInvestment>>();
     }
 
     public async Task<ProjectInvestment?> GetInvestmentAsync(string projectId, string investorPubKey)
     {
-        var indexer = _networkService.GetPrimaryIndexer();
-        var response = await _httpClient.GetAsync($"{indexer.Url}{AngorApiRoute}/projects/{projectId}/investments/{investorPubKey}");
+        var response = await GetIndexerClient()
+            .GetAsync($"{AngorApiRoute}/projects/{projectId}/investments/{investorPubKey}");
         _networkService.CheckAndHandleError(response);
         response.EnsureSuccessStatusCode();
         return await response.Content.ReadFromJsonAsync<ProjectInvestment>();
     }
 
     public async Task<string> PublishTransactionAsync(string trxHex)
     {
-        var indexer = _networkService.GetPrimaryIndexer();
-
-        var response = await _httpClient.PostAsync($"{indexer.Url}{MempoolApiRoute}/tx", new StringContent(trxHex));
+        var response = await GetIndexerClient()
+            .PostAsync($"{MempoolApiRoute}/tx", new StringContent(trxHex));
 
         _networkService.CheckAndHandleError(response);
 
@@ -213,8 +219,8 @@ public async Task<AddressBalance[]> GetAdressBalancesAsync(List<AddressInfo> dat
         {
             //check all new addresses for balance or a history
 
-            var indexer = _networkService.GetPrimaryIndexer();
-            return _httpClient.GetAsync(indexer.Url + urlBalance + x.Address);
+            return GetIndexerClient()
+                .GetAsync(urlBalance + x.Address);
         });
 
         var results = await Task.WhenAll(tasks);
@@ -247,11 +253,10 @@ public async Task<AddressBalance[]> GetAdressBalancesAsync(List<AddressInfo> dat
 
     public async Task<List<UtxoData>?> FetchUtxoAsync(string address, int limit, int offset)
     {
-        var indexer = _networkService.GetPrimaryIndexer();
-
         var txsUrl = $"{MempoolApiRoute}/address/{address}/txs";
 
-        var response = await _httpClient.GetAsync(indexer.Url + txsUrl);
+        var response = await GetIndexerClient()
+            .GetAsync(txsUrl);
         _networkService.CheckAndHandleError(response);
 
         if (!response.IsSuccessStatusCode)
@@ -272,7 +277,7 @@ public async Task<AddressBalance[]> GetAdressBalancesAsync(List<AddressInfo> dat
 
             var outspendsUrl = $"{MempoolApiRoute}/tx/" + mempoolTransaction.Txid + "/outspends";
 
-            var resultsOutputs = await _httpClient.GetAsync(indexer.Url + outspendsUrl);
+            var resultsOutputs = await GetIndexerClient().GetAsync(outspendsUrl);
 
             var spentOutputsStatus = await resultsOutputs.Content.ReadFromJsonAsync<List<Outspent>>(new JsonSerializerOptions()
                 { PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower });
@@ -316,14 +321,13 @@ public async Task<AddressBalance[]> GetAdressBalancesAsync(List<AddressInfo> dat
 
     public async Task<List<QueryTransaction>?> FetchAddressHistoryAsync(string address, string? afterTrxId = null) //TODO check the paging (I think it is 50 by default 
     {
-        var indexer = _networkService.GetPrimaryIndexer();
-
         var txsUrl = $"{MempoolApiRoute}/address/{address}/txs";
 
         if (!string.IsNullOrEmpty(afterTrxId))
             txsUrl += $"?after_txid={afterTrxId}";
 
-        var response = await _httpClient.GetAsync(indexer.Url + txsUrl);
+        var response = await GetIndexerClient()
+            .GetAsync( txsUrl);
         _networkService.CheckAndHandleError(response);
 
         if (!response.IsSuccessStatusCode)
@@ -337,11 +341,10 @@ public async Task<AddressBalance[]> GetAdressBalancesAsync(List<AddressInfo> dat
 
     public async Task<FeeEstimations?> GetFeeEstimationAsync(int[] confirmations)
     {
-        var indexer = _networkService.GetPrimaryIndexer();
-
         var url = $"{MempoolApiRoute}/fees/recommended";
-
-        var response = await _httpClient.GetAsync(indexer.Url + url);
+
+        var response = await GetIndexerClient()
+            .GetAsync(url);
         _networkService.CheckAndHandleError(response);
 
         if (!response.IsSuccessStatusCode)
@@ -369,11 +372,10 @@ public async Task<AddressBalance[]> GetAdressBalancesAsync(List<AddressInfo> dat
 
     public async Task<string> GetTransactionHexByIdAsync(string transactionId)
     {
-        var indexer = _networkService.GetPrimaryIndexer();
-
         var url = $"{MempoolApiRoute}/tx/{transactionId}/hex";
 
-        var response = await _httpClient.GetAsync(indexer.Url + url);
+        var response = await GetIndexerClient()
+            .GetAsync(url);
         _networkService.CheckAndHandleError(response);
 
         if (!response.IsSuccessStatusCode)
@@ -384,11 +386,10 @@ public async Task<string> GetTransactionHexByIdAsync(string transactionId)
 
     public async Task<QueryTransaction?> GetTransactionInfoByIdAsync(string transactionId)
     {
-        var indexer = _networkService.GetPrimaryIndexer();
-
         var url = $"{MempoolApiRoute}/tx/{transactionId}";
 
-        var response = await _httpClient.GetAsync(indexer.Url + url);
+        var response = await GetIndexerClient()
+            .GetAsync(url);
         _networkService.CheckAndHandleError(response);
 
         if (!response.IsSuccessStatusCode)
@@ -403,7 +404,8 @@ public async Task<string> GetTransactionHexByIdAsync(string transactionId)
 
         var urlSpent = $"{MempoolApiRoute}/tx/{transactionId}/outspends";
 
-        var responseSpent = await _httpClient.GetAsync(indexer.Url + urlSpent);
+        var responseSpent = await GetIndexerClient()
+            .GetAsync(urlSpent);
         _networkService.CheckAndHandleError(responseSpent);
 
         if (!responseSpent.IsSuccessStatusCode)
@@ -462,8 +464,6 @@ private QueryTransaction MapToQueryTransaction(MempoolTransaction x, List<Outspe
 
     private async Task PopulateSpentMissingData(List<Outspent> outspents, MempoolTransaction mempoolTransaction)
     {
-        var indexer = _networkService.GetPrimaryIndexer();
-
         for (int index = 0; index < outspents.Count; index++)
         {
             var outspent = outspents[index];
@@ -475,7 +475,8 @@ private async Task PopulateSpentMissingData(List<Outspent> outspents, MempoolTra
                 {
                     var txsUrl = $"{MempoolApiRoute}/address/{output.ScriptpubkeyAddress}/txs";
 
-                    var response = await _httpClient.GetAsync(indexer.Url + txsUrl);
+                    var response = await GetIndexerClient()
+                        .GetAsync(txsUrl);
                     _networkService.CheckAndHandleError(response);
 
                     if (!response.IsSuccessStatusCode)
@@ -514,9 +515,10 @@ private async Task PopulateSpentMissingData(List<Outspent> outspents, MempoolTra
         try
         {
             // fetch block 0 (Genesis Block)
-            var blockUrl = $"{indexerUrl}{MempoolApiRoute}/block-height/0";
-
-            var blockResponse = await _httpClient.GetAsync(blockUrl);
+            var blockUrl = $"{MempoolApiRoute}/block-height/0";
+
+            var blockResponse = await GetIndexerClient()
+                .GetAsync(blockUrl);
 
             if (!blockResponse.IsSuccessStatusCode)
             {

diff --git a/src/Angor/Shared/Services/NetworkService.cs b/src/Angor/Shared/Services/NetworkService.cs
@@ -11,16 +11,16 @@ namespace Angor.Shared.Services
     public class NetworkService : INetworkService
     {
         private readonly INetworkStorage _networkStorage;
-        private readonly HttpClient _httpClient;
+        private readonly IHttpClientFactory _clientFactory;
         private readonly ILogger<NetworkService> _logger;
         private readonly INetworkConfiguration _networkConfiguration;
         public event Action OnStatusChanged;
 
 
-        public NetworkService(INetworkStorage networkStorage, HttpClient httpClient, ILogger<NetworkService> logger, INetworkConfiguration networkConfiguration)
+        public NetworkService(INetworkStorage networkStorage, IHttpClientFactory clientFactory, ILogger<NetworkService> logger, INetworkConfiguration networkConfiguration)
         {
             _networkStorage = networkStorage;
-            _httpClient = httpClient;
+            _clientFactory = clientFactory;
             _logger = logger;
             _networkConfiguration = networkConfiguration;
         }
@@ -113,7 +113,8 @@ public async Task CheckServices(bool force = false)
 
                         var blockUrl = Path.Combine(uri.AbsoluteUri, "api", "v1", "block-height", "0");
 
-                        var response = await _httpClient.GetAsync(blockUrl);
+                        var response = await _clientFactory.CreateClient()
+                            .GetAsync(blockUrl);
 
                         if (response.IsSuccessStatusCode)
                         {
@@ -165,7 +166,8 @@ public async Task CheckServices(bool force = false)
             //}
 
             var nostrHeaderMediaType = new MediaTypeWithQualityHeaderValue("application/nostr+json");
-            _httpClient.DefaultRequestHeaders.Accept.Add(nostrHeaderMediaType);
+            var client = _clientFactory.CreateClient();
+            client.DefaultRequestHeaders.Accept.Add(nostrHeaderMediaType);
             foreach (var relayUrl in settings.Relays)
             {
                 if (force || (DateTime.UtcNow - relayUrl.LastCheck).Minutes > 1)
@@ -179,7 +181,7 @@ public async Task CheckServices(bool force = false)
                             ? new Uri($"https://{uri.Host}/")
                             : new Uri($"http://{uri.Host}/");
 
-                        var response = await _httpClient.GetAsync(httpUri);
+                        var response = await client.GetAsync(httpUri);
 
                         if (response.IsSuccessStatusCode)
                         {
@@ -201,7 +203,7 @@ public async Task CheckServices(bool force = false)
                 }
             }
 
-            _httpClient.DefaultRequestHeaders.Accept.Remove(nostrHeaderMediaType);
+            client.DefaultRequestHeaders.Accept.Remove(nostrHeaderMediaType);
             _networkStorage.SetSettings(settings);
         }