Merge pull request #245 from synonymdev/feat/onchain-events

Integrate LDK onchain events

Author: ovitrif

.github/workflows/integration-tests.yml

@@ -41,21 +41,11 @@ jobs:
             ~/Library/org.swift.swiftpm
             Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm
           key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-spm-
-
-      - name: Cache DerivedData
-        uses: actions/cache@v4
-        with:
-          path: ~/Library/Developer/Xcode/DerivedData
-          key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.swift', '**/*.m', '**/*.h', 'Bitkit.xcodeproj/project.pbxproj') }}
-          restore-keys: |
-            ${{ runner.os }}-deriveddata-
 
       - name: Install dependencies
         run: |
           echo "⏱️  Starting dependency resolution at $(date)"
-          xcodebuild -resolvePackageDependencies | xcbeautify
+          xcodebuild -resolvePackageDependencies -onlyUsePackageVersionsFromResolvedFile | xcbeautify
           echo "✅ Dependencies resolved at $(date)"
 
       - name: Pre-start simulator
@@ -64,6 +54,12 @@ jobs:
           xcrun simctl boot "iPhone 16" || true
           echo "✅ Simulator started at $(date)"
 
+      - name: Clean build
+        run: |
+          echo "⏱️  Cleaning build at $(date)"
+          xcodebuild clean -scheme Bitkit | xcbeautify
+          echo "✅ Build cleaned at $(date)"
+
       - name: Run integration tests
         run: |
           echo "⏱️  Starting integration tests at $(date)"

.github/workflows/unit-tests.yml

@@ -40,21 +40,11 @@ jobs:
             ~/Library/org.swift.swiftpm
             Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm
           key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-spm-
-
-      - name: Cache DerivedData
-        uses: actions/cache@v4
-        with:
-          path: ~/Library/Developer/Xcode/DerivedData
-          key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.swift', '**/*.m', '**/*.h', 'Bitkit.xcodeproj/project.pbxproj') }}
-          restore-keys: |
-            ${{ runner.os }}-deriveddata-
 
       - name: Install dependencies
         run: |
           echo "⏱️  Starting dependency resolution at $(date)"
-          xcodebuild -resolvePackageDependencies | xcbeautify
+          xcodebuild -resolvePackageDependencies -onlyUsePackageVersionsFromResolvedFile | xcbeautify
           echo "✅ Dependencies resolved at $(date)"
 
       - name: Pre-start simulator
@@ -63,6 +53,12 @@ jobs:
           xcrun simctl boot "iPhone 16" || true
           echo "✅ Simulator started at $(date)"
 
+      - name: Clean build
+        run: |
+          echo "⏱️  Cleaning build at $(date)"
+          xcodebuild clean -scheme Bitkit | xcbeautify
+          echo "✅ Build cleaned at $(date)"
+
       - name: Run unit tests
         run: |
           echo "⏱️  Starting unit tests at $(date)"

Bitkit.xcodeproj/project.pbxproj

@@ -94,7 +94,6 @@
 				Services/MigrationsService.swift,
 				Services/ServiceQueue.swift,
 				Services/VssStoreIdProvider.swift,
-				Utilities/AddressChecker.swift,
 				Utilities/Crypto.swift,
 				Utilities/Errors.swift,
 				Utilities/Keychain.swift,
@@ -118,7 +117,6 @@
 				Services/LightningService.swift,
 				Services/ServiceQueue.swift,
 				Services/VssStoreIdProvider.swift,
-				Utilities/AddressChecker.swift,
 				Utilities/Crypto.swift,
 				Utilities/Errors.swift,
 				Utilities/Keychain.swift,

Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -71,7 +71,6 @@ struct AppScene: View {
             .onChange(of: currency.hasStaleData, perform: handleCurrencyStaleData)
             .onChange(of: wallet.walletExists, perform: handleWalletExistsChange)
             .onChange(of: wallet.nodeLifecycleState, perform: handleNodeLifecycleChange)
-            .onChange(of: wallet.totalBalanceSats, perform: handleBalanceChange)
             .onChange(of: scenePhase, perform: handleScenePhaseChange)
             .environmentObject(app)
             .environmentObject(navigation)
@@ -215,11 +214,6 @@ struct AppScene: View {
             app?.handleLdkNodeEvent(lightningEvent)
         }
 
-        wallet.addOnEvent(id: "activity-sync") { [weak activity] (_: Event) in
-            // TODO: this might not be the best for performace to sync all payments on every event. Could switch to habdling the specific event.
-            Task { try? await activity?.syncLdkNodePayments() }
-        }
-
         if wallet.isRestoringWallet {
             Task {
                 await BackupService.shared.performFullRestoreFromLatestBackup()
@@ -284,11 +278,6 @@ struct AppScene: View {
         }
     }
 
-    private func handleBalanceChange(_: Int) {
-        // Anytime we receive a balance update, we should sync the payments to activity list
-        Task { try? await activity.syncLdkNodePayments() }
-    }
-
     private func handleScenePhaseChange(_: ScenePhase) {
         // If PIN is enabled, lock the app when the app goes to the background
         if scenePhase == .background && settings.pinEnabled {

Bitkit/AppScene.swift

@@ -48,6 +48,7 @@ struct ToastView: View {
         )
         .cornerRadius(8)
         .shadow(color: .black.opacity(0.2), radius: 8, x: 0, y: 4)
+        .accessibilityIdentifierIfPresent(toast.accessibilityIdentifier)
     }
 
     private var accentColor: Color {
@@ -68,7 +69,8 @@ struct ToastView: View {
             title: "Hey toast",
             description: "This is a toast message",
             autoHide: true,
-            visibilityTime: 4.0
+            visibilityTime: 4.0,
+            accessibilityIdentifier: nil
         ), onDismiss: {}
     )
     .preferredColorScheme(.dark)

Bitkit/Components/ToastView.swift

@@ -10,4 +10,5 @@ struct Toast: Equatable {
     let description: String?
     let autoHide: Bool
     let visibilityTime: Double
+    let accessibilityIdentifier: String?
 }

Bitkit/Models/Toast.swift

@@ -968,6 +968,14 @@
 "wallet__toast_payment_success_description" = "Your instant payment was sent successfully.";
 "wallet__toast_payment_failed_title" = "Payment Failed";
 "wallet__toast_payment_failed_description" = "Your instant payment failed. Please try again.";
+"wallet__toast_received_transaction_replaced_title" = "Received Transaction Replaced";
+"wallet__toast_received_transaction_replaced_description" = "Your received transaction was replaced by a fee bump";
+"wallet__toast_transaction_replaced_title" = "Transaction Replaced";
+"wallet__toast_transaction_replaced_description" = "Your transaction was replaced by a fee bump";
+"wallet__toast_transaction_unconfirmed_title" = "Transaction Unconfirmed";
+"wallet__toast_transaction_unconfirmed_description" = "Transaction became unconfirmed due to blockchain reorganization";
+"wallet__toast_transaction_removed_title" = "Transaction Removed";
+"wallet__toast_transaction_removed_description" = "Transaction was removed from mempool";
 "wallet__selection_title" = "Coin Selection";
 "wallet__selection_auto" = "Auto";
 "wallet__selection_total_required" = "Total required";
@@ -1046,6 +1054,8 @@
 "wallet__activity_output" = "{count, plural, one {OUTPUT} other {OUTPUTS (#)}}";
 "wallet__activity_boosted_cpfp" = "BOOSTED TRANSACTION {num} (CPFP)";
 "wallet__activity_boosted_rbf" = "BOOSTED TRANSACTION {num} (RBF)";
+"wallet__activity_boost_fee" = "Boost Fee";
+"wallet__activity_boost_fee_description" = "Boosted incoming transaction";
 "wallet__activity_explorer" = "Open Block Explorer";
 "wallet__activity_successful" = "Successful";
 "wallet__activity_invoice_note" = "Invoice note";