Integrate LDK onchain events

Author: ben-kaufman

Bitkit.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		186523ED2ED7365100485B41 /* LDKNode in Frameworks */ = {isa = PBXBuildFile; productRef = 186523EC2ED7365100485B41 /* LDKNode */; };
 		18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
 		18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
 		4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
@@ -17,7 +18,6 @@
 		96204B782DE9AA43007BAA26 /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = 96204B772DE9AA43007BAA26 /* SQLite */; };
 		966DE6702C51210000A7B0EF /* LightningDevKit in Frameworks */ = {isa = PBXBuildFile; productRef = 966DE66F2C51210000A7B0EF /* LightningDevKit */; };
 		968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */ = {isa = PBXBuildFile; productRef = 9613018B2C5022D700878183 /* LDKNode */; };
-		968FE1402DFB016B0053CD7F /* LDKNode in Frameworks */ = {isa = PBXBuildFile; productRef = 968FE13F2DFB016B0053CD7F /* LDKNode */; };
 		96DEA03A2DE8BBA1009932BF /* BitkitCore in Frameworks */ = {isa = PBXBuildFile; productRef = 96DEA0392DE8BBA1009932BF /* BitkitCore */; };
 		96DEA03C2DE8BBAB009932BF /* BitkitCore in Frameworks */ = {isa = PBXBuildFile; productRef = 96DEA03B2DE8BBAB009932BF /* BitkitCore */; };
 		96E20CD42CB6D91A00C24149 /* CodeScanner in Frameworks */ = {isa = PBXBuildFile; productRef = 96E20CD32CB6D91A00C24149 /* CodeScanner */; };
@@ -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,
@@ -148,8 +146,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				968FE1402DFB016B0053CD7F /* LDKNode in Frameworks */,
 				96DEA03C2DE8BBAB009932BF /* BitkitCore in Frameworks */,
+				186523ED2ED7365100485B41 /* LDKNode in Frameworks */,
 				4AFCA3722E0596D900205CAE /* Zip in Frameworks */,
 				96E493A82C943184000E8BC2 /* secp256k1 in Frameworks */,
 				18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */,
@@ -241,8 +239,8 @@
 				96E493A72C943184000E8BC2 /* secp256k1 */,
 				96DEA03B2DE8BBAB009932BF /* BitkitCore */,
 				4AFCA3712E0596D900205CAE /* Zip */,
-				968FE13F2DFB016B0053CD7F /* LDKNode */,
 				18D65E012EB964BD00252335 /* VssRustClientFfi */,
+				186523EC2ED7365100485B41 /* LDKNode */,
 			);
 			productName = BitkitNotification;
 			productReference = 961058DC2C355B5500E1F1D8 /* BitkitNotification.appex */;
@@ -383,9 +381,9 @@
 				96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */,
 				96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */,
 				4AFCA36E2E05933800205CAE /* XCRemoteSwiftPackageReference "Zip" */,
-				968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
 				4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
 				18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
+				186523EB2ED7365100485B41 /* XCRemoteSwiftPackageReference "ldk-node" */,
 			);
 			productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
 			projectDirPath = "";
@@ -876,6 +874,14 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
+		186523EB2ED7365100485B41 /* XCRemoteSwiftPackageReference "ldk-node" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/synonymdev/ldk-node";
+			requirement = {
+				branch = main;
+				kind = branch;
+			};
+		};
 		18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
@@ -924,14 +930,6 @@
 				minimumVersion = 0.0.123;
 			};
 		};
-		968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/synonymdev/ldk-node";
-			requirement = {
-				branch = main;
-				kind = branch;
-			};
-		};
 		96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/synonymdev/bitkit-core";
@@ -959,6 +957,11 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		186523EC2ED7365100485B41 /* LDKNode */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 186523EB2ED7365100485B41 /* XCRemoteSwiftPackageReference "ldk-node" */;
+			productName = LDKNode;
+		};
 		18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
@@ -1004,11 +1007,6 @@
 			package = 966DE66E2C51210000A7B0EF /* XCRemoteSwiftPackageReference "ldk-swift" */;
 			productName = LightningDevKit;
 		};
-		968FE13F2DFB016B0053CD7F /* LDKNode */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */;
-			productName = LDKNode;
-		};
 		96DEA0392DE8BBA1009932BF /* BitkitCore */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */;

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 {