LN Address - db schema fix method

2022-04-14 15:26:10 +02:00
11 changed files with 629 additions and 220 deletions
--- a/BTCPayServer.Data/ApplicationDbContext.cs
+++ b/BTCPayServer.Data/ApplicationDbContext.cs
@ -61,6 +61,7 @@ namespace BTCPayServer.Data
        public DbSet<WalletTransactionData> WalletTransactions { get; set; }
        public DbSet<WebhookDeliveryData> WebhookDeliveries { get; set; }
        public DbSet<WebhookData> Webhooks { get; set; }
+        public DbSet<LightningAddressData> LightningAddresses{ get; set; }

        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
        {
@ -106,6 +107,7 @@ namespace BTCPayServer.Data
            //WalletData.OnModelCreating(builder);
            WalletTransactionData.OnModelCreating(builder);
            WebhookDeliveryData.OnModelCreating(builder);
+            LightningAddressData.OnModelCreating(builder);
            //WebhookData.OnModelCreating(builder);


--- a/BTCPayServer.Data/Data/LightingAddressData.cs
+++ b/BTCPayServer.Data/Data/LightingAddressData.cs
@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace BTCPayServer.Data;
+
+public class LightningAddressData
+{
+    public string Username { get; set; }
+    public string StoreDataId { get; set; }
+    public byte[] Blob { get; set; }
+
+    public StoreData Store { get; set; }
+
+
+    internal static void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<LightningAddressData>()
+            .HasOne(o => o.Store)
+            .WithMany(a => a.LightningAddresses)
+            .HasForeignKey(data => data.StoreDataId)
+            .IsRequired()
+            .OnDelete(DeleteBehavior.Cascade);
+        builder.Entity<LightningAddressData>().HasKey(o => o.Username);
+    }
+}
+
+public class LightningAddressDataBlob
+{
+    public string CurrencyCode { get; set; }
+    public decimal? Min { get; set; }
+    public decimal? Max { get; set; }
+}
--- a/BTCPayServer.Data/Data/StoreData.cs
+++ b/BTCPayServer.Data/Data/StoreData.cs
@ -41,5 +41,6 @@ namespace BTCPayServer.Data

        public List<PairedSINData> PairedSINs { get; set; }
        public IEnumerable<APIKeyData> APIKeys { get; set; }
+        public IEnumerable<LightningAddressData> LightningAddresses { get; set; }
    }
 }
--- a/BTCPayServer.Data/Migrations/20220414132313_AddLightningAddress.cs
+++ b/BTCPayServer.Data/Migrations/20220414132313_AddLightningAddress.cs
@ -0,0 +1,51 @@
+// <auto-generated />
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20220414132313_AddLightningAddress")]
+    public partial class AddLightningAddress : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "LightningAddresses",
+                columns: table => new
+                {
+                    Username = table.Column<string>(type: "TEXT", nullable: false),
+                    StoreDataId = table.Column<string>(type: "TEXT", nullable: false),
+                    Blob = table.Column<byte[]>( nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_LightningAddresses", x => x.Username);
+                    table.ForeignKey(
+                        name: "FK_LightningAddresses_Stores_StoreDataId",
+                        column: x => x.StoreDataId,
+                        principalTable: "Stores",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_LightningAddresses_StoreDataId",
+                table: "LightningAddresses",
+                column: "StoreDataId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "LightningAddresses");
+        }
+    }
+}
--- a/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs
@ -6,6 +6,8 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

+#nullable disable
+
 namespace BTCPayServer.Migrations
 {
    [DbContext(typeof(ApplicationDbContext))]
@ -14,40 +16,7 @@ namespace BTCPayServer.Migrations
        protected override void BuildModel(ModelBuilder modelBuilder)
        {
 #pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.19");
-
-            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(50);
-
-                    b.Property<byte[]>("Blob")
-                        .HasColumnType("BLOB");
-
-                    b.Property<string>("Label")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("StoreId")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(50);
-
-                    b.Property<int>("Type")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("UserId")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(50);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("StoreId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("ApiKeys");
-                });
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.1");

            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
                {
@ -67,6 +36,38 @@ namespace BTCPayServer.Migrations
                    b.ToTable("AddressInvoices");
                });

+            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("Blob")
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("Label")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StoreId")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StoreId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ApiKeys");
+                });
+
            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
                {
                    b.Property<string>("Id")
@ -119,8 +120,8 @@ namespace BTCPayServer.Migrations
                        .HasColumnType("TEXT");

                    b.Property<string>("Email")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(256);
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");

                    b.Property<bool>("EmailConfirmed")
                        .HasColumnType("INTEGER");
@ -132,12 +133,12 @@ namespace BTCPayServer.Migrations
                        .HasColumnType("TEXT");

                    b.Property<string>("NormalizedEmail")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(256);
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");

                    b.Property<string>("NormalizedUserName")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(256);
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");

                    b.Property<string>("PasswordHash")
                        .HasColumnType("TEXT");
@ -158,19 +159,19 @@ namespace BTCPayServer.Migrations
                        .HasColumnType("INTEGER");

                    b.Property<string>("UserName")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(256);
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");

                    b.HasKey("Id");

                    b.HasIndex("NormalizedEmail")
-                        .HasName("EmailIndex");
+                        .HasDatabaseName("EmailIndex");

                    b.HasIndex("NormalizedUserName")
                        .IsUnique()
-                        .HasName("UserNameIndex");
+                        .HasDatabaseName("UserNameIndex");

-                    b.ToTable("AspNetUsers");
+                    b.ToTable("AspNetUsers", (string)null);
                });

            modelBuilder.Entity("BTCPayServer.Data.Fido2Credential", b =>
@ -331,16 +332,35 @@ namespace BTCPayServer.Migrations
                    b.ToTable("InvoiceWebhookDeliveries");
                });

+            modelBuilder.Entity("BTCPayServer.Data.LightningAddressData", b =>
+                {
+                    b.Property<string>("Username")
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("Blob")
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("StoreDataId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Username");
+
+                    b.HasIndex("StoreDataId");
+
+                    b.ToTable("LightningAddresses");
+                });
+
            modelBuilder.Entity("BTCPayServer.Data.NotificationData", b =>
                {
                    b.Property<string>("Id")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(36);
+                        .HasMaxLength(36)
+                        .HasColumnType("TEXT");

                    b.Property<string>("ApplicationUserId")
                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(50);
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");

                    b.Property<byte[]>("Blob")
                        .HasColumnType("BLOB");
@ -350,8 +370,8 @@ namespace BTCPayServer.Migrations

                    b.Property<string>("NotificationType")
                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(100);
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");

                    b.Property<bool>("Seen")
                        .HasColumnType("INTEGER");
@ -366,8 +386,8 @@ namespace BTCPayServer.Migrations
            modelBuilder.Entity("BTCPayServer.Data.OffchainTransactionData", b =>
                {
                    b.Property<string>("Id")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(64);
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");

                    b.Property<byte[]>("Blob")
                        .HasColumnType("BLOB");
@ -437,8 +457,8 @@ namespace BTCPayServer.Migrations
            modelBuilder.Entity("BTCPayServer.Data.PayjoinLock", b =>
                {
                    b.Property<string>("Id")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(100);
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");

                    b.HasKey("Id");

@ -500,8 +520,8 @@ namespace BTCPayServer.Migrations
            modelBuilder.Entity("BTCPayServer.Data.PayoutData", b =>
                {
                    b.Property<string>("Id")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(30);
+                        .HasMaxLength(30)
+                        .HasColumnType("TEXT");

                    b.Property<byte[]>("Blob")
                        .HasColumnType("BLOB");
@ -514,8 +534,8 @@ namespace BTCPayServer.Migrations

                    b.Property<string>("PaymentMethodId")
                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(20);
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");

                    b.Property<byte[]>("Proof")
                        .HasColumnType("BLOB");
@ -525,8 +545,8 @@ namespace BTCPayServer.Migrations

                    b.Property<string>("State")
                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(20);
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");

                    b.HasKey("Id");

@ -552,8 +572,8 @@ namespace BTCPayServer.Migrations
            modelBuilder.Entity("BTCPayServer.Data.PlannedTransaction", b =>
                {
                    b.Property<string>("Id")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(100);
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");

                    b.Property<byte[]>("Blob")
                        .HasColumnType("BLOB");
@ -569,8 +589,8 @@ namespace BTCPayServer.Migrations
            modelBuilder.Entity("BTCPayServer.Data.PullPaymentData", b =>
                {
                    b.Property<string>("Id")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(30);
+                        .HasMaxLength(30)
+                        .HasColumnType("TEXT");

                    b.Property<bool>("Archived")
                        .HasColumnType("INTEGER");
@ -588,8 +608,8 @@ namespace BTCPayServer.Migrations
                        .HasColumnType("TEXT");

                    b.Property<string>("StoreId")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(50);
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");

                    b.HasKey("Id");

@ -604,8 +624,8 @@ namespace BTCPayServer.Migrations
                        .HasColumnType("TEXT");

                    b.Property<string>("PullPaymentDataId")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(30);
+                        .HasMaxLength(30)
+                        .HasColumnType("TEXT");

                    b.HasKey("InvoiceDataId", "PullPaymentDataId");

@ -661,25 +681,6 @@ namespace BTCPayServer.Migrations
                    b.ToTable("Stores");
                });

-            modelBuilder.Entity("BTCPayServer.Data.StoreWebhookData", b =>
-                {
-                    b.Property<string>("StoreId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("WebhookId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("StoreId", "WebhookId");
-
-                    b.HasIndex("StoreId")
-                        .IsUnique();
-
-                    b.HasIndex("WebhookId")
-                        .IsUnique();
-
-                    b.ToTable("StoreWebhooks");
-                });
-
            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
                {
                    b.Property<string>("Id")
@ -705,6 +706,25 @@ namespace BTCPayServer.Migrations
                    b.ToTable("Files");
                });

+            modelBuilder.Entity("BTCPayServer.Data.StoreWebhookData", b =>
+                {
+                    b.Property<string>("StoreId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("WebhookId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("StoreId", "WebhookId");
+
+                    b.HasIndex("StoreId")
+                        .IsUnique();
+
+                    b.HasIndex("WebhookId")
+                        .IsUnique();
+
+                    b.ToTable("StoreWebhooks");
+                });
+
            modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
                {
                    b.Property<string>("Id")
@ -791,8 +811,8 @@ namespace BTCPayServer.Migrations
            modelBuilder.Entity("BTCPayServer.Data.WebhookData", b =>
                {
                    b.Property<string>("Id")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(25);
+                        .HasMaxLength(25)
+                        .HasColumnType("TEXT");

                    b.Property<byte[]>("Blob")
                        .IsRequired()
@ -806,8 +826,8 @@ namespace BTCPayServer.Migrations
            modelBuilder.Entity("BTCPayServer.Data.WebhookDeliveryData", b =>
                {
                    b.Property<string>("Id")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(25);
+                        .HasMaxLength(25)
+                        .HasColumnType("TEXT");

                    b.Property<byte[]>("Blob")
                        .IsRequired()
@ -818,8 +838,8 @@ namespace BTCPayServer.Migrations

                    b.Property<string>("WebhookId")
                        .IsRequired()
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(25);
+                        .HasMaxLength(25)
+                        .HasColumnType("TEXT");

                    b.HasKey("Id");

@ -838,20 +858,20 @@ namespace BTCPayServer.Migrations
                        .HasColumnType("TEXT");

                    b.Property<string>("Name")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(256);
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");

                    b.Property<string>("NormalizedName")
-                        .HasColumnType("TEXT")
-                        .HasMaxLength(256);
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");

                    b.HasKey("Id");

                    b.HasIndex("NormalizedName")
                        .IsUnique()
-                        .HasName("RoleNameIndex");
+                        .HasDatabaseName("RoleNameIndex");

-                    b.ToTable("AspNetRoles");
+                    b.ToTable("AspNetRoles", (string)null);
                });

            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
@ -874,7 +894,7 @@ namespace BTCPayServer.Migrations

                    b.HasIndex("RoleId");

-                    b.ToTable("AspNetRoleClaims");
+                    b.ToTable("AspNetRoleClaims", (string)null);
                });

            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
@ -897,7 +917,7 @@ namespace BTCPayServer.Migrations

                    b.HasIndex("UserId");

-                    b.ToTable("AspNetUserClaims");
+                    b.ToTable("AspNetUserClaims", (string)null);
                });

            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
@ -919,7 +939,7 @@ namespace BTCPayServer.Migrations

                    b.HasIndex("UserId");

-                    b.ToTable("AspNetUserLogins");
+                    b.ToTable("AspNetUserLogins", (string)null);
                });

            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
@ -934,7 +954,7 @@ namespace BTCPayServer.Migrations

                    b.HasIndex("RoleId");

-                    b.ToTable("AspNetUserRoles");
+                    b.ToTable("AspNetUserRoles", (string)null);
                });

            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
@ -953,7 +973,17 @@ namespace BTCPayServer.Migrations

                    b.HasKey("UserId", "LoginProvider", "Name");

-                    b.ToTable("AspNetUserTokens");
+                    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 =>
@ -967,14 +997,10 @@ namespace BTCPayServer.Migrations
                        .WithMany("APIKeys")
                        .HasForeignKey("UserId")
                        .OnDelete(DeleteBehavior.Cascade);
-                });

-            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("AddressInvoices")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                    b.Navigation("StoreData");
+
+                    b.Navigation("User");
                });

            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
@ -983,6 +1009,8 @@ namespace BTCPayServer.Migrations
                        .WithMany("Apps")
                        .HasForeignKey("StoreDataId")
                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("StoreData");
                });

            modelBuilder.Entity("BTCPayServer.Data.Fido2Credential", b =>
@ -991,6 +1019,8 @@ namespace BTCPayServer.Migrations
                        .WithMany("Fido2Credentials")
                        .HasForeignKey("ApplicationUserId")
                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("ApplicationUser");
                });

            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
@ -1000,6 +1030,8 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("InvoiceDataId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
+
+                    b.Navigation("InvoiceData");
                });

            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
@ -1012,6 +1044,10 @@ namespace BTCPayServer.Migrations
                    b.HasOne("BTCPayServer.Data.RefundData", "CurrentRefund")
                        .WithMany()
                        .HasForeignKey("Id", "CurrentRefundId");
+
+                    b.Navigation("CurrentRefund");
+
+                    b.Navigation("StoreData");
                });

            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
@ -1021,6 +1057,8 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("InvoiceDataId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
+
+                    b.Navigation("InvoiceData");
                });

            modelBuilder.Entity("BTCPayServer.Data.InvoiceSearchData", b =>
@ -1029,6 +1067,8 @@ namespace BTCPayServer.Migrations
                        .WithMany("InvoiceSearchData")
                        .HasForeignKey("InvoiceDataId")
                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("InvoiceData");
                });

            modelBuilder.Entity("BTCPayServer.Data.InvoiceWebhookDeliveryData", b =>
@ -1044,6 +1084,21 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("BTCPayServer.Data.InvoiceWebhookDeliveryData", "InvoiceId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
+
+                    b.Navigation("Delivery");
+
+                    b.Navigation("Invoice");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.LightningAddressData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.StoreData", "Store")
+                        .WithMany("LightningAddresses")
+                        .HasForeignKey("StoreDataId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Store");
                });

            modelBuilder.Entity("BTCPayServer.Data.NotificationData", b =>
@ -1053,6 +1108,8 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("ApplicationUserId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
                });

            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
@ -1061,6 +1118,8 @@ namespace BTCPayServer.Migrations
                        .WithMany("PairedSINs")
                        .HasForeignKey("StoreDataId")
                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("StoreData");
                });

            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
@ -1069,6 +1128,8 @@ namespace BTCPayServer.Migrations
                        .WithMany("Payments")
                        .HasForeignKey("InvoiceDataId")
                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("InvoiceData");
                });

            modelBuilder.Entity("BTCPayServer.Data.PaymentRequestData", b =>
@ -1077,6 +1138,8 @@ namespace BTCPayServer.Migrations
                        .WithMany("PaymentRequests")
                        .HasForeignKey("StoreDataId")
                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("StoreData");
                });

            modelBuilder.Entity("BTCPayServer.Data.PayoutData", b =>
@ -1085,6 +1148,8 @@ namespace BTCPayServer.Migrations
                        .WithMany("Payouts")
                        .HasForeignKey("PullPaymentDataId")
                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("PullPaymentData");
                });

            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
@ -1094,6 +1159,8 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("Id")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
+
+                    b.Navigation("InvoiceData");
                });

            modelBuilder.Entity("BTCPayServer.Data.PullPaymentData", b =>
@ -1102,6 +1169,8 @@ namespace BTCPayServer.Migrations
                        .WithMany("PullPayments")
                        .HasForeignKey("StoreId")
                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("StoreData");
                });

            modelBuilder.Entity("BTCPayServer.Data.RefundData", b =>
@ -1117,6 +1186,19 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("PullPaymentDataId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
+
+                    b.Navigation("InvoiceData");
+
+                    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.StoreWebhookData", b =>
@ -1132,13 +1214,10 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("BTCPayServer.Data.StoreWebhookData", "WebhookId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
-                });

-            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
-                        .WithMany("StoredFiles")
-                        .HasForeignKey("ApplicationUserId");
+                    b.Navigation("Store");
+
+                    b.Navigation("Webhook");
                });

            modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
@ -1147,6 +1226,8 @@ namespace BTCPayServer.Migrations
                        .WithMany("U2FDevices")
                        .HasForeignKey("ApplicationUserId")
                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("ApplicationUser");
                });

            modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>
@ -1162,6 +1243,10 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("StoreDataId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("StoreData");
                });

            modelBuilder.Entity("BTCPayServer.Data.WalletTransactionData", b =>
@ -1171,6 +1256,8 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("WalletDataId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
+
+                    b.Navigation("WalletData");
                });

            modelBuilder.Entity("BTCPayServer.Data.WebhookDeliveryData", b =>
@ -1180,6 +1267,8 @@ namespace BTCPayServer.Migrations
                        .HasForeignKey("WebhookId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
+
+                    b.Navigation("Webhook");
                });

            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
@ -1218,7 +1307,7 @@ namespace BTCPayServer.Migrations
                        .IsRequired();

                    b.HasOne("BTCPayServer.Data.ApplicationUser", null)
-                        .WithMany()
+                        .WithMany("UserRoles")
                        .HasForeignKey("UserId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
@ -1232,6 +1321,74 @@ namespace BTCPayServer.Migrations
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
                });
+
+            modelBuilder.Entity("BTCPayServer.Data.ApplicationUser", b =>
+                {
+                    b.Navigation("APIKeys");
+
+                    b.Navigation("Fido2Credentials");
+
+                    b.Navigation("Notifications");
+
+                    b.Navigation("StoredFiles");
+
+                    b.Navigation("U2FDevices");
+
+                    b.Navigation("UserRoles");
+
+                    b.Navigation("UserStores");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
+                {
+                    b.Navigation("AddressInvoices");
+
+                    b.Navigation("Events");
+
+                    b.Navigation("HistoricalAddressInvoices");
+
+                    b.Navigation("InvoiceSearchData");
+
+                    b.Navigation("Payments");
+
+                    b.Navigation("PendingInvoices");
+
+                    b.Navigation("Refunds");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.PullPaymentData", b =>
+                {
+                    b.Navigation("Payouts");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.StoreData", b =>
+                {
+                    b.Navigation("APIKeys");
+
+                    b.Navigation("Apps");
+
+                    b.Navigation("Invoices");
+
+                    b.Navigation("LightningAddresses");
+
+                    b.Navigation("PairedSINs");
+
+                    b.Navigation("PaymentRequests");
+
+                    b.Navigation("PullPayments");
+
+                    b.Navigation("UserStores");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.WalletData", b =>
+                {
+                    b.Navigation("WalletTransactions");
+                });
+
+            modelBuilder.Entity("BTCPayServer.Data.WebhookData", b =>
+                {
+                    b.Navigation("Deliveries");
+                });
 #pragma warning restore 612, 618
        }
    }
--- a/BTCPayServer/Controllers/LnurlAuthService.cs
+++ b/BTCPayServer/Controllers/LnurlAuthService.cs
@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@ -6,6 +7,7 @@ using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Fido2;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
 using NBitcoin;
 using NBitcoin.Crypto;

@ -144,4 +146,115 @@ namespace BTCPayServer
            return await context.Fido2Credentials.Where(fDevice => fDevice.ApplicationUserId == userId && fDevice.Type == Fido2Credential.CredentialType.LNURLAuth).AnyAsync();
        }
    }
+
+    public class LightningAddressService
+    {
+        private readonly ApplicationDbContextFactory _applicationDbContextFactory;
+        private readonly IMemoryCache _memoryCache;
+
+        public LightningAddressService(ApplicationDbContextFactory applicationDbContextFactory, IMemoryCache memoryCache)
+        {
+            _applicationDbContextFactory = applicationDbContextFactory;
+            _memoryCache = memoryCache;
+        }
+        
+        public async Task<List<LightningAddressData>> Get(LightningAddressQuery query)
+        {
+            
+            await using var context = _applicationDbContextFactory.CreateContext();
+            return await GetCore(context, query);
+        }
+        
+        private async Task<List<LightningAddressData>> GetCore(ApplicationDbContext context,LightningAddressQuery query)
+        {
+            
+            IQueryable<LightningAddressData?> queryable = context.LightningAddresses.AsQueryable();
+            if (query.Usernames is not null)
+            {
+                queryable = queryable.Where(data => query.Usernames.Contains(data.Username));
+            }
+            if (query.StoreIds is not null)
+            {
+                queryable = queryable.Where(data => query.StoreIds.Contains(data.StoreDataId));
+            }
+
+            return await queryable.ToListAsync();
+        }
+        
+        public async Task<LightningAddressData?> ResolveByAddress(string username)
+        {
+           return  await _memoryCache.GetOrCreateAsync(GetKey(username), async entry =>
+           {
+               var result = await Get(new LightningAddressQuery() {Usernames = new[] {username}});
+               return result.FirstOrDefault();
+           });
+        }
+
+        public async Task<bool> Set(LightningAddressData data)
+        {
+            await using var context = _applicationDbContextFactory.CreateContext();
+            var result = (await GetCore(context, new LightningAddressQuery() {Usernames = new[] {data.Username}}))
+                .FirstOrDefault();
+            if (result is not null)
+            {
+                if (result.StoreDataId != data.StoreDataId)
+                {
+                    return false;
+                }
+
+                context.Remove(result);
+            }
+
+            await context.AddAsync(data);
+            await context.SaveChangesAsync();
+            _memoryCache.Remove(GetKey(data.Username));
+            return true;
+        }
+
+        public async Task<bool> Remove(string username, string storeId = null)
+        {
+            await using var context = _applicationDbContextFactory.CreateContext();
+            var x = (await GetCore (context, new LightningAddressQuery() {Usernames = new[] {username}})).FirstOrDefault();
+            if (x is null) return true;
+            if (storeId is not null && x.StoreDataId != storeId)
+            {
+                return false;
+            }
+
+            context.Remove(x);
+            await context.SaveChangesAsync();
+            _memoryCache.Remove(GetKey(username));
+            return true;
+        }
+        public async Task Set(LightningAddressData data, ApplicationDbContext context)
+        {
+            var result = (await GetCore(context, new LightningAddressQuery() {Usernames = new[] {data.Username}}))
+                .FirstOrDefault();
+            if (result is not null)
+            {
+                if (result.StoreDataId != data.StoreDataId)
+                {
+                    return;
+                }
+
+                context.Remove(result);
+            }
+
+            await context.AddAsync(data);
+        } 
+        
+        
+
+        private string GetKey(string username)
+        {
+            return $"{nameof(LightningAddressService)}_{username}";
+        }
+    }
+
+    public class LightningAddressQuery
+    {
+        public string[]? StoreIds { get; set; }
+        public string[]? Usernames { get; set; }
+
+    }
 }
--- a/BTCPayServer/Controllers/UILNURLController.cs
+++ b/BTCPayServer/Controllers/UILNURLController.cs
@ -2,7 +2,6 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@ -18,7 +17,6 @@ using BTCPayServer.Lightning;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
-using BTCPayServer.Services;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
@ -26,7 +24,6 @@ using BTCPayServer.Services.Stores;
 using LNURL;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Routing;
 using NBitcoin;
 using NBitcoin.Crypto;
@ -44,9 +41,10 @@ namespace BTCPayServer
        private readonly LightningLikePaymentHandler _lightningLikePaymentHandler;
        private readonly StoreRepository _storeRepository;
        private readonly AppService _appService;
+
        private readonly UIInvoiceController _invoiceController;
-        private readonly SettingsRepository _settingsRepository;
        private readonly LinkGenerator _linkGenerator;
+        private readonly LightningAddressService _lightningAddressService;

        public UILNURLController(InvoiceRepository invoiceRepository,
            EventAggregator eventAggregator,
@ -55,8 +53,8 @@ namespace BTCPayServer
            StoreRepository storeRepository,
            AppService appService,
            UIInvoiceController invoiceController,
-            SettingsRepository settingsRepository,
-            LinkGenerator linkGenerator)
+            LinkGenerator linkGenerator,
+            LightningAddressService lightningAddressService)
        {
            _invoiceRepository = invoiceRepository;
            _eventAggregator = eventAggregator;
@ -65,8 +63,8 @@ namespace BTCPayServer
            _storeRepository = storeRepository;
            _appService = appService;
            _invoiceController = invoiceController;
-            _settingsRepository = settingsRepository;
            _linkGenerator = linkGenerator;
+            _lightningAddressService = lightningAddressService;
        }


@ -90,6 +88,7 @@ namespace BTCPayServer
            {
                return NotFound();
            }
+
            if (string.IsNullOrEmpty(itemCode))
            {
                return NotFound();
@ -133,7 +132,7 @@ namespace BTCPayServer
            }

            return await GetLNURL(cryptoCode, app.StoreDataId, currencyCode, null, null,
-                () => (null, new List<string> { AppService.GetAppInternalTag(appId) }, item.Price.Value, true));
+                () => (null, new List<string> {AppService.GetAppInternalTag(appId)}, item.Price.Value, true));
        }

        public class EditLightningAddressVM
@ -154,8 +153,7 @@ namespace BTCPayServer
            public class LightningAddressItem
            {
                public string StoreId { get; set; }
-                [Display(Name = "Invoice currency")]
-                public string CurrencyCode { get; set; }
+                [Display(Name = "Invoice currency")] public string CurrencyCode { get; set; }

                [Display(Name = "Min sats")]
                [Range(1, double.PositiveInfinity)]
@ -178,22 +176,18 @@ namespace BTCPayServer
            }
        }

-        private async Task<LightningAddressSettings> GetSettings()
-        {
-            return await _settingsRepository.GetSettingAsync<LightningAddressSettings>(nameof(LightningAddressSettings)) ??
-                   new LightningAddressSettings();
-        }

        [HttpGet("~/.well-known/lnurlp/{username}")]
        public async Task<IActionResult> ResolveLightningAddress(string username)
        {
-            var lightningAddressSettings = await GetSettings();
-            if (!lightningAddressSettings.Items.TryGetValue(username.ToLowerInvariant(), out var item))
+            var lightningAddressSettings = await _lightningAddressService.ResolveByAddress(username);
+            if (lightningAddressSettings is null)
            {
                return NotFound("Unknown username");
            }

-            return await GetLNURL("BTC", item.StoreId, item.CurrencyCode, item.Min, item.Max,
+            var blob = lightningAddressSettings.Blob.GetBlob<LightningAddressDataBlob>();
+            return await GetLNURL("BTC", lightningAddressSettings.StoreDataId, blob.CurrencyCode, blob.Min, blob.Max,
                () => (username, null, null, true));
        }

@ -250,7 +244,7 @@ namespace BTCPayServer
                    Amount = invoiceAmount,
                    Checkout = new InvoiceDataBase.CheckoutOptions
                    {
-                        PaymentMethods = new[] { pmi.ToStringNormalized() },
+                        PaymentMethods = new[] {pmi.ToStringNormalized()},
                        Expiration = blob.InvoiceExpiration < TimeSpan.FromMinutes(2)
                            ? blob.InvoiceExpiration
                            : TimeSpan.FromMinutes(2)
@ -273,10 +267,10 @@ namespace BTCPayServer
                await _invoiceRepository.UpdateInvoicePaymentMethod(i.Id, pm);
            }

-            lnurlMetadata.Add(new[] { "text/plain", i.Id });
+            lnurlMetadata.Add(new[] {"text/plain", i.Id});
            if (!string.IsNullOrEmpty(username))
            {
-                lnurlMetadata.Add(new[] { "text/identifier", lnAddress });
+                lnurlMetadata.Add(new[] {"text/identifier", lnAddress});
            }

            return Ok(new LNURLPayRequest
@ -292,7 +286,7 @@ namespace BTCPayServer
                Callback = new Uri(_linkGenerator.GetUriByAction(
                    action: nameof(GetLNURLForInvoice),
                    controller: "UILNURL",
-                    values: new { cryptoCode, invoiceId = i.Id }, Request.Scheme, Request.Host, Request.PathBase))
+                    values: new {cryptoCode, invoiceId = i.Id}, Request.Scheme, Request.Host, Request.PathBase))
            });
        }

@ -306,6 +300,7 @@ namespace BTCPayServer
            {
                return NotFound();
            }
+
            if (comment is not null)
                comment = comment.Truncate(2000);

@ -337,20 +332,16 @@ namespace BTCPayServer

                List<string[]> lnurlMetadata = new List<string[]>();

-                lnurlMetadata.Add(new[] { "text/plain", i.Id });
+                lnurlMetadata.Add(new[] {"text/plain", i.Id});
                if (!string.IsNullOrEmpty(paymentMethodDetails.ConsumedLightningAddress))
                {
-                    lnurlMetadata.Add(new[] { "text/identifier", paymentMethodDetails.ConsumedLightningAddress });
+                    lnurlMetadata.Add(new[] {"text/identifier", paymentMethodDetails.ConsumedLightningAddress});
                }

                var metadata = JsonConvert.SerializeObject(lnurlMetadata);
                if (amount.HasValue && (amount < min || amount > max))
                {
-                    return BadRequest(new LNUrlStatusResponse
-                    {
-                        Status = "ERROR",
-                        Reason = "Amount is out of bounds."
-                    });
+                    return BadRequest(new LNUrlStatusResponse {Status = "ERROR", Reason = "Amount is out of bounds."});
                }

                if (amount.HasValue && string.IsNullOrEmpty(paymentMethodDetails.BOLT11) ||
@ -379,7 +370,7 @@ namespace BTCPayServer
                            descriptionHash,
                            i.ExpirationTime.ToUniversalTime() - DateTimeOffset.UtcNow));
                        if (!BOLT11PaymentRequest.Parse(invoice.BOLT11, network.NBitcoinNetwork)
-                            .VerifyDescriptionHash(metadata))
+                                .VerifyDescriptionHash(metadata))
                        {
                            return BadRequest(new LNUrlStatusResponse
                            {
@ -413,9 +404,7 @@ namespace BTCPayServer
                        paymentMethodDetails, pmi));
                    return Ok(new LNURLPayRequest.LNURLPayRequestCallbackResponse
                    {
-                        Disposable = true,
-                        Routes = Array.Empty<string>(),
-                        Pr = paymentMethodDetails.BOLT11
+                        Disposable = true, Routes = Array.Empty<string>(), Pr = paymentMethodDetails.BOLT11
                    });
                }

@ -430,9 +419,7 @@ namespace BTCPayServer

                    return Ok(new LNURLPayRequest.LNURLPayRequestCallbackResponse
                    {
-                        Disposable = true,
-                        Routes = Array.Empty<string>(),
-                        Pr = paymentMethodDetails.BOLT11
+                        Disposable = true, Routes = Array.Empty<string>(), Pr = paymentMethodDetails.BOLT11
                    });
                }

@ -452,8 +439,7 @@ namespace BTCPayServer

            return BadRequest(new LNUrlStatusResponse
            {
-                Status = "ERROR",
-                Reason = "Invoice not in a valid payable state"
+                Status = "ERROR", Reason = "Invoice not in a valid payable state"
            });
        }

@ -463,37 +449,39 @@ namespace BTCPayServer
        [HttpGet("~/stores/{storeId}/integrations/lightning-address")]
        public async Task<IActionResult> EditLightningAddress(string storeId)
        {
-            if (ControllerContext.HttpContext.GetStoreData().GetEnabledPaymentIds(_btcPayNetworkProvider).All(id => id.PaymentType != LNURLPayPaymentType.Instance))
+            if (ControllerContext.HttpContext.GetStoreData().GetEnabledPaymentIds(_btcPayNetworkProvider)
+                .All(id => id.PaymentType != LNURLPayPaymentType.Instance))
            {
                TempData.SetStatusMessageModel(new StatusMessageModel
                {
                    Message = "LNURL is required for lightning addresses but has not yet been enabled.",
                    Severity = StatusMessageModel.StatusSeverity.Error
                });
-                return RedirectToAction(nameof(UIStoresController.GeneralSettings), "UIStores", new { storeId });
-            }
-            var lightningAddressSettings = await GetSettings();
-            if (lightningAddressSettings.StoreToItemMap.TryGetValue(storeId, out var addresses))
-            {
-                return View(new EditLightningAddressVM
-                {
-                    Items = addresses.Select(s => new EditLightningAddressVM.EditLightningAddressItem
-                    {
-                        Max = lightningAddressSettings.Items[s].Max,
-                        Min = lightningAddressSettings.Items[s].Min,
-                        CurrencyCode = lightningAddressSettings.Items[s].CurrencyCode,
-                        StoreId = lightningAddressSettings.Items[s].StoreId,
-                        Username = s,
-                    }).ToList()
-                });
+                return RedirectToAction(nameof(UIStoresController.GeneralSettings), "UIStores", new {storeId});
            }

+            var addresses =
+                await _lightningAddressService.Get(new LightningAddressQuery() {StoreIds = new[] {storeId}});
+
            return View(new EditLightningAddressVM
            {
-                Items = new List<EditLightningAddressVM.EditLightningAddressItem>()
+                Items = addresses.Select(s =>
+                    {
+                        var blob = s.Blob.GetBlob<LightningAddressDataBlob>();
+                        return new EditLightningAddressVM.EditLightningAddressItem
+                        {
+                            Max = blob.Max,
+                            Min = blob.Min,
+                            CurrencyCode = blob.CurrencyCode,
+                            StoreId = storeId,
+                            Username = s.Username,
+                        };
+                    }
+                ).ToList()
            });
        }

+
        [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie)]
        [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
        [HttpPost("~/stores/{storeId}/integrations/lightning-address")]
@ -502,69 +490,71 @@ namespace BTCPayServer
        {
            if (command == "add")
            {
-                if (!string.IsNullOrEmpty(vm.Add.CurrencyCode) && currencyNameTable.GetCurrencyData(vm.Add.CurrencyCode, false) is null)
+                if (!string.IsNullOrEmpty(vm.Add.CurrencyCode) &&
+                    currencyNameTable.GetCurrencyData(vm.Add.CurrencyCode, false) is null)
                {
                    vm.AddModelError(addressVm => addressVm.Add.CurrencyCode, "Currency is invalid", this);
                }
-                if (!ModelState.IsValid)
-                {
-                    return View(vm);
-                }
-                var lightningAddressSettings = await GetSettings();
-                if (lightningAddressSettings.Items.ContainsKey(vm.Add.Username.ToLowerInvariant()))
-                {
-                    vm.AddModelError(addressVm => addressVm.Add.Username, "Username is already taken", this);
-                }

                if (!ModelState.IsValid)
                {
                    return View(vm);
                }
+               

-                if (lightningAddressSettings.StoreToItemMap.TryGetValue(storeId, out var ids))
+                if (await _lightningAddressService.Set(new LightningAddressData()
+                    {
+                        StoreDataId = storeId,
+                        Username = vm.Add.Username,
+                        Blob = new LightningAddressDataBlob()
+                        {
+                            Max = vm.Add.Max, Min = vm.Add.Min, CurrencyCode = vm.Add.CurrencyCode
+                        }.SerializeBlob()
+                    }))
                {
-                    ids = ids.Concat(new[] { vm.Add.Username.ToLowerInvariant() }).ToArray();
+                    TempData.SetStatusMessageModel(new StatusMessageModel
+                    {
+                        Severity = StatusMessageModel.StatusSeverity.Success,
+                        Message = "Lightning address added successfully."
+                    });
                }
                else
                {
-                    ids = new[] { vm.Add.Username.ToLowerInvariant() };
+                    vm.AddModelError(addressVm => addressVm.Add.Username, "Username is already taken", this);
+                    
+                    if (!ModelState.IsValid)
+                    {
+                        return View(vm);
+                    }
                }
-
-                lightningAddressSettings.StoreToItemMap.AddOrReplace(storeId, ids);
-                vm.Add.StoreId = storeId;
-                lightningAddressSettings.Items.TryAdd(vm.Add.Username.ToLowerInvariant(), vm.Add);
-                await _settingsRepository.UpdateSetting(lightningAddressSettings, nameof(LightningAddressSettings));
-                TempData.SetStatusMessageModel(new StatusMessageModel
-                {
-                    Severity = StatusMessageModel.StatusSeverity.Success,
-                    Message = "Lightning address added successfully."
-                });
-
                return RedirectToAction("EditLightningAddress");
            }

            if (command.StartsWith("remove", StringComparison.InvariantCultureIgnoreCase))
            {
-                var lightningAddressSettings = await  GetSettings();
-                var index = int.Parse(
-                    command.Substring(command.IndexOf(":", StringComparison.InvariantCultureIgnoreCase) + 1),
-                    CultureInfo.InvariantCulture);
-                if (lightningAddressSettings.StoreToItemMap.TryGetValue(storeId, out var addresses))
+                var index = command.Substring(command.IndexOf(":", StringComparison.InvariantCultureIgnoreCase) + 1);
+                if (await _lightningAddressService.Remove(index, storeId))
                {
-                    var addressToRemove = addresses[index];
-                    addresses = addresses.Where(s => s != addressToRemove).ToArray();
-                    lightningAddressSettings.StoreToItemMap.AddOrReplace(storeId, addresses);
-                    lightningAddressSettings.Items.TryRemove(addressToRemove, out _);
-                    await _settingsRepository.UpdateSetting(lightningAddressSettings, nameof(LightningAddressSettings));
                    TempData.SetStatusMessageModel(new StatusMessageModel
                    {
                        Severity = StatusMessageModel.StatusSeverity.Success,
-                        Message = $"Lightning address {addressToRemove} removed successfully."
+                        Message = $"Lightning address {index} removed successfully."
                    });
+                    return RedirectToAction("EditLightningAddress");
+                }
+                else
+                {
+                    vm.AddModelError(addressVm => addressVm.Add.Username, "Username could not be removed", this);
+                    
+                    if (!ModelState.IsValid)
+                    {
+                        return View(vm);
+                    }
                }
            }
+            
+            return View(vm);

-            return RedirectToAction("EditLightningAddress");
        }
    }
 }
--- a/BTCPayServer/Data/APIKeyDataExtensions.cs
+++ b/BTCPayServer/Data/APIKeyDataExtensions.cs
@ -1,3 +1,4 @@
+using System.Linq;
 using NBXplorer;
 using Newtonsoft.Json.Linq;

@ -7,20 +8,30 @@ namespace BTCPayServer.Data
    {
        public static APIKeyBlob GetBlob(this APIKeyData apiKeyData)
        {
-            var result = apiKeyData.Blob == null
-                ? new APIKeyBlob()
-                : JObject.Parse(ZipUtils.Unzip(apiKeyData.Blob)).ToObject<APIKeyBlob>();
-            return result;
+            return GetBlob<APIKeyBlob>(apiKeyData.Blob);
        }

        public static bool SetBlob(this APIKeyData apiKeyData, APIKeyBlob blob)
        {
-            var original = new Serializer(null).ToString(apiKeyData.GetBlob());
-            var newBlob = new Serializer(null).ToString(blob);
-            if (original == newBlob)
+            var newBlob = SerializeBlob(blob);
+            if (apiKeyData.Blob.SequenceEqual(newBlob))
                return false;
-            apiKeyData.Blob = ZipUtils.Zip(newBlob);
+            apiKeyData.Blob = newBlob;
            return true;
        }
+        
+        public static T GetBlob<T>(this byte[] data)
+        {
+            var result = data == null
+                ? default
+                : JObject.Parse(ZipUtils.Unzip(data)).ToObject<T>();
+            return result;
+        }
+
+        public static byte[] SerializeBlob<T>(this T blob)
+        {
+            var newBlob = new Serializer(null).ToString(blob);
+            return ZipUtils.Zip(newBlob);
+        }
    }
 }
--- a/BTCPayServer/Hosting/MigrationStartupTask.cs
+++ b/BTCPayServer/Hosting/MigrationStartupTask.cs
@ -40,6 +40,7 @@ namespace BTCPayServer.Hosting
        private readonly AppService _appService;
        private readonly IEnumerable<IPayoutHandler> _payoutHandlers;
        private readonly BTCPayNetworkJsonSerializerSettings _btcPayNetworkJsonSerializerSettings;
+        private readonly LightningAddressService _lightningAddressService;
        private readonly UserManager<ApplicationUser> _userManager;

        public IOptions<LightningNetworkOptions> LightningOptions { get; }
@ -54,6 +55,7 @@ namespace BTCPayServer.Hosting
            AppService appService,
            IEnumerable<IPayoutHandler> payoutHandlers,
            BTCPayNetworkJsonSerializerSettings btcPayNetworkJsonSerializerSettings,
+            LightningAddressService lightningAddressService,
            Logs logs)
        {
            Logs = logs;
@ -64,6 +66,7 @@ namespace BTCPayServer.Hosting
            _appService = appService;
            _payoutHandlers = payoutHandlers;
            _btcPayNetworkJsonSerializerSettings = btcPayNetworkJsonSerializerSettings;
+            _lightningAddressService = lightningAddressService;
            _userManager = userManager;
            LightningOptions = lightningOptions;
        }
@ -175,6 +178,12 @@ namespace BTCPayServer.Hosting
                    settings.LighingAddressSettingRename = true;
                    await _Settings.UpdateSetting(settings);
                }
+                if (!settings.LighingAddressOrphanFix)
+                {
+                    await MigrateLighingAddressOrphanFix();
+                    settings.LighingAddressOrphanFix = true;
+                    await _Settings.UpdateSetting(settings);
+                }
            }
            catch (Exception ex)
            {
@ -183,6 +192,49 @@ namespace BTCPayServer.Hosting
            }
        }

+        private async Task MigrateLighingAddressOrphanFix()
+        {
+            await using var ctx = _DBContextFactory.CreateContext();
+
+            var lightningAddressSettings =
+                await _Settings.GetSettingAsync<UILNURLController.LightningAddressSettings>(
+                    nameof(UILNURLController.LightningAddressSettings));
+
+            if (lightningAddressSettings is null)
+            {
+                return;
+            }
+
+            var storeids = lightningAddressSettings.StoreToItemMap.Keys.ToArray();
+            var existingStores = await ctx.Stores.Where(data => storeids.Contains(data.Id)).Select(data => data.Id ).ToArrayAsync();
+
+            foreach (var storeMap in lightningAddressSettings.StoreToItemMap)
+            {
+                if (!existingStores.Contains(storeMap.Key)) continue;
+                foreach (var storeitem in storeMap.Value)
+                {
+                    if (lightningAddressSettings.Items.TryGetValue(storeitem, out var val))
+                    {
+                        await _lightningAddressService.Set(
+                            new LightningAddressData()
+                            {
+                                StoreDataId = storeMap.Key,
+                                Username = storeitem,
+                                Blob = new LightningAddressDataBlob()
+                                {
+                                    Max = val.Max,
+                                    Min = val.Min,
+                                    CurrencyCode = val.CurrencyCode
+                                }.SerializeBlob()
+                            }, ctx);
+                    }
+                }
+            }
+
+            await ctx.SaveChangesAsync();
+            await _Settings.UpdateSetting<object>(null, nameof(UILNURLController.LightningAddressSettings));
+        }
+
        private async Task MigrateLighingAddressSettingRename()
        {
           var old = await _Settings.GetSettingAsync<UILNURLController.LightningAddressSettings>("BTCPayServer.LNURLController+LightningAddressSettings");
--- a/BTCPayServer/Services/MigrationSettings.cs
+++ b/BTCPayServer/Services/MigrationSettings.cs
@ -29,5 +29,6 @@ namespace BTCPayServer.Services
        public bool MigratePayoutDestinationId { get; set; }
        public bool AddInitialUserBlob { get; set; }
        public bool LighingAddressSettingRename { get; set; }
+        public bool LighingAddressOrphanFix { get; set; }
    }
 }
--- a/BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml
+++ b/BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml
@ -134,7 +134,7 @@
                                }
                            </td>
                            <td class="text-end">
-                                <button type="submit" title="Remove" name="command" value="@($"remove:{index}")"
+                                <button type="submit" title="Remove" name="command" value="@($"remove:{Model.Items[index].Username}")"
                                        class="btn btn-link px-0 remove" data-bs-toggle="modal" data-bs-target="#ConfirmModal" data-description="The Lightning Address <strong>@address</strong> will be removed." data-confirm-input="REMOVE">
                                    Remove
                                </button>