Merge pull request #12671 from molnard/movecj

Organize (move) client side CJ related code
WalletWasabi · Mar 15, 2024 · 0494c26 · 0494c26
2 parents f2b25ec + 2a71c8d
commit 0494c26
Show file tree

Hide file tree

Showing 60 changed files with 50 additions and 32 deletions.
diff --git a/WalletWasabi.Daemon/Rpc/WasabiJsonRpcService.cs b/WalletWasabi.Daemon/Rpc/WasabiJsonRpcService.cs
@@ -19,6 +19,7 @@
 using WalletWasabi.Services;
 using WalletWasabi.WabiSabi.Client;
 using WalletWasabi.WabiSabi.Client.Batching;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using WalletWasabi.Wallets;
 using JsonRpcResult = System.Collections.Generic.Dictionary<string, object?>;
 using JsonRpcResultList = System.Collections.Immutable.ImmutableArray<System.Collections.Generic.Dictionary<string, object?>>;

diff --git a/WalletWasabi.Fluent/Models/Wallets/CoinjoinModel.cs b/WalletWasabi.Fluent/Models/Wallets/CoinjoinModel.cs
@@ -1,11 +1,12 @@
 using ReactiveUI;
 using System.Threading.Tasks;
 using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 namespace WalletWasabi.Fluent.Models.Wallets;
 
 [AutoInterface]
-public partial class CoinjoinModel: ReactiveObject
+public partial class CoinjoinModel : ReactiveObject
 {
 	private CoinJoinManager? _coinJoinManager;
 

diff --git a/WalletWasabi.Tests/Helpers/WabiSabiFactory.cs b/WalletWasabi.Tests/Helpers/WabiSabiFactory.cs
@@ -31,6 +31,7 @@
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 using WalletWasabi.Wallets;
 using WalletWasabi.WebClients.Wasabi;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 namespace WalletWasabi.Tests.Helpers;
 

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/AliceTimeoutTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/AliceTimeoutTests.cs
@@ -5,6 +5,7 @@
 using WalletWasabi.WabiSabi.Backend.Models;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using WalletWasabi.WabiSabi.Client.RoundStateAwaiters;
 using WalletWasabi.WabiSabi.Models;
 using WalletWasabi.Wallets;

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PhaseStepping/StepOutputRegistrationTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PhaseStepping/StepOutputRegistrationTests.cs
@@ -10,6 +10,7 @@
 using WalletWasabi.WabiSabi.Backend.Models;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using WalletWasabi.WabiSabi.Client.RoundStateAwaiters;
 using WalletWasabi.WabiSabi.Models;
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PhaseStepping/StepTransactionSigningTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PhaseStepping/StepTransactionSigningTests.cs
@@ -12,6 +12,7 @@
 using WalletWasabi.WabiSabi.Backend.DoSPrevention;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using WalletWasabi.WabiSabi.Client.RoundStateAwaiters;
 using WalletWasabi.WabiSabi.Models;
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterInputSuccessTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterInputSuccessTests.cs
@@ -9,9 +9,9 @@
 using WalletWasabi.WabiSabi.Backend.Models;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Backend.Rounds.CoinJoinStorage;
-using WalletWasabi.WabiSabi.Client;
 using WalletWasabi.WabiSabi.Models;
 using Xunit;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Backend.PostRequests;
 

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/AmountDecomposerTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/AmountDecomposerTests.cs
@@ -6,7 +6,7 @@
 using WalletWasabi.Helpers;
 using WalletWasabi.Tests.Helpers;
 using WalletWasabi.WabiSabi;
-using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client.Decomposer;
 using WalletWasabi.WabiSabi.Models;
 using Xunit;
 

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/ArenaClientTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/ArenaClientTests.cs
@@ -28,6 +28,7 @@
 using Xunit;
 using WalletWasabi.WabiSabi.Backend.Rounds.CoinJoinStorage;
 using WalletWasabi.BitcoinCore.Mempool;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Client;
 

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/BobClientTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/BobClientTests.cs
@@ -20,6 +20,7 @@
 using WalletWasabi.WabiSabi.Backend.Rounds.CoinJoinStorage;
 using WalletWasabi.WabiSabi.Backend.Statistics;
 using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using WalletWasabi.WabiSabi.Client.RoundStateAwaiters;
 using WalletWasabi.WabiSabi.Models;
 using WalletWasabi.Wallets;

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/CoinJoinClientTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/CoinJoinClientTests.cs
@@ -5,6 +5,8 @@
 using NBitcoin;
 using WalletWasabi.Tests.Helpers;
 using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client.Decomposer;
 using WalletWasabi.Wallets;
 using Xunit;
 

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/CoinJoinCoinSelectionTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/CoinJoinCoinSelectionTests.cs
@@ -9,6 +9,7 @@
 using WalletWasabi.Tests.Helpers;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using Xunit;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Client;

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/IsRoundEconomicTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/IsRoundEconomicTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using NBitcoin;
 using WalletWasabi.Helpers;
-using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using Xunit;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Client;

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/WabiSabiApiApplicationFactory.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/WabiSabiApiApplicationFactory.cs
@@ -26,6 +26,7 @@
 using WalletWasabi.WabiSabi.Models;
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 using WalletWasabi.BitcoinCore.Mempool;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Integration;
 

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/WabiSabiHttpApiIntegrationTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/WabiSabiHttpApiIntegrationTests.cs
@@ -25,6 +25,7 @@
 using Xunit;
 using Xunit.Abstractions;
 using WalletWasabi.Blockchain.TransactionOutputs;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Integration;
 

diff --git a/WalletWasabi/Services/SleepInhibitor.cs b/WalletWasabi/Services/SleepInhibitor.cs
@@ -6,6 +6,7 @@
 using WalletWasabi.Helpers.PowerSaving;
 using WalletWasabi.Logging;
 using WalletWasabi.WabiSabi.Client;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using static WalletWasabi.Helpers.PowerSaving.LinuxInhibitorTask;
 
 namespace WalletWasabi.Services;

diff --git a/WalletWasabi/WabiSabi/Client/AliceClient.cs → ...abi/Client/CoinJoin/Client/AliceClient.cs b/WalletWasabi/WabiSabi/Client/AliceClient.cs → ...abi/Client/CoinJoin/Client/AliceClient.cs
@@ -15,7 +15,7 @@
 using WabiSabi.Crypto.ZeroKnowledge;
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 public class AliceClient
 {

diff --git a/WalletWasabi/WabiSabi/Client/ArenaClient.cs → ...abi/Client/CoinJoin/Client/ArenaClient.cs b/WalletWasabi/WabiSabi/Client/ArenaClient.cs → ...abi/Client/CoinJoin/Client/ArenaClient.cs
@@ -12,7 +12,7 @@
 using WalletWasabi.WabiSabi.Models;
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 public class ArenaClient
 {

diff --git a/...etWasabi/WabiSabi/Client/ArenaResponse.cs → ...i/Client/CoinJoin/Client/ArenaResponse.cs b/...etWasabi/WabiSabi/Client/ArenaResponse.cs → ...i/Client/CoinJoin/Client/ArenaResponse.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using WabiSabi.Crypto.ZeroKnowledge;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 public class ArenaResponse
 {

diff --git a/WalletWasabi/WabiSabi/Client/BobClient.cs → ...iSabi/Client/CoinJoin/Client/BobClient.cs b/WalletWasabi/WabiSabi/Client/BobClient.cs → ...iSabi/Client/CoinJoin/Client/BobClient.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using WabiSabi.Crypto.ZeroKnowledge;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 public class BobClient
 {

diff --git a/...tWasabi/WabiSabi/Client/CoinJoinClient.cs → .../Client/CoinJoin/Client/CoinJoinClient.cs b/...tWasabi/WabiSabi/Client/CoinJoinClient.cs → .../Client/CoinJoin/Client/CoinJoinClient.cs
@@ -22,7 +22,7 @@
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 using WalletWasabi.WebClients.Wasabi;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 public class CoinJoinClient
 {
@@ -617,8 +617,7 @@ internal static bool SanityCheck(IEnumerable<TxOut> expectedOutputs, IEnumerable
 		var maximumSigningRequestDelay = TimeSpan.FromSeconds(50);
 		var scheduledDates = signingEndTime.GetScheduledDates(aliceClients.Count(), signingStartTime, maximumSigningRequestDelay);
 
-		var tasks = Enumerable.Zip(
-			aliceClients,
+		var tasks = aliceClients.Zip(
 			scheduledDates,
 			async (aliceClient, scheduledDate) =>
 			{
@@ -648,8 +647,7 @@ private async Task ReadyToSignAsync(IEnumerable<AliceClient> aliceClients, DateT
 	{
 		var scheduledDates = readyToSignEndTime.GetScheduledDates(aliceClients.Count(), DateTimeOffset.UtcNow, MaximumRequestDelay);
 
-		var tasks = Enumerable.Zip(
-			aliceClients,
+		var tasks = aliceClients.Zip(
 			scheduledDates,
 			async (aliceClient, scheduledDate) =>
 			{
@@ -741,7 +739,7 @@ private async Task<IEnumerable<TxOut>> ProceedWithOutputRegistrationPhaseAsync(u
 
 		// Splitting the remaining time.
 		// Both operations are done under output registration phase, so we have to do the random timing taking that into account.
-		var outputRegistrationEndTime = now + (remainingTime * 0.8); // 80% of the time.
+		var outputRegistrationEndTime = now + remainingTime * 0.8; // 80% of the time.
 		var readyToSignEndTime = outputRegistrationEndTime + remainingTime * 0.2; // 20% of the time.
 
 		CoinJoinClientProgress.SafeInvoke(this, new EnteringOutputRegistrationPhase(roundState, outputRegistrationPhaseEndTime));
@@ -842,7 +840,7 @@ private async Task<IEnumerable<TxOut>> ProceedWithOutputRegistrationPhaseAsync(u
 	private async Task<ImmutableArray<(AliceClient, PersonCircuit)>> ProceedWithInputRegAndConfirmAsync(IEnumerable<SmartCoin> smartCoins, RoundState roundState, CancellationToken cancellationToken)
 	{
 		// Because of the nature of the protocol, the input registration and the connection confirmation phases are done subsequently thus they have a merged timeout.
-		var timeUntilOutputReg = (roundState.InputRegistrationEnd - DateTimeOffset.UtcNow) + roundState.CoinjoinState.Parameters.ConnectionConfirmationTimeout;
+		var timeUntilOutputReg = roundState.InputRegistrationEnd - DateTimeOffset.UtcNow + roundState.CoinjoinState.Parameters.ConnectionConfirmationTimeout;
 
 		using CancellationTokenSource timeUntilOutputRegCts = new(timeUntilOutputReg + ExtraPhaseTimeoutMargin);
 		using CancellationTokenSource linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeUntilOutputRegCts.Token);

diff --git a/...abi/Exceptions/CoinJoinClientException.cs → ...oinJoin/Client/CoinJoinClientException.cs b/...abi/Exceptions/CoinJoinClientException.cs → ...oinJoin/Client/CoinJoinClientException.cs
@@ -1,6 +1,6 @@
 using WalletWasabi.WabiSabi.Client.StatusChangedEvents;
 
-namespace WalletWasabi.Exceptions;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 public class CoinJoinClientException : Exception
 {

diff --git a/...bi/WabiSabi/Client/CoinJoinClientState.cs → ...nt/CoinJoin/Client/CoinJoinClientState.cs b/...bi/WabiSabi/Client/CoinJoinClientState.cs → ...nt/CoinJoin/Client/CoinJoinClientState.cs
@@ -1,4 +1,4 @@
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 public enum CoinJoinClientState
 {

diff --git a/...i/WabiSabi/Client/CoinJoinCoinSelector.cs → ...t/CoinJoin/Client/CoinJoinCoinSelector.cs b/...i/WabiSabi/Client/CoinJoinCoinSelector.cs → ...t/CoinJoin/Client/CoinJoinCoinSelector.cs
@@ -12,7 +12,7 @@
 using WalletWasabi.Wallets;
 using SecureRandom = WabiSabi.Crypto.Randomness.SecureRandom;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 public class CoinJoinCoinSelector
 {
@@ -292,7 +292,7 @@ public ImmutableList<TCoin> SelectCoinsForRound<TCoin>(IEnumerable<TCoin> coins,
 		double winnerAnonLoss = GetAnonLoss(winner);
 
 		// Only stay in the while if we are above the liquidityClue (we are a whale) AND the weightedAnonLoss is not tolerable.
-		while ((winner.Sum(x => x.Amount) > liquidityClue) && (winnerAnonLoss > MaxWeightedAnonLoss))
+		while (winner.Sum(x => x.Amount) > liquidityClue && winnerAnonLoss > MaxWeightedAnonLoss)
 		{
 			List<TCoin> bestReducedWinner = winner;
 			var bestAnonLoss = winnerAnonLoss;

diff --git a/...oinJoinCoinSelectorRandomnessGenerator.cs → ...oinJoinCoinSelectorRandomnessGenerator.cs b/...oinJoinCoinSelectorRandomnessGenerator.cs → ...oinJoinCoinSelectorRandomnessGenerator.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using WabiSabi.Crypto.Randomness;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 /// <summary>
 /// Generator of randomness for <see cref="CoinJoinCoinSelector"/>.

diff --git a/...ient/CoinJoinProgressEvents/CoinBanned.cs → ...ient/CoinJoinProgressEvents/CoinBanned.cs b/...ient/CoinJoinProgressEvents/CoinBanned.cs → ...ient/CoinJoinProgressEvents/CoinBanned.cs
diff --git a/...ogressEvents/CoinJoinProgressEventArgs.cs → ...ogressEvents/CoinJoinProgressEventArgs.cs b/...ogressEvents/CoinJoinProgressEventArgs.cs → ...ogressEvents/CoinJoinProgressEventArgs.cs
diff --git a/...ts/EnteringConnectionConfirmationPhase.cs → ...ts/EnteringConnectionConfirmationPhase.cs b/...ts/EnteringConnectionConfirmationPhase.cs → ...ts/EnteringConnectionConfirmationPhase.cs
diff --git a/...inProgressEvents/EnteringCriticalPhase.cs → ...inProgressEvents/EnteringCriticalPhase.cs b/...inProgressEvents/EnteringCriticalPhase.cs → ...inProgressEvents/EnteringCriticalPhase.cs
diff --git a/...sEvents/EnteringInputRegistrationPhase.cs → ...sEvents/EnteringInputRegistrationPhase.cs b/...sEvents/EnteringInputRegistrationPhase.cs → ...sEvents/EnteringInputRegistrationPhase.cs
diff --git a/...Events/EnteringOutputRegistrationPhase.cs → ...Events/EnteringOutputRegistrationPhase.cs b/...Events/EnteringOutputRegistrationPhase.cs → ...Events/EnteringOutputRegistrationPhase.cs
diff --git a/...oinProgressEvents/EnteringSigningPhase.cs → ...oinProgressEvents/EnteringSigningPhase.cs b/...oinProgressEvents/EnteringSigningPhase.cs → ...oinProgressEvents/EnteringSigningPhase.cs
diff --git a/...oinProgressEvents/LeavingCriticalPhase.cs → ...oinProgressEvents/LeavingCriticalPhase.cs b/...oinProgressEvents/LeavingCriticalPhase.cs → ...oinProgressEvents/LeavingCriticalPhase.cs
diff --git a/...ient/CoinJoinProgressEvents/RoundEnded.cs → ...ient/CoinJoinProgressEvents/RoundEnded.cs b/...ient/CoinJoinProgressEvents/RoundEnded.cs → ...ient/CoinJoinProgressEvents/RoundEnded.cs
diff --git a/...inJoinProgressEvents/RoundStateChanged.cs → ...inJoinProgressEvents/RoundStateChanged.cs b/...inJoinProgressEvents/RoundStateChanged.cs → ...inJoinProgressEvents/RoundStateChanged.cs
diff --git a/...oinProgressEvents/WaitingForBlameRound.cs → ...oinProgressEvents/WaitingForBlameRound.cs b/...oinProgressEvents/WaitingForBlameRound.cs → ...oinProgressEvents/WaitingForBlameRound.cs
diff --git a/...CoinJoinProgressEvents/WaitingForRound.cs → ...CoinJoinProgressEvents/WaitingForRound.cs b/...CoinJoinProgressEvents/WaitingForRound.cs → ...CoinJoinProgressEvents/WaitingForRound.cs
diff --git a/...tWasabi/WabiSabi/Client/CoinJoinResult.cs → .../Client/CoinJoin/Client/CoinJoinResult.cs b/...tWasabi/WabiSabi/Client/CoinJoinResult.cs → .../Client/CoinJoin/Client/CoinJoinResult.cs
diff --git a/...asabi/WabiSabi/Client/AmountDecomposer.cs → ...oin/Client/Decomposer/AmountDecomposer.cs b/...asabi/WabiSabi/Client/AmountDecomposer.cs → ...oin/Client/Decomposer/AmountDecomposer.cs
@@ -5,7 +5,7 @@
 using WalletWasabi.Extensions;
 using WalletWasabi.WabiSabi.Models;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client.Decomposer;
 
 /// <summary>
 /// Pull requests to this file must be up to date with this simulation to ensure correctness: https://github.com/nopara73/Sake
@@ -219,7 +219,7 @@ private static Money FindChange(IEnumerable<Output> decomposition, HashSet<Outpu
 					continue;
 				}
 
-				var deficit = (myInputSum - (ulong)finalDenoms.Sum(d => d.EffectiveCost)) + CalculateCost(finalDenoms);
+				var deficit = myInputSum - (ulong)finalDenoms.Sum(d => d.EffectiveCost) + CalculateCost(finalDenoms);
 
 				setCandidates.TryAdd(CalculateHash(finalDenoms), (finalDenoms, deficit));
 			}
@@ -239,7 +239,7 @@ private static Money FindChange(IEnumerable<Output> decomposition, HashSet<Outpu
 			List<Output> currentSet = new();
 			while (true)
 			{
-				var denom = denoms.Where(x => x.EffectiveCost <= remaining && x.EffectiveCost >= (remaining / 3)).RandomElement(Random)
+				var denom = denoms.Where(x => x.EffectiveCost <= remaining && x.EffectiveCost >= remaining / 3).RandomElement(Random)
 					?? denoms.FirstOrDefault(x => x.EffectiveCost <= remaining);
 
 				// Continue only if there is enough remaining amount and size to create one output (+ change if change could potentially be created).

diff --git a/WalletWasabi/WabiSabi/Client/Decomposer.cs → .../CoinJoin/Client/Decomposer/Decomposer.cs b/WalletWasabi/WabiSabi/Client/Decomposer.cs → .../CoinJoin/Client/Decomposer/Decomposer.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using WalletWasabi.Extensions;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client.Decomposer;
 
 /// <summary>
 /// Notebook: https://github.com/lontivero/DecompositionsPlayground/blob/master/Notebook.ipynb
@@ -37,7 +37,7 @@ private static IEnumerable<(long Sum, int Count, ulong Decomposition)> InternalC
 			long sum,
 			int k)
 		{
-			accumulator = (accumulator << 8) | ((ulong)currentDenominationIdx & 0xff);
+			accumulator = accumulator << 8 | (ulong)currentDenominationIdx & 0xff;
 			var currentDenomination = denoms[currentDenominationIdx];
 			sum += currentDenomination;
 			var remaining = target - sum;
@@ -69,7 +69,7 @@ public static IEnumerable<long> ToRealValuesArray(ulong decomposition, int count
 		var list = new long[count];
 		for (var i = 0; i < count; i++)
 		{
-			var index = (decomposition >> (i * 8)) & 0xff;
+			var index = decomposition >> i * 8 & 0xff;
 			list[count - i - 1] = denoms[index];
 		}
 		return list;

diff --git a/...bi/WabiSabi/Client/DenominationBuilder.cs → .../Client/Decomposer/DenominationBuilder.cs b/...bi/WabiSabi/Client/DenominationBuilder.cs → .../Client/Decomposer/DenominationBuilder.cs
@@ -4,7 +4,7 @@
 using WabiSabi.Crypto.Randomness;
 using WalletWasabi.Extensions;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client.Decomposer;
 
 public static class DenominationBuilder
 {

diff --git a/WalletWasabi/WabiSabi/Client/Output.cs → ...ient/CoinJoin/Client/Decomposer/Output.cs b/WalletWasabi/WabiSabi/Client/Output.cs → ...ient/CoinJoin/Client/Decomposer/Output.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using WalletWasabi.Extensions;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client.Decomposer;
 
 public record Output
 {

diff --git a/...bi/Client/DependencyGraphTaskScheduler.cs → ...in/Client/DependencyGraphTaskScheduler.cs b/...bi/Client/DependencyGraphTaskScheduler.cs → ...in/Client/DependencyGraphTaskScheduler.cs
@@ -11,15 +11,15 @@
 using WalletWasabi.WabiSabi.Backend.Models;
 using WalletWasabi.WabiSabi.Client.CredentialDependencies;
 
-namespace WalletWasabi.WabiSabi.Client;
+namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
 public class DependencyGraphTaskScheduler
 {
 	public DependencyGraphTaskScheduler(DependencyGraph graph)
 	{
 		Graph = graph;
 		var allInEdges = Enum.GetValues<CredentialType>()
-			.SelectMany(type => Enumerable.Concat<RequestNode>(Graph.Reissuances, Graph.Outputs)
+			.SelectMany(type => Graph.Reissuances.Concat<RequestNode>(Graph.Outputs)
 			.SelectMany(node => Graph.EdgeSets[type].InEdges(node)));
 		DependencyTasks = allInEdges.ToDictionary(edge => edge, _ => new TaskCompletionSource<Credential>(TaskCreationOptions.RunContinuationsAsynchronously));
 	}
@@ -205,6 +205,6 @@ private IEnumerable<(AliceClient AliceClient, InputNode Node)> PairAliceClientAn
 			throw new InvalidOperationException("Graph vs Alice inputs mismatch");
 		}
 
-		return Enumerable.Zip(aliceClients, inputNodes);
+		return aliceClients.Zip(inputNodes);
 	}
 }
diff --git a/...abiSabi/Client/UtxoSelectionParameters.cs → ...oinJoin/Client/UtxoSelectionParameters.cs b/...abiSabi/Client/UtxoSelectionParameters.cs → ...oinJoin/Client/UtxoSelectionParameters.cs
@@ -6,6 +6,7 @@
 using WalletWasabi.Extensions;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Models;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client.Decomposer;
 
 namespace WalletWasabi.WabiSabi.Client;
 
@@ -29,7 +30,7 @@ public static UtxoSelectionParameters FromRoundParameters(RoundParameters roundP
 			.Min(x => x.EffectiveCost);
 		var smallestReasonableEffectiveDenomination =
 			smallestEffectiveDenom
-		    ?? throw new InvalidOperationException("Something's wrong with the denomination creation or with the parameters it got.");
+			?? throw new InvalidOperationException("Something's wrong with the denomination creation or with the parameters it got.");
 
 		return new(
 			roundParameters.AllowedInputAmounts,

diff --git a/...Wasabi/WabiSabi/Client/CoinJoinManager.cs → ...lient/CoinJoin/Manager/CoinJoinManager.cs b/...Wasabi/WabiSabi/Client/CoinJoinManager.cs → ...lient/CoinJoin/Manager/CoinJoinManager.cs
@@ -16,6 +16,7 @@
 using WalletWasabi.Logging;
 using WalletWasabi.WabiSabi.Backend.Models;
 using WalletWasabi.WabiSabi.Client.Banning;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using WalletWasabi.WabiSabi.Client.CoinJoinProgressEvents;
 using WalletWasabi.WabiSabi.Client.RoundStateAwaiters;
 using WalletWasabi.WabiSabi.Client.StatusChangedEvents;

diff --git a/...Wasabi/WabiSabi/Client/CoinJoinTracker.cs → ...lient/CoinJoin/Manager/CoinJoinTracker.cs b/...Wasabi/WabiSabi/Client/CoinJoinTracker.cs → ...lient/CoinJoin/Manager/CoinJoinTracker.cs
@@ -3,6 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using WalletWasabi.Blockchain.TransactionOutputs;
+using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using WalletWasabi.WabiSabi.Client.CoinJoinProgressEvents;
 using WalletWasabi.Wallets;