diff --git a/Bitkit.xcodeproj/project.pbxproj b/Bitkit.xcodeproj/project.pbxproj index 844a89eeb..eb927124a 100644 --- a/Bitkit.xcodeproj/project.pbxproj +++ b/Bitkit.xcodeproj/project.pbxproj @@ -1206,7 +1206,7 @@ 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" */ = { @@ -1214,7 +1214,7 @@ repositoryURL = "https://github.com/synonymdev/bitkit-core"; requirement = { kind = exactVersion; - version = 0.5.3; + version = 0.5.14; }; }; 96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = { diff --git a/Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index cf2e05754..2b1adf6fb 100644 --- a/Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/synonymdev/bitkit-core", "state" : { - "revision" : "4c859d3f2c0022fda25baa62a029e2c03d1892a7", - "version" : "0.5.3" + "revision" : "890502f241e12305325cdd0f5e46b2752b9aedf4", + "version" : "0.5.14" } }, { @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/synonymdev/ldk-node", "state" : { - "revision" : "c9a41458a646324c6c8728b4de8329ad4d52ac8d", - "version" : "0.7.0-rc.63" + "revision" : "190a17d966cf5a685444cfa17c3a419c290bf26c", + "version" : "0.7.0-rc.66" } }, { diff --git a/Bitkit/Managers/HwWalletManager.swift b/Bitkit/Managers/HwWalletManager.swift index af90ed6db..06acea2be 100644 --- a/Bitkit/Managers/HwWalletManager.swift +++ b/Bitkit/Managers/HwWalletManager.swift @@ -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( diff --git a/Bitkit/ViewModels/Trezor/TrezorViewModel.swift b/Bitkit/ViewModels/Trezor/TrezorViewModel.swift index 24b44886a..3c141df3f 100644 --- a/Bitkit/ViewModels/Trezor/TrezorViewModel.swift +++ b/Bitkit/ViewModels/Trezor/TrezorViewModel.swift @@ -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 diff --git a/BitkitTests/HwWalletManagerFundingTests.swift b/BitkitTests/HwWalletManagerFundingTests.swift index 275645ff8..8e3aa6184 100644 --- a/BitkitTests/HwWalletManagerFundingTests.swift +++ b/BitkitTests/HwWalletManagerFundingTests.swift @@ -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]] = [:] diff --git a/BitkitTests/HwWalletManagerTests.swift b/BitkitTests/HwWalletManagerTests.swift index 51aa5fb19..5f21064ab 100644 --- a/BitkitTests/HwWalletManagerTests.swift +++ b/BitkitTests/HwWalletManagerTests.swift @@ -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]] = [:] diff --git a/BitkitTests/TrezorViewModelWatcherTests.swift b/BitkitTests/TrezorViewModelWatcherTests.swift index fdb22dcf2..c266ad9ef 100644 --- a/BitkitTests/TrezorViewModelWatcherTests.swift +++ b/BitkitTests/TrezorViewModelWatcherTests.swift @@ -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