chore: removed main net

rubensmachion · rubensmachion · commit a6ee9bf10900 · 2025-05-26T13:50:53.000-03:00
chore: back to bip86 wallet
diff --git a/BDKSwiftExampleWallet/Extensions/BDK+Extensions/Network+Extensions.swift b/BDKSwiftExampleWallet/Extensions/BDK+Extensions/Network+Extensions.swift
@@ -21,7 +21,7 @@ extension Network {
 
     init?(stringValue: String) {
         switch stringValue {
-        case "bitcoin": self = .bitcoin
+        case "bitcoin": self = .signet
         case "testnet": self = .testnet
         case "testnet4": self = .testnet4
         case "signet": self = .signet
diff --git a/BDKSwiftExampleWallet/Resources/Localizable.xcstrings b/BDKSwiftExampleWallet/Resources/Localizable.xcstrings
@@ -409,9 +409,6 @@
           }
         }
       }
-    },
-    "Bitcoin" : {
-
     },
     "Bitcoin Balance" : {
       "localizations" : {
diff --git a/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift b/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
@@ -11,8 +11,8 @@ 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
diff --git a/BDKSwiftExampleWallet/Service/BDKSyncService/BDKSyncService.swift b/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.newBip84Public(
+            let descriptor = Descriptor.newBip86Public(
                 publicKey: descriptorPublicKey,
                 fingerprint: fingerprint,
                 keychain: .external,
                 network: network
             )
-            let changeDescriptor = Descriptor.newBip84Public(
+            let changeDescriptor = Descriptor.newBip86Public(
                 publicKey: descriptorPublicKey,
                 fingerprint: fingerprint,
                 keychain: .internal,
@@ -125,12 +125,12 @@ extension BDKSyncService {
             mnemonic: mnemonic,
             password: nil
         )
-        let descriptor = Descriptor.newBip84(
+        let descriptor = Descriptor.newBip86(
             secretKey: secretKey,
             keychain: .external,
             network: network
         )
-        let changeDescriptor = Descriptor.newBip84(
+        let changeDescriptor = Descriptor.newBip86(
             secretKey: secretKey,
             keychain: .internal,
             network: network
diff --git a/BDKSwiftExampleWallet/Service/BDKSyncService/EsploraService.swift b/BDKSwiftExampleWallet/Service/BDKSyncService/EsploraService.swift
@@ -25,7 +25,7 @@ final class EsploraService: BDKSyncService {
     
     init(
         keyClient: KeyClient = .live,
-        network: Network = .bitcoin,
+        network: Network = .signet,
         connection: Connection? = nil
     ) {
         self.connection = connection
diff --git a/BDKSwiftExampleWallet/Service/BDKSyncService/KyotoService.swift b/BDKSwiftExampleWallet/Service/BDKSyncService/KyotoService.swift
@@ -34,7 +34,7 @@ final class KyotoService: BDKSyncService {
     
     init(
         keyClient: KeyClient = .live,
-        network: Network = .bitcoin,
+        network: Network = .signet,
         connection: Connection? = nil
     ) {
         self.connection = connection
@@ -74,8 +74,9 @@ final class KyotoService: BDKSyncService {
             throw WalletError.walletNotFound
         }
         let nodeComponents = try buildNode(
-            from: wallet, scanType: .recovery(fromHeight: KyotoService.nodeHeight)
+            from: wallet, scanType: .recovery(fromHeight: network.taprootHeight)
         )
+        
         self.fullScanProgress = progress
         self.client = nodeComponents.client
         self.node = nodeComponents.node
diff --git a/BDKSwiftExampleWallet/Service/Key Service/KeyService.swift b/BDKSwiftExampleWallet/Service/Key Service/KeyService.swift
@@ -137,12 +137,12 @@ extension KeyClient {
                     mnemonic: mnemonic,
                     password: nil
                 )
-                let descriptor = Descriptor.newBip84(
+                let descriptor = Descriptor.newBip86(
                     secretKey: secretKey,
                     keychain: .external,
                     network: mockKeyClientNetwork
                 )
-                let changeDescriptor = Descriptor.newBip84(
+                let changeDescriptor = Descriptor.newBip86(
                     secretKey: secretKey,
                     keychain: .internal,
                     network: mockKeyClientNetwork
diff --git a/BDKSwiftExampleWallet/Utilities/Constants.swift b/BDKSwiftExampleWallet/Utilities/Constants.swift
@@ -31,9 +31,9 @@ struct Constants {
                 static let mutiny = "https://mutinynet.com/api"
                 static let mempoolspace = "https://mempool.space/signet/api"
                 static let allValues = [
+                    mempoolspace,
                     mutiny,
                     bdk,
-                    mempoolspace,
                 ]
             }
             struct Testnet {
@@ -95,4 +95,13 @@ extension Network {
             Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
         }
     }
+    
+    var taprootHeight: UInt32 {
+        switch self {
+        case .bitcoin:
+            return 700_000
+        default:
+            return 250_000
+        }
+    }
 }
diff --git a/BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift b/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 = .bitcoin {
+    @Published var selectedNetwork: Network = .signet {
         didSet {
             bdkClient.updateNetwork(selectedNetwork)
             selectedURL = availableURLs.first ?? ""
diff --git a/BDKSwiftExampleWallet/View/Activity/TransactionListView.swift b/BDKSwiftExampleWallet/View/Activity/TransactionListView.swift
@@ -36,7 +36,8 @@ struct TransactionListView: View {
                         .font(.subheadline)
 
                     let mutinyFaucetURL = URL(string: "https://faucet.mutinynet.com")
-                    let signetFaucetURL = URL(string: "https://signetfaucet.com")
+//                    let signetFaucetURL = URL(string: "https://signetfaucet.com")
+                    let signetFaucetURL = URL(string: "https://signet25.bublina.eu.org/")
 
                     if let mutinyFaucetURL,
                         let signetFaucetURL,
diff --git a/BDKSwiftExampleWallet/View/OnboardingView.swift b/BDKSwiftExampleWallet/View/OnboardingView.swift
@@ -112,7 +112,6 @@ struct OnboardingView: View {
 
                 Group {
                     Picker("Network", selection: $viewModel.selectedNetwork) {
-                        Text("Bitcoin").tag(Network.bitcoin)
                         Text("Signet").tag(Network.signet)
                         Text("Testnet").tag(Network.testnet)
                         Text("Testnet4").tag(Network.testnet4)
diff --git a/BDKSwiftExampleWalletTests/Service/BDKSwiftExampleWalletKeyServiceTests.swift b/BDKSwiftExampleWalletTests/Service/BDKSwiftExampleWalletKeyServiceTests.swift
@@ -23,12 +23,12 @@ final class BDKSwiftExampleWalletKeyServiceTests: XCTestCase {
             mnemonic: mnemonic,
             password: nil
         )
-        let descriptor = Descriptor.newBip84(
+        let descriptor = Descriptor.newBip86(
             secretKey: secretKey,
             keychain: .external,
             network: mockKeyClientNetwork
         )
-        let changeDescriptor = Descriptor.newBip84(
+        let changeDescriptor = Descriptor.newBip86(
             secretKey: secretKey,
             keychain: .internal,
             network: mockKeyClientNetwork

Original file line number	Diff line number	Diff line change
`@@ -409,9 +409,6 @@`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`	`}`
`412`		`- },`
`413`		`- "Bitcoin" : {`
`414`		`-`
`415`	`412`	`},`
`416`	`413`	`"Bitcoin Balance" : {`
`417`	`414`	`"localizations" : {`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ struct Constants {`
`31`	`31`	`static let mutiny = "https://mutinynet.com/api"`
`32`	`32`	`static let mempoolspace = "https://mempool.space/signet/api"`
`33`	`33`	`static let allValues = [`
	`34`	`+ mempoolspace,`
`34`	`35`	`mutiny,`
`35`	`36`	`bdk,`
`36`		`- mempoolspace,`
`37`	`37`	`]`
`38`	`38`	`}`
`39`	`39`	`struct Testnet {`
`@@ -95,4 +95,13 @@ extension Network {`
`95`	`95`	`Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""`
`96`	`96`	`}`
`97`	`97`	`}`
	`98`	`+`
	`99`	`+ var taprootHeight: UInt32 {`
	`100`	`+ switch self {`
	`101`	`+ case .bitcoin:`
	`102`	`+ return 700_000`
	`103`	`+ default:`
	`104`	`+ return 250_000`
	`105`	`+ }`
	`106`	`+ }`
`98`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class OnboardingViewModel: ObservableObject {`
`26`	`26`	`}`
`27`	`27`	`@Published var networkColor = Color.gray`
`28`	`28`	`@Published var onboardingViewError: AppError?`
`29`		`- @Published var selectedNetwork: Network = .bitcoin {`
	`29`	`+ @Published var selectedNetwork: Network = .signet {`
`30`	`30`	`didSet {`
`31`	`31`	`bdkClient.updateNetwork(selectedNetwork)`
`32`	`32`	`selectedURL = availableURLs.first ?? ""`