From 8906073e92ea958235435c0cadf4ca4b7a1a4503 Mon Sep 17 00:00:00 2001 From: Kukks Date: Tue, 17 Jan 2023 14:29:22 +0100 Subject: [PATCH] update --- .../BTCPayServer.Plugins.AOPP/AOPPPlugin.cs | 10 +----- .../BTCPayServer.Plugins.AOPP.csproj | 2 +- ...PayServer.Plugins.BitcoinWhitepaper.csproj | 2 +- .../BitcoinWhitepaperPlugin.cs | 6 +--- .../BTCPayServer.Plugins.FixedFloat.csproj | 2 +- .../FixedFloatPlugin.cs | 9 +----- .../BTCPayServer.Plugins.LSP.csproj | 2 +- Plugins/BTCPayServer.Plugins.LSP/LSPPlugin.cs | 9 +----- .../BTCPayServer.Plugins.LiquidPlus.csproj | 2 +- .../LiquidPlusPlugin.cs | 7 +---- .../BTCPayServer.Plugins.NFC.csproj | 2 +- Plugins/BTCPayServer.Plugins.NFC/NFCPlugin.cs | 10 +----- .../BTCPayServer.Plugins.SideShift.csproj | 2 +- .../SideShiftPlugin.cs | 10 +----- .../BTCPayServer.Plugins.TicketTailor.csproj | 2 +- .../TicketTailorPlugin.cs | 10 +----- .../BTCPayServer.Plugins.Wabisabi.csproj | 31 ++++++++----------- .../WabisabiCoordinatorClientInstance.cs | 1 + .../WabisabiPlugin.cs | 11 +------ submodules/btcpayserver | 2 +- 20 files changed, 32 insertions(+), 100 deletions(-) diff --git a/Plugins/BTCPayServer.Plugins.AOPP/AOPPPlugin.cs b/Plugins/BTCPayServer.Plugins.AOPP/AOPPPlugin.cs index e62dace..e31beae 100644 --- a/Plugins/BTCPayServer.Plugins.AOPP/AOPPPlugin.cs +++ b/Plugins/BTCPayServer.Plugins.AOPP/AOPPPlugin.cs @@ -7,18 +7,10 @@ namespace BTCPayServer.Plugins.AOPP { public class AOPPPlugin : BaseBTCPayServerPlugin { - public override string Identifier => "BTCPayServer.Plugins.AOPP"; - public override string Name => "AOPP"; - - public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = { - new() { Identifier = nameof(BTCPayServer), Condition = ">=1.6.0.0" } + new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.4" } }; - - public override string Description => - "Allows you to support the AOPP protocol in invoices to allow customers to bypass stupid KYC rules."; - public override void Execute(IServiceCollection applicationBuilder) { applicationBuilder.AddSingleton(); diff --git a/Plugins/BTCPayServer.Plugins.AOPP/BTCPayServer.Plugins.AOPP.csproj b/Plugins/BTCPayServer.Plugins.AOPP/BTCPayServer.Plugins.AOPP.csproj index b534934..9decdbd 100644 --- a/Plugins/BTCPayServer.Plugins.AOPP/BTCPayServer.Plugins.AOPP.csproj +++ b/Plugins/BTCPayServer.Plugins.AOPP/BTCPayServer.Plugins.AOPP.csproj @@ -9,7 +9,7 @@ - AOPP + AOPP Allows you to support the AOPP protocol in invoices to allow customers to bypass stupid KYC rules. Kukks 1.0.1 diff --git a/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BTCPayServer.Plugins.BitcoinWhitepaper.csproj b/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BTCPayServer.Plugins.BitcoinWhitepaper.csproj index e263509..429f897 100644 --- a/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BTCPayServer.Plugins.BitcoinWhitepaper.csproj +++ b/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BTCPayServer.Plugins.BitcoinWhitepaper.csproj @@ -8,7 +8,7 @@ - Bitcoin Whitepaper + Bitcoin Whitepaper This makes the Bitcoin whitepaper available on your BTCPay Server. Kukks 1.0.2 diff --git a/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BitcoinWhitepaperPlugin.cs b/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BitcoinWhitepaperPlugin.cs index c8e2365..87a37ff 100644 --- a/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BitcoinWhitepaperPlugin.cs +++ b/Plugins/BTCPayServer.Plugins.BitcoinWhitepaper/BitcoinWhitepaperPlugin.cs @@ -5,13 +5,9 @@ namespace BTCPayServer.Plugins.BitcoinWhitepaper { public class BitcoinWhitepaperPlugin: BaseBTCPayServerPlugin { - public override string Identifier { get; } = "BTCPayServer.Plugins.BitcoinWhitepaper"; - public override string Name { get; } = "Bitcoin Whitepaper"; - public override string Description { get; } = "This makes the Bitcoin whitepaper available on your BTCPay Server."; - public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = { - new() { Identifier = nameof(BTCPayServer), Condition = ">=1.4.0.0" } + new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.4" } }; } } diff --git a/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj b/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj index 1ce9709..9707187 100644 --- a/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj +++ b/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj @@ -9,7 +9,7 @@ - FixedFloat + FixedFloat Allows you to embed a FixedFloat conversion screen to allow customers to pay with altcoins. Kukks 1.0.6 diff --git a/Plugins/BTCPayServer.Plugins.FixedFloat/FixedFloatPlugin.cs b/Plugins/BTCPayServer.Plugins.FixedFloat/FixedFloatPlugin.cs index f448995..8c84c6b 100644 --- a/Plugins/BTCPayServer.Plugins.FixedFloat/FixedFloatPlugin.cs +++ b/Plugins/BTCPayServer.Plugins.FixedFloat/FixedFloatPlugin.cs @@ -7,17 +7,10 @@ namespace BTCPayServer.Plugins.FixedFloat { public class FixedFloatPlugin : BaseBTCPayServerPlugin { - public override string Identifier => "BTCPayServer.Plugins.FixedFloat"; - public override string Name => "FixedFloat"; - public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = { - new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.0.0" } + new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.4" } }; - - public override string Description => - "Allows you to embed a FixedFloat conversion screen to allow customers to pay with altcoins."; - public override void Execute(IServiceCollection applicationBuilder) { applicationBuilder.AddSingleton(); diff --git a/Plugins/BTCPayServer.Plugins.LSP/BTCPayServer.Plugins.LSP.csproj b/Plugins/BTCPayServer.Plugins.LSP/BTCPayServer.Plugins.LSP.csproj index 85fcba7..46d0e6b 100644 --- a/Plugins/BTCPayServer.Plugins.LSP/BTCPayServer.Plugins.LSP.csproj +++ b/Plugins/BTCPayServer.Plugins.LSP/BTCPayServer.Plugins.LSP.csproj @@ -9,7 +9,7 @@ - LSP + LSP Allows you to become an LSP selling lightning channels with inbound liquidity Kukks 1.0.0 diff --git a/Plugins/BTCPayServer.Plugins.LSP/LSPPlugin.cs b/Plugins/BTCPayServer.Plugins.LSP/LSPPlugin.cs index 7d49164..5bf4bb6 100644 --- a/Plugins/BTCPayServer.Plugins.LSP/LSPPlugin.cs +++ b/Plugins/BTCPayServer.Plugins.LSP/LSPPlugin.cs @@ -7,17 +7,10 @@ namespace BTCPayServer.Plugins.LSP { public class LSPPlugin : BaseBTCPayServerPlugin { - public override string Identifier => "BTCPayServer.Plugins.LSP"; - public override string Name => "LSP"; - public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = { - new() {Identifier = nameof(BTCPayServer), Condition = ">=1.6.0.0"} + new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.4" } }; - - public override string Description => - "Allows you to become an LSP selling lightning channels with inbound liquidity"; - public override void Execute(IServiceCollection applicationBuilder) { applicationBuilder.AddSingleton(); diff --git a/Plugins/BTCPayServer.Plugins.LiquidPlus/BTCPayServer.Plugins.LiquidPlus.csproj b/Plugins/BTCPayServer.Plugins.LiquidPlus/BTCPayServer.Plugins.LiquidPlus.csproj index deb30bd..147d33b 100644 --- a/Plugins/BTCPayServer.Plugins.LiquidPlus/BTCPayServer.Plugins.LiquidPlus.csproj +++ b/Plugins/BTCPayServer.Plugins.LiquidPlus/BTCPayServer.Plugins.LiquidPlus.csproj @@ -28,7 +28,7 @@ - "Liquid+ + Liquid+ Enhanced support for the liquid network. Kukks 1.0.8 diff --git a/Plugins/BTCPayServer.Plugins.LiquidPlus/LiquidPlusPlugin.cs b/Plugins/BTCPayServer.Plugins.LiquidPlus/LiquidPlusPlugin.cs index 01b0921..43fa2bf 100644 --- a/Plugins/BTCPayServer.Plugins.LiquidPlus/LiquidPlusPlugin.cs +++ b/Plugins/BTCPayServer.Plugins.LiquidPlus/LiquidPlusPlugin.cs @@ -14,15 +14,10 @@ namespace BTCPayServer.Plugins.LiquidPlus { public class LiquidPlusPlugin : BaseBTCPayServerPlugin { - public override string Identifier { get; } = "BTCPayServer.Plugins.LiquidPlus"; - public override string Name { get; } = "Liquid+"; - public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = { - new IBTCPayServerPlugin.PluginDependency() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.0.0" } + new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.4" } }; - public override string Description { get; } = "Enhanced support for the liquid network."; - public override void Execute(IServiceCollection services) { services.AddSingleton(new UIExtension("LiquidNav", "store-integrations-nav")); diff --git a/Plugins/BTCPayServer.Plugins.NFC/BTCPayServer.Plugins.NFC.csproj b/Plugins/BTCPayServer.Plugins.NFC/BTCPayServer.Plugins.NFC.csproj index f6a5fd3..4d285d4 100644 --- a/Plugins/BTCPayServer.Plugins.NFC/BTCPayServer.Plugins.NFC.csproj +++ b/Plugins/BTCPayServer.Plugins.NFC/BTCPayServer.Plugins.NFC.csproj @@ -9,7 +9,7 @@ - LNURL NFC Support + LNURL NFC Support Allows you to support contactless card payments over NFC and LNURL Withdraw! Kukks 1.0.8 diff --git a/Plugins/BTCPayServer.Plugins.NFC/NFCPlugin.cs b/Plugins/BTCPayServer.Plugins.NFC/NFCPlugin.cs index 85aabea..42d31a4 100644 --- a/Plugins/BTCPayServer.Plugins.NFC/NFCPlugin.cs +++ b/Plugins/BTCPayServer.Plugins.NFC/NFCPlugin.cs @@ -7,18 +7,10 @@ namespace BTCPayServer.Plugins.FixedFloat { public class NFCPlugin : BaseBTCPayServerPlugin { - public override string Identifier => "BTCPayServer.Plugins.NFC"; - public override string Name => "LNURL NFC Support"; - - public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = { - new() { Identifier = nameof(BTCPayServer), Condition = ">1.7.1.0" } + new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.4" } }; - - public override string Description => - "Allows you to support contactless card payments over NFC and LNURL Withdraw!"; - public override void Execute(IServiceCollection applicationBuilder) { applicationBuilder.AddSingleton(new UIExtension("NFC/CheckoutEnd", diff --git a/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj b/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj index 2baf26e..f368c4f 100644 --- a/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj +++ b/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj @@ -9,7 +9,7 @@ - SideShift + SideShift Allows you to embed a SideShift conversion screen to allow customers to pay with altcoins. Kukks 1.0.9 diff --git a/Plugins/BTCPayServer.Plugins.SideShift/SideShiftPlugin.cs b/Plugins/BTCPayServer.Plugins.SideShift/SideShiftPlugin.cs index 3b23787..c66bc83 100644 --- a/Plugins/BTCPayServer.Plugins.SideShift/SideShiftPlugin.cs +++ b/Plugins/BTCPayServer.Plugins.SideShift/SideShiftPlugin.cs @@ -7,18 +7,10 @@ namespace BTCPayServer.Plugins.SideShift { public class SideShiftPlugin : BaseBTCPayServerPlugin { - public override string Identifier => "BTCPayServer.Plugins.SideShift"; - public override string Name => "SideShift"; - - public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = { - new IBTCPayServerPlugin.PluginDependency() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.0.0" } + new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.4" } }; - - public override string Description => - "Allows you to embed a SideShift conversion screen to allow customers to pay with altcoins."; - public override void Execute(IServiceCollection applicationBuilder) { applicationBuilder.AddSingleton(); diff --git a/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj b/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj index ce34515..fb29749 100644 --- a/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj +++ b/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj @@ -9,7 +9,7 @@ - TicketTailor + TicketTailor Allows you to integrate with TicketTailor.com to sell tickets for Bitcoin Kukks 1.0.5 diff --git a/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs b/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs index 7751cb7..a1866c9 100644 --- a/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs +++ b/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs @@ -7,18 +7,10 @@ namespace BTCPayServer.Plugins.TicketTailor { public class TicketTailorPlugin : BaseBTCPayServerPlugin { - public override string Identifier => "BTCPayServer.Plugins.TicketTailor"; - public override string Name => "TicketTailor"; - - public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = { - new() { Identifier = nameof(BTCPayServer), Condition = ">=1.6.0.0" } + new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.4" } }; - - public override string Description => - "Allows you to integrate with TicketTailor.com to sell tickets for Bitcoin"; - public override void Execute(IServiceCollection applicationBuilder) { applicationBuilder.AddSingleton(); diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj index c454981..2c99870 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj @@ -10,7 +10,7 @@ - Wabisabi Coinjoin + Wabisabi Coinjoin Allows you to integrate your btcpayserver store with coinjoins. Kukks 1.0.10 @@ -35,26 +35,21 @@ - - - - - - - - <_ContentIncludedByDefault Remove="Views\Shared\Wabisabi\StoreIntegrationWabisabiOption.cshtml" /> - <_ContentIncludedByDefault Remove="Views\Shared\Wabisabi\WabisabiDashboard.cshtml" /> - <_ContentIncludedByDefault Remove="Views\Shared\Wabisabi\WabisabiNav.cshtml" /> - <_ContentIncludedByDefault Remove="Views\Shared\Wabisabi\WabisabiServerNavvExtension.cshtml" /> - <_ContentIncludedByDefault Remove="Views\WabisabiCoordinatorConfig\UpdateWabisabiSettings.cshtml" /> - <_ContentIncludedByDefault Remove="Views\WabisabiStore\Spend.cshtml" /> - <_ContentIncludedByDefault Remove="Views\WabisabiStore\UpdateWabisabiStoreSettings.cshtml" /> - <_ContentIncludedByDefault Remove="Views\_ViewImports.cshtml" /> + + StaticWebAssetsEnabled=false + true + runtime;contentFiles + - - + + + + + + + \ No newline at end of file diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiCoordinatorClientInstance.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiCoordinatorClientInstance.cs index d108b87..9ce28e8 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiCoordinatorClientInstance.cs +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiCoordinatorClientInstance.cs @@ -20,6 +20,7 @@ using WalletWasabi.WabiSabi.Client; using WalletWasabi.WabiSabi.Client.RoundStateAwaiters; using WalletWasabi.WabiSabi.Client.StatusChangedEvents; using WalletWasabi.WebClients.Wasabi; +using HttpClientFactory = WalletWasabi.WebClients.Wasabi.HttpClientFactory; namespace BTCPayServer.Plugins.Wabisabi; diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs index a16a98b..379019a 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs @@ -36,19 +36,10 @@ namespace BTCPayServer.Plugins.Wabisabi; public class WabisabiPlugin : BaseBTCPayServerPlugin { - public override string Identifier => "BTCPayServer.Plugins.Wabisabi"; - public override string Name => "Coinjoin"; - - public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = { - new() {Identifier = nameof(BTCPayServer), Condition = ">=1.7.3.0"} + new() { Identifier = nameof(BTCPayServer), Condition = ">=1.7.4" } }; - - public override string Description => - "Allows you to integrate your btcpayserver store with coinjoins."; - - public override void Execute(IServiceCollection applicationBuilder) { var utxoLocker = new LocalisedUTXOLocker(); diff --git a/submodules/btcpayserver b/submodules/btcpayserver index 068b717..b5cd215 160000 --- a/submodules/btcpayserver +++ b/submodules/btcpayserver @@ -1 +1 @@ -Subproject commit 068b717a7530a6f904502f41678df40a97d63b03 +Subproject commit b5cd215643f2551015fe86089d4f36338c778366