diff --git a/Plugins/BTCPayServer.Plugins.Breez/BTCPayServer.Plugins.Breez.csproj b/Plugins/BTCPayServer.Plugins.Breez/BTCPayServer.Plugins.Breez.csproj
index cd39693..9bcacf0 100644
--- a/Plugins/BTCPayServer.Plugins.Breez/BTCPayServer.Plugins.Breez.csproj
+++ b/Plugins/BTCPayServer.Plugins.Breez/BTCPayServer.Plugins.Breez.csproj
@@ -9,7 +9,7 @@
Breez / Greenlight
Lightweight lightning baby!
- 1.0.9
+ 1.0.10
true
diff --git a/Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs b/Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs
index 672c4ee..308b087 100644
--- a/Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs
@@ -12,7 +12,7 @@ namespace BTCPayServer.Plugins.Breez
{
public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } =
{
- new() { Identifier = nameof(BTCPayServer), Condition = ">=2.0.0" }
+ new() { Identifier = nameof(BTCPayServer), Condition = ">=2.0.6" }
};
public override void Execute(IServiceCollection applicationBuilder)
diff --git a/Plugins/BTCPayServer.Plugins.Breez/BreezService.cs b/Plugins/BTCPayServer.Plugins.Breez/BreezService.cs
index 40fee5e..c89e139 100644
--- a/Plugins/BTCPayServer.Plugins.Breez/BreezService.cs
+++ b/Plugins/BTCPayServer.Plugins.Breez/BreezService.cs
@@ -45,13 +45,13 @@ public class BreezService:EventHostedServiceBase
protected override void SubscribeToEvents()
{
- Subscribe();
+ Subscribe();
base.SubscribeToEvents();
}
protected override async Task ProcessEvent(object evt, CancellationToken cancellationToken)
{
- if (evt is StoreRemovedEvent storeRemovedEvent)
+ if (evt is StoreEvent.Removed storeRemovedEvent)
{
await Handle(storeRemovedEvent.StoreId, null);
_settings.Remove(storeRemovedEvent.StoreId);
diff --git a/Plugins/BTCPayServer.Plugins.Bringin/BTCPayServer.Plugins.Bringin.csproj b/Plugins/BTCPayServer.Plugins.Bringin/BTCPayServer.Plugins.Bringin.csproj
index b4eb5db..e0f1ad8 100644
--- a/Plugins/BTCPayServer.Plugins.Bringin/BTCPayServer.Plugins.Bringin.csproj
+++ b/Plugins/BTCPayServer.Plugins.Bringin/BTCPayServer.Plugins.Bringin.csproj
@@ -9,7 +9,7 @@
Bringin
Euro Offramp
- 1.0.3
+ 1.0.4
true
diff --git a/Plugins/BTCPayServer.Plugins.Bringin/BringinPlugin.cs b/Plugins/BTCPayServer.Plugins.Bringin/BringinPlugin.cs
index fbc8b7f..67767b4 100644
--- a/Plugins/BTCPayServer.Plugins.Bringin/BringinPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Bringin/BringinPlugin.cs
@@ -13,7 +13,7 @@ public class BringinPlugin : BaseBTCPayServerPlugin
{
new()
{
- Identifier = nameof(BTCPayServer), Condition = ">=2.0.0"
+ Identifier = nameof(BTCPayServer), Condition = ">=2.0.6"
}
};
diff --git a/Plugins/BTCPayServer.Plugins.Bringin/BringinService.cs b/Plugins/BTCPayServer.Plugins.Bringin/BringinService.cs
index 4c054f9..a3d0f77 100644
--- a/Plugins/BTCPayServer.Plugins.Bringin/BringinService.cs
+++ b/Plugins/BTCPayServer.Plugins.Bringin/BringinService.cs
@@ -69,7 +69,7 @@ public class BringinService : EventHostedServiceBase
protected override void SubscribeToEvents()
{
base.SubscribeToEvents();
- Subscribe();
+ Subscribe();
Subscribe();
Subscribe();
}
@@ -117,7 +117,7 @@ public class BringinService : EventHostedServiceBase
{
var storeId = evt switch
{
- StoreRemovedEvent storeRemovedEvent => storeRemovedEvent.StoreId,
+ StoreEvent.Removed storeRemovedEvent => storeRemovedEvent.StoreId,
InvoiceEvent invoiceEvent => invoiceEvent.Invoice.StoreId,
PayoutEvent payoutEvent => payoutEvent.Payout.StoreDataId,
_ => null
@@ -129,7 +129,7 @@ public class BringinService : EventHostedServiceBase
{
switch (evt)
{
- case StoreRemovedEvent storeRemovedEvent:
+ case StoreEvent.Removed storeRemovedEvent:
_settings.TryRemove(storeRemovedEvent.StoreId, out _);
break;
case InvoiceEvent
diff --git a/Plugins/BTCPayServer.Plugins.FileSeller/BTCPayServer.Plugins.FileSeller.csproj b/Plugins/BTCPayServer.Plugins.FileSeller/BTCPayServer.Plugins.FileSeller.csproj
index 3b54d35..ccfd255 100644
--- a/Plugins/BTCPayServer.Plugins.FileSeller/BTCPayServer.Plugins.FileSeller.csproj
+++ b/Plugins/BTCPayServer.Plugins.FileSeller/BTCPayServer.Plugins.FileSeller.csproj
@@ -9,7 +9,7 @@
File Seller
Allows you to sell files through the point of sale/crowdfund apps.
- 1.0.5
+ 1.0.6
true
diff --git a/Plugins/BTCPayServer.Plugins.FileSeller/FileSellerService.cs b/Plugins/BTCPayServer.Plugins.FileSeller/FileSellerService.cs
index d6f2e72..df01fea 100644
--- a/Plugins/BTCPayServer.Plugins.FileSeller/FileSellerService.cs
+++ b/Plugins/BTCPayServer.Plugins.FileSeller/FileSellerService.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
using BTCPayServer.Events;
using BTCPayServer.HostedServices;
using BTCPayServer.Plugins.Crowdfund;
@@ -46,7 +47,7 @@ namespace BTCPayServer.Plugins.FileSeller
protected override async Task ProcessEvent(object evt, CancellationToken cancellationToken)
{
if (evt is not InvoiceEvent invoiceEvent) return;
- List cartItems = null;
+ List cartItems = null;
if (invoiceEvent.Name is not (InvoiceEvent.Completed or InvoiceEvent.MarkedCompleted
or InvoiceEvent.Confirmed))
{
@@ -68,11 +69,11 @@ namespace BTCPayServer.Plugins.FileSeller
if ((!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode) ||
AppService.TryParsePosCartItems(invoiceEvent.Invoice.Metadata.PosData, out cartItems)))
{
- var items = cartItems ?? new List();
+ var items = cartItems ?? new List();
if (!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode) &&
!items.Exists(cartItem => cartItem.Id == invoiceEvent.Invoice.Metadata.ItemCode))
{
- items.Add(new PosCartItem()
+ items.Add(new AppCartItem()
{
Id = invoiceEvent.Invoice.Metadata.ItemCode,
Count = 1,
diff --git a/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodeService.cs b/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodeService.cs
index aa1d40f..beb6445 100644
--- a/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodeService.cs
+++ b/Plugins/BTCPayServer.Plugins.MicroNode/MicroNodeService.cs
@@ -645,7 +645,7 @@ public class MicroNodeService : EventHostedServiceBase
PushEvent(new CreatePayoutEvt());
}, cancellationToken);
- }else if (evt is StoreRemovedEvent storeRemovedEvent)
+ }else if (evt is StoreEvent.Removed storeRemovedEvent)
{
_storeSettings.Remove(storeRemovedEvent.StoreId);
_ownerSettings.Remove(storeRemovedEvent.StoreId);
@@ -665,7 +665,7 @@ public class MicroNodeService : EventHostedServiceBase
{
Subscribe();
Subscribe();
- Subscribe();
+ Subscribe();
Subscribe();
base.SubscribeToEvents();
}
diff --git a/Plugins/BTCPayServer.Plugins.Prism/BTCPayServer.Plugins.Prism.csproj b/Plugins/BTCPayServer.Plugins.Prism/BTCPayServer.Plugins.Prism.csproj
index edc1cb7..a17d41b 100644
--- a/Plugins/BTCPayServer.Plugins.Prism/BTCPayServer.Plugins.Prism.csproj
+++ b/Plugins/BTCPayServer.Plugins.Prism/BTCPayServer.Plugins.Prism.csproj
@@ -11,7 +11,7 @@
Prism
Automated value splits for Bitcoin.
- 1.3.0
+ 1.3.1
true
diff --git a/Plugins/BTCPayServer.Plugins.Prism/PrismPlugin.cs b/Plugins/BTCPayServer.Plugins.Prism/PrismPlugin.cs
index 70661fe..a17858e 100644
--- a/Plugins/BTCPayServer.Plugins.Prism/PrismPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Prism/PrismPlugin.cs
@@ -11,7 +11,7 @@ public class PrismPlugin : BaseBTCPayServerPlugin
{
public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } =
{
- new() {Identifier = nameof(BTCPayServer), Condition = ">=2.0.0"}
+ new() {Identifier = nameof(BTCPayServer), Condition = ">=2.0.6"}
};
public override void Execute(IServiceCollection applicationBuilder)
diff --git a/Plugins/BTCPayServer.Plugins.Prism/SatBreaker.cs b/Plugins/BTCPayServer.Plugins.Prism/SatBreaker.cs
index 6c49bf9..9976124 100644
--- a/Plugins/BTCPayServer.Plugins.Prism/SatBreaker.cs
+++ b/Plugins/BTCPayServer.Plugins.Prism/SatBreaker.cs
@@ -103,7 +103,7 @@ namespace BTCPayServer.Plugins.Prism
base.SubscribeToEvents();
Subscribe();
Subscribe();
- Subscribe();
+ Subscribe();
}
class CheckPayoutsEvt
@@ -439,7 +439,7 @@ namespace BTCPayServer.Plugins.Prism
switch (evt)
{
- case StoreRemovedEvent storeRemovedEvent:
+ case StoreEvent.Removed storeRemovedEvent:
_prismSettings.Remove(storeRemovedEvent.StoreId);
return;
case InvoiceEvent invoiceEvent when
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
index ca1bc8c..210d5e6 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.103
+ 1.0.104
true
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
index fe58fea..21a6544 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
@@ -31,7 +31,7 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
{
public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } =
{
- new() { Identifier = nameof(BTCPayServer), Condition = ">=2.0.0" }
+ new() { Identifier = nameof(BTCPayServer), Condition = ">=2.0.6" }
};
public override void Execute(IServiceCollection applicationBuilder)
{
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/WalletProvider.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/WalletProvider.cs
index f74d7eb..92015f7 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/WalletProvider.cs
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/WalletProvider.cs
@@ -265,7 +265,7 @@ public class WalletProvider : PeriodicRunner, IWalletProvider
(await _storeRepository.GetSettingsAsync(nameof(WabisabiStoreSettings))));
_initialLoad.SetResult();
}, cancellationToken);
- _disposables.Add(_eventAggregator.SubscribeAsync(async @event =>
+ _disposables.Add(_eventAggregator.SubscribeAsync(async @event =>
{
await _initialLoad.Task;
await UnloadWallet(@event.StoreId);
diff --git a/submodules/btcpayserver b/submodules/btcpayserver
index 5534dde..ba8feed 160000
--- a/submodules/btcpayserver
+++ b/submodules/btcpayserver
@@ -1 +1 @@
-Subproject commit 5534ddeb285e2875a585a6da3724893451a4ddb6
+Subproject commit ba8feeddd990cb2e66b028709e0d5f9159437826