From 96cb9039aaccb75a1b10f2d80a7bed6ba42defe1 Mon Sep 17 00:00:00 2001
From: David Molnar <molnardavid84@gmail.com>
Date: Thu, 25 May 2023 16:51:41 +0200
Subject: [PATCH 1/3] Make sure used keys are saved into a file.

---
 WalletWasabi/WabiSabi/Client/CoinJoinManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs b/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
index 5079af5995a..95757e40b1b 100644
--- a/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
+++ b/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
@@ -519,6 +519,8 @@ private async Task MarkDestinationsUsedAsync(ImmutableList<Script> outputs)
 			{
 				k.KeyChain?.TrySetScriptStates(state, scripts);
 			}
+
+			(k as Wallet)?.KeyManager.ToFile();
 		}
 	}
 

From 9852bfa2088525c8a0e692ba20b4aad74eb057d6 Mon Sep 17 00:00:00 2001
From: David Molnar <molnardavid84@gmail.com>
Date: Fri, 9 Jun 2023 17:52:01 +0200
Subject: [PATCH 2/3] Save file in Keychain implementation.

---
 WalletWasabi/WabiSabi/Client/CoinJoinManager.cs | 3 +--
 WalletWasabi/WabiSabi/Client/KeyChain.cs        | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs b/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
index da1afc3a6c5..458d513397f 100644
--- a/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
+++ b/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
@@ -513,14 +513,13 @@ private async Task MarkDestinationsUsedAsync(ImmutableList<Script> outputs)
 				foreach (var hdPubKey in w.KeyManager.GetKeys(key => scripts.Any(key.ContainsScript)))
 				{
 					w.KeyManager.SetKeyState(state, hdPubKey);
+					w.KeyManager.ToFile();
 				}
 			}
 			else
 			{
 				k.KeyChain?.TrySetScriptStates(state, scripts);
 			}
-
-			(k as Wallet)?.KeyManager.ToFile();
 		}
 	}
 
diff --git a/WalletWasabi/WabiSabi/Client/KeyChain.cs b/WalletWasabi/WabiSabi/Client/KeyChain.cs
index 1c9c87a69ef..0b8d63040a3 100644
--- a/WalletWasabi/WabiSabi/Client/KeyChain.cs
+++ b/WalletWasabi/WabiSabi/Client/KeyChain.cs
@@ -35,6 +35,8 @@ public void TrySetScriptStates(KeyState state, IEnumerable<Script> scripts)
 		{
 			KeyManager.SetKeyState(state, hdPubKey);
 		}
+
+		KeyManager.ToFile();
 	}
 
 	public OwnershipProof GetOwnershipProof(IDestination destination, CoinJoinInputCommitmentData commitmentData)

From 68567eabd7d4fc8fe3ac169264811c1f0e2f0b3b Mon Sep 17 00:00:00 2001
From: David Molnar <molnardavid84@gmail.com>
Date: Fri, 9 Jun 2023 17:54:22 +0200
Subject: [PATCH 3/3] Save only at the end.

---
 WalletWasabi/WabiSabi/Client/CoinJoinManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs b/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
index 458d513397f..272e4b0367e 100644
--- a/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
+++ b/WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
@@ -513,8 +513,9 @@ private async Task MarkDestinationsUsedAsync(ImmutableList<Script> outputs)
 				foreach (var hdPubKey in w.KeyManager.GetKeys(key => scripts.Any(key.ContainsScript)))
 				{
 					w.KeyManager.SetKeyState(state, hdPubKey);
-					w.KeyManager.ToFile();
 				}
+
+				w.KeyManager.ToFile();
 			}
 			else
 			{