Skip to content

Commit 6b83010

Browse files
reezreez
authored
spm: bdk-swift 4e3783cfaee98e14ed12aee3cf1d63b2fc99705b (1.1.0-rc.1)
1 parent 56d6608 commit 6b83010

File tree

6 files changed

+52
-18
lines changed

6 files changed

+52
-18
lines changed

‎BDKSwiftExampleWallet.xcodeproj/project.pbxproj

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
AE2ADD782B61EFFF00C2A823 /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE2ADD772B61EFFE00C2A823 /* SettingsViewModel.swift */; };
3434
AE2B8C1D2A9678C900815B2F /* FeeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE2B8C1C2A9678C900815B2F /* FeeService.swift */; };
3535
AE2B8C1F2A96797300815B2F /* RecommendedFees.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE2B8C1E2A96797300815B2F /* RecommendedFees.swift */; };
36+
AE2DD8392D6FE9B000E5F212 /* BitcoinDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = AE2DD8382D6FE9B000E5F212 /* BitcoinDevKit */; };
37+
AE2DD83C2D6FEC3100E5F212 /* BitcoinDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = AE2DD83B2D6FEC3100E5F212 /* BitcoinDevKit */; };
38+
AE2DD83F2D6FEF3600E5F212 /* BitcoinDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = AE2DD83E2D6FEF3600E5F212 /* BitcoinDevKit */; };
3639
AE2F255D2BED0BFB002A9AC6 /* AppError.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE2F255C2BED0BFB002A9AC6 /* AppError.swift */; };
3740
AE32D7622D0C9146006A8788 /* BitcoinDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = AE32D7612D0C9146006A8788 /* BitcoinDevKit */; };
3841
AE34DDAC2B6B31ED00F04AD4 /* WalletRecoveryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE34DDAB2B6B31ED00F04AD4 /* WalletRecoveryView.swift */; };
@@ -45,7 +48,6 @@
4548
AE4984832A1BBBD7009951E2 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AE4984822A1BBBD7009951E2 /* Preview Assets.xcassets */; };
4649
AE49848D2A1BBBD8009951E2 /* BDKSwiftExampleWalletTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE49848C2A1BBBD8009951E2 /* BDKSwiftExampleWalletTests.swift */; };
4750
AE4984A62A1BBCB8009951E2 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = AE4984A52A1BBCB8009951E2 /* README.md */; };
48-
AE52D68F2D1367C80042119D /* BitcoinDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = AE52D68E2D1367C80042119D /* BitcoinDevKit */; };
4951
AE6715FA2A9A9220005C193F /* BDKSwiftExampleWalletPriceServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6715F92A9A9220005C193F /* BDKSwiftExampleWalletPriceServiceTests.swift */; };
5052
AE6715FD2A9AC056005C193F /* PriceServiceError.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6715FC2A9AC056005C193F /* PriceServiceError.swift */; };
5153
AE6715FF2A9AC066005C193F /* FeeServiceError.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6715FE2A9AC066005C193F /* FeeServiceError.swift */; };
@@ -192,14 +194,16 @@
192194
isa = PBXFrameworksBuildPhase;
193195
buildActionMask = 2147483647;
194196
files = (
197+
AE2DD83F2D6FEF3600E5F212 /* BitcoinDevKit in Frameworks */,
195198
AE187D782C9BB3B50081D0C3 /* BitcoinDevKit in Frameworks */,
196199
AE29ED0F2BBE2E7100EB9C4F /* BitcoinDevKit in Frameworks */,
197200
AEAF83B62B7BD4D10019B23B /* CodeScanner in Frameworks */,
198-
AE52D68F2D1367C80042119D /* BitcoinDevKit in Frameworks */,
201+
AE2DD8392D6FE9B000E5F212 /* BitcoinDevKit in Frameworks */,
199202
AE32D7622D0C9146006A8788 /* BitcoinDevKit in Frameworks */,
200203
AE4135652D0CC1AD00605103 /* BitcoinDevKit in Frameworks */,
201204
AEB735D32B2CC4B900F99DBB /* BitcoinUI in Frameworks */,
202205
AEE83A492C07F54B00834468 /* BitcoinDevKit in Frameworks */,
206+
AE2DD83C2D6FEC3100E5F212 /* BitcoinDevKit in Frameworks */,
203207
AE7D5A0E2A7EE62200EAC8CE /* KeychainAccess in Frameworks */,
204208
);
205209
runOnlyForDeploymentPostprocessing = 0;
@@ -557,7 +561,9 @@
557561
AE187D772C9BB3B50081D0C3 /* BitcoinDevKit */,
558562
AE32D7612D0C9146006A8788 /* BitcoinDevKit */,
559563
AE4135642D0CC1AD00605103 /* BitcoinDevKit */,
560-
AE52D68E2D1367C80042119D /* BitcoinDevKit */,
564+
AE2DD8382D6FE9B000E5F212 /* BitcoinDevKit */,
565+
AE2DD83B2D6FEC3100E5F212 /* BitcoinDevKit */,
566+
AE2DD83E2D6FEF3600E5F212 /* BitcoinDevKit */,
561567
);
562568
productName = BDKSwiftExampleWallet;
563569
productReference = AE4984782A1BBBD6009951E2 /* BDKSwiftExampleWallet.app */;
@@ -614,7 +620,7 @@
614620
AE7D5A0C2A7EE62200EAC8CE /* XCRemoteSwiftPackageReference "KeychainAccess" */,
615621
AEB735D12B2CC4B900F99DBB /* XCRemoteSwiftPackageReference "BitcoinUI" */,
616622
AEAF83B42B7BD4D10019B23B /* XCRemoteSwiftPackageReference "CodeScanner" */,
617-
AE52D68D2D1367C80042119D /* XCRemoteSwiftPackageReference "bdk-swift" */,
623+
AEA2DEF12D70F8840067C0EB /* XCRemoteSwiftPackageReference "bdk-swift" */,
618624
);
619625
productRefGroup = AE4984792A1BBBD6009951E2 /* Products */;
620626
projectDirPath = "";
@@ -1012,20 +1018,20 @@
10121018
/* End XCConfigurationList section */
10131019

10141020
/* Begin XCRemoteSwiftPackageReference section */
1015-
AE52D68D2D1367C80042119D /* XCRemoteSwiftPackageReference "bdk-swift" */ = {
1021+
AE7D5A0C2A7EE62200EAC8CE /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
10161022
isa = XCRemoteSwiftPackageReference;
1017-
repositoryURL = "https://github.com/bitcoindevkit/bdk-swift.git";
1023+
repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess.git";
10181024
requirement = {
10191025
kind = exactVersion;
1020-
version = "1.0.0-beta.7";
1026+
version = 4.2.2;
10211027
};
10221028
};
1023-
AE7D5A0C2A7EE62200EAC8CE /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
1029+
AEA2DEF12D70F8840067C0EB /* XCRemoteSwiftPackageReference "bdk-swift" */ = {
10241030
isa = XCRemoteSwiftPackageReference;
1025-
repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess.git";
1031+
repositoryURL = "https://github.com/bitcoindevkit/bdk-swift";
10261032
requirement = {
1027-
kind = exactVersion;
1028-
version = 4.2.2;
1033+
kind = revision;
1034+
revision = 4e3783cfaee98e14ed12aee3cf1d63b2fc99705b;
10291035
};
10301036
};
10311037
AEAF83B42B7BD4D10019B23B /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
@@ -1055,17 +1061,24 @@
10551061
isa = XCSwiftPackageProductDependency;
10561062
productName = BitcoinDevKit;
10571063
};
1058-
AE32D7612D0C9146006A8788 /* BitcoinDevKit */ = {
1064+
AE2DD8382D6FE9B000E5F212 /* BitcoinDevKit */ = {
10591065
isa = XCSwiftPackageProductDependency;
10601066
productName = BitcoinDevKit;
10611067
};
1062-
AE4135642D0CC1AD00605103 /* BitcoinDevKit */ = {
1068+
AE2DD83B2D6FEC3100E5F212 /* BitcoinDevKit */ = {
10631069
isa = XCSwiftPackageProductDependency;
10641070
productName = BitcoinDevKit;
10651071
};
1066-
AE52D68E2D1367C80042119D /* BitcoinDevKit */ = {
1072+
AE2DD83E2D6FEF3600E5F212 /* BitcoinDevKit */ = {
1073+
isa = XCSwiftPackageProductDependency;
1074+
productName = BitcoinDevKit;
1075+
};
1076+
AE32D7612D0C9146006A8788 /* BitcoinDevKit */ = {
1077+
isa = XCSwiftPackageProductDependency;
1078+
productName = BitcoinDevKit;
1079+
};
1080+
AE4135642D0CC1AD00605103 /* BitcoinDevKit */ = {
10671081
isa = XCSwiftPackageProductDependency;
1068-
package = AE52D68D2D1367C80042119D /* XCRemoteSwiftPackageReference "bdk-swift" */;
10691082
productName = BitcoinDevKit;
10701083
};
10711084
AE7D5A0D2A7EE62200EAC8CE /* KeychainAccess */ = {

‎BDKSwiftExampleWallet/Extensions/BDK+Extensions/LocalOutput+Extensions.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ extension LocalOutput {
1919
scriptPubkey: Script(rawOutputScript: [UInt8(1)])
2020
),
2121
keychain: .external,
22-
isSpent: false
22+
isSpent: false,
23+
derivationIndex: UInt32(32),
24+
chainPosition: .unconfirmed(timestamp: nil)
2325
)
2426
}
2527
//#endif

‎BDKSwiftExampleWallet/Extensions/BDK+Extensions/Network+Extensions.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ extension Network {
1313
switch self {
1414
case .bitcoin: return "bitcoin"
1515
case .testnet: return "testnet"
16+
case .testnet4: return "testnet4"
1617
case .signet: return "signet"
1718
case .regtest: return "regtest"
1819
}
@@ -22,6 +23,7 @@ extension Network {
2223
switch stringValue {
2324
case "bitcoin": self = .bitcoin
2425
case "testnet": self = .testnet
26+
case "testnet4": self = .testnet4
2527
case "signet": self = .signet
2628
case "regtest": self = .regtest
2729
default: return nil

‎BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ private class BDKService {
4848
newURL = Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
4949
case .signet:
5050
newURL = Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
51+
case .testnet4:
52+
newURL = Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
5153
}
5254
updateEsploraURL(newURL)
5355

@@ -121,6 +123,8 @@ private class BDKService {
121123
baseUrl = Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
122124
case .signet:
123125
baseUrl = Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
126+
case .testnet4:
127+
baseUrl = Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
124128
}
125129

126130
var words12: String
@@ -257,6 +261,8 @@ private class BDKService {
257261
baseUrl = Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
258262
case .signet:
259263
baseUrl = Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
264+
case .testnet4:
265+
baseUrl = Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
260266
}
261267

262268
guard let xpubString = xpub, !xpubString.isEmpty else {

‎BDKSwiftExampleWallet/Utilities/Constants.swift

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,16 @@ struct Constants {
3535
}
3636
struct Testnet {
3737
static let blockstream = "https://blockstream.info/testnet/api/"
38-
//static let kuutamo = "https://esplora.testnet.kuutamo.cloud"
3938
static let mempoolspace = "https://mempool.space/testnet/api/"
4039
static let allValues = [
4140
mempoolspace,
4241
blockstream,
43-
//kuutamo,
42+
]
43+
}
44+
struct Testnet4 {
45+
static let mempoolspace = "https://mempool.space/testnet4/api/"
46+
static let allValues = [
47+
mempoolspace
4448
]
4549
}
4650
}
@@ -50,6 +54,7 @@ struct Constants {
5054
case regtest
5155
case signet
5256
case testnet
57+
case testnet4
5358

5459
var color: Color {
5560
switch self {
@@ -65,6 +70,8 @@ struct Constants {
6570
return Color.orange
6671
case .testnet:
6772
return Color.red
73+
case .testnet4:
74+
return Color.cyan
6875
}
6976
}
7077
}

‎BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ class OnboardingViewModel: ObservableObject {
5656
return Constants.Config.EsploraServerURLNetwork.Regtest.allValues
5757
case .signet:
5858
return Constants.Config.EsploraServerURLNetwork.Signet.allValues
59+
case .testnet4:
60+
return Constants.Config.EsploraServerURLNetwork.Testnet4.allValues
5961
}
6062
}
6163
var buttonColor: Color {
@@ -68,6 +70,8 @@ class OnboardingViewModel: ObservableObject {
6870
return Constants.BitcoinNetworkColor.signet.color
6971
case .regtest:
7072
return Constants.BitcoinNetworkColor.regtest.color
73+
case .testnet4:
74+
return Constants.BitcoinNetworkColor.testnet4.color
7175
}
7276
}
7377

0 commit comments

Comments
 (0)