update ww

This commit is contained in:
Kukks
2023-06-01 10:47:34 +02:00
parent 134e229888
commit 3823f9461c
6 changed files with 7 additions and 7 deletions

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -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);

View File

@@ -260,7 +260,7 @@
@coin.Amount.ToDecimal(MoneyUnit.BTC) BTC
</td>
<td>
@coin.HdPubKey.Label.ToString()
@coin.HdPubKey.Labels.ToString()
</td>
</tr>
}