Merge pull request #1507 from synonymdev/ln-pay-timeout-fix

fix(lightning): ldk pay timeout

Author: Jasonvdb

android/app/build.gradle

@@ -78,7 +78,7 @@ android {
         applicationId "to.synonym.bitkit.wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 92
+        versionCode 96
         versionName "1.0"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'

ios/Podfile.lock

@@ -392,7 +392,7 @@ PODS:
     - React-Core
   - react-native-keep-awake (1.2.2):
     - React-Core
-  - react-native-ldk (0.0.126):
+  - react-native-ldk (0.0.127):
     - React
   - react-native-mmkv (2.10.2):
     - MMKV (>= 1.2.13)
@@ -905,7 +905,7 @@ SPEC CHECKSUMS:
   react-native-flipper: 9c1957af24b76493ba74f46d000a5c1d485e7731
   react-native-image-picker: 2e2e82aba9b6a91a7c78f7d9afde341a2659c7b8
   react-native-keep-awake: ad1d67f617756b139536977a0bf06b27cec0714a
-  react-native-ldk: f45ad0a5397824c7d3f5c4c32503adea6106b4f4
+  react-native-ldk: 4ab3d26d5e1356313c572814289cc516dc18dd88
   react-native-mmkv: 9ae7ca3977e8ef48dbf7f066974eb844c20b5fd7
   react-native-netinfo: 5ddbf20865bcffab6b43d0e4e1fd8b3896beb898
   react-native-quick-base64: a5dbe4528f1453e662fcf7351029500b8b63e7bb

ios/bitkit.xcodeproj/project.pbxproj

@@ -556,7 +556,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 92;
+				CURRENT_PROJECT_VERSION = 96;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = bitkit/Info.plist;
@@ -587,7 +587,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 92;
+				CURRENT_PROJECT_VERSION = 96;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = bitkit/Info.plist;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bitkit",
   "author": "Synonym",
-  "version": "1.0.0-beta.92",
+  "version": "1.0.0-beta.96",
   "scripts": {
     "start": "react-native start",
     "android": "react-native run-android",
@@ -51,7 +51,7 @@
     "@synonymdev/blocktank-client": "0.0.50",
     "@synonymdev/blocktank-lsp-http-client": "0.9.0",
     "@synonymdev/feeds": "2.1.1",
-    "@synonymdev/react-native-ldk": "0.0.126",
+    "@synonymdev/react-native-ldk": "0.0.127",
     "@synonymdev/react-native-lnurl": "0.0.7",
     "@synonymdev/result": "0.0.2",
     "@synonymdev/slashtags-auth": "1.0.0-alpha.6",

src/store/utils/lightning.ts

@@ -331,7 +331,7 @@ export const syncLightningTxsWithActivityList = async (): Promise<
 	const sentTxs = await getSentLightningPayments();
 	for (const tx of sentTxs) {
 		const sats = tx.amount_sat;
-		if (!sats || tx.state !== 'successful') {
+		if (!sats || tx.state === 'failed') {
 			continue;
 		}
 

src/utils/lightning/index.ts

@@ -1595,6 +1595,8 @@ export const payLightningInvoice = async (
 			timeout: 60000,
 		});
 		if (payResponse.isErr()) {
+			//On occasion a payment can time out but still be pending, so we need to sync with react-native-ldk's stored pending payments
+			await syncLightningTxsWithActivityList();
 			return err(payResponse.error.message);
 		}
 

yarn.lock

@@ -3185,10 +3185,10 @@
   dependencies:
     b4a "^1.5.3"
 
-"@synonymdev/react-native-ldk@0.0.126":
-  version "0.0.126"
-  resolved "https://registry.yarnpkg.com/@synonymdev/react-native-ldk/-/react-native-ldk-0.0.126.tgz#78a2b131768e4808add5209c8b8b1f98bab472af"
-  integrity sha512-tdGisOlxTLe9VblkXjEAyQffaPmXHbZrDuWBw0SBaKenX3j8gW9wm87oOWLl5BrD+D31I6iJqLQoeCo/dp5qZw==
+"@synonymdev/react-native-ldk@0.0.127":
+  version "0.0.127"
+  resolved "https://registry.yarnpkg.com/@synonymdev/react-native-ldk/-/react-native-ldk-0.0.127.tgz#01dbf45319b9003adba111934a3723345a3a461c"
+  integrity sha512-CmPCq6C8Km55Zg35uM8wfFwY4GtqVQLHOJ1ppmEB36auGvCa0mdfOi7zUaRBw9E4c3W5fnOnAzeReju5WFyR5Q==
   dependencies:
     bech32 "^2.0.0"
     bitcoinjs-lib "^6.0.2"