From d68df945f2664affe79c03332e2530c76118c71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20A=2EP?= <53834183+Jossec101@users.noreply.github.com> Date: Thu, 7 May 2026 14:27:06 +0200 Subject: [PATCH] Add Rebalance feature with UI components and service integration stack-info: PR: https://github.com/Elenpay/NodeGuard/pull/509, branch: Jossec101/stack/15 --- src/Pages/Rebalances.razor | 327 ++++++++++++++++ src/Program.cs | 10 +- src/Shared/NavMenu.razor | 6 + src/Shared/NewRebalanceModal.razor | 597 +++++++++++++++++++++++++++++ 4 files changed, 936 insertions(+), 4 deletions(-) create mode 100644 src/Pages/Rebalances.razor create mode 100644 src/Shared/NewRebalanceModal.razor diff --git a/src/Pages/Rebalances.razor b/src/Pages/Rebalances.razor new file mode 100644 index 00000000..427df370 --- /dev/null +++ b/src/Pages/Rebalances.razor @@ -0,0 +1,327 @@ +@page "/rebalances" +@using Humanizer +@using Blazorise +@using Blazorise.Components +@using NodeGuard.Data.Models +@attribute [Authorize(Roles = "Superadmin,NodeManager,FinanceManager")] +

Rebalances

+ + + + + Status + + + + + + Source Node + + + + + + Requestor + + + + + + Is Manual + + + + + + From Date + + + + + + To Date + + + + + + + + + + + + + + + + + + + + + + @(context.Node?.Name ?? "Unknown") + + + + + @(context.SourceChanIdLnd?.ToString() ?? "Any") + + + + + @{ + var sourcePeer = context.SourceChannel == null ? null + : context.SourceChannel.SourceNode?.PubKey == context.SourceNodePubKey + ? context.SourceChannel.DestinationNode + : context.SourceChannel.SourceNode; + } + @if (sourcePeer != null) + { + + @(sourcePeer.Name ?? StringHelper.TruncateTail(sourcePeer.PubKey, 10)) + + } + else + { + @("—") + } + + + + + @if (!string.IsNullOrEmpty(context.TargetPubkey)) + { + + @StringHelper.TruncateTail(context.TargetPubkey, 10) + + } + else + { + @("Any") + } + + + + + @($"{context.RequestedAmount:f8} BTC") + + + + + @($"{context.Amount:f8} BTC ({Math.Round(PriceConversionService.BtcToUsdConversion(context.Amount, _btcPrice), 2)} USD)") + + + + + + + @($"{context.MaxFeePct:0.####}%") + + + + + + @if (context.FeePaidSats.HasValue) + { + + @context.FeePaid.ToUnit(NBitcoin.MoneyUnit.BTC).ToString("f8") BTC + + } + else + { + @("-") + } + + + + + @context.Status.Humanize() + + + + + + + @context.CreationDatetime.ToString("yyyy-MM-dd HH:mm:ss") + + + + + + + @context.UpdateDatetime.ToString("yyyy-MM-dd HH:mm:ss") + + + + + +
No records were found.
+ + +
+ +
+ + + + + + + +@inject IPriceConversionService PriceConversionService +@inject INodeRepository NodeRepository +@inject IRebalanceRepository RebalanceRepository +@inject IApplicationUserRepository ApplicationUserRepository +@inject IToastService ToastService +@code { + [CascadingParameter] private ApplicationUser? LoggedUser { get; set; } + + private DataGrid _dataGrid = new(); + private List _rebalances = new(); + private List _availableNodes = new(); + private List _availableUsers = new(); + private decimal _btcPrice; + public required NewRebalanceModal _newRebalanceModal; + private int _totalItems; + private int _filtersResetKey; + + private RebalanceStatus? _statusFilter; + private int? _nodeFilter; + private string? _userFilter; + private bool? _isManualFilter; + private DateTime? _fromDate; + private DateTime? _toDate; + + private List _statusOptions = new() { null }; + private List _isManualOptions = new() + { + new BoolOption { Label = "All", Value = null }, + new BoolOption { Label = "Yes", Value = true }, + new BoolOption { Label = "No", Value = false }, + }; + + public class BoolOption + { + public string Label { get; set; } = ""; + public bool? Value { get; set; } + } + + protected override async Task OnInitializedAsync() + { + if (LoggedUser == null) return; + _btcPrice = await PriceConversionService.GetBtcToUsdPrice(); + if (_btcPrice == 0) + { + ToastService.ShowError("Bitcoin price in USD could not be retrieved."); + } + _availableNodes = await NodeRepository.GetAllManagedByUser(LoggedUser.Id); + _availableUsers = await ApplicationUserRepository.GetAll(); + _statusOptions.AddRange(Enum.GetValues().Cast()); + } + + private async Task OnReadData(DataGridReadDataEventArgs e) + { + if (e.CancellationToken.IsCancellationRequested) return; + + var fromDate = _fromDate.HasValue + ? new DateTimeOffset(DateTime.SpecifyKind(_fromDate.Value.Date, DateTimeKind.Local)).ToUniversalTime() + : (DateTimeOffset?)null; + var toDate = _toDate.HasValue + ? new DateTimeOffset(DateTime.SpecifyKind(_toDate.Value.Date.AddDays(1).AddTicks(-1), DateTimeKind.Local)).ToUniversalTime() + : (DateTimeOffset?)null; + + var (rows, total) = await RebalanceRepository.GetPaginatedAsync( + e.Page, e.PageSize, + status: _statusFilter, + nodeId: _nodeFilter, + userId: _userFilter, + isManual: _isManualFilter, + fromDate: fromDate, + toDate: toDate); + + _rebalances = rows; + _totalItems = total; + } + + private async Task OnFiltersChanged() => await _dataGrid.Reload(); + + private async Task ClearAllFilters() + { + _statusFilter = null; + _nodeFilter = null; + _userFilter = null; + _isManualFilter = null; + _fromDate = null; + _toDate = null; + _filtersResetKey++; + await _dataGrid.Reload(); + } + + private async Task NewRebalance() + { + _newRebalanceModal.Clear(); + StateHasChanged(); + await _newRebalanceModal.Show(); + } + + private async Task OnRebalanceCreated() + { + await _dataGrid.Reload(); + } +} diff --git a/src/Program.cs b/src/Program.cs index 0f079640..75756f61 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -121,6 +121,7 @@ public static async Task Main(string[] args) builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); + builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); @@ -144,6 +145,7 @@ public static async Task Main(string[] args) builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); + builder.Services.AddTransient(); builder.Services.AddScoped(); //DbContext @@ -191,7 +193,7 @@ public static async Task Main(string[] args) o.Protocols = HttpProtocols.Http1); }); - + // Npgsql JSON mapping is opt-in per https://www.npgsql.org/doc/release-notes/8.0.html#breaking-changes NpgsqlConnection.GlobalTypeMapper.EnableDynamicJson(); @@ -256,7 +258,8 @@ public static async Task Main(string[] args) opts.ForJob(nameof(AutoLiquidityManagementJob)) .WithIdentity($"{nameof(AutoLiquidityManagementJob)}Trigger") .StartNow().WithSimpleSchedule(scheduleBuilder => - { if (Constants.IS_DEV_ENVIRONMENT) + { + if (Constants.IS_DEV_ENVIRONMENT) { scheduleBuilder.WithIntervalInMinutes(1).RepeatForever(); } @@ -348,7 +351,6 @@ public static async Task Main(string[] args) } }); }); - // Audit Log Cleanup Job q.AddJob(opts => { @@ -362,7 +364,7 @@ public static async Task Main(string[] args) .WithIdentity($"{nameof(AuditLogCleanupJob)}Trigger") .StartNow().WithSimpleSchedule(scheduleBuilder => { - scheduleBuilder.WithIntervalInHours(24).RepeatForever(); + scheduleBuilder.WithIntervalInHours(24).RepeatForever(); }); }); }); diff --git a/src/Shared/NavMenu.razor b/src/Shared/NavMenu.razor index ca3a0120..48181b9b 100644 --- a/src/Shared/NavMenu.razor +++ b/src/Shared/NavMenu.razor @@ -66,6 +66,12 @@ +
+ + Rebalances + +
+
diff --git a/src/Shared/NewRebalanceModal.razor b/src/Shared/NewRebalanceModal.razor new file mode 100644 index 00000000..fcdb80d3 --- /dev/null +++ b/src/Shared/NewRebalanceModal.razor @@ -0,0 +1,597 @@ +@using Grpc.Core +@using NBitcoin +@using Blazorise +@using NodeGuard.Data.Models +@using NodeGuard.Helpers +@using NodeGuard.Services + + + + New rebalance + + + + + + + Source node + + + + + + + + + + Source channel (drain) + + + + + + + + + + + + Receiving peer (optional) + + + + + + + + @if (string.IsNullOrEmpty(_selectedTargetPubkey)) + { + No receiving peer pinned — LND will pick any inbound peer that satisfies the cost cap. + } + else if (_targetOutboundPpm.HasValue) + { + Outbound fee rate to this peer: @_targetOutboundPpm.Value ppm (for reference only). + } + + + + + Target inbound % + + + + + + + + @if (_sourceLocalSats.HasValue && _sourceRemoteSats.HasValue) + { +
+
Source channel — @_selectedSourceChannel?.ChanId
+ @RenderBalanceBar("Before", _sourceLocalSats.Value, _sourceRemoteSats.Value) + @RenderBalanceBar("After", SourceLocalAfter, SourceRemoteAfter, isProjection: true) + + @if (!string.IsNullOrEmpty(_selectedTargetPubkey)) + { +
+ Receiving peer pinned: @_selectedTargetPubkey.Substring(0, 10)…. The exact channel that lands the sats is LND's call — no per-channel projection possible. +
+ } + +
+ @{ + var amount = ComputeAmountSats(); + } + @if (amount > 0) + { +
Will move @FormatSats(amount) from local→remote on the source channel.
+
Max fee: @FormatSats(MaxFeeSatsPreview) (@_maxFeePct.ToString("0.####")% = @PctToPpm(_maxFeePct) ppm).
+ } + else + { +
Channel is already at or above the requested inbound %. Increase the target above @CurrentInboundPct.ToString("0.0")%.
+ } +
+
+ } + else if (_selectedSourceChannel != null) + { +
Loading current balance…
+ } + + + + Max fee percent + + + + + + + @($"{_maxFeePct:0.####}% of rebalanced amount = {PctToPpm(_maxFeePct)} ppm.") + + + + + Timeout (seconds) + + + + + + + + + + + + Advanced + + + + + + + + Probe backoff ratio + + + + + + + @($"Server default: {Constants.REBALANCE_PROBE_BACKOFF_RATIO:0.00}. Higher values = finer-grained probing.") + + + + + Max attempts + + + + + + + @($"Server default: {Constants.REBALANCE_MAX_ATTEMPTS} attempts.") + + + + + Retry max fee % + + + + + + + @if (_retryMaxFeePct < _maxFeePct) + { + Must be ≥ max fee percent (@_maxFeePct.ToString("0.####")%). + } + else if (_targetOutboundPpm.HasValue && _targetOutboundPpm.Value > 0) + { + @($"{_retryMaxFeePct:0.####}% = {PctToPpm(_retryMaxFeePct)} ppm retry cap.") + } + else + { + @($"Server default: {Constants.REBALANCE_DEFAULT_RETRY_MAX_FEE_PCT:0.####}% (= {(long)Math.Round(Constants.REBALANCE_DEFAULT_RETRY_MAX_FEE_PCT * 10_000m)} ppm).") + } + + + + + + + + + + + + + + +@inject IRebalanceService RebalanceService +@inject IToastService ToastService +@inject INodeRepository NodeRepository +@inject IChannelRepository ChannelRepository +@inject ILightningService LightningService +@inject ILogger Logger +@code { + [CascadingParameter] public required ApplicationUser LoggedUser { get; set; } + [Parameter] public Func? OnRebalanceCreatedAsync { get; set; } + + public required Modal _modalRef; + private List _availableNodes = new(); + private List _nodeChannels = new(); + private Dictionary _channelBalances = new(); + private List _sourcePeerOptions = new(); + private List _peerOptions = new(); + private Node? _selectedNode; + private Channel? _selectedSourceChannel; + private string? _selectedSourcePubkey; + private string? _selectedTargetPubkey; + private long? _targetOutboundPpm; + private long? _sourceLocalSats; + private long? _sourceRemoteSats; + + public class PeerOption + { + public required string Pubkey { get; set; } + public required string DisplayName { get; set; } + } + private decimal _targetInboundPct = 50m; + private decimal _maxFeePct = Constants.REBALANCE_DEFAULT_MAX_FEE_PCT; + private decimal _retryMaxFeePct = Constants.REBALANCE_DEFAULT_RETRY_MAX_FEE_PCT; + private int _timeoutSeconds = 60; + private decimal _probeBackoffRatio = (decimal)Constants.REBALANCE_PROBE_BACKOFF_RATIO; + private int _maxAttempts = Constants.REBALANCE_MAX_ATTEMPTS; + private bool _showAdvanced; + private bool _submitting; + + private static long PctToPpm(decimal pct) => Math.Max(1L, (long)Math.Round(pct * 10_000m)); + + private List FilteredSourceChannels => + string.IsNullOrEmpty(_selectedSourcePubkey) + ? _nodeChannels + : _nodeChannels.Where(c => + (c.SourceNode?.PubKey == _selectedNode?.PubKey ? c.DestinationNode?.PubKey : c.SourceNode?.PubKey) == _selectedSourcePubkey + ).ToList(); + + private decimal CurrentInboundPct => + _sourceLocalSats.HasValue && _sourceRemoteSats.HasValue + && (_sourceLocalSats.Value + _sourceRemoteSats.Value) > 0 + ? (decimal)_sourceRemoteSats.Value / (_sourceLocalSats.Value + _sourceRemoteSats.Value) * 100m + : 0m; + + private long SourceLocalAfter => _sourceLocalSats.HasValue ? _sourceLocalSats.Value - ComputeAmountSats() : 0; + private long SourceRemoteAfter => _sourceRemoteSats.HasValue ? _sourceRemoteSats.Value + ComputeAmountSats() : 0; + + private long MaxFeeSatsPreview => (long)Math.Ceiling((decimal)ComputeAmountSats() * _maxFeePct / 100m); + + private long ComputeAmountSats() + { + if (!_sourceLocalSats.HasValue || !_sourceRemoteSats.HasValue) return 0; + var capacity = _sourceLocalSats.Value + _sourceRemoteSats.Value; + if (capacity <= 0) return 0; + var targetRemote = (long)Math.Round((decimal)capacity * _targetInboundPct / 100m); + var delta = targetRemote - _sourceRemoteSats.Value; + return delta > 0 ? delta : 0; + } + + private bool CanSubmit => + _selectedNode != null + && _selectedSourceChannel != null + && _sourceLocalSats.HasValue + && ComputeAmountSats() > 0 + && _maxFeePct > 0m + && _probeBackoffRatio > 0m + && _probeBackoffRatio < 1m + && _maxAttempts >= 1 + && _retryMaxFeePct >= _maxFeePct + && !_submitting; + + private static string FormatSats(long sats) + { + var btc = (decimal)sats / 100_000_000m; + return $"{sats:N0} sats ({btc:f8} BTC)"; + } + + private RenderFragment RenderBalanceBar(string label, long local, long remote, bool isProjection = false) + { + var capacity = local + remote; + var localPct = capacity > 0 ? (double)local / capacity * 100 : 0; + var remotePct = 100 - localPct; + var inbound = remotePct.ToString("0.0"); + var localColor = isProjection ? "#5a8" : "#4a8"; + var remoteColor = isProjection ? "#85a" : "#74a"; + var opacity = isProjection ? "0.85" : "1"; + return @
+
+ @label + + @local.ToString("N0") local + / + @remote.ToString("N0") remote + · + @inbound% inbound + +
+
+
+
+
+
; + } + + protected override async Task OnInitializedAsync() + { + _availableNodes = await NodeRepository.GetAllManagedByUser(LoggedUser.Id); + } + + public async Task Show() => await _modalRef.Show(); + + public void Clear() + { + _selectedNode = null; + _selectedSourceChannel = null; + _selectedSourcePubkey = null; + _selectedTargetPubkey = null; + _targetOutboundPpm = null; + _sourceLocalSats = null; + _sourceRemoteSats = null; + _nodeChannels = new(); + _channelBalances = new(); + _sourcePeerOptions = new(); + _peerOptions = new(); + _targetInboundPct = 50m; + _maxFeePct = Constants.REBALANCE_DEFAULT_MAX_FEE_PCT; + _retryMaxFeePct = Constants.REBALANCE_DEFAULT_RETRY_MAX_FEE_PCT; + _timeoutSeconds = 60; + _probeBackoffRatio = (decimal)Constants.REBALANCE_PROBE_BACKOFF_RATIO; + _maxAttempts = Constants.REBALANCE_MAX_ATTEMPTS; + _showAdvanced = false; + _submitting = false; + } + + private async Task OnNodeChanged(int nodeId) + { + _selectedNode = _availableNodes.FirstOrDefault(n => n.Id == nodeId); + _selectedSourceChannel = null; + _selectedSourcePubkey = null; + _selectedTargetPubkey = null; + _targetOutboundPpm = null; + _sourceLocalSats = null; + _sourceRemoteSats = null; + if (_selectedNode != null) + { + var all = await ChannelRepository.GetAllManagedByUserNodes(LoggedUser.Id); + _nodeChannels = all.Where(c => + (c.SourceNode?.Id == _selectedNode.Id || c.DestinationNode?.Id == _selectedNode.Id) + && c.Status == Channel.ChannelStatus.Open).ToList(); + + _channelBalances = new(); + try + { + var listed = await LightningService.ListChannels(_selectedNode); + if (listed != null) + { + foreach (var lc in listed.Channels) + _channelBalances[lc.ChanId] = (lc.LocalBalance, lc.RemoteBalance); + } + } + catch (Exception ex) + { + Logger.LogWarning(ex, "Could not pre-load channel balances for node {NodeId}", _selectedNode.Id); + } + + _sourcePeerOptions = _nodeChannels + .Select(c => c.SourceNode?.PubKey == _selectedNode.PubKey ? c.DestinationNode : c.SourceNode) + .Where(n => n != null && !string.IsNullOrEmpty(n.PubKey)) + .GroupBy(n => n!.PubKey) + .Select(g => new PeerOption + { + Pubkey = g.Key, + DisplayName = $"{g.First()!.Name ?? g.Key[..10]} · {g.Count()} ch", + }) + .ToList(); + + _peerOptions = _nodeChannels + .Select(c => c.SourceNode?.PubKey == _selectedNode.PubKey ? c.DestinationNode : c.SourceNode) + .Where(n => n != null && !string.IsNullOrEmpty(n.PubKey)) + .GroupBy(n => n!.PubKey) + .Select(g => new PeerOption + { + Pubkey = g.Key, + DisplayName = $"{g.First()!.Name ?? g.Key[..10]} · {g.Count()} channel{(g.Count() == 1 ? "" : "s")}", + }) + .ToList(); + } + else + { + _nodeChannels = new(); + _sourcePeerOptions = new(); + _peerOptions = new(); + } + StateHasChanged(); + } + + private Task OnSourcePeerChanged(string pubkey) + { + _selectedSourcePubkey = string.IsNullOrEmpty(pubkey) ? null : pubkey; + _selectedSourceChannel = null; + _sourceLocalSats = null; + _sourceRemoteSats = null; + StateHasChanged(); + return Task.CompletedTask; + } + + private async Task OnSourceChannelChanged(int channelId) + { + _selectedSourceChannel = _nodeChannels.FirstOrDefault(c => c.Id == channelId); + _sourceLocalSats = null; + _sourceRemoteSats = null; + if (_selectedSourceChannel != null && _selectedNode != null) + { + var (local, remote) = await TryGetLiveBalance(_selectedNode, _selectedSourceChannel.ChanId); + _sourceLocalSats = local; + _sourceRemoteSats = remote; + } + StateHasChanged(); + } + + private async Task OnTargetPeerChanged(string? peerPubkey) + { + _selectedTargetPubkey = string.IsNullOrEmpty(peerPubkey) ? null : peerPubkey; + _targetOutboundPpm = null; + if (!string.IsNullOrEmpty(_selectedTargetPubkey) && _selectedNode != null) + { + try + { + _targetOutboundPpm = await LightningService.GetLocalOutboundFeeRatePpmByPeerAsync(_selectedNode, _selectedTargetPubkey); + } + catch (Exception e) + { + Logger.LogWarning(e, "Could not fetch outbound fee rate for receiving peer {Pubkey}", _selectedTargetPubkey); + } + } + StateHasChanged(); + } + + private static string TrimBtc(decimal btc) => + btc.ToString("0.########").TrimEnd('0').TrimEnd('.'); + + private string FormatChannelOption(Channel channel) + { + var capBtc = (decimal)channel.SatsAmount / 100_000_000m; + if (_channelBalances.TryGetValue(channel.ChanId, out var bal)) + { + var capacity = bal.Local + bal.Remote; + var inboundPct = capacity > 0 ? (decimal)bal.Remote / capacity * 100m : 0m; + var inboundBtc = (decimal)bal.Remote / 100_000_000m; + return $"id: {channel.ChanId} cap: {TrimBtc(capBtc)} BTC inbound: {TrimBtc(inboundBtc)} BTC ({inboundPct:0.0}%)"; + } + return $"id: {channel.ChanId} cap: {TrimBtc(capBtc)} BTC"; + } + + private async Task<(long? local, long? remote)> TryGetLiveBalance(Node node, ulong chanId) + { + try + { + var listed = await LightningService.ListChannels(node); + var live = listed?.Channels.FirstOrDefault(c => c.ChanId == chanId); + if (live == null) + { + Logger.LogWarning("Channel {ChanId} not found in ListChannels for node {NodeId}", chanId, node.Id); + return (null, null); + } + return (live.LocalBalance, live.RemoteBalance); + } + catch (Exception e) + { + Logger.LogWarning(e, "Could not fetch live balance for channel {ChanId}", chanId); + return (null, null); + } + } + + private async Task OnCancel() => await _modalRef.Hide(); + + private async Task OnSubmit() + { + if (!CanSubmit) return; + + var amountSats = ComputeAmountSats(); + if (amountSats <= 0) + { + ToastService.ShowWarning("Channel is already at or above the requested inbound %"); + return; + } + + _submitting = true; + try + { + var request = new RebalanceRequest( + NodeId: _selectedNode!.Id, + SourceChannelId: _selectedSourceChannel!.Id, + TargetPubkey: _selectedTargetPubkey, + AmountSats: amountSats, + MaxFeePct: _maxFeePct > 0m ? (double)_maxFeePct : (double?)null, + TimeoutSeconds: _timeoutSeconds, + IsManual: true, + UserRequestorId: LoggedUser.Id, + ProbeBackoffRatio: _probeBackoffRatio > 0m && _probeBackoffRatio < 1m ? (double)_probeBackoffRatio : (double?)null, + MaxAttempts: _maxAttempts >= 1 ? _maxAttempts : (int?)null, + RetryMaxFeePct: _retryMaxFeePct > 0m ? (double)_retryMaxFeePct : (double?)null); + + var rebalance = await RebalanceService.RebalanceAsync(request); + + if (rebalance.Status == RebalanceStatus.Succeeded) + { + ToastService.ShowSuccess($"Rebalance succeeded: {rebalance.SatsAmount} sats moved, fee {rebalance.FeePaidSats} sats"); + } + else + { + ToastService.ShowWarning($"Rebalance ended with status {rebalance.Status}. Check audit log for details."); + } + + await _modalRef.Hide(); + if (OnRebalanceCreatedAsync != null) + { + await OnRebalanceCreatedAsync.Invoke(); + } + } + catch (Exception e) + { + Logger.LogError(e, "Error creating rebalance"); + ToastService.ShowError($"Failed to create rebalance: {e.Message}"); + } + finally + { + _submitting = false; + StateHasChanged(); + } + } +}