From b69ff1e90c6197af8a99f0b4bcd404ace4403fb5 Mon Sep 17 00:00:00 2001
From: Ovi Trif <ovitrif@proton.me>
Date: Tue, 13 Feb 2024 20:05:57 +0100
Subject: [PATCH 1/8] chore(example): add support to disable ldk logs

---
 example/index.js            |  2 ++
 example/utils/ignoreLogs.ts | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 example/utils/ignoreLogs.ts

diff --git a/example/index.js b/example/index.js
index 9b739329..d4145fbc 100644
--- a/example/index.js
+++ b/example/index.js
@@ -2,6 +2,8 @@
  * @format
  */
 
+import './utils/ignoreLogs';
+
 import { AppRegistry } from 'react-native';
 import App from './App';
 import { name as appName } from './app.json';
diff --git a/example/utils/ignoreLogs.ts b/example/utils/ignoreLogs.ts
new file mode 100644
index 00000000..ac018329
--- /dev/null
+++ b/example/utils/ignoreLogs.ts
@@ -0,0 +1,44 @@
+import { LogBox } from 'react-native';
+
+const ENABLE_LOGBOX = true;
+const ENABLE_LDK_LOGS = true;
+
+if (__DEV__) {
+	const ignoredLogs: string[] = [];
+	const ignoredInfo: string[] = [];
+	const ignoredWarnings: string[] = [];
+	const ignoredErrors: string[] = [];
+
+	if (!ENABLE_LOGBOX) {
+		LogBox.ignoreAllLogs();
+	}
+
+	if (!ENABLE_LDK_LOGS) {
+		ignoredLogs.push('LDK:', 'react-native-ldk:', 'DEBUG (JS)', 'ERROR (JS)');
+	}
+
+	const withoutIgnored = (
+		logger: (...data: any[]) => void,
+		ignoreList: string[],
+	): any => {
+		return (...args): void => {
+			let output: string;
+			try {
+				output = args.join(' ');
+			} catch (err) {
+				// if we can't check if the log should be ignored, just log it
+				logger(...args);
+				return;
+			}
+
+			if (!ignoreList.some((log) => output.includes(log))) {
+				logger(...args);
+			}
+		};
+	};
+
+	console.log = withoutIgnored(console.log, ignoredLogs);
+	console.info = withoutIgnored(console.info, ignoredInfo);
+	console.warn = withoutIgnored(console.warn, ignoredWarnings);
+	console.error = withoutIgnored(console.error, ignoredErrors);
+}

From 864fba158362972f882c8cdaad40c10b732eb811 Mon Sep 17 00:00:00 2001
From: Ovi Trif <ovitrif@proton.me>
Date: Tue, 13 Feb 2024 20:10:04 +0100
Subject: [PATCH 2/8] refactor(example): group related buttons in example app

---
 example/Dev.tsx | 472 ++++++++++++++++++++++++------------------------
 1 file changed, 241 insertions(+), 231 deletions(-)

diff --git a/example/Dev.tsx b/example/Dev.tsx
index da0db6a4..bc376758 100644
--- a/example/Dev.tsx
+++ b/example/Dev.tsx
@@ -259,153 +259,156 @@ const Dev = (): ReactElement => {
 						}}
 					/>
 
-					<Button
-						title={'Add Peers'}
-						onPress={async (): Promise<void> => {
-							try {
-								const peersRes = await Promise.all(
-									Object.keys(peers).map(async (peer) => {
-										const addPeer = await lm.addPeer({
-											...peers[peer],
-											timeout: 5000,
-										});
-										if (addPeer.isErr()) {
-											setMessage(addPeer.error.message);
-											return;
-										}
-										return addPeer.value;
-									}),
-								);
-								setMessage(JSON.stringify(peersRes));
-							} catch (e) {
-								setMessage(e.toString());
-							}
-						}}
-					/>
-
-					<Button
-						title={'List peers'}
-						onPress={async (): Promise<void> => {
-							try {
-								const listPeers = await ldk.listPeers();
-								if (listPeers.isErr()) {
-									setMessage(listPeers.error.message);
-									return;
-								}
-								setMessage(JSON.stringify(listPeers.value));
-							} catch (e) {
-								setMessage(e.toString());
-							}
-						}}
-					/>
-
-					<Button
-						title={'List channels'}
-						onPress={async (): Promise<void> => {
-							try {
-								const listChannels = await ldk.listChannels();
-								if (listChannels.isErr()) {
-									setMessage(listChannels.error.message);
-									return;
+					<View style={styles.buttonRow}>
+						<Button
+							title={'Add Peers'}
+							onPress={async (): Promise<void> => {
+								try {
+									const peersRes = await Promise.all(
+										Object.keys(peers).map(async (peer) => {
+											const addPeer = await lm.addPeer({
+												...peers[peer],
+												timeout: 5000,
+											});
+											if (addPeer.isErr()) {
+												setMessage(addPeer.error.message);
+												return;
+											}
+											return addPeer.value;
+										}),
+									);
+									setMessage(JSON.stringify(peersRes));
+								} catch (e) {
+									setMessage(e.toString());
 								}
-								if (listChannels.value.length < 1) {
-									setMessage('No channels detected.');
-									return;
+							}}
+						/>
+						<Button
+							title={'List peers'}
+							onPress={async (): Promise<void> => {
+								try {
+									const listPeers = await ldk.listPeers();
+									if (listPeers.isErr()) {
+										setMessage(listPeers.error.message);
+										return;
+									}
+									setMessage(JSON.stringify(listPeers.value));
+								} catch (e) {
+									setMessage(e.toString());
 								}
+							}}
+						/>
+					</View>
 
-								let msg = '';
-								// Sort Channels
-								await Promise.all(
-									listChannels.value.map(async (channel) => {
-										const sorted = Object.keys(channel)
-											.sort()
-											.reduce((obj, key) => {
-												obj[key] = channel[key];
-												return obj;
-											}, {});
-										// Append channel info to msg.
-										await Promise.all(
-											Object.keys(sorted).map((key) => {
-												msg += `${key}: ${sorted[key]}\n`;
-											}),
-										);
-									}),
-								);
-
-								setMessage(msg);
-							} catch (e) {
-								setMessage(e.toString());
-							}
-						}}
-					/>
+					<View style={styles.buttonRow}>
+						<Button
+							title={'List channels'}
+							onPress={async (): Promise<void> => {
+								try {
+									const listChannels = await ldk.listChannels();
+									if (listChannels.isErr()) {
+										setMessage(listChannels.error.message);
+										return;
+									}
+									if (listChannels.value.length < 1) {
+										setMessage('No channels detected.');
+										return;
+									}
 
-					<Button
-						title={'Close channel'}
-						onPress={async (): Promise<void> => {
-							try {
-								const listChannels = await ldk.listChannels();
-								if (listChannels.isErr()) {
-									setMessage(listChannels.error.message);
-									return;
-								}
-								if (listChannels.value.length < 1) {
-									setMessage('No channels detected.');
-									return;
+									let msg = '';
+									// Sort Channels
+									await Promise.all(
+										listChannels.value.map(async (channel) => {
+											const sorted = Object.keys(channel)
+												.sort()
+												.reduce((obj, key) => {
+													obj[key] = channel[key];
+													return obj;
+												}, {});
+											// Append channel info to msg.
+											await Promise.all(
+												Object.keys(sorted).map((key) => {
+													msg += `${key}: ${sorted[key]}\n`;
+												}),
+											);
+										}),
+									);
+
+									setMessage(msg);
+								} catch (e) {
+									setMessage(e.toString());
 								}
-
-								const { channel_id, counterparty_node_id } =
-									listChannels.value[0];
-
-								const close = async (force: boolean): Promise<void> => {
-									setMessage(`Closing ${channel_id}...`);
-
-									const res = await ldk.closeChannel({
-										channelId: channel_id,
-										counterPartyNodeId: counterparty_node_id,
-										force,
-									});
-									if (res.isErr()) {
-										setMessage(res.error.message);
+							}}
+						/>
+						<Button
+							title={'Close channel'}
+							onPress={async (): Promise<void> => {
+								try {
+									const listChannels = await ldk.listChannels();
+									if (listChannels.isErr()) {
+										setMessage(listChannels.error.message);
+										return;
+									}
+									if (listChannels.value.length < 1) {
+										setMessage('No channels detected.');
 										return;
 									}
-									setMessage(res.value);
-								};
 
-								Alert.alert('Close channel', `Peer ${counterparty_node_id}`, [
-									{
-										text: 'Cancel',
-										onPress: () => console.log('Cancel Pressed'),
-										style: 'cancel',
-									},
-									{
-										text: 'Close channel',
-										onPress: async (): Promise<void> => close(false),
-									},
-									{
-										text: 'Force close',
-										onPress: async (): Promise<void> => close(true),
-									},
-								]);
-							} catch (e) {
-								setMessage(e.toString());
-							}
-						}}
-					/>
+									const { channel_id, counterparty_node_id } =
+										listChannels.value[0];
 
-					<Button
-						title={'List watch transactions'}
-						onPress={async (): Promise<void> => {
-							console.log(lm.watchTxs);
-							setMessage(`Watch TXs: ${JSON.stringify(lm.watchTxs)}`);
-						}}
-					/>
+									const close = async (force: boolean): Promise<void> => {
+										setMessage(`Closing ${channel_id}...`);
 
-					<Button
-						title={'List watch outputs'}
-						onPress={async (): Promise<void> => {
-							setMessage(`Watch Outputs: ${JSON.stringify(lm.watchOutputs)}`);
-						}}
-					/>
+										const res = await ldk.closeChannel({
+											channelId: channel_id,
+											counterPartyNodeId: counterparty_node_id,
+											force,
+										});
+										if (res.isErr()) {
+											setMessage(res.error.message);
+											return;
+										}
+										setMessage(res.value);
+									};
+
+									Alert.alert('Close channel', `Peer ${counterparty_node_id}`, [
+										{
+											text: 'Cancel',
+											onPress: () => console.log('Cancel Pressed'),
+											style: 'cancel',
+										},
+										{
+											text: 'Close channel',
+											onPress: async (): Promise<void> => close(false),
+										},
+										{
+											text: 'Force close',
+											onPress: async (): Promise<void> => close(true),
+										},
+									]);
+								} catch (e) {
+									setMessage(e.toString());
+								}
+							}}
+						/>
+					</View>
+
+					<View style={styles.buttonRow}>
+						<Button
+							title={'List watch transactions'}
+							onPress={async (): Promise<void> => {
+								console.log(lm.watchTxs);
+								setMessage(`Watch TXs: ${JSON.stringify(lm.watchTxs)}`);
+							}}
+						/>
+						<Button
+							title={'List watch outputs'}
+							onPress={async (): Promise<void> => {
+								setMessage(`Watch Outputs: ${JSON.stringify(lm.watchOutputs)}`);
+							}}
+						/>
+					</View>
 
 					<Button
 						title={'🤑Get Address Balance'}
@@ -433,112 +436,115 @@ const Dev = (): ReactElement => {
 						}}
 					/>
 
-					<Button
-						title={'Get claimed payments'}
-						onPress={async (): Promise<void> => {
-							setMessage('Getting all claimed payments...');
-							const res = await lm.getLdkPaymentsClaimed();
-							setMessage(JSON.stringify(res));
-						}}
-					/>
-					<Button
-						title={'Get sent payments'}
-						onPress={async (): Promise<void> => {
-							setMessage('Getting all sent payments...');
-							const res = await lm.getLdkPaymentsSent();
-							setMessage(JSON.stringify(res));
-						}}
-					/>
-
-					<Button
-						title={'Create invoice'}
-						onPress={async (): Promise<void> => {
-							const createInvoice = async (
-								amountSats?: number,
-							): Promise<void> => {
-								try {
-									const createPaymentRequest =
-										await lm.createAndStorePaymentRequest({
-											amountSats,
-											description: 'paymeplz 🤑',
-											expiryDeltaSeconds: 999999,
-										});
-
-									if (createPaymentRequest.isErr()) {
-										setMessage(createPaymentRequest.error.message);
-										return;
-									}
+					<View style={styles.buttonRow}>
+						<Button
+							title={'Get claimed payments'}
+							onPress={async (): Promise<void> => {
+								setMessage('Getting all claimed payments...');
+								const res = await lm.getLdkPaymentsClaimed();
+								setMessage(JSON.stringify(res));
+							}}
+						/>
+						<Button
+							title={'Get sent payments'}
+							onPress={async (): Promise<void> => {
+								setMessage('Getting all sent payments...');
+								const res = await lm.getLdkPaymentsSent();
+								setMessage(JSON.stringify(res));
+							}}
+						/>
+					</View>
 
-									const { to_str } = createPaymentRequest.value;
-									console.log(to_str);
-									Clipboard.setString(to_str);
-									setMessage(to_str);
-								} catch (e) {
-									setMessage(e.toString());
-								}
-							};
-
-							const amountSats = 100;
-							Alert.alert('Create invoice', 'Specify amount?', [
-								{
-									text: 'Cancel',
-									onPress: () => console.log('Cancel Pressed'),
-									style: 'cancel',
-								},
-								{
-									text: `${amountSats} sats`,
-									onPress: async (): Promise<void> => createInvoice(amountSats),
-								},
-								{
-									text: "Don't specify",
-									onPress: async (): Promise<void> => createInvoice(),
-								},
-							]);
-						}}
-					/>
+					<View style={styles.buttonRow}>
+						<Button
+							title={'Create invoice'}
+							onPress={async (): Promise<void> => {
+								const createInvoice = async (
+									amountSats?: number,
+								): Promise<void> => {
+									try {
+										const createPaymentRequest =
+											await lm.createAndStorePaymentRequest({
+												amountSats,
+												description: 'paymeplz 🤑',
+												expiryDeltaSeconds: 999999,
+											});
 
-					<Button
-						title={'Pay invoice'}
-						onPress={async (): Promise<void> => {
-							const paymentRequest = await Clipboard.getString();
-							const decode = await ldk.decode({ paymentRequest });
-							if (decode.isErr()) {
-								return setMessage(decode.error.message);
-							}
+										if (createPaymentRequest.isErr()) {
+											setMessage(createPaymentRequest.error.message);
+											return;
+										}
 
-							const { amount_satoshis, description } = decode.value;
+										const { to_str } = createPaymentRequest.value;
+										console.log(to_str);
+										Clipboard.setString(to_str);
+										setMessage(to_str);
+									} catch (e) {
+										setMessage(e.toString());
+									}
+								};
 
-							const ownAmountSats = 1000;
-							Alert.alert(
-								amount_satoshis
-									? `Pay ${amount_satoshis ?? 0}`
-									: 'Zero sat invoice found',
-								description,
-								[
+								const amountSats = 100;
+								Alert.alert('Create invoice', 'Specify amount?', [
 									{
 										text: 'Cancel',
 										onPress: () => console.log('Cancel Pressed'),
 										style: 'cancel',
 									},
 									{
-										text: 'Pay',
-										onPress: async (): Promise<void> => {
-											const pay = await lm.payWithTimeout({
-												paymentRequest,
-												amountSats: amount_satoshis ? undefined : ownAmountSats,
-												timeout: 20000,
-											});
-											if (pay.isErr()) {
-												return setMessage(pay.error.message);
-											}
+										text: `${amountSats} sats`,
+										onPress: async (): Promise<void> => createInvoice(amountSats),
+									},
+									{
+										text: "Don't specify",
+										onPress: async (): Promise<void> => createInvoice(),
+									},
+								]);
+							}}
+						/>
+						<Button
+							title={'Pay invoice'}
+							onPress={async (): Promise<void> => {
+								const paymentRequest = await Clipboard.getString();
+								const decode = await ldk.decode({ paymentRequest });
+								if (decode.isErr()) {
+									return setMessage(decode.error.message);
+								}
 
-											setMessage(pay.value.payment_id);
+								const { amount_satoshis, description } = decode.value;
+
+								const ownAmountSats = 1000;
+								Alert.alert(
+									amount_satoshis
+										? `Pay ${amount_satoshis ?? 0}`
+										: 'Zero sat invoice found',
+									description,
+									[
+										{
+											text: 'Cancel',
+											onPress: () => console.log('Cancel Pressed'),
+											style: 'cancel',
 										},
-									},
-								],
-							);
-						}}
-					/>
+										{
+											text: 'Pay',
+											onPress: async (): Promise<void> => {
+												const pay = await lm.payWithTimeout({
+													paymentRequest,
+													amountSats: amount_satoshis ? undefined : ownAmountSats,
+													timeout: 20000,
+												});
+												if (pay.isErr()) {
+													return setMessage(pay.error.message);
+												}
+
+												setMessage(pay.value.payment_id);
+											},
+										},
+									],
+								);
+							}}
+						/>
+					</View>
 
 					<Button
 						title={'Get network graph nodes'}
@@ -773,6 +779,10 @@ const styles = StyleSheet.create({
 		color: 'green',
 		fontSize: 10,
 	},
+	buttonRow: {
+		flexDirection: 'row',
+		gap: 2.5,
+	},
 });
 
 export default Dev;

From 5e61564c579f2cb128871ce9cd8ae81e05dac78f Mon Sep 17 00:00:00 2001
From: Ovi Trif <ovitrif@proton.me>
Date: Wed, 14 Feb 2024 12:57:35 +0100
Subject: [PATCH 3/8] chore(example): allow disabling transactions logs

---
 example/utils/ignoreLogs.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/example/utils/ignoreLogs.ts b/example/utils/ignoreLogs.ts
index ac018329..0094c6f6 100644
--- a/example/utils/ignoreLogs.ts
+++ b/example/utils/ignoreLogs.ts
@@ -2,6 +2,7 @@ import { LogBox } from 'react-native';
 
 const ENABLE_LOGBOX = true;
 const ENABLE_LDK_LOGS = true;
+const ENABLE_TX_LOGS = true;
 
 if (__DEV__) {
 	const ignoredLogs: string[] = [];
@@ -17,6 +18,10 @@ if (__DEV__) {
 		ignoredLogs.push('LDK:', 'react-native-ldk:', 'DEBUG (JS)', 'ERROR (JS)');
 	}
 
+	if (!ENABLE_TX_LOGS) {
+		ignoredLogs.push('INFO (JS)', 'broadcastTransaction');
+	}
+
 	const withoutIgnored = (
 		logger: (...data: any[]) => void,
 		ignoreList: string[],

From 5492a73571adddd0ac80005382cb3915d098e7ce Mon Sep 17 00:00:00 2001
From: Ovi Trif <ovitrif@proton.me>
Date: Wed, 14 Feb 2024 16:10:51 +0100
Subject: [PATCH 4/8] feat: remove expired and unclaimed invoices

---
 lib/src/lightning-manager.ts | 52 ++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/lib/src/lightning-manager.ts b/lib/src/lightning-manager.ts
index fc8a1f7b..debac9d3 100644
--- a/lib/src/lightning-manager.ts
+++ b/lib/src/lightning-manager.ts
@@ -69,6 +69,8 @@ import * as bitcoin from 'bitcoinjs-lib';
 import networks from './utils/networks';
 import { EmitterSubscription } from 'react-native';
 
+const MAX_PENDING_PAY_AGE = 1000 * 60 * 60; // 1 hour
+
 //TODO startup steps
 // Step 0: Listen for events ✅
 // Step 1: Initialize the FeeEstimator ✅
@@ -639,6 +641,8 @@ class LightningManager {
 			});
 		}
 
+		await this.removeExpiredAndUnclaimedInvoices();
+
 		this.isSyncing = false;
 
 		// Handle force sync if needed.
@@ -1956,6 +1960,54 @@ class LightningManager {
 		await this.addPeers();
 		await this.syncLdk();
 	}
+
+	/**
+	 * Called with each sync to remove expired and unclaimed invoices.
+	 * An invoice is expired if there is no payments claimed (received) for it
+	 * after MAX_PENDING_PAY_AGE.
+	 */
+	private async removeExpiredAndUnclaimedInvoices(): Promise<void> {
+		const invoices = await this.getBolt11Invoices();
+		const claimedPayments = await this.getLdkPaymentsClaimed();
+		const expiredAndUnclaimedInvoices: TBolt11Invoices = [];
+
+		for (let index = 0; index < invoices.length; index++) {
+			const paymentRequest = invoices[index];
+			const invoiceRes = await ldk.decode({ paymentRequest });
+			if (invoiceRes.isOk()) {
+				const invoice = invoiceRes.value;
+				const invoiceAge = Date.now() - invoice.timestamp * 1000;
+				const isOld = invoiceAge > MAX_PENDING_PAY_AGE;
+				if (isOld) {
+					const payment = claimedPayments.find(
+						(it) => it.payment_hash === invoice.payment_hash,
+					);
+					const isClaimed = payment?.state === 'successful';
+					if (!isClaimed) {
+						expiredAndUnclaimedInvoices.push(paymentRequest);
+					}
+				}
+			}
+		}
+
+		if (expiredAndUnclaimedInvoices.length === 0) {
+			return;
+		}
+
+		const filteredInvoices = invoices.filter(
+			(it) => !expiredAndUnclaimedInvoices.includes(it),
+		);
+
+		await ldk.writeToLogFile(
+			'info',
+			`Removing ${expiredAndUnclaimedInvoices.length} expired and unclaimed invoices.`,
+		);
+		await ldk.writeToFile({
+			fileName: ELdkFiles.bolt11_invoices,
+			content: JSON.stringify(filteredInvoices),
+			remotePersist: false,
+		});
+	}
 }
 
 export default new LightningManager();

From 392c9ffa3798d46420750b3b9b06a815cb7dd9df Mon Sep 17 00:00:00 2001
From: Ovi Trif <ovitrif@proton.me>
Date: Wed, 14 Feb 2024 17:27:57 +0100
Subject: [PATCH 5/8] feat: remove stale payment claims

---
 lib/src/lightning-manager.ts | 37 ++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/lib/src/lightning-manager.ts b/lib/src/lightning-manager.ts
index debac9d3..e26eaa47 100644
--- a/lib/src/lightning-manager.ts
+++ b/lib/src/lightning-manager.ts
@@ -641,7 +641,10 @@ class LightningManager {
 			});
 		}
 
+		// Awaiting because sync is often followed by reading from the files
+		// that might be overwritten by the cleanups below.
 		await this.removeExpiredAndUnclaimedInvoices();
+		await this.removeStalePaymentClaims();
 
 		this.isSyncing = false;
 
@@ -1379,8 +1382,6 @@ class LightningManager {
 		return [];
 	};
 
-	//TODO Remove any stale payments from storage if stuck for 60min. No payment claim should be stuck that long.
-
 	/**
 	 * Returns the previously created bolt11 invoices.
 	 * @returns {@link TBolt11Invoices}
@@ -2008,6 +2009,38 @@ class LightningManager {
 			remotePersist: false,
 		});
 	}
+
+	private async removeStalePaymentClaims(): Promise<void> {
+		const claims = await this.getLdkPaymentsClaimed();
+		const staleClaims: TChannelManagerClaim[] = [];
+
+		for (let index = 0; index < claims.length; index++) {
+			const payment = claims[index];
+			const isPending = payment.state === 'pending';
+			const age = Date.now() - payment.unix_timestamp * 1000;
+			const isStale = age > MAX_PENDING_PAY_AGE;
+			if (isPending && isStale) {
+				staleClaims.push(payment);
+			}
+		}
+
+		if (staleClaims.length === 0) {
+			return;
+		}
+
+		const filteredClaims = claims.filter((it) => !staleClaims.includes(it));
+
+		await ldk.writeToLogFile(
+			'info',
+			`Removing ${staleClaims.length} stale payment claims.`,
+		);
+
+		await ldk.writeToFile({
+			fileName: ELdkFiles.payments_claimed,
+			content: JSON.stringify(filteredClaims),
+			remotePersist: true,
+		});
+	}
 }
 
 export default new LightningManager();

From 234be5b455fdf0bf2d989004cb0b8fa2094fbc53 Mon Sep 17 00:00:00 2001
From: Ovi Trif <ovitrif@proton.me>
Date: Wed, 14 Feb 2024 17:33:14 +0100
Subject: [PATCH 6/8] chore: bump version number

---
 backup-server/package.json | 2 +-
 example/ios/Podfile.lock   | 4 ++--
 lib/package.json           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backup-server/package.json b/backup-server/package.json
index 615efd30..d319cf1a 100644
--- a/backup-server/package.json
+++ b/backup-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backup-server",
-  "version": "0.0.129",
+  "version": "0.0.131",
   "description": "",
   "main": "index.js",
   "engines": {
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 9d1c01e2..55fe0090 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -375,7 +375,7 @@ PODS:
   - React-jsinspector (0.72.4)
   - React-logger (0.72.4):
     - glog
-  - react-native-ldk (0.0.128):
+  - react-native-ldk (0.0.131):
     - React
   - react-native-randombytes (3.6.1):
     - React-Core
@@ -723,7 +723,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: c7f826e40fa9cab5d37cab6130b1af237332b594
   React-jsinspector: aaed4cf551c4a1c98092436518c2d267b13a673f
   React-logger: da1ebe05ae06eb6db4b162202faeafac4b435e77
-  react-native-ldk: 7e754f4168e774326eaf2f0707843f5ce06f70bb
+  react-native-ldk: cf82dd50d1a5a0b5b5a65b01ccad3c8e17bdf4ce
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-tcp-socket: c1b7297619616b4c9caae6889bcb0aba78086989
   React-NativeModulesApple: edb5ace14f73f4969df6e7b1f3e41bef0012740f
diff --git a/lib/package.json b/lib/package.json
index 1e333b72..3577aa7d 100644
--- a/lib/package.json
+++ b/lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@synonymdev/react-native-ldk",
   "title": "React Native LDK",
-  "version": "0.0.129",
+  "version": "0.0.131",
   "description": "React Native wrapper for LDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

From b28d68adf95888331ec4af7d2369502c9aad6f9c Mon Sep 17 00:00:00 2001
From: Ovi Trif <ovitrif@proton.me>
Date: Wed, 14 Feb 2024 18:00:20 +0100
Subject: [PATCH 7/8] chore(example): fix lint errors

---
 example/Dev.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/example/Dev.tsx b/example/Dev.tsx
index bc376758..4d8da97b 100644
--- a/example/Dev.tsx
+++ b/example/Dev.tsx
@@ -493,7 +493,8 @@ const Dev = (): ReactElement => {
 									},
 									{
 										text: `${amountSats} sats`,
-										onPress: async (): Promise<void> => createInvoice(amountSats),
+										onPress: async (): Promise<void> =>
+											createInvoice(amountSats),
 									},
 									{
 										text: "Don't specify",
@@ -530,7 +531,9 @@ const Dev = (): ReactElement => {
 											onPress: async (): Promise<void> => {
 												const pay = await lm.payWithTimeout({
 													paymentRequest,
-													amountSats: amount_satoshis ? undefined : ownAmountSats,
+													amountSats: amount_satoshis
+														? undefined
+														: ownAmountSats,
 													timeout: 20000,
 												});
 												if (pay.isErr()) {

From 65a0fbd3d8c0046ebf88371c70fa7b95b9a29bcd Mon Sep 17 00:00:00 2001
From: Ovi Trif <ovitrif@proton.me>
Date: Tue, 20 Feb 2024 13:15:13 +0100
Subject: [PATCH 8/8] fix: move cleanups to startup

---
 lib/src/lightning-manager.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/src/lightning-manager.ts b/lib/src/lightning-manager.ts
index e26eaa47..05aa727c 100644
--- a/lib/src/lightning-manager.ts
+++ b/lib/src/lightning-manager.ts
@@ -488,6 +488,8 @@ class LightningManager {
 
 		//Can continue in the background
 		this.syncLdk().catch(console.error);
+		this.removeExpiredAndUnclaimedInvoices().catch(console.error);
+		this.removeStalePaymentClaims().catch(console.error);
 
 		//Writes node state to log files
 		ldk.nodeStateDump().catch(console.error);
@@ -641,11 +643,6 @@ class LightningManager {
 			});
 		}
 
-		// Awaiting because sync is often followed by reading from the files
-		// that might be overwritten by the cleanups below.
-		await this.removeExpiredAndUnclaimedInvoices();
-		await this.removeStalePaymentClaims();
-
 		this.isSyncing = false;
 
 		// Handle force sync if needed.