add batchpayment

WalletWasabi · Apr 7, 2024 · 842aeec · 842aeec
1 parent 0dc382b
commit 842aeec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletCoinjoinModel.cs b/WalletWasabi.Fluent/Models/Wallets/WalletCoinjoinModel.cs
@@ -22,7 +22,7 @@ public WalletCoinjoinModel(Wallet wallet, IWalletSettingsModel settings)
 	{
 		_wallet = wallet;
 		_coinJoinManager = Services.HostedServices.Get<CoinJoinManager>();
-		_outputWallet = settings.OutputWallet;
+		_outputWallet = settings.OutputWallet ?? wallet;
 		StatusUpdated =
 			Observable.FromEventPattern<StatusChangedEventArgs>(_coinJoinManager, nameof(CoinJoinManager.StatusChanged))
 					  .Where(x => x.EventArgs.Wallet == wallet)

diff --git a/WalletWasabi/WabiSabi/Client/CoinJoin/Manager/CoinJoinManager.cs b/WalletWasabi/WabiSabi/Client/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.Batching;
 using WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 using WalletWasabi.WabiSabi.Client.CoinJoinProgressEvents;
 using WalletWasabi.WabiSabi.Client.RoundStateAwaiters;
@@ -201,6 +202,16 @@ async Task<IEnumerable<SmartCoin>> SanityChecksAndGetCoinCandidatesFunc()
 
 				var coinCandidates = await SelectCandidateCoinsAsync(walletToStart, synchronizerResponse.BestHeight).ConfigureAwait(false);
 
+				var result = await walletToStart.GetCoinjoinCoinCandidatesAsync();
+				var coins = result.Where(x => x.IsPrivate(walletToStart.AnonScoreTarget)).ToArray();
+
+				var batchedPayments = new PaymentBatch();
+
+				foreach (SmartCoin smartCoin in coins)
+				{
+					batchedPayments.AddPayment(startCommand.OutputWallet.DestinationProvider.GetNextDestinations(1, false).FirstOrDefault(), smartCoin.Amount);
+				}
+
 				// If there are pending payments, ignore already achieved privacy.
 				if (!walletToStart.BatchedPayments.AreTherePendingPayments)
 				{

diff --git a/WalletWasabi/WabiSabi/Client/CoinJoin/Manager/CoinJoinTrackerFactory.cs b/WalletWasabi/WabiSabi/Client/CoinJoin/Manager/CoinJoinTrackerFactory.cs
@@ -30,7 +30,7 @@ public class CoinJoinTrackerFactory
 	private string CoordinatorIdentifier { get; }
 	private LiquidityClueProvider LiquidityClueProvider { get; }
 
-	public async Task<CoinJoinTracker> CreateAndStartAsync(IWallet wallet, IWallet outputWallet, Func<Task<IEnumerable<SmartCoin>>> coinCandidatesFunc, bool stopWhenAllMixed, bool overridePlebStop)
+	public async Task<CoinJoinTracker> CreateAndStartAsync(IWallet wallet, IWallet? outputWallet, Func<Task<IEnumerable<SmartCoin>>> coinCandidatesFunc, bool stopWhenAllMixed, bool overridePlebStop)
 	{
 		await LiquidityClueProvider.InitLiquidityClueAsync(wallet).ConfigureAwait(false);