aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 22:44:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bump nbxplorer

Browse Source
This commit is contained in:
nicolas.dorier
2018-11-21 20:41:51 +09:00
parent 2929d7bf51
commit 0096ec1d12
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer.Tests/UnitTest1.cs
View File

@@ -811,7 +811,7 @@ namespace BTCPayServer.Tests
output.ScriptPubKey = invoiceAddress.ScriptPubKey; output.ScriptPubKey = invoiceAddress.ScriptPubKey;
using (var cts = new CancellationTokenSource(10000)) using (var cts = new CancellationTokenSource(10000))
using (var listener = tester.ExplorerClient.CreateNotificationSession()) using (var listener = tester.ExplorerClient.CreateWebsocketNotificationSession())
{ {
listener.ListenAllDerivationSchemes(); listener.ListenAllDerivationSchemes();
var replaced = tester.ExplorerNode.SignRawTransaction(tx); var replaced = tester.ExplorerNode.SignRawTransaction(tx);

2
BTCPayServer.Tests/docker-compose.yml
View File

@@ -69,7 +69,7 @@ services:
nbxplorer: nbxplorer:
image: nicolasdorier/nbxplorer:1.1.0.18 image: nicolasdorier/nbxplorer:2.0.0.0
restart: unless-stopped restart: unless-stopped
ports: ports:
- "32838:32838" - "32838:32838"

2
BTCPayServer/BTCPayServer.csproj
View File

@@ -49,7 +49,7 @@
<PackageReference Include="NBitcoin" Version="4.1.1.71" /> <PackageReference Include="NBitcoin" Version="4.1.1.71" />
<PackageReference Include="NBitpayClient" Version="1.0.0.30" /> <PackageReference Include="NBitpayClient" Version="1.0.0.30" />
<PackageReference Include="DBreeze" Version="1.92.0" /> <PackageReference Include="DBreeze" Version="1.92.0" />
<PackageReference Include="NBXplorer.Client" Version="1.0.3.11" /> <PackageReference Include="NBXplorer.Client" Version="2.0.0" />
<PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" /> <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
<PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" /> <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
<PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" /> <PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" />

6
BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs
View File

@@ -51,7 +51,7 @@ namespace BTCPayServer.Payments.Bitcoin
} }
CompositeDisposable leases = new CompositeDisposable(); CompositeDisposable leases = new CompositeDisposable();
ConcurrentDictionary<string, NotificationSession> _SessionsByCryptoCode = new ConcurrentDictionary<string, NotificationSession>(); ConcurrentDictionary<string, WebsocketNotificationSession> _SessionsByCryptoCode = new ConcurrentDictionary<string, WebsocketNotificationSession>();
private Timer _ListenPoller; private Timer _ListenPoller;
TimeSpan _PollInterval; TimeSpan _PollInterval;
@@ -114,7 +114,7 @@ namespace BTCPayServer.Payments.Bitcoin
return; return;
if (_Cts.IsCancellationRequested) if (_Cts.IsCancellationRequested)
return; return;
var session = await client.CreateNotificationSessionAsync(_Cts.Token).ConfigureAwait(false); var session = await client.CreateWebsocketNotificationSessionAsync(_Cts.Token).ConfigureAwait(false);
if (!_SessionsByCryptoCode.TryAdd(network.CryptoCode, session)) if (!_SessionsByCryptoCode.TryAdd(network.CryptoCode, session))
{ {
await session.DisposeAsync(); await session.DisposeAsync();
@@ -187,7 +187,7 @@ namespace BTCPayServer.Payments.Bitcoin
if (cleanup) if (cleanup)
{ {
Logs.PayServer.LogInformation($"Disconnected from WebSocket of NBXplorer ({network.CryptoCode})"); Logs.PayServer.LogInformation($"Disconnected from WebSocket of NBXplorer ({network.CryptoCode})");
_SessionsByCryptoCode.TryRemove(network.CryptoCode, out NotificationSession unused); _SessionsByCryptoCode.TryRemove(network.CryptoCode, out WebsocketNotificationSession unused);
if (_SessionsByCryptoCode.Count == 0 && _Cts.IsCancellationRequested) if (_SessionsByCryptoCode.Count == 0 && _Cts.IsCancellationRequested)
{ {
_RunningTask.TrySetResult(true); _RunningTask.TrySetResult(true);

4
BTCPayServer/Services/Wallets/BTCPayWallet.cs
View File

@@ -122,7 +122,7 @@ namespace BTCPayServer.Services.Wallets
UTXOChanges result = null; UTXOChanges result = null;
try try
{ {
result = await _Client.GetUTXOsAsync(strategy, null, false, cancellation).ConfigureAwait(false); result = await _Client.GetUTXOsAsync(strategy, cancellation).ConfigureAwait(false);
} }
catch catch
{ {
@@ -153,7 +153,7 @@ namespace BTCPayServer.Services.Wallets
public Task<GetTransactionsResponse> FetchTransactions(DerivationStrategyBase derivationStrategyBase) public Task<GetTransactionsResponse> FetchTransactions(DerivationStrategyBase derivationStrategyBase)
{ {
return _Client.GetTransactionsAsync(derivationStrategyBase, null, false); return _Client.GetTransactionsAsync(derivationStrategyBase);
} }
public Task<BroadcastResult[]> BroadcastTransactionsAsync(List<Transaction> transactions) public Task<BroadcastResult[]> BroadcastTransactionsAsync(List<Transaction> transactions)