Skip to content

Commit 7787689

Browse files
committed
feat: sort UTXOs using Comparable Txid
1 parent 9e72529 commit 7787689

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

BDKSwiftExampleWallet.xcodeproj/project.pbxproj

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 56;
6+
objectVersion = 60;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -92,14 +92,14 @@
9292
AED4CC122A1D640800CE1831 /* BDKSwiftExampleWalletWalletViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AED4CC112A1D640800CE1831 /* BDKSwiftExampleWalletWalletViewModelTests.swift */; };
9393
AED79FC22A97D14100FD3C7D /* BDKSwiftExampleWalletDouble+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AED79FC12A97D14100FD3C7D /* BDKSwiftExampleWalletDouble+Extensions.swift */; };
9494
AED79FC52A97D47D00FD3C7D /* BDKSwiftExampleWalletSendViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AED79FC42A97D47D00FD3C7D /* BDKSwiftExampleWalletSendViewModelTests.swift */; };
95+
AEDCFC2C2EC50CBF00E3C05C /* BitcoinDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = AEDCFC2B2EC50CBF00E3C05C /* BitcoinDevKit */; };
9596
AEE6C74C2ABCB3E200442ADD /* Transaction+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE6C74B2ABCB3E200442ADD /* Transaction+Extensions.swift */; };
9697
AEE6C74F2ABCBA4600442ADD /* WalletSyncState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE6C74E2ABCBA4600442ADD /* WalletSyncState.swift */; };
9798
AEEA0E402DEF80B600C83255 /* Outpoint+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEEA0E3F2DEF80B600C83255 /* Outpoint+Extensions.swift */; };
9899
AEEC65532E8EC260003B55E8 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = AEEC65522E8EC25F003B55E8 /* AppIcon.icon */; };
99100
AF77B2012F4B2C9E00000004 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = AF77B2172F4B2C9E00000004 /* KeychainAccess */; };
100101
AF77B2022F4B2C9E00000002 /* CodeScanner in Frameworks */ = {isa = PBXBuildFile; productRef = AF77B2152F4B2C9E00000002 /* CodeScanner */; };
101102
AF77B2032F4B2C9E00000003 /* BitcoinUI in Frameworks */ = {isa = PBXBuildFile; productRef = AF77B2162F4B2C9E00000003 /* BitcoinUI */; };
102-
AF77B2042F4B2C9E00000001 /* BitcoinDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = AF77B2142F4B2C9E00000001 /* BitcoinDevKit */; };
103103
/* End PBXBuildFile section */
104104

105105
/* Begin PBXContainerItemProxy section */
@@ -213,7 +213,7 @@
213213
isa = PBXFrameworksBuildPhase;
214214
buildActionMask = 2147483647;
215215
files = (
216-
AF77B2042F4B2C9E00000001 /* BitcoinDevKit in Frameworks */,
216+
AEDCFC2C2EC50CBF00E3C05C /* BitcoinDevKit in Frameworks */,
217217
AF77B2022F4B2C9E00000002 /* CodeScanner in Frameworks */,
218218
AF77B2032F4B2C9E00000003 /* BitcoinUI in Frameworks */,
219219
AF77B2012F4B2C9E00000004 /* KeychainAccess in Frameworks */,
@@ -597,7 +597,7 @@
597597
AF77B2172F4B2C9E00000004 /* KeychainAccess */,
598598
AF77B2162F4B2C9E00000003 /* BitcoinUI */,
599599
AF77B2152F4B2C9E00000002 /* CodeScanner */,
600-
AF77B2142F4B2C9E00000001 /* BitcoinDevKit */,
600+
AEDCFC2B2EC50CBF00E3C05C /* BitcoinDevKit */,
601601
);
602602
productName = BDKSwiftExampleWallet;
603603
productReference = AE4984782A1BBBD6009951E2 /* BDKSwiftExampleWallet.app */;
@@ -655,7 +655,7 @@
655655
AF77B2242F4B2C9E00000004 /* XCRemoteSwiftPackageReference "KeychainAccess" */,
656656
AF77B2232F4B2C9E00000003 /* XCRemoteSwiftPackageReference "BitcoinUI" */,
657657
AF77B2222F4B2C9E00000002 /* XCRemoteSwiftPackageReference "CodeScanner" */,
658-
AF77B2212F4B2C9E00000001 /* XCRemoteSwiftPackageReference "bdk-swift" */,
658+
AEDCFC2A2EC50CBF00E3C05C /* XCLocalSwiftPackageReference "../bdk-ffi/bdk-swift" */,
659659
);
660660
productRefGroup = AE4984792A1BBBD6009951E2 /* Products */;
661661
projectDirPath = "";
@@ -1065,15 +1065,14 @@
10651065
};
10661066
/* End XCConfigurationList section */
10671067

1068-
/* Begin XCRemoteSwiftPackageReference section */
1069-
AF77B2212F4B2C9E00000001 /* XCRemoteSwiftPackageReference "bdk-swift" */ = {
1070-
isa = XCRemoteSwiftPackageReference;
1071-
repositoryURL = "https://github.com/bitcoindevkit/bdk-swift";
1072-
requirement = {
1073-
kind = exactVersion;
1074-
version = 2.2.0;
1075-
};
1068+
/* Begin XCLocalSwiftPackageReference section */
1069+
AEDCFC2A2EC50CBF00E3C05C /* XCLocalSwiftPackageReference "../bdk-ffi/bdk-swift" */ = {
1070+
isa = XCLocalSwiftPackageReference;
1071+
relativePath = "../bdk-ffi/bdk-swift";
10761072
};
1073+
/* End XCLocalSwiftPackageReference section */
1074+
1075+
/* Begin XCRemoteSwiftPackageReference section */
10771076
AF77B2222F4B2C9E00000002 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
10781077
isa = XCRemoteSwiftPackageReference;
10791078
repositoryURL = "https://github.com/twostraws/CodeScanner.git";
@@ -1101,9 +1100,8 @@
11011100
/* End XCRemoteSwiftPackageReference section */
11021101

11031102
/* Begin XCSwiftPackageProductDependency section */
1104-
AF77B2142F4B2C9E00000001 /* BitcoinDevKit */ = {
1103+
AEDCFC2B2EC50CBF00E3C05C /* BitcoinDevKit */ = {
11051104
isa = XCSwiftPackageProductDependency;
1106-
package = AF77B2212F4B2C9E00000001 /* XCRemoteSwiftPackageReference "bdk-swift" */;
11071105
productName = BitcoinDevKit;
11081106
};
11091107
AF77B2152F4B2C9E00000002 /* CodeScanner */ = {

BDKSwiftExampleWallet/View/Activity/LocalOutputListView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct LocalOutputListView: View {
3030
.listRowSeparator(.hidden)
3131
} else {
3232
let sortedOutputs = localOutputs.sorted { lhs, rhs in
33-
lhs.outpoint.txid.description < rhs.outpoint.txid.description
33+
lhs.outpoint.txid < rhs.outpoint.txid
3434
}
3535
ForEach(sortedOutputs, id: \.outpoint) { output in
3636
LocalOutputItemView(

0 commit comments

Comments
 (0)