diff --git a/BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs b/BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs index d5ae67fbfa..cfec344a7f 100644 --- a/BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs +++ b/BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.Extensions.Options; using Npgsql; +using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations.Operations; @@ -21,7 +22,8 @@ public BaseDbContextFactory(IOptions options, string migrationT _migrationTableName = migrationTableName; } - public abstract T CreateContext(); + public T CreateContext() => CreateContext(null); + public abstract T CreateContext(Action npgsqlOptionsAction = null); class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator { #pragma warning disable EF1001 // Internal EF Core API usage. @@ -66,16 +68,18 @@ protected override void Generate(NpgsqlCreateDatabaseOperation operation, IModel } } - public void ConfigureBuilder(DbContextOptionsBuilder builder) + public void ConfigureBuilder(DbContextOptionsBuilder builder) => ConfigureBuilder(builder, null); + public void ConfigureBuilder(DbContextOptionsBuilder builder, Action npgsqlOptionsAction = null) { builder .UseNpgsql(_options.Value.ConnectionString, o => { o.EnableRetryOnFailure(10); o.SetPostgresVersion(12, 0); - var mainSearchPath = GetSearchPath(_options.Value.ConnectionString); - var schemaPrefix = string.IsNullOrEmpty(_migrationTableName) ? "__EFMigrationsHistory" : _migrationTableName; - o.MigrationsHistoryTable(schemaPrefix, mainSearchPath); + npgsqlOptionsAction?.Invoke(o); + var mainSearchPath = GetSearchPath(_options.Value.ConnectionString); + var schemaPrefix = string.IsNullOrEmpty(_migrationTableName) ? "__EFMigrationsHistory" : _migrationTableName; + o.MigrationsHistoryTable(schemaPrefix, mainSearchPath); }) .ReplaceService(); } diff --git a/BTCPayServer.Data/ApplicationDbContext.cs b/BTCPayServer.Data/ApplicationDbContext.cs index 2614cfc94a..35f9697834 100644 --- a/BTCPayServer.Data/ApplicationDbContext.cs +++ b/BTCPayServer.Data/ApplicationDbContext.cs @@ -28,7 +28,6 @@ public ApplicationDbContext(DbContextOptions options) public DbSet ApiKeys { get; set; } public DbSet Apps { get; set; } public DbSet Files { get; set; } - public DbSet InvoiceEvents { get; set; } public DbSet InvoiceSearches { get; set; } public DbSet InvoiceWebhookDeliveries { get; set; } public DbSet Invoices { get; set; } @@ -75,7 +74,6 @@ protected override void OnModelCreating(ModelBuilder builder) APIKeyData.OnModelCreating(builder, Database); AppData.OnModelCreating(builder, Database); //StoredFile.OnModelCreating(builder); - InvoiceEventData.OnModelCreating(builder); InvoiceSearchData.OnModelCreating(builder); InvoiceWebhookDeliveryData.OnModelCreating(builder); InvoiceData.OnModelCreating(builder, Database); diff --git a/BTCPayServer.Data/ApplicationDbContextFactory.cs b/BTCPayServer.Data/ApplicationDbContextFactory.cs index bfbcb34cfd..fa3c9401d7 100644 --- a/BTCPayServer.Data/ApplicationDbContextFactory.cs +++ b/BTCPayServer.Data/ApplicationDbContextFactory.cs @@ -5,6 +5,7 @@ using BTCPayServer.Abstractions.Models; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; +using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; namespace BTCPayServer.Data { @@ -14,11 +15,11 @@ public ApplicationDbContextFactory(IOptions options) : base(opt { } - public override ApplicationDbContext CreateContext() + public override ApplicationDbContext CreateContext(Action npgsqlOptionsAction = null) { var builder = new DbContextOptionsBuilder(); builder.AddInterceptors(Data.InvoiceData.MigrationInterceptor.Instance); - ConfigureBuilder(builder); + ConfigureBuilder(builder, npgsqlOptionsAction); return new ApplicationDbContext(builder.Options); } } diff --git a/BTCPayServer.Data/BTCPayServer.Data.csproj b/BTCPayServer.Data/BTCPayServer.Data.csproj index 646084b827..4883815a2a 100644 --- a/BTCPayServer.Data/BTCPayServer.Data.csproj +++ b/BTCPayServer.Data/BTCPayServer.Data.csproj @@ -14,4 +14,7 @@ + + + diff --git a/BTCPayServer.Data/DBScripts/000.Init.sql b/BTCPayServer.Data/DBScripts/000.Init.sql new file mode 100644 index 0000000000..c2c5090561 --- /dev/null +++ b/BTCPayServer.Data/DBScripts/000.Init.sql @@ -0,0 +1,301 @@ +CREATE TABLE "AddressInvoices" ( + "Address" text NOT NULL, + "InvoiceDataId" text, + "CreatedTime" timestamp with time zone +); +CREATE TABLE "ApiKeys" ( + "Id" character varying(50) NOT NULL, + "StoreId" character varying(50), + "Permissions" text, + "Type" integer DEFAULT 0 NOT NULL, + "UserId" character varying(50), + "Label" text +); +CREATE TABLE "Apps" ( + "Id" text NOT NULL, + "AppType" text, + "Created" timestamp with time zone NOT NULL, + "Name" text, + "Settings" text, + "StoreDataId" text, + "TagAllInvoices" boolean DEFAULT false NOT NULL +); +CREATE TABLE "AspNetRoleClaims" ( + "Id" integer NOT NULL, + "ClaimType" text, + "ClaimValue" text, + "RoleId" text NOT NULL +); +CREATE TABLE "AspNetRoles" ( + "Id" text NOT NULL, + "ConcurrencyStamp" text, + "Name" character varying(256), + "NormalizedName" character varying(256) +); +CREATE TABLE "AspNetUserClaims" ( + "Id" integer NOT NULL, + "ClaimType" text, + "ClaimValue" text, + "UserId" text NOT NULL +); +CREATE TABLE "AspNetUserLogins" ( + "LoginProvider" character varying(255) NOT NULL, + "ProviderKey" character varying(255) NOT NULL, + "ProviderDisplayName" text, + "UserId" text NOT NULL +); +CREATE TABLE "AspNetUserRoles" ( + "UserId" text NOT NULL, + "RoleId" text NOT NULL +); +CREATE TABLE "AspNetUserTokens" ( + "UserId" text NOT NULL, + "LoginProvider" character varying(64) NOT NULL, + "Name" character varying(64) NOT NULL, + "Value" text +); +CREATE TABLE "AspNetUsers" ( + "Id" text NOT NULL, + "AccessFailedCount" integer NOT NULL, + "ConcurrencyStamp" text, + "Email" character varying(256), + "EmailConfirmed" boolean NOT NULL, + "LockoutEnabled" boolean NOT NULL, + "LockoutEnd" timestamp with time zone, + "NormalizedEmail" character varying(256), + "NormalizedUserName" character varying(256), + "PasswordHash" text, + "PhoneNumber" text, + "PhoneNumberConfirmed" boolean NOT NULL, + "SecurityStamp" text, + "TwoFactorEnabled" boolean NOT NULL, + "UserName" character varying(256), + "RequiresEmailConfirmation" boolean DEFAULT false NOT NULL +); +CREATE TABLE "Files" ( + "Id" text NOT NULL, + "FileName" text, + "StorageFileName" text, + "Timestamp" timestamp with time zone NOT NULL, + "ApplicationUserId" text +); +CREATE TABLE "HistoricalAddressInvoices" ( + "InvoiceDataId" text NOT NULL, + "Address" text NOT NULL, + "Assigned" timestamp with time zone NOT NULL, + "UnAssigned" timestamp with time zone, + "CryptoCode" text +); +CREATE TABLE "InvoiceEvents" ( + "InvoiceDataId" text NOT NULL, + "UniqueId" text NOT NULL, + "Message" text, + "Timestamp" timestamp with time zone NOT NULL +); +CREATE TABLE "Invoices" ( + "Id" text NOT NULL, + "Blob" bytea, + "Created" timestamp with time zone NOT NULL, + "CustomerEmail" text, + "ExceptionStatus" text, + "ItemCode" text, + "OrderId" text, + "Status" text, + "StoreDataId" text +); +CREATE TABLE "PairedSINData" ( + "Id" text NOT NULL, + "Label" text, + "PairingTime" timestamp with time zone NOT NULL, + "SIN" text, + "StoreDataId" text +); +CREATE TABLE "PairingCodes" ( + "Id" text NOT NULL, + "DateCreated" timestamp with time zone NOT NULL, + "Expiration" timestamp with time zone NOT NULL, + "Facade" text, + "Label" text, + "SIN" text, + "StoreDataId" text, + "TokenValue" text +); +CREATE TABLE "PaymentRequests" ( + "Id" text NOT NULL, + "StoreDataId" text, + "Status" integer NOT NULL, + "Blob" bytea, + "Created" timestamp with time zone DEFAULT '1970-01-01 00:00:00+00'::timestamp with time zone NOT NULL +); +CREATE TABLE "Payments" ( + "Id" text NOT NULL, + "Blob" bytea, + "InvoiceDataId" text, + "Accounted" boolean DEFAULT false NOT NULL +); +CREATE TABLE "PendingInvoices" ( + "Id" text NOT NULL +); +CREATE TABLE "RefundAddresses" ( + "Id" text NOT NULL, + "Blob" bytea, + "InvoiceDataId" text +); +CREATE TABLE "Settings" ( + "Id" text NOT NULL, + "Value" text +); +CREATE TABLE "Stores" ( + "Id" text NOT NULL, + "DerivationStrategy" text, + "SpeedPolicy" integer NOT NULL, + "StoreCertificate" bytea, + "StoreName" text, + "StoreWebsite" text, + "StoreBlob" bytea, + "DerivationStrategies" text, + "DefaultCrypto" text +); +CREATE TABLE "U2FDevices" ( + "Id" text NOT NULL, + "Name" text, + "KeyHandle" bytea NOT NULL, + "PublicKey" bytea NOT NULL, + "AttestationCert" bytea NOT NULL, + "Counter" integer NOT NULL, + "ApplicationUserId" text +); +CREATE TABLE "UserStore" ( + "ApplicationUserId" text NOT NULL, + "StoreDataId" text NOT NULL, + "Role" text +); +CREATE TABLE "WalletTransactions" ( + "WalletDataId" text NOT NULL, + "TransactionId" text NOT NULL, + "Labels" text, + "Blob" bytea +); +CREATE TABLE "Wallets" ( + "Id" text NOT NULL, + "Blob" bytea +); +ALTER TABLE ONLY "AddressInvoices" + ADD CONSTRAINT "PK_AddressInvoices" PRIMARY KEY ("Address"); +ALTER TABLE ONLY "ApiKeys" + ADD CONSTRAINT "PK_ApiKeys" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "Apps" + ADD CONSTRAINT "PK_Apps" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "AspNetRoleClaims" + ADD CONSTRAINT "PK_AspNetRoleClaims" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "AspNetRoles" + ADD CONSTRAINT "PK_AspNetRoles" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "AspNetUserClaims" + ADD CONSTRAINT "PK_AspNetUserClaims" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "AspNetUserLogins" + ADD CONSTRAINT "PK_AspNetUserLogins" PRIMARY KEY ("LoginProvider", "ProviderKey"); +ALTER TABLE ONLY "AspNetUserRoles" + ADD CONSTRAINT "PK_AspNetUserRoles" PRIMARY KEY ("UserId", "RoleId"); +ALTER TABLE ONLY "AspNetUserTokens" + ADD CONSTRAINT "PK_AspNetUserTokens" PRIMARY KEY ("UserId", "LoginProvider", "Name"); +ALTER TABLE ONLY "AspNetUsers" + ADD CONSTRAINT "PK_AspNetUsers" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "Files" + ADD CONSTRAINT "PK_Files" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "HistoricalAddressInvoices" + ADD CONSTRAINT "PK_HistoricalAddressInvoices" PRIMARY KEY ("InvoiceDataId", "Address"); +ALTER TABLE ONLY "InvoiceEvents" + ADD CONSTRAINT "PK_InvoiceEvents" PRIMARY KEY ("InvoiceDataId", "UniqueId"); +ALTER TABLE ONLY "Invoices" + ADD CONSTRAINT "PK_Invoices" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "PairedSINData" + ADD CONSTRAINT "PK_PairedSINData" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "PairingCodes" + ADD CONSTRAINT "PK_PairingCodes" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "PaymentRequests" + ADD CONSTRAINT "PK_PaymentRequests" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "Payments" + ADD CONSTRAINT "PK_Payments" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "PendingInvoices" + ADD CONSTRAINT "PK_PendingInvoices" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "RefundAddresses" + ADD CONSTRAINT "PK_RefundAddresses" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "Settings" + ADD CONSTRAINT "PK_Settings" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "Stores" + ADD CONSTRAINT "PK_Stores" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "U2FDevices" + ADD CONSTRAINT "PK_U2FDevices" PRIMARY KEY ("Id"); +ALTER TABLE ONLY "UserStore" + ADD CONSTRAINT "PK_UserStore" PRIMARY KEY ("ApplicationUserId", "StoreDataId"); +ALTER TABLE ONLY "WalletTransactions" + ADD CONSTRAINT "PK_WalletTransactions" PRIMARY KEY ("WalletDataId", "TransactionId"); +ALTER TABLE ONLY "Wallets" + ADD CONSTRAINT "PK_Wallets" PRIMARY KEY ("Id"); +CREATE INDEX "EmailIndex" ON "AspNetUsers" USING btree ("NormalizedEmail"); +CREATE INDEX "IX_AddressInvoices_InvoiceDataId" ON "AddressInvoices" USING btree ("InvoiceDataId"); +CREATE INDEX "IX_ApiKeys_StoreId" ON "ApiKeys" USING btree ("StoreId"); +CREATE INDEX "IX_ApiKeys_UserId" ON "ApiKeys" USING btree ("UserId"); +CREATE INDEX "IX_Apps_StoreDataId" ON "Apps" USING btree ("StoreDataId"); +CREATE INDEX "IX_AspNetRoleClaims_RoleId" ON "AspNetRoleClaims" USING btree ("RoleId"); +CREATE INDEX "IX_AspNetUserClaims_UserId" ON "AspNetUserClaims" USING btree ("UserId"); +CREATE INDEX "IX_AspNetUserLogins_UserId" ON "AspNetUserLogins" USING btree ("UserId"); +CREATE INDEX "IX_AspNetUserRoles_RoleId" ON "AspNetUserRoles" USING btree ("RoleId"); +CREATE INDEX "IX_Files_ApplicationUserId" ON "Files" USING btree ("ApplicationUserId"); +CREATE INDEX "IX_Invoices_StoreDataId" ON "Invoices" USING btree ("StoreDataId"); +CREATE INDEX "IX_PairedSINData_SIN" ON "PairedSINData" USING btree ("SIN"); +CREATE INDEX "IX_PairedSINData_StoreDataId" ON "PairedSINData" USING btree ("StoreDataId"); +CREATE INDEX "IX_PaymentRequests_Status" ON "PaymentRequests" USING btree ("Status"); +CREATE INDEX "IX_PaymentRequests_StoreDataId" ON "PaymentRequests" USING btree ("StoreDataId"); +CREATE INDEX "IX_Payments_InvoiceDataId" ON "Payments" USING btree ("InvoiceDataId"); +CREATE INDEX "IX_RefundAddresses_InvoiceDataId" ON "RefundAddresses" USING btree ("InvoiceDataId"); +CREATE INDEX "IX_U2FDevices_ApplicationUserId" ON "U2FDevices" USING btree ("ApplicationUserId"); +CREATE INDEX "IX_UserStore_StoreDataId" ON "UserStore" USING btree ("StoreDataId"); +CREATE UNIQUE INDEX "RoleNameIndex" ON "AspNetRoles" USING btree ("NormalizedName"); +CREATE UNIQUE INDEX "UserNameIndex" ON "AspNetUsers" USING btree ("NormalizedUserName"); +ALTER TABLE ONLY "AddressInvoices" + ADD CONSTRAINT "FK_AddressInvoices_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "ApiKeys" + ADD CONSTRAINT "FK_ApiKeys_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "ApiKeys" + ADD CONSTRAINT "FK_ApiKeys_Stores_StoreId" FOREIGN KEY ("StoreId") REFERENCES "Stores"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "Apps" + ADD CONSTRAINT "FK_Apps_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "AspNetRoleClaims" + ADD CONSTRAINT "FK_AspNetRoleClaims_AspNetRoles_RoleId" FOREIGN KEY ("RoleId") REFERENCES "AspNetRoles"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "AspNetUserClaims" + ADD CONSTRAINT "FK_AspNetUserClaims_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "AspNetUserLogins" + ADD CONSTRAINT "FK_AspNetUserLogins_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "AspNetUserRoles" + ADD CONSTRAINT "FK_AspNetUserRoles_AspNetRoles_RoleId" FOREIGN KEY ("RoleId") REFERENCES "AspNetRoles"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "AspNetUserRoles" + ADD CONSTRAINT "FK_AspNetUserRoles_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "AspNetUserTokens" + ADD CONSTRAINT "FK_AspNetUserTokens_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "Files" + ADD CONSTRAINT "FK_Files_AspNetUsers_ApplicationUserId" FOREIGN KEY ("ApplicationUserId") REFERENCES "AspNetUsers"("Id") ON DELETE RESTRICT; +ALTER TABLE ONLY "HistoricalAddressInvoices" + ADD CONSTRAINT "FK_HistoricalAddressInvoices_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "InvoiceEvents" + ADD CONSTRAINT "FK_InvoiceEvents_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "Invoices" + ADD CONSTRAINT "FK_Invoices_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "PairedSINData" + ADD CONSTRAINT "FK_PairedSINData_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "PaymentRequests" + ADD CONSTRAINT "FK_PaymentRequests_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "Payments" + ADD CONSTRAINT "FK_Payments_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "PendingInvoices" + ADD CONSTRAINT "FK_PendingInvoices_Invoices_Id" FOREIGN KEY ("Id") REFERENCES "Invoices"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "RefundAddresses" + ADD CONSTRAINT "FK_RefundAddresses_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "U2FDevices" + ADD CONSTRAINT "FK_U2FDevices_AspNetUsers_ApplicationUserId" FOREIGN KEY ("ApplicationUserId") REFERENCES "AspNetUsers"("Id") ON DELETE RESTRICT; +ALTER TABLE ONLY "UserStore" + ADD CONSTRAINT "FK_UserStore_AspNetUsers_ApplicationUserId" FOREIGN KEY ("ApplicationUserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "UserStore" + ADD CONSTRAINT "FK_UserStore_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE; +ALTER TABLE ONLY "WalletTransactions" + ADD CONSTRAINT "FK_WalletTransactions_Wallets_WalletDataId" FOREIGN KEY ("WalletDataId") REFERENCES "Wallets"("Id") ON DELETE CASCADE; diff --git a/BTCPayServer.Data/DBScriptsMigration.cs b/BTCPayServer.Data/DBScriptsMigration.cs new file mode 100644 index 0000000000..1cde23d805 --- /dev/null +++ b/BTCPayServer.Data/DBScriptsMigration.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace BTCPayServer.Data +{ + public abstract class DBScriptsMigration : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + foreach (var script in GetType().GetCustomAttributes().OrderBy(n => n.ScriptName)) + { + var name = Assembly.GetExecutingAssembly().GetManifestResourceNames() + .First(s => s.EndsWith("." + script.ScriptName, StringComparison.Ordinal)); + var stream = Assembly.GetExecutingAssembly() + .GetManifestResourceStream(name); + using var reader = new StreamReader(stream, Encoding.UTF8); + migrationBuilder.Sql(reader.ReadToEnd()); + } + } + } + + [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] + public class DBScriptAttribute : Attribute + { + public DBScriptAttribute(string scriptName) + { + ScriptName = scriptName; + } + public string ScriptName { get; set; } + } +} diff --git a/BTCPayServer.Data/Data/InvoiceData.cs b/BTCPayServer.Data/Data/InvoiceData.cs index 80092d02d0..8d0aaef164 100644 --- a/BTCPayServer.Data/Data/InvoiceData.cs +++ b/BTCPayServer.Data/Data/InvoiceData.cs @@ -16,7 +16,6 @@ public partial class InvoiceData : IHasBlobUntyped public DateTimeOffset Created { get; set; } public List Payments { get; set; } - public List Events { get; set; } [Obsolete("Use Blob2 instead")] public byte[] Blob { get; set; } diff --git a/BTCPayServer.Data/Data/InvoiceEventData.cs b/BTCPayServer.Data/Data/InvoiceEventData.cs index 2e0c1ef325..de7d403608 100644 --- a/BTCPayServer.Data/Data/InvoiceEventData.cs +++ b/BTCPayServer.Data/Data/InvoiceEventData.cs @@ -6,28 +6,10 @@ namespace BTCPayServer.Data public class InvoiceEventData { public string InvoiceDataId { get; set; } - public InvoiceData InvoiceData { get; set; } - public string UniqueId { get; set; } public DateTimeOffset Timestamp { get; set; } public string Message { get; set; } public EventSeverity Severity { get; set; } = EventSeverity.Info; - - internal static void OnModelCreating(ModelBuilder builder) - { - builder.Entity() - .HasOne(o => o.InvoiceData) - .WithMany(i => i.Events).OnDelete(DeleteBehavior.Cascade); - builder.Entity() - .HasKey(o => new - { - o.InvoiceDataId, -#pragma warning disable CS0618 - o.UniqueId -#pragma warning restore CS0618 - }); - } - public enum EventSeverity { Info, diff --git a/BTCPayServer.Data/Migrations/20170913143004_Init.cs b/BTCPayServer.Data/Migrations/20170913143004_Init.cs deleted file mode 100644 index 36736869c5..0000000000 --- a/BTCPayServer.Data/Migrations/20170913143004_Init.cs +++ /dev/null @@ -1,360 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20170913143004_Init")] - public partial class Init : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "AspNetRoles", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - ConcurrencyStamp = table.Column(nullable: true), - Name = table.Column(maxLength: 256, nullable: true), - NormalizedName = table.Column(maxLength: 256, nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoles", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetUsers", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - AccessFailedCount = table.Column(nullable: false), - ConcurrencyStamp = table.Column(nullable: true), - Email = table.Column(maxLength: 256, nullable: true), - EmailConfirmed = table.Column(nullable: false), - LockoutEnabled = table.Column(nullable: false), - LockoutEnd = table.Column(nullable: true), - NormalizedEmail = table.Column(maxLength: 256, nullable: true), - NormalizedUserName = table.Column(maxLength: 256, nullable: true), - PasswordHash = table.Column(nullable: true), - PhoneNumber = table.Column(nullable: true), - PhoneNumberConfirmed = table.Column(nullable: false), - SecurityStamp = table.Column(nullable: true), - TwoFactorEnabled = table.Column(nullable: false), - UserName = table.Column(maxLength: 256, nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUsers", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Stores", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - DerivationStrategy = table.Column(nullable: true), - SpeedPolicy = table.Column(nullable: false), - StoreCertificate = table.Column(nullable: true), - StoreName = table.Column(nullable: true), - StoreWebsite = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Stores", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetRoleClaims", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Sqlite:Autoincrement", true), - ClaimType = table.Column(nullable: true), - ClaimValue = table.Column(nullable: true), - RoleId = table.Column(nullable: false, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); - table.ForeignKey( - name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserClaims", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Sqlite:Autoincrement", true), - ClaimType = table.Column(nullable: true), - ClaimValue = table.Column(nullable: true), - UserId = table.Column(nullable: false, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); - table.ForeignKey( - name: "FK_AspNetUserClaims_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserLogins", - columns: table => new - { - LoginProvider = table.Column(nullable: false, maxLength: 255), - ProviderKey = table.Column(nullable: false, maxLength: 255), - ProviderDisplayName = table.Column(nullable: true), - UserId = table.Column(nullable: false, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); - table.ForeignKey( - name: "FK_AspNetUserLogins_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserRoles", - columns: table => new - { - UserId = table.Column(nullable: false, maxLength: null), - RoleId = table.Column(nullable: false, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); - table.ForeignKey( - name: "FK_AspNetUserRoles_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_AspNetUserRoles_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserTokens", - columns: table => new - { - UserId = table.Column(nullable: false, maxLength: null), - LoginProvider = table.Column(nullable: false, maxLength: 64), - Name = table.Column(nullable: false, maxLength: 64), - Value = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); - table.ForeignKey( - name: "FK_AspNetUserTokens_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "Invoices", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - Blob = table.Column(nullable: true), - Created = table.Column(nullable: false), - CustomerEmail = table.Column(nullable: true), - ExceptionStatus = table.Column(nullable: true), - ItemCode = table.Column(nullable: true), - OrderId = table.Column(nullable: true), - Status = table.Column(nullable: true), - StoreDataId = table.Column(nullable: true, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_Invoices", x => x.Id); - table.ForeignKey( - name: "FK_Invoices_Stores_StoreDataId", - column: x => x.StoreDataId, - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "UserStore", - columns: table => new - { - ApplicationUserId = table.Column(nullable: false, maxLength: null), - StoreDataId = table.Column(nullable: false, maxLength: null), - Role = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_UserStore", x => new { x.ApplicationUserId, x.StoreDataId }); - table.ForeignKey( - name: "FK_UserStore_AspNetUsers_ApplicationUserId", - column: x => x.ApplicationUserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_UserStore_Stores_StoreDataId", - column: x => x.StoreDataId, - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "Payments", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - Blob = table.Column(nullable: true), - InvoiceDataId = table.Column(nullable: true, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_Payments", x => x.Id); - table.ForeignKey( - name: "FK_Payments_Invoices_InvoiceDataId", - column: x => x.InvoiceDataId, - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "RefundAddresses", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - Blob = table.Column(nullable: true), - InvoiceDataId = table.Column(nullable: true, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_RefundAddresses", x => x.Id); - table.ForeignKey( - name: "FK_RefundAddresses_Invoices_InvoiceDataId", - column: x => x.InvoiceDataId, - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_AspNetRoleClaims_RoleId", - table: "AspNetRoleClaims", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "RoleNameIndex", - table: "AspNetRoles", - column: "NormalizedName", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserClaims_UserId", - table: "AspNetUserClaims", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserLogins_UserId", - table: "AspNetUserLogins", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserRoles_RoleId", - table: "AspNetUserRoles", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "EmailIndex", - table: "AspNetUsers", - column: "NormalizedEmail"); - - migrationBuilder.CreateIndex( - name: "UserNameIndex", - table: "AspNetUsers", - column: "NormalizedUserName", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_Invoices_StoreDataId", - table: "Invoices", - column: "StoreDataId"); - - migrationBuilder.CreateIndex( - name: "IX_Payments_InvoiceDataId", - table: "Payments", - column: "InvoiceDataId"); - - migrationBuilder.CreateIndex( - name: "IX_RefundAddresses_InvoiceDataId", - table: "RefundAddresses", - column: "InvoiceDataId"); - - migrationBuilder.CreateIndex( - name: "IX_UserStore_StoreDataId", - table: "UserStore", - column: "StoreDataId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "AspNetRoleClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserLogins"); - - migrationBuilder.DropTable( - name: "AspNetUserRoles"); - - migrationBuilder.DropTable( - name: "AspNetUserTokens"); - - migrationBuilder.DropTable( - name: "Payments"); - - migrationBuilder.DropTable( - name: "RefundAddresses"); - - migrationBuilder.DropTable( - name: "UserStore"); - - migrationBuilder.DropTable( - name: "AspNetRoles"); - - migrationBuilder.DropTable( - name: "Invoices"); - - migrationBuilder.DropTable( - name: "AspNetUsers"); - - migrationBuilder.DropTable( - name: "Stores"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20170926073744_Settings.cs b/BTCPayServer.Data/Migrations/20170926073744_Settings.cs deleted file mode 100644 index 67ea47fda3..0000000000 --- a/BTCPayServer.Data/Migrations/20170926073744_Settings.cs +++ /dev/null @@ -1,32 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20170926073744_Settings")] - public partial class Settings : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Settings", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - Value = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Settings", x => x.Id); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Settings"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20170926084408_RequiresEmailConfirmation.cs b/BTCPayServer.Data/Migrations/20170926084408_RequiresEmailConfirmation.cs deleted file mode 100644 index d1e7bc831b..0000000000 --- a/BTCPayServer.Data/Migrations/20170926084408_RequiresEmailConfirmation.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20170926084408_RequiresEmailConfirmation")] - public partial class RequiresEmailConfirmation : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "RequiresEmailConfirmation", - table: "AspNetUsers", - nullable: false, - defaultValue: false); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "RequiresEmailConfirmation", - table: "AspNetUsers"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20171006013443_AddressMapping.cs b/BTCPayServer.Data/Migrations/20171006013443_AddressMapping.cs deleted file mode 100644 index 011ff100d1..0000000000 --- a/BTCPayServer.Data/Migrations/20171006013443_AddressMapping.cs +++ /dev/null @@ -1,43 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20171006013443_AddressMapping")] - public partial class AddressMapping : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "AddressInvoices", - columns: table => new - { - Address = table.Column(nullable: false, maxLength: null), - InvoiceDataId = table.Column(nullable: true, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_AddressInvoices", x => x.Address); - table.ForeignKey( - name: "FK_AddressInvoices_Invoices_InvoiceDataId", - column: x => x.InvoiceDataId, - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_AddressInvoices_InvoiceDataId", - table: "AddressInvoices", - column: "InvoiceDataId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "AddressInvoices"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20171010082424_Tokens.cs b/BTCPayServer.Data/Migrations/20171010082424_Tokens.cs deleted file mode 100644 index 1846dbdb1c..0000000000 --- a/BTCPayServer.Data/Migrations/20171010082424_Tokens.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20171010082424_Tokens")] - public partial class Tokens : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "PairedSINData", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - Facade = table.Column(nullable: true), - Label = table.Column(nullable: true), - Name = table.Column(nullable: true), - PairingTime = table.Column(nullable: false), - SIN = table.Column(nullable: true, maxLength: null), - StoreDataId = table.Column(nullable: true, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_PairedSINData", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "PairingCodes", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - DateCreated = table.Column(nullable: false), - Expiration = table.Column(nullable: false), - Facade = table.Column(nullable: true), - Label = table.Column(nullable: true), - Name = table.Column(nullable: true), - SIN = table.Column(nullable: true), - StoreDataId = table.Column(nullable: true, maxLength: null), - TokenValue = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_PairingCodes", x => x.Id); - }); - - migrationBuilder.CreateIndex( - name: "IX_PairedSINData_SIN", - table: "PairedSINData", - column: "SIN"); - - migrationBuilder.CreateIndex( - name: "IX_PairedSINData_StoreDataId", - table: "PairedSINData", - column: "StoreDataId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "PairedSINData"); - - migrationBuilder.DropTable( - name: "PairingCodes"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20171012020112_PendingInvoices.cs b/BTCPayServer.Data/Migrations/20171012020112_PendingInvoices.cs deleted file mode 100644 index 57bbfc964c..0000000000 --- a/BTCPayServer.Data/Migrations/20171012020112_PendingInvoices.cs +++ /dev/null @@ -1,48 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20171012020112_PendingInvoices")] - public partial class PendingInvoices : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Name", - table: "PairingCodes"); - - migrationBuilder.DropColumn( - name: "Name", - table: "PairedSINData"); - migrationBuilder.CreateTable( - name: "PendingInvoices", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_PendingInvoices", x => x.Id); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "PendingInvoices"); - - migrationBuilder.AddColumn( - name: "Name", - table: "PairingCodes", - nullable: true); - - migrationBuilder.AddColumn( - name: "Name", - table: "PairedSINData", - nullable: true); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20171023101754_StoreBlob.cs b/BTCPayServer.Data/Migrations/20171023101754_StoreBlob.cs deleted file mode 100644 index deec42c08a..0000000000 --- a/BTCPayServer.Data/Migrations/20171023101754_StoreBlob.cs +++ /dev/null @@ -1,26 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20171023101754_StoreBlob")] - public partial class StoreBlob : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "StoreBlob", - table: "Stores", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "StoreBlob", - table: "Stores"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20171024163354_RenewUsedAddresses.cs b/BTCPayServer.Data/Migrations/20171024163354_RenewUsedAddresses.cs deleted file mode 100644 index eb222a16d2..0000000000 --- a/BTCPayServer.Data/Migrations/20171024163354_RenewUsedAddresses.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20171024163354_RenewUsedAddresses")] - public partial class RenewUsedAddresses : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "CreatedTime", - table: "AddressInvoices", - nullable: true); - - migrationBuilder.CreateTable( - name: "HistoricalAddressInvoices", - columns: table => new - { - InvoiceDataId = table.Column(nullable: false, maxLength: null), - Address = table.Column(nullable: false, maxLength: null), - Assigned = table.Column(nullable: false), - UnAssigned = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_HistoricalAddressInvoices", x => new { x.InvoiceDataId, x.Address }); - table.ForeignKey( - name: "FK_HistoricalAddressInvoices_Invoices_InvoiceDataId", - column: x => x.InvoiceDataId, - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "HistoricalAddressInvoices"); - - migrationBuilder.DropColumn( - name: "CreatedTime", - table: "AddressInvoices"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20171105235734_PaymentAccounted.cs b/BTCPayServer.Data/Migrations/20171105235734_PaymentAccounted.cs deleted file mode 100644 index c0e3f02c2d..0000000000 --- a/BTCPayServer.Data/Migrations/20171105235734_PaymentAccounted.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20171105235734_PaymentAccounted")] - public partial class PaymentAccounted : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "Accounted", - table: "Payments", - nullable: false, - defaultValue: false); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Accounted", - table: "Payments"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20171221054550_AltcoinSupport.cs b/BTCPayServer.Data/Migrations/20171221054550_AltcoinSupport.cs deleted file mode 100644 index b07ecf6389..0000000000 --- a/BTCPayServer.Data/Migrations/20171221054550_AltcoinSupport.cs +++ /dev/null @@ -1,26 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20171221054550_AltcoinSupport")] - public partial class AltcoinSupport : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "CryptoCode", - table: "HistoricalAddressInvoices", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "CryptoCode", - table: "HistoricalAddressInvoices"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20180106095215_DerivationStrategies.cs b/BTCPayServer.Data/Migrations/20180106095215_DerivationStrategies.cs deleted file mode 100644 index ed760fe527..0000000000 --- a/BTCPayServer.Data/Migrations/20180106095215_DerivationStrategies.cs +++ /dev/null @@ -1,26 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20180106095215_DerivationStrategies")] - public partial class DerivationStrategies : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "DerivationStrategies", - table: "Stores", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "DerivationStrategies", - table: "Stores"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20180109021122_defaultcrypto.cs b/BTCPayServer.Data/Migrations/20180109021122_defaultcrypto.cs deleted file mode 100644 index 3935266341..0000000000 --- a/BTCPayServer.Data/Migrations/20180109021122_defaultcrypto.cs +++ /dev/null @@ -1,26 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20180109021122_defaultcrypto")] - public partial class defaultcrypto : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "DefaultCrypto", - table: "Stores", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "DefaultCrypto", - table: "Stores"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20180114123253_events.cs b/BTCPayServer.Data/Migrations/20180114123253_events.cs deleted file mode 100644 index df9af20dc2..0000000000 --- a/BTCPayServer.Data/Migrations/20180114123253_events.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20180114123253_events")] - public partial class events : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "InvoiceEvents", - columns: table => new - { - InvoiceDataId = table.Column(nullable: false, maxLength: null), - UniqueId = table.Column(nullable: false, maxLength: null), - Message = table.Column(nullable: true), - Timestamp = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_InvoiceEvents", x => new { x.InvoiceDataId, x.UniqueId }); - table.ForeignKey( - name: "FK_InvoiceEvents_Invoices_InvoiceDataId", - column: x => x.InvoiceDataId, - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "InvoiceEvents"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20180402095640_appdata.cs b/BTCPayServer.Data/Migrations/20180402095640_appdata.cs deleted file mode 100644 index bd53c10724..0000000000 --- a/BTCPayServer.Data/Migrations/20180402095640_appdata.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20180402095640_appdata")] - public partial class appdata : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Apps", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - AppType = table.Column(nullable: true), - Created = table.Column(nullable: false), - Name = table.Column(nullable: true), - Settings = table.Column(nullable: true), - StoreDataId = table.Column(nullable: true, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_Apps", x => x.Id); - table.ForeignKey( - name: "FK_Apps_Stores_StoreDataId", - column: x => x.StoreDataId, - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_Apps_StoreDataId", - table: "Apps", - column: "StoreDataId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Apps"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20180429083930_legacyapikey.cs b/BTCPayServer.Data/Migrations/20180429083930_legacyapikey.cs deleted file mode 100644 index ce34d303f2..0000000000 --- a/BTCPayServer.Data/Migrations/20180429083930_legacyapikey.cs +++ /dev/null @@ -1,37 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20180429083930_legacyapikey")] - public partial class legacyapikey : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "ApiKeys", - columns: table => new - { - Id = table.Column(maxLength: 50, nullable: false), - StoreId = table.Column(maxLength: 50, nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_ApiKeys", x => x.Id); - }); - - migrationBuilder.CreateIndex( - name: "IX_ApiKeys_StoreId", - table: "ApiKeys", - column: "StoreId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "ApiKeys"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20180719095626_CanDeleteStores.cs b/BTCPayServer.Data/Migrations/20180719095626_CanDeleteStores.cs deleted file mode 100644 index a30065936f..0000000000 --- a/BTCPayServer.Data/Migrations/20180719095626_CanDeleteStores.cs +++ /dev/null @@ -1,173 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20180719095626_CanDeleteStores")] - public partial class CanDeleteStores : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_AddressInvoices_Invoices_InvoiceDataId", - table: "AddressInvoices"); - - migrationBuilder.DropForeignKey( - name: "FK_Apps_Stores_StoreDataId", - table: "Apps"); - - migrationBuilder.DropForeignKey( - name: "FK_Invoices_Stores_StoreDataId", - table: "Invoices"); - - migrationBuilder.DropForeignKey( - name: "FK_Payments_Invoices_InvoiceDataId", - table: "Payments"); - - migrationBuilder.DropForeignKey( - name: "FK_RefundAddresses_Invoices_InvoiceDataId", - table: "RefundAddresses"); - - migrationBuilder.AddForeignKey( - name: "FK_AddressInvoices_Invoices_InvoiceDataId", - table: "AddressInvoices", - column: "InvoiceDataId", - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_ApiKeys_Stores_StoreId", - table: "ApiKeys", - column: "StoreId", - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_Apps_Stores_StoreDataId", - table: "Apps", - column: "StoreDataId", - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_Invoices_Stores_StoreDataId", - table: "Invoices", - column: "StoreDataId", - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_PairedSINData_Stores_StoreDataId", - table: "PairedSINData", - column: "StoreDataId", - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_Payments_Invoices_InvoiceDataId", - table: "Payments", - column: "InvoiceDataId", - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_PendingInvoices_Invoices_Id", - table: "PendingInvoices", - column: "Id", - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_RefundAddresses_Invoices_InvoiceDataId", - table: "RefundAddresses", - column: "InvoiceDataId", - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_AddressInvoices_Invoices_InvoiceDataId", - table: "AddressInvoices"); - - migrationBuilder.DropForeignKey( - name: "FK_ApiKeys_Stores_StoreId", - table: "ApiKeys"); - - migrationBuilder.DropForeignKey( - name: "FK_Apps_Stores_StoreDataId", - table: "Apps"); - - migrationBuilder.DropForeignKey( - name: "FK_Invoices_Stores_StoreDataId", - table: "Invoices"); - - migrationBuilder.DropForeignKey( - name: "FK_PairedSINData_Stores_StoreDataId", - table: "PairedSINData"); - - migrationBuilder.DropForeignKey( - name: "FK_Payments_Invoices_InvoiceDataId", - table: "Payments"); - - migrationBuilder.DropForeignKey( - name: "FK_PendingInvoices_Invoices_Id", - table: "PendingInvoices"); - - migrationBuilder.DropForeignKey( - name: "FK_RefundAddresses_Invoices_InvoiceDataId", - table: "RefundAddresses"); - - migrationBuilder.AddForeignKey( - name: "FK_AddressInvoices_Invoices_InvoiceDataId", - table: "AddressInvoices", - column: "InvoiceDataId", - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - - migrationBuilder.AddForeignKey( - name: "FK_Apps_Stores_StoreDataId", - table: "Apps", - column: "StoreDataId", - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - - migrationBuilder.AddForeignKey( - name: "FK_Invoices_Stores_StoreDataId", - table: "Invoices", - column: "StoreDataId", - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - - migrationBuilder.AddForeignKey( - name: "FK_Payments_Invoices_InvoiceDataId", - table: "Payments", - column: "InvoiceDataId", - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - - migrationBuilder.AddForeignKey( - name: "FK_RefundAddresses_Invoices_InvoiceDataId", - table: "RefundAddresses", - column: "InvoiceDataId", - principalTable: "Invoices", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20190121133309_AddPaymentRequests.cs b/BTCPayServer.Data/Migrations/20190121133309_AddPaymentRequests.cs deleted file mode 100644 index 35819b286e..0000000000 --- a/BTCPayServer.Data/Migrations/20190121133309_AddPaymentRequests.cs +++ /dev/null @@ -1,50 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20190121133309_AddPaymentRequests")] - public partial class AddPaymentRequests : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "PaymentRequests", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - StoreDataId = table.Column(nullable: true, maxLength: null), - Status = table.Column(nullable: false), - Blob = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_PaymentRequests", x => x.Id); - table.ForeignKey( - name: "FK_PaymentRequests_Stores_StoreDataId", - column: x => x.StoreDataId, - principalTable: "Stores", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "IX_PaymentRequests_Status", - table: "PaymentRequests", - column: "Status"); - - migrationBuilder.CreateIndex( - name: "IX_PaymentRequests_StoreDataId", - table: "PaymentRequests", - column: "StoreDataId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "PaymentRequests"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20190219032533_AppsTagging.cs b/BTCPayServer.Data/Migrations/20190219032533_AppsTagging.cs deleted file mode 100644 index 47193479b2..0000000000 --- a/BTCPayServer.Data/Migrations/20190219032533_AppsTagging.cs +++ /dev/null @@ -1,27 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20190219032533_AppsTagging")] - public partial class AppsTagging : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "TagAllInvoices", - table: "Apps", - nullable: false, - defaultValue: false); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "TagAllInvoices", - table: "Apps"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20190225091644_AddOpenIddict.cs b/BTCPayServer.Data/Migrations/20190225091644_AddOpenIddict.cs deleted file mode 100644 index 92fe48d2bf..0000000000 --- a/BTCPayServer.Data/Migrations/20190225091644_AddOpenIddict.cs +++ /dev/null @@ -1,171 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20190225091644_AddOpenIddict")] - public partial class AddOpenIddict : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "OpenIddictApplications", - columns: table => new - { - ClientId = table.Column(maxLength: 100, nullable: false), - ClientSecret = table.Column(nullable: true), - ConcurrencyToken = table.Column(maxLength: 50, nullable: true), - ConsentType = table.Column(nullable: true), - DisplayName = table.Column(nullable: true), - Id = table.Column(nullable: false, maxLength: null), - Permissions = table.Column(nullable: true), - PostLogoutRedirectUris = table.Column(nullable: true), - Properties = table.Column(nullable: true), - RedirectUris = table.Column(nullable: true), - Type = table.Column(maxLength: 25, nullable: false), - ApplicationUserId = table.Column(nullable: true, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_OpenIddictApplications", x => x.Id); - table.ForeignKey( - name: "FK_OpenIddictApplications_AspNetUsers_ApplicationUserId", - column: x => x.ApplicationUserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "OpenIddictScopes", - columns: table => new - { - ConcurrencyToken = table.Column(maxLength: 50, nullable: true), - Description = table.Column(nullable: true), - DisplayName = table.Column(nullable: true), - Id = table.Column(nullable: false, maxLength: null), - Name = table.Column(maxLength: 200, nullable: false), - Properties = table.Column(nullable: true), - Resources = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_OpenIddictScopes", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "OpenIddictAuthorizations", - columns: table => new - { - ApplicationId = table.Column(nullable: true, maxLength: null), - ConcurrencyToken = table.Column(maxLength: 50, nullable: true), - Id = table.Column(nullable: false, maxLength: null), - Properties = table.Column(nullable: true), - Scopes = table.Column(nullable: true), - Status = table.Column(maxLength: 25, nullable: false), - Subject = table.Column(maxLength: 450, nullable: false), - Type = table.Column(maxLength: 25, nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_OpenIddictAuthorizations", x => x.Id); - table.ForeignKey( - name: "FK_OpenIddictAuthorizations_OpenIddictApplications_ApplicationId", - column: x => x.ApplicationId, - principalTable: "OpenIddictApplications", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "OpenIddictTokens", - columns: table => new - { - ApplicationId = table.Column(nullable: true, maxLength: null), - AuthorizationId = table.Column(nullable: true, maxLength: null), - ConcurrencyToken = table.Column(maxLength: 50, nullable: true), - CreationDate = table.Column(nullable: true), - ExpirationDate = table.Column(nullable: true), - Id = table.Column(nullable: false, maxLength: null), - Payload = table.Column(nullable: true), - Properties = table.Column(nullable: true), - ReferenceId = table.Column(maxLength: 100, nullable: true), - Status = table.Column(maxLength: 25, nullable: false), - Subject = table.Column(maxLength: 450, nullable: false), - Type = table.Column(maxLength: 25, nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_OpenIddictTokens", x => x.Id); - table.ForeignKey( - name: "FK_OpenIddictTokens_OpenIddictApplications_ApplicationId", - column: x => x.ApplicationId, - principalTable: "OpenIddictApplications", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - table.ForeignKey( - name: "FK_OpenIddictTokens_OpenIddictAuthorizations_AuthorizationId", - column: x => x.AuthorizationId, - principalTable: "OpenIddictAuthorizations", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictApplications_ApplicationUserId", - table: "OpenIddictApplications", - column: "ApplicationUserId"); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictApplications_ClientId", - table: "OpenIddictApplications", - column: "ClientId", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictAuthorizations_ApplicationId_Status_Subject_Type", - table: "OpenIddictAuthorizations", - columns: new[] { "ApplicationId", "Status", "Subject", "Type" }); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictScopes_Name", - table: "OpenIddictScopes", - column: "Name", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictTokens_AuthorizationId", - table: "OpenIddictTokens", - column: "AuthorizationId"); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictTokens_ReferenceId", - table: "OpenIddictTokens", - column: "ReferenceId", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictTokens_ApplicationId_Status_Subject_Type", - table: "OpenIddictTokens", - columns: new[] { "ApplicationId", "Status", "Subject", "Type" }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "OpenIddictScopes"); - - migrationBuilder.DropTable( - name: "OpenIddictTokens"); - - migrationBuilder.DropTable( - name: "OpenIddictAuthorizations"); - - migrationBuilder.DropTable( - name: "OpenIddictApplications"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20190324141717_AddFiles.cs b/BTCPayServer.Data/Migrations/20190324141717_AddFiles.cs deleted file mode 100644 index d0b980674f..0000000000 --- a/BTCPayServer.Data/Migrations/20190324141717_AddFiles.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20190324141717_AddFiles")] - public partial class AddFiles : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Files", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - FileName = table.Column(nullable: true), - StorageFileName = table.Column(nullable: true), - Timestamp = table.Column(nullable: false), - ApplicationUserId = table.Column(nullable: true, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_Files", x => x.Id); - table.ForeignKey( - name: "FK_Files_AspNetUsers_ApplicationUserId", - column: x => x.ApplicationUserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_Files_ApplicationUserId", - table: "Files", - column: "ApplicationUserId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Files"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20190425081749_AddU2fDevices.cs b/BTCPayServer.Data/Migrations/20190425081749_AddU2fDevices.cs deleted file mode 100644 index 505a1adee9..0000000000 --- a/BTCPayServer.Data/Migrations/20190425081749_AddU2fDevices.cs +++ /dev/null @@ -1,57 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20190425081749_AddU2fDevices")] - public partial class AddU2fDevices : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Facade", - table: "PairedSINData"); - - migrationBuilder.CreateTable( - name: "U2FDevices", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - Name = table.Column(nullable: true), - KeyHandle = table.Column(nullable: false), - PublicKey = table.Column(nullable: false), - AttestationCert = table.Column(nullable: false), - Counter = table.Column(nullable: false), - ApplicationUserId = table.Column(nullable: true, maxLength: null) - }, - constraints: table => - { - table.PrimaryKey("PK_U2FDevices", x => x.Id); - table.ForeignKey( - name: "FK_U2FDevices_AspNetUsers_ApplicationUserId", - column: x => x.ApplicationUserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_U2FDevices_ApplicationUserId", - table: "U2FDevices", - column: "ApplicationUserId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "U2FDevices"); - //if it did not support dropping it, then it is still here and re-adding it would throw - migrationBuilder.AddColumn( - name: "Facade", - table: "PairedSINData", - nullable: true); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20190701082105_sort_paymentrequests.cs b/BTCPayServer.Data/Migrations/20190701082105_sort_paymentrequests.cs deleted file mode 100644 index 6e1bb9488a..0000000000 --- a/BTCPayServer.Data/Migrations/20190701082105_sort_paymentrequests.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20190701082105_sort_paymentrequests")] - public partial class sort_paymentrequests : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "Created", - table: "PaymentRequests", - nullable: false, - defaultValue: new DateTimeOffset(new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0))); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Created", - table: "PaymentRequests"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20190802142637_WalletData.cs b/BTCPayServer.Data/Migrations/20190802142637_WalletData.cs deleted file mode 100644 index 832c350309..0000000000 --- a/BTCPayServer.Data/Migrations/20190802142637_WalletData.cs +++ /dev/null @@ -1,55 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20190802142637_WalletData")] - public partial class WalletData : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Wallets", - columns: table => new - { - Id = table.Column(nullable: false, maxLength: null), - Blob = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Wallets", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "WalletTransactions", - columns: table => new - { - WalletDataId = table.Column(nullable: false, maxLength: null), - TransactionId = table.Column(nullable: false, maxLength: null), - Labels = table.Column(nullable: true), - Blob = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_WalletTransactions", x => new { x.WalletDataId, x.TransactionId }); - table.ForeignKey( - name: "FK_WalletTransactions_Wallets_WalletDataId", - column: x => x.WalletDataId, - principalTable: "Wallets", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "WalletTransactions"); - - migrationBuilder.DropTable( - name: "Wallets"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20200110064617_OpenIddictUpdate.cs b/BTCPayServer.Data/Migrations/20200110064617_OpenIddictUpdate.cs deleted file mode 100644 index f733923cf2..0000000000 --- a/BTCPayServer.Data/Migrations/20200110064617_OpenIddictUpdate.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20200110064617_OpenIddictUpdate")] - public partial class OpenIddictUpdate : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "Subject", - table: "OpenIddictTokens", - maxLength: 450, - nullable: true, - oldClrType: typeof(string), - oldMaxLength: 450); - - migrationBuilder.AlterColumn( - name: "Subject", - table: "OpenIddictAuthorizations", - maxLength: 450, - nullable: true, - oldClrType: typeof(string), - oldMaxLength: 450); - - migrationBuilder.AddColumn( - name: "Requirements", - table: "OpenIddictApplications", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Requirements", - table: "OpenIddictApplications"); - - migrationBuilder.AlterColumn( - name: "Subject", - table: "OpenIddictTokens", - maxLength: 450, - nullable: false, - oldClrType: typeof(string), - oldMaxLength: 450, - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Subject", - table: "OpenIddictAuthorizations", - maxLength: 450, - nullable: false, - oldClrType: typeof(string), - oldMaxLength: 450, - oldNullable: true); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20200119130108_ExtendApiKeys.cs b/BTCPayServer.Data/Migrations/20200119130108_ExtendApiKeys.cs deleted file mode 100644 index 38a4bf0723..0000000000 --- a/BTCPayServer.Data/Migrations/20200119130108_ExtendApiKeys.cs +++ /dev/null @@ -1,67 +0,0 @@ -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20200119130108_ExtendApiKeys")] - public partial class ExtendApiKeys : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "Permissions", - table: "ApiKeys", - nullable: true); - - migrationBuilder.AddColumn( - name: "Type", - table: "ApiKeys", - nullable: false, - defaultValue: 0); - - migrationBuilder.AddColumn( - name: "UserId", - table: "ApiKeys", - maxLength: 50, - nullable: true); - - migrationBuilder.CreateIndex( - name: "IX_ApiKeys_UserId", - table: "ApiKeys", - column: "UserId"); - - migrationBuilder.AddForeignKey( - name: "FK_ApiKeys_AspNetUsers_UserId", - table: "ApiKeys", - column: "UserId", - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_ApiKeys_AspNetUsers_UserId", - table: "ApiKeys"); - - migrationBuilder.DropIndex( - name: "IX_ApiKeys_UserId", - table: "ApiKeys"); - - migrationBuilder.DropColumn( - name: "Permissions", - table: "ApiKeys"); - - migrationBuilder.DropColumn( - name: "Type", - table: "ApiKeys"); - - migrationBuilder.DropColumn( - name: "UserId", - table: "ApiKeys"); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20200224134444_Remove_OpenIddict.cs b/BTCPayServer.Data/Migrations/20200224134444_Remove_OpenIddict.cs deleted file mode 100644 index 9cd7d588e8..0000000000 --- a/BTCPayServer.Data/Migrations/20200224134444_Remove_OpenIddict.cs +++ /dev/null @@ -1,172 +0,0 @@ -using System; -using BTCPayServer.Data; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace BTCPayServer.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20200224134444_Remove_OpenIddict")] - public partial class Remove_OpenIddict : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "OpenIddictScopes"); - - migrationBuilder.DropTable( - name: "OpenIddictTokens"); - - migrationBuilder.DropTable( - name: "OpenIddictAuthorizations"); - - migrationBuilder.DropTable( - name: "OpenIddictApplications"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "OpenIddictApplications", - columns: table => new - { - Id = table.Column(type: "TEXT", nullable: false, maxLength: null), - ApplicationUserId = table.Column(type: "TEXT", nullable: true, maxLength: null), - ClientId = table.Column(type: "TEXT", maxLength: 100, nullable: false), - ClientSecret = table.Column(type: "TEXT", nullable: true), - ConcurrencyToken = table.Column(type: "TEXT", maxLength: 50, nullable: true), - ConsentType = table.Column(type: "TEXT", nullable: true), - DisplayName = table.Column(type: "TEXT", nullable: true), - Permissions = table.Column(type: "TEXT", nullable: true), - PostLogoutRedirectUris = table.Column(type: "TEXT", nullable: true), - Properties = table.Column(type: "TEXT", nullable: true), - RedirectUris = table.Column(type: "TEXT", nullable: true), - Requirements = table.Column(type: "TEXT", nullable: true), - Type = table.Column(type: "TEXT", maxLength: 25, nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_OpenIddictApplications", x => x.Id); - table.ForeignKey( - name: "FK_OpenIddictApplications_AspNetUsers_ApplicationUserId", - column: x => x.ApplicationUserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "OpenIddictScopes", - columns: table => new - { - Id = table.Column(type: "TEXT", nullable: false, maxLength: null), - ConcurrencyToken = table.Column(type: "TEXT", maxLength: 50, nullable: true), - Description = table.Column(type: "TEXT", nullable: true), - DisplayName = table.Column(type: "TEXT", nullable: true), - Name = table.Column(type: "TEXT", maxLength: 200, nullable: false), - Properties = table.Column(type: "TEXT", nullable: true), - Resources = table.Column(type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_OpenIddictScopes", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "OpenIddictAuthorizations", - columns: table => new - { - Id = table.Column(type: "TEXT", nullable: false, maxLength: null), - ApplicationId = table.Column(type: "TEXT", nullable: true, maxLength: null), - ConcurrencyToken = table.Column(type: "TEXT", maxLength: 50, nullable: true), - Properties = table.Column(type: "TEXT", nullable: true), - Scopes = table.Column(type: "TEXT", nullable: true), - Status = table.Column(type: "TEXT", maxLength: 25, nullable: false), - Subject = table.Column(type: "TEXT", maxLength: 450, nullable: true), - Type = table.Column(type: "TEXT", maxLength: 25, nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_OpenIddictAuthorizations", x => x.Id); - table.ForeignKey( - name: "FK_OpenIddictAuthorizations_OpenIddictApplications_ApplicationId", - column: x => x.ApplicationId, - principalTable: "OpenIddictApplications", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "OpenIddictTokens", - columns: table => new - { - Id = table.Column(type: "TEXT", nullable: false, maxLength: null), - ApplicationId = table.Column(type: "TEXT", nullable: true, maxLength: null), - AuthorizationId = table.Column(type: "TEXT", nullable: true, maxLength: null), - ConcurrencyToken = table.Column(type: "TEXT", maxLength: 50, nullable: true), - CreationDate = table.Column(type: "TEXT", nullable: true), - ExpirationDate = table.Column(type: "TEXT", nullable: true), - Payload = table.Column(type: "TEXT", nullable: true), - Properties = table.Column(type: "TEXT", nullable: true), - ReferenceId = table.Column(type: "TEXT", maxLength: 100, nullable: true), - Status = table.Column(type: "TEXT", maxLength: 25, nullable: false), - Subject = table.Column(type: "TEXT", maxLength: 450, nullable: true), - Type = table.Column(type: "TEXT", maxLength: 25, nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_OpenIddictTokens", x => x.Id); - table.ForeignKey( - name: "FK_OpenIddictTokens_OpenIddictApplications_ApplicationId", - column: x => x.ApplicationId, - principalTable: "OpenIddictApplications", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - table.ForeignKey( - name: "FK_OpenIddictTokens_OpenIddictAuthorizations_AuthorizationId", - column: x => x.AuthorizationId, - principalTable: "OpenIddictAuthorizations", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictApplications_ApplicationUserId", - table: "OpenIddictApplications", - column: "ApplicationUserId"); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictApplications_ClientId", - table: "OpenIddictApplications", - column: "ClientId", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictAuthorizations_ApplicationId_Status_Subject_Type", - table: "OpenIddictAuthorizations", - columns: new[] { "ApplicationId", "Status", "Subject", "Type" }); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictScopes_Name", - table: "OpenIddictScopes", - column: "Name", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictTokens_AuthorizationId", - table: "OpenIddictTokens", - column: "AuthorizationId"); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictTokens_ReferenceId", - table: "OpenIddictTokens", - column: "ReferenceId", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_OpenIddictTokens_ApplicationId_Status_Subject_Type", - table: "OpenIddictTokens", - columns: new[] { "ApplicationId", "Status", "Subject", "Type" }); - } - } -} diff --git a/BTCPayServer.Data/Migrations/20200225133433_AddApiKeyLabel.cs b/BTCPayServer.Data/Migrations/20200225133433_AddApiKeyLabel.cs index e5f6fc6aca..c38eb9a726 100644 --- a/BTCPayServer.Data/Migrations/20200225133433_AddApiKeyLabel.cs +++ b/BTCPayServer.Data/Migrations/20200225133433_AddApiKeyLabel.cs @@ -6,22 +6,9 @@ namespace BTCPayServer.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20200225133433_AddApiKeyLabel")] - public partial class AddApiKeyLabel : Migration + [DBScript("000.Init.sql")] + public partial class AddApiKeyLabel : DBScriptsMigration { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "Label", - table: "ApiKeys", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Label", - table: "ApiKeys"); - } } } diff --git a/BTCPayServer.Data/Migrations/20240405004015_cleanup_invoice_events.cs b/BTCPayServer.Data/Migrations/20240405004015_cleanup_invoice_events.cs new file mode 100644 index 0000000000..a053c79f0c --- /dev/null +++ b/BTCPayServer.Data/Migrations/20240405004015_cleanup_invoice_events.cs @@ -0,0 +1,31 @@ +using System; +using BTCPayServer.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BTCPayServer.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20240405004015_cleanup_invoice_events")] + public partial class cleanup_invoice_events : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.Sql(@" + ALTER TABLE ""InvoiceEvents"" DROP CONSTRAINT IF EXISTS ""PK_InvoiceEvents""; + ALTER TABLE ""InvoiceEvents"" DROP COLUMN IF EXISTS ""UniqueId""; + CREATE INDEX IF NOT EXISTS ""IX_InvoiceEvents_InvoiceDataId"" ON ""InvoiceEvents""(""InvoiceDataId""); + VACUUM (FULL, ANALYZE) ""InvoiceEvents""; + ", true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + } + } +} diff --git a/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs b/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs index 8cc9278067..9fda244942 100644 --- a/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -302,28 +302,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Invoices"); }); - modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b => - { - b.Property("InvoiceDataId") - .HasColumnType("text"); - - b.Property("UniqueId") - .HasColumnType("text"); - - b.Property("Message") - .HasColumnType("text"); - - b.Property("Severity") - .HasColumnType("integer"); - - b.Property("Timestamp") - .HasColumnType("timestamp with time zone"); - - b.HasKey("InvoiceDataId", "UniqueId"); - - b.ToTable("InvoiceEvents"); - }); - modelBuilder.Entity("BTCPayServer.Data.InvoiceSearchData", b => { b.Property("Id") @@ -1241,17 +1219,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("StoreData"); }); - modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b => - { - b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData") - .WithMany("Events") - .HasForeignKey("InvoiceDataId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("InvoiceData"); - }); - modelBuilder.Entity("BTCPayServer.Data.InvoiceSearchData", b => { b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData") @@ -1597,8 +1564,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) { b.Navigation("AddressInvoices"); - b.Navigation("Events"); - b.Navigation("InvoiceSearchData"); b.Navigation("Payments"); diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs index 39a2b23107..c4814aa332 100644 --- a/BTCPayServer.Tests/SeleniumTests.cs +++ b/BTCPayServer.Tests/SeleniumTests.cs @@ -6,6 +6,7 @@ using System.Net; using System.Net.Http; using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; using System.Text; using System.Text.RegularExpressions; using System.Threading; @@ -1965,6 +1966,60 @@ await s.Server.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create(receiveAddr s.Driver.SwitchTo().Window(s.Driver.WindowHandles.First()); } + [Fact] + [Trait("Selenium", "Selenium")] + [Trait("Lightning", "Lightning")] + public async Task CanManageLightningNode() + { + using var s = CreateSeleniumTester(); + s.Server.ActivateLightning(); + await s.StartAsync(); + await s.Server.EnsureChannelsSetup(); + s.RegisterNewUser(true); + (string storeName, _) = s.CreateNewStore(); + + // Check status in navigation + s.Driver.FindElement(By.CssSelector("#StoreNav-LightningBTC .btcpay-status--pending")); + + // Set up LN node + s.AddLightningNode(); + s.Driver.FindElement(By.CssSelector("#StoreNav-LightningBTC .btcpay-status--enabled")); + + // Check public node info for availability + s.Driver.FindElement(By.Id("PublicNodeInfo")).Click(); + s.Driver.SwitchTo().Window(s.Driver.WindowHandles.Last()); + Assert.Equal(storeName, s.Driver.FindElement(By.CssSelector(".store-name")).Text); + Assert.Equal("BTC Lightning Node", s.Driver.FindElement(By.Id("LightningNodeTitle")).Text); + Assert.Equal("Online", s.Driver.FindElement(By.Id("LightningNodeStatus")).Text); + s.Driver.FindElement(By.CssSelector(".btcpay-status--enabled")); + s.Driver.FindElement(By.Id("LightningNodeUrlClearnet")); + s.Driver.Close(); + s.Driver.SwitchTo().Window(s.Driver.WindowHandles.First()); + + // Set wrong node connection string to simulate offline node + s.GoToLightningSettings(); + s.Driver.FindElement(By.Id("SetupLightningNodeLink")).Click(); + s.Driver.FindElement(By.CssSelector("label[for=\"LightningNodeType-Custom\"]")).Click(); + s.Driver.WaitForElement(By.Id("ConnectionString")).Clear(); + s.Driver.FindElement(By.Id("ConnectionString")).SendKeys("type=lnd-rest;server=https://doesnotwork:8080/"); + s.Driver.FindElement(By.Id("test")).Click(); + Assert.Contains("Error", s.FindAlertMessage(StatusMessageModel.StatusSeverity.Error).Text); + s.Driver.FindElement(By.Id("save")).Click(); + Assert.Contains("BTC Lightning node updated.", s.FindAlertMessage().Text); + + // Check offline state is communicated in nav item + s.Driver.FindElement(By.CssSelector("#StoreNav-LightningBTC .btcpay-status--disabled")); + + // Check public node info for availability + s.Driver.FindElement(By.Id("PublicNodeInfo")).Click(); + s.Driver.SwitchTo().Window(s.Driver.WindowHandles.Last()); + Assert.Equal(storeName, s.Driver.FindElement(By.CssSelector(".store-name")).Text); + Assert.Equal("BTC Lightning Node", s.Driver.FindElement(By.Id("LightningNodeTitle")).Text); + Assert.Equal("Unavailable", s.Driver.FindElement(By.Id("LightningNodeStatus")).Text); + s.Driver.FindElement(By.CssSelector(".btcpay-status--disabled")); + s.Driver.AssertElementNotFound(By.Id("LightningNodeUrlClearnet")); + } + [Fact(Timeout = TestTimeout)] public async Task CanImportWallet() { @@ -2620,9 +2675,9 @@ public async Task CanUsePOSKeypad() // Receipt s.Driver.WaitForElement(By.Id("ReceiptLink")).Click(); - var additionalData = s.Driver.FindElement(By.CssSelector("#AdditionalData table")); - var items = additionalData.FindElements(By.CssSelector("tbody tr")); - var sums = additionalData.FindElements(By.CssSelector("tfoot tr")); + var cartData = s.Driver.FindElement(By.CssSelector("#CartData table")); + var items = cartData.FindElements(By.CssSelector("tbody tr")); + var sums = cartData.FindElements(By.CssSelector("tfoot tr")); Assert.Equal(2, items.Count); Assert.Equal(4, sums.Count); Assert.Contains("Manual entry 1", items[0].FindElement(By.CssSelector("th")).Text); @@ -2676,21 +2731,19 @@ public async Task CanUsePOSKeypad() // Receipt s.Driver.WaitForElement(By.Id("ReceiptLink")).Click(); - additionalData = s.Driver.FindElement(By.CssSelector("#AdditionalData table")); - items = additionalData.FindElements(By.CssSelector("tbody tr")); - sums = additionalData.FindElements(By.CssSelector("tfoot tr")); + cartData = s.Driver.FindElement(By.CssSelector("#CartData table")); + items = cartData.FindElements(By.CssSelector("tbody tr")); + sums = cartData.FindElements(By.CssSelector("tfoot tr")); Assert.Equal(3, items.Count); - Assert.Equal(2, sums.Count); + Assert.Single(sums); Assert.Contains("Black Tea", items[0].FindElement(By.CssSelector("th")).Text); Assert.Contains("1 x 1,00 € = 1,00 €", items[0].FindElement(By.CssSelector("td")).Text); Assert.Contains("Green Tea", items[1].FindElement(By.CssSelector("th")).Text); Assert.Contains("2 x 1,00 € = 2,00 €", items[1].FindElement(By.CssSelector("td")).Text); Assert.Contains("Manual entry 1", items[2].FindElement(By.CssSelector("th")).Text); Assert.Contains("1,23 €", items[2].FindElement(By.CssSelector("td")).Text); - Assert.Contains("Subtotal", sums[0].FindElement(By.CssSelector("th")).Text); + Assert.Contains("Total", sums[0].FindElement(By.CssSelector("th")).Text); Assert.Contains("4,23 €", sums[0].FindElement(By.CssSelector("td")).Text); - Assert.Contains("Total", sums[1].FindElement(By.CssSelector("th")).Text); - Assert.Contains("4,23 €", sums[1].FindElement(By.CssSelector("td")).Text); // Guest user can access recent transactions s.GoToHome(); @@ -2837,9 +2890,9 @@ public async Task CanUsePOSCart() // Receipt s.Driver.WaitForElement(By.Id("ReceiptLink")).Click(); - var additionalData = s.Driver.FindElement(By.CssSelector("#AdditionalData table")); - var items = additionalData.FindElements(By.CssSelector("tbody tr")); - var sums = additionalData.FindElements(By.CssSelector("tfoot tr")); + var cartData = s.Driver.FindElement(By.CssSelector("#CartData table")); + var items = cartData.FindElements(By.CssSelector("tbody tr")); + var sums = cartData.FindElements(By.CssSelector("tfoot tr")); Assert.Equal(7, items.Count); Assert.Equal(4, sums.Count); Assert.Contains("Black Tea", items[0].FindElement(By.CssSelector("th")).Text); diff --git a/BTCPayServer.Tests/ThirdPartyTests.cs b/BTCPayServer.Tests/ThirdPartyTests.cs index 9b7b09de8b..a1ce68c9db 100644 --- a/BTCPayServer.Tests/ThirdPartyTests.cs +++ b/BTCPayServer.Tests/ThirdPartyTests.cs @@ -77,7 +77,7 @@ await controller.StorageProvider(StorageProvider.AzureBlobStorage.ToString())) await UnitTest1.CanUploadRemoveFiles(controller); } - [Fact] + [Fact(Skip = "Fail on CI")] public async Task CanQueryMempoolFeeProvider() { IServiceCollection collection = new ServiceCollection(); diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs index e30ada0f2a..e6b1508f8c 100644 --- a/BTCPayServer.Tests/UnitTest1.cs +++ b/BTCPayServer.Tests/UnitTest1.cs @@ -2738,17 +2738,6 @@ public async Task CanDoInvoiceMigrations() Multiplier = 2 } }))); - blob.AdditionalData.Add("walletKeyPathRoots", JToken.Parse( - serializer.ToString(new Dictionary() - { - { - PaymentTypes.CHAIN.GetPaymentMethodId("BTC").ToString(), - new KeyPath("44'/0'/0'").ToString() - } - }))); - - blob.AdditionalData.Add("networkFeeDisabled", JToken.Parse( - serializer.ToString((bool?)true))); blob.AdditionalData.Add("onChainMinValue", JToken.Parse( serializer.ToString(new CurrencyValue() @@ -2775,12 +2764,7 @@ public async Task CanDoInvoiceMigrations() Assert.Contains(blob.PaymentMethodCriteria, criteria => criteria.PaymentMethod == PaymentTypes.CHAIN.GetPaymentMethodId("BTC") && criteria.Above && criteria.Value.Value == 5m && criteria.Value.Currency == "USD"); - Assert.Equal(NetworkFeeMode.Never, blob.NetworkFeeMode); var handlers = tester.PayTester.GetService(); - Assert.Contains(store.GetPaymentMethodConfigs(handlers), method => - method.Value is DerivationSchemeSettings dss && - method.Key == PaymentTypes.CHAIN.GetPaymentMethodId("BTC") && - dss.AccountKeySettings[0].AccountKeyPath == new KeyPath("44'/0'/0'")); await acc.ImportOldInvoices(); var dbContext = tester.PayTester.GetService().CreateContext(); diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index 505cc03b69..e2cb73cea7 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -47,7 +47,7 @@ - + diff --git a/BTCPayServer/Components/MainNav/Default.cshtml b/BTCPayServer/Components/MainNav/Default.cshtml index 9c0b244546..e8c3825681 100644 --- a/BTCPayServer/Components/MainNav/Default.cshtml +++ b/BTCPayServer/Components/MainNav/Default.cshtml @@ -79,8 +79,11 @@
  • @if (isSetUp) { + var status = scheme.Enabled + ? scheme.Available ? "enabled" : "disabled" + : "pending"; - + @PrettyName.PrettyName(scheme.PaymentMethodId) } diff --git a/BTCPayServer/Components/MainNav/MainNav.cs b/BTCPayServer/Components/MainNav/MainNav.cs index edca42264c..59c9bf73ca 100644 --- a/BTCPayServer/Components/MainNav/MainNav.cs +++ b/BTCPayServer/Components/MainNav/MainNav.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using BTCPayServer.Controllers; using BTCPayServer.Data; +using BTCPayServer.Lightning; using BTCPayServer.Models.StoreViewModels; using BTCPayServer.Payments; using BTCPayServer.Payments.Lightning; @@ -14,6 +16,7 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.Extensions.Caching.Memory; using NBitcoin; using NBitcoin.Secp256k1; @@ -28,6 +31,8 @@ public class MainNav : ViewComponent private readonly UserManager _userManager; private readonly PaymentMethodHandlerDictionary _paymentMethodHandlerDictionary; private readonly SettingsRepository _settingsRepository; + private readonly IMemoryCache _cache; + public PoliciesSettings PoliciesSettings { get; } public MainNav( @@ -38,6 +43,7 @@ public MainNav( UserManager userManager, PaymentMethodHandlerDictionary paymentMethodHandlerDictionary, SettingsRepository settingsRepository, + IMemoryCache cache, PoliciesSettings policiesSettings) { _storeRepo = storeRepo; @@ -47,6 +53,7 @@ public MainNav( _storesController = storesController; _paymentMethodHandlerDictionary = paymentMethodHandlerDictionary; _settingsRepository = settingsRepository; + _cache = cache; PoliciesSettings = policiesSettings; } @@ -69,6 +76,38 @@ public async Task InvokeAsync() // Wallets _storesController.AddPaymentMethods(store, storeBlob, out var derivationSchemes, out var lightningNodes); + + foreach (var lnNode in lightningNodes) + { + var pmi = PaymentTypes.LN.GetPaymentMethodId(lnNode.CryptoCode); + if (_paymentMethodHandlerDictionary.TryGet(pmi) is not LightningLikePaymentHandler handler) + continue; + + if (lnNode.CacheKey is not null) + { + using var cts = new CancellationTokenSource(5000); + try + { + lnNode.Available = await _cache.GetOrCreateAsync(lnNode.CacheKey, async entry => + { + entry.SetAbsoluteExpiration(TimeSpan.FromMinutes(5)); + try + { + var paymentMethodDetails = store.GetPaymentMethodConfig(pmi, _paymentMethodHandlerDictionary); + await handler.GetNodeInfo(paymentMethodDetails, null, throws: true); + // if we came here without exception, this means the node is available + return true; + } + catch (Exception) + { + return false; + } + }).WithCancellation(cts.Token); + } + catch when (cts.IsCancellationRequested) { } + } + } + vm.DerivationSchemes = derivationSchemes; vm.LightningNodes = lightningNodes; diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs index 5b012f748a..74f6368bb7 100644 --- a/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs @@ -224,8 +224,8 @@ public async Task CreateUser(CreateApplicationUserRequest request await _userManager.AddToRoleAsync(user, Roles.ServerAdmin); if (!anyAdmin) { - var settings = await _settingsRepository.GetSettingAsync(); - if (settings != null) + var settings = await _settingsRepository.GetSettingAsync() ?? new ThemeSettings(); + if (settings.FirstRun) { settings.FirstRun = false; await _settingsRepository.UpdateSetting(settings); diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs index 443efdc5af..448b937a01 100644 --- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs +++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs @@ -103,7 +103,6 @@ public async Task Invoice(string invoiceId) InvoiceId = new[] { invoiceId }, UserId = GetUserId(), IncludeAddresses = true, - IncludeEvents = true, IncludeArchived = true, IncludeRefunds = true, })).FirstOrDefault(); @@ -144,7 +143,7 @@ public async Task Invoice(string invoiceId) RedirectUrl = invoice.RedirectURL?.AbsoluteUri, TypedMetadata = invoice.Metadata, StatusException = invoice.ExceptionStatus, - Events = invoice.Events, + Events = await _InvoiceRepository.GetInvoiceLogs(invoice.Id), Metadata = metaData, Archived = invoice.Archived, HasRefund = invoice.Refunds.Any(), @@ -164,9 +163,9 @@ public async Task Invoice(string invoiceId) model.StillDue = details.StillDue; model.HasRates = details.HasRates; - if (additionalData.ContainsKey("receiptData")) + if (additionalData.TryGetValue("receiptData", out object? receiptData)) { - model.ReceiptData = (Dictionary)additionalData["receiptData"]; + model.ReceiptData = (Dictionary)receiptData; additionalData.Remove("receiptData"); } @@ -227,15 +226,39 @@ public async Task InvoiceReceipt(string invoiceId, [FromQuery] bo { return View(vm); } - - JToken? receiptData = null; - i.Metadata?.AdditionalData?.TryGetValue("receiptData", out receiptData); + + var metaData = PosDataParser.ParsePosData(i.Metadata?.ToJObject()); + var additionalData = metaData + .Where(dict => !InvoiceAdditionalDataExclude.Contains(dict.Key)) + .ToDictionary(dict => dict.Key, dict => dict.Value); + + // Split receipt data into cart and additional data + if (additionalData.TryGetValue("receiptData", out object? combinedReceiptData)) + { + var receiptData = new Dictionary((Dictionary)combinedReceiptData, StringComparer.OrdinalIgnoreCase); + string[] cartKeys = ["cart", "subtotal", "discount", "tip", "total"]; + // extract cart data and lowercase keys to handle data uniformly in PosData partial + if (receiptData.Keys.Any(key => cartKeys.Contains(key.ToLowerInvariant()))) + { + vm.CartData = new Dictionary(); + foreach (var key in cartKeys) + { + if (!receiptData.ContainsKey(key)) continue; + // add it to cart data and remove it from the general data + vm.CartData.Add(key.ToLowerInvariant(), receiptData[key]); + receiptData.Remove(key); + } + } + // assign the rest to additional data + if (receiptData.Any()) + { + vm.AdditionalData = receiptData; + } + } var payments = ViewPaymentRequestViewModel.PaymentRequestInvoicePayment.GetViewModels(i, _displayFormatter, _transactionLinkProviders, _handlers); - vm.Amount = i.PaidAmount.Net; vm.Payments = receipt.ShowPayments is false ? null : payments; - vm.AdditionalData = PosDataParser.ParsePosData(receiptData); return View(print ? "InvoiceReceiptPrint" : "InvoiceReceipt", vm); } @@ -586,7 +609,6 @@ public async Task ToggleArchive(string invoiceId) InvoiceId = new[] { invoiceId }, UserId = GetUserId(), IncludeAddresses = false, - IncludeEvents = false, IncludeArchived = true, })).FirstOrDefault(); if (invoice == null) diff --git a/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs b/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs index d47847536f..6097312753 100644 --- a/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs +++ b/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs @@ -5,7 +5,6 @@ using BTCPayServer.Data; using BTCPayServer.Filters; using BTCPayServer.Lightning; -using BTCPayServer.Logging; using BTCPayServer.Models; using BTCPayServer.Payments; using BTCPayServer.Payments.Lightning; @@ -23,18 +22,16 @@ public class UIPublicLightningNodeInfoController : Controller private readonly BTCPayNetworkProvider _BtcPayNetworkProvider; private readonly Dictionary _paymentModelExtensions; private readonly PaymentMethodHandlerDictionary _handlers; - private readonly LightningLikePaymentHandler _LightningLikePaymentHandler; private readonly StoreRepository _StoreRepository; public UIPublicLightningNodeInfoController(BTCPayNetworkProvider btcPayNetworkProvider, Dictionary paymentModelExtensions, PaymentMethodHandlerDictionary handlers, - LightningLikePaymentHandler lightningLikePaymentHandler, StoreRepository storeRepository) + StoreRepository storeRepository) { _BtcPayNetworkProvider = btcPayNetworkProvider; _paymentModelExtensions = paymentModelExtensions; _handlers = handlers; - _LightningLikePaymentHandler = lightningLikePaymentHandler; _StoreRepository = storeRepository; } @@ -43,7 +40,8 @@ public UIPublicLightningNodeInfoController(BTCPayNetworkProvider btcPayNetworkPr public async Task ShowLightningNodeInfo(string storeId, string cryptoCode) { var store = await _StoreRepository.FindStore(storeId); - if (store == null) + var pmi = PaymentTypes.LN.GetPaymentMethodId(cryptoCode); + if (store == null || _handlers.TryGet(pmi) is not LightningLikePaymentHandler handler) return NotFound(); var storeBlob = store.GetStoreBlob(); @@ -55,10 +53,8 @@ public async Task ShowLightningNodeInfo(string storeId, string cr }; try { - var pmi = PaymentTypes.LN.GetPaymentMethodId(cryptoCode); var paymentMethodDetails = store.GetPaymentMethodConfig(pmi, _handlers); - var network = _BtcPayNetworkProvider.GetNetwork(cryptoCode); - var nodeInfo = await _LightningLikePaymentHandler.GetNodeInfo(paymentMethodDetails, null, throws: true); + var nodeInfo = await handler.GetNodeInfo(paymentMethodDetails, null, throws: true); vm.Available = true; vm.CryptoImage = GetImage(pmi); diff --git a/BTCPayServer/Controllers/UIStoresController.Dashboard.cs b/BTCPayServer/Controllers/UIStoresController.Dashboard.cs index 1cf1b178db..bb1d5b8f46 100644 --- a/BTCPayServer/Controllers/UIStoresController.Dashboard.cs +++ b/BTCPayServer/Controllers/UIStoresController.Dashboard.cs @@ -1,6 +1,9 @@ #nullable enable +using System; using System.Collections.Generic; using System.Linq; +using System.Security.Cryptography; +using System.Text; using System.Threading.Tasks; using BTCPayServer.Abstractions.Constants; using BTCPayServer.Client; @@ -15,6 +18,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using NBitcoin; +using NBitcoin.DataEncoders; namespace BTCPayServer.Controllers; @@ -161,10 +165,19 @@ internal void AddPaymentMethods(StoreData store, StoreBlob storeBlob, CryptoCode = lnNetwork.CryptoCode, PaymentMethodId = handler.PaymentMethodId, Address = lightning?.GetDisplayableConnectionString(), - Enabled = isEnabled - }); + Enabled = isEnabled, + CacheKey = GetCacheKey(lightning) + }); } } } + private string? GetCacheKey(LightningPaymentMethodConfig? lightning) + { + if (lightning is null) + return null; + var connStr = lightning.IsInternalNode ? lightning.InternalNodeRef : lightning.ConnectionString; + connStr ??= string.Empty; + return "LN-INFO-" + Encoders.Hex.EncodeData(SHA256.HashData(Encoding.UTF8.GetBytes(connStr))[0..4]); + } } diff --git a/BTCPayServer/Data/InvoiceDataExtensions.cs b/BTCPayServer/Data/InvoiceDataExtensions.cs index d53ca2d265..9a240a72f0 100644 --- a/BTCPayServer/Data/InvoiceDataExtensions.cs +++ b/BTCPayServer/Data/InvoiceDataExtensions.cs @@ -50,10 +50,6 @@ public static InvoiceEntity GetBlob(this InvoiceData invoiceData) { entity.AvailableAddressHashes = invoiceData.AddressInvoices.Select(a => a.GetAddress() + a.GetPaymentMethodId()).ToHashSet(); } - if (invoiceData.Events != null) - { - entity.Events = invoiceData.Events.OrderBy(c => c.Timestamp).ToList(); - } if (invoiceData.Refunds != null) { entity.Refunds = invoiceData.Refunds.OrderBy(c => c.PullPaymentData.StartDate).ToList(); diff --git a/BTCPayServer/Data/Payouts/LightningLike/BoltInvoiceClaimDestination.cs b/BTCPayServer/Data/Payouts/LightningLike/BoltInvoiceClaimDestination.cs index ea6693021d..30956fdff9 100644 --- a/BTCPayServer/Data/Payouts/LightningLike/BoltInvoiceClaimDestination.cs +++ b/BTCPayServer/Data/Payouts/LightningLike/BoltInvoiceClaimDestination.cs @@ -11,7 +11,7 @@ public BoltInvoiceClaimDestination(string bolt11, BOLT11PaymentRequest paymentRe Bolt11 = bolt11 ?? throw new ArgumentNullException(nameof(bolt11)); PaymentRequest = paymentRequest; PaymentHash = paymentRequest.Hash; - Amount = paymentRequest.MinimumAmount.ToDecimal(LightMoneyUnit.BTC); + Amount = paymentRequest.MinimumAmount.MilliSatoshi == LightMoney.Zero ? null: paymentRequest.MinimumAmount.ToDecimal(LightMoneyUnit.BTC); } public override string ToString() diff --git a/BTCPayServer/Filters/DomainMappingConstraintAttribute.cs b/BTCPayServer/Filters/DomainMappingConstraintAttribute.cs index ecb6a66a61..52e9f5e6a7 100644 --- a/BTCPayServer/Filters/DomainMappingConstraintAttribute.cs +++ b/BTCPayServer/Filters/DomainMappingConstraintAttribute.cs @@ -37,11 +37,11 @@ public bool Accept(ActionConstraintContext context) } // If we have an appId, we can redirect to the canonical domain - if ((string)context.RouteContext.RouteData.Values["appId"] is { } appId && !req.IsOnion()) + if ((string)context.RouteContext.RouteData.Values["appId"] is { } appId) { var redirectDomain = mapping.FirstOrDefault(item => item.AppId == appId)?.Domain; // App is accessed via path, redirect to canonical domain - if (!string.IsNullOrEmpty(redirectDomain) && req.Method != "POST" && !req.HasFormContentType) + if (!string.IsNullOrEmpty(redirectDomain) && req.Method != "POST" && !req.HasFormContentType && !req.IsOnion()) { var uri = new UriBuilder(req.Scheme, redirectDomain); if (req.Host.Port.HasValue) diff --git a/BTCPayServer/Hosting/MigrationStartupTask.cs b/BTCPayServer/Hosting/MigrationStartupTask.cs index 85aead4b87..57b3f7515c 100644 --- a/BTCPayServer/Hosting/MigrationStartupTask.cs +++ b/BTCPayServer/Hosting/MigrationStartupTask.cs @@ -52,7 +52,6 @@ public class MigrationStartupTask : IStartupTask private readonly LightningAddressService _lightningAddressService; private readonly ILogger _logger; private readonly LightningClientFactoryService _lightningClientFactoryService; - private readonly UserManager _userManager; public IOptions LightningOptions { get; } @@ -60,7 +59,6 @@ public MigrationStartupTask( PaymentMethodHandlerDictionary handlers, StoreRepository storeRepository, ApplicationDbContextFactory dbContextFactory, - UserManager userManager, IOptions lightningOptions, SettingsRepository settingsRepository, AppService appService, @@ -80,7 +78,6 @@ public MigrationStartupTask( _lightningAddressService = lightningAddressService; _logger = logger; _lightningClientFactoryService = lightningClientFactoryService; - _userManager = userManager; LightningOptions = lightningOptions; } public async Task ExecuteAsync(CancellationToken cancellationToken = default) @@ -98,9 +95,9 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default) prop.SetValue(settings, true); } // Ensure these checks still get run - settings.CheckedFirstRun = false; settings.FileSystemStorageAsDefault = false; await _Settings.UpdateSetting(settings); + await _Settings.UpdateSetting(new ThemeSettings()); } if (!settings.PaymentMethodCriteria) @@ -109,45 +106,6 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default) settings.PaymentMethodCriteria = true; await _Settings.UpdateSetting(settings); } - if (!settings.DeprecatedLightningConnectionStringCheck) - { - await DeprecatedLightningConnectionStringCheck(); - settings.DeprecatedLightningConnectionStringCheck = true; - await _Settings.UpdateSetting(settings); - } - if (!settings.ConvertMultiplierToSpread) - { - await ConvertMultiplierToSpread(); - settings.ConvertMultiplierToSpread = true; - await _Settings.UpdateSetting(settings); - } - if (!settings.ConvertNetworkFeeProperty) - { - await ConvertNetworkFeeProperty(); - settings.ConvertNetworkFeeProperty = true; - await _Settings.UpdateSetting(settings); - } - if (!settings.ConvertCrowdfundOldSettings) - { - await ConvertCrowdfundOldSettings(); - settings.ConvertCrowdfundOldSettings = true; - await _Settings.UpdateSetting(settings); - } - if (!settings.ConvertWalletKeyPathRoots) - { - await ConvertConvertWalletKeyPathRoots(); - settings.ConvertWalletKeyPathRoots = true; - await _Settings.UpdateSetting(settings); - } - if (!settings.CheckedFirstRun) - { - var themeSettings = await _Settings.GetSettingAsync() ?? new ThemeSettings(); - var admin = await _userManager.GetUsersInRoleAsync(Roles.ServerAdmin); - themeSettings.FirstRun = admin.Count == 0; - await _Settings.UpdateSetting(themeSettings); - settings.CheckedFirstRun = true; - await _Settings.UpdateSetting(settings); - } if (!settings.TransitionToStoreBlobAdditionalData) { @@ -927,21 +885,25 @@ private async Task TransitionToStoreBlobAdditionalData() private async Task Migrate(CancellationToken cancellationToken) { - using (CancellationTokenSource timeout = new CancellationTokenSource(10_000)) + int cancellationTimeout = 60 * 60 * 24; + using (CancellationTokenSource timeout = new CancellationTokenSource(cancellationTimeout)) using (CancellationTokenSource cts = CancellationTokenSource.CreateLinkedTokenSource(timeout.Token, cancellationToken)) { retry: try { - var db = _DBContextFactory.CreateContext(); - await db.Database.MigrateAsync(); + _logger.LogInformation("Running the migration scripts..."); + var db = _DBContextFactory.CreateContext(o => o.CommandTimeout(cancellationTimeout + 1)); + await db.Database.MigrateAsync(timeout.Token); + _logger.LogInformation("All migration scripts ran successfully"); } // Starting up catch (ConfigException) { throw; } - catch when (!cts.Token.IsCancellationRequested) + catch (Exception ex) when (!cts.Token.IsCancellationRequested) { try { + _logger.LogWarning(ex, "Error while running migration scripts, retrying..."); await Task.Delay(1000, cts.Token); } catch { } @@ -950,43 +912,6 @@ private async Task Migrate(CancellationToken cancellationToken) } } - private async Task ConvertConvertWalletKeyPathRoots() - { - bool save = false; - using var ctx = _DBContextFactory.CreateContext(); - foreach (var store in await ctx.Stores.AsQueryable().ToArrayAsync()) - { -#pragma warning disable CS0618 // Type or member is obsolete - var blob = store.GetStoreBlob(); - - if (blob.AdditionalData.TryGetValue("walletKeyPathRoots", out var walletKeyPathRootsJToken)) - { - var walletKeyPathRoots = walletKeyPathRootsJToken.ToObject>(); - - if (!(walletKeyPathRoots?.Any() is true)) - continue; - var walletKeyPathRoots2 = walletKeyPathRoots.ToDictionary(w => PaymentMethodId.Parse(w.Key), w => w.Value); - foreach (var (id, scheme) in store.GetPaymentMethodConfigs(_handlers)) - { - var handler = (BitcoinLikePaymentHandler)_handlers[id]; - if (walletKeyPathRoots2.TryGetValue(id, - out var root)) - { - scheme.AccountKeyPath = new NBitcoin.KeyPath(root); - MigrateDerivationSettings(scheme, handler.Network); - store.SetPaymentMethodConfig(_handlers[id], scheme); - save = true; - } - } - - blob.AdditionalData.Remove("walletKeyPathRoots"); - store.SetStoreBlob(blob); - } -#pragma warning restore CS0618 // Type or member is obsolete - } - if (save) - await ctx.SaveChangesAsync(); - } void MigrateDerivationSettings(DerivationSchemeSettings s, BTCPayNetwork network) { if (network == null || s.AccountKeySettings is not (null or { Length: 1 })) @@ -1004,22 +929,6 @@ void MigrateDerivationSettings(DerivationSchemeSettings s, BTCPayNetwork network #pragma warning restore CS0618 // Type or member is obsolete } - private async Task ConvertCrowdfundOldSettings() - { - using var ctx = _DBContextFactory.CreateContext(); - foreach (var app in await ctx.Apps.Where(a => a.AppType == "Crowdfund").ToArrayAsync()) - { - var settings = app.GetSettings(); -#pragma warning disable CS0618 // Type or member is obsolete - if (settings.UseAllStoreInvoices) -#pragma warning restore CS0618 // Type or member is obsolete - { - app.TagAllInvoices = true; - } - } - await ctx.SaveChangesAsync(); - } - private async Task MigratePaymentMethodCriteria() { using var ctx = _DBContextFactory.CreateContext(); @@ -1074,53 +983,6 @@ null when _handlers.TryGet(paymentMethodId) is BitcoinLikePaymentHandler && await ctx.SaveChangesAsync(); } - private async Task ConvertNetworkFeeProperty() - { - using var ctx = _DBContextFactory.CreateContext(); - foreach (var store in await ctx.Stores.AsQueryable().ToArrayAsync()) - { - var blob = store.GetStoreBlob(); - if (blob.AdditionalData.TryGetValue("networkFeeDisabled", out var networkFeeModeJToken)) - { - var networkFeeMode = networkFeeModeJToken.ToObject(); - if (networkFeeMode != null) - { - blob.NetworkFeeMode = networkFeeMode.Value ? NetworkFeeMode.Never : NetworkFeeMode.Always; - } - - blob.AdditionalData.Remove("networkFeeDisabled"); - store.SetStoreBlob(blob); - } - } - await ctx.SaveChangesAsync(); - } - - private async Task ConvertMultiplierToSpread() - { - using var ctx = _DBContextFactory.CreateContext(); - foreach (var store in await ctx.Stores.AsQueryable().ToArrayAsync()) - { - var blob = store.GetStoreBlob(); - decimal multiplier = 1.0m; - if (blob.AdditionalData.TryGetValue("rateRules", out var rateRulesJToken)) - { - var rateRules = new Serializer(null).ToObject>(rateRulesJToken.ToString()); - if (rateRules != null && rateRules.Count != 0) - { - foreach (var rule in rateRules) - { - multiplier = rule.Apply(null, multiplier); - } - } - - blob.AdditionalData.Remove("rateRules"); - blob.Spread = Math.Min(1.0m, Math.Max(0m, -(multiplier - 1.0m))); - store.SetStoreBlob(blob); - } - } - await ctx.SaveChangesAsync(); - } - public class RateRule_Obsolete { public RateRule_Obsolete() @@ -1136,27 +998,5 @@ public decimal Apply(BTCPayNetworkBase network, decimal rate) return rate * (decimal)Multiplier; } } - - private async Task DeprecatedLightningConnectionStringCheck() - { - await using var ctx = _DBContextFactory.CreateContext(); - foreach (var store in await ctx.Stores.AsQueryable().ToArrayAsync()) - { - foreach (var (id, method) in store.GetPaymentMethodConfigs(_handlers)) - { - var lightning = method.GetExternalLightningUrl(); - if (lightning is null) - continue; - var client = _lightningClientFactoryService.Create(lightning, - ((IHasNetwork)_handlers[id]).Network); - if (client?.ToString() != lightning) - { - method.SetLightningUrl(client); - store.SetPaymentMethodConfig(_handlers[id], method); - } - } - } - await ctx.SaveChangesAsync(); - } } } diff --git a/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs b/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs index 3ac0f2f19e..c45cc1d25c 100644 --- a/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs +++ b/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs @@ -120,7 +120,7 @@ public string Fiat } public InvoiceMetadata TypedMetadata { get; set; } public DateTimeOffset MonitoringDate { get; internal set; } - public List Events { get; internal set; } + public InvoiceEventData[] Events { get; internal set; } public string NotificationEmail { get; internal set; } public Dictionary Metadata { get; set; } public Dictionary ReceiptData { get; set; } diff --git a/BTCPayServer/Models/InvoicingModels/InvoiceReceiptViewModel.cs b/BTCPayServer/Models/InvoicingModels/InvoiceReceiptViewModel.cs index 1065596d89..50c85a53ab 100644 --- a/BTCPayServer/Models/InvoicingModels/InvoiceReceiptViewModel.cs +++ b/BTCPayServer/Models/InvoicingModels/InvoiceReceiptViewModel.cs @@ -17,6 +17,7 @@ public class InvoiceReceiptViewModel public decimal Amount { get; set; } public DateTimeOffset Timestamp { get; set; } public Dictionary AdditionalData { get; set; } + public Dictionary CartData { get; set; } public ReceiptOptions ReceiptOptions { get; set; } public List Payments { get; set; } public string OrderUrl { get; set; } diff --git a/BTCPayServer/Models/StoreViewModels/StoreLightningNode.cs b/BTCPayServer/Models/StoreViewModels/StoreLightningNode.cs index 21ac67ce25..2d0e1737cf 100644 --- a/BTCPayServer/Models/StoreViewModels/StoreLightningNode.cs +++ b/BTCPayServer/Models/StoreViewModels/StoreLightningNode.cs @@ -8,5 +8,7 @@ public class StoreLightningNode public PaymentMethodId PaymentMethodId { get; set; } public string Address { get; set; } public bool Enabled { get; set; } + public bool Available { get; set; } + public string CacheKey { get; set; } } } diff --git a/BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs b/BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs index 92fabe98ee..6b68fd0b6c 100644 --- a/BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs +++ b/BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs @@ -1,11 +1,8 @@ #nullable enable using System; -using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using AngleSharp.Dom; -using BTCPayServer.Abstractions.Extensions; using BTCPayServer.Client; using BTCPayServer.Client.Models; using BTCPayServer.Configuration; @@ -13,17 +10,12 @@ using BTCPayServer.HostedServices; using BTCPayServer.Lightning; using BTCPayServer.Lightning.LndHub; -using BTCPayServer.Logging; -using BTCPayServer.Models; -using BTCPayServer.Models.InvoicingModels; using BTCPayServer.Payments.Bitcoin; using BTCPayServer.Security; using BTCPayServer.Services; -using BTCPayServer.Services.Invoices; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Options; using NBitcoin; -using NBitcoin.Protocol; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -41,7 +33,6 @@ public class LightningLikePaymentHandler : IPaymentMethodHandler, ILightningPaym private readonly LightningClientFactoryService _lightningClientFactory; private readonly BTCPayNetwork _Network; private readonly SocketFactory _socketFactory; - private readonly DisplayFormatter _displayFormatter; private readonly ISettingsAccessor _policies; private readonly IOptions _lightningNetworkOptions; @@ -51,7 +42,6 @@ public LightningLikePaymentHandler( LightningClientFactoryService lightningClientFactory, BTCPayNetwork network, SocketFactory socketFactory, - DisplayFormatter displayFormatter, IOptions options, ISettingsAccessor policies, IOptions lightningNetworkOptions) @@ -61,7 +51,6 @@ public LightningLikePaymentHandler( _lightningClientFactory = lightningClientFactory; _Network = network; _socketFactory = socketFactory; - _displayFormatter = displayFormatter; Options = options; _policies = policies; _lightningNetworkOptions = lightningNetworkOptions; @@ -155,7 +144,7 @@ public async Task GetNodeInfo(LightningPaymentMethodConfig supported var synced = _Dashboard.IsFullySynched(_Network.CryptoCode, out var summary); if (supportedPaymentMethod.IsInternalNode && !synced) throw new PaymentMethodUnavailableException("Full node not available"); - ; + try { using var cts = new CancellationTokenSource(LightningTimeout); diff --git a/BTCPayServer/Payments/PaymentTypes.cs b/BTCPayServer/Payments/PaymentTypes.cs index 34d1753f62..5265467746 100644 --- a/BTCPayServer/Payments/PaymentTypes.cs +++ b/BTCPayServer/Payments/PaymentTypes.cs @@ -1,13 +1,8 @@ #nullable enable -using System; -using System.Linq; #if ALTCOINS using BTCPayServer.Services.Altcoins.Monero.Payments; using BTCPayServer.Services.Altcoins.Zcash.Payments; #endif -using BTCPayServer.Services.Invoices; -using NBitcoin; -using Newtonsoft.Json.Linq; namespace BTCPayServer.Payments { diff --git a/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs b/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs index ffc10f248a..e70e00cb20 100644 --- a/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs +++ b/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs @@ -80,7 +80,7 @@ static ZcashLikeConfiguration ConfigureZcashLikeConfiguration(IServiceProvider s foreach (var ZcashLikeSpecificBtcPayNetwork in supportedNetworks) { var daemonUri = - configuration.GetOrDefault($"{ZcashLikeSpecificBtcPayNetwork.CryptoCode}_daemon_uri", + configuration.GetOrDefault($"{ZcashLikeSpecificBtcPayNetwork.CryptoCode}_daemon_uri", null); var walletDaemonUri = configuration.GetOrDefault( diff --git a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs index 137a327701..6e824c20ea 100644 --- a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs +++ b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs @@ -28,7 +28,6 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments { public class MoneroLikePaymentMethodHandler : IPaymentMethodHandler { - internal static PaymentType MoneroLike => MoneroPaymentType.Instance; private readonly MoneroLikeSpecificBtcPayNetwork _network; public MoneroLikeSpecificBtcPayNetwork Network => _network; public JsonSerializer Serializer { get; } @@ -38,7 +37,7 @@ public class MoneroLikePaymentMethodHandler : IPaymentMethodHandler public MoneroLikePaymentMethodHandler(MoneroLikeSpecificBtcPayNetwork network, MoneroRPCProvider moneroRpcProvider) { - PaymentMethodId = MoneroLike.GetPaymentMethodId(network.CryptoCode); + PaymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode); _network = network; Serializer = BlobSerializer.CreateSerializer().Serializer; _moneroRpcProvider = moneroRpcProvider; diff --git a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentType.cs b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentType.cs deleted file mode 100644 index 4de6197a89..0000000000 --- a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentType.cs +++ /dev/null @@ -1,17 +0,0 @@ -#if ALTCOINS -using System.Globalization; -using BTCPayServer.Payments; -using BTCPayServer.Plugins.Altcoins; -using BTCPayServer.Services.Invoices; -using NBitcoin; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -namespace BTCPayServer.Services.Altcoins.Monero.Payments -{ - internal class MoneroPaymentType - { - internal static readonly PaymentType Instance = new("MoneroLike"); - } -} -#endif diff --git a/BTCPayServer/Services/Altcoins/Monero/Services/MoneroListener.cs b/BTCPayServer/Services/Altcoins/Monero/Services/MoneroListener.cs index 4d4896b3f9..aff07a2aeb 100644 --- a/BTCPayServer/Services/Altcoins/Monero/Services/MoneroListener.cs +++ b/BTCPayServer/Services/Altcoins/Monero/Services/MoneroListener.cs @@ -157,7 +157,7 @@ private async Task UpdatePaymentStates(string cryptoCode, InvoiceEntity[] invoic var moneroWalletRpcClient = _moneroRpcProvider.WalletRpcClients[cryptoCode]; var network = _networkProvider.GetNetwork(cryptoCode); - var paymentId = MoneroPaymentType.Instance.GetPaymentMethodId(network.CryptoCode); + var paymentId = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode); var handler = (MoneroLikePaymentMethodHandler)_handlers[paymentId]; //get all the required data in one list (invoice, its existing payments and the current payment method details) @@ -273,7 +273,7 @@ private async Task OnNewBlock(string cryptoCode) private async Task OnTransactionUpdated(string cryptoCode, string transactionHash) { - var paymentMethodId = MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode); + var paymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode); var transfer = await _moneroRpcProvider.WalletRpcClients[cryptoCode] .SendCommandAsync( "get_transfer_by_txid", @@ -324,7 +324,7 @@ private async Task HandlePaymentData(string cryptoCode, string address, long tot BlockingCollection<(PaymentEntity Payment, InvoiceEntity invoice)> paymentsToUpdate) { var network = _networkProvider.GetNetwork(cryptoCode); - var pmi = MoneroPaymentType.Instance.GetPaymentMethodId(network.CryptoCode); + var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode); var handler = (MoneroLikePaymentMethodHandler)_handlers[pmi]; var promptDetails = handler.ParsePaymentPromptDetails(invoice.GetPaymentPrompt(pmi).Details); var details = new MoneroLikePaymentData() @@ -397,7 +397,7 @@ private async Task UpdateAnyPendingMoneroLikePayment(string cryptoCode) var invoices = await _invoiceRepository.GetPendingInvoices(); if (!invoices.Any()) return; - var paymentMethodId = MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode); + var paymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode); invoices = invoices.Where(entity => entity.GetPaymentPrompt(paymentMethodId)?.Activated is true).ToArray(); await UpdatePaymentStates(cryptoCode, invoices); } @@ -405,7 +405,7 @@ private async Task UpdateAnyPendingMoneroLikePayment(string cryptoCode) private IEnumerable GetAllMoneroLikePayments(InvoiceEntity invoice, string cryptoCode) { return invoice.GetPayments(false) - .Where(p => p.PaymentMethodId == MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode)); + .Where(p => p.PaymentMethodId == PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode)); } } } diff --git a/BTCPayServer/Services/Altcoins/Monero/UI/MoneroLikeStoreController.cs b/BTCPayServer/Services/Altcoins/Monero/UI/MoneroLikeStoreController.cs index bfac948ab7..d8d05ee9fe 100644 --- a/BTCPayServer/Services/Altcoins/Monero/UI/MoneroLikeStoreController.cs +++ b/BTCPayServer/Services/Altcoins/Monero/UI/MoneroLikeStoreController.cs @@ -99,7 +99,7 @@ private MoneroLikePaymentMethodViewModel GetMoneroLikePaymentMethodViewModel( var monero = storeData.GetPaymentMethodConfigs(_handlers) .Where(s => s.Value is MoneroPaymentPromptDetails) .Select(s => (PaymentMethodId: s.Key, Details: (MoneroPaymentPromptDetails)s.Value)); - var pmi = MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode); + var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode); var settings = monero.Where(method => method.PaymentMethodId == pmi).Select(m => m.Details).SingleOrDefault(); _MoneroRpcProvider.Summaries.TryGetValue(cryptoCode, out var summary); _MoneroLikeConfiguration.MoneroLikeConfigurationItems.TryGetValue(cryptoCode, @@ -127,7 +127,7 @@ private MoneroLikePaymentMethodViewModel GetMoneroLikePaymentMethodViewModel( WalletFileFound = System.IO.File.Exists(fileAddress), Enabled = settings != null && - !excludeFilters.Match(MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode)), + !excludeFilters.Match(PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode)), Summary = summary, CryptoCode = cryptoCode, AccountIndex = settings?.AccountIndex ?? accountsResponse?.SubaddressAccounts?.FirstOrDefault()?.AccountIndex ?? 0, @@ -278,7 +278,7 @@ public async Task GetStoreMoneroLikePaymentMethod(MoneroLikePayme var storeData = StoreData; var blob = storeData.GetStoreBlob(); - storeData.SetPaymentMethodConfig(_handlers[MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode)], new MoneroPaymentPromptDetails() + storeData.SetPaymentMethodConfig(_handlers[PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode)], new MoneroPaymentPromptDetails() { AccountIndex = viewModel.AccountIndex, InvoiceSettledConfirmationThreshold = viewModel.SettlementConfirmationThresholdChoice switch @@ -291,7 +291,7 @@ public async Task GetStoreMoneroLikePaymentMethod(MoneroLikePayme } }); - blob.SetExcluded(MoneroPaymentType.Instance.GetPaymentMethodId(viewModel.CryptoCode), !viewModel.Enabled); + blob.SetExcluded(PaymentTypes.CHAIN.GetPaymentMethodId(viewModel.CryptoCode), !viewModel.Enabled); storeData.SetStoreBlob(blob); await _StoreRepository.UpdateStore(storeData); return RedirectToAction("GetStoreMoneroLikePaymentMethods", @@ -343,7 +343,7 @@ public class MoneroLikePaymentMethodViewModel : IValidatableObject public IFormFile WalletKeysFile { get; set; } [Display(Name = "Wallet Password")] public string WalletPassword { get; set; } - [Display(Name = "Consider the invoice settled when the payment transaction �")] + [Display(Name = "Consider the invoice settled when the payment transaction �")] public MoneroLikeSettlementThresholdChoice SettlementConfirmationThresholdChoice { get; set; } [Display(Name = "Required Confirmations"), Range(0, 100)] public long? CustomSettlementConfirmationThreshold { get; set; } diff --git a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs index ca122da943..720849eea0 100644 --- a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs +++ b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs @@ -26,7 +26,6 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments { public class ZcashLikePaymentMethodHandler : IPaymentMethodHandler { - internal static PaymentType ZcashLike => ZcashPaymentType.Instance; private readonly ZcashLikeSpecificBtcPayNetwork _network; public ZcashLikeSpecificBtcPayNetwork Network => _network; public JsonSerializer Serializer { get; } @@ -35,7 +34,7 @@ public class ZcashLikePaymentMethodHandler : IPaymentMethodHandler public ZcashLikePaymentMethodHandler(BTCPayNetworkBase network, ZcashRPCProvider ZcashRpcProvider) { _network = (ZcashLikeSpecificBtcPayNetwork)network; - PaymentMethodId = ZcashLike.GetPaymentMethodId(_network.CryptoCode); + PaymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(_network.CryptoCode); Serializer = BlobSerializer.CreateSerializer().Serializer; _ZcashRpcProvider = ZcashRpcProvider; } diff --git a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentType.cs b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentType.cs deleted file mode 100644 index 47be903100..0000000000 --- a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentType.cs +++ /dev/null @@ -1,17 +0,0 @@ -#if ALTCOINS -using System.Globalization; -using BTCPayServer.Payments; -using BTCPayServer.Plugins.Altcoins; -using BTCPayServer.Services.Invoices; -using NBitcoin; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -namespace BTCPayServer.Services.Altcoins.Zcash.Payments -{ - internal class ZcashPaymentType - { - internal static readonly PaymentType Instance = new("ZcashLike"); - } -} -#endif diff --git a/BTCPayServer/Services/Altcoins/Zcash/Services/ZcashListener.cs b/BTCPayServer/Services/Altcoins/Zcash/Services/ZcashListener.cs index 436137a846..8904b3f14f 100644 --- a/BTCPayServer/Services/Altcoins/Zcash/Services/ZcashListener.cs +++ b/BTCPayServer/Services/Altcoins/Zcash/Services/ZcashListener.cs @@ -155,7 +155,7 @@ private async Task UpdatePaymentStates(string cryptoCode, InvoiceEntity[] invoic var ZcashWalletRpcClient = _ZcashRpcProvider.WalletRpcClients[cryptoCode]; var network = _networkProvider.GetNetwork(cryptoCode); - var paymentId = ZcashPaymentType.Instance.GetPaymentMethodId(network.CryptoCode); + var paymentId = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode); var handler = (ZcashLikePaymentMethodHandler)_handlers[paymentId]; //get all the required data in one list (invoice, its existing payments and the current payment method details) @@ -271,7 +271,7 @@ private async Task OnNewBlock(string cryptoCode) private async Task OnTransactionUpdated(string cryptoCode, string transactionHash) { - var paymentMethodId = ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode); + var paymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode); var transfer = await _ZcashRpcProvider.WalletRpcClients[cryptoCode] .SendCommandAsync( "get_transfer_by_txid", @@ -322,7 +322,7 @@ private async Task HandlePaymentData(string cryptoCode, string address, long tot BlockingCollection<(PaymentEntity Payment, InvoiceEntity invoice)> paymentsToUpdate) { var network = _networkProvider.GetNetwork(cryptoCode); - var pmi = ZcashPaymentType.Instance.GetPaymentMethodId(network.CryptoCode); + var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode); var handler = (ZcashLikePaymentMethodHandler)_handlers[pmi]; var details = new ZcashLikePaymentData() @@ -385,7 +385,7 @@ private async Task UpdateAnyPendingZcashLikePayment(string cryptoCode) var invoices = await _invoiceRepository.GetPendingInvoices(); if (!invoices.Any()) return; - var paymentMethodId = ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode); + var paymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode); invoices = invoices.Where(entity => entity.GetPaymentPrompt(paymentMethodId).Activated).ToArray(); await UpdatePaymentStates(cryptoCode, invoices); } @@ -393,7 +393,7 @@ private async Task UpdateAnyPendingZcashLikePayment(string cryptoCode) private IEnumerable GetAllZcashLikePayments(InvoiceEntity invoice, string cryptoCode) { return invoice.GetPayments(false) - .Where(p => p.PaymentMethodId == ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode)); + .Where(p => p.PaymentMethodId == PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode)); } } } diff --git a/BTCPayServer/Services/Altcoins/Zcash/UI/ZcashLikeStoreController.cs b/BTCPayServer/Services/Altcoins/Zcash/UI/ZcashLikeStoreController.cs index 0676e4ab59..7541ecabed 100644 --- a/BTCPayServer/Services/Altcoins/Zcash/UI/ZcashLikeStoreController.cs +++ b/BTCPayServer/Services/Altcoins/Zcash/UI/ZcashLikeStoreController.cs @@ -106,7 +106,7 @@ private ZcashLikePaymentMethodViewModel GetZcashLikePaymentMethodViewModel( WalletFileFound = System.IO.File.Exists(fileAddress), Enabled = settings != null && - !excludeFilters.Match(ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode)), + !excludeFilters.Match(PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode)), Summary = summary, CryptoCode = cryptoCode, AccountIndex = settings?.AccountIndex ?? accountsResponse?.SubaddressAccounts?.FirstOrDefault()?.AccountIndex ?? 0, @@ -249,13 +249,13 @@ public async Task GetStoreZcashLikePaymentMethod(ZcashLikePayment var storeData = StoreData; var blob = storeData.GetStoreBlob(); - var pmi = ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode); + var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode); storeData.SetPaymentMethodConfig(_handlers[pmi], new ZcashPaymentMethodConfig() { AccountIndex = viewModel.AccountIndex }); - blob.SetExcluded(ZcashPaymentType.Instance.GetPaymentMethodId(viewModel.CryptoCode), !viewModel.Enabled); + blob.SetExcluded(PaymentTypes.CHAIN.GetPaymentMethodId(viewModel.CryptoCode), !viewModel.Enabled); storeData.SetStoreBlob(blob); await _StoreRepository.UpdateStore(storeData); return RedirectToAction("GetStoreZcashLikePaymentMethods", diff --git a/BTCPayServer/Services/Apps/CrowdfundSettings.cs b/BTCPayServer/Services/Apps/CrowdfundSettings.cs index e70bfe5c7b..1fb78f0b4b 100644 --- a/BTCPayServer/Services/Apps/CrowdfundSettings.cs +++ b/BTCPayServer/Services/Apps/CrowdfundSettings.cs @@ -40,8 +40,6 @@ public decimal? TargetAmount public bool AnimationsEnabled { get; set; } public int ResetEveryAmount { get; set; } = 1; public CrowdfundResetEvery ResetEvery { get; set; } = CrowdfundResetEvery.Never; - [Obsolete("Use AppData.TagAllInvoices instead")] - public bool UseAllStoreInvoices { get; set; } public bool DisplayPerksRanking { get; set; } public bool DisplayPerksValue { get; set; } public bool SortPerksByPopularity { get; set; } diff --git a/BTCPayServer/Services/Invoices/InvoiceEntity.cs b/BTCPayServer/Services/Invoices/InvoiceEntity.cs index 33c1e1122d..4a4eadd6d7 100644 --- a/BTCPayServer/Services/Invoices/InvoiceEntity.cs +++ b/BTCPayServer/Services/Invoices/InvoiceEntity.cs @@ -501,8 +501,6 @@ private Uri FillPlaceholdersUri(string v) public HashSet AvailableAddressHashes { get; set; } [JsonProperty] public bool ExtendedNotifications { get; set; } - [JsonIgnore] - public List Events { get; internal set; } [JsonProperty] public double PaymentTolerance { get; set; } diff --git a/BTCPayServer/Services/Invoices/InvoiceRepository.cs b/BTCPayServer/Services/Invoices/InvoiceRepository.cs index 44b5b75905..5c469f1d38 100644 --- a/BTCPayServer/Services/Invoices/InvoiceRepository.cs +++ b/BTCPayServer/Services/Invoices/InvoiceRepository.cs @@ -16,6 +16,7 @@ using NBitcoin; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Npgsql; using Encoders = NBitcoin.DataEncoders.Encoders; using InvoiceData = BTCPayServer.Data.InvoiceData; @@ -140,7 +141,7 @@ public async Task GetAppsTaggingStore(string storeId) public async Task UpdateInvoice(string invoiceId, UpdateCustomerModel data) { - retry: +retry: using (var ctx = _applicationDbContextFactory.CreateContext()) { var invoiceData = await ctx.Invoices.FindAsync(invoiceId); @@ -169,7 +170,7 @@ public async Task UpdateInvoice(string invoiceId, UpdateCustomerModel data) public async Task UpdateInvoiceExpiry(string invoiceId, TimeSpan seconds) { - retry: +retry: await using (var ctx = _applicationDbContextFactory.CreateContext()) { var invoiceData = await ctx.Invoices.FindAsync(invoiceId); @@ -199,7 +200,7 @@ async Task InvoiceNeedUpdateEventLater(string invoiceId, TimeSpan expirationIn) public async Task ExtendInvoiceMonitor(string invoiceId) { - retry: +retry: using (var ctx = _applicationDbContextFactory.CreateContext()) { var invoiceData = await ctx.Invoices.FindAsync(invoiceId); @@ -275,28 +276,33 @@ await context.AddressInvoices.AddAsync(new AddressInvoiceData() public async Task AddInvoiceLogs(string invoiceId, InvoiceLogs logs) { await using var context = _applicationDbContextFactory.CreateContext(); - foreach (var log in logs.ToList()) + var db = context.Database.GetDbConnection(); + var data = logs.ToList().Select(log => new InvoiceEventData() { - await context.InvoiceEvents.AddAsync(new InvoiceEventData() - { - Severity = log.Severity, - InvoiceDataId = invoiceId, - Message = log.Log, - Timestamp = log.Timestamp, - UniqueId = Encoders.Hex.EncodeData(RandomUtils.GetBytes(10)) - }); - } - await context.SaveChangesAsync().ConfigureAwait(false); + Severity = log.Severity, + InvoiceDataId = invoiceId, + Message = log.Log, + Timestamp = log.Timestamp + }).ToArray(); + + await db.ExecuteAsync(InsertInvoiceEvent, data); + } + + public async Task GetInvoiceLogs(string invoiceId) + { + await using var context = _applicationDbContextFactory.CreateContext(); + var db = context.Database.GetDbConnection(); + return (await db.QueryAsync("SELECT * FROM \"InvoiceEvents\" WHERE \"InvoiceDataId\"=@InvoiceDataId ORDER BY \"Timestamp\"", new { InvoiceDataId = invoiceId })).ToArray(); } public Task UpdatePaymentDetails(string invoiceId, IPaymentMethodHandler handler, object details) { return UpdatePaymentDetails(invoiceId, handler.PaymentMethodId, details is null ? null : JToken.FromObject(details, handler.Serializer)); - + } public async Task UpdatePaymentDetails(string invoiceId, PaymentMethodId paymentMethodId, JToken details) { - retry: +retry: using (var context = _applicationDbContextFactory.CreateContext()) { try @@ -346,7 +352,7 @@ public async Task UpdatePrompt(string invoiceId, PaymentPrompt prompt) public async Task NewPaymentPrompt(string invoiceId, PaymentMethodContext paymentPromptContext) { var prompt = paymentPromptContext.Prompt; - retry: +retry: using (var context = _applicationDbContextFactory.CreateContext()) { var invoice = await context.Invoices.FindAsync(invoiceId); @@ -397,22 +403,27 @@ public async Task AddPendingInvoiceIfNotPresent(string invoiceId) } } + const string InsertInvoiceEvent = "INSERT INTO \"InvoiceEvents\" (\"InvoiceDataId\", \"Severity\", \"Message\", \"Timestamp\") VALUES (@InvoiceDataId, @Severity, @Message, @Timestamp)"; + public async Task AddInvoiceEvent(string invoiceId, object evt, InvoiceEventData.EventSeverity severity) { await using var context = _applicationDbContextFactory.CreateContext(); - await context.InvoiceEvents.AddAsync(new InvoiceEventData() - { - Severity = severity, - InvoiceDataId = invoiceId, - Message = evt.ToString(), - Timestamp = DateTimeOffset.UtcNow, - UniqueId = Encoders.Hex.EncodeData(RandomUtils.GetBytes(10)) - }); + var conn = context.Database.GetDbConnection(); try { - await context.SaveChangesAsync(); + await conn.ExecuteAsync(InsertInvoiceEvent, + new InvoiceEventData() + { + Severity = severity, + InvoiceDataId = invoiceId, + Message = evt.ToString(), + Timestamp = DateTimeOffset.UtcNow + }); + } + catch (Npgsql.NpgsqlException ex) when (ex.SqlState == PostgresErrorCodes.ForeignKeyViolation) + { + // Invoice does not exists } - catch (DbUpdateException) { } // Probably the invoice does not exists anymore } public static void AddToTextSearch(ApplicationDbContext context, InvoiceData invoice, params string[] terms) @@ -446,7 +457,7 @@ await context.Database.GetDbConnection() } internal async Task UpdateInvoicePrice(string invoiceId, decimal price) { - retry: +retry: using (var context = _applicationDbContextFactory.CreateContext()) { var invoiceData = await context.FindAsync(invoiceId).ConfigureAwait(false); @@ -742,7 +753,7 @@ private IQueryable GetInvoiceQuery(ApplicationDbContext context, In if (queryObject.Take != null) query = query.Take(queryObject.Take.Value); - + return query; } public Task GetInvoices(InvoiceQuery queryObject) @@ -756,8 +767,6 @@ public async Task GetInvoices(InvoiceQuery queryObject, Cancell query = query.Include(o => o.Payments); if (queryObject.IncludeAddresses) query = query.Include(o => o.AddressInvoices); - if (queryObject.IncludeEvents) - query = query.Include(o => o.Events); if (queryObject.IncludeRefunds) query = query.Include(o => o.Refunds).ThenInclude(refundData => refundData.PullPaymentData); var data = await query.AsNoTracking().ToArrayAsync(cancellationToken).ConfigureAwait(false); @@ -961,8 +970,6 @@ public string[] InvoiceId set; } public bool IncludeAddresses { get; set; } - - public bool IncludeEvents { get; set; } public bool IncludeArchived { get; set; } = true; public bool IncludeRefunds { get; set; } public bool OrderByDesc { get; set; } = true; diff --git a/BTCPayServer/Services/MigrationSettings.cs b/BTCPayServer/Services/MigrationSettings.cs index 2fb58f2264..a787290e23 100644 --- a/BTCPayServer/Services/MigrationSettings.cs +++ b/BTCPayServer/Services/MigrationSettings.cs @@ -7,12 +7,6 @@ public class MigrationSettings [JsonProperty("MigrateHotwalletProperty2")] public bool MigrateHotwalletProperty { get; set; } public bool MigrateU2FToFIDO2 { get; set; } - public bool DeprecatedLightningConnectionStringCheck { get; set; } - public bool ConvertMultiplierToSpread { get; set; } - public bool ConvertNetworkFeeProperty { get; set; } - public bool ConvertCrowdfundOldSettings { get; set; } - public bool ConvertWalletKeyPathRoots { get; set; } - public bool CheckedFirstRun { get; set; } public bool PaymentMethodCriteria { get; set; } public bool TransitionToStoreBlobAdditionalData { get; set; } public bool TransitionInternalNodeConnectionString { get; set; } diff --git a/BTCPayServer/Services/Reporting/ProductsReportProvider.cs b/BTCPayServer/Services/Reporting/ProductsReportProvider.cs index d83f9d0deb..2697773e25 100644 --- a/BTCPayServer/Services/Reporting/ProductsReportProvider.cs +++ b/BTCPayServer/Services/Reporting/ProductsReportProvider.cs @@ -33,7 +33,6 @@ public override async Task Query(QueryContext queryContext, CancellationToken ca { IncludeArchived = true, IncludeAddresses = false, - IncludeEvents = false, IncludeRefunds = false, StartDate = queryContext.From, EndDate = queryContext.To, diff --git a/BTCPayServer/Services/ThemesSettings.cs b/BTCPayServer/Services/ThemesSettings.cs index d6a4aa32ce..303a51c0b1 100644 --- a/BTCPayServer/Services/ThemesSettings.cs +++ b/BTCPayServer/Services/ThemesSettings.cs @@ -30,7 +30,7 @@ public class ThemeSettings public string LogoFileId { get; set; } - public bool FirstRun { get; set; } + public bool FirstRun { get; set; } = true; public override string ToString() { diff --git a/BTCPayServer/Views/Shared/EmailsBody.cshtml b/BTCPayServer/Views/Shared/EmailsBody.cshtml index 23c92a3729..c9f2ab5f70 100644 --- a/BTCPayServer/Views/Shared/EmailsBody.cshtml +++ b/BTCPayServer/Views/Shared/EmailsBody.cshtml @@ -1,6 +1,7 @@ @using BTCPayServer.Client @using Microsoft.AspNetCore.Mvc.TagHelpers @using BTCPayServer.Abstractions.TagHelpers +@using BTCPayServer.Models.ServerViewModels @model BTCPayServer.Models.EmailsViewModel
    @@ -44,7 +45,7 @@
    For many email providers (like Gmail) your login is your email address.
    -
    +
    @if (!Model.PasswordSet) { @@ -81,7 +82,6 @@ diff --git a/BTCPayServer/Views/UIPublicLightningNodeInfo/ShowLightningNodeInfo.cshtml b/BTCPayServer/Views/UIPublicLightningNodeInfo/ShowLightningNodeInfo.cshtml index c00d99998d..0ef38a5049 100644 --- a/BTCPayServer/Views/UIPublicLightningNodeInfo/ShowLightningNodeInfo.cshtml +++ b/BTCPayServer/Views/UIPublicLightningNodeInfo/ShowLightningNodeInfo.cshtml @@ -18,13 +18,13 @@
    -

    +

    @Model.CryptoCode Lightning Node

    - @(Model.Available ? "Online" : "Unavailable") + @(Model.Available ? "Online" : "Unavailable")

    @if (Model.Available) { @@ -46,6 +46,7 @@ { var nodeInfo = Model.NodeInfo[i]; var title = nodeInfo.IsTor ? "Tor" : "Clearnet"; + var id = $"LightningNodeUrl{title}"; var value = nodeInfo.ToString();
    @@ -58,7 +59,7 @@
    - +
    diff --git a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml index 7d43a9f2e2..5b4475d4a2 100644 --- a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml +++ b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml @@ -58,7 +58,7 @@ }
    @@ -202,7 +202,7 @@

    @if (Model.LnurlEndpoint is not null) { -

    Setup Boltcard @@ -229,11 +229,10 @@ const isAndroid = /(android)/i.test(navigator.userAgent); if (isAndroid) { document.getElementById("SetupBoltcard").setAttribute('target', '_blank'); - document.getElementById("SetupBoltcard").setAttribute('href', @Safe.Json(@Model.SetupDeepLink)); + document.getElementById("SetupBoltcard").setAttribute('href', @Safe.Json(Model.SetupDeepLink)); document.getElementById("ResetBoltcard").setAttribute('target', '_blank'); - document.getElementById("ResetBoltcard").setAttribute('href', @Safe.Json(@Model.ResetDeepLink)); + document.getElementById("ResetBoltcard").setAttribute('href', @Safe.Json(Model.ResetDeepLink)); } - document.getElementById("BoltcardActions").style.visibility = "visible"; window.qrApp = initQRShow({}); delegate('click', 'button[page-qr]', event => { diff --git a/BTCPayServer/wwwroot/main/site.js b/BTCPayServer/wwwroot/main/site.js index e40d38ba48..7358864ba8 100644 --- a/BTCPayServer/wwwroot/main/site.js +++ b/BTCPayServer/wwwroot/main/site.js @@ -2,19 +2,6 @@ const baseUrl = Object.values(document.scripts).find(s => s.src.includes('/main/ const flatpickrInstances = []; -const formatDateTimes = format => { - // select only elements which haven't been initialized before, those without data-localized - document.querySelectorAll("time[datetime]:not([data-localized])").forEach($el => { - const date = new Date($el.getAttribute("datetime")); - // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat - const { dateStyle = 'short', timeStyle = 'short' } = $el.dataset; - // initialize and set localized attribute - $el.dataset.localized = new Intl.DateTimeFormat('default', { dateStyle, timeStyle }).format(date); - // set text to chosen mode - const mode = format || $el.dataset.initial; - if ($el.dataset[mode]) $el.innerText = $el.dataset[mode]; - }); -}; const switchTimeFormat = event => { const curr = event.target.dataset.mode || 'localized'; @@ -166,8 +153,9 @@ document.addEventListener("DOMContentLoaded", () => { } // initialize timezone offset value if field is present in page - var timezoneOffset = new Date().getTimezoneOffset(); - $("#TimezoneOffset").val(timezoneOffset); + const $timezoneOffset = document.getElementById("TimezoneOffset"); + const timezoneOffset = new Date().getTimezoneOffset(); + if ($timezoneOffset) $timezoneOffset.value = timezoneOffset; // localize all elements that have localizeDate class formatDateTimes(); diff --git a/BTCPayServer/wwwroot/main/utils.js b/BTCPayServer/wwwroot/main/utils.js index 7bda6caede..6c65d63c2a 100644 --- a/BTCPayServer/wwwroot/main/utils.js +++ b/BTCPayServer/wwwroot/main/utils.js @@ -15,3 +15,17 @@ function debounce(key, fn, delay = 250) { clearTimeout(DEBOUNCE_TIMERS[key]) DEBOUNCE_TIMERS[key] = setTimeout(fn, delay) } + +function formatDateTimes(format) { + // select only elements which haven't been initialized before, those without data-localized + document.querySelectorAll("time[datetime]:not([data-localized])").forEach($el => { + const date = new Date($el.getAttribute("datetime")); + // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat + const { dateStyle = 'short', timeStyle = 'short' } = $el.dataset; + // initialize and set localized attribute + $el.dataset.localized = new Intl.DateTimeFormat('default', { dateStyle, timeStyle }).format(date); + // set text to chosen mode + const mode = format || $el.dataset.initial; + if ($el.dataset[mode]) $el.innerText = $el.dataset[mode]; + }); +}