master as of may 28 2025

reez · reez · commit 20da6be15733 · 2025-06-03T13:49:50.000-05:00
diff --git a/BDKSwiftExampleWallet.xcodeproj/project.pbxproj b/BDKSwiftExampleWallet.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -59,6 +59,7 @@
 		AE6716012A9AC089005C193F /* KeyServiceError.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6716002A9AC089005C193F /* KeyServiceError.swift */; };
 		AE6F34D82AA6C1800087E700 /* Network+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6F34D72AA6C1800087E700 /* Network+Extensions.swift */; };
 		AE6F34DA2AA6C1E00087E700 /* Balance+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6F34D92AA6C1E00087E700 /* Balance+Extensions.swift */; };
+		AE7053262DE79AA30091DD78 /* BitcoinDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = AE7053252DE79AA30091DD78 /* BitcoinDevKit */; };
 		AE7839FD2AB4E18D005F0CBA /* AmountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE7839FC2AB4E18D005F0CBA /* AmountView.swift */; };
 		AE783A012AB4E5E1005F0CBA /* BuildTransactionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE783A002AB4E5E1005F0CBA /* BuildTransactionView.swift */; };
 		AE783A032AB4ECC2005F0CBA /* AddressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE783A022AB4ECC2005F0CBA /* AddressView.swift */; };
@@ -204,6 +205,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AE7053262DE79AA30091DD78 /* BitcoinDevKit in Frameworks */,
 				AE2DD83F2D6FEF3600E5F212 /* BitcoinDevKit in Frameworks */,
 				AE187D782C9BB3B50081D0C3 /* BitcoinDevKit in Frameworks */,
 				AE29ED0F2BBE2E7100EB9C4F /* BitcoinDevKit in Frameworks */,
@@ -595,6 +597,7 @@
 				AE2DD8382D6FE9B000E5F212 /* BitcoinDevKit */,
 				AE2DD83B2D6FEC3100E5F212 /* BitcoinDevKit */,
 				AE2DD83E2D6FEF3600E5F212 /* BitcoinDevKit */,
+				AE7053252DE79AA30091DD78 /* BitcoinDevKit */,
 			);
 			productName = BDKSwiftExampleWallet;
 			productReference = AE4984782A1BBBD6009951E2 /* BDKSwiftExampleWallet.app */;
@@ -652,7 +655,7 @@
 				AE7D5A0C2A7EE62200EAC8CE /* XCRemoteSwiftPackageReference "KeychainAccess" */,
 				AEB735D12B2CC4B900F99DBB /* XCRemoteSwiftPackageReference "BitcoinUI" */,
 				AEAF83B42B7BD4D10019B23B /* XCRemoteSwiftPackageReference "CodeScanner" */,
-				AEA2DEF12D70F8840067C0EB /* XCRemoteSwiftPackageReference "bdk-swift" */,
+				AE7053242DE79AA30091DD78 /* XCLocalSwiftPackageReference "../bdk-ffi/bdk-swift" */,
 			);
 			productRefGroup = AE4984792A1BBBD6009951E2 /* Products */;
 			projectDirPath = "";
@@ -1054,6 +1057,13 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		AE7053242DE79AA30091DD78 /* XCLocalSwiftPackageReference "../bdk-ffi/bdk-swift" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = "../bdk-ffi/bdk-swift";
+		};
+/* End XCLocalSwiftPackageReference section */
+
 /* Begin XCRemoteSwiftPackageReference section */
 		AE7D5A0C2A7EE62200EAC8CE /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
 			isa = XCRemoteSwiftPackageReference;
@@ -1063,14 +1073,6 @@
 				version = 4.2.2;
 			};
 		};
-		AEA2DEF12D70F8840067C0EB /* XCRemoteSwiftPackageReference "bdk-swift" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/bitcoindevkit/bdk-swift";
-			requirement = {
-				kind = exactVersion;
-				version = 1.2.0;
-			};
-		};
 		AEAF83B42B7BD4D10019B23B /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/twostraws/CodeScanner.git";
@@ -1118,6 +1120,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = BitcoinDevKit;
 		};
+		AE7053252DE79AA30091DD78 /* BitcoinDevKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = BitcoinDevKit;
+		};
 		AE7D5A0D2A7EE62200EAC8CE /* KeychainAccess */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = AE7D5A0C2A7EE62200EAC8CE /* XCRemoteSwiftPackageReference "KeychainAccess" */;
diff --git a/BDKSwiftExampleWallet/Extensions/BDK+Extensions/CanonicalTx+Extensions.swift b/BDKSwiftExampleWallet/Extensions/BDK+Extensions/CanonicalTx+Extensions.swift
@@ -16,11 +16,25 @@ extension CanonicalTx {
             confirmationBlockTime: .init(
                 blockId: .init(
                     height: UInt32(12),
-                    hash: "hash"
+                    hash: try! BlockHash.fromBytes(
+                        bytes: Data([
+                            0xc1, 0xf9, 0xfe, 0x0d, 0x7f, 0x97, 0xc6, 0x49,
+                            0x0f, 0x83, 0x60, 0xcf, 0x71, 0xbb, 0xef, 0x15,
+                            0x1f, 0x2e, 0x73, 0x30, 0x2b, 0xd0, 0x6f, 0x16,
+                            0x90, 0xd6, 0x40, 0xb9, 0x6f, 0xb9, 0x44, 0x57,
+                        ])
+                    )
                 ),
                 confirmationTime: UInt64(21)
             ),
-            transitively: "c1f9fe0d7f97c6490f8360cf71bbef151f2e73302bd06f1690d640b96fb94457"
+            transitively: try! Txid.fromBytes(
+                bytes: Data([
+                    0xc1, 0xf9, 0xfe, 0x0d, 0x7f, 0x97, 0xc6, 0x49,
+                    0x0f, 0x83, 0x60, 0xcf, 0x71, 0xbb, 0xef, 0x15,
+                    0x1f, 0x2e, 0x73, 0x30, 0x2b, 0xd0, 0x6f, 0x16,
+                    0x90, 0xd6, 0x40, 0xb9, 0x6f, 0xb9, 0x44, 0x57,
+                ])
+            )
         )
     )
 }
diff --git a/BDKSwiftExampleWallet/Extensions/BDK+Extensions/LocalOutput+Extensions.swift b/BDKSwiftExampleWallet/Extensions/BDK+Extensions/LocalOutput+Extensions.swift
@@ -6,17 +6,25 @@
 //
 
 import BitcoinDevKit
+import Foundation
 
 //#if DEBUG
 extension LocalOutput {
     static var mock = LocalOutput(
         outpoint: OutPoint(
-            txid: "txid",
+            txid: try! Txid.fromBytes(
+                bytes: Data([
+                    0xc1, 0xf9, 0xfe, 0x0d, 0x7f, 0x97, 0xc6, 0x49,
+                    0x0f, 0x83, 0x60, 0xcf, 0x71, 0xbb, 0xef, 0x15,
+                    0x1f, 0x2e, 0x73, 0x30, 0x2b, 0xd0, 0x6f, 0x16,
+                    0x90, 0xd6, 0x40, 0xb9, 0x6f, 0xb9, 0x44, 0x57,
+                ])
+            ),
             vout: UInt32(1)
         ),
         txout: TxOut(
             value: UInt64(1),
-            scriptPubkey: Script(rawOutputScript: [UInt8(1)])
+            scriptPubkey: Script.init(rawOutputScript: Data([0x51]))
         ),
         keychain: .external,
         isSpent: false,
diff --git a/BDKSwiftExampleWallet/Extensions/BDK+Extensions/Transaction+Extensions.swift b/BDKSwiftExampleWallet/Extensions/BDK+Extensions/Transaction+Extensions.swift
@@ -6,17 +6,18 @@
 //
 
 import BitcoinDevKit
+import Foundation
 
 extension Transaction {
     var transactionID: String {
-        return self.computeTxid()
+        return "\(self.computeTxid())"
     }
 }
 
 //#if DEBUG
 extension Transaction {
     static var mock = try? Transaction(
-        transactionBytes: String.mockTransactionHex.hexStringToByteArray()
+        transactionBytes: Data(String.mockTransactionHex.hexStringToByteArray())
     )
 }
 //#endif
diff --git a/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift b/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
@@ -119,12 +119,12 @@ private class BDKService {
         )
         let descriptor = Descriptor.newBip86(
             secretKey: secretKey,
-            keychain: .external,
+            keychainKind: .external,
             network: network
         )
         let changeDescriptor = Descriptor.newBip86(
             secretKey: secretKey,
-            keychain: .internal,
+            keychainKind: .internal,
             network: network
         )
         let backupInfo = BackupInfo(
@@ -222,13 +222,13 @@ private class BDKService {
         let descriptor = Descriptor.newBip86Public(
             publicKey: descriptorPublicKey,
             fingerprint: fingerprint,
-            keychain: .external,
+            keychainKind: .external,
             network: network
         )
         let changeDescriptor = Descriptor.newBip86Public(
             publicKey: descriptorPublicKey,
             fingerprint: fingerprint,
-            keychain: .internal,
+            keychainKind: .internal,
             network: network
         )
 
@@ -539,7 +539,7 @@ extension BDKClient {
                 let pb64 = """
                     cHNidP8BAIkBAAAAAeaWcxp4/+xSRJ2rhkpUJ+jQclqocoyuJ/ulSZEgEkaoAQAAAAD+////Ak/cDgAAAAAAIlEgqxShDO8ifAouGyRHTFxWnTjpY69Cssr3IoNQvMYOKG/OVgAAAAAAACJRIGnlvMwBz4Ylb6xLTe5g4ZeZCxmVH/XWG+CDlcPzzaoT8qoGAAABAStAQg8AAAAAACJRIFGGvSoLWt3hRAIwYa8KEyawiFTXoOCVWFxYtSofZuAsIRZ2b8YiEpzexWYGt8B5EqLM8BE4qxJY3pkiGw/8zOZGYxkAvh7sj1YAAIABAACAAAAAgAAAAAAEAAAAARcgdm/GIhKc3sVmBrfAeRKizPAROKsSWN6ZIhsP/MzmRmMAAQUge7cvJMsJmR56NzObGOGkm8vNqaAIJdnBXLZD2PvrinIhB3u3LyTLCZkeejczmxjhpJvLzamgCCXZwVy2Q9j764pyGQC+HuyPVgAAgAEAAIAAAACAAQAAAAYAAAAAAQUgtIFPrI2EW/+PJiAmYdmux88p0KgeAxDFLMoeQoS66hIhB7SBT6yNhFv/jyYgJmHZrsfPKdCoHgMQxSzKHkKEuuoSGQC+HuyPVgAAgAEAAIAAAACAAAAAAAIAAAAA
                     """
-                return try! Psbt(psbtBase64: pb64)
+                return try Psbt(psbtBase64: pb64)
             },
             getBackupInfo: {
                 BackupInfo(
diff --git a/BDKSwiftExampleWallet/Service/Key Service/KeyService.swift b/BDKSwiftExampleWallet/Service/Key Service/KeyService.swift
@@ -129,12 +129,12 @@ extension KeyClient {
                 )
                 let descriptor = Descriptor.newBip86(
                     secretKey: secretKey,
-                    keychain: .external,
+                    keychainKind: .external,
                     network: mockKeyClientNetwork
                 )
                 let changeDescriptor = Descriptor.newBip86(
                     secretKey: secretKey,
-                    keychain: .internal,
+                    keychainKind: .internal,
                     network: mockKeyClientNetwork
                 )
                 let backupInfo = BackupInfo(
diff --git a/BDKSwiftExampleWallet/View/Activity/LocalOutputItemView.swift b/BDKSwiftExampleWallet/View/Activity/LocalOutputItemView.swift
@@ -33,7 +33,7 @@ struct LocalOutputItemView: View {
 
             VStack(alignment: .leading, spacing: 5) {
 
-                Text(output.outpoint.txid)
+                Text(output.outpoint.txid.description)
                     .truncationMode(.middle)
                     .lineLimit(1)
                     .fontDesign(.monospaced)
diff --git a/BDKSwiftExampleWallet/View/Activity/LocalOutputListView.swift b/BDKSwiftExampleWallet/View/Activity/LocalOutputListView.swift
@@ -27,7 +27,7 @@ struct LocalOutputListView: View {
                     .listRowInsets(EdgeInsets())
                     .listRowSeparator(.hidden)
             } else {
-                ForEach(localOutputs, id: \.outpoint) { output in
+                ForEach(Array(localOutputs.enumerated()), id: \.offset) { index, output in
                     LocalOutputItemView(
                         isRedacted: false,
                         output: output
diff --git a/BDKSwiftExampleWallet/View/Activity/TransactionDetailView.swift b/BDKSwiftExampleWallet/View/Activity/TransactionDetailView.swift
@@ -124,7 +124,7 @@ struct TransactionDetailView: View {
                     Spacer()
                 }
                 Button {
-                    UIPasteboard.general.string = canonicalTx.transaction.computeTxid()
+                    UIPasteboard.general.string = "\(canonicalTx.transaction.computeTxid())"
                     isCopied = true
                     showCheckmark = true
                     DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
@@ -133,7 +133,7 @@ struct TransactionDetailView: View {
                     }
                 } label: {
                     HStack {
-                        Text(canonicalTx.transaction.computeTxid())
+                        Text("\(canonicalTx.transaction.computeTxid())")
                             .lineLimit(1)
                             .truncationMode(.middle)
                         withAnimation {
diff --git a/BDKSwiftExampleWallet/View/Activity/TransactionItemView.swift b/BDKSwiftExampleWallet/View/Activity/TransactionItemView.swift
@@ -55,7 +55,7 @@ struct TransactionItemView: View {
             }
 
             VStack(alignment: .leading, spacing: 5) {
-                Text(canonicalTx.transaction.computeTxid())
+                Text(canonicalTx.transaction.transactionID)
                     .truncationMode(.middle)
                     .lineLimit(1)
                     .fontDesign(.monospaced)
diff --git a/BDKSwiftExampleWallet/View/Receive/ReceiveView.swift b/BDKSwiftExampleWallet/View/Receive/ReceiveView.swift
@@ -121,6 +121,6 @@ struct ReceiveView: View {
 
 #if DEBUG
     #Preview("ReceiveView - en") {
-        ReceiveView(viewModel: .init(bdkClient: .mock))
+        ReceiveView(viewModel: ReceiveViewModel(bdkClient: .mock))
     }
 #endif
diff --git a/BDKSwiftExampleWallet/View/Send/BuildTransactionView.swift b/BDKSwiftExampleWallet/View/Send/BuildTransactionView.swift
@@ -169,12 +169,12 @@ struct BuildTransactionView: View {
                                 .foregroundStyle(.green)
                             if let transaction = viewModel.extractTransaction() {
                                 HStack {
-                                    Text(transaction.computeTxid())
+                                    Text("\(transaction.computeTxid())")
                                         .lineLimit(1)
                                         .truncationMode(.middle)
                                     Spacer()
                                     Button {
-                                        UIPasteboard.general.string = transaction.computeTxid()
+                                        UIPasteboard.general.string = "\(transaction.computeTxid())"
                                         isCopied = true
                                         showCheckmark = true
                                         DispatchQueue.main.asyncAfter(deadline: .now() + 2) {

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,18 @@`
`6`	`6`	`//`
`7`	`7`
`8`	`8`	`import BitcoinDevKit`
	`9`	`+import Foundation`
`9`	`10`
`10`	`11`	`extension Transaction {`
`11`	`12`	`var transactionID: String {`
`12`		`- return self.computeTxid()`
	`13`	`+ return "\(self.computeTxid())"`
`13`	`14`	`}`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`//#if DEBUG`
`17`	`18`	`extension Transaction {`
`18`	`19`	`static var mock = try? Transaction(`
`19`		`- transactionBytes: String.mockTransactionHex.hexStringToByteArray()`
	`20`	`+ transactionBytes: Data(String.mockTransactionHex.hexStringToByteArray())`
`20`	`21`	`)`
`21`	`22`	`}`
`22`	`23`	`//#endif`
Original file line number	Diff line number	Diff line change
`@@ -129,12 +129,12 @@ extension KeyClient {`
`129`	`129`	`)`
`130`	`130`	`let descriptor = Descriptor.newBip86(`
`131`	`131`	`secretKey: secretKey,`
`132`		`- keychain: .external,`
	`132`	`+ keychainKind: .external,`
`133`	`133`	`network: mockKeyClientNetwork`
`134`	`134`	`)`
`135`	`135`	`let changeDescriptor = Descriptor.newBip86(`
`136`	`136`	`secretKey: secretKey,`
`137`		`- keychain: .internal,`
	`137`	`+ keychainKind: .internal,`
`138`	`138`	`network: mockKeyClientNetwork`
`139`	`139`	`)`
`140`	`140`	`let backupInfo = BackupInfo(`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ struct TransactionItemView: View {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`VStack(alignment: .leading, spacing: 5) {`
`58`		`- Text(canonicalTx.transaction.computeTxid())`
	`58`	`+ Text(canonicalTx.transaction.transactionID)`
`59`	`59`	`.truncationMode(.middle)`
`60`	`60`	`.lineLimit(1)`
`61`	`61`	`.fontDesign(.monospaced)`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,6 @@ struct ReceiveView: View {`
`121`	`121`
`122`	`122`	`#if DEBUG`
`123`	`123`	`#Preview("ReceiveView - en") {`
`124`		`- ReceiveView(viewModel: .init(bdkClient: .mock))`
	`124`	`+ ReceiveView(viewModel: ReceiveViewModel(bdkClient: .mock))`
`125`	`125`	`}`
`126`	`126`	`#endif`