From ce5fb97515b113d2774536d37084cc8d422143f1 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Thu, 14 Oct 2021 16:26:41 +0100 Subject: [PATCH] WIP: ldk open channel human-readable errors --- class/wallets/lightning-ldk-wallet.ts | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- screen/lnd/ldkOpenChannel.tsx | 8 +++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/class/wallets/lightning-ldk-wallet.ts b/class/wallets/lightning-ldk-wallet.ts index 26ff2f6fe..92c78c249 100644 --- a/class/wallets/lightning-ldk-wallet.ts +++ b/class/wallets/lightning-ldk-wallet.ts @@ -628,6 +628,10 @@ export class LightningLdkWallet extends LightningCustodianWallet { return RnLdk.getPackageVersion(); } + getChannelsClosedEvents() { + return RnLdk.channelsClosed; + } + /** * executes async function in background, so calling code can return immediately, while catching all thrown exceptions * and showing them in alert() instead of propagating them up diff --git a/package-lock.json b/package-lock.json index 29d0855d7..848592d3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20903,8 +20903,8 @@ } }, "rn-ldk": { - "version": "git+https://github.com/BlueWallet/rn-ldk.git#v0.3.2", - "from": "git+https://github.com/BlueWallet/rn-ldk.git#v0.3.2" + "version": "git+https://github.com/BlueWallet/rn-ldk.git#v0.4.0", + "from": "git+https://github.com/BlueWallet/rn-ldk.git#v0.4.0" }, "rn-nodeify": { "version": "10.3.0", diff --git a/package.json b/package.json index 10fa9b5ce..b89533801 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "react-test-render": "1.1.2", "readable-stream": "3.6.0", "realm": "10.8.0", - "rn-ldk": "git+https://github.com/BlueWallet/rn-ldk.git#v0.3.2", + "rn-ldk": "git+https://github.com/BlueWallet/rn-ldk.git#v0.4.0", "rn-nodeify": "10.3.0", "scryptsy": "2.1.0", "secure-random": "1.1.2", diff --git a/screen/lnd/ldkOpenChannel.tsx b/screen/lnd/ldkOpenChannel.tsx index e07626004..d52aec3fa 100644 --- a/screen/lnd/ldkOpenChannel.tsx +++ b/screen/lnd/ldkOpenChannel.tsx @@ -145,8 +145,14 @@ const LdkOpenChannel = (props: any) => { console.warn('initiated channel opening'); if (!fundingAddressTemp) { + let reason = ''; + const channelsClosed = ldkWallet.getChannelsClosedEvents(); + const event = channelsClosed.pop(); + if (event) { + reason += event.reason + ' ' + event.text; + } ReactNativeHapticFeedback.trigger('notificationError', { ignoreAndroidSystemSettings: false }); - return alert('Initiating channel open failed'); + return alert('Initiating channel open failed: ' + reason); } psbtOpenChannelStartedTs.current = +new Date();