Set consolidation mode if mixing to another wallet

WalletWasabi · May 7, 2024 · 743c0e0 · 743c0e0
1 parent 375b3e3
commit 743c0e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/WalletWasabi.Daemon/Rpc/WasabiJsonRpcService.cs b/WalletWasabi.Daemon/Rpc/WasabiJsonRpcService.cs
@@ -495,8 +495,6 @@ public void StartCoinjoinSweeping(string? password = null, string? outputWalletN
 
 	private async Task StartCoinjoinSweepAsync(Wallet activeWallet, Wallet outputWallet)
 	{
-		activeWallet.ConsolidationMode = true;
-
 		// If output wallet isn't initialized, then load it.
 		if (outputWallet.State == WalletState.Uninitialized)
 		{

diff --git a/WalletWasabi/WabiSabi/Client/CoinJoin/Manager/CoinJoinTrackerFactory.cs b/WalletWasabi/WabiSabi/Client/CoinJoin/Manager/CoinJoinTrackerFactory.cs
@@ -39,6 +39,9 @@ public async Task<CoinJoinTracker> CreateAndStartAsync(IWallet wallet, IWallet?
 			throw new NotSupportedException("Wallet has no key chain.");
 		}
 
+		// The only use-case when we set consolidation mode to true, when we are mixing to another wallet.
+		wallet.ConsolidationMode = outputWallet is not null && outputWallet.WalletId != wallet.WalletId;
+
 		var coinSelector = CoinJoinCoinSelector.FromWallet(wallet);
 		var coinJoinClient = new CoinJoinClient(
 			HttpClientFactory,

diff --git a/WalletWasabi/Wallets/IWallet.cs b/WalletWasabi/Wallets/IWallet.cs
@@ -25,7 +25,7 @@ public interface IWallet
 	PaymentBatch BatchedPayments => new();
 
 	int AnonScoreTarget { get; }
-	bool ConsolidationMode { get; }
+	bool ConsolidationMode { get; set; }
 	TimeSpan FeeRateMedianTimeFrame { get; }
 	bool RedCoinIsolation { get; }
 	CoinjoinSkipFactors CoinjoinSkipFactors { get; }