feat: addition of the tag manually_frozen

Elenpay · Aug 29, 2024 · c05b9ae · c05b9ae
1 parent b63d8cf
commit c05b9ae
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 9 deletions.
diff --git a/src/Helpers/Constants.cs b/src/Helpers/Constants.cs
@@ -87,6 +87,7 @@ public class Constants
     public static decimal MAX_TX_FEE_RATIO = 0.5m;
 
     public const string IsFrozenTag = "frozen";
+    public const string IsManuallyFrozenTag = "manually_frozen";
 
     //  Constants for the NBXplorer API
     public static int SCAN_GAP_LIMIT = 1000;

diff --git a/src/Pages/Wallets.razor b/src/Pages/Wallets.razor
@@ -1154,8 +1154,16 @@
             .Select((u) => (
                 u.Outpoint,
                 u,
-                tagsMap[u.Outpoint].Where(t => t.Key != Constants.IsFrozenTag).ToList(),
-                tagsMap[u.Outpoint].Any(t => t.Key == Constants.IsFrozenTag && t.Value == "true")
+                tagsMap[u.Outpoint]
+                    .Where(t => t.Key != Constants.IsFrozenTag && t.Key != Constants.IsManuallyFrozenTag)
+                    .ToList(),
+                // Check if the UTXO is frozen, has been manually frozen or has been manually unfrozen
+                (tagsMap[u.Outpoint]
+                     .Any(t => t.Key == Constants.IsFrozenTag && t.Value == "true") ||
+                 tagsMap[u.Outpoint]
+                     .Any(t => t.Key == Constants.IsManuallyFrozenTag && t.Value == "true")) &&
+                !tagsMap[u.Outpoint]
+                    .Any(t => t.Key == Constants.IsManuallyFrozenTag && t.Value == "false")
             )).ToList();
 
         _detailsTransactions = await NBXplorerService.GetTransactionsAsync(derivationStrategyBase);
@@ -1703,8 +1711,8 @@
 
     private async Task ToggleUtxoFreeze(bool newValue, UTXO utxo)
     {
-        var tag = await UTXOTagRepository.GetByKeyAndOutpoint(Constants.IsFrozenTag, utxo.Outpoint.ToString());
-        var (saved, _) = UTXOTagRepository.Update(new UTXOTag {Key = Constants.IsFrozenTag, Value = newValue ? "true" : "false", Outpoint = utxo.Outpoint.ToString(), Id = tag?.Id ?? 0 });
+        var tag = await UTXOTagRepository.GetByKeyAndOutpoint(Constants.IsManuallyFrozenTag, utxo.Outpoint.ToString());
+        var (saved, _) = UTXOTagRepository.Update(new UTXOTag {Key = Constants.IsManuallyFrozenTag, Value = newValue ? "true" : "false", Outpoint = utxo.Outpoint.ToString(), Id = tag?.Id ?? 0 });
         if (!saved)
         {
             ToastService.ShowError("Error while updating the UTXO status");

diff --git a/src/Rpc/NodeGuardService.cs b/src/Rpc/NodeGuardService.cs
@@ -951,11 +951,9 @@ public override async Task<GetUtxosResponse> GetAvailableUtxos(GetAvailableUtxos
         }
 
         var lockedUtxos = await _fmutxoRepository.GetLockedUTXOs();
-        var frozenUtxos = await _utxoTagRepository.GetByKeyValue(Constants.IsFrozenTag, "true");
-
         var ignoreOutpoints = new List<string>();
         var listLocked = lockedUtxos.Select(utxo => $"{utxo.TxId}-{utxo.OutputIndex}").ToList();
-        var listFrozen = frozenUtxos.Select(utxo => utxo.Outpoint).ToList();
+        var listFrozen = await _coinSelectionService.GetFrozenUTXOs();
         ignoreOutpoints.AddRange(listLocked);
         ignoreOutpoints.AddRange(listFrozen);
 

diff --git a/src/Services/CoinSelectionService.cs b/src/Services/CoinSelectionService.cs
@@ -67,6 +67,11 @@ public interface ICoinSelectionService
     /// <param name="bitcoinRequest"></param>
     /// <param name="requestType"></param>
     public Task<List<UTXO>> GetLockedUTXOsForRequest(IBitcoinRequest bitcoinRequest, BitcoinRequestType requestType);
+
+    /// <summary>
+    /// Gets the frozen UTXOs
+    /// </summary>
+    public Task<List<string>> GetFrozenUTXOs();
 
     public Task<(List<ICoin> coins, List<UTXO> selectedUTXOs)> GetTxInputCoins(
         List<UTXO> availableUTXOs,
@@ -146,9 +151,8 @@ public async Task<List<UTXO>> GetLockedUTXOsForRequest(IBitcoinRequest bitcoinRe
     private async Task<List<UTXO>> FilterLockedFrozenUTXOs(UTXOChanges? utxoChanges)
     {
         var lockedUTXOs = await _fmutxoRepository.GetLockedUTXOs();
-        var frozenUTXOs = await _utxoTagRepository.GetByKeyValue(Constants.IsFrozenTag, "true");
         var listLocked = lockedUTXOs.Select(utxo => $"{utxo.TxId}-{utxo.OutputIndex}").ToList(); 
-        var listFrozen = frozenUTXOs.Select(utxo => utxo.Outpoint).ToList();
+        var listFrozen = await GetFrozenUTXOs();
         var frozenAndLockedOutpoints = new List<string>();
         frozenAndLockedOutpoints.AddRange(listLocked);
         frozenAndLockedOutpoints.AddRange(listFrozen);
@@ -171,6 +175,25 @@ private async Task<List<UTXO>> FilterLockedFrozenUTXOs(UTXOChanges? utxoChanges)
 
         return availableUTXOs;
     }
+
+    public async Task<List<string>> GetFrozenUTXOs()
+    {
+        var frozenUTXOs = await _utxoTagRepository.GetByKeyValue(Constants.IsFrozenTag, "true");
+        var manuallyFrozenUTXOs = await _utxoTagRepository.GetByKeyValue(Constants.IsManuallyFrozenTag, "true");
+        var manuallyUnfrozenUTXOs = await _utxoTagRepository.GetByKeyValue(Constants.IsManuallyFrozenTag, "false");
+        var listFrozen = frozenUTXOs.Select(utxo => utxo.Outpoint).ToList();
+        var listManuallyFrozen = manuallyFrozenUTXOs.Select(utxo => utxo.Outpoint).ToList();
+        var listManuallyUnfrozen = manuallyUnfrozenUTXOs.Select(utxo => utxo.Outpoint).ToList();
+
+        // Merge manually frozen and frozen UTXOs and remove manually unfrozen UTXOs
+        List<string> frozenUTXOsList =
+            listFrozen
+            .Union(listManuallyFrozen)
+            .Except(listManuallyUnfrozen)
+            .ToList();
+
+        return frozenUTXOsList;
+    }
 
     public async Task<List<UTXO>> GetAvailableUTXOsAsync(DerivationStrategyBase derivationStrategy)
     {