Replace connection in Monero RPC Provider

Author: napoly

Plugins/Monero/Services/MoneroRPCProvider.cs

@@ -8,6 +8,8 @@
 using BTCPayServer.Plugins.Monero.RPC;
 using BTCPayServer.Plugins.Monero.RPC.Models;
 
+using Monero.Common;
+
 using NBitcoin;
 
 namespace BTCPayServer.Plugins.Monero.Services
@@ -16,12 +18,9 @@ public class MoneroRPCProvider
     {
         private readonly MoneroLikeConfiguration _moneroLikeConfiguration;
         private readonly EventAggregator _eventAggregator;
-        public ImmutableDictionary<string, JsonRpcClient> DaemonRpcClients;
-        public ImmutableDictionary<string, JsonRpcClient> WalletRpcClients;
-
-        private readonly ConcurrentDictionary<string, MoneroLikeSummary> _summaries = new();
-
-        public ConcurrentDictionary<string, MoneroLikeSummary> Summaries => _summaries;
+        public ImmutableDictionary<string, MoneroRpcConnection> DaemonRpcClients;
+        public ImmutableDictionary<string, MoneroRpcConnection> WalletRpcClients;
+        public ConcurrentDictionary<string, MoneroLikeSummary> Summaries { get; } = new();
 
         public MoneroRPCProvider(MoneroLikeConfiguration moneroLikeConfiguration,
             EventAggregator eventAggregator,
@@ -31,19 +30,19 @@ public MoneroRPCProvider(MoneroLikeConfiguration moneroLikeConfiguration,
             _eventAggregator = eventAggregator;
             DaemonRpcClients =
                 _moneroLikeConfiguration.MoneroLikeConfigurationItems.ToImmutableDictionary(pair => pair.Key,
-                    pair => new JsonRpcClient(pair.Value.DaemonRpcUri, pair.Value.Username, pair.Value.Password,
+                    pair => new MoneroRpcConnection(pair.Value.DaemonRpcUri, pair.Value.Username, pair.Value.Password,
                         httpClientFactory.CreateClient($"{pair.Key}client")));
             WalletRpcClients =
                 _moneroLikeConfiguration.MoneroLikeConfigurationItems.ToImmutableDictionary(pair => pair.Key,
-                    pair => new JsonRpcClient(pair.Value.InternalWalletRpcUri, "", "",
+                    pair => new MoneroRpcConnection(pair.Value.InternalWalletRpcUri, "", "",
                         httpClientFactory.CreateClient($"{pair.Key}client")));
         }
 
         public bool IsConfigured(string cryptoCode) => WalletRpcClients.ContainsKey(cryptoCode) && DaemonRpcClients.ContainsKey(cryptoCode);
         public bool IsAvailable(string cryptoCode)
         {
             cryptoCode = cryptoCode.ToUpperInvariant();
-            return _summaries.ContainsKey(cryptoCode) && IsAvailable(_summaries[cryptoCode]);
+            return Summaries.ContainsKey(cryptoCode) && IsAvailable(Summaries[cryptoCode]);
         }
 
         private bool IsAvailable(MoneroLikeSummary summary)
@@ -90,9 +89,9 @@ public async Task<MoneroLikeSummary> UpdateSummary(string cryptoCode)
                 summary.WalletAvailable = false;
             }
 
-            var changed = !_summaries.ContainsKey(cryptoCode) || IsAvailable(cryptoCode) != IsAvailable(summary);
+            var changed = !Summaries.ContainsKey(cryptoCode) || IsAvailable(cryptoCode) != IsAvailable(summary);
 
-            _summaries.AddOrReplace(cryptoCode, summary);
+            Summaries.AddOrReplace(cryptoCode, summary);
             if (changed)
             {
                 _eventAggregator.Publish(new MoneroDaemonStateChange() { Summary = summary, CryptoCode = cryptoCode });