Update Changelog (#5583)

Fixes #5564.

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -31,7 +31,7 @@
   </ItemGroup>
     <ItemGroup>
       <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.5.1" />
-      <PackageReference Include="NBitcoin" Version="7.0.31" />
+      <PackageReference Include="NBitcoin" Version="7.0.32" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
   <ItemGroup>

BTCPayServer.Client/BTCPayServerClient.PullPayments.cs

@@ -20,6 +20,12 @@ namespace BTCPayServer.Client
             return await HandleResponse<PullPaymentData>(response);
         }
 
+        public virtual async Task<RegisterBoltcardResponse> RegisterBoltcard(string pullPaymentId, RegisterBoltcardRequest request, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/boltcards", bodyPayload: request, method: HttpMethod.Post), cancellationToken);
+            return await HandleResponse<RegisterBoltcardResponse>(response);
+        }
+
         public virtual async Task<PullPaymentData[]> GetPullPayments(string storeId, bool includeArchived = false, CancellationToken cancellationToken = default)
         {
             Dictionary<string, object> query = new Dictionary<string, object>();

BTCPayServer.Client/Models/RegisterBoltcardRequest.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NBitcoin.JsonConverters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace BTCPayServer.Client.Models
+{
+    public enum OnExistingBehavior
+    {
+        KeepVersion,
+        UpdateVersion
+    }
+    public class RegisterBoltcardRequest
+    {
+        [JsonConverter(typeof(HexJsonConverter))]
+        [JsonProperty("UID")]
+        public byte[] UID { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public OnExistingBehavior? OnExisting { get; set; }
+    }
+    public class RegisterBoltcardResponse
+    {
+        [JsonProperty("LNURLW")]
+        public string LNURLW { get; set; }
+        public int Version { get; set; }
+        [JsonProperty("K0")]
+        public string K0 { get; set; }
+        [JsonProperty("K1")]
+        public string K1 { get; set; }
+        [JsonProperty("K2")]
+        public string K2 { get; set; }
+        [JsonProperty("K3")]
+        public string K3 { get; set; }
+        [JsonProperty("K4")]
+        public string K4 { get; set; }
+    }
+}

BTCPayServer.Client/Models/WebhookInvoiceEvent.cs

@@ -63,6 +63,7 @@ namespace BTCPayServer.Client.Models
         }
 
         public bool ManuallyMarked { get; set; }
+        public bool OverPaid { get; set; }
     }
 
     public class WebhookInvoiceInvalidEvent : WebhookInvoiceEvent
@@ -92,7 +93,6 @@ namespace BTCPayServer.Client.Models
         public bool AfterExpiration { get; set; }
         public string PaymentMethod { get; set; }
         public InvoicePaymentMethodDataModel.Payment Payment { get; set; }
-        public bool OverPaid { get; set; }
     }
 
     public class WebhookInvoicePaymentSettledEvent : WebhookInvoiceReceivedPaymentEvent

BTCPayServer.Data/ApplicationDbContext.cs

@@ -93,7 +93,7 @@ namespace BTCPayServer.Data
             ApplicationUser.OnModelCreating(builder, Database);
             AddressInvoiceData.OnModelCreating(builder);
             APIKeyData.OnModelCreating(builder, Database);
-            AppData.OnModelCreating(builder);
+            AppData.OnModelCreating(builder, Database);
             CustodianAccountData.OnModelCreating(builder, Database);
             //StoredFile.OnModelCreating(builder);
             InvoiceEventData.OnModelCreating(builder);

BTCPayServer.Data/Data/AppData.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Data
@@ -16,13 +17,20 @@ namespace BTCPayServer.Data
         public string Settings { get; set; }
         public bool Archived { get; set; }
 
-        internal static void OnModelCreating(ModelBuilder builder)
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<AppData>()
                        .HasOne(o => o.StoreData)
                        .WithMany(i => i.Apps).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<AppData>()
                     .HasOne(a => a.StoreData);
+
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<AppData>()
+                    .Property(o => o.Settings)
+                    .HasColumnType("JSONB");
+            }
         }
 
         // utility methods

BTCPayServer.Data/Data/InvoiceData.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -31,7 +32,9 @@ namespace BTCPayServer.Data
         public List<InvoiceSearchData> InvoiceSearchData { get; set; }
         public List<RefundData> Refunds { get; set; }
 
-
+        [Timestamp]
+        // With this, update of InvoiceData will fail if the row was modified by another process
+        public uint XMin { get; set; }
         internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<InvoiceData>()

BTCPayServer.Data/Migrations/20230906135844_AddArchivedFlagForStoresAndApps.cs

@@ -1,4 +1,4 @@
-using BTCPayServer.Data;
+using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 

BTCPayServer.Data/Migrations/20231020135844_AddBoltcardsTable.cs

@@ -0,0 +1,38 @@
+using System.Security.Permissions;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20231020135844_AddBoltcardsTable")]
+    public partial class AddBoltcardsTable : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "boltcards",
+                columns: table => new
+                {
+                    id = table.Column<string>(maxLength: 32, nullable: false),
+                    counter = table.Column<int>(type: "INT", nullable: false, defaultValue: 0),
+                    ppid = table.Column<string>(maxLength: 30, nullable: true),
+                    version = table.Column<int>(nullable: false, defaultValue: 0)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_id", x => x.id);
+                    table.ForeignKey("FK_boltcards_PullPayments", x => x.ppid, "PullPayments", "Id", onDelete: ReferentialAction.SetNull);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable("boltcards");
+        }
+    }
+}

BTCPayServer.Data/Migrations/20231219031609_appssettingstojson.cs

@@ -0,0 +1,26 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20231219031609_appssettingstojson")]
+    public partial class appssettingstojson : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (migrationBuilder.IsNpgsql())
+            {
+                migrationBuilder.Sql("ALTER TABLE \"Apps\" ALTER COLUMN \"Settings\" TYPE JSONB USING \"Settings\"::JSONB");
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -16,25 +16,7 @@ namespace BTCPayServer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "6.0.9");
-
-            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
-                {
-                    b.Property<string>("Address")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset?>("CreatedTime")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("InvoiceDataId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Address");
-
-                    b.HasIndex("InvoiceDataId");
-
-                    b.ToTable("AddressInvoices");
-                });
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
 
             modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
                 {
@@ -71,6 +53,24 @@ namespace BTCPayServer.Migrations
                     b.ToTable("ApiKeys");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+                {
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTimeOffset?>("CreatedTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InvoiceDataId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Address");
+
+                    b.HasIndex("InvoiceDataId");
+
+                    b.ToTable("AddressInvoices");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
                 {
                     b.Property<string>("Id")
@@ -305,6 +305,11 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("StoreDataId")
                         .HasColumnType("TEXT");
 
+                    b.Property<uint>("XMin")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("Id");
 
                     b.HasIndex("Created");
@@ -781,31 +786,6 @@ namespace BTCPayServer.Migrations
                     b.ToTable("Stores");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ApplicationUserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("FileName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("StorageFileName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("Timestamp")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ApplicationUserId");
-
-                    b.ToTable("Files");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.StoreRole", b =>
                 {
                     b.Property<string>("Id")
@@ -863,6 +843,31 @@ namespace BTCPayServer.Migrations
                     b.ToTable("StoreWebhooks");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StorageFileName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.ToTable("Files");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
                 {
                     b.Property<string>("Id")
@@ -1171,16 +1176,6 @@ namespace BTCPayServer.Migrations
                     b.ToTable("AspNetUserTokens", (string)null);
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("AddressInvoices")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("InvoiceData");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
@@ -1198,6 +1193,16 @@ namespace BTCPayServer.Migrations
                     b.Navigation("User");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("AddressInvoices")
+                        .HasForeignKey("InvoiceDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("InvoiceData");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
@@ -1408,15 +1413,6 @@ namespace BTCPayServer.Migrations
                     b.Navigation("PullPaymentData");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
-                        .WithMany("StoredFiles")
-                        .HasForeignKey("ApplicationUserId");
-
-                    b.Navigation("ApplicationUser");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.StoreRole", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
@@ -1457,6 +1453,15 @@ namespace BTCPayServer.Migrations
                     b.Navigation("Webhook");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
+                        .WithMany("StoredFiles")
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.Navigation("ApplicationUser");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
                 {
                     b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")

BTCPayServer.Rating/BTCPayServer.Rating.csproj

@@ -6,7 +6,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
-    <PackageReference Include="NBitcoin" Version="7.0.31" />
+    <PackageReference Include="NBitcoin" Version="7.0.32" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="1.0.4" />
   </ItemGroup>

BTCPayServer.Rating/Providers/BTCTurkRateProvider.cs

@@ -29,7 +29,7 @@ namespace BTCPayServer.Rating.Providers
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.btcturk.com/api/v2/ticker", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.btcturk.com/api/v2/ticker", cancellationToken);
             var jarray = (JArray)(await response.Content.ReadAsAsync<JObject>(cancellationToken))["data"];
             var tickers = jarray.ToObject<Ticker[]>();
             return tickers

BTCPayServer.Rating/Providers/BitbankRateProvider.cs

@@ -21,7 +21,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://public.bitbank.cc/tickers", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://public.bitbank.cc/tickers", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             var data = jobj.ContainsKey("data") ? jobj["data"] : null;
             if (jobj["success"]?.Value<int>() != 1)

BTCPayServer.Rating/Providers/BitflyerRateProvider.cs

@@ -19,7 +19,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.bitflyer.jp/v1/ticker", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.bitflyer.jp/v1/ticker", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             if (jobj.Property("error_message")?.Value?.Value<string>() is string err)
             {

BTCPayServer.Rating/Providers/BitpayRateProvider.cs

@@ -19,7 +19,9 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://bitpay.com/rates", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://bitpay.com/rates", cancellationToken);
+            if (response.Content.Headers.ContentType?.MediaType is not "application/json")
+                throw new HttpRequestException($"Unexpected content type when querying currency rates from Bitpay ({response.Content.Headers.ContentType?.MediaType})");
             var jarray = (JArray)(await response.Content.ReadAsAsync<JObject>(cancellationToken))["data"];
             return jarray
                 .Children<JObject>()

BTCPayServer.Rating/Providers/BudaRateProvider.cs

@@ -18,7 +18,7 @@ public class BudaRateProvider : IRateProvider
 
     public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
     {
-        var response = await _httpClient.GetAsync("https://www.buda.com/api/v2/markets/btc-clp/ticker", cancellationToken);
+        using var response = await _httpClient.GetAsync("https://www.buda.com/api/v2/markets/btc-clp/ticker", cancellationToken);
         var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
         var minAsk = jobj["ticker"]["min_ask"][0].Value<decimal>();
         var maxBid = jobj["ticker"]["max_bid"][0].Value<decimal>();

BTCPayServer.Rating/Providers/ByllsRateProvider.cs

@@ -18,7 +18,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://bylls.com/api/price?from_currency=BTC&to_currency=CAD", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://bylls.com/api/price?from_currency=BTC&to_currency=CAD", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             var value = jobj["public_price"]["to_price"].Value<decimal>();
             return new[] { new PairRate(new CurrencyPair("BTC", "CAD"), new BidAsk(value)) };

BTCPayServer.Rating/Providers/CryptoMarketExchangeRateProvider.cs

@@ -28,7 +28,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.exchange.cryptomkt.com/api/3/public/ticker/", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.exchange.cryptomkt.com/api/3/public/ticker/", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
 
             return ((jobj as JObject) ?? new JObject())

BTCPayServer.Rating/Providers/FreeCurrencyRatesRateProvider.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -18,7 +18,7 @@ public class FreeCurrencyRatesRateProvider : IRateProvider
 
     public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
     {
-        var response = await _httpClient.GetAsync(RateSourceInfo.Url, cancellationToken);
+        using var response = await _httpClient.GetAsync(RateSourceInfo.Url, cancellationToken);
         response.EnsureSuccessStatusCode();
         var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
         var results = (JObject) jobj["btc"] ;

BTCPayServer.Rating/Providers/HitBTCRateProvider.cs

@@ -21,7 +21,7 @@ namespace BTCPayServer.Rating
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.hitbtc.com/api/2/public/ticker", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.hitbtc.com/api/2/public/ticker", cancellationToken);
             var jarray = await response.Content.ReadAsAsync<JArray>(cancellationToken);
             return jarray
                 .Children<JObject>()

BTCPayServer.Rating/Providers/KrakenExchangeRateProvider.cs

@@ -172,7 +172,7 @@ namespace BTCPayServer.Services.Rates
                 sb.Append(String.Join('&', payload.Select(kv => $"{kv.Key}={kv.Value}").OfType<object>().ToArray()));
             }
             var request = new HttpRequestMessage(HttpMethod.Get, sb.ToString());
-            var response = await HttpClient.SendAsync(request, cancellationToken);
+            using var response = await HttpClient.SendAsync(request, cancellationToken);
             string stringResult = await response.Content.ReadAsStringAsync();
             var result = JsonConvert.DeserializeObject<T>(stringResult);
             if (result is JToken json)

BTCPayServer.Rating/Providers/RipioExchangeProvider.cs

@@ -21,7 +21,7 @@ namespace BTCPayServer.Services.Rates
         }
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.ripiotrade.co/v4/public/tickers", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.ripiotrade.co/v4/public/tickers", cancellationToken);
             response.EnsureSuccessStatusCode();
             var jarray = (JArray)(await response.Content.ReadAsAsync<JObject>(cancellationToken))["data"];
             return jarray

BTCPayServer.Rating/Providers/YadioRateProvider.cs

@@ -23,7 +23,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.yadio.io/exrates/BTC", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.yadio.io/exrates/BTC", cancellationToken);
             response.EnsureSuccessStatusCode();
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             var results = jobj["BTC"];

BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Data;
+using BTCPayServer.Events;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Hosting;
 using BTCPayServer.Lightning;
@@ -23,6 +24,7 @@ using Newtonsoft.Json.Linq;
 using OpenQA.Selenium;
 using Xunit;
 using Xunit.Abstractions;
+using Xunit.Sdk;
 using WalletSettingsViewModel = BTCPayServer.Models.StoreViewModels.WalletSettingsViewModel;
 
 namespace BTCPayServer.Tests
@@ -756,24 +758,26 @@ noninventoryitem:
                 vmpos.Template = AppService.SerializeTemplate(MigrationStartupTask.ParsePOSYML(vmpos.Template));
                 Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
 
-                //inventoryitem has 1 item available
-                await tester.WaitForEvent<AppInventoryUpdaterHostedService.UpdateAppInventory>(() =>
+                async Task AssertCanBuy(string choiceKey, bool expected)
                 {
-                    Assert.IsType<RedirectToActionResult>(publicApps
-                        .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "inventoryitem").Result);
-                    return Task.CompletedTask;
-                });
+                    var redirect = Assert.IsType<RedirectToActionResult>(await publicApps
+                        .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: choiceKey));
+                    if (expected)
+                        Assert.Equal("UIInvoice", redirect.ControllerName);
+                    else
+                        Assert.NotEqual("UIInvoice", redirect.ControllerName);
+                }
+
+                //inventoryitem has 1 item available
+                await AssertCanBuy("inventoryitem", true);
 
                 //we already bought all available stock so this should fail
                 await Task.Delay(100);
-                Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "inventoryitem").Result);
+                await AssertCanBuy("inventoryitem", false);
 
                 //inventoryitem has unlimited items available
-                Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "noninventoryitem").Result);
-                Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "noninventoryitem").Result);
+                await AssertCanBuy("noninventoryitem", true);
+                await AssertCanBuy("noninventoryitem", true);
 
                 //verify invoices where created
                 invoices = user.BitPay.GetInvoices();
@@ -805,7 +809,6 @@ btconly:
     - BTC
 normal:
   price: 1.0";
-
                 vmpos.Template = AppService.SerializeTemplate(MigrationStartupTask.ParsePOSYML(vmpos.Template));
                 Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
                 Assert.IsType<RedirectToActionResult>(publicApps

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <Import Project="../Build/Common.csproj" />
   <PropertyGroup>
     <NoWarn>$(NoWarn),xUnit1031</NoWarn>
@@ -25,8 +25,8 @@
     <PackageReference Include="Selenium.Support" Version="4.1.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.1.1" />
 	<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="119.0.6045.10500" />
-	<PackageReference Include="xunit" Version="2.6.2" />
-	<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+	<PackageReference Include="xunit" Version="2.6.3" />
+	<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -232,17 +232,13 @@ namespace BTCPayServer.Tests
                 ndax.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("BTC_CAD"), new BidAsk(6000m)));
                 rateProvider.Providers.Add("ndax", ndax);
 
-                var bittrex = new MockRateProvider();
-                bittrex.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("DOGE_BTC"), new BidAsk(0.004m)));
-                rateProvider.Providers.Add("bittrex", bittrex);
-
-
                 var bitfinex = new MockRateProvider();
                 bitfinex.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("UST_BTC"), new BidAsk(0.000136m)));
                 rateProvider.Providers.Add("bitfinex", bitfinex);
 
                 var bitpay = new MockRateProvider();
                 bitpay.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("ETB_BTC"), new BidAsk(0.1m)));
+                bitpay.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("DOGE_BTC"), new BidAsk(0.004m)));
                 rateProvider.Providers.Add("bitpay", bitpay);
                 var kraken = new MockRateProvider();
                 kraken.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("ETH_BTC"), new BidAsk(0.1m)));

BTCPayServer.Tests/Extensions.cs

@@ -197,10 +197,11 @@ retry:
             driver.FindElement(selector).Click();
         }
 
-        [DebuggerHidden]
         public static bool ElementDoesNotExist(this IWebDriver driver, By selector)
         {
-            Assert.Throws<NoSuchElementException>(() =>
+            Assert.Throws<NoSuchElementException>(
+            [DebuggerStepThrough]
+            () =>
             {
                 driver.FindElement(selector);
             });

BTCPayServer.Tests/FastTests.cs

@@ -1005,7 +1005,7 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
         public async Task CheckRatesProvider()
         {
             var spy = new SpyRateProvider();
-            RateRules.TryParse("X_X = bittrex(X_X);", out var rateRules);
+            RateRules.TryParse("X_X = bitpay(X_X);", out var rateRules);
 
             var factory = CreateBTCPayRateFactory();
             factory.Providers.Clear();
@@ -1013,7 +1013,7 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
             factory.Providers.Clear();
             var fetch = new BackgroundFetcherRateProvider(spy);
             fetch.DoNotAutoFetchIfExpired = true;
-            factory.Providers.Add("bittrex", fetch);
+            factory.Providers.Add("bitpay", fetch);
             var fetchedRate = await fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default);
             spy.AssertHit();
             fetchedRate = await fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default);
@@ -1614,7 +1614,7 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
             StringBuilder builder = new StringBuilder();
             builder.AppendLine("// Some cool comments");
             builder.AppendLine("DOGE_X = DOGE_BTC * BTC_X * 1.1");
-            builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
+            builder.AppendLine("DOGE_BTC = bitpay(DOGE_BTC)");
             builder.AppendLine("// Some other cool comments");
             builder.AppendLine("BTC_usd = kraken(BTC_USD)");
             builder.AppendLine("BTC_X = Coinbase(BTC_X);");
@@ -1625,7 +1625,7 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
             Assert.Equal(
                 "// Some cool comments\n" +
                 "DOGE_X = DOGE_BTC * BTC_X * 1.1;\n" +
-                "DOGE_BTC = bittrex(DOGE_BTC);\n" +
+                "DOGE_BTC = bitpay(DOGE_BTC);\n" +
                 "// Some other cool comments\n" +
                 "BTC_USD = kraken(BTC_USD);\n" +
                 "BTC_X = coinbase(BTC_X);\n" +
@@ -1633,10 +1633,10 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
                 rules.ToString());
             var tests = new[]
             {
-                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * kraken(BTC_USD) * 1.1"),
+                (Pair: "DOGE_USD", Expected: "bitpay(DOGE_BTC) * kraken(BTC_USD) * 1.1"),
                 (Pair: "BTC_USD", Expected: "kraken(BTC_USD)"),
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)"),
-                (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1"),
+                (Pair: "DOGE_CAD", Expected: "bitpay(DOGE_BTC) * coinbase(BTC_CAD) * 1.1"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02"),
                 (Pair: "SATS_CAD", Expected: "0.00000001 * coinbase(BTC_CAD)"),
                 (Pair: "Sats_USD", Expected: "0.00000001 * kraken(BTC_USD)")
@@ -1646,13 +1646,13 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
                 Assert.Equal(test.Expected, rules.GetRuleFor(CurrencyPair.Parse(test.Pair)).ToString());
             }
             rules.Spread = 0.2m;
-            Assert.Equal("(bittrex(DOGE_BTC) * kraken(BTC_USD) * 1.1) * (0.8, 1.2)", rules.GetRuleFor(CurrencyPair.Parse("DOGE_USD")).ToString());
+            Assert.Equal("(bitpay(DOGE_BTC) * kraken(BTC_USD) * 1.1) * (0.8, 1.2)", rules.GetRuleFor(CurrencyPair.Parse("DOGE_USD")).ToString());
             ////////////////
 
             // Check errors conditions
             builder = new StringBuilder();
             builder.AppendLine("DOGE_X = LTC_CAD * BTC_X * 1.1");
-            builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
+            builder.AppendLine("DOGE_BTC = bitpay(DOGE_BTC)");
             builder.AppendLine("BTC_usd = kraken(BTC_USD)");
             builder.AppendLine("LTC_CHF = LTC_CHF * 1.01");
             builder.AppendLine("BTC_X = Coinbase(BTC_X)");
@@ -1673,7 +1673,7 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
             // Check if we can resolve exchange rates
             builder = new StringBuilder();
             builder.AppendLine("DOGE_X = DOGE_BTC * BTC_X * 1.1");
-            builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
+            builder.AppendLine("DOGE_BTC = bitpay(DOGE_BTC)");
             builder.AppendLine("BTC_usd = kraken(BTC_USD)");
             builder.AppendLine("BTC_X = Coinbase(BTC_X)");
             builder.AppendLine("X_X = CoinAverage(X_X) * 1.02");
@@ -1681,10 +1681,10 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
 
             var tests2 = new[]
             {
-                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * kraken(BTC_USD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),kraken(BTC_USD)"),
+                (Pair: "DOGE_USD", Expected: "bitpay(DOGE_BTC) * kraken(BTC_USD) * 1.1", ExpectedExchangeRates: "bitpay(DOGE_BTC),kraken(BTC_USD)"),
                 (Pair: "BTC_USD", Expected: "kraken(BTC_USD)", ExpectedExchangeRates: "kraken(BTC_USD)"),
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)", ExpectedExchangeRates: "coinbase(BTC_CAD)"),
-                (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),coinbase(BTC_CAD)"),
+                (Pair: "DOGE_CAD", Expected: "bitpay(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", ExpectedExchangeRates: "bitpay(DOGE_BTC),coinbase(BTC_CAD)"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02", ExpectedExchangeRates: "coinaverage(LTC_CAD)"),
                 (Pair: "SATS_USD", Expected: "0.00000001 * kraken(BTC_USD)", ExpectedExchangeRates: "kraken(BTC_USD)"),
                 (Pair: "SATS_EUR", Expected: "0.00000001 * coinbase(BTC_EUR)", ExpectedExchangeRates: "coinbase(BTC_EUR)")
@@ -1696,11 +1696,11 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
                 Assert.Equal(test.ExpectedExchangeRates, string.Join(',', rule.ExchangeRates.OfType<object>().ToArray()));
             }
             var rule2 = rules.GetRuleFor(CurrencyPair.Parse("DOGE_CAD"));
-            rule2.ExchangeRates.SetRate("bittrex", CurrencyPair.Parse("DOGE_BTC"), new BidAsk(5000m));
+            rule2.ExchangeRates.SetRate("bitpay", CurrencyPair.Parse("DOGE_BTC"), new BidAsk(5000m));
             rule2.Reevaluate();
             Assert.True(rule2.HasError);
             Assert.Equal("5000 * ERR_RATE_UNAVAILABLE(coinbase, BTC_CAD) * 1.1", rule2.ToString(true));
-            Assert.Equal("bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", rule2.ToString(false));
+            Assert.Equal("bitpay(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", rule2.ToString(false));
             rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(2000.4m));
             rule2.Reevaluate();
             Assert.False(rule2.HasError);
@@ -2110,6 +2110,7 @@ Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString(
         [Fact]
         public void AllPoliciesShowInUI()
         {
+            var a = new BitpayRateProvider(new System.Net.Http.HttpClient()).GetRatesAsync(default).Result;
             foreach (var policy in Policies.AllPolicies)
             {
                 Assert.True(UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.ContainsKey(policy));

BTCPayServer.Tests/GreenfieldAPITests.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
+using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Contracts;
@@ -28,6 +29,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Xunit;
 using Xunit.Abstractions;
+using Xunit.Sdk;
 using CreateApplicationUserRequest = BTCPayServer.Client.Models.CreateApplicationUserRequest;
 
 namespace BTCPayServer.Tests
@@ -1084,7 +1086,39 @@ namespace BTCPayServer.Tests
             Assert.IsType<string>(lnrURLs.LNURLUri);
             Assert.Equal(12.303228134m, test4.Amount);
             Assert.Equal("BTC", test4.Currency);
-            
+
+            // Check we can register Boltcard
+            var uid = new byte[7];
+            RandomNumberGenerator.Fill(uid);
+            var card = await client.RegisterBoltcard(test4.Id, new RegisterBoltcardRequest()
+            {
+                UID = uid
+            });
+            Assert.Equal(0, card.Version);
+            var card1keys = new[] { card.K0, card.K1, card.K2, card.K3, card.K4 };
+            Assert.DoesNotContain(null, card1keys);
+            var card2 = await client.RegisterBoltcard(test4.Id, new RegisterBoltcardRequest()
+            {
+                UID = uid
+            });
+            Assert.Equal(1, card2.Version);
+            Assert.StartsWith("lnurlw://", card2.LNURLW);
+            Assert.EndsWith("/boltcard", card2.LNURLW);
+            var card2keys = new[] { card2.K0, card2.K1, card2.K2, card2.K3, card2.K4 };
+            Assert.DoesNotContain(null, card2keys);
+            for (int i = 0; i < card1keys.Length; i++)
+            {
+                if (i == 1)
+                    Assert.Contains(card1keys[i], card2keys);
+                else
+                    Assert.DoesNotContain(card1keys[i], card2keys);
+            }
+            var card3 = await client.RegisterBoltcard(test4.Id, new RegisterBoltcardRequest()
+            {
+                UID = uid,
+                OnExisting = OnExistingBehavior.KeepVersion
+            });
+            Assert.Equal(card2.Version, card3.Version);
             // Test with SATS denomination values
             var testSats = await client.CreatePullPayment(storeId, new Client.Models.CreatePullPaymentRequest()
             {
@@ -3783,9 +3817,19 @@ namespace BTCPayServer.Tests
                 {
                     case "before-automated-payout-processing":
                         beforeHookTcs.TrySetResult();
+                        var bd = (BeforePayoutActionData)tuple.args;
+                        foreach (var p in bd.Payouts)
+                        {
+                            TestLogs.LogInformation("Before Processed: " + p.Id);
+                        }
                         break;
                     case "after-automated-payout-processing":
                         afterHookTcs.TrySetResult();
+                        var ad = (AfterPayoutActionData)tuple.args;
+                        foreach (var p in ad.Payouts)
+                        {
+                            TestLogs.LogInformation("After Processed: " + p.Id);
+                        }
                         break;
                 }
             };
@@ -3800,7 +3844,21 @@ namespace BTCPayServer.Tests
             await beforeHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
             await afterHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
             payouts = await adminClient.GetStorePayouts(admin.StoreId);
-            Assert.Single(payouts.Where(data => data.State == PayoutState.InProgress && data.Id == payoutThatShouldBeProcessedStraightAway.Id));
+            try
+            {
+                Assert.Single(payouts.Where(data => data.State == PayoutState.InProgress && data.Id == payoutThatShouldBeProcessedStraightAway.Id));
+            }
+            catch (SingleException)
+            {
+                TestLogs.LogInformation("Debugging flaky test...");
+                TestLogs.LogInformation("payoutThatShouldBeProcessedStraightAway: " + payoutThatShouldBeProcessedStraightAway.Id);
+                foreach (var p in payouts)
+                {
+                    TestLogs.LogInformation("Payout Id: " + p.Id);
+                    TestLogs.LogInformation("Payout State: " + p.State);
+                }
+                throw;
+            }
             
             beforeHookTcs = new TaskCompletionSource();
             afterHookTcs = new TaskCompletionSource();

BTCPayServer.Tests/SeleniumTester.cs

@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -99,14 +98,25 @@ namespace BTCPayServer.Tests
             Driver.FindElement(By.Id("FakePayment")).Click();
             if (mine)
             {
+                TestUtils.Eventually(() =>
+                {
+                    Driver.WaitForElement(By.Id("CheatSuccessMessage"));
+                });
                 MineBlockOnInvoiceCheckout();
             }
         }
 
         public void MineBlockOnInvoiceCheckout()
         {
-            Driver.FindElement(By.CssSelector("#mine-block button")).Click();
-
+            retry:
+            try
+            {
+                Driver.FindElement(By.CssSelector("#mine-block button")).Click();
+            }
+            catch (StaleElementReferenceException)
+            {
+                goto retry;
+            }
         }
 
         /// <summary>

BTCPayServer.Tests/SeleniumTests.cs

@@ -6,6 +6,7 @@ using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -17,6 +18,7 @@ using BTCPayServer.Controllers;
 using BTCPayServer.Data;
 using BTCPayServer.Lightning;
 using BTCPayServer.Models.InvoicingModels;
+using BTCPayServer.NTag424;
 using BTCPayServer.Payments;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
@@ -25,6 +27,8 @@ using BTCPayServer.Views.Manage;
 using BTCPayServer.Views.Server;
 using BTCPayServer.Views.Stores;
 using BTCPayServer.Views.Wallets;
+using Dapper;
+using ExchangeSharp;
 using LNURL;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
@@ -160,7 +164,7 @@ namespace BTCPayServer.Tests
             Assert.Contains("CustomFormInputTest", s.Driver.PageSource);
             s.Driver.FindElement(By.Name("buyerEmail")).SendKeys("aa@aa.com");
             s.Driver.FindElement(By.CssSelector("input[type='submit']")).Click();
-            s.PayInvoice(true);
+            s.PayInvoice(true, 0.001m);
             var result = await s.Server.PayTester.HttpClient.GetAsync(formurl);
             Assert.Equal(HttpStatusCode.NotFound, result.StatusCode);
 
@@ -1145,7 +1149,6 @@ namespace BTCPayServer.Tests
 
             // Contribute
             s.Driver.FindElement(By.Id("crowdfund-body-header-cta")).Click();
-            Thread.Sleep(1000);
             s.Driver.WaitUntilAvailable(By.Name("btcpay"));
 
             var frameElement = s.Driver.FindElement(By.Name("btcpay"));
@@ -2116,6 +2119,7 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.CssSelector("#lnurlwithdraw-button")).Click();
             s.Driver.WaitForElement(By.Id("qr-code-data-input"));
             
+            // Try to use lnurlw via the QR Code
             var lnurl = new Uri(LNURL.LNURL.Parse(s.Driver.FindElement(By.Id("qr-code-data-input")).GetAttribute("value"), out _).ToString().Replace("https", "http"));
             s.Driver.FindElement(By.CssSelector("button[data-bs-dismiss='modal']")).Click();
             var info = Assert.IsType<LNURLWithdrawRequest>(await LNURL.LNURL.FetchInformation(lnurl, s.Server.PayTester.HttpClient));
@@ -2126,7 +2130,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(info.CurrentBalance, new LightMoney(0.0000001m, LightMoneyUnit.BTC));
 
             var bolt2 = (await s.Server.CustomerLightningD.CreateInvoice(
-                new LightMoney(0.0000001m, LightMoneyUnit.BTC),
+                new LightMoney(0.00000005m, LightMoneyUnit.BTC),
                 $"LNurl w payout test {DateTime.UtcNow.Ticks}",
                 TimeSpan.FromHours(1), CancellationToken.None));
             var response = await info.SendRequest(bolt2.BOLT11, s.Server.PayTester.HttpClient, null,null);
@@ -2141,6 +2145,56 @@ namespace BTCPayServer.Tests
             s.Driver.Close();
             s.Driver.SwitchTo().Window(s.Driver.WindowHandles.First());
 
+            // Simulate a boltcard
+            {
+                var db = s.Server.PayTester.GetService<ApplicationDbContextFactory>();
+                var ppid = lnurl.AbsoluteUri.Split("/").Last();
+                var issuerKey = new IssuerKey(SettingsRepositoryExtensions.FixedKey());
+                var uid = RandomNumberGenerator.GetBytes(7);
+                var cardKey = issuerKey.CreatePullPaymentCardKey(uid, 0, ppid);
+                var keys = cardKey.DeriveBoltcardKeys(issuerKey);
+                await db.LinkBoltcardToPullPayment(ppid, issuerKey, uid);
+                var piccData = new byte[] { 0xc7 }.Concat(uid).Concat(new byte[] { 1, 0, 0, 0, 0, 0, 0, 0 }).ToArray();
+                var p = keys.EncryptionKey.Encrypt(piccData);
+                var c = keys.AuthenticationKey.GetSunMac(uid, 1);
+                var boltcardUrl = new Uri(s.Server.PayTester.ServerUri.AbsoluteUri + $"boltcard?p={Encoders.Hex.EncodeData(p).ToStringUpperInvariant()}&c={Encoders.Hex.EncodeData(c).ToStringUpperInvariant()}");
+                // p and c should work so long as no bolt11 has been submitted
+                info = (LNURLWithdrawRequest)await LNURL.LNURL.FetchInformation(boltcardUrl, s.Server.PayTester.HttpClient);
+                info = (LNURLWithdrawRequest)await LNURL.LNURL.FetchInformation(boltcardUrl, s.Server.PayTester.HttpClient);
+                var fakeBoltcardUrl = new Uri(Regex.Replace(boltcardUrl.AbsoluteUri, "p=([A-F0-9]{32})", $"p={RandomBytes(16)}"));
+                await Assert.ThrowsAsync<LNUrlException>(() => LNURL.LNURL.FetchInformation(fakeBoltcardUrl, s.Server.PayTester.HttpClient));
+                fakeBoltcardUrl = new Uri(Regex.Replace(boltcardUrl.AbsoluteUri, "c=([A-F0-9]{16})", $"c={RandomBytes(8)}"));
+                await Assert.ThrowsAsync<LNUrlException>(() => LNURL.LNURL.FetchInformation(fakeBoltcardUrl, s.Server.PayTester.HttpClient));
+
+                bolt2 = (await s.Server.CustomerLightningD.CreateInvoice(
+                    new LightMoney(0.00000005m, LightMoneyUnit.BTC),
+                    $"LNurl w payout test2 {DateTime.UtcNow.Ticks}",
+                    TimeSpan.FromHours(1), CancellationToken.None));
+                response = await info.SendRequest(bolt2.BOLT11, s.Server.PayTester.HttpClient, null, null);
+                Assert.Equal("OK", response.Status);
+                // No replay should be possible
+                await Assert.ThrowsAsync<LNUrlException>(() => LNURL.LNURL.FetchInformation(boltcardUrl, s.Server.PayTester.HttpClient));
+                response = await info.SendRequest(bolt2.BOLT11, s.Server.PayTester.HttpClient, null, null);
+                Assert.Equal("ERROR", response.Status);
+                Assert.Contains("Replayed", response.Reason);
+
+                // Check the state of the registration, counter should have increased
+                var reg = await db.GetBoltcardRegistration(issuerKey, uid);
+                Assert.Equal((ppid, 1, 0), (reg.PullPaymentId, reg.Counter, reg.Version));
+                await db.SetBoltcardResetState(issuerKey, uid);
+                // After reset, counter is 0, version unchanged and ppId null
+                reg = await db.GetBoltcardRegistration(issuerKey, uid);
+                Assert.Equal((null, 0, 0), (reg.PullPaymentId, reg.Counter, reg.Version));
+                await db.LinkBoltcardToPullPayment(ppid, issuerKey, uid);
+                // Relink should bump Version
+                reg = await db.GetBoltcardRegistration(issuerKey, uid);
+                Assert.Equal((ppid, 0, 1), (reg.PullPaymentId, reg.Counter, reg.Version));
+
+                await db.LinkBoltcardToPullPayment(ppid, issuerKey, uid);
+                reg = await db.GetBoltcardRegistration(issuerKey, uid);
+                Assert.Equal((ppid, 0, 2), (reg.PullPaymentId, reg.Counter, reg.Version));
+            }
+
             s.GoToStore(s.StoreId, StoreNavPages.PullPayments);
             s.Driver.FindElement(By.Id("NewPullPayment")).Click();
             s.Driver.FindElement(By.Id("Name")).SendKeys("PP1");
@@ -2221,6 +2275,12 @@ namespace BTCPayServer.Tests
             s.Driver.Close();
         }
 
+        private string RandomBytes(int count)
+        {
+            var c = RandomNumberGenerator.GetBytes(count);
+            return Encoders.Hex.EncodeData(c);
+        }
+
         [Fact]
         [Trait("Selenium", "Selenium")]
         [Trait("Lightning", "Lightning")]

BTCPayServer.Tests/ThirdPartyTests.cs

@@ -297,10 +297,9 @@ retry:
             }
         }
 
-        [Fact()]
+        [Fact]
         public void CanSolveTheDogesRatesOnKraken()
         {
-            var provider = CreateNetworkProvider(ChainName.Mainnet);
             var factory = FastTests.CreateBTCPayRateFactory();
             var fetcher = new RateFetcher(factory);
 
@@ -320,7 +319,7 @@ retry:
             var fetcher = new RateFetcher(factory);
             var provider = CreateNetworkProvider(ChainName.Mainnet);
             var b = new StoreBlob();
-            string[] temporarilyBroken = { "COP", "UGX" };
+            string[] temporarilyBroken = Array.Empty<string>();
             foreach (var k in StoreBlob.RecommendedExchanges)
             {
                 b.DefaultCurrency = k.Key;
@@ -359,7 +358,7 @@ retry:
                     .Select(c => new CurrencyPair(c.CryptoCode, "USD"))
                     .ToHashSet();
 
-            string[] brokenShitcoins = { "BTG", "BTX" };
+            string[] brokenShitcoins = { "BTG", "BTX", "GRS" };
             bool IsBrokenShitcoin(CurrencyPair p) => brokenShitcoins.Contains(p.Left) || brokenShitcoins.Contains(p.Right);
             foreach (var _ in brokenShitcoins)
             {

BTCPayServer.Tests/UnitTest1.cs

@@ -395,7 +395,7 @@ namespace BTCPayServer.Tests
                     BOLT11PaymentRequest.Parse(newBolt11, Network.RegTest).MinimumAmount.ToDecimal(LightMoneyUnit.BTC));
             }, 40000);
 
-            TestLogs.LogInformation($"Paying invoice {newInvoice.Id} remaining due amount {newInvoice.BtcDue.GetValue((BTCPayNetwork) tester.DefaultNetwork)} via lightning");
+            TestLogs.LogInformation($"Paying invoice {newInvoice.Id} remaining due amount {newInvoice.BtcDue.GetValue((BTCPayNetwork)tester.DefaultNetwork)} via lightning");
             var evt = await tester.WaitForEvent<InvoiceDataChangedEvent>(async () =>
             {
                 await tester.SendLightningPaymentAsync(newInvoice);
@@ -1301,11 +1301,8 @@ namespace BTCPayServer.Tests
             var user = tester.NewAccount();
             await user.GrantAccessAsync();
             user.RegisterDerivationScheme("BTC");
-
+            await tester.ExplorerNode.EnsureGenerateAsync(1);
             var rng = new Random();
-            var seed = rng.Next();
-            rng = new Random(seed);
-            TestLogs.LogInformation("Seed: " + seed);
             foreach (var networkFeeMode in Enum.GetValues(typeof(NetworkFeeMode)).Cast<NetworkFeeMode>())
             {
                 await user.SetNetworkFeeMode(networkFeeMode);
@@ -1318,7 +1315,7 @@ namespace BTCPayServer.Tests
             }
         }
 
-        private static async Task AssertTopUpBtcPrice(ServerTester tester, TestAccount user, Money btcSent, decimal expectedPriceWithoutNetworkFee, NetworkFeeMode networkFeeMode)
+        private async Task AssertTopUpBtcPrice(ServerTester tester, TestAccount user, Money btcSent, decimal expectedPriceWithoutNetworkFee, NetworkFeeMode networkFeeMode)
         {
             var cashCow = tester.ExplorerNode;
             // First we try payment with a merchant having only BTC
@@ -1343,7 +1340,6 @@ namespace BTCPayServer.Tests
             {
                 networkFee = 0.0m;
             }
-
             await cashCow.SendToAddressAsync(invoiceAddress, paid);
             await TestUtils.EventuallyAsync(async () =>
             {
@@ -1419,7 +1415,7 @@ namespace BTCPayServer.Tests
                 StringComparison.OrdinalIgnoreCase);
 
             rateVm.ScriptTest = "BTC_USD,BTC_CAD,DOGE_USD,DOGE_CAD";
-            rateVm.Script = "DOGE_X = bittrex(DOGE_BTC) * BTC_X;\n" +
+            rateVm.Script = "DOGE_X = bitpay(DOGE_BTC) * BTC_X;\n" +
                             "X_CAD = ndax(X_CAD);\n" +
                             "X_X = coingecko(X_X);";
             rateVm.Spread = 50;
@@ -1822,7 +1818,7 @@ namespace BTCPayServer.Tests
             Assert.Empty(appList2.Apps);
             Assert.Equal("test", appList.Apps[0].AppName);
             Assert.Equal(apps.CreatedAppId, appList.Apps[0].Id);
-            
+
             Assert.True(app.Role.ToPermissionSet(app.StoreId).Contains(Policies.CanModifyStoreSettings, app.StoreId));
             Assert.Equal(user.StoreId, appList.Apps[0].StoreId);
             Assert.IsType<NotFoundResult>(apps2.DeleteApp(appList.Apps[0].Id));
@@ -1984,7 +1980,7 @@ namespace BTCPayServer.Tests
                 Assert.Single(textSearchResult);
             });
 
-            invoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
+            invoice = await user.BitPay.GetInvoiceAsync(invoice.Id, Facade.Merchant);
             Assert.Equal(1000.0m, invoice.TaxIncluded);
             Assert.Equal(5000.0m, invoice.Price);
             Assert.Equal(Money.Coins(0), invoice.BtcPaid);
@@ -2104,6 +2100,7 @@ namespace BTCPayServer.Tests
                 c =>
                 {
                     Assert.False(c.ManuallyMarked);
+                    Assert.True(c.OverPaid);
                 });
             user.AssertHasWebhookEvent<WebhookInvoiceProcessingEvent>(WebhookEventType.InvoiceProcessing,
                 c =>
@@ -2398,11 +2395,11 @@ namespace BTCPayServer.Tests
 
             var url = lnMethod.GetExternalLightningUrl();
             var kv = LightningConnectionStringHelper.ExtractValues(url, out var connType);
-            Assert.Equal(LightningConnectionType.Charge,connType);
+            Assert.Equal(LightningConnectionType.Charge, connType);
             var client = Assert.IsType<ChargeClient>(tester.PayTester.GetService<LightningClientFactoryService>()
                 .Create(url, tester.NetworkProvider.GetNetwork<BTCPayNetwork>("BTC")));
             var auth = Assert.IsType<ChargeAuthentication.UserPasswordAuthentication>(client.ChargeAuthentication);
-            
+
             Assert.Equal("pass", auth.NetworkCredential.Password);
             Assert.Equal("usr", auth.NetworkCredential.UserName);
 
@@ -2828,7 +2825,7 @@ namespace BTCPayServer.Tests
             var app = await client.CreatePointOfSaleApp(acc.StoreId, new CreatePointOfSaleAppRequest()
             {
                 AppName = "Static",
-                DefaultView =  Client.Models.PosViewType.Static,
+                DefaultView = Client.Models.PosViewType.Static,
                 Template = new PointOfSaleSettings().Template
             });
             var resp = await posController.ViewPointOfSale(app.Id, choiceKey: "green-tea");
@@ -2838,7 +2835,7 @@ namespace BTCPayServer.Tests
             app = await client.CreatePointOfSaleApp(acc.StoreId, new CreatePointOfSaleAppRequest()
             {
                 AppName = "Cart",
-                DefaultView =  Client.Models.PosViewType.Cart,
+                DefaultView = Client.Models.PosViewType.Cart,
                 Template = new PointOfSaleSettings().Template
             });
             resp = await posController.ViewPointOfSale(app.Id, posData: new JObject()

BTCPayServer.Tests/docker-compose.altcoins.yml

@@ -73,7 +73,7 @@ services:
         - "sshd_datadir:/root/.ssh"
 
   devlnd:
-    image: btcpayserver/bitcoin:25.1
+    image: btcpayserver/bitcoin:26.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_WALLETDIR: "/data/wallets"
@@ -135,7 +135,7 @@ services:
 
   bitcoind:
     restart: unless-stopped
-    image: btcpayserver/bitcoin:25.1
+    image: btcpayserver/bitcoin:26.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_WALLETDIR: "/data/wallets"

BTCPayServer.Tests/docker-compose.yml

@@ -70,7 +70,7 @@ services:
         - "sshd_datadir:/root/.ssh"
 
   devlnd:
-    image: btcpayserver/bitcoin:25.1
+    image: btcpayserver/bitcoin:26.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_WALLETDIR: "/data/wallets"
@@ -121,7 +121,7 @@ services:
 
   bitcoind:
     restart: unless-stopped
-    image: btcpayserver/bitcoin:25.1
+    image: btcpayserver/bitcoin:26.0
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_WALLETDIR: "/data/wallets"

BTCPayServer/APDUVaultTransport.cs

@@ -0,0 +1,42 @@
+using Newtonsoft.Json.Linq;
+using System.Net.WebSockets;
+using System.Threading.Tasks;
+using System.Threading;
+using BTCPayServer.NTag424;
+using NBitcoin.DataEncoders;
+using System;
+using SocketIOClient;
+
+namespace BTCPayServer
+{
+    public class APDUVaultTransport : IAPDUTransport
+    {
+        private readonly VaultClient _vaultClient;
+
+        public APDUVaultTransport(VaultClient vaultClient)
+        {
+            _vaultClient = vaultClient;
+        }
+
+
+        public async Task WaitForCard(CancellationToken cancellationToken)
+        {
+            await _vaultClient.SendVaultRequest("/wait-for-card", null, cancellationToken);
+        }
+        public async Task WaitForRemoved(CancellationToken cancellationToken)
+        {
+            await _vaultClient.SendVaultRequest("/wait-for-disconnected", null, cancellationToken);
+        }
+
+        public async Task<NtagResponse> SendAPDU(byte[] apdu, CancellationToken cancellationToken)
+        {
+            var resp = await _vaultClient.SendVaultRequest("/",
+                new JObject()
+                {
+                    ["apdu"] = Encoders.Hex.EncodeData(apdu)
+                }, cancellationToken);
+            var data = Encoders.Hex.DecodeData(resp["data"].Value<string>());
+            return new NtagResponse(data, resp["status"].Value<ushort>());
+        }
+    }
+}

BTCPayServer/BTCPayServer.csproj

@@ -1,4 +1,4 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
+ <Project Sdk="Microsoft.NET.Sdk.Web">
   <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
   <Import Project="../Build/Common.csproj" />
 
@@ -46,10 +46,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="BTCPayServer.NTag424" Version="1.0.19" />
     <PackageReference Include="YamlDotNet" Version="8.0.0" />
     <PackageReference Include="BIP78.Sender" Version="0.2.2" />
     <PackageReference Include="BTCPayServer.Hwi" Version="2.0.2" />
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.5.2" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.5.3" />
     <PackageReference Include="CsvHelper" Version="15.0.5" />
     <PackageReference Include="Dapper" Version="2.1.24" />
     <PackageReference Include="Fido2" Version="2.0.2" />
@@ -137,6 +138,7 @@
 
 	<ItemGroup>
     <Watch Include="Views\**\*.*"></Watch>
+    <Watch Remove="Views\Shared\LocalhostBrowserSupport.cshtml" />
     <Watch Remove="Views\UIAccount\CheatPermissions.cshtml" />
     <Watch Remove="Views\UIReports\StoreReports.cshtml" />
     <Content Update="Views\UIApps\_ViewImports.cshtml">

BTCPayServer/Components/StoreSelector/StoreSelector.cs

@@ -41,14 +41,13 @@ namespace BTCPayServer.Components.StoreSelector
                         .FirstOrDefault()?
                         .Network.CryptoCode;
                     var walletId = cryptoCode != null ? new WalletId(store.Id, cryptoCode) : null;
-                    var role = store.GetStoreRoleOfUser(userId);
                     return new StoreSelectorOption
                     {
                         Text = store.StoreName,
                         Value = store.Id,
                         Selected = store.Id == currentStore?.Id,
                         WalletId = walletId,
-                        Store = store,
+                        Store = store
                     };
                 })
                 .OrderBy(s => s.Text)

BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs

@@ -41,6 +41,7 @@ namespace BTCPayServer.Controllers.Greenfield
         private readonly RateFetcher _rateProvider;
         private readonly InvoiceActivator _invoiceActivator;
         private readonly ApplicationDbContextFactory _dbContextFactory;
+        private readonly IAuthorizationService _authorizationService;
 
         public LanguageService LanguageService { get; }
 
@@ -48,7 +49,9 @@ namespace BTCPayServer.Controllers.Greenfield
             LinkGenerator linkGenerator, LanguageService languageService, BTCPayNetworkProvider btcPayNetworkProvider,
             CurrencyNameTable currencyNameTable, RateFetcher rateProvider,
             InvoiceActivator invoiceActivator,
-            PullPaymentHostedService pullPaymentService, ApplicationDbContextFactory dbContextFactory)
+            PullPaymentHostedService pullPaymentService, 
+            ApplicationDbContextFactory dbContextFactory, 
+            IAuthorizationService authorizationService)
         {
             _invoiceController = invoiceController;
             _invoiceRepository = invoiceRepository;
@@ -59,6 +62,7 @@ namespace BTCPayServer.Controllers.Greenfield
             _invoiceActivator = invoiceActivator;
             _pullPaymentService = pullPaymentService;
             _dbContextFactory = dbContextFactory;
+            _authorizationService = authorizationService;
             LanguageService = languageService;
         }
 
@@ -350,7 +354,7 @@ namespace BTCPayServer.Controllers.Greenfield
             return this.CreateValidationError(ModelState);
         }
 
-        [Authorize(Policy = Policies.CanModifyStoreSettings,
+        [Authorize(Policy = Policies.CanCreateNonApprovedPullPayments,
             AuthenticationSchemes = AuthenticationSchemes.Greenfield)]
         [HttpPost("~/api/v1/stores/{storeId}/invoices/{invoiceId}/refund")]
         public async Task<IActionResult> RefundInvoice(
@@ -512,6 +516,7 @@ namespace BTCPayServer.Controllers.Greenfield
                 createPullPayment.Amount = Math.Round(createPullPayment.Amount - reduceByAmount, appliedDivisibility);
             }
 
+            createPullPayment.AutoApproveClaims = createPullPayment.AutoApproveClaims && (await _authorizationService.AuthorizeAsync(User, createPullPayment.StoreId ,Policies.CanCreatePullPayments)).Succeeded;
             var ppId = await _pullPaymentService.CreatePullPayment(createPullPayment);
 
             await using var ctx = _dbContextFactory.CreateContext();

BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs

@@ -1,7 +1,9 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using System.IO.IsolatedStorage;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Constants;
@@ -10,6 +12,7 @@ using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
+using BTCPayServer.NTag424;
 using BTCPayServer.Payments;
 using BTCPayServer.Security;
 using BTCPayServer.Services;
@@ -19,6 +22,7 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.EntityFrameworkCore;
+using NBitcoin.DataEncoders;
 using Newtonsoft.Json.Linq;
 using MarkPayoutRequest = BTCPayServer.HostedServices.MarkPayoutRequest;
 
@@ -37,6 +41,8 @@ namespace BTCPayServer.Controllers.Greenfield
         private readonly IEnumerable<IPayoutHandler> _payoutHandlers;
         private readonly BTCPayNetworkProvider _networkProvider;
         private readonly IAuthorizationService _authorizationService;
+        private readonly SettingsRepository _settingsRepository;
+        private readonly BTCPayServerEnvironment _env;
 
         public GreenfieldPullPaymentController(PullPaymentHostedService pullPaymentService,
             LinkGenerator linkGenerator,
@@ -45,7 +51,9 @@ namespace BTCPayServer.Controllers.Greenfield
             Services.BTCPayNetworkJsonSerializerSettings serializerSettings,
             IEnumerable<IPayoutHandler> payoutHandlers,
             BTCPayNetworkProvider btcPayNetworkProvider,
-            IAuthorizationService authorizationService)
+            IAuthorizationService authorizationService,
+            SettingsRepository settingsRepository,
+            BTCPayServerEnvironment env)
         {
             _pullPaymentService = pullPaymentService;
             _linkGenerator = linkGenerator;
@@ -55,6 +63,8 @@ namespace BTCPayServer.Controllers.Greenfield
             _payoutHandlers = payoutHandlers;
             _networkProvider = btcPayNetworkProvider;
             _authorizationService = authorizationService;
+            _settingsRepository = settingsRepository;
+            _env = env;
         }
 
         [HttpGet("~/api/v1/stores/{storeId}/pull-payments")]
@@ -187,6 +197,46 @@ namespace BTCPayServer.Controllers.Greenfield
             };
         }
 
+        [HttpPost]
+        [Route("~/api/v1/pull-payments/{pullPaymentId}/boltcards")]
+        [AllowAnonymous]
+        public async Task<IActionResult> RegisterBoltcard(string pullPaymentId, RegisterBoltcardRequest request)
+        {
+            if (pullPaymentId is null)
+                return PullPaymentNotFound();
+            var pp = await _pullPaymentService.GetPullPayment(pullPaymentId, false);
+            if (pp is null)
+                return PullPaymentNotFound();
+            if (request?.UID is null || request.UID.Length != 7)
+            {
+                ModelState.AddModelError(nameof(request.UID), "The UID is required and should be 7 bytes");
+                return this.CreateValidationError(ModelState);
+            }
+            if (!_pullPaymentService.SupportsLNURL(pp.GetBlob()))
+            {
+                return this.CreateAPIError(400, "lnurl-not-supported", "This pull payment currency should be BTC or SATS and accept lightning");
+            }
+
+            var issuerKey = await _settingsRepository.GetIssuerKey(_env);
+            var version = await _dbContextFactory.LinkBoltcardToPullPayment(pullPaymentId, issuerKey, request.UID, request.OnExisting);
+            var keys = issuerKey.CreatePullPaymentCardKey(request.UID, version, pullPaymentId).DeriveBoltcardKeys(issuerKey);
+
+            var boltcardUrl = Url.Action(nameof(UIBoltcardController.GetWithdrawRequest), "UIBoltcard");
+            boltcardUrl = Request.GetAbsoluteUri(boltcardUrl);
+            boltcardUrl = Regex.Replace(boltcardUrl, "^https?://", "lnurlw://");
+
+            return Ok(new RegisterBoltcardResponse()
+            {
+                LNURLW = boltcardUrl,
+                Version = version,
+                K0 = Encoders.Hex.EncodeData(keys.AppMasterKey.ToBytes()).ToUpperInvariant(),
+                K1 = Encoders.Hex.EncodeData(keys.EncryptionKey.ToBytes()).ToUpperInvariant(),
+                K2 = Encoders.Hex.EncodeData(keys.AuthenticationKey.ToBytes()).ToUpperInvariant(),
+                K3 = Encoders.Hex.EncodeData(keys.K3.ToBytes()).ToUpperInvariant(),
+                K4 = Encoders.Hex.EncodeData(keys.K4.ToBytes()).ToUpperInvariant(),
+            });
+        }
+
         [HttpGet("~/api/v1/pull-payments/{pullPaymentId}")]
         [AllowAnonymous]
         public async Task<IActionResult> GetPullPayment(string pullPaymentId)

BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs

@@ -1275,6 +1275,11 @@ namespace BTCPayServer.Controllers.Greenfield
             return GetFromActionResult<PayoutData>(await GetController<GreenfieldPullPaymentController>().GetPayout(pullPaymentId, payoutId));
         }
 
+        public override async Task<RegisterBoltcardResponse> RegisterBoltcard(string pullPaymentId, RegisterBoltcardRequest request, CancellationToken cancellationToken = default)
+        {
+            return GetFromActionResult<RegisterBoltcardResponse>(await GetController<GreenfieldPullPaymentController>().RegisterBoltcard(pullPaymentId, request));
+        }
+
         public override async Task<PullPaymentLNURL> GetPullPaymentLNURL(string pullPaymentId, CancellationToken cancellationToken = default)
         {
             return GetFromActionResult<PullPaymentLNURL>(await GetController<GreenfieldPullPaymentController>().GetPullPaymentLNURL(pullPaymentId));

BTCPayServer/Controllers/LightningAddressService.cs

@@ -48,16 +48,11 @@ public class LightningAddressService
     {
         return await _memoryCache.GetOrCreateAsync(GetKey(username), async entry =>
         {
-            var result = await Get(new LightningAddressQuery { Usernames = new[] { username } });
+            var result = await Get(new LightningAddressQuery { Usernames = new[] { NormalizeUsername(username) } });
             return result.FirstOrDefault();
         });
     }
 
-    private string NormalizeUsername(string username)
-    {
-        return username.ToLowerInvariant();
-    }
-
     public async Task<bool> Set(LightningAddressData data)
     {
         data.Username = NormalizeUsername(data.Username);
@@ -115,8 +110,12 @@ public class LightningAddressService
         await context.AddAsync(data);
     }
 
+    public static string NormalizeUsername(string username)
+    {
+        return username.ToLowerInvariant();
+    }
 
-    private string GetKey(string username)
+    private static string GetKey(string username)
     {
         username = NormalizeUsername(username);
         return $"{nameof(LightningAddressService)}_{username}";

BTCPayServer/Controllers/UIBoltcardController.cs

@@ -0,0 +1,70 @@
+#nullable enable
+using Dapper;
+using System.Linq;
+using System.Security;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+using BTCPayServer.NTag424;
+using BTCPayServer.Services;
+using LNURL;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System.Threading;
+using System;
+using NBitcoin.DataEncoders;
+using System.Text.Json.Serialization;
+
+namespace BTCPayServer.Controllers;
+
+public class UIBoltcardController : Controller
+{
+    public class BoltcardSettings
+    {
+        [JsonConverter(typeof(NBitcoin.JsonConverters.HexJsonConverter))]
+        public byte[]? IssuerKey { get; set; }
+    }
+    public UIBoltcardController(
+        UILNURLController lnUrlController,
+        SettingsRepository settingsRepository,
+        ApplicationDbContextFactory contextFactory,
+        BTCPayServerEnvironment env)
+    {
+        LNURLController = lnUrlController;
+        SettingsRepository = settingsRepository;
+        ContextFactory = contextFactory;
+        Env = env;
+    }
+
+    public UILNURLController LNURLController { get; }
+    public SettingsRepository SettingsRepository { get; }
+    public ApplicationDbContextFactory ContextFactory { get; }
+    public BTCPayServerEnvironment Env { get; }
+
+    [AllowAnonymous]
+    [HttpGet("~/boltcard")]
+    public async Task<IActionResult> GetWithdrawRequest([FromQuery] string? p, [FromQuery] string? c, [FromQuery] string? pr, [FromQuery] string? k1, CancellationToken cancellationToken)
+    {
+        if (p is null || c is null)
+        {
+            var k1s = k1?.Split('-');
+            if (k1s is not { Length: 2 })
+                return BadRequest(new LNUrlStatusResponse { Status = "ERROR", Reason = "Missing p, c, or k1 query parameter" });
+            p = k1s[0];
+            c = k1s[1];
+        }
+        var issuerKey = await SettingsRepository.GetIssuerKey(Env);
+        var piccData = issuerKey.TryDecrypt(p);
+        if (piccData is null)
+            return BadRequest(new LNUrlStatusResponse { Status = "ERROR", Reason = "Invalid PICCData" });
+
+        var registration = await ContextFactory.GetBoltcardRegistration(issuerKey, piccData, updateCounter: pr is not null);
+        if (registration?.PullPaymentId is null)
+            return BadRequest(new LNUrlStatusResponse { Status = "ERROR", Reason = "Replayed or expired query" });
+        var cardKey = issuerKey.CreatePullPaymentCardKey(piccData.Uid, registration.Version, registration.PullPaymentId);
+        if (!cardKey.CheckSunMac(c, piccData))
+            return BadRequest(new LNUrlStatusResponse { Status = "ERROR", Reason = "Replayed or expired query" });
+        LNURLController.ControllerContext.HttpContext = HttpContext;
+        return await LNURLController.GetLNURLForPullPayment("BTC", registration.PullPaymentId, pr, $"{p}-{c}", cancellationToken);
+    }
+}

BTCPayServer/Controllers/UIHomeController.cs

@@ -84,8 +84,9 @@ namespace BTCPayServer.Controllers
                 }
 
                 var stores = await _storeRepository.GetStoresByUserId(userId);
-                return stores.Any()
-                    ? RedirectToStore(userId, stores.First())
+                var activeStore = stores.FirstOrDefault(s => !s.Archived);
+                return activeStore != null
+                    ? RedirectToStore(userId, activeStore)
                     : RedirectToAction(nameof(UIUserStoresController.CreateStore), "UIUserStores");
             }
 

BTCPayServer/Controllers/UILNURLController.cs

@@ -90,9 +90,13 @@ namespace BTCPayServer
             _pluginHookService = pluginHookService;
             _invoiceActivator = invoiceActivator;
         }
-
         [HttpGet("withdraw/pp/{pullPaymentId}")]
-        public async Task<IActionResult> GetLNURLForPullPayment(string cryptoCode, string pullPaymentId, [FromQuery] string pr, CancellationToken cancellationToken)
+        public Task<IActionResult> GetLNURLForPullPayment(string cryptoCode, string pullPaymentId, [FromQuery] string pr, CancellationToken cancellationToken)
+        {
+            return GetLNURLForPullPayment(cryptoCode, pullPaymentId, pr, pullPaymentId, cancellationToken);
+        }
+        [NonAction]
+        internal async Task<IActionResult> GetLNURLForPullPayment(string cryptoCode, string pullPaymentId, string pr, string k1, CancellationToken cancellationToken)
         {
             var network = _btcPayNetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
             if (network is null || !network.SupportLightning)
@@ -119,7 +123,7 @@ namespace BTCPayServer
             var request = new LNURLWithdrawRequest
             {
                 MaxWithdrawable = LightMoney.FromUnit(remaining, unit),
-                K1 = pullPaymentId,
+                K1 = k1,
                 BalanceCheck = new Uri(Request.GetCurrentUrl()),
                 CurrentBalance = LightMoney.FromUnit(remaining, unit),
                 MinWithdrawable =
@@ -369,7 +373,7 @@ namespace BTCPayServer
             if (string.IsNullOrEmpty(username))
                 return NotFound("Unknown username");
             
-            LNURLPayRequest lnurlRequest = null;
+            LNURLPayRequest lnurlRequest;
             
             // Check core and fall back to lookup Lightning Address via plugins
             var lightningAddressSettings = await _lightningAddressService.ResolveByAddress(username);

BTCPayServer/Controllers/UIPaymentRequestController.cs

@@ -26,8 +26,8 @@ using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Controllers
 {
-    [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
     [Route("payment-requests")]
+    [Authorize(Policy = Policies.CanViewPaymentRequests, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
     public class UIPaymentRequestController : Controller
     {
         private readonly UIInvoiceController _InvoiceController;
@@ -69,7 +69,6 @@ namespace BTCPayServer.Controllers
             FormDataService = formDataService;
         }
 
-        
         [HttpGet("/stores/{storeId}/payment-requests")]
         [Authorize(Policy = Policies.CanViewPaymentRequests, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
         public async Task<IActionResult> GetPaymentRequests(string storeId, ListPaymentRequestsViewModel model = null)
@@ -363,6 +362,7 @@ namespace BTCPayServer.Controllers
         }
 
         [HttpGet("{payReqId}/cancel")]
+        [AllowAnonymous]
         public async Task<IActionResult> CancelUnpaidPendingInvoice(string payReqId, bool redirect = true)
         {
             var result = await _PaymentRequestService.GetPaymentRequest(payReqId, GetUserId());

BTCPayServer/Controllers/UIPullPaymentController.Boltcard.cs

@@ -0,0 +1,202 @@
+using BTCPayServer.Abstractions.Constants;
+using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Data;
+using BTCPayServer.Lightning;
+using BTCPayServer.Models;
+using BTCPayServer.NTag424;
+using Dapper;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using NBitcoin.DataEncoders;
+using System;
+using System.Net.WebSockets;
+using System.Threading;
+using System.Threading.Tasks;
+using static BTCPayServer.BoltcardDataExtensions;
+
+namespace BTCPayServer.Controllers
+{
+    public partial class UIPullPaymentController
+    {
+        [AllowAnonymous]
+        [HttpGet("pull-payments/{pullPaymentId}/boltcard/{command}")]
+        public IActionResult SetupBoltcard(string pullPaymentId, string command)
+        {
+            return View(nameof(SetupBoltcard), new SetupBoltcardViewModel()
+            {
+                ReturnUrl = Url.Action(nameof(ViewPullPayment), "UIPullPayment", new { pullPaymentId }),
+                WebsocketPath = Url.Action(nameof(VaultNFCBridgeConnection), "UIPullPayment", new { pullPaymentId }),
+                Command = command
+            });
+        }
+        [AllowAnonymous]
+        [HttpPost("pull-payments/{pullPaymentId}/boltcard/{command}")]
+        public IActionResult SetupBoltcardPost(string pullPaymentId, string command)
+        {
+            TempData[WellKnownTempData.SuccessMessage] = "Boltcard is configured";
+            return RedirectToAction(nameof(ViewPullPayment), new { pullPaymentId });
+        }
+
+        record CardOrigin
+        {
+            public record Blank() : CardOrigin;
+            public record ThisIssuer(BoltcardRegistration Registration) : CardOrigin;
+            public record ThisIssuerConfigured(string PullPaymentId, BoltcardRegistration Registration) : ThisIssuer(Registration);
+            public record OtherIssuer() : CardOrigin;
+            public record ThisIssuerReset(BoltcardRegistration Registration) : ThisIssuer(Registration);
+        }
+        [HttpGet]
+        [Route("pull-payments/{pullPaymentId}/nfc/bridge")]
+        public async Task<IActionResult> VaultNFCBridgeConnection(string pullPaymentId)
+        {
+            if (!HttpContext.WebSockets.IsWebSocketRequest)
+                return NotFound();
+            var pp = await _pullPaymentHostedService.GetPullPayment(pullPaymentId, false);
+            if (pp is null)
+                return NotFound();
+            if (!_pullPaymentHostedService.SupportsLNURL(pp.GetBlob()))
+                return BadRequest();
+
+            var boltcardUrl = Url.Action(nameof(UIBoltcardController.GetWithdrawRequest), "UIBoltcard");
+            boltcardUrl = Request.GetAbsoluteUri(boltcardUrl);
+            var websocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
+            var vaultClient = new VaultClient(websocket);
+            var transport = new APDUVaultTransport(vaultClient);
+            var ntag = new Ntag424(transport);
+            using (var cts = new CancellationTokenSource(TimeSpan.FromMinutes(10)))
+            {
+next:
+                while (websocket.State == System.Net.WebSockets.WebSocketState.Open)
+                {
+                    try
+                    {
+                        var command = await vaultClient.GetNextCommand(cts.Token);
+                        var permission = await vaultClient.AskPermission(VaultServices.NFC, cts.Token);
+                        if (permission is null)
+                        {
+                            await vaultClient.Show(VaultMessageType.Error, "BTCPay Server Vault does not seem to be running, you can download it on <a target=\"_blank\" href=\"https://github.com/btcpayserver/BTCPayServer.Vault/releases/latest\">Github</a>.", cts.Token);
+                            goto next;
+                        }
+                        await vaultClient.Show(VaultMessageType.Ok, "BTCPayServer successfully connected to the vault.", cts.Token);
+                        if (permission is false)
+                        {
+                            await vaultClient.Show(VaultMessageType.Error, "The user declined access to the vault.", cts.Token);
+                            goto next;
+                        }
+                        await vaultClient.Show(VaultMessageType.Ok, "Access to vault granted by owner.", cts.Token);
+
+                        await vaultClient.Show(VaultMessageType.Processing, "Waiting for NFC to be presented...", cts.Token);
+                        await transport.WaitForCard(cts.Token);
+                        await vaultClient.Show(VaultMessageType.Ok, "NFC detected.", cts.Token);
+
+                        var issuerKey = await _settingsRepository.GetIssuerKey(_env);
+                        CardOrigin cardOrigin = await GetCardOrigin(pullPaymentId, ntag, issuerKey, cts.Token);
+
+                        if (cardOrigin is CardOrigin.OtherIssuer)
+                        {
+                            await vaultClient.Show(VaultMessageType.Error, "This card is already configured for another issuer", cts.Token);
+                            goto next;
+                        }
+
+                        bool success = false;
+                        switch (command)
+                        {
+                            case "configure-boltcard":
+                                await vaultClient.Show(VaultMessageType.Processing, "Configuring Boltcard...", cts.Token);
+                                if (cardOrigin is CardOrigin.Blank || cardOrigin is CardOrigin.ThisIssuerReset)
+                                {
+                                    await ntag.AuthenticateEV2First(0, AESKey.Default, cts.Token);
+                                    var uid = await ntag.GetCardUID();
+                                    try
+                                    {
+                                        var version = await _dbContextFactory.LinkBoltcardToPullPayment(pullPaymentId, issuerKey, uid);
+                                        var cardKey = issuerKey.CreatePullPaymentCardKey(uid, version, pullPaymentId);
+                                        await ntag.SetupBoltcard(boltcardUrl, BoltcardKeys.Default, cardKey.DeriveBoltcardKeys(issuerKey));
+                                    }
+                                    catch
+                                    {
+                                        await _dbContextFactory.SetBoltcardResetState(issuerKey, uid);
+                                        throw;
+                                    }
+                                    await vaultClient.Show(VaultMessageType.Ok, "The card is now configured", cts.Token);
+                                }
+                                else if (cardOrigin is CardOrigin.ThisIssuer)
+                                {
+                                    await vaultClient.Show(VaultMessageType.Ok, "This card is already properly configured", cts.Token);
+                                }
+                                success = true;
+                                break;
+                            case "reset-boltcard":
+                                await vaultClient.Show(VaultMessageType.Processing, "Resetting Boltcard...", cts.Token);
+                                if (cardOrigin is CardOrigin.Blank)
+                                {
+                                    await vaultClient.Show(VaultMessageType.Ok, "This card is already in a factory state", cts.Token);
+                                }
+                                else if (cardOrigin is CardOrigin.ThisIssuer thisIssuer)
+                                {
+                                    var cardKey = issuerKey.CreatePullPaymentCardKey(thisIssuer.Registration.UId, thisIssuer.Registration.Version, pullPaymentId);
+                                    await ntag.ResetCard(issuerKey, cardKey);
+                                    await _dbContextFactory.SetBoltcardResetState(issuerKey, thisIssuer.Registration.UId);
+                                    await vaultClient.Show(VaultMessageType.Ok, "Card reset succeed", cts.Token);
+                                }
+                                success = true;
+                                break;
+                        }
+                        if (success)
+                        {
+                            await vaultClient.Show(VaultMessageType.Processing, "Please remove the NFC from the card reader", cts.Token);
+                            await transport.WaitForRemoved(cts.Token);
+                            await vaultClient.Show(VaultMessageType.Ok, "Thank you!", cts.Token);
+                            await vaultClient.SendSimpleMessage("done", cts.Token);
+                        }
+                    }
+                    catch (Exception) when (websocket.State != WebSocketState.Open || cts.IsCancellationRequested)
+                    {
+                        await WebsocketHelper.CloseSocket(websocket);
+                    }
+                    catch (Exception ex)
+                    {
+                        try
+                        {
+                            await vaultClient.Show(VaultMessageType.Error, "Unexpected error: " + ex.Message, ex.ToString(), cts.Token);
+                        }
+                        catch { }
+                    }
+                }
+            }
+            return new EmptyResult();
+        }
+
+        private async Task<CardOrigin> GetCardOrigin(string pullPaymentId, Ntag424 ntag, IssuerKey issuerKey, CancellationToken cancellationToken)
+        {
+            CardOrigin cardOrigin;
+            Uri uri = await ntag.TryReadNDefURI(cancellationToken);
+
+            if (uri is null)
+            {
+                cardOrigin = new CardOrigin.Blank();
+            }
+            else
+            {
+                var piccData = issuerKey.TryDecrypt(uri);
+                if (piccData is null)
+                {
+                    cardOrigin = new CardOrigin.OtherIssuer();
+                }
+                else
+                {
+                    var res = await _dbContextFactory.GetBoltcardRegistration(issuerKey, piccData.Uid);
+                    if (res != null && res.PullPaymentId is null)
+                        cardOrigin = new CardOrigin.ThisIssuerReset(res);
+                    else if (res?.PullPaymentId != pullPaymentId)
+                        cardOrigin = new CardOrigin.OtherIssuer();
+                    else
+                        cardOrigin = new CardOrigin.ThisIssuerConfigured(res.PullPaymentId, res);
+                }
+            }
+
+            return cardOrigin;
+        }
+    }
+}

BTCPayServer/Controllers/UIPullPaymentController.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Amazon.S3.Model;
 using BTCPayServer.Abstractions.Constants;
 using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Abstractions.Models;
@@ -10,20 +13,27 @@ using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
+using BTCPayServer.Lightning;
+using BTCPayServer.ModelBinders;
 using BTCPayServer.Models;
 using BTCPayServer.Models.WalletViewModels;
+using BTCPayServer.NTag424;
 using BTCPayServer.Payments;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
+using Dapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using NBitcoin;
+using NBitcoin.DataEncoders;
+using NdefLibrary.Ndef;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Controllers
 {
-    public class UIPullPaymentController : Controller
+    public partial class UIPullPaymentController : Controller
     {
         private readonly ApplicationDbContextFactory _dbContextFactory;
         private readonly CurrencyNameTable _currencyNameTable;
@@ -33,6 +43,8 @@ namespace BTCPayServer.Controllers
         private readonly BTCPayNetworkJsonSerializerSettings _serializerSettings;
         private readonly IEnumerable<IPayoutHandler> _payoutHandlers;
         private readonly StoreRepository _storeRepository;
+        private readonly BTCPayServerEnvironment _env;
+        private readonly SettingsRepository _settingsRepository;
 
         public UIPullPaymentController(ApplicationDbContextFactory dbContextFactory,
             CurrencyNameTable currencyNameTable,
@@ -41,7 +53,9 @@ namespace BTCPayServer.Controllers
             BTCPayNetworkProvider networkProvider,
             BTCPayNetworkJsonSerializerSettings serializerSettings,
             IEnumerable<IPayoutHandler> payoutHandlers,
-            StoreRepository storeRepository)
+            StoreRepository storeRepository,
+            BTCPayServerEnvironment env,
+            SettingsRepository settingsRepository)
         {
             _dbContextFactory = dbContextFactory;
             _currencyNameTable = currencyNameTable;
@@ -50,6 +64,8 @@ namespace BTCPayServer.Controllers
             _serializerSettings = serializerSettings;
             _payoutHandlers = payoutHandlers;
             _storeRepository = storeRepository;
+            _env = env;
+            _settingsRepository = settingsRepository;
             _networkProvider = networkProvider;
         }
 
@@ -114,7 +130,7 @@ namespace BTCPayServer.Controllers
                 var url = Url.Action("GetLNURLForPullPayment", "UILNURL", new { cryptoCode = _networkProvider.DefaultNetwork.CryptoCode, pullPaymentId = vm.Id }, Request.Scheme, Request.Host.ToString());
                 vm.LnurlEndpoint = url != null ? new Uri(url) : null;
             }
-            
+
             return View(nameof(ViewPullPayment), vm);
         }
 
@@ -224,11 +240,11 @@ namespace BTCPayServer.Controllers
                 ModelState.AddModelError(nameof(vm.Destination), "Invalid destination or payment method");
                 return await ViewPullPayment(pullPaymentId);
             }
-            
-            var amtError = ClaimRequest.IsPayoutAmountOk(destination, vm.ClaimedAmount == 0? null: vm.ClaimedAmount, paymentMethodId.CryptoCode, ppBlob.Currency);
+
+            var amtError = ClaimRequest.IsPayoutAmountOk(destination, vm.ClaimedAmount == 0 ? null : vm.ClaimedAmount, paymentMethodId.CryptoCode, ppBlob.Currency);
             if (amtError.error is not null)
             {
-                ModelState.AddModelError(nameof(vm.ClaimedAmount), amtError.error );
+                ModelState.AddModelError(nameof(vm.ClaimedAmount), amtError.error);
             }
             else if (amtError.amount is not null)
             {

BTCPayServer/Controllers/UIReportsController.CheatMode.cs

@@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Internal;
-using System.Text.Json.Nodes;
 using System.Threading;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;

BTCPayServer/Controllers/UIStorePullPaymentsController.PullPayments.cs

@@ -138,11 +138,8 @@ namespace BTCPayServer.Controllers
             }
             if (!ModelState.IsValid)
                 return View(model);
-            if (model.AutoApproveClaims)
-            {
-                model.AutoApproveClaims = (await
-                    _authorizationService.AuthorizeAsync(User, storeId, Policies.CanCreatePullPayments)).Succeeded;
-            }
+            model.AutoApproveClaims = model.AutoApproveClaims &&  (await
+                _authorizationService.AuthorizeAsync(User, storeId, Policies.CanCreatePullPayments)).Succeeded;
             await _pullPaymentService.CreatePullPayment(new HostedServices.CreatePullPayment()
             {
                 Name = model.Name,

BTCPayServer/Controllers/UIStoresController.Email.cs

@@ -51,11 +51,11 @@ namespace BTCPayServer.Controllers
         {
             vm.Rules ??= new List<StoreEmailRule>();
             int commandIndex = 0;
-            var indSep = command.IndexOf(":", StringComparison.InvariantCultureIgnoreCase);
-            if (indSep > 0)
+            
+            var indSep = command.Split(':', StringSplitOptions.RemoveEmptyEntries);
+            if (indSep.Length > 1)
             {
-                var item = command[(indSep + 1)..];
-                commandIndex = int.Parse(item, CultureInfo.InvariantCulture);
+                commandIndex = int.Parse(indSep[1], CultureInfo.InvariantCulture);
             }
 
             if (command.StartsWith("remove", StringComparison.InvariantCultureIgnoreCase))
@@ -72,10 +72,19 @@ namespace BTCPayServer.Controllers
             for (var i = 0; i < vm.Rules.Count; i++)
             {
                 var rule = vm.Rules[i];
-                if (!rule.CustomerEmail && string.IsNullOrEmpty(rule.To))
-                    ModelState.AddModelError($"{nameof(vm.Rules)}[{i}].{nameof(rule.To)}", "Either recipient or \"Send the email to the buyer\" is required");
+
+                if (!string.IsNullOrEmpty(rule.To) && (rule.To.Split(',', StringSplitOptions.RemoveEmptyEntries)
+                        .Any(s => !MailboxAddressValidator.TryParse(s, out var mb))))
+                {
+                    ModelState.AddModelError($"{nameof(vm.Rules)}[{i}].{nameof(rule.To)}",
+                        "Invalid mailbox address provided. Valid formats are: 'test@example.com' or 'Firstname Lastname <test@example.com>'");
+
+                }
+                else if (!rule.CustomerEmail && string.IsNullOrEmpty(rule.To))
+                    ModelState.AddModelError($"{nameof(vm.Rules)}[{i}].{nameof(rule.To)}",
+                        "Either recipient or \"Send the email to the buyer\" is required");
             }
-            
+
             if (!ModelState.IsValid)
             {
                 return View(vm);
@@ -144,7 +153,7 @@ namespace BTCPayServer.Controllers
             
             public bool CustomerEmail { get; set; }
             
-            [MailboxAddress]
+           
             public string To { get; set; }
             
             [Required]

BTCPayServer/Controllers/UIVaultController.cs

@@ -310,10 +310,11 @@ askdevice:
                                     await websocketHelper.Send("{ \"error\": \"no-device\"}", cancellationToken);
                                     continue;
                                 }
-                                device = new HwiDeviceClient(hwi, deviceEntry.DeviceSelector, deviceEntry.Model, deviceEntry.Fingerprint);
+                                var model = deviceEntry.Model ?? "Unsupported hardware wallet, try to update BTCPay Server Vault";
+                                device = new HwiDeviceClient(hwi, deviceEntry.DeviceSelector, model, deviceEntry.Fingerprint);
                                 fingerprint = device.Fingerprint;
                                 JObject json = new JObject();
-                                json.Add("model", device.Model);
+                                json.Add("model", model);
                                 json.Add("fingerprint", device.Fingerprint?.ToString());
                                 await websocketHelper.Send(json.ToString(), cancellationToken);
                                 break;

BTCPayServer/Controllers/UIWalletsController.cs

@@ -512,9 +512,9 @@ namespace BTCPayServer.Controllers
 
             await Task.WhenAll(recommendedFees);
             model.RecommendedSatoshiPerByte =
-                recommendedFees.Select(tuple => tuple.Result).Where(option => option != null).ToList();
+                recommendedFees.Select(tuple => tuple.GetAwaiter().GetResult()).Where(option => option != null).ToList();
 
-            model.FeeSatoshiPerByte = model.RecommendedSatoshiPerByte.LastOrDefault()?.FeeRate;
+            model.FeeSatoshiPerByte = recommendedFees[1].GetAwaiter().GetResult()?.FeeRate;
             model.SupportRBF = network.SupportRBF;
 
             model.CryptoDivisibility = network.Divisibility;

BTCPayServer/Data/BoltcardDataExtensions.cs

@@ -0,0 +1,62 @@
+#nullable enable
+using BTCPayServer.Client.Models;
+using BTCPayServer.Data;
+using BTCPayServer.NTag424;
+using Dapper;
+using Microsoft.EntityFrameworkCore;
+using NBitcoin.DataEncoders;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer;
+public static class BoltcardDataExtensions
+{
+    public static async Task<int> LinkBoltcardToPullPayment(this ApplicationDbContextFactory dbContextFactory, string pullPaymentId, IssuerKey issuerKey, byte[] uid, OnExistingBehavior? onExisting = null)
+    {
+        onExisting ??= OnExistingBehavior.UpdateVersion;
+        using var ctx = dbContextFactory.CreateContext();
+        var conn = ctx.Database.GetDbConnection();
+
+        string onConflict = onExisting switch
+        {
+            OnExistingBehavior.KeepVersion => "UPDATE SET ppid=excluded.ppid, version=boltcards.version",
+            OnExistingBehavior.UpdateVersion => "UPDATE SET ppid=excluded.ppid, version=boltcards.version+1",
+            _ => throw new NotSupportedException()
+        };
+        return await conn.QueryFirstOrDefaultAsync<int>(
+        $"INSERT INTO boltcards(id, ppid) VALUES (@id, @ppid) ON CONFLICT (id) DO {onConflict} RETURNING version", new
+        {
+            id = GetId(issuerKey, uid),
+            ppid = pullPaymentId
+        });
+    }
+    public static async Task SetBoltcardResetState(this ApplicationDbContextFactory dbContextFactory, IssuerKey issuerKey, byte[] uid)
+    {
+        using var ctx = dbContextFactory.CreateContext();
+        var conn = ctx.Database.GetDbConnection();
+        await conn.ExecuteAsync("UPDATE boltcards SET ppid=NULL, counter=0 WHERE id=@id", new
+        {
+            id = GetId(issuerKey, uid)
+        });
+    }
+
+    static string GetId(IssuerKey issuerKey, byte[] uid) => Encoders.Hex.EncodeData(issuerKey.GetId(uid));
+    public record BoltcardRegistration(string? PullPaymentId, string Id, byte[] UId, int Version, int Counter);
+    public static async Task<BoltcardRegistration?> GetBoltcardRegistration(this ApplicationDbContextFactory dbContextFactory, IssuerKey issuerKey, BoltcardPICCData piccData, bool updateCounter)
+    {
+        using var ctx = dbContextFactory.CreateContext();
+        var conn = ctx.Database.GetDbConnection();
+        var query = updateCounter ? "UPDATE boltcards SET counter=@counter WHERE id=@id AND counter < @counter RETURNING ppid, id, version, counter"
+                                  : "SELECT ppid, id, version, counter FROM boltcards WHERE id=@id AND counter < @counter";
+        var res = await conn.QueryFirstOrDefaultAsync(query, new { id = GetId(issuerKey, piccData.Uid), counter = piccData.Counter });
+        if (res is null)
+            return null;
+        return new BoltcardRegistration(res.ppid, res.id, piccData.Uid, res.version, res.counter);
+    }
+    public static Task<BoltcardRegistration?> GetBoltcardRegistration(this ApplicationDbContextFactory dbContextFactory, IssuerKey issuerKey, byte[] uid)
+    {
+        var data = new BoltcardPICCData(uid, int.MaxValue);
+        return GetBoltcardRegistration(dbContextFactory, issuerKey, data, false);
+    }
+}

BTCPayServer/Data/StoreBlob.cs

@@ -167,7 +167,7 @@ namespace BTCPayServer.Data
 
         public RateRules GetDefaultRateRules(BTCPayNetworkProvider networkProvider)
         {
-            StringBuilder builder = new StringBuilder();
+            var builder = new StringBuilder();
             foreach (var network in networkProvider.GetAll())
             {
                 if (network.DefaultRateRules.Length != 0)
@@ -177,7 +177,7 @@ namespace BTCPayServer.Data
                     {
                         builder.AppendLine(line);
                     }
-                    builder.AppendLine($"////////");
+                    builder.AppendLine("////////");
                     builder.AppendLine();
                 }
             }
@@ -185,7 +185,7 @@ namespace BTCPayServer.Data
             var preferredExchange = string.IsNullOrEmpty(PreferredExchange) ? GetRecommendedExchange() : PreferredExchange;
             builder.AppendLine(CultureInfo.InvariantCulture, $"X_X = {preferredExchange}(X_X);");
 
-            BTCPayServer.Rating.RateRules.TryParse(builder.ToString(), out var rules);
+            RateRules.TryParse(builder.ToString(), out var rules);
             rules.Spread = Spread;
             return rules;
         }

BTCPayServer/Data/StoreDataExtensions.cs

@@ -50,6 +50,7 @@ namespace BTCPayServer.Data
 
         public static StoreBlob GetStoreBlob(this StoreData storeData)
         {
+            ArgumentNullException.ThrowIfNull(storeData);
             var result = storeData.StoreBlob == null ? new StoreBlob() : new Serializer(null).ToObject<StoreBlob>(storeData.StoreBlob);
             if (result.PreferredExchange == null)
                 result.PreferredExchange = result.GetRecommendedExchange();

BTCPayServer/Extensions.cs

@@ -19,6 +19,7 @@ using BTCPayServer.Lightning;
 using BTCPayServer.Logging;
 using BTCPayServer.Models;
 using BTCPayServer.Models.StoreViewModels;
+using BTCPayServer.NTag424;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Security;
@@ -41,6 +42,11 @@ namespace BTCPayServer
 {
     public static class Extensions
     {
+        public static CardKey CreatePullPaymentCardKey(this IssuerKey issuerKey, byte[] uid, int version, string pullPaymentId)
+        {
+            var data = Encoding.UTF8.GetBytes(pullPaymentId);
+            return issuerKey.CreateCardKey(uid, version, data);
+        }
         public static DateTimeOffset TruncateMilliSeconds(this DateTimeOffset dt) => new (dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, dt.Second, 0, dt.Offset);
         public static decimal? GetDue(this InvoiceCryptoInfo invoiceCryptoInfo)
         {
@@ -94,20 +100,21 @@ namespace BTCPayServer
         public static string GetDisplayName(this ILightningClient client)
         {
             LightningConnectionStringHelper.ExtractValues(client.ToString(), out var type);
-           
-            var field = typeof(LightningConnectionType).GetField(type, BindingFlags.Public | BindingFlags.Static);
+
+            var lncType = typeof(LightningConnectionType);
+            var fields = lncType.GetFields(BindingFlags.Public | BindingFlags.Static);
+            var field = fields.FirstOrDefault(f => f.GetValue(lncType)?.ToString() == type);
             if (field == null) return type;
             DisplayAttribute attr = field.GetCustomAttribute<DisplayAttribute>();
             return attr?.Name ?? type;
-
         }
 
-        public static bool IsSafe(this ILightningClient connectionString)
+        public static bool IsSafe(this ILightningClient client)
         {
-            var kv = LightningConnectionStringHelper.ExtractValues(connectionString.ToString(), out var type);
-            if (kv.TryGetValue("cookiefilepath", out var cookieFilePath)  ||
-                kv.TryGetValue("macaroondirectorypath", out var macaroonDirectoryPath)  ||
-                kv.TryGetValue("macaroonfilepath", out var macaroonFilePath) )
+            var kv = LightningConnectionStringHelper.ExtractValues(client.ToString(), out var type);
+            if (kv.TryGetValue("cookiefilepath", out _)  ||
+                kv.TryGetValue("macaroondirectorypath", out _)  ||
+                kv.TryGetValue("macaroonfilepath", out _) )
                 return false;
 
             if (!kv.TryGetValue("server", out var server))
@@ -117,7 +124,7 @@ namespace BTCPayServer
             var uri = new Uri(server, UriKind.Absolute);
             if (uri.Scheme.Equals("unix", StringComparison.OrdinalIgnoreCase))
                 return false;
-            if (!Utils.TryParseEndpoint(uri.DnsSafeHost, 80, out var endpoint))
+            if (!Utils.TryParseEndpoint(uri.DnsSafeHost, 80, out _))
                 return false;
             return !IsLocalNetwork(uri.DnsSafeHost);
         }

BTCPayServer/Extensions/ActionLogicExtensions.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using BTCPayServer.Configuration;
 using BTCPayServer.Logging;
+using BTCPayServer.NTag424;
 using BTCPayServer.Services;
 using Microsoft.Extensions.Logging;
 

BTCPayServer/Extensions/SettingsRepositoryExtensions.cs

@@ -0,0 +1,32 @@
+#nullable enable
+using BTCPayServer.NTag424;
+using BTCPayServer.Services;
+using static BTCPayServer.Controllers.UIBoltcardController;
+using System.Threading.Tasks;
+
+namespace BTCPayServer;
+public static class SettingsRepositoryExtensions
+{
+    public static async Task<IssuerKey> GetIssuerKey(this SettingsRepository settingsRepository, BTCPayServerEnvironment env)
+    {
+        var settings = await settingsRepository.GetSettingAsync<BoltcardSettings>(nameof(BoltcardSettings));
+        AESKey issuerKey;
+        if (settings?.IssuerKey is byte[] bytes)
+        {
+            issuerKey = new AESKey(bytes);
+        }
+        else
+        {
+            issuerKey = env.CheatMode && env.IsDeveloping ? FixedKey() : AESKey.Random();
+            settings = new BoltcardSettings() { IssuerKey = issuerKey.ToBytes() };
+            await settingsRepository.UpdateSetting(settings, nameof(BoltcardSettings));
+        }
+        return new IssuerKey(issuerKey);
+    }
+    internal static AESKey FixedKey()
+    {
+        byte[] v = new byte[16];
+        v[0] = 1;
+        return new AESKey(v);
+    }
+}

BTCPayServer/HostedServices/AppInventoryUpdaterHostedService.cs

@@ -20,7 +20,6 @@ namespace BTCPayServer.HostedServices
         protected override void SubscribeToEvents()
         {
             Subscribe<InvoiceEvent>();
-            Subscribe<UpdateAppInventory>();
         }
 
         public AppInventoryUpdaterHostedService(EventAggregator eventAggregator, AppService appService, Logs logs) : base(eventAggregator, logs)
@@ -31,77 +30,18 @@ namespace BTCPayServer.HostedServices
 
         protected override async Task ProcessEvent(object evt, CancellationToken cancellationToken)
         {
-            if (evt is UpdateAppInventory updateAppInventory)
-            {
-                //get all apps that were tagged that have manageable inventory that has an item that matches the item code in the invoice
-                var apps = (await _appService.GetApps(updateAppInventory.AppId)).Select(data =>
-                    {
-                        switch (data.AppType)
-                        {
-                            case PointOfSaleAppType.AppType:
-                                var possettings = data.GetSettings<PointOfSaleSettings>();
-                                return (Data: data, Settings: (object)possettings,
-                                    Items: AppService.Parse(possettings.Template));
-                            case CrowdfundAppType.AppType:
-                                var cfsettings = data.GetSettings<CrowdfundSettings>();
-                                return (Data: data, Settings: (object)cfsettings,
-                                    Items: AppService.Parse(cfsettings.PerksTemplate));
-                            default:
-                                return (null, null, null);
-                        }
-                    }).Where(tuple => tuple.Data != null && tuple.Items.Any(item =>
-                                          item.Inventory.HasValue &&
-                                          updateAppInventory.Items.FirstOrDefault(i => i.Id == item.Id) != null));
-                foreach (var app in apps)
-                {
-                    foreach (var cartItem in updateAppInventory.Items)
-                    {
-                        var item = app.Items.FirstOrDefault(item => item.Id == cartItem.Id);
-                        if (item == null) continue;
-                        
-                        if (updateAppInventory.Deduct)
-                        {
-                            item.Inventory -= cartItem.Count;
-                        }
-                        else
-                        {
-                            item.Inventory += cartItem.Count;
-                        }
-                    }
-
-                    switch (app.Data.AppType)
-                    {
-                        case PointOfSaleAppType.AppType:
-                            ((PointOfSaleSettings)app.Settings).Template =
-                                AppService.SerializeTemplate(app.Items);
-                            break;
-                        case CrowdfundAppType.AppType:
-                            ((CrowdfundSettings)app.Settings).PerksTemplate =
-                                AppService.SerializeTemplate(app.Items);
-                            break;
-                        default:
-                            throw new InvalidOperationException();
-                    }
-
-                    app.Data.SetSettings(app.Settings);
-                    await _appService.UpdateOrCreateApp(app.Data);
-                }
-
-
-            }
-            else if (evt is InvoiceEvent invoiceEvent)
+            if (evt is InvoiceEvent invoiceEvent)
             {
                 List<PosCartItem> cartItems = null;
-                bool deduct;
+                int deduct;
                 switch (invoiceEvent.Name)
                 {
                     case InvoiceEvent.Expired:
-
                     case InvoiceEvent.MarkedInvalid:
-                        deduct = false;
+                        deduct = 1;
                         break;
                     case InvoiceEvent.Created:
-                        deduct = true;
+                        deduct = -1;
                         break;
                     default:
                         return;
@@ -112,11 +52,6 @@ namespace BTCPayServer.HostedServices
                 {
                     var appIds = AppService.GetAppInternalTags(invoiceEvent.Invoice);
 
-                    if (!appIds.Any())
-                    {
-                        return;
-                    }
-
                     var items = cartItems?.ToList() ?? new List<PosCartItem>();
                     if (!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode))
                     {
@@ -128,27 +63,13 @@ namespace BTCPayServer.HostedServices
                         });
                     }
 
-                    _eventAggregator.Publish(new UpdateAppInventory
+                    var changes = items.Select(i => new AppService.InventoryChange(i.Id, i.Count * deduct)).ToArray();
+                    foreach (var appId in appIds)
                     {
-                        Deduct = deduct,
-                        Items = items,
-                        AppId = appIds
-                    });
-
+                        await _appService.UpdateInventory(appId, changes);
+                    }
                 }
             }
         }
-
-        public class UpdateAppInventory
-        {
-            public string[] AppId { get; set; }
-            public List<PosCartItem> Items { get; set; }
-            public bool Deduct { get; set; }
-
-            public override string ToString()
-            {
-                return string.Empty;
-            }
-        }
     }
 }

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -38,11 +38,10 @@ namespace BTCPayServer.HostedServices
 
             public bool Dirty => _dirty;
 
-            bool _isBlobUpdated;
-            public bool IsBlobUpdated => _isBlobUpdated;
-            public void BlobUpdated()
+            public bool IsPriceUpdated { get; private set; }
+            public void PriceUpdated()
             {
-                _isBlobUpdated = true;
+                IsPriceUpdated = true;
             }
         }
 
@@ -104,7 +103,7 @@ namespace BTCPayServer.HostedServices
                             var payment = invoice.GetPayments(true).First();
                             invoice.Price = payment.InvoicePaidAmount.Net;
                             invoice.UpdateTotals();
-                            context.BlobUpdated();
+                            context.PriceUpdated();
                         }
                         else
                         {
@@ -291,9 +290,9 @@ namespace BTCPayServer.HostedServices
                             await _invoiceRepository.UpdateInvoiceStatus(invoice.Id, invoice.GetInvoiceState());
                             updateContext.Events.Insert(0, new InvoiceDataChangedEvent(invoice));
                         }
-                        if (updateContext.IsBlobUpdated)
+                        if (updateContext.IsPriceUpdated)
                         {
-                            await _invoiceRepository.UpdateInvoicePrice(invoice.Id, invoice);
+                            await _invoiceRepository.UpdateInvoicePrice(invoice.Id, invoice.Price);
                         }
 
                         foreach (var evt in updateContext.Events)

BTCPayServer/HostedServices/PluginUpdateFetcher.cs

@@ -83,7 +83,10 @@ namespace BTCPayServer.HostedServices
             var installedPlugins =
                 pluginService.LoadedPlugins.ToDictionary(plugin => plugin.Identifier, plugin => plugin.Version);
             var remotePlugins = await pluginService.GetRemotePlugins();
+            //take the latest version of each plugin
             var remotePluginsList = remotePlugins
+                .GroupBy(plugin => plugin.Identifier)
+                .Select(group => group.OrderByDescending(plugin => plugin.Version).First())
                 .Where(pair => installedPlugins.ContainsKey(pair.Identifier) || disabledPlugins.Contains(pair.Name))
                 .ToDictionary(plugin => plugin.Identifier, plugin => plugin.Version);
             var notify = new HashSet<string>();

BTCPayServer/HostedServices/Webhooks/InvoiceWebhookProvider.cs

@@ -72,7 +72,8 @@ public class InvoiceWebhookProvider : WebhookProvider<InvoiceEvent>
             case InvoiceEventCode.MarkedCompleted:
                 return new WebhookInvoiceSettledEvent(storeId)
                 {
-                    ManuallyMarked = eventCode == InvoiceEventCode.MarkedCompleted
+                    ManuallyMarked = eventCode == InvoiceEventCode.MarkedCompleted,
+                    OverPaid = invoiceEvent.Invoice.ExceptionStatus == InvoiceExceptionStatus.PaidOver
                 };
             case InvoiceEventCode.Created:
                 return new WebhookInvoiceEvent(WebhookEventType.InvoiceCreated, storeId);
@@ -110,7 +111,6 @@ public class InvoiceWebhookProvider : WebhookProvider<InvoiceEvent>
                         invoiceEvent.Invoice.Status.ToModernStatus() == InvoiceStatus.Invalid,
                     PaymentMethod = invoiceEvent.Payment.GetPaymentMethodId().ToStringNormalized(),
                     Payment = GreenfieldInvoiceController.ToPaymentModel(invoiceEvent.Invoice, invoiceEvent.Payment),
-                    OverPaid = invoiceEvent.Invoice.ExceptionStatus == InvoiceExceptionStatus.PaidOver,
                     StoreId = invoiceEvent.Invoice.StoreId
                 };
             default:

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -517,7 +517,6 @@ namespace BTCPayServer.Hosting
         {
             // We need to be careful to only add exchanges which OnGetTickers implementation make only 1 request
             services.AddRateProviderExchangeSharp<ExchangeBinanceAPI>(new("binance", "Binance", "https://api.binance.com/api/v1/ticker/24hr"));
-            services.AddRateProviderExchangeSharp<ExchangeBittrexAPI>(new("bittrex", "Bittrex", "https://bittrex.com/api/v1.1/public/getmarketsummaries"));
             services.AddRateProviderExchangeSharp<ExchangePoloniexAPI>(new("poloniex", "Poloniex", " https://api.poloniex.com/markets/price"));
             services.AddRateProviderExchangeSharp<ExchangeNDAXAPI>(new("ndax", "NDAX", "https://ndax.io/api/returnTicker"));
 

BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs

@@ -233,7 +233,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
                         Amount = paymentEntity.PaidAmount.Gross,
                         Paid = paymentEntity.InvoicePaidAmount.Net,
                         ReceivedDate = paymentEntity.ReceivedTime.DateTime,
-                        AmountFormatted = displayFormatter.Currency(paymentEntity.PaidAmount.Gross, paymentEntity.PaidAmount.Currency, DisplayFormatter.CurrencyFormat.None),
+                        AmountFormatted = displayFormatter.Currency(paymentEntity.PaidAmount.Gross, paymentEntity.PaidAmount.Currency),
                         PaidFormatted = displayFormatter.Currency(paymentEntity.InvoicePaidAmount.Net, invoice.Currency, DisplayFormatter.CurrencyFormat.Symbol),
                         RateFormatted = displayFormatter.Currency(paymentEntity.Rate, invoice.Currency, DisplayFormatter.CurrencyFormat.Symbol),
                         PaymentMethod = paymentMethodId.ToPrettyString(),

BTCPayServer/Models/SetupBoltcardViewModel.cs

@@ -0,0 +1,9 @@
+namespace BTCPayServer.Models
+{
+    public class SetupBoltcardViewModel
+    {
+        public string ReturnUrl { get; set; }
+        public string WebsocketPath { get; set; }
+        public string Command { get; set; }
+    }
+}

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -61,7 +61,7 @@ namespace BTCPayServer.Payments.Lightning
 
             if (preparePaymentObject is null)
             {
-                return new LightningLikePaymentMethodDetails()
+                return new LightningLikePaymentMethodDetails
                 {
                     Activated = false
                 };
@@ -142,8 +142,14 @@ namespace BTCPayServer.Payments.Lightning
                 {
                     throw new PaymentMethodUnavailableException("The lightning node did not reply in a timely manner");
                 }
-                catch (NotSupportedException) when (isLndHub)
+                catch (NotSupportedException)
                 {
+                    // LNDhub, LNbits and others might not support this call, yet we can create invoices.
+                    return new NodeInfo[] {};
+                }
+                catch (UnauthorizedAccessException)
+                {
+                    // LND might return this with restricted macaroon, support this nevertheless..
                     return new NodeInfo[] {};
                 }
                 catch (Exception ex)
@@ -237,7 +243,7 @@ namespace BTCPayServer.Payments.Lightning
 
         public override CheckoutUIPaymentMethodSettings GetCheckoutUISettings()
         {
-            return new CheckoutUIPaymentMethodSettings()
+            return new CheckoutUIPaymentMethodSettings
             {
                 ExtensionPartial = "Lightning/LightningLikeMethodCheckout",
                 CheckoutBodyVueComponentName = "LightningLikeMethodCheckout",

BTCPayServer/Payments/Lightning/LightningSupportedPaymentMethod.cs

@@ -30,11 +30,11 @@ namespace BTCPayServer.Payments.Lightning
 #pragma warning restore CS0618 // Type or member is obsolete
         }
 
-        public void SetLightningUrl(ILightningClient connectionString)
+        public void SetLightningUrl(ILightningClient client)
         {
-            ArgumentNullException.ThrowIfNull(connectionString);
+            ArgumentNullException.ThrowIfNull(client);
 #pragma warning disable CS0618 // Type or member is obsolete
-            LightningConnectionString = connectionString.ToString();
+            LightningConnectionString = client.ToString();
 #pragma warning restore CS0618 // Type or member is obsolete
         }
 

BTCPayServer/Plugins/Altcoins/AltcoinsPlugin.Dogecoin.cs

@@ -21,7 +21,7 @@ public partial class AltcoinsPlugin
             DefaultRateRules = new[]
             {
                                 "DOGE_X = DOGE_BTC * BTC_X",
-                                "DOGE_BTC = bittrex(DOGE_BTC)"
+                                "DOGE_BTC = bitpay(DOGE_BTC)"
                 },
             CryptoImagePath = "imlegacy/dogecoin.png",
             DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(ChainName),

BTCPayServer/Plugins/Altcoins/AltcoinsPlugin.Groestlcoin.cs

@@ -20,7 +20,7 @@ public partial class AltcoinsPlugin
             DefaultRateRules = new[]
             {
                     "GRS_X = GRS_BTC * BTC_X",
-                    "GRS_BTC = bittrex(GRS_BTC)"
+                    "GRS_BTC = upbit(GRS_BTC)"
                 },
             CryptoImagePath = "imlegacy/groestlcoin.png",
             LightningImagePath = "imlegacy/groestlcoin-lightning.svg",

BTCPayServer/Plugins/Altcoins/AltcoinsPlugin.Monacoin.cs

@@ -12,7 +12,7 @@ public partial class AltcoinsPlugin
     public void InitMonacoin(IServiceCollection services)
     {
         var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("MONA");
-        var network = new BTCPayNetwork()
+        var network = new BTCPayNetwork
         {
             CryptoCode = nbxplorerNetwork.CryptoCode,
             DisplayName = "Monacoin",
@@ -20,7 +20,8 @@ public partial class AltcoinsPlugin
             DefaultRateRules = new[]
             {
                                 "MONA_X = MONA_BTC * BTC_X",
-                                "MONA_BTC = bittrex(MONA_BTC)"
+                                "MONA_JPY = bitbank(MONA_JPY)",
+                                "MONA_BTC = MONA_JPY * JPY_BTC"
                 },
             CryptoImagePath = "imlegacy/monacoin.png",
             LightningImagePath = "imlegacy/mona-lightning.svg",

BTCPayServer/Plugins/LightningAddressResolver.cs

@@ -0,0 +1,9 @@
+using LNURL;
+
+namespace BTCPayServer.Plugins;
+
+public class LightningAddressResolver(string username)
+{
+    public string Username { get; set; } = LightningAddressService.NormalizeUsername(username);
+    public LNURLPayRequest LNURLPayRequest { get; set; }
+}

BTCPayServer/Plugins/LightningAddresssResolver.cs

@@ -1,14 +0,0 @@
-using LNURL;
-
-namespace BTCPayServer.Plugins;
-
-public class LightningAddressResolver
-{
-    public string Username { get; set; }
-    public LNURLPayRequest LNURLPayRequest { get; set; }
-
-    public LightningAddressResolver(string username)
-    {
-        Username = username;
-    }
-}

BTCPayServer/Plugins/PluginManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
@@ -10,7 +9,6 @@ using System.Reflection;
 using System.Text.RegularExpressions;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Configuration;
-using BTCPayServer.Logging;
 using McMaster.NETCore.Plugins;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -19,14 +17,14 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
-using NBXplorer;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Plugins
 {
     public static class PluginManager
     {
         public const string BTCPayPluginSuffix = ".btcpay";
-        private static readonly List<Assembly> _pluginAssemblies = new List<Assembly>();
+        private static readonly List<Assembly> _pluginAssemblies = new ();
 
         public static bool IsExceptionByPlugin(Exception exception, [MaybeNullWhen(false)] out string pluginName)
         {
@@ -65,6 +63,31 @@ namespace BTCPayServer.Plugins
         public static IMvcBuilder AddPlugins(this IMvcBuilder mvcBuilder, IServiceCollection serviceCollection,
             IConfiguration config, ILoggerFactory loggerFactory, ServiceProvider bootstrapServiceProvider)
         {
+            void LoadPluginsFromAssemblies(Assembly systemAssembly1, HashSet<string> hashSet, HashSet<string> loadedPluginIdentifiers1,
+                List<IBTCPayServerPlugin> btcPayServerPlugins)
+            {
+                // Load the referenced assembly plugins
+                // All referenced plugins should have at least one plugin with exact same plugin identifier
+                // as the assembly. Except for the system assembly (btcpayserver assembly) which are fake plugins
+                foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+                {
+                    var assemblyName = assembly.GetName().Name;
+                    bool isSystemPlugin = assembly == systemAssembly1;
+                    if (!isSystemPlugin && hashSet.Contains(assemblyName))
+                        continue;
+
+                    foreach (var plugin in GetPluginInstancesFromAssembly(assembly))
+                    {
+                        if (!isSystemPlugin && plugin.Identifier != assemblyName)
+                            continue;
+                        if (!loadedPluginIdentifiers1.Add(plugin.Identifier))
+                            continue;
+                        btcPayServerPlugins.Add(plugin);
+                        plugin.SystemPlugin = isSystemPlugin;
+                    }
+                }
+            }
+
             var logger = loggerFactory.CreateLogger(typeof(PluginManager));
             var pluginsFolder = new DataDirectories().Configure(config).PluginDir;
             var plugins = new List<IBTCPayServerPlugin>();
@@ -80,25 +103,12 @@ namespace BTCPayServer.Plugins
 
             var disabledPlugins = GetDisabledPlugins(pluginsFolder);
             var systemAssembly = typeof(Program).Assembly;
-            // Load the referenced assembly plugins
-            // All referenced plugins should have at least one plugin with exact same plugin identifier
-            // as the assembly. Except for the system assembly (btcpayserver assembly) which are fake plugins
-            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-            {
-                var assemblyName = assembly.GetName().Name;
-                bool isSystemPlugin = assembly == systemAssembly;
-                if (!isSystemPlugin && disabledPlugins.Contains(assemblyName))
-                    continue;
+            LoadPluginsFromAssemblies(systemAssembly, disabledPlugins, loadedPluginIdentifiers, plugins);
 
-                foreach (var plugin in GetPluginInstancesFromAssembly(assembly))
-                {
-                    if (!isSystemPlugin && plugin.Identifier != assemblyName)
-                        continue;
-                    if (!loadedPluginIdentifiers.Add(plugin.Identifier))
-                        continue;
-                    plugins.Add(plugin);
-                    plugin.SystemPlugin = isSystemPlugin;
-                }
+            if (ExecuteCommands(pluginsFolder, plugins.ToDictionary(plugin => plugin.Identifier, plugin => plugin.Version)))
+            {
+                plugins.Clear();
+                LoadPluginsFromAssemblies(systemAssembly, disabledPlugins, loadedPluginIdentifiers, plugins);
             }
 
             var pluginsToLoad = new List<(string PluginIdentifier, string PluginFilePath)>();
@@ -179,8 +189,15 @@ namespace BTCPayServer.Plugins
             {
                 if (plugin.Identifier == "BTCPayServer.Plugins.Prism" && plugin.Version <= new Version("1.1.18"))
                 {
+                    QueueCommands(pluginsFolder, ("disable", plugin.Identifier));
                     logger.LogWarning("Please update your prism plugin, this version is incompatible");
                     continue;
+                } 
+                if (plugin.Identifier == "BTCPayServer.Plugins.Wabisabi" && plugin.Version <= new Version("1.0.66"))
+                {
+                    
+                    QueueCommands(pluginsFolder, ("disable", plugin.Identifier));
+                    continue;
                 }
                 try
                 {
@@ -244,37 +261,56 @@ namespace BTCPayServer.Plugins
                 !type.IsAbstract).
                 Select(type => (IBTCPayServerPlugin)Activator.CreateInstance(type, Array.Empty<object>()));
         }
+
         private static IBTCPayServerPlugin GetPluginInstanceFromAssembly(string pluginIdentifier, Assembly assembly)
         {
-            return GetPluginInstancesFromAssembly(assembly)
-                .Where(plugin => plugin.Identifier == pluginIdentifier)
-                .FirstOrDefault();
+            return GetPluginInstancesFromAssembly(assembly).FirstOrDefault(plugin => plugin.Identifier == pluginIdentifier);
         }
 
-        private static void ExecuteCommands(string pluginsFolder)
+        private static bool ExecuteCommands(string pluginsFolder, Dictionary<string, Version> installed = null)
         {
             var pendingCommands = GetPendingCommands(pluginsFolder);
-            foreach (var command in pendingCommands)
+            if (!pendingCommands.Any())
             {
-                ExecuteCommand(command, pluginsFolder);
+                return false;
             }
 
-            File.Delete(Path.Combine(pluginsFolder, "commands"));
+            var remainingCommands = (from command in pendingCommands where !ExecuteCommand(command, pluginsFolder, false, installed) select $"{command.command}:{command.plugin}").ToList();
+            if (remainingCommands.Any())
+            {
+                File.WriteAllLines(Path.Combine(pluginsFolder, "commands"), remainingCommands);
+            }
+            else
+            {
+                File.Delete(Path.Combine(pluginsFolder, "commands"));
+            }
+
+            return remainingCommands.Count != pendingCommands.Length;
         }
 
-        private static void ExecuteCommand((string command, string extension) command, string pluginsFolder,
-            bool ignoreOrder = false)
+        private static bool DependenciesMet(string pluginsFolder, string plugin, Dictionary<string, Version> installed)
+        {
+            var dirName = Path.Combine(pluginsFolder, plugin);
+            var manifestFileName = dirName + ".json";
+            if (!File.Exists(manifestFileName)) return true;
+            var pluginManifest =  JObject.Parse(File.ReadAllText(manifestFileName)).ToObject<PluginService.AvailablePlugin>();
+            return DependenciesMet(pluginManifest.Dependencies, installed);
+        }
+
+        private static bool ExecuteCommand((string command, string extension) command, string pluginsFolder,
+            bool ignoreOrder = false, Dictionary<string, Version> installed = null)
         {
             var dirName = Path.Combine(pluginsFolder, command.extension);
             switch (command.command)
             {
                 case "update":
-                    ExecuteCommand(("enable", command.extension), pluginsFolder, true);
+                    if (!DependenciesMet(pluginsFolder, command.extension, installed))
+                        return false;
                     ExecuteCommand(("delete", command.extension), pluginsFolder, true);
                     ExecuteCommand(("install", command.extension), pluginsFolder, true);
                     break;
-                case "delete":
 
+                case "delete":
                     ExecuteCommand(("enable", command.extension), pluginsFolder, true);
                     if (File.Exists(dirName))
                     {
@@ -290,11 +326,15 @@ namespace BTCPayServer.Plugins
                                 orders.Where(s => s != command.extension));
                         }
                     }
-
                     break;
+
                 case "install":
-                    ExecuteCommand(("enable", command.extension), pluginsFolder, true);
                     var fileName = dirName + BTCPayPluginSuffix;
+                    var manifestFileName = dirName + ".json";
+                    if (!DependenciesMet(pluginsFolder, command.extension, installed))
+                        return false;
+
+                    ExecuteCommand(("enable", command.extension), pluginsFolder, true);
                     if (File.Exists(fileName))
                     {
                         ZipFile.ExtractToDirectory(fileName, dirName, true);
@@ -302,10 +342,12 @@ namespace BTCPayServer.Plugins
                         {
                             File.AppendAllLines(Path.Combine(pluginsFolder, "order"), new[] { command.extension });
                         }
-
                         File.Delete(fileName);
+                        if (File.Exists(manifestFileName))
+                        {
+                            File.Move(manifestFileName, Path.Combine(dirName, Path.GetFileName(manifestFileName)));
+                        }
                     }
-
                     break;
 
                 case "disable":
@@ -339,6 +381,8 @@ namespace BTCPayServer.Plugins
 
                     break;
             }
+
+            return true;
         }
 
         public static (string command, string plugin)[] GetPendingCommands(string pluginsFolder)
@@ -364,25 +408,84 @@ namespace BTCPayServer.Plugins
             var cmds = GetPendingCommands(pluginDir).Where(tuple =>
                 !tuple.plugin.Equals(plugin, StringComparison.InvariantCultureIgnoreCase)).ToArray();
 
+            if (File.Exists(Path.Combine(pluginDir, plugin, BTCPayPluginSuffix)))
+            {
+                File.Delete(Path.Combine(pluginDir, plugin, BTCPayPluginSuffix));
+            } 
+            if (File.Exists(Path.Combine(pluginDir, plugin, ".json")))
+            {
+                File.Delete(Path.Combine(pluginDir, plugin, ".json"));
+            }
             File.Delete(Path.Combine(pluginDir, "commands"));
             QueueCommands(pluginDir, cmds);
         }
 
         public static void DisablePlugin(string pluginDir, string plugin)
         {
-
             QueueCommands(pluginDir, ("disable", plugin));
         }
 
         public static HashSet<string> GetDisabledPlugins(string pluginsFolder)
         {
             var disabledFilePath = Path.Combine(pluginsFolder, "disabled");
-            if (File.Exists(disabledFilePath))
+            return File.Exists(disabledFilePath)
+                ? File.ReadLines(disabledFilePath).ToHashSet()
+                : [];
+        }
+
+        public static bool DependencyMet(IBTCPayServerPlugin.PluginDependency dependency,
+            Dictionary<string, Version> installed = null)
+        {
+            var plugin = dependency.Identifier.ToLowerInvariant();
+            var versionReq = dependency.Condition;
+            // ensure installed is not null and has lowercased keys for comparison
+            installed = installed == null
+                ? new Dictionary<string, Version>()
+                : installed.ToDictionary(x => x.Key.ToLowerInvariant(), x => x.Value);
+            if (!installed.ContainsKey(plugin) && !versionReq.Equals("!"))
             {
-                return File.ReadLines(disabledFilePath).ToHashSet();
+                return false;
             }
 
-            return new HashSet<string>();
+            var versionConditions = versionReq.Split("||", StringSplitOptions.RemoveEmptyEntries);
+            return versionConditions.Any(s =>
+            {
+                s = s.Trim();
+                var v = s.Substring(1);
+                if (s[1] == '=')
+                {
+                    v = s.Substring(2);
+                }
+
+                var parsedV = Version.Parse(v);
+                switch (s)
+                {
+                    case { } xx when xx.StartsWith(">="):
+                        return installed[plugin] >= parsedV;
+                    case { } xx when xx.StartsWith("<="):
+                        return installed[plugin] <= parsedV;
+                    case { } xx when xx.StartsWith(">"):
+                        return installed[plugin] > parsedV;
+                    case { } xx when xx.StartsWith("<"):
+                        return installed[plugin] >= parsedV;
+                    case { } xx when xx.StartsWith("^"):
+                        return installed[plugin] >= parsedV && installed[plugin].Major == parsedV.Major;
+                    case { } xx when xx.StartsWith("~"):
+                        return installed[plugin] >= parsedV && installed[plugin].Major == parsedV.Major &&
+                               installed[plugin].Minor == parsedV.Minor;
+                    case { } xx when xx.StartsWith("!="):
+                        return installed[plugin] != parsedV;
+                    case { } xx when xx.StartsWith("=="):
+                    default:
+                        return installed[plugin] == parsedV;
+                }
+            });
+        }
+
+        public static bool DependenciesMet(IEnumerable<IBTCPayServerPlugin.PluginDependency> dependencies,
+            Dictionary<string, Version> installed = null)
+        {
+            return dependencies.All(dependency => DependencyMet(dependency, installed));
         }
     }
 }

BTCPayServer/Plugins/PluginService.cs

@@ -2,22 +2,14 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Configuration;
-using BTCPayServer.Lightning.CLightning;
 using BTCPayServer.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileSystemGlobbing;
 using Microsoft.Extensions.Options;
-using NBitcoin.DataEncoders;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -27,10 +19,8 @@ namespace BTCPayServer.Plugins
     {
         private readonly IOptions<DataDirectories> _dataDirectories;
         private readonly PoliciesSettings _policiesSettings;
-        private readonly ISettingsRepository _settingsRepository;
         private readonly PluginBuilderClient _pluginBuilderClient;
         public PluginService(
-            ISettingsRepository settingsRepository,
             IEnumerable<IBTCPayServerPlugin> btcPayServerPlugins,
             PluginBuilderClient pluginBuilderClient,
             IOptions<DataDirectories> dataDirectories,
@@ -39,7 +29,6 @@ namespace BTCPayServer.Plugins
         {
             LoadedPlugins = btcPayServerPlugins;
             _pluginBuilderClient = pluginBuilderClient;
-            _settingsRepository = settingsRepository;
             _dataDirectories = dataDirectories;
             _policiesSettings = policiesSettings;
             Env = env;
@@ -47,6 +36,15 @@ namespace BTCPayServer.Plugins
 
         public IEnumerable<IBTCPayServerPlugin> LoadedPlugins { get; }
         public BTCPayServerEnvironment Env { get; }
+        
+        public Version GetVersionOfPendingInstall(string plugin)
+        {
+            var dirName = Path.Combine(_dataDirectories.Value.PluginDir, plugin);
+            var manifestFileName = dirName + ".json";
+            if (!File.Exists(manifestFileName)) return null;
+            var pluginManifest =  JObject.Parse(File.ReadAllText(manifestFileName)).ToObject<AvailablePlugin>();
+            return pluginManifest.Version;
+        }
 
         public async Task<AvailablePlugin[]> GetRemotePlugins()
         {
@@ -66,14 +64,18 @@ namespace BTCPayServer.Plugins
                 return p;
             }).ToArray();
         }
+
         public async Task DownloadRemotePlugin(string pluginIdentifier, string version)
         {
             var dest = _dataDirectories.Value.PluginDir;
             var filedest = Path.Join(dest, pluginIdentifier + ".btcpay");
+            var filemanifestdest = Path.Join(dest, pluginIdentifier + ".json");
             Directory.CreateDirectory(Path.GetDirectoryName(filedest));
             var url = $"api/v1/plugins/[{Uri.EscapeDataString(pluginIdentifier)}]/versions/{Uri.EscapeDataString(version)}/download";
+            var manifest = (await _pluginBuilderClient.GetPublishedVersions(null, true)).Select(v => v.ManifestInfo.ToObject<AvailablePlugin>()).FirstOrDefault(p => p.Identifier == pluginIdentifier);
+            await File.WriteAllTextAsync(filemanifestdest, JsonConvert.SerializeObject(manifest, Formatting.Indented));
             using var resp2 = await _pluginBuilderClient.HttpClient.GetAsync(url);
-            using var fs = new FileStream(filedest, FileMode.Create, FileAccess.ReadWrite);
+            await using var fs = new FileStream(filedest, FileMode.Create, FileAccess.ReadWrite);
             await resp2.Content.CopyToAsync(fs);
             await fs.FlushAsync();
         }
@@ -84,6 +86,7 @@ namespace BTCPayServer.Plugins
             UninstallPlugin(plugin);
             PluginManager.QueueCommands(dest, ("install", plugin));
         }
+
         public void UpdatePlugin(string plugin)
         {
             var dest = _dataDirectories.Value.PluginDir;
@@ -122,8 +125,7 @@ namespace BTCPayServer.Plugins
             public string Author { get; set; }
             public string AuthorLink { get; set; }
 
-            public void Execute(IApplicationBuilder applicationBuilder,
-                IServiceProvider applicationBuilderApplicationServices)
+            public void Execute(IApplicationBuilder applicationBuilder, IServiceProvider applicationBuilderApplicationServices)
             {
             }
 

BTCPayServer/Services/Apps/AppService.cs

@@ -15,6 +15,7 @@ using BTCPayServer.Plugins.PointOfSale.Models;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
+using Dapper;
 using Ganss.Xss;
 using Microsoft.EntityFrameworkCore;
 using NBitcoin;
@@ -46,6 +47,7 @@ namespace BTCPayServer.Services.Apps
         private readonly StoreRepository _storeRepository;
         private readonly HtmlSanitizer _HtmlSanitizer;
         public CurrencyNameTable Currencies => _Currencies;
+
         public AppService(
             IEnumerable<AppBaseType> apps,
             ApplicationDbContextFactory contextFactory,
@@ -77,13 +79,13 @@ namespace BTCPayServer.Services.Apps
 
         public async Task<object?> GetInfo(string appId)
         {
-            var appData = await GetApp(appId, null);
+            var appData = await GetApp(appId, null, includeStore: true);
             if (appData is null)
                 return null;
             var appType = GetAppType(appData.AppType);
             if (appType is null)
                 return null;
-            return appType.GetInfo(appData);
+            return await appType.GetInfo(appData);
         }
 
         public async Task<IEnumerable<ItemStats>> GetItemStats(AppData appData)
@@ -380,6 +382,46 @@ namespace BTCPayServer.Services.Apps
             return app;
         }
 
+        record AppSettingsWithXmin(string apptype, string settings, uint xmin);
+        public record InventoryChange(string ItemId, int Delta);
+        public async Task UpdateInventory(string appId, InventoryChange[] changes)
+        {
+            await using var ctx = _ContextFactory.CreateContext();
+            // We use xmin to make sure we don't override changes made by another process
+retry:
+            var connection = ctx.Database.GetDbConnection();
+            var row = connection.QueryFirstOrDefault<AppSettingsWithXmin>(
+                "SELECT \"AppType\" AS apptype, \"Settings\" AS settings, xmin FROM \"Apps\" WHERE \"Id\"=@appId", new { appId }
+                );
+            if (row?.settings is null)
+                return;
+            var templatePath = row.apptype switch
+            {
+                CrowdfundAppType.AppType => "PerksTemplate",
+                _ => "Template"
+            };
+            var settings = JObject.Parse(row.settings);
+            var items = JArray.Parse(settings[templatePath]!.Value<string>()!);
+            bool hasChange = false;
+            foreach (var change in changes)
+            {
+                var item = items.FirstOrDefault(i => i["id"]?.Value<string>() == change.ItemId && i["inventory"] is not null && i["inventory"]!.Type is JTokenType.Integer);
+                if (item is null)
+                    continue;
+                var inventory = item["inventory"]!.Value<int>();
+                inventory += change.Delta;
+                item["inventory"] = inventory;
+                hasChange = true;
+            }
+            if (!hasChange)
+                return;
+            settings[templatePath] = items.ToString(Formatting.None);
+            var updated = await connection.ExecuteAsync("UPDATE \"Apps\" SET \"Settings\"=@v::JSONB WHERE \"Id\"=@appId AND xmin=@xmin", new { appId, xmin = (int)row.xmin, v = settings.ToString(Formatting.None) }) == 1;
+            // If we can't update, it means someone else updated the row, so we need to retry
+            if (!updated)
+                goto retry;
+        }
+
         public async Task UpdateOrCreateApp(AppData app)
         {
             await using var ctx = _ContextFactory.CreateContext();

BTCPayServer/Services/DisplayFormatter.cs

@@ -44,6 +44,12 @@ public class DisplayFormatter
         }
         var formatted = value.ToString("C", provider);
 
+        // Ensure we are not using the symbol for BTC — we made that design choice consciously.
+        if (format == CurrencyFormat.Symbol && currencyData.Code == "BTC")
+        {
+            format = CurrencyFormat.Code;
+        }
+
         return format switch
         {
             CurrencyFormat.None => formatted.Replace(provider.CurrencySymbol, "").Trim(),

BTCPayServer/Services/Fees/FallbackFeeProvider.cs

@@ -8,8 +8,15 @@ using NBitcoin;
 
 namespace BTCPayServer.Services.Fees
 {
-    public class FallbackFeeProvider(IFeeProvider[] Providers) : IFeeProvider
+    public class FallbackFeeProvider : IFeeProvider
     {
+        public FallbackFeeProvider(IFeeProvider[] providers)
+        {
+            Providers = providers;
+        }
+
+        public IFeeProvider[] Providers { get; }
+
         public async Task<FeeRate> GetFeeRateAsync(int blockTarget = 20)
         {
             for (int i = 0; i < Providers.Length; i++)

BTCPayServer/Services/Fees/MempoolSpaceFeeProvider.cs

@@ -56,9 +56,22 @@ public class MempoolSpaceFeeProvider(
                     "minimumFee" => 144,
                     _ => -1
                 };
-                feesByBlockTarget.TryAdd(target, new FeeRate(value));
+                feesByBlockTarget.TryAdd(target, new FeeRate(RandomizeByPercentage(value, 10)));
             }
             return feesByBlockTarget;
         })!;
     }
+    
+    static decimal RandomizeByPercentage(decimal value, int percentage)
+    {
+        decimal range = value * percentage / 100m;
+        var res = value + range * (Random.Shared.NextDouble() < 0.5 ? -1 : 1);
+
+        return res switch
+        {
+            < 1m => 1m,
+            > 850m => 2000m,
+            _ => res
+        };
+    }
 }

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -11,6 +11,7 @@ using BTCPayServer.Events;
 using BTCPayServer.Logging;
 using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Payments;
+using Dapper;
 using Microsoft.EntityFrameworkCore;
 using NBitcoin;
 using Newtonsoft.Json;
@@ -130,32 +131,50 @@ namespace BTCPayServer.Services.Invoices
 
         public async Task UpdateInvoice(string invoiceId, UpdateCustomerModel data)
         {
-            using var ctx = _applicationDbContextFactory.CreateContext();
-            var invoiceData = await ctx.Invoices.FindAsync(invoiceId).ConfigureAwait(false);
-            if (invoiceData == null)
-                return;
-            if (invoiceData.CustomerEmail == null && data.Email != null)
+            retry:
+            using (var ctx = _applicationDbContextFactory.CreateContext())
             {
-                invoiceData.CustomerEmail = data.Email;
-                AddToTextSearch(ctx, invoiceData, invoiceData.CustomerEmail);
+                var invoiceData = await ctx.Invoices.FindAsync(invoiceId);
+                if (invoiceData == null)
+                    return;
+                if (invoiceData.CustomerEmail == null && data.Email != null)
+                {
+                    invoiceData.CustomerEmail = data.Email;
+                    AddToTextSearch(ctx, invoiceData, invoiceData.CustomerEmail);
+                }
+                try
+                {
+                    await ctx.SaveChangesAsync().ConfigureAwait(false);
+                }
+                catch (DbUpdateConcurrencyException)
+                {
+                    goto retry;
+                }
             }
-            await ctx.SaveChangesAsync().ConfigureAwait(false);
         }
 
         public async Task UpdateInvoiceExpiry(string invoiceId, TimeSpan seconds)
         {
-            await using var ctx = _applicationDbContextFactory.CreateContext();
-            var invoiceData = await ctx.Invoices.FindAsync(invoiceId);
-            var invoice = invoiceData.GetBlob(_btcPayNetworkProvider);
-            var expiry = DateTimeOffset.Now + seconds;
-            invoice.ExpirationTime = expiry;
-            invoice.MonitoringExpiration = expiry.AddHours(1);
-            invoiceData.SetBlob(invoice);
-
-            await ctx.SaveChangesAsync();
-
-            _eventAggregator.Publish(new InvoiceDataChangedEvent(invoice));
-            _ = InvoiceNeedUpdateEventLater(invoiceId, seconds);
+            retry:
+            await using (var ctx = _applicationDbContextFactory.CreateContext())
+            {
+                var invoiceData = await ctx.Invoices.FindAsync(invoiceId);
+                var invoice = invoiceData.GetBlob(_btcPayNetworkProvider);
+                var expiry = DateTimeOffset.Now + seconds;
+                invoice.ExpirationTime = expiry;
+                invoice.MonitoringExpiration = expiry.AddHours(1);
+                invoiceData.SetBlob(invoice);
+                try
+                {
+                    await ctx.SaveChangesAsync();
+                }
+                catch (DbUpdateConcurrencyException)
+                {
+                    goto retry;
+                }
+                _eventAggregator.Publish(new InvoiceDataChangedEvent(invoice));
+                _ = InvoiceNeedUpdateEventLater(invoiceId, seconds);
+            }
         }
 
         async Task InvoiceNeedUpdateEventLater(string invoiceId, TimeSpan expirationIn)
@@ -166,13 +185,23 @@ namespace BTCPayServer.Services.Invoices
 
         public async Task ExtendInvoiceMonitor(string invoiceId)
         {
-            using var ctx = _applicationDbContextFactory.CreateContext();
-            var invoiceData = await ctx.Invoices.FindAsync(invoiceId);
+            retry:
+            using (var ctx = _applicationDbContextFactory.CreateContext())
+            {
+                var invoiceData = await ctx.Invoices.FindAsync(invoiceId);
 
-            var invoice = invoiceData.GetBlob(_btcPayNetworkProvider);
-            invoice.MonitoringExpiration = invoice.MonitoringExpiration.AddHours(1);
-            invoiceData.SetBlob(invoice);
-            await ctx.SaveChangesAsync();
+                var invoice = invoiceData.GetBlob(_btcPayNetworkProvider);
+                invoice.MonitoringExpiration = invoice.MonitoringExpiration.AddHours(1);
+                invoiceData.SetBlob(invoice);
+                try
+                {
+                    await ctx.SaveChangesAsync();
+                }
+                catch (DbUpdateConcurrencyException)
+                {
+                    goto retry;
+                }
+            }
         }
 
         public async Task CreateInvoiceAsync(InvoiceEntity invoice, string[] additionalSearchTerms = null)
@@ -279,62 +308,81 @@ namespace BTCPayServer.Services.Invoices
 
         public async Task<bool> NewPaymentDetails(string invoiceId, IPaymentMethodDetails paymentMethodDetails, BTCPayNetworkBase network)
         {
-            await using var context = _applicationDbContextFactory.CreateContext();
-            var invoice = (await context.Invoices.Where(i => i.Id == invoiceId).ToListAsync()).FirstOrDefault();
-            if (invoice == null)
-                return false;
+            retry:
+            await using (var context = _applicationDbContextFactory.CreateContext())
+            {
+                var invoice = (await context.Invoices.Where(i => i.Id == invoiceId).ToListAsync()).FirstOrDefault();
+                if (invoice == null)
+                    return false;
 
-            var invoiceEntity = invoice.GetBlob(_btcPayNetworkProvider);
-            var paymentMethod = invoiceEntity.GetPaymentMethod(network, paymentMethodDetails.GetPaymentType());
-            if (paymentMethod == null)
-                return false;
+                var invoiceEntity = invoice.GetBlob(_btcPayNetworkProvider);
+                var paymentMethod = invoiceEntity.GetPaymentMethod(network, paymentMethodDetails.GetPaymentType());
+                if (paymentMethod == null)
+                    return false;
 
-            var existingPaymentMethod = paymentMethod.GetPaymentMethodDetails();
-            paymentMethod.SetPaymentMethodDetails(paymentMethodDetails);
+                var existingPaymentMethod = paymentMethod.GetPaymentMethodDetails();
+                paymentMethod.SetPaymentMethodDetails(paymentMethodDetails);
 #pragma warning disable CS0618
-            if (network.IsBTC)
-            {
-                invoiceEntity.DepositAddress = paymentMethod.DepositAddress;
-            }
+                if (network.IsBTC)
+                {
+                    invoiceEntity.DepositAddress = paymentMethod.DepositAddress;
+                }
 #pragma warning restore CS0618
-            invoiceEntity.SetPaymentMethod(paymentMethod);
-            invoice.SetBlob(invoiceEntity);
-
-            await context.AddressInvoices.AddAsync(new AddressInvoiceData()
-            {
-                InvoiceDataId = invoiceId,
-                CreatedTime = DateTimeOffset.UtcNow
-            }
-                .Set(GetDestination(paymentMethod), paymentMethod.GetId()));
-
-            AddToTextSearch(context, invoice, paymentMethodDetails.GetPaymentDestination());
-            await context.SaveChangesAsync();
-            return true;
-        }
-
-        public async Task UpdateInvoicePaymentMethod(string invoiceId, PaymentMethod paymentMethod)
-        {
-            using var context = _applicationDbContextFactory.CreateContext();
-            var invoice = await context.Invoices.FindAsync(invoiceId);
-            if (invoice == null)
-                return;
-            var network = paymentMethod.Network;
-            var invoiceEntity = invoice.GetBlob(_btcPayNetworkProvider);
-            var newDetails = paymentMethod.GetPaymentMethodDetails();
-            var existing = invoiceEntity.GetPaymentMethod(paymentMethod.GetId());
-            if (existing.GetPaymentMethodDetails().GetPaymentDestination() != newDetails.GetPaymentDestination() && newDetails.Activated)
-            {
+                invoiceEntity.SetPaymentMethod(paymentMethod);
+                invoice.SetBlob(invoiceEntity);
                 await context.AddressInvoices.AddAsync(new AddressInvoiceData()
                 {
                     InvoiceDataId = invoiceId,
                     CreatedTime = DateTimeOffset.UtcNow
                 }
-                    .Set(GetDestination(paymentMethod), paymentMethod.GetId()));
+                .Set(GetDestination(paymentMethod), paymentMethod.GetId()));
+
+                AddToTextSearch(context, invoice, paymentMethodDetails.GetPaymentDestination());
+                try
+                {
+                    await context.SaveChangesAsync();
+                }
+                catch (DbUpdateConcurrencyException)
+                {
+                    goto retry;
+                }
+                return true;
+            }
+        }
+
+        public async Task UpdateInvoicePaymentMethod(string invoiceId, PaymentMethod paymentMethod)
+        {
+            retry:
+            using (var context = _applicationDbContextFactory.CreateContext())
+            {
+                var invoice = await context.Invoices.FindAsync(invoiceId);
+                if (invoice == null)
+                    return;
+                var network = paymentMethod.Network;
+                var invoiceEntity = invoice.GetBlob(_btcPayNetworkProvider);
+                var newDetails = paymentMethod.GetPaymentMethodDetails();
+                var existing = invoiceEntity.GetPaymentMethod(paymentMethod.GetId());
+                if (existing.GetPaymentMethodDetails().GetPaymentDestination() != newDetails.GetPaymentDestination() && newDetails.Activated)
+                {
+                    await context.AddressInvoices.AddAsync(new AddressInvoiceData()
+                    {
+                        InvoiceDataId = invoiceId,
+                        CreatedTime = DateTimeOffset.UtcNow
+                    }
+                        .Set(GetDestination(paymentMethod), paymentMethod.GetId()));
+                }
+                invoiceEntity.SetPaymentMethod(paymentMethod);
+                invoice.SetBlob(invoiceEntity);
+                AddToTextSearch(context, invoice, paymentMethod.GetPaymentMethodDetails().GetPaymentDestination());
+                try
+                {
+                    await context.SaveChangesAsync();
+                }
+                catch (DbUpdateConcurrencyException)
+                {
+                    goto retry;
+                }
             }
-            invoiceEntity.SetPaymentMethod(paymentMethod);
-            invoice.SetBlob(invoiceEntity);
-            AddToTextSearch(context, invoice, paymentMethod.GetPaymentMethodDetails().GetPaymentDestination());
-            await context.SaveChangesAsync();
         }
 
         public async Task AddPendingInvoiceIfNotPresent(string invoiceId)
@@ -389,26 +437,38 @@ namespace BTCPayServer.Services.Invoices
         public async Task UpdateInvoiceStatus(string invoiceId, InvoiceState invoiceState)
         {
             using var context = _applicationDbContextFactory.CreateContext();
-            var invoiceData = await context.FindAsync<Data.InvoiceData>(invoiceId).ConfigureAwait(false);
-            if (invoiceData == null)
-                return;
-            invoiceData.Status = InvoiceState.ToString(invoiceState.Status);
-            invoiceData.ExceptionStatus = InvoiceState.ToString(invoiceState.ExceptionStatus);
-            await context.SaveChangesAsync().ConfigureAwait(false);
+            await context.Database.GetDbConnection()
+                .ExecuteAsync("UPDATE \"Invoices\" SET \"Status\"=@status, \"ExceptionStatus\"=@exstatus WHERE \"Id\"=@id",
+                new
+                {
+                    id = invoiceId,
+                    status = InvoiceState.ToString(invoiceState.Status),
+                    exstatus = InvoiceState.ToString(invoiceState.ExceptionStatus)
+                });
         }
-        internal async Task UpdateInvoicePrice(string invoiceId, InvoiceEntity invoice)
+        internal async Task UpdateInvoicePrice(string invoiceId, decimal price)
         {
-            if (invoice.Type != InvoiceType.TopUp)
-                throw new ArgumentException("The invoice type should be TopUp to be able to update invoice price", nameof(invoice));
-            using var context = _applicationDbContextFactory.CreateContext();
-            var invoiceData = await context.FindAsync<Data.InvoiceData>(invoiceId).ConfigureAwait(false);
-            if (invoiceData == null)
-                return;
-            var blob = invoiceData.GetBlob(_btcPayNetworkProvider);
-            blob.Price = invoice.Price;
-            AddToTextSearch(context, invoiceData, new[] { invoice.Price.ToString(CultureInfo.InvariantCulture) });
-            invoiceData.SetBlob(blob);
-            await context.SaveChangesAsync().ConfigureAwait(false);
+            retry:
+            using (var context = _applicationDbContextFactory.CreateContext())
+            {
+                var invoiceData = await context.FindAsync<Data.InvoiceData>(invoiceId).ConfigureAwait(false);
+                if (invoiceData == null)
+                    return;
+                var blob = invoiceData.GetBlob(_btcPayNetworkProvider);
+                if (blob.Type != InvoiceType.TopUp)
+                    throw new ArgumentException("The invoice type should be TopUp to be able to update invoice price", nameof(invoiceId));
+                blob.Price = price;
+                AddToTextSearch(context, invoiceData, new[] { price.ToString(CultureInfo.InvariantCulture) });
+                invoiceData.SetBlob(blob);
+                try
+                {
+                    await context.SaveChangesAsync();
+                }
+                catch (DbUpdateConcurrencyException)
+                {
+                    goto retry;
+                }
+            }
         }
 
         public async Task MassArchive(string[] invoiceIds, bool archive = true)
@@ -436,37 +496,47 @@ namespace BTCPayServer.Services.Invoices
         }
         public async Task<InvoiceEntity> UpdateInvoiceMetadata(string invoiceId, string storeId, JObject metadata)
         {
-            using var context = _applicationDbContextFactory.CreateContext();
-            var invoiceData = await GetInvoiceRaw(invoiceId, context);
-            if (invoiceData == null || (storeId != null &&
-                                        !invoiceData.StoreDataId.Equals(storeId,
-                                            StringComparison.InvariantCultureIgnoreCase)))
-                return null;
-            var blob = invoiceData.GetBlob(_btcPayNetworkProvider);
-
-            var newMetadata = InvoiceMetadata.FromJObject(metadata);
-            var oldOrderId = blob.Metadata.OrderId;
-            var newOrderId = newMetadata.OrderId;
-
-            if (newOrderId != oldOrderId)
+retry:
+            using (var context = _applicationDbContextFactory.CreateContext())
             {
-                // OrderId is saved in 2 places: (1) the invoice table and (2) in the metadata field. We are updating both for consistency.
-                invoiceData.OrderId = newOrderId;
+                var invoiceData = await GetInvoiceRaw(invoiceId, context);
+                if (invoiceData == null || (storeId != null &&
+                                            !invoiceData.StoreDataId.Equals(storeId,
+                                                StringComparison.InvariantCultureIgnoreCase)))
+                    return null;
+                var blob = invoiceData.GetBlob(_btcPayNetworkProvider);
 
-                if (oldOrderId != null && (newOrderId is null || !newOrderId.Equals(oldOrderId, StringComparison.InvariantCulture)))
+                var newMetadata = InvoiceMetadata.FromJObject(metadata);
+                var oldOrderId = blob.Metadata.OrderId;
+                var newOrderId = newMetadata.OrderId;
+
+                if (newOrderId != oldOrderId)
                 {
-                    RemoveFromTextSearch(context, invoiceData, oldOrderId);
+                    // OrderId is saved in 2 places: (1) the invoice table and (2) in the metadata field. We are updating both for consistency.
+                    invoiceData.OrderId = newOrderId;
+
+                    if (oldOrderId != null && (newOrderId is null || !newOrderId.Equals(oldOrderId, StringComparison.InvariantCulture)))
+                    {
+                        RemoveFromTextSearch(context, invoiceData, oldOrderId);
+                    }
+                    if (newOrderId != null)
+                    {
+                        AddToTextSearch(context, invoiceData, new[] { newOrderId });
+                    }
                 }
-                if (newOrderId != null)
+
+                blob.Metadata = newMetadata;
+                invoiceData.SetBlob(blob);
+                try
                 {
-                    AddToTextSearch(context, invoiceData, new[] { newOrderId });
+                    await context.SaveChangesAsync();
                 }
+                catch (DbUpdateConcurrencyException)
+                {
+                    goto retry;
+                }
+                return ToEntity(invoiceData);
             }
-
-            blob.Metadata = newMetadata;
-            invoiceData.SetBlob(blob);
-            await context.SaveChangesAsync().ConfigureAwait(false);
-            return ToEntity(invoiceData);
         }
         public async Task<bool> MarkInvoiceStatus(string invoiceId, InvoiceStatus status)
         {

BTCPayServer/Views/Shared/CreateOrEditRole.cshtml

@@ -31,7 +31,7 @@
 <div class="row">
     <div class="col-xxl-constrain">
         <form method="post">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <div asp-validation-summary="ModelOnly"></div>
 
             <div class="form-group" style="max-width:320px">
                 <label asp-for="Role" class="form-label"></label>

BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml

@@ -42,7 +42,7 @@
 
     <input type="hidden" asp-for="StoreId" />
     <input type="hidden" asp-for="Archived" />
-    <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+    <div asp-validation-summary="ModelOnly"></div>
 
     <div class="row">
         <div class="col-sm-10 col-md-9 col-xl-7 col-xxl-6">

BTCPayServer/Views/Shared/EmailsBody.cshtml

@@ -27,7 +27,7 @@
         <div class="col-xl-10 col-xxl-constrain">
             @if (!ViewContext.ModelState.IsValid)
             {
-                <div asp-validation-summary="All" class="text-danger"></div>
+                <div asp-validation-summary="All"></div>
             }
             <div class="form-group">
                 <label asp-for="Settings.Server" class="form-label">SMTP Server</label>

BTCPayServer/Views/Shared/ListRoles.cshtml

@@ -96,7 +96,10 @@
                 <td>
                     @if (!role.Permissions.Any())
                     {
-                        <span class="text-warning">No policies</span>
+                        <span class="info-note text-warning">
+                            <vc:icon symbol="warning"/>
+                            No policies
+                        </span>
                     }
                     else
                     {

BTCPayServer/Views/Shared/LocalhostBrowserSupport.cshtml

@@ -0,0 +1,22 @@
+<div id="walletAlert" class="alert alert-warning alert-dismissible my-4" style="display:none;" role="alert">
+    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
+        <vc:icon symbol="close" />
+    </button>
+    <span id="alertMessage"></span>
+</div>
+<script>
+		var alertMsg = document.getElementById("alertMessage");
+		var walletAlert = document.getElementById("walletAlert");
+		var isSafari = window.safari !== undefined;
+		if (isSafari)
+		{
+			alertMsg.innerHTML = "Safari doesn't support BTCPay Server Vault. Please use a different browser. (<a class=\"alert-link\" href=\"https://bugs.webkit.org/show_bug.cgi?id=171934\" target=\"_blank\" rel=\"noreferrer noopener\">More information</a>)";
+			walletAlert.style.display = null;
+		}
+		var isBrave = navigator.brave !== undefined;
+		if (isBrave)
+		{
+			alertMsg.innerHTML = "Brave supports BTCPay Server Vault, but you need to disable Brave Shields. (<a class=\"alert-link\" href=\"https://www.updateland.com/how-to-turn-off-brave-shields/\" target=\"_blank\" rel=\"noreferrer noopener\">More information</a>)";
+			walletAlert.style.display = null;
+		}
+</script>

BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml

@@ -43,7 +43,7 @@
 
     <input type="hidden" asp-for="StoreId" />
     <input type="hidden" asp-for="Archived" />
-    <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+    <div asp-validation-summary="ModelOnly"></div>
 
     <div class="row">
         <div class="col-sm-10 col-md-9 col-xl-7 col-xxl-6">

BTCPayServer/Views/Shared/VaultElements.cshtml

@@ -8,7 +8,7 @@
     <div class="vault-feedback vault-feedback3 mb-2 d-flex">
         <span class="vault-feedback-icon mt-1 me-2"></span> <span class="vault-feedback-content flex-grow"></span>
     </div>
-		<div class="vault-feedback vault-feedback4 mb-2 d-flex">
+	<div class="vault-feedback vault-feedback4 mb-2 d-flex">
         <span class="vault-feedback-icon mt-1 me-2"></span> <span class="vault-feedback-content flex-grow"></span>
     </div>
 	<div class="vault-feedback vault-feedback5 mb-2 d-flex">

BTCPayServer/Views/UIAccount/ForgotPassword.cshtml

@@ -10,7 +10,7 @@
 </p>
 
 <form asp-action="ForgotPassword" method="post">
-    <div asp-validation-summary="All" class="text-danger"></div>
+    <div asp-validation-summary="All"></div>
     <div class="form-group">
         <label asp-for="Email" class="form-label"></label>
         <input asp-for="Email" class="form-control" />

BTCPayServer/Views/UIAccount/Login.cshtml

@@ -9,7 +9,7 @@
 
 <form asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" id="login-form" asp-action="Login">
     <fieldset disabled="@(ViewData.ContainsKey("disabled") ? "disabled" : null)">
-        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <div asp-validation-summary="ModelOnly"></div>
         <div class="form-group">
             <label asp-for="Email" class="form-label"></label>
             <input asp-for="Email" class="form-control" required autofocus/>

BTCPayServer/Views/UIAccount/LoginWith2fa.cshtml

@@ -3,7 +3,7 @@
 <div class="twoFaBox">
     <h2 class="h3 mb-3">Two-Factor Authentication</h2>
     <form method="post" asp-route-returnUrl="@ViewData["ReturnUrl"]" asp-action="LoginWith2fa">
-        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <div asp-validation-summary="ModelOnly"></div>
         <input asp-for="RememberMe" type="hidden"/>
         <div class="form-group">
             <label asp-for="TwoFactorCode" class="form-label"></label>

BTCPayServer/Views/UIAccount/Register.cshtml

@@ -8,7 +8,7 @@
 
 <form asp-route-returnUrl="@ViewData["ReturnUrl"]" asp-route-logon="true" method="post">
     <fieldset disabled="@(ViewData.ContainsKey("disabled") ? "disabled" : null)" >
-        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <div asp-validation-summary="ModelOnly"></div>
         <div class="form-group">
             <label asp-for="Email" class="form-label"></label>
             <input asp-for="Email" class="form-control" required autofocus />

BTCPayServer/Views/UIAccount/SecondaryLogin.cshtml

@@ -15,7 +15,7 @@
 
 @if (Model.LoginWith2FaViewModel != null && Model.LoginWithFido2ViewModel != null&& Model.LoginWithLNURLAuthViewModel != null)
 {
-    <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+    <div asp-validation-summary="ModelOnly"></div>
 }
 else if (Model.LoginWith2FaViewModel == null && Model.LoginWithFido2ViewModel == null && Model.LoginWithLNURLAuthViewModel == null)
 {

BTCPayServer/Views/UIAccount/SetPassword.cshtml

@@ -5,7 +5,7 @@
 }
 
 <form method="post" asp-action="SetPassword">
-    <div asp-validation-summary="All" class="text-danger"></div>
+    <div asp-validation-summary="All"></div>
     <input asp-for="Code" type="hidden"/>
     <input asp-for="EmailSetInternally" type="hidden"/>
     @if (Model.EmailSetInternally)

BTCPayServer/Views/UIApps/CreateApp.cshtml

@@ -14,7 +14,7 @@
 <div class="row">
     <div class="col-xl-8 col-xxl-constrain">
         <form asp-action="CreateApp" asp-route-appType="@Model.AppType">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <div asp-validation-summary="ModelOnly"></div>
             @if (string.IsNullOrEmpty(Model.AppType))
             {
                 <div class="form-group">

BTCPayServer/Views/UICustodianAccounts/CreateCustodianAccount.cshtml

@@ -20,7 +20,7 @@
 			<input asp-for="Config" type="hidden" />
             @if (!ViewContext.ModelState.IsValid)
             {
-                <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+                <div asp-validation-summary="ModelOnly"></div>
             }
             @if (!string.IsNullOrEmpty(Model.SelectedCustodian))
             {

BTCPayServer/Views/UICustodianAccounts/EditCustodianAccount.cshtml

@@ -21,7 +21,7 @@
 			<input asp-for="Config" type="hidden" />
             @if (!ViewContext.ModelState.IsValid)
             {
-                <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+                <div asp-validation-summary="ModelOnly"></div>
             }
             <partial name="_FormTopMessages" model="Model.ConfigForm"/>
 

BTCPayServer/Views/UIForms/Modify.cshtml

@@ -211,7 +211,7 @@
                     }
                 </div>
             </div>
-            <div asp-validation-summary="All" class="text-danger"></div>
+            <div asp-validation-summary="All"></div>
             <div class="form-group" style="max-width: 27rem;">
                 <label asp-for="Name" class="form-label" data-required></label>
                 <input asp-for="Name" class="form-control" required />

BTCPayServer/Views/UIForms/View.cshtml

@@ -26,7 +26,7 @@
         <main class="flex-grow-1">
             @if (!ViewContext.ModelState.IsValid)
             {
-                <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+                <div asp-validation-summary="ModelOnly"></div>
             }
             <partial name="_FormTopMessages" model="@Model.Form" />
             <div class="d-flex flex-column justify-content-center gap-4">

BTCPayServer/Views/UIHome/RecoverySeedBackup.cshtml

@@ -70,7 +70,7 @@
                 <span>Do not photograph the recovery phrase, and do not store it digitally.</span>
             </p>
             <br />
-                <p class="text-warning">
+            <p class="text-warning">
                 <strong>The recovery phrase will be permanently erased from the server.</strong>
             </p>
         }