Revert broken additional payment fix and release as 1.3.2

Author: napoly

BTCPayServer.Plugins.IntegrationTests/Monero/MoneroPluginIntegrationTest.cs

@@ -60,7 +60,7 @@ public async Task ShouldSettleInvoiceAfterPartialThenFullPayment()
         await AssertFullyPaidReceipt(s.Page, "$4.20");
     }
 
-    [Fact]
+    [Fact(Skip = "Skip until proper fix for additional payment is created")]
     public async Task ShouldReuseOriginalAddressForSubsequentPartialPayment()
     {
         await using var s = CreatePlaywrightTester();

Plugins/Monero/BTCPayServer.Plugins.Monero.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Product>Monero</Product>
     <Description>This plugin extends BTCPay Server to enable users to receive payments via Monero.</Description>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 

Plugins/Monero/BTCPayServer.Plugins.Monero.json

@@ -1,7 +1,7 @@
 {
   "Identifier": "BTCPayServer.Plugins.Monero",
   "Name": "Monero",
-  "Version": "1.3.1",
+  "Version": "1.3.2",
   "Description": "This plugin extends BTCPay Server to enable users to receive payments via Monero.",
   "SystemPlugin": false,
   "Dependencies": [

Plugins/Monero/MoneroPlugin.cs

@@ -26,7 +26,7 @@ namespace BTCPayServer.Plugins.Monero;
 
 public class MoneroPlugin : BaseBTCPayServerPlugin
 {
-    public override Version Version => new(1, 3, 1);
+    public override Version Version => new(1, 3, 2);
 
     public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } =
     [

Plugins/Monero/Services/MoneroListener.cs

@@ -210,7 +210,7 @@ private async Task UpdatePaymentStates(string cryptoCode, InvoiceEntity[] invoic
                     }
 
 
-                    return HandlePaymentData(cryptoCode, transfer.Address, transfer.Amount, transfer.SubaddressIndex.AccountIndex,
+                    return HandlePaymentData(cryptoCode, transfer.Amount, transfer.SubaddressIndex.AccountIndex,
                         transfer.SubaddressIndex.Index, transfer.TransactionId, transfer.Confirmations, transfer.Height,
                         transfer.UnlockTime, invoice,
                         updatedPaymentEntities);
@@ -259,7 +259,6 @@ private async Task OnTransactionUpdated(string cryptoCode, string transactionHas
                 var index = destination.First().SubaddressIndex;
 
                 await HandlePaymentData(cryptoCode,
-                    destination.Key,
                     destination.Sum(destination1 => destination1.Amount),
                     index.AccountIndex,
                     index.Index,
@@ -329,7 +328,7 @@ private async Task<GetTransferByTransactionIdResponse> GetTransferByTxId(string
             }
         }
 
-        private async Task HandlePaymentData(string cryptoCode, string address, long totalAmount, uint subaccountIndex,
+        private async Task HandlePaymentData(string cryptoCode, long totalAmount, uint subaccountIndex,
             uint subaddressIndex,
             string txId, int confirmations, ulong blockHeight, int locktime, InvoiceEntity invoice,
             List<(PaymentEntity Payment, InvoiceEntity invoice)> paymentsToUpdate)
@@ -349,15 +348,6 @@ private async Task HandlePaymentData(string cryptoCode, string address, long tot
                 InvoiceSettledConfirmationThreshold = promptDetails.InvoiceSettledConfirmationThreshold
             };
 
-            // set destination address from transfer
-            var prompts = invoice.GetPaymentPrompts();
-            var prompt = prompts[pmi];
-            if (prompt != null)
-            {
-                prompt.Destination = address;
-                invoice.SetPaymentPrompts(prompts);
-            }
-
             var status = GetStatus(details, invoice.SpeedPolicy) ? PaymentStatus.Settled : PaymentStatus.Processing;
             var paymentData = new PaymentData
             {