testing main net with bip84

Author: rubensmachion

BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift

@@ -11,17 +11,17 @@ import Foundation
 private class BDKService {
     static var shared: BDKService = BDKService()
 
-//    private let service: BDKSyncService = KyotoService.live
-    private let service: BDKSyncService = EsploraService.live
+    private let service: BDKSyncService = KyotoService.live
+//    private let service: BDKSyncService = EsploraService.live
     private let keyClient: KeyClient
     private var needsFullScan: Bool = false
     private(set) var network: Network
     private(set) var esploraURL: String
 
     init(keyClient: KeyClient = .live) {
         self.keyClient = keyClient
-        let storedNetworkString = try? keyClient.getNetwork() ?? Network.signet.description
-        self.network = Network(stringValue: storedNetworkString ?? "") ?? .signet
+        let storedNetworkString = try? keyClient.getNetwork() ?? Network.bitcoin.description
+        self.network = Network(stringValue: storedNetworkString ?? "") ?? .bitcoin
 
         self.esploraURL = (try? keyClient.getEsploraURL()) ?? self.network.url
     }

BDKSwiftExampleWallet/Service/BDKSyncService/BDKSyncService.swift

@@ -66,13 +66,13 @@ extension BDKSyncService {
         if isXPub(params) {
             let descriptorPublicKey = try DescriptorPublicKey.fromString(publicKey: params)
             let fingerprint = descriptorPublicKey.masterFingerprint()
-            let descriptor = Descriptor.newBip86Public(
+            let descriptor = Descriptor.newBip84Public(
                 publicKey: descriptorPublicKey,
                 fingerprint: fingerprint,
                 keychain: .external,
                 network: network
             )
-            let changeDescriptor = Descriptor.newBip86Public(
+            let changeDescriptor = Descriptor.newBip84Public(
                 publicKey: descriptorPublicKey,
                 fingerprint: fingerprint,
                 keychain: .internal,
@@ -125,12 +125,12 @@ extension BDKSyncService {
             mnemonic: mnemonic,
             password: nil
         )
-        let descriptor = Descriptor.newBip86(
+        let descriptor = Descriptor.newBip84(
             secretKey: secretKey,
             keychain: .external,
             network: network
         )
-        let changeDescriptor = Descriptor.newBip86(
+        let changeDescriptor = Descriptor.newBip84(
             secretKey: secretKey,
             keychain: .internal,
             network: network

BDKSwiftExampleWallet/Service/BDKSyncService/EsploraService.swift

@@ -25,7 +25,7 @@ final class EsploraService: BDKSyncService {
 
     init(
         keyClient: KeyClient = .live,
-        network: Network = .signet,
+        network: Network = .bitcoin,
         connection: Connection? = nil
     ) {
         self.connection = connection

BDKSwiftExampleWallet/Service/BDKSyncService/KyotoService.swift

@@ -34,7 +34,7 @@ final class KyotoService: BDKSyncService {
 
     init(
         keyClient: KeyClient = .live,
-        network: Network = .signet,
+        network: Network = .bitcoin,
         connection: Connection? = nil
     ) {
         self.connection = connection

BDKSwiftExampleWallet/Service/Key Service/KeyService.swift

@@ -137,12 +137,12 @@ extension KeyClient {
                     mnemonic: mnemonic,
                     password: nil
                 )
-                let descriptor = Descriptor.newBip86(
+                let descriptor = Descriptor.newBip84(
                     secretKey: secretKey,
                     keychain: .external,
                     network: mockKeyClientNetwork
                 )
-                let changeDescriptor = Descriptor.newBip86(
+                let changeDescriptor = Descriptor.newBip84(
                     secretKey: secretKey,
                     keychain: .internal,
                     network: mockKeyClientNetwork

BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift

@@ -26,7 +26,7 @@ class OnboardingViewModel: ObservableObject {
     }
     @Published var networkColor = Color.gray
     @Published var onboardingViewError: AppError?
-    @Published var selectedNetwork: Network = .signet {
+    @Published var selectedNetwork: Network = .bitcoin {
         didSet {
             bdkClient.updateNetwork(selectedNetwork)
             selectedURL = availableURLs.first ?? ""

BDKSwiftExampleWalletTests/Service/BDKSwiftExampleWalletKeyServiceTests.swift

@@ -23,12 +23,12 @@ final class BDKSwiftExampleWalletKeyServiceTests: XCTestCase {
             mnemonic: mnemonic,
             password: nil
         )
-        let descriptor = Descriptor.newBip86(
+        let descriptor = Descriptor.newBip84(
             secretKey: secretKey,
             keychain: .external,
             network: mockKeyClientNetwork
         )
-        let changeDescriptor = Descriptor.newBip86(
+        let changeDescriptor = Descriptor.newBip84(
             secretKey: secretKey,
             keychain: .internal,
             network: mockKeyClientNetwork