Skip to content

feat(wallet): support recovery phrases for multiple wallets #1018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
llbartekll merged 2 commits into from
Aug 17, 2026
Merged

feat(wallet): support recovery phrases for multiple wallets #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b85a2
feat: support recovery phrases for multiple wallets
llbartekll Aug 14, 2026
eb8d367
fix: keep readable recovery phrases available
llbartekll Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions DashWallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@
752F81992E30F55E00ADA76D /* SecurityMenuViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752F81972E30F55E00ADA76D /* SecurityMenuViewModel.swift */; };
752F819A2E30F55E00ADA76D /* SecurityMenuScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752F81962E30F55E00ADA76D /* SecurityMenuScreen.swift */; };
752F819B2E30F55E00ADA76D /* SecurityMenuViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752F81972E30F55E00ADA76D /* SecurityMenuViewModel.swift */; };
A1C0D0020000000000000002 /* RecoveryPhraseFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1C0D0010000000000000001 /* RecoveryPhraseFlow.swift */; };
A1C0D0030000000000000003 /* RecoveryPhraseFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1C0D0010000000000000001 /* RecoveryPhraseFlow.swift */; };
752F81A92E323FDB00ADA76D /* ToolsMenuViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752F81A82E323FD000ADA76D /* ToolsMenuViewModel.swift */; };
752F81AA2E323FDB00ADA76D /* ToolsMenuViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752F81A82E323FD000ADA76D /* ToolsMenuViewModel.swift */; };
75303FE52AE7B70500870D8B /* CrowdNode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75303FE42AE7B70500870D8B /* CrowdNode.storyboard */; };
Expand Down Expand Up @@ -2856,6 +2858,7 @@
752D03B12E2F7B3C00B88784 /* MainMenuViewControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenuViewControllerDelegate.swift; sourceTree = "<group>"; };
752F81962E30F55E00ADA76D /* SecurityMenuScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityMenuScreen.swift; sourceTree = "<group>"; };
752F81972E30F55E00ADA76D /* SecurityMenuViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityMenuViewModel.swift; sourceTree = "<group>"; };
A1C0D0010000000000000001 /* RecoveryPhraseFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecoveryPhraseFlow.swift; sourceTree = "<group>"; };
752F81A82E323FD000ADA76D /* ToolsMenuViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolsMenuViewModel.swift; sourceTree = "<group>"; };
75303FE42AE7B70500870D8B /* CrowdNode.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CrowdNode.storyboard; sourceTree = "<group>"; };
7531308C2B47EC910069C9B7 /* UpholdClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpholdClient.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4748,6 +4751,7 @@
children = (
2A7F3B18238C643D00DEA3EF /* Advanced Security */,
2A10EB3F2358D29500C38B61 /* ResetWalletInfo */,
A1C0D0010000000000000001 /* RecoveryPhraseFlow.swift */,
752F81962E30F55E00ADA76D /* SecurityMenuScreen.swift */,
752F81972E30F55E00ADA76D /* SecurityMenuViewModel.swift */,
FB64DD5B1F2691BC2FC4149B /* Wallets */,
Expand Down Expand Up @@ -9899,6 +9903,7 @@
472D13E3299E23B7006903F1 /* BalanceNotifier.swift in Sources */,
752F819A2E30F55E00ADA76D /* SecurityMenuScreen.swift in Sources */,
752F819B2E30F55E00ADA76D /* SecurityMenuViewModel.swift in Sources */,
A1C0D0020000000000000002 /* RecoveryPhraseFlow.swift in Sources */,
2AD1CE6422D9127600C99324 /* DWSeedWordModel.m in Sources */,
7592AA7C2B9B08C000417F9E /* SupportedTopperPaymentMethods.swift in Sources */,
75AA33CC2BF9C82700F12465 /* ModalDialog.swift in Sources */,
Expand Down Expand Up @@ -10730,6 +10735,7 @@
C9D2C7C42A320AA000D15901 /* CurrencyExchanger_Objc.m in Sources */,
752F81982E30F55E00ADA76D /* SecurityMenuScreen.swift in Sources */,
752F81992E30F55E00ADA76D /* SecurityMenuViewModel.swift in Sources */,
A1C0D0030000000000000003 /* RecoveryPhraseFlow.swift in Sources */,
C943B32B2A408CED00AF23C5 /* DWAvatarExternalLoadingView.m in Sources */,
C943B5972A40EDDA00AF23C5 /* DWConfirmUsernameViewController.m in Sources */,
C9D2C7C62A320AA000D15901 /* Tools.swift in Sources */,
Expand Down
7 changes: 7 additions & 0 deletions DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKHost.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,13 @@ final class SwiftDashSDKHost {
}
}

/// Strict exact-id read for flows that already selected a concrete wallet.
/// Unlike the legacy active-wallet reader, this never substitutes another
/// Keychain entry when the requested id is missing or unreadable.
nonisolated static func strictlyPersistedMnemonic(for walletId: Data) throws -> String {
try WalletStorage().retrieveMnemonic(for: walletId)
}

/// Count of persisted SDK wallet ids. Attributes-only Keychain
/// enumeration — no mnemonic secrets are read. Throws on enumeration
/// failure so destructive callers stay fail-closed.
Expand Down
52 changes: 35 additions & 17 deletions DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKWalletWiper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,37 @@ enum SwiftDashSDKWalletDeletionError: LocalizedError {
}
}

/// Resolves a Keychain wallet id against the deterministic ids derived from
/// its mnemonic. Wallet ids are network-scoped even when a seed is shared;
/// the mainnet-derived id is also a stable logical identifier for grouping
/// mirrored mainnet/testnet entries without retaining the mnemonic.
enum SwiftDashSDKStoredWalletNetworkResolver {
struct Resolution {
let network: Network
let canonicalMainnetWalletId: Data
}

static func resolve(walletId: Data, mnemonic: String) throws -> Resolution {
let mainnetWalletId = try SwiftDashSDK.Wallet(
mnemonic: mnemonic,
network: .mainnet
).id
if mainnetWalletId == walletId {
return Resolution(network: .mainnet, canonicalMainnetWalletId: mainnetWalletId)
}

let testnetWalletId = try SwiftDashSDK.Wallet(
mnemonic: mnemonic,
network: .testnet
).id
if testnetWalletId == walletId {
return Resolution(network: .testnet, canonicalMainnetWalletId: mainnetWalletId)
}

throw SwiftDashSDKWalletDeletionError.unrecognizedWalletNetwork
}
}

private final class WalletWipeResultAccumulator: @unchecked Sendable {
private let lock = NSLock()
private var failureCount = 0
Expand Down Expand Up @@ -235,23 +266,10 @@ final class SwiftDashSDKWalletWiper: NSObject {

for walletId in try storage.listWalletIdsWithMnemonic() {
let mnemonic = try storage.retrieveMnemonic(for: walletId)
var matchedNetwork: Network?

for network in [Network.mainnet, .testnet] {
let derivedId = try SwiftDashSDK.Wallet(
mnemonic: mnemonic,
network: network
).id
if derivedId == walletId {
matchedNetwork = network
break
}
}

guard let matchedNetwork else {
throw SwiftDashSDKWalletDeletionError.unrecognizedWalletNetwork
}
result[matchedNetwork, default: []].insert(walletId)
let resolution = try SwiftDashSDKStoredWalletNetworkResolver.resolve(
walletId: walletId,
mnemonic: mnemonic)
result[resolution.network, default: []].insert(walletId)
}

return result
Expand Down
Loading
Loading