From 0da51d5ae327073973847e68633efb1d2943a09b Mon Sep 17 00:00:00 2001
From: nrobi144 <robert.nagy@swanbitcoin.com>
Date: Fri, 24 Apr 2026 11:18:06 +0300
Subject: [PATCH] refactor(multi-account): remove legacy migration code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Migration from single-account files didn't work reliably.
Removed migrateFromLegacyFiles() and migrateAndLoadAccounts().
Account list now populated only via saveCurrentAccount/saveBunkerAccount
when user logs in — no automatic migration from old format.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../vitorpamplona/amethyst/desktop/Main.kt    |  4 +-
 .../desktop/account/AccountManager.kt         |  3 +-
 .../desktop/account/DesktopAccountStorage.kt  | 49 -------------------
 3 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt
index f908ff687..42b11811a 100644
--- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt
+++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt
@@ -663,8 +663,8 @@ fun App(
         subscriptionsCoordinator.start()
 
         scope.launch(Dispatchers.IO) {
-            // Migrate legacy single-account files and load account list
-            accountManager.migrateAndLoadAccounts()
+            // Load account list from encrypted storage
+            accountManager.refreshAccountListOnStartup()
 
             if (accountManager.hasBunkerAccount()) {
                 // Show connecting UI while dedicated NIP-46 client connects
diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/account/AccountManager.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/account/AccountManager.kt
index 9115563b8..cc3c00b5f 100644
--- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/account/AccountManager.kt
+++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/account/AccountManager.kt
@@ -713,8 +713,7 @@ class AccountManager internal constructor(
         disconnectNip46Client()
     }
 
-    suspend fun migrateAndLoadAccounts() {
-        accountStorage.migrateFromLegacyFiles(this)
+    suspend fun refreshAccountListOnStartup() {
         refreshAccountList()
     }
 
diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/account/DesktopAccountStorage.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/account/DesktopAccountStorage.kt
index f79a46bfc..03e5d0a64 100644
--- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/account/DesktopAccountStorage.kt
+++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/account/DesktopAccountStorage.kt
@@ -92,55 +92,6 @@ class DesktopAccountStorage(
         writeMetadata(metadata.copy(activeNpub = npub))
     }
 
-    // --- Migration from single-account files ---
-
-    suspend fun migrateFromLegacyFiles(accountManager: AccountManager): Boolean {
-        val prefsFile = File(amethystDir, "last_account.txt")
-        val bunkerFile = File(amethystDir, "bunker_uri.txt")
-
-        if (!prefsFile.exists() && !bunkerFile.exists()) return false
-        if (getAccountsFile().exists()) return false // already migrated
-
-        val npub =
-            prefsFile
-                .takeIf { it.exists() }
-                ?.readText()
-                ?.trim()
-                ?.takeIf { it.isNotEmpty() }
-                ?: return false
-
-        val bunkerUri =
-            bunkerFile
-                .takeIf { it.exists() }
-                ?.readText()
-                ?.trim()
-                ?.takeIf { it.isNotEmpty() }
-
-        val signerType =
-            if (bunkerUri != null) {
-                SignerType.Remote(bunkerUri)
-            } else {
-                val hasPrivKey = secureStorage.hasPrivateKey(npub)
-                if (hasPrivKey) SignerType.Internal else SignerType.ViewOnly
-            }
-
-        val info = AccountInfo(npub = npub, signerType = signerType)
-        val metadata = AccountMetadata(accounts = listOf(AccountInfoDto.from(info)), activeNpub = npub)
-        writeMetadata(metadata)
-
-        // Verify migration by reading back
-        val verified = readMetadata()
-        if (verified.accounts.any { it.npub == npub }) {
-            // Migration verified — rename old files
-            prefsFile.renameTo(File(amethystDir, "last_account.txt.bak"))
-            bunkerFile.takeIf { it.exists() }?.renameTo(File(amethystDir, "bunker_uri.txt.bak"))
-            Log.d("DesktopAccountStorage", "Migrated legacy account: $npub")
-            return true
-        }
-
-        return false
-    }
-
     // --- Encrypted file I/O ---
 
     private suspend fun readMetadata(): AccountMetadata {