From d216ad7da9e1c73a2d8218c4f2dcfde00e3aa2c4 Mon Sep 17 00:00:00 2001 From: Jabster28 <29015942+Jabster28@users.noreply.github.com> Date: Thu, 4 Apr 2024 09:38:41 +0100 Subject: [PATCH] fix: switch to using get_info for monerod (#5885) --- .../RPC/Models/{SyncInfoResponse.cs => GetInfoResponse.cs} | 4 ++-- .../Services/Altcoins/Monero/Services/MoneroRPCProvider.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename BTCPayServer/Plugins/Altcoins/Monero/RPC/Models/{SyncInfoResponse.cs => GetInfoResponse.cs} (74%) diff --git a/BTCPayServer/Plugins/Altcoins/Monero/RPC/Models/SyncInfoResponse.cs b/BTCPayServer/Plugins/Altcoins/Monero/RPC/Models/GetInfoResponse.cs similarity index 74% rename from BTCPayServer/Plugins/Altcoins/Monero/RPC/Models/SyncInfoResponse.cs rename to BTCPayServer/Plugins/Altcoins/Monero/RPC/Models/GetInfoResponse.cs index 6459f0772..864c42953 100644 --- a/BTCPayServer/Plugins/Altcoins/Monero/RPC/Models/SyncInfoResponse.cs +++ b/BTCPayServer/Plugins/Altcoins/Monero/RPC/Models/GetInfoResponse.cs @@ -3,10 +3,10 @@ using Newtonsoft.Json; namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models { - public partial class SyncInfoResponse + public partial class GetInfoResponse { [JsonProperty("height")] public long Height { get; set; } - [JsonProperty("peers")] public List Peers { get; set; } + [JsonProperty("busy_syncing")] public bool BusySyncing { get; set; } [JsonProperty("status")] public string Status { get; set; } [JsonProperty("target_height")] public long? TargetHeight { get; set; } } diff --git a/BTCPayServer/Services/Altcoins/Monero/Services/MoneroRPCProvider.cs b/BTCPayServer/Services/Altcoins/Monero/Services/MoneroRPCProvider.cs index a98767aff..f016951a4 100644 --- a/BTCPayServer/Services/Altcoins/Monero/Services/MoneroRPCProvider.cs +++ b/BTCPayServer/Services/Altcoins/Monero/Services/MoneroRPCProvider.cs @@ -59,12 +59,12 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services try { var daemonResult = - await daemonRpcClient.SendCommandAsync("sync_info", + await daemonRpcClient.SendCommandAsync("get_info", JsonRpcClient.NoRequestModel.Instance); summary.TargetHeight = daemonResult.TargetHeight.GetValueOrDefault(0); summary.CurrentHeight = daemonResult.Height; summary.TargetHeight = summary.TargetHeight == 0 ? summary.CurrentHeight : summary.TargetHeight; - summary.Synced = daemonResult.Height >= summary.TargetHeight && summary.CurrentHeight > 0; + summary.Synced = !daemonResult.BusySyncing; summary.UpdatedAt = DateTime.UtcNow; summary.DaemonAvailable = true; }