Swift channel manager claim funds

Author: Jasonvdb

ios/Ldk.m

@@ -82,6 +82,9 @@ @interface RCT_EXTERN_MODULE(Ldk, NSObject)
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(processPendingHtlcForwards:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(claimFunds:(NSString *)paymentPreimage
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 @end
 
 //MARK: Events

ios/Ldk.swift

@@ -49,6 +49,7 @@ enum LdkErrors: String {
     case invoice_payment_fail = "invoice_payment_fail"
     case init_ldk_currency = "init_ldk_currency"
     case invoice_create_failed = "invoice_create_failed"
+    case claim_funds_failed = "claim_funds_failed"
 }
 
 enum LdkCallbackResponses: String {
@@ -68,6 +69,7 @@ enum LdkCallbackResponses: String {
     case tx_set_confirmed = "tx_set_confirmed"
     case tx_set_unconfirmed = "tx_set_unconfirmed"
     case process_pending_htlc_forwards_success = "process_pending_htlc_forwards_success"
+    case claim_funds_success = "claim_funds_success"
 }
 
 @objc(Ldk)
@@ -480,6 +482,20 @@ class Ldk: NSObject {
         handleResolve(resolve, .process_pending_htlc_forwards_success)
     }
 
+    @objc
+    func claimFunds(_ paymentPreimage: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard let channelManager = channelManager else {
+            return handleReject(reject, .init_channel_manager)
+        }
+        
+        let res = channelManager.claim_funds(payment_preimage: String(paymentPreimage).hexaBytes)
+        if res == false {
+            handleReject(reject, .claim_funds_failed)
+        }
+        
+        handleResolve(resolve, .claim_funds_success)
+    }
+    
     //MARK: Fetch methods
     @objc
     func version(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {

src/ldk.ts

@@ -323,6 +323,20 @@ class LDK {
 		}
 	}
 
+	/**
+	 * https://docs.rs/lightning/latest/lightning/ln/channelmanager/struct.ChannelManager.html#method.claim_funds
+	 * @returns {Promise<Err<unknown> | Ok<Ok<string> | Err<string>>>}
+	 * @param paymentPreimage
+	 */
+	async claimFunds(paymentPreimage: string): Promise<Result<string>> {
+		try {
+			const res = await NativeLDK.claimFunds(paymentPreimage);
+			return ok(res);
+		} catch (e) {
+			return err(e);
+		}
+	}
+
 	/**
 	 * Pays a bolt11 payment request
 	 * @param paymentRequest

src/lightning-manager.ts

@@ -335,10 +335,12 @@ class LightningManager {
 	private onChannelManagerPaymentReceived(
 		res: TChannelManagerPaymentReceived,
 	): void {
-		//TODO call channelManager.claim_funds(payment_preimage: paymentPreimage) if spontaneous_payment_preimage is not a blank string as
-		//https://docs.rs/lightning/latest/lightning/util/events/enum.PaymentPurpose.html#variant.SpontaneousPayment
-		//If not a spontaneous payment then nothing to do but notify user invoice was paid
-		console.log(`onChannelManagerPaymentReceived: ${JSON.stringify(res)}`); //TODO
+		if (res.spontaneous_payment_preimage) {
+			//https://docs.rs/lightning/latest/lightning/util/events/enum.PaymentPurpose.html#variant.SpontaneousPayment
+			ldk.claimFunds(res.spontaneous_payment_preimage).catch(console.error);
+		} else {
+			ldk.claimFunds(res.payment_preimage).catch(console.error);
+		}
 	}
 
 	private onChannelManagerPaymentSent(res: TChannelManagerPaymentSent): void {