Keep IsUnderPlebStop
MODIFY
WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
@@ -53,7 +53,7 @@ public class CoinJoinManager : BackgroundService
public async Task StartAsync(IWallet wallet, bool stopWhenAllMixed, bool overridePlebStop, CancellationToken cancellationToken)
{
- if (overridePlebStop && !wallet.CoinjoinEnabled)
+ if (overridePlebStop && wallet.IsUnderPlebStop)
{
// Turn off overriding if we went above the threshold meanwhile.
overridePlebStop = false;
@@ -163,7 +163,7 @@ public class CoinJoinManager : BackgroundService
return;
}
- if (!walletToStart.CoinjoinEnabled && !startCommand.OverridePlebStop)
+ if (walletToStart.IsUnderPlebStop && !startCommand.OverridePlebStop)
{
walletToStart.LogDebug("PlebStop preventing coinjoin.");
ScheduleRestartAutomatically(walletToStart, trackedAutoStarts, startCommand.StopWhenAllMixed, startCommand.OverridePlebStop, stoppingToken);

MODIFY
WalletWasabi/Wallets/IWallet.cs
WalletWasabi/Wallets/IWallet.cs
@@ -10,7 +10,7 @@ namespace WalletWasabi.Wallets;
public interface IWallet
{
string Identifier { get; }
- bool CoinjoinEnabled { get; }
+ bool IsUnderPlebStop { get; }
bool IsMixable { get; }
IKeyChain KeyChain { get; }
IDestinationProvider DestinationProvider { get; }

MODIFY
WalletWasabi/Wallets/Wallet.cs
WalletWasabi/Wallets/Wallet.cs
@@ -89,6 +89,7 @@ public class Wallet : BackgroundService, IWallet
public bool IsWalletPrivate() => GetPrivacyPercentage(new CoinsView(Coins), KeyManager.AnonScoreTarget) >= 1;
public Task<IEnumerable<SmartCoin>> GetCoinjoinCoinCandidatesAsync(int bestHeight) => Task.FromResult(GetCoinjoinCoinCandidates(bestHeight));
+
public Task<IEnumerable<SmartTransaction>> GetTransactionsAsync()
{
return Task.FromResult(TransactionProcessor.TransactionStore.GetTransactions());
@@ -497,7 +498,6 @@ public class Wallet : BackgroundService, IWallet
}
public string Identifier => WalletName;
- public bool CoinjoinEnabled => !IsUnderPlebStop;
public bool IsMixable =>
State == WalletState.Started // Only running wallets

Keep IsUnderPlebStop