aljaz/BTCPayServerPlugins
1
0
Fork 0
mirror of https://github.com/aljazceru/BTCPayServerPlugins.git synced 2025-12-17 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

bump

Browse Source
This commit is contained in:
Kukks
2023-08-28 14:35:07 +02:00
parent 52b159813a
commit 8fb7c03825
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
View File

@@ -13,7 +13,7 @@
<PropertyGroup> <PropertyGroup>
<Product>Wabisabi Coinjoin</Product> <Product>Wabisabi Coinjoin</Product>
<Description>Allows you to integrate your btcpayserver store with coinjoins.</Description> <Description>Allows you to integrate your btcpayserver store with coinjoins.</Description>
<Version>1.0.51</Version> <Version>1.0.52</Version>
</PropertyGroup> </PropertyGroup>
<!-- Plugin development properties --> <!-- Plugin development properties -->

8
Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/WabisabiCoordinatorService.cs
View File

@@ -13,6 +13,7 @@ using BTCPayServer.Services;
using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using NBitcoin; using NBitcoin;
using NBitcoin.RPC; using NBitcoin.RPC;
@@ -38,7 +39,7 @@ public class WabisabiCoordinatorService : PeriodicRunner
private readonly IMemoryCache _memoryCache; private readonly IMemoryCache _memoryCache;
private readonly WabisabiCoordinatorClientInstanceManager _instanceManager; private readonly WabisabiCoordinatorClientInstanceManager _instanceManager;
private readonly IHttpClientFactory _httpClientFactory; private readonly IHttpClientFactory _httpClientFactory;
private readonly LinkGenerator _linkGenerator; private readonly ILogger<WabisabiCoordinatorService> _logger;
public readonly IdempotencyRequestCache IdempotencyRequestCache; public readonly IdempotencyRequestCache IdempotencyRequestCache;
@@ -51,7 +52,7 @@ public class WabisabiCoordinatorService : PeriodicRunner
WabisabiCoordinatorClientInstanceManager instanceManager, WabisabiCoordinatorClientInstanceManager instanceManager,
IHttpClientFactory httpClientFactory, IHttpClientFactory httpClientFactory,
IServiceProvider serviceProvider, IServiceProvider serviceProvider,
LinkGenerator linkGenerator) : base(TimeSpan.FromMinutes(15)) ILogger<WabisabiCoordinatorService> logger ) : base(TimeSpan.FromMinutes(15))
{ {
_settingsRepository = settingsRepository; _settingsRepository = settingsRepository;
_dataDirectories = dataDirectories; _dataDirectories = dataDirectories;
@@ -59,7 +60,7 @@ public class WabisabiCoordinatorService : PeriodicRunner
_memoryCache = memoryCache; _memoryCache = memoryCache;
_instanceManager = instanceManager; _instanceManager = instanceManager;
_httpClientFactory = httpClientFactory; _httpClientFactory = httpClientFactory;
_linkGenerator = linkGenerator; _logger = logger;
_socks5HttpClientHandler = serviceProvider.GetRequiredService<Socks5HttpClientHandler>(); _socks5HttpClientHandler = serviceProvider.GetRequiredService<Socks5HttpClientHandler>();
IdempotencyRequestCache = new(memoryCache); IdempotencyRequestCache = new(memoryCache);
} }
@@ -195,6 +196,7 @@ public class WabisabiCoordinatorService : PeriodicRunner
public async Task StartCoordinator(CancellationToken cancellationToken) public async Task StartCoordinator(CancellationToken cancellationToken)
{ {
_logger.LogInformation("Starting local coordinator");
await HostedServices.StartAllAsync(cancellationToken); await HostedServices.StartAllAsync(cancellationToken);
if (_instanceManager.HostedServices.TryGetValue("local", out var instance)) if (_instanceManager.HostedServices.TryGetValue("local", out var instance))
{ {

4
Plugins/BTCPayServer.Plugins.Wabisabi/Views/WabisabiCoordinatorConfig/UpdateWabisabiSettings.cshtml
View File

@@ -1,9 +1,7 @@
@using Microsoft.AspNetCore.Mvc.TagHelpers 
@using WalletWasabi.Backend.Controllers @using WalletWasabi.Backend.Controllers
@using Microsoft.AspNetCore.Mvc.ModelBinding
@using BTCPayServer.Plugins.Wabisabi @using BTCPayServer.Plugins.Wabisabi
@model WalletWasabi.Backend.Controllers.WabisabiCoordinatorSettings @model WalletWasabi.Backend.Controllers.WabisabiCoordinatorSettings
@inject WabisabiCoordinatorService WabisabiCoordinatorService
@{ @{
Layout = "../Shared/_NavLayout.cshtml"; Layout = "../Shared/_NavLayout.cshtml";

3
Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
View File

@@ -75,7 +75,7 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
"onchain-wallet-send")); "onchain-wallet-send"));
// applicationBuilder.AddSingleton<IPayoutProcessorFactory, WabisabiPayoutProcessor>(); // applicationBuilder.AddSingleton<IPayoutProcessorFactory, WabisabiPayoutProcessor>();
Logger.SetMinimumLevel(LogLevel.Warning); Logger.SetMinimumLevel(LogLevel.Info);
Logger.SetModes(LogMode.DotNetLoggers); Logger.SetModes(LogMode.DotNetLoggers);
@@ -136,7 +136,6 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
(WalletProvider)applicationBuilderApplicationServices.GetRequiredService<IWalletProvider>(); (WalletProvider)applicationBuilderApplicationServices.GetRequiredService<IWalletProvider>();
await walletProvider.ResetWabisabiStuckPayouts(null); await walletProvider.ResetWabisabiStuckPayouts(null);
}); });
Logger.DotnetLogger = applicationBuilderApplicationServices.GetService<ILogger<WabisabiPlugin>>(); Logger.DotnetLogger = applicationBuilderApplicationServices.GetService<ILogger<WabisabiPlugin>>();
base.Execute(applicationBuilder, applicationBuilderApplicationServices); base.Execute(applicationBuilder, applicationBuilderApplicationServices);
} }