From c768d7000bc56054e891ccea8b91ab35e3e1ee4d Mon Sep 17 00:00:00 2001 From: Kukks Date: Wed, 2 Oct 2024 12:17:20 +0200 Subject: [PATCH] logs --- .../BTCPayServer.Plugins.Wabisabi.csproj | 2 +- .../Coordinator/WabisabiCoordinatorService.cs | 3 +-- .../WabisabiCoordinatorClientInstance.cs | 2 ++ .../BTCPayServer.Plugins.Wabisabi/WabisabiStoreController.cs | 3 +-- submodules/walletwasabi | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj index 82746e7..59ed3f9 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj @@ -13,7 +13,7 @@ Coinjoin Allows you to integrate your btcpayserver store with coinjoins. - 1.0.97 + 1.0.100 true diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/WabisabiCoordinatorService.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/WabisabiCoordinatorService.cs index d6e4c79..37dd782 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/WabisabiCoordinatorService.cs +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/WabisabiCoordinatorService.cs @@ -265,10 +265,9 @@ public class WabisabiCoordinatorService : PeriodicRunner instance.WasabiCoordinatorStatusFetcher.OverrideConnected = null; } - var coinjoinConfig = new CoinJoinConfiguration(WabiSabiCoordinator.Config.CoordinatorIdentifier,150m, WabiSabiCoordinator.Config.MinInputCountByRound, false); _instanceManager.AddCoordinator("Local Coordinator", "local", _ => null, - coinjoinConfig, + null, cachedSettings.TermsConditions, cachedSettings.CoordinatorDescription ); diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiCoordinatorClientInstance.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiCoordinatorClientInstance.cs index 78310b1..06ddf1c 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiCoordinatorClientInstance.cs +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiCoordinatorClientInstance.cs @@ -106,6 +106,8 @@ public class WabisabiCoordinatorClientInstanceManager:IHostedService public void AddCoordinator(string displayName, string name, Func fetcher, CoinJoinConfiguration configuration, string termsConditions = null, string description = null) { + configuration ??= new CoinJoinConfiguration("CoinJoinCoordinatorIdentifier",150m, 1, false); + if (termsConditions is null && name == "zksnacks") { try diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiStoreController.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiStoreController.cs index 61b2ade..d827626 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiStoreController.cs +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiStoreController.cs @@ -245,8 +245,7 @@ namespace BTCPayServer.Plugins.Wabisabi { coordSettings.DiscoveredCoordinators.Add(viewModel); await _wabisabiCoordinatorService.UpdateSettings(coordSettings); - var config = new CoinJoinConfiguration("CoinJoinCoordinatorIdentifier",150m, 1, false); - _instanceManager.AddCoordinator(viewModel.Name, viewModel.Name, provider => viewModel.Uri, config,null,viewModel.Description); + _instanceManager.AddCoordinator(viewModel.Name, viewModel.Name, provider => viewModel.Uri, null,null,viewModel.Description); TempData["SuccessMessage"] = $"Coordinator {viewModel.Name } added and started"; } diff --git a/submodules/walletwasabi b/submodules/walletwasabi index 26cb35f..834f4b3 160000 --- a/submodules/walletwasabi +++ b/submodules/walletwasabi @@ -1 +1 @@ -Subproject commit 26cb35f06e3d32f058e9e61ae3d51471adf71912 +Subproject commit 834f4b39156e0ddd495151b497ab90169ba03484