Skip to content

chore: bump bitkit-core ldk-node to match android #726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ovitrif merged 1 commit into from
Sep 3, 2026
Merged

chore: bump bitkit-core ldk-node to match android #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Bitkit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,15 +1206,15 @@
repositoryURL = "https://github.com/synonymdev/ldk-node";
requirement = {
kind = exactVersion;
version = "0.7.0-rc.63";
version = "0.7.0-rc.66";
};
};
96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
kind = exactVersion;
version = 0.5.3;
version = 0.5.14;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand Down
8 changes: 4 additions & 4 deletions Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Bitkit/Managers/HwWalletManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ final class HwWalletManager {
/// Core builds the persistence-ready activities (core 0.3.4 watch-only watcher); the manager
/// stores, aggregates, and scopes them to the wallet.
func handleWatcherEvent(watcherId: String, event: WatcherEvent) {
guard case let .transactionsChanged(activities, transactionDetails, balance, _, _, _) = event else { return }
guard case let .transactionsChanged(activities, transactionDetails, balance, _, _, _, _) = event else { return }
let walletId = walletId(fromWatcherId: watcherId)
let previous = watcherData[watcherId]
watcherData[watcherId] = HwWatcherData(
Expand Down
2 changes: 1 addition & 1 deletion Bitkit/ViewModels/Trezor/TrezorViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ class TrezorViewModel {
guard watcherId == activeWatcherId || watcherId == startingWatcherId else { return }

switch event {
case let .transactionsChanged(activities, _, balance, txCount, blockHeight, accountType):
case let .transactionsChanged(activities, _, balance, txCount, blockHeight, accountType, _):
watcherConnectionStatus = .connected
watcherError = nil
watcherActivities = activities
Expand Down
7 changes: 6 additions & 1 deletion BitkitTests/HwWalletManagerFundingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,15 @@ final class HwWalletManagerFundingTests: XCTestCase {
balance: balance,
txCount: 0,
blockHeight: 100,
accountType: .nativeSegwit
accountType: .nativeSegwit,
nextUnusedExternalAddress: unusedAddress()
)
}

private func unusedAddress() -> BitkitCore.AddressInfo {
BitkitCore.AddressInfo(address: "bc1qtestunused", path: "m/84'/0'/0'/0/0", transfers: 0)
}

/// Watcher ids are keyed by wallet identity, so they are derived from the device's xpubs.
/// `makeDevice` records them here so tests can keep naming devices by their transport id.
private var xpubsByDeviceId: [String: [String: String]] = [:]
Expand Down
7 changes: 6 additions & 1 deletion BitkitTests/HwWalletManagerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,15 @@ final class HwWalletManagerTests: XCTestCase {
balance: balance,
txCount: UInt32(activities.count),
blockHeight: 100,
accountType: .nativeSegwit
accountType: .nativeSegwit,
nextUnusedExternalAddress: unusedAddress()
)
}

private func unusedAddress() -> BitkitCore.AddressInfo {
BitkitCore.AddressInfo(address: "bc1qtestunused", path: "m/84'/0'/0'/0/0", transfers: 0)
}

/// Watcher ids are keyed by wallet identity, so they are derived from the device's xpubs.
/// `makeDevice` records them here so tests can keep naming devices by their transport id.
private var xpubsByDeviceId: [String: [String: String]] = [:]
Expand Down
7 changes: 6 additions & 1 deletion BitkitTests/TrezorViewModelWatcherTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,15 @@ final class TrezorViewModelWatcherTests: XCTestCase {
balance: sampleBalance,
txCount: 3,
blockHeight: 850_000,
accountType: .nativeSegwit
accountType: .nativeSegwit,
nextUnusedExternalAddress: unusedAddress()
)
}

private static func unusedAddress() -> BitkitCore.AddressInfo {
BitkitCore.AddressInfo(address: "bc1qtestunused", path: "m/84'/0'/0'/0/0", transfers: 0)
}

// MARK: - Helpers

@MainActor
Expand Down
Loading