Merge pull request #907 from synonymdev/upgrade-ldk-dependency

chore(lightning): Upgrade react-native-ldk

Author: Jasonvdb

ios/Podfile.lock

@@ -320,7 +320,7 @@ PODS:
     - React-Core
   - react-native-image-picker (4.10.0):
     - React-Core
-  - react-native-ldk (0.0.79):
+  - react-native-ldk (0.0.80):
     - React
   - react-native-libsodium (0.0.1):
     - React-Core
@@ -808,7 +808,7 @@ SPEC CHECKSUMS:
   react-native-document-picker: f68191637788994baed5f57d12994aa32cf8bf88
   react-native-flipper: 7eeb9b59b667dd0619372c7349cf7c78032d1de2
   react-native-image-picker: 4bc9ed38c8be255b515d8c88babbaf74973f91a8
-  react-native-ldk: f0b685567716721dd9bc0f7c04bbde820d625f0e
+  react-native-ldk: eab39afb545fcb7e943119ab142c9e40e7d9f59a
   react-native-libsodium: f4eba037c4ddf73f86b08075452cacb957256147
   react-native-mmkv: 1265a348a4711097ba29c8bcefd5971f48220f2b
   react-native-netinfo: 1a6035d3b9780221d407c277ebfb5722ace00658
@@ -854,4 +854,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 784c6e02c28154c0549ad3a940a4c2d528699d0d
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

package.json

@@ -42,7 +42,7 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@shopify/react-native-skia": "0.1.141",
     "@synonymdev/blocktank-client": "0.0.47",
-    "@synonymdev/react-native-ldk": "^0.0.79",
+    "@synonymdev/react-native-ldk": "0.0.80",
     "@synonymdev/react-native-lnurl": "0.0.3",
     "@synonymdev/result": "0.0.2",
     "@synonymdev/slashtags-auth": "^1.0.0-alpha.5",

src/screens/Settings/Lightning/Channels.tsx

@@ -69,7 +69,7 @@ import { SettingsScreenProps } from '../../../navigation/types';
 /**
  * Convert pending (non-channel) blocktank orders to (fake) channels.
  * @param {IGetOrderResponse[]} orders
- * @param {nodeKey} string
+ * @param {string} nodeKey
  */
 const getPendingBlocktankChannels = (
 	orders: IGetOrderResponse[],
@@ -82,7 +82,7 @@ const getPendingBlocktankChannels = (
 	const failedOrders: TChannel[] = [];
 
 	orders.forEach((order) => {
-		const fakeChannel = {
+		const fakeChannel: TChannel = {
 			channel_id: order._id,
 			is_public: false,
 			is_usable: false,
@@ -92,11 +92,14 @@ const getPendingBlocktankChannels = (
 			counterparty_node_id: nodeKey,
 			funding_txid: order.channel_open_tx?.transaction_id,
 			// channel_type: string,
-			user_channel_id: 0,
+			user_channel_id: '0',
 			// short_channel_id: number,
 			inbound_capacity_sat: order.local_balance,
 			outbound_capacity_sat: order.remote_balance,
 			channel_value_satoshis: order.local_balance + order.remote_balance,
+			short_channel_id: order._id,
+			config_forwarding_fee_base_msat: 0,
+			config_forwarding_fee_proportional_millionths: 0,
 		};
 
 		if ([0, 100, 150, 200].includes(order.state)) {

src/utils/lightning/index.ts

@@ -11,7 +11,7 @@ import lm, {
 	TAccount,
 	TAccountBackup,
 	TChannel,
-	TChannelManagerPayment,
+	TChannelManagerClaim,
 	TChannelManagerPaymentSent,
 	TCloseChannelReq,
 	TCreatePaymentReq,
@@ -279,7 +279,7 @@ export const handleLightningPaymentSubscription = async ({
 	selectedWallet,
 	selectedNetwork,
 }: {
-	payment: TChannelManagerPayment;
+	payment: TChannelManagerClaim;
 	selectedWallet?: TWalletName;
 	selectedNetwork?: TAvailableNetworks;
 }): Promise<void> => {
@@ -346,7 +346,7 @@ export const subscribeToLightningPayments = ({
 	if (!paymentSubscription) {
 		paymentSubscription = ldk.onEvent(
 			EEventTypes.channel_manager_payment_claimed,
-			(res: TChannelManagerPayment) => {
+			(res: TChannelManagerClaim) => {
 				handleLightningPaymentSubscription({
 					payment: res,
 					selectedNetwork,

yarn.lock

@@ -2028,10 +2028,10 @@
     cross-fetch "^3.1.4"
     node-fetch "3.1.1"
 
-"@synonymdev/react-native-ldk@^0.0.79":
-  version "0.0.79"
-  resolved "https://registry.yarnpkg.com/@synonymdev/react-native-ldk/-/react-native-ldk-0.0.79.tgz#6d3608027e795b10aad377438131f97eaf7dd426"
-  integrity sha512-rU9qtMqQIMlgnbCX5buEcgsoUQHkyqI69sarMp2+Ud5xbry8beDWhXo0gUxXwQ/XAHhJMXuaxoMC3/rpqyDXvg==
+"@synonymdev/react-native-ldk@0.0.80":
+  version "0.0.80"
+  resolved "https://registry.yarnpkg.com/@synonymdev/react-native-ldk/-/react-native-ldk-0.0.80.tgz#6f8729ff6fcea4d3963b40d60cfb7dd7e27321f8"
+  integrity sha512-/ikfCEPPmNaL3cdWI4/dWlT+54Br6LoA15WpKBpMzbgo/lVvRKwf55UPXFH8QGuIY+dckrin3y57VcLqfZrgag==
   dependencies:
     bitcoinjs-lib "^6.0.2"
 
@@ -2095,7 +2095,7 @@
     b4a "^1.6.0"
     protomux-rpc "^1.3.0"
 
-"@synonymdev/slashtags-sdk@^1.0.0-alpha.19", "@synonymdev/slashtags-sdk@^1.0.0-alpha.35":
+"@synonymdev/slashtags-sdk@^1.0.0-alpha.19", "@synonymdev/slashtags-sdk@^1.0.0-alpha.36":
   version "1.0.0-alpha.36"
   resolved "https://registry.yarnpkg.com/@synonymdev/slashtags-sdk/-/slashtags-sdk-1.0.0-alpha.36.tgz#d47b60bbaf8b55259034d4aa36be6af062c9cdc2"
   integrity sha512-7G6cLINKjaJ/28n7zj8F7RFkusGkIJ3XzUWZtIopomjwTvLYdYrFyFjwL/mIyiuNtK/9OeLNp1NIVw7KpX+ULQ==