[GEN-1599] Withdrawals to support the new Database model (single output backwards-compatible)

NodeGuard.code-workspace

@@ -0,0 +1,13 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "src"
+		}
+	],
+	"settings": {
+		"editor.formatOnSave": false
+	}
+}

src/Data/DbInitializer.cs

@@ -79,7 +79,7 @@ public static void Initialize(IServiceProvider serviceProvider)
                 }
                 catch (Exception e)
                 {
-                    logger.LogError(e, "Error while migrating");
+                    throw new Exception("Error while migrating the database", e);
                 }
 
                 Thread.Sleep(1_000);

src/Data/Models/WalletWithdrawalRequest.cs

@@ -73,12 +73,6 @@
     {
         public WalletWithdrawalRequestStatus Status { get; set; }
 
-        [Obsolete("This is not used anymore, use the WalletWithdrawalRequestDestinations instead")]
-        /// <summary>
-        /// base58 address of the output of the request, its mutually exclusive with the WalletWithdrawalRequestDestinations
-        /// </summary>
-        public string DestinationAddress { get; set; }
-
         /// <summary>
         /// Description by the requestor
         /// </summary>
@@ -91,28 +85,12 @@
 
         public string? RejectCancelDescription { get; set; }
 
-        [Obsolete("This is not used anymore, use the WalletWithdrawalRequestDestinations instead")]
-        /// <summary>
-        /// TX amount in BTC, its mutually exclusive with the WalletWithdrawalRequestDestinations
-        /// </summary>
-        ///
-        public decimal Amount { get; set; }
-
         /// <summary>
         /// Checks if all the threshold signatures are collected, including the internal wallet key (even if not signed yet)
         /// </summary>
         [NotMapped]
         public bool AreAllRequiredHumanSignaturesCollected => CheckSignatures();
 
-        [NotMapped]
-        /// <summary>
-        /// This indicates if the request is a legacy request, meaning that it has no destinations and only a single address and amount
-        /// </summary>
-#pragma warning disable CS0618 // Type or member is obsolete
-        public bool IsLegacy => Amount > 0 && string.IsNullOrEmpty(DestinationAddress) &&
-                                (WalletWithdrawalRequestDestinations == null || WalletWithdrawalRequestDestinations?.Count == 0);
-#pragma warning restore CS0618 // Type or member is obsolete
-
         [NotMapped]
         public int NumberOfSignaturesCollected =>
     WalletWithdrawalRequestPSBTs == null
@@ -193,7 +171,11 @@
         }
 
         [NotMapped]
-        public long SatsAmount => new Money(Amount, MoneyUnit.BTC).Satoshi;
+        public decimal TotalAmount =>
+            WalletWithdrawalRequestDestinations?.Sum(x => x.Amount) ?? 0m;
+
+        [NotMapped]
+        public long SatsAmount => new Money(WalletWithdrawalRequestDestinations?.Sum(x => x.Amount) ?? 0m, MoneyUnit.BTC).Satoshi;
 
         #region Relationships
 
@@ -205,7 +187,7 @@
         public ApplicationUser UserRequestor { get; set; }
         public int WalletId { get; set; }
 
         public Wallet Wallet { get; set; }
 
         public List<WalletWithdrawalRequestPSBT> WalletWithdrawalRequestPSBTs { get; set; }
 

src/Data/Repositories/WalletWithdrawalRequestRepository.cs

@@ -64,6 +64,7 @@ INBXplorerService nBXplorerService
                 .ThenInclude(x => x.Keys)
                 .Include(x => x.UserRequestor)
                 .Include(x => x.WalletWithdrawalRequestPSBTs)
+                .Include(x => x.WalletWithdrawalRequestDestinations)
                 .SingleOrDefaultAsync(x => x.Id == id);
 
             return request;
@@ -92,6 +93,7 @@ public async Task<List<WalletWithdrawalRequest>> GetAll()
                 .Include(x => x.Wallet).ThenInclude(x => x.Keys)
                 .Include(x => x.UserRequestor)
                 .Include(x => x.WalletWithdrawalRequestPSBTs)
+                .Include(x => x.WalletWithdrawalRequestDestinations)
                 .AsSplitQuery()
                 .ToListAsync();
         }
@@ -104,6 +106,7 @@ public async Task<List<WalletWithdrawalRequest>> GetUnsignedPendingRequestsByUse
                 .Include(x => x.Wallet).ThenInclude(x => x.Keys)
                 .Include(x => x.UserRequestor)
                 .Include(x => x.WalletWithdrawalRequestPSBTs)
+                .Include(x => x.WalletWithdrawalRequestDestinations)
                 .Where(request => request.Wallet != null
                                 && request.Wallet.Keys.Count(key => userId == key.UserId) > request.WalletWithdrawalRequestPSBTs.Count(req => req.SignerId == userId)
                                 && (request.Status == WalletWithdrawalRequestStatus.Pending || request.Status == WalletWithdrawalRequestStatus.PSBTSignaturesPending))
@@ -119,6 +122,7 @@ public async Task<List<WalletWithdrawalRequest>> GetAllUnsignedPendingRequests()
                 .Include(x => x.Wallet).ThenInclude(x => x.Keys)
                 .Include(x => x.UserRequestor)
                 .Include(x => x.WalletWithdrawalRequestPSBTs)
+                .Include(x => x.WalletWithdrawalRequestDestinations)
                 .Where(request => request.Status == WalletWithdrawalRequestStatus.Pending || request.Status == WalletWithdrawalRequestStatus.PSBTSignaturesPending)
                 .AsSplitQuery()
                 .ToListAsync();
@@ -155,7 +159,7 @@ public async Task<List<WalletWithdrawalRequest>> GetAllUnsignedPendingRequests()
                 return (false, "Balance could not be retrieved from the wallet.");
             }
 
-            var requestMoneyAmount = new Money(type.Amount, MoneyUnit.BTC);
+            var requestMoneyAmount = new Money(type.TotalAmount, MoneyUnit.BTC);
 
             if ((Money)balance.Confirmed < requestMoneyAmount)
             {
@@ -272,6 +276,7 @@ public async Task<List<WalletWithdrawalRequest>> GetPendingRequests()
                                   || request.Status == WalletWithdrawalRequestStatus.Pending
                                   || request.Status == WalletWithdrawalRequestStatus.PSBTSignaturesPending)
                 .Include(request => request.Wallet)
+                .Include(x => x.WalletWithdrawalRequestDestinations)
                 .ToListAsync();
 
             return walletWithdrawalRequests;
@@ -284,6 +289,7 @@ public async Task<List<WalletWithdrawalRequest>> GetOnChainPendingWithdrawals()
             var walletWithdrawalRequests = await applicationDbContext.WalletWithdrawalRequests
                 .Where(request => request.Status == WalletWithdrawalRequestStatus.OnChainConfirmationPending)
                 .Include(request => request.Wallet)
+                .Include(x => x.WalletWithdrawalRequestDestinations)
                 .ToListAsync();
 
             return walletWithdrawalRequests;