Merge remote-tracking branch 'upstream/master'

Groestlcoin · Sep 8, 2024 · 734b912 · 734b912
2 parents 8a7db56 + 73dcde7
commit 734b912
Show file tree

Hide file tree

Showing 45 changed files with 344 additions and 194 deletions.
diff --git a/BTCPayServer.Client/Models/CreatePayoutRequest.cs b/BTCPayServer.Client/Models/CreatePayoutRequest.cs
@@ -8,6 +8,6 @@ public class CreatePayoutRequest
         public string Destination { get; set; }
         [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal? Amount { get; set; }
-        public string PaymentMethod { get; set; }
+        public string PayoutMethodId { get; set; }
     }
 }
diff --git a/BTCPayServer.Client/Models/GenerateOnChainWalletRequest.cs b/BTCPayServer.Client/Models/GenerateOnChainWalletRequest.cs
@@ -10,6 +10,7 @@ namespace BTCPayServer.Client
 {
     public class GenerateOnChainWalletRequest
     {
+        public string Label { get; set; }
         public int AccountNumber { get; set; } = 0;
         [JsonConverter(typeof(MnemonicJsonConverter))]
         public Mnemonic ExistingMnemonic { get; set; }
@@ -29,6 +30,7 @@ public class GenerateOnChainWalletResponse : GenericPaymentMethodData
     {
         public class ConfigData
         {
+            public string Label { get; set; }
             public string AccountDerivation { get; set; }
             [JsonExtensionData]
             IDictionary<string, JToken> AdditionalData { get; set; }

diff --git a/BTCPayServer.Client/Models/LightningAutomatedPayoutSettings.cs b/BTCPayServer.Client/Models/LightningAutomatedPayoutSettings.cs
@@ -6,7 +6,7 @@ namespace BTCPayServer.Client.Models;
 
 public class LightningAutomatedPayoutSettings
 {
-    public string PaymentMethod { get; set; }
+    public string PayoutMethodId { get; set; }
 
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }

diff --git a/BTCPayServer.Client/Models/OnChainAutomatedPayoutSettings.cs b/BTCPayServer.Client/Models/OnChainAutomatedPayoutSettings.cs
@@ -6,7 +6,7 @@ namespace BTCPayServer.Client.Models;
 
 public class OnChainAutomatedPayoutSettings
 {
-    public string PaymentMethod { get; set; }
+    public string PayoutMethodId { get; set; }
 
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }

diff --git a/BTCPayServer.Client/Models/PaymentMethodCriteriaData.cs b/BTCPayServer.Client/Models/PaymentMethodCriteriaData.cs
@@ -5,7 +5,7 @@ namespace BTCPayServer.Client.Models;
 
 public class PaymentMethodCriteriaData
 {
-    public string PaymentMethod { get; set; }
+    public string PaymentMethodId { get; set; }
     public string CurrencyCode { get; set; }
     [JsonConverter(typeof(NumericStringJsonConverter))]
     public decimal Amount { get; set; }

diff --git a/BTCPayServer.Client/Models/PayoutData.cs b/BTCPayServer.Client/Models/PayoutData.cs
@@ -21,7 +21,7 @@ public class PayoutData
         public string Id { get; set; }
         public string PullPaymentId { get; set; }
         public string Destination { get; set; }
-        public string PaymentMethod { get; set; }
+        public string PayoutMethodId { get; set; }
         public string CryptoCode { get; set; }
         [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal Amount { get; set; }

diff --git a/BTCPayServer.Client/Models/RefundInvoiceRequest.cs b/BTCPayServer.Client/Models/RefundInvoiceRequest.cs
@@ -17,7 +17,7 @@ public enum RefundVariant
     public class RefundInvoiceRequest
     {
         public string? Name { get; set; } = null;
-        public string? PaymentMethod { get; set; }
+        public string? PayoutMethodId { get; set; }
         public string? Description { get; set; } = null;
 
         [JsonConverter(typeof(StringEnumConverter))]

diff --git a/BTCPayServer.Data/DBScripts/002.RefactorPayouts.sql b/BTCPayServer.Data/DBScripts/002.RefactorPayouts.sql
@@ -7,6 +7,7 @@ UPDATE "Payouts" SET
     "Currency" = split_part("PayoutMethodId", '_', 1),
     "PayoutMethodId"=
         CASE
+            WHEN ("Blob"->>'Amount')::NUMERIC < 0 THEN 'TOPUP'
             WHEN split_part("PayoutMethodId", '_', 2) = 'LightningLike' THEN split_part("PayoutMethodId", '_', 1) || '-LN'
             ELSE split_part("PayoutMethodId", '_', 1) || '-CHAIN'
         END;

diff --git a/BTCPayServer.Data/Data/PayoutData.cs b/BTCPayServer.Data/Data/PayoutData.cs
@@ -44,7 +44,14 @@ public partial class PayoutData
         public string Blob { get; set; }
         public string Proof { get; set; }
 #nullable enable
-        public string? Destination { get; set; }
+        /// <summary>
+        /// For example, BTC-CHAIN needs to ensure that only a single address is tied to an active payout.
+        /// If `PayoutBlob.Destination` is `bitcoin://1BvBMSeYstWetqTFn5Au4m4GFg7xJaNVN2?amount=0.1`
+        /// Then `DedupId` is `1BvBMSeYstWetqTFn5Au4m4GFg7xJaNVN2`
+        /// For Lightning, Destination could be the lightning address, BOLT11 or LNURL
+        /// But the `DedupId` would be the `PaymentHash`.
+        /// </summary>
+        public string? DedupId { get; set; }
 #nullable restore
         public StoreData StoreData { get; set; }
 
@@ -62,7 +69,7 @@ internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databa
             builder.Entity<PayoutData>()
                 .HasIndex(o => o.State);
             builder.Entity<PayoutData>()
-                .HasIndex(x => new { DestinationId = x.Destination, x.State });
+                .HasIndex(x => new { DestinationId = x.DedupId, x.State });
 
             builder.Entity<PayoutData>()
                 .Property(o => o.Blob)

diff --git a/BTCPayServer.Data/Data/PayoutProcessorData.cs b/BTCPayServer.Data/Data/PayoutProcessorData.cs
@@ -16,7 +16,7 @@ public class PayoutProcessorData : IHasBlobUntyped
     public string Id { get; set; }
     public string StoreId { get; set; }
     public StoreData Store { get; set; }
-    public string PaymentMethod { get; set; }
+    public string PayoutMethodId { get; set; }
     public string Processor { get; set; }
 
     [Obsolete("Use Blob2 instead")]
@@ -36,6 +36,6 @@ internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databa
 
     public override string ToString()
     {
-        return $"{Processor} {PaymentMethod} {StoreId}";
+        return $"{Processor} {PayoutMethodId} {StoreId}";
     }
 }
diff --git a/BTCPayServer.Data/Migrations/20240906010127_renamecol.cs b/BTCPayServer.Data/Migrations/20240906010127_renamecol.cs
@@ -0,0 +1,36 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240906010127_renamecol")]
+    public partial class renamecol : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "Destination",
+                table: "Payouts",
+                newName: "DedupId");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_Payouts_Destination_State",
+                table: "Payouts",
+                newName: "IX_Payouts_DedupId_State");
+            migrationBuilder.RenameColumn(
+             name: "PaymentMethod",
+             table: "PayoutProcessors",
+             newName: "PayoutMethodId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}
diff --git a/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs b/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -565,7 +565,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTimeOffset>("Date")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<string>("Destination")
+                    b.Property<string>("DedupId")
                         .HasColumnType("text");
 
                     b.Property<decimal>("OriginalAmount")
@@ -601,7 +601,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("StoreDataId");
 
-                    b.HasIndex("Destination", "State");
+                    b.HasIndex("DedupId", "State");
 
                     b.ToTable("Payouts");
                 });
@@ -618,7 +618,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("Blob2")
                         .HasColumnType("JSONB");
 
-                    b.Property<string>("PaymentMethod")
+                    b.Property<string>("PayoutMethodId")
                         .HasColumnType("text");
 
                     b.Property<string>("Processor")

diff --git a/BTCPayServer.Tests/DatabaseTests.cs b/BTCPayServer.Tests/DatabaseTests.cs
@@ -59,6 +59,14 @@ public async Task CanMigratePayoutsAndPullPayments()
                     PullPaymentDataId = null as string,
                     PaymentMethodId = "BTC_LightningLike",
                     Blob = "{\"Amount\": \"10.0\", \"Revision\": 0, \"Destination\": \"address\", \"CryptoAmount\": null, \"MinimumConfirmation\": 1}"
+                },
+                new
+                {
+                    Id = "p4",
+                    StoreId = "store1",
+                    PullPaymentDataId = null as string,
+                    PaymentMethodId = "BTC_LightningLike",
+                    Blob = "{\"Amount\": \"-10.0\", \"Revision\": 0, \"Destination\": \"address\", \"CryptoAmount\": null, \"MinimumConfirmation\": 1}"
                 }
             };
             await conn.ExecuteAsync("INSERT INTO \"Payouts\"(\"Id\", \"StoreDataId\", \"PullPaymentDataId\", \"PaymentMethodId\", \"Blob\", \"State\", \"Date\") VALUES (@Id, @StoreId, @PullPaymentDataId, @PaymentMethodId, @Blob::JSONB, 'state', NOW())", parameters);
@@ -75,6 +83,9 @@ public async Task CanMigratePayoutsAndPullPayments()
 
             migrated = await conn.ExecuteScalarAsync<bool>("SELECT 't'::BOOLEAN FROM \"Payouts\" WHERE \"Id\"='p3' AND \"Amount\" IS NULL AND \"OriginalAmount\"=10.0 AND \"OriginalCurrency\"='BTC'");
             Assert.True(migrated);
+
+            migrated = await conn.ExecuteScalarAsync<bool>("SELECT 't'::BOOLEAN FROM \"Payouts\" WHERE \"Id\"='p4' AND \"Amount\" IS NULL AND \"OriginalAmount\"=-10.0 AND \"OriginalCurrency\"='BTC' AND \"PayoutMethodId\"='TOPUP'");
+            Assert.True(migrated);
         }
     }
 }