mirror of
https://github.com/aljazceru/BTCPayServerPlugins.git
synced 2026-02-22 16:15:07 +01:00
update ww
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -260,7 +260,7 @@
|
||||
@coin.Amount.ToDecimal(MoneyUnit.BTC) BTC
|
||||
</td>
|
||||
<td>
|
||||
@coin.HdPubKey.Label.ToString()
|
||||
@coin.HdPubKey.Labels.ToString()
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
|
||||
Submodule submodules/btcpayserver updated: eb3f0dbf93...9ce1e3bb08
Submodule submodules/walletwasabi updated: 6c941b8b18...fbf1b4b729
Reference in New Issue
Block a user