bump everything

This commit is contained in:
Andrew Camilleri
2025-01-29 09:15:54 +01:00
parent 90684c9f0b
commit f6ecc8fd72
16 changed files with 24 additions and 23 deletions

View File

@@ -9,7 +9,7 @@
<PropertyGroup> <PropertyGroup>
<Product>Breez / Greenlight</Product> <Product>Breez / Greenlight</Product>
<Description>Lightweight lightning baby!</Description> <Description>Lightweight lightning baby!</Description>
<Version>1.0.9</Version> <Version>1.0.10</Version>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>
<!-- Plugin development properties --> <!-- Plugin development properties -->

View File

@@ -12,7 +12,7 @@ namespace BTCPayServer.Plugins.Breez
{ {
public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = 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) public override void Execute(IServiceCollection applicationBuilder)

View File

@@ -45,13 +45,13 @@ public class BreezService:EventHostedServiceBase
protected override void SubscribeToEvents() protected override void SubscribeToEvents()
{ {
Subscribe<StoreRemovedEvent>(); Subscribe<StoreEvent.Removed>();
base.SubscribeToEvents(); base.SubscribeToEvents();
} }
protected override async Task ProcessEvent(object evt, CancellationToken cancellationToken) 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); await Handle(storeRemovedEvent.StoreId, null);
_settings.Remove(storeRemovedEvent.StoreId); _settings.Remove(storeRemovedEvent.StoreId);

View File

@@ -9,7 +9,7 @@
<PropertyGroup> <PropertyGroup>
<Product>Bringin</Product> <Product>Bringin</Product>
<Description>Euro Offramp</Description> <Description>Euro Offramp</Description>
<Version>1.0.3</Version> <Version>1.0.4</Version>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>
<!-- Plugin development properties --> <!-- Plugin development properties -->

View File

@@ -13,7 +13,7 @@ public class BringinPlugin : BaseBTCPayServerPlugin
{ {
new() new()
{ {
Identifier = nameof(BTCPayServer), Condition = ">=2.0.0" Identifier = nameof(BTCPayServer), Condition = ">=2.0.6"
} }
}; };

View File

@@ -69,7 +69,7 @@ public class BringinService : EventHostedServiceBase
protected override void SubscribeToEvents() protected override void SubscribeToEvents()
{ {
base.SubscribeToEvents(); base.SubscribeToEvents();
Subscribe<StoreRemovedEvent>(); Subscribe<StoreEvent.Removed>();
Subscribe<InvoiceEvent>(); Subscribe<InvoiceEvent>();
Subscribe<PayoutEvent>(); Subscribe<PayoutEvent>();
} }
@@ -117,7 +117,7 @@ public class BringinService : EventHostedServiceBase
{ {
var storeId = evt switch var storeId = evt switch
{ {
StoreRemovedEvent storeRemovedEvent => storeRemovedEvent.StoreId, StoreEvent.Removed storeRemovedEvent => storeRemovedEvent.StoreId,
InvoiceEvent invoiceEvent => invoiceEvent.Invoice.StoreId, InvoiceEvent invoiceEvent => invoiceEvent.Invoice.StoreId,
PayoutEvent payoutEvent => payoutEvent.Payout.StoreDataId, PayoutEvent payoutEvent => payoutEvent.Payout.StoreDataId,
_ => null _ => null
@@ -129,7 +129,7 @@ public class BringinService : EventHostedServiceBase
{ {
switch (evt) switch (evt)
{ {
case StoreRemovedEvent storeRemovedEvent: case StoreEvent.Removed storeRemovedEvent:
_settings.TryRemove(storeRemovedEvent.StoreId, out _); _settings.TryRemove(storeRemovedEvent.StoreId, out _);
break; break;
case InvoiceEvent case InvoiceEvent

View File

@@ -9,7 +9,7 @@
<PropertyGroup> <PropertyGroup>
<Product>File Seller</Product> <Product>File Seller</Product>
<Description>Allows you to sell files through the point of sale/crowdfund apps.</Description> <Description>Allows you to sell files through the point of sale/crowdfund apps.</Description>
<Version>1.0.5</Version> <Version>1.0.6</Version>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>
<!-- Plugin development properties --> <!-- Plugin development properties -->

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using BTCPayServer.Client.Models;
using BTCPayServer.Events; using BTCPayServer.Events;
using BTCPayServer.HostedServices; using BTCPayServer.HostedServices;
using BTCPayServer.Plugins.Crowdfund; using BTCPayServer.Plugins.Crowdfund;
@@ -46,7 +47,7 @@ namespace BTCPayServer.Plugins.FileSeller
protected override async Task ProcessEvent(object evt, CancellationToken cancellationToken) protected override async Task ProcessEvent(object evt, CancellationToken cancellationToken)
{ {
if (evt is not InvoiceEvent invoiceEvent) return; if (evt is not InvoiceEvent invoiceEvent) return;
List<PosCartItem> cartItems = null; List<AppCartItem> cartItems = null;
if (invoiceEvent.Name is not (InvoiceEvent.Completed or InvoiceEvent.MarkedCompleted if (invoiceEvent.Name is not (InvoiceEvent.Completed or InvoiceEvent.MarkedCompleted
or InvoiceEvent.Confirmed)) or InvoiceEvent.Confirmed))
{ {
@@ -68,11 +69,11 @@ namespace BTCPayServer.Plugins.FileSeller
if ((!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode) || if ((!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode) ||
AppService.TryParsePosCartItems(invoiceEvent.Invoice.Metadata.PosData, out cartItems))) AppService.TryParsePosCartItems(invoiceEvent.Invoice.Metadata.PosData, out cartItems)))
{ {
var items = cartItems ?? new List<PosCartItem>(); var items = cartItems ?? new List<AppCartItem>();
if (!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode) && if (!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode) &&
!items.Exists(cartItem => cartItem.Id == 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, Id = invoiceEvent.Invoice.Metadata.ItemCode,
Count = 1, Count = 1,

View File

@@ -645,7 +645,7 @@ public class MicroNodeService : EventHostedServiceBase
PushEvent(new CreatePayoutEvt()); PushEvent(new CreatePayoutEvt());
}, cancellationToken); }, cancellationToken);
}else if (evt is StoreRemovedEvent storeRemovedEvent) }else if (evt is StoreEvent.Removed storeRemovedEvent)
{ {
_storeSettings.Remove(storeRemovedEvent.StoreId); _storeSettings.Remove(storeRemovedEvent.StoreId);
_ownerSettings.Remove(storeRemovedEvent.StoreId); _ownerSettings.Remove(storeRemovedEvent.StoreId);
@@ -665,7 +665,7 @@ public class MicroNodeService : EventHostedServiceBase
{ {
Subscribe<PayoutEvent>(); Subscribe<PayoutEvent>();
Subscribe<CreatePayoutEvt>(); Subscribe<CreatePayoutEvt>();
Subscribe<StoreRemovedEvent>(); Subscribe<StoreEvent.Removed>();
Subscribe<CheckActiveTransactions>(); Subscribe<CheckActiveTransactions>();
base.SubscribeToEvents(); base.SubscribeToEvents();
} }

View File

@@ -11,7 +11,7 @@
<PropertyGroup> <PropertyGroup>
<Product>Prism</Product> <Product>Prism</Product>
<Description>Automated value splits for Bitcoin.</Description> <Description>Automated value splits for Bitcoin.</Description>
<Version>1.3.0</Version> <Version>1.3.1</Version>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>
<!-- Plugin development properties --> <!-- Plugin development properties -->

View File

@@ -11,7 +11,7 @@ public class PrismPlugin : BaseBTCPayServerPlugin
{ {
public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = 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) public override void Execute(IServiceCollection applicationBuilder)

View File

@@ -103,7 +103,7 @@ namespace BTCPayServer.Plugins.Prism
base.SubscribeToEvents(); base.SubscribeToEvents();
Subscribe<InvoiceEvent>(); Subscribe<InvoiceEvent>();
Subscribe<PayoutEvent>(); Subscribe<PayoutEvent>();
Subscribe<StoreRemovedEvent>(); Subscribe<StoreEvent.Removed>();
} }
class CheckPayoutsEvt class CheckPayoutsEvt
@@ -439,7 +439,7 @@ namespace BTCPayServer.Plugins.Prism
switch (evt) switch (evt)
{ {
case StoreRemovedEvent storeRemovedEvent: case StoreEvent.Removed storeRemovedEvent:
_prismSettings.Remove(storeRemovedEvent.StoreId); _prismSettings.Remove(storeRemovedEvent.StoreId);
return; return;
case InvoiceEvent invoiceEvent when case InvoiceEvent invoiceEvent when

View File

@@ -13,7 +13,7 @@
<PropertyGroup> <PropertyGroup>
<Product>Coinjoin</Product> <Product>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.103</Version> <Version>1.0.104</Version>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>

View File

@@ -31,7 +31,7 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
{ {
public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = 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) public override void Execute(IServiceCollection applicationBuilder)
{ {

View File

@@ -265,7 +265,7 @@ public class WalletProvider : PeriodicRunner, IWalletProvider
(await _storeRepository.GetSettingsAsync<WabisabiStoreSettings>(nameof(WabisabiStoreSettings)))); (await _storeRepository.GetSettingsAsync<WabisabiStoreSettings>(nameof(WabisabiStoreSettings))));
_initialLoad.SetResult(); _initialLoad.SetResult();
}, cancellationToken); }, cancellationToken);
_disposables.Add(_eventAggregator.SubscribeAsync<StoreRemovedEvent>(async @event => _disposables.Add(_eventAggregator.SubscribeAsync<StoreEvent.Removed>(async @event =>
{ {
await _initialLoad.Task; await _initialLoad.Task;
await UnloadWallet(@event.StoreId); await UnloadWallet(@event.StoreId);