mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-23 22:46:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

tell apps the internal node to connect to

Browse source
This commit is contained in:
Kukks 2024-05-20 14:02:44 +02:00 • committed by Dennis Reimann
parent eb3a37bd2b
commit 0ac8e0c517
No known key found for this signature in database
GPG key ID: 5009E1797F03F8D0
4 changed files with 55 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BTCPayApp.CommonServer/IBTCPayAppHubClient.cs
View file

@ -20,6 +20,7 @@ public class TransactionDetectedRequest
public interface IBTCPayAppHubClient
{
Task NotifyNetwork(string network);
Task NotifyServerNode(string nodeInfo);
Task TransactionDetected(TransactionDetectedRequest request);
Task NewBlock(string block);
@ -32,7 +33,7 @@ public interface IBTCPayAppHubClient
//methods available on the hub in the server
public interface IBTCPayAppHubServer
{
Task MasterNodePong(string group, bool active);
Task IdentifierActive(string group, bool active);
Task<Dictionary<string,string>> Pair(PairRequest request);
Task<AppHandshakeResponse> Handshake(AppHandshake request);

6
BTCPayServer.Tests/docker-compose.yml
View file

@ -157,7 +157,8 @@ services:
EXPOSE_TCP: "true"
LIGHTNINGD_CHAIN: "btc"
LIGHTNINGD_NETWORK: "regtest"
LIGHTNINGD_ANNOUNCEADDR: "127.0.0.1:30892"
LIGHTNINGD_ANNOUNCEADDR: "127.0.0.1"
LIGHTNINGD_PORT: "30892"
LIGHTNINGD_OPT: |
developer
bitcoin-datadir=/etc/bitcoin
@ -187,7 +188,8 @@ services:
EXPOSE_TCP: "true"
LIGHTNINGD_CHAIN: "btc"
LIGHTNINGD_NETWORK: "regtest"
LIGHTNINGD_ANNOUNCEADDR: "127.0.0.1:30893"
LIGHTNINGD_ANNOUNCEADDR: "127.0.0.1"
LIGHTNINGD_PORT: "30893"
LIGHTNINGD_OPT: |
developer
bitcoin-datadir=/etc/bitcoin

4
BTCPayServer/App/BTCPayAppHub.cs
View file

@ -266,9 +266,9 @@ var resultPsbt = PSBT.Parse(psbt, explorerClient.Network.NBitcoinNetwork);
}
public async Task MasterNodePong(string group, bool active)
public async Task IdentifierActive(string group, bool active)
{
await _appState.MasterNodePong(group, Context.ConnectionId, active);
await _appState.IdentifierActive(group, Context.ConnectionId, active);
}

49
BTCPayServer/App/BTCPayAppState.cs
View file

@ -8,7 +8,10 @@ using System.Threading;
using System.Threading.Tasks;
using BTCPayApp.CommonServer;
using BTCPayServer.Events;
using BTCPayServer.Payments.Lightning;
using BTCPayServer.Services.Invoices;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using NBitcoin;
@ -25,6 +28,7 @@ public class BTCPayAppState : IHostedService
private readonly ExplorerClientProvider _explorerClientProvider;
private readonly BTCPayNetworkProvider _networkProvider;
private readonly EventAggregator _eventAggregator;
private readonly IServiceProvider _serviceProvider;
private CompositeDisposable? _compositeDisposable;
public ExplorerClient ExplorerClient { get; private set; }
@ -37,17 +41,19 @@ public class BTCPayAppState : IHostedService
ILogger<BTCPayAppState> logger,
ExplorerClientProvider explorerClientProvider,
BTCPayNetworkProvider networkProvider,
EventAggregator eventAggregator)
EventAggregator eventAggregator, IServiceProvider serviceProvider)
{
_hubContext = hubContext;
_logger = logger;
_explorerClientProvider = explorerClientProvider;
_networkProvider = networkProvider;
_eventAggregator = eventAggregator;
_serviceProvider = serviceProvider;
}
public Task StartAsync(CancellationToken cancellationToken)
{
_cts ??= new CancellationTokenSource();
ExplorerClient = _explorerClientProvider.GetExplorerClient("BTC");
_derivationSchemeParser = new DerivationSchemeParser(_networkProvider.BTC);
_compositeDisposable = new();
@ -55,8 +61,44 @@ public class BTCPayAppState : IHostedService
_eventAggregator.Subscribe<NewBlockEvent>(OnNewBlock));
_compositeDisposable.Add(
_eventAggregator.SubscribeAsync<NewOnChainTransactionEvent>(OnNewTransaction));
_ = UpdateNodeInfo();
return Task.CompletedTask;
}
private string _nodeInfo = string.Empty;
private async Task UpdateNodeInfo()
{
while (!_cts.Token.IsCancellationRequested)
{
try
{
var res = await _serviceProvider.GetRequiredService<PaymentMethodHandlerDictionary>().GetLightningHandler(ExplorerClient.CryptoCode).GetNodeInfo(
new LightningPaymentMethodConfig() {InternalNodeRef = LightningPaymentMethodConfig.InternalNode},
null,
false, false);
if (res.Any())
{
var newInf = res.First().ToString();
if (newInf != _nodeInfo)
{
_nodeInfo = newInf;
await _hubContext.Clients.All.NotifyServerNode(_nodeInfo);
}
}
}
catch (Exception e)
{
_logger.LogError(e, "Error during node info update");
}
await Task.Delay(TimeSpan.FromMinutes(string.IsNullOrEmpty(_nodeInfo)? 1:5), _cts.Token);
}
}
private async Task OnNewTransaction(NewOnChainTransactionEvent obj)
{
@ -137,9 +179,10 @@ public class BTCPayAppState : IHostedService
}
public readonly ConcurrentDictionary<string, string> GroupToConnectionId = new();
private CancellationTokenSource _cts;
public async Task MasterNodePong(string group, string contextConnectionId, bool active)
public async Task IdentifierActive(string group, string contextConnectionId, bool active)
{
if (active)
{
@ -162,6 +205,8 @@ public class BTCPayAppState : IHostedService
public async Task Connected(string contextConnectionId)
{
if(_nodeInfo.Length > 0)
await _hubContext.Clients.Client(contextConnectionId).NotifyServerNode(_nodeInfo);
}
public async Task PaymentUpdate(string identifier, LightningPayment lightningPayment)