mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-24 06:47:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix event data from block

Browse source
This commit is contained in:
Kukks 2023-08-21 14:48:16 +02:00 • committed by Dennis Reimann
parent 63720baa73
commit 643739514e
No known key found for this signature in database
GPG key ID: 5009E1797F03F8D0
3 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BTCPayApp.CommonServer/IBTCPayAppServerClient.cs
View file

@ -5,19 +5,21 @@ namespace BTCPayApp.CommonServer
{
public interface IBTCPayAppServerClient
{
Task OnTransactionDetected(string txid);
Task TransactionDetected(string txid);
Task NewBlock(string block);
}
public interface IBTCPayAppServerHub
{
Task Handshake(AppHandshake handshake);
Task GetTransactions();
}
public class AppHandshake
{
public string DerivationScheme { get; set; }
}

39
BTCPayServer/App/BTCPayAppHub.cs
View file

@ -1,4 +1,5 @@
using System;
#nullable enable
using System;
using System.Collections.Concurrent;
using System.Linq;
using System.Threading;
@ -6,6 +7,7 @@ using System.Threading.Tasks;
using BTCPayApp.CommonServer;
using BTCPayServer.Abstractions.Constants;
using BTCPayServer.Data;
using BTCPayServer.Services.Wallets;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.SignalR;
@ -26,7 +28,7 @@ public class BTCPayAppState : IHostedService
private readonly BTCPayNetworkProvider _networkProvider;
private readonly EventAggregator _eventAggregator;
private CompositeDisposable? _compositeDisposable;
private ExplorerClient _explorerClient;
public ExplorerClient ExplorerClient { get; private set; }
private DerivationSchemeParser _derivationSchemeParser;
private readonly ConcurrentDictionary<string, TrackedSource> _connectionScheme = new();
@ -46,7 +48,7 @@ public class BTCPayAppState : IHostedService
public Task StartAsync(CancellationToken cancellationToken)
{
_explorerClient = _explorerClientProvider.GetExplorerClient("BTC");
ExplorerClient = _explorerClientProvider.GetExplorerClient("BTC");
_derivationSchemeParser = new DerivationSchemeParser(_networkProvider.BTC);
_compositeDisposable = new();
_compositeDisposable.Add(
@ -67,7 +69,7 @@ public class BTCPayAppState : IHostedService
.ForEach(connectionId =>
{
_hubContext.Clients.Client(connectionId)
.OnTransactionDetected(obj.TransactionData.TransactionHash.ToString());
.TransactionDetected(obj.TransactionData.TransactionHash.ToString());
});
}
@ -84,13 +86,19 @@ public class BTCPayAppState : IHostedService
return Task.CompletedTask;
}
public TrackedSource? GetConnectionState(string connectionId)
{
_connectionScheme.TryGetValue(connectionId, out var res);
return res;
}
public async Task Handshake(string contextConnectionId, AppHandshake handshake)
{
try
{
var ts =
TrackedSource.Create(_derivationSchemeParser.Parse(handshake.DerivationScheme));
await _explorerClient.TrackAsync(ts);
await ExplorerClient.TrackAsync(ts);
_connectionScheme.AddOrReplace(contextConnectionId, ts);
}
catch (Exception e)
@ -110,11 +118,13 @@ public class BTCPayAppState : IHostedService
public class BTCPayAppHub : Hub<IBTCPayAppServerClient>, IBTCPayAppServerHub
{
private readonly BTCPayAppState _appState;
private readonly BTCPayWallet _wallet;
public BTCPayAppHub(BTCPayAppState appState)
public BTCPayAppHub(BTCPayAppState appState, BTCPayWalletProvider walletProvider)
{
_appState = appState;
_wallet = walletProvider.GetWallet("BTC");
}
@ -122,7 +132,7 @@ public class BTCPayAppHub : Hub<IBTCPayAppServerClient>, IBTCPayAppServerHub
{
}
public override Task OnDisconnectedAsync(Exception exception)
public override Task OnDisconnectedAsync(Exception? exception)
{
_appState.RemoveConnection(Context.ConnectionId);
return base.OnDisconnectedAsync(exception);
@ -132,4 +142,19 @@ public class BTCPayAppHub : Hub<IBTCPayAppServerClient>, IBTCPayAppServerHub
{
return _appState.Handshake(Context.ConnectionId, handshake);
}
public async Task GetTransactions()
{
var deriv = _appState.GetConnectionState(Context.ConnectionId);
if(deriv is null)
throw new InvalidOperationException("Handshake not done");
var txs = await _appState.ExplorerClient.GetTransactionsAsync(deriv);
if (txs is null)
{
throw new InvalidOperationException("NBXplorer failed to get transactions");
}
}
}

11
BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs
View file

@ -151,7 +151,16 @@ namespace BTCPayServer.Payments.Bitcoin
{
case NBXplorer.Models.NewBlockEvent evt:
await UpdatePaymentStates(wallet);
_Aggregator.Publish(new Events.NewBlockEvent() { CryptoCode = evt.CryptoCode });
_Aggregator.Publish(new Events.NewBlockEvent()
{
CryptoCode = wallet.Network.CryptoCode,
Confirmations = evt.Confirmations,
Hash = evt.Hash,
Height = evt.Height,
EventId = evt.EventId,
PreviousBlockHash = evt.PreviousBlockHash
}
);
break;
case NBXplorer.Models.NewTransactionEvent evt:
if (evt.DerivationStrategy != null)