From 3823f9461c9e120dad4af4a2624d5a46a6e1bb4d Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Thu, 1 Jun 2023 10:47:34 +0200
Subject: [PATCH] update ww

---
 .../BTCPayCoinjoinCoinSelector.cs                             | 2 +-
 Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayWallet.cs         | 2 +-
 Plugins/BTCPayServer.Plugins.Wabisabi/Smartifier.cs           | 4 ++--
 .../Views/Shared/Wabisabi/WabisabiDashboard.cshtml            | 2 +-
 submodules/btcpayserver                                       | 2 +-
 submodules/walletwasabi                                       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayCoinjoinCoinSelector.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayCoinjoinCoinSelector.cs
index fd2de65..30147d0 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayCoinjoinCoinSelector.cs
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayCoinjoinCoinSelector.cs
@@ -51,7 +51,7 @@ public class BTCPayCoinjoinCoinSelector : IRoundCoinSelector
                     {
                         return true;
                     }
-                    if (!coin.HdPubKey.Label.Contains("coinjoin") || coin.HdPubKey.Label.Contains(utxoSelectionParameters.CoordinatorName))
+                    if (!coin.HdPubKey.Labels.Contains("coinjoin") || coin.HdPubKey.Labels.Contains(utxoSelectionParameters.CoordinatorName))
                     {
                         return true;
                     }
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayWallet.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayWallet.cs
index 8de7392..4387826 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayWallet.cs
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayWallet.cs
@@ -406,7 +406,7 @@ public class BTCPayWallet : IWallet, IDestinationProvider
                     var derivation = DerivationScheme.GetChild(si.Item2.Result.KeyPath).GetExtPubKeys().First()
                         .PubKey;
                     var hdPubKey = new HdPubKey(derivation, kp.Derive(si.Item2.Result.KeyPath).KeyPath,
-                        SmartLabel.Empty,
+                        LabelsArray.Empty, 
                         KeyState.Used);
                     
                     var coin = new SmartCoin(smartTx, si.txout.N, hdPubKey);
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/Smartifier.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/Smartifier.cs
index bf59579..88192d7 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/Smartifier.cs
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/Smartifier.cs
@@ -155,7 +155,7 @@ public class Smartifier
                 //if there is no account key path, it most likely means this is a watch only wallet. Fake the key path
                 var kp = _accountKeyPath?.Derive(coin.KeyPath).KeyPath ?? new KeyPath(0,0,0,0,0);
 
-                var hdPubKey = new HdPubKey(pubKey, kp, new SmartLabel(labels.labels ?? new HashSet<string>()),
+                var hdPubKey = new HdPubKey(pubKey, kp, new LabelsArray(labels.labels ?? new HashSet<string>()),
                     current == 1 ? KeyState.Clean : KeyState.Used);
 
                 hdPubKey.SetAnonymitySet(labels.anonset);
@@ -165,7 +165,7 @@ public class Smartifier
             });
             
             utxoLabels.TryGetValue(coin.OutPoint, out var labels);
-            smartCoin.HdPubKey.SetLabel(new SmartLabel(labels.labels ?? new HashSet<string>()));
+            smartCoin.HdPubKey.SetLabel(new LabelsArray(labels.labels ?? new HashSet<string>()));
             smartCoin.HdPubKey.SetKeyState(current == 1 ? KeyState.Clean : KeyState.Used);
             smartCoin.HdPubKey.SetAnonymitySet(labels.anonset);
             tx.TryAddWalletOutput(smartCoin);
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/WabisabiDashboard.cshtml b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/WabisabiDashboard.cshtml
index 7ac8415..2aad7ea 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/WabisabiDashboard.cshtml
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/WabisabiDashboard.cshtml
@@ -260,7 +260,7 @@
                                             @coin.Amount.ToDecimal(MoneyUnit.BTC) BTC
                                         </td>
                                         <td>
-                                            @coin.HdPubKey.Label.ToString()
+                                            @coin.HdPubKey.Labels.ToString()
                                         </td>
                                     </tr>
                                 }
diff --git a/submodules/btcpayserver b/submodules/btcpayserver
index eb3f0db..9ce1e3b 160000
--- a/submodules/btcpayserver
+++ b/submodules/btcpayserver
@@ -1 +1 @@
-Subproject commit eb3f0dbf93fa3bd120a153ce7941994482f3ad34
+Subproject commit 9ce1e3bb08b3e272de2384363e71e2b77cd3a503
diff --git a/submodules/walletwasabi b/submodules/walletwasabi
index 6c941b8..fbf1b4b 160000
--- a/submodules/walletwasabi
+++ b/submodules/walletwasabi
@@ -1 +1 @@
-Subproject commit 6c941b8b18e5a58ddcf2138b719223f4a328021f
+Subproject commit fbf1b4b7298dab15eaaaea143c41ed7505ff824b