do xpubs too

bitcoindevkit · Nov 10, 2024 · 67a70a9 · 67a70a9
1 parent 3a91a13
commit 67a70a9
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 17 deletions.
diff --git a/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift b/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
@@ -195,6 +195,52 @@ private class BDKService {
         self.wallet = wallet
     }
 
+    func createWallet(xpub: String?) throws {
+        let documentsDirectoryURL = URL.documentsDirectory
+        let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data")
+
+        if FileManager.default.fileExists(atPath: walletDataDirectoryURL.path) {
+            try FileManager.default.removeItem(at: walletDataDirectoryURL)
+        } else {
+        }
+
+        let baseUrl =
+            try keyClient.getEsploraURL() ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny
+
+        guard let xpubString = xpub, !xpubString.isEmpty else {
+            throw WalletError.walletNotFound
+        }
+
+        let descriptorString = "tr(\(xpubString)/0/*)"
+        let changeDescriptorString = "tr(\(xpubString)/1/*)"
+        let descriptor = try Descriptor(descriptor: descriptorString, network: network)
+        let changeDescriptor = try Descriptor(descriptor: changeDescriptorString, network: network)
+
+        let backupInfo = BackupInfo(
+            mnemonic: "",
+            descriptor: descriptor.toStringWithSecret(),
+            changeDescriptor: changeDescriptor.toStringWithSecret()
+        )
+
+        try keyClient.saveBackupInfo(backupInfo)
+        try keyClient.saveNetwork(self.network.description)
+        try keyClient.saveEsploraURL(baseUrl)
+
+        try FileManager.default.ensureDirectoryExists(at: walletDataDirectoryURL)
+        try FileManager.default.removeOldFlatFileIfNeeded(at: documentsDirectoryURL)
+        let persistenceBackendPath = walletDataDirectoryURL.appendingPathComponent("wallet.sqlite")
+            .path
+        let connection = try Connection(path: persistenceBackendPath)
+        self.connection = connection
+        let wallet = try Wallet(
+            descriptor: descriptor,
+            changeDescriptor: changeDescriptor,
+            network: network,
+            connection: connection
+        )
+        self.wallet = wallet
+    }
+
     private func loadWallet(descriptor: Descriptor, changeDescriptor: Descriptor) throws {
         let documentsDirectoryURL = URL.documentsDirectory
         let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data")
@@ -362,6 +408,7 @@ struct BDKClient {
     let deleteWallet: () throws -> Void
     let createWalletFromSeed: (String?) throws -> Void
     let createWalletFromDescriptor: (String?) throws -> Void
+    let createWalletFromXPub: (String?) throws -> Void
     let getBalance: () throws -> Balance
     let transactions: () throws -> [CanonicalTx]
     let listUnspent: () throws -> [LocalOutput]
@@ -390,6 +437,9 @@ extension BDKClient {
         createWalletFromDescriptor: { descriptor in
             try BDKService.shared.createWallet(descriptor: descriptor)
         },
+        createWalletFromXPub: { xpub in
+            try BDKService.shared.createWallet(xpub: xpub)
+        },
         getBalance: { try BDKService.shared.getBalance() },
         transactions: { try BDKService.shared.transactions() },
         listUnspent: { try BDKService.shared.listUnspent() },
@@ -440,6 +490,7 @@ extension BDKClient {
             deleteWallet: {},
             createWalletFromSeed: { _ in },
             createWalletFromDescriptor: { _ in },
+            createWalletFromXPub: { _ in },
             getBalance: { .mock },
             transactions: {
                 return [

diff --git a/BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift b/BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift
@@ -15,13 +15,15 @@ import SwiftUI
 class OnboardingViewModel: ObservableObject {
     let bdkClient: BDKClient
 
+    @AppStorage("isOnboarding") var isOnboarding: Bool?
+    @Published var createWithPersistError: CreateWithPersistError?
     var isDescriptor: Bool {
         words.hasPrefix("tr(") || words.hasPrefix("wpkh(") || words.hasPrefix("wsh(")
             || words.hasPrefix("sh(")
     }
-
-    @AppStorage("isOnboarding") var isOnboarding: Bool?
-    @Published var createWithPersistError: CreateWithPersistError?
+    var isXPub: Bool {
+        words.hasPrefix("xpub") || words.hasPrefix("tpub")
+    }
     @Published var networkColor = Color.gray
     @Published var onboardingViewError: AppError?
     @Published var selectedNetwork: Network = .signet {
@@ -36,12 +38,14 @@ class OnboardingViewModel: ObservableObject {
             bdkClient.updateEsploraURL(selectedURL)
         }
     }
-    @Published var words: String = "" {
-        didSet {
-            updateWordArray()
+    @Published var words: String = ""
+    var wordArray: [String] {
+        if words.hasPrefix("xpub") || words.hasPrefix("tpub") {
+            return []
         }
+        let trimmedWords = words.trimmingCharacters(in: .whitespacesAndNewlines)
+        return trimmedWords.components(separatedBy: " ")
     }
-    @Published var wordArray: [String] = []
     var availableURLs: [String] {
         switch selectedNetwork {
         case .bitcoin:
@@ -79,6 +83,8 @@ class OnboardingViewModel: ObservableObject {
         do {
             if isDescriptor {
                 try bdkClient.createWalletFromDescriptor(words)
+            } else if isXPub {
+                try bdkClient.createWalletFromXPub(words)
             } else {
                 try bdkClient.createWalletFromSeed(words)
             }
@@ -95,9 +101,4 @@ class OnboardingViewModel: ObservableObject {
             }
         }
     }
-
-    private func updateWordArray() {
-        let trimmedWords = words.trimmingCharacters(in: .whitespacesAndNewlines)
-        wordArray = trimmedWords.split(separator: " ").map { String($0) }
-    }
 }
diff --git a/BDKSwiftExampleWallet/View/OnboardingView.swift b/BDKSwiftExampleWallet/View/OnboardingView.swift
@@ -27,7 +27,7 @@ struct OnboardingView: View {
                 HStack {
                     Spacer()
                     Button {
-                        if viewModel.wordArray.isEmpty {
+                        if viewModel.words.isEmpty {
                             if let clipboardContent = UIPasteboard.general.string {
                                 viewModel.words = clipboardContent
                             }
@@ -36,13 +36,13 @@ struct OnboardingView: View {
                         }
                     } label: {
                         Image(
-                            systemName: viewModel.wordArray.isEmpty
+                            systemName: viewModel.words.isEmpty
                                 ? "arrow.down.square" : "clear"
                         )
                         .contentTransition(.symbolEffect(.replace))
                     }
                     .tint(
-                        viewModel.wordArray.isEmpty ? .secondary : .primary
+                        viewModel.words.isEmpty ? .secondary : .primary
                     )
                     .font(.title)
                     .padding()
@@ -108,8 +108,8 @@ struct OnboardingView: View {
                 .pickerStyle(.automatic)
                 .tint(.primary)
 
-                if viewModel.wordArray != [] {
-                    if viewModel.isDescriptor {
+                if !viewModel.words.isEmpty {
+                    if viewModel.isDescriptor || viewModel.isXPub {
                         Text(viewModel.words)
                             .font(.system(.caption, design: .monospaced))
                             .lineLimit(1)