diff --git a/__tests__/lightning.test.ts b/__tests__/lightning.test.ts index ff8f75da2..5e154390d 100644 --- a/__tests__/lightning.test.ts +++ b/__tests__/lightning.test.ts @@ -49,7 +49,6 @@ describe('getFees', () => { const result = await getFees(); expect(result).toEqual({ - onChainSweep: 111, maxAllowedNonAnchorChannelRemoteFee: Math.max(25, 111 * 10), minAllowedAnchorChannelRemoteFee: 108, minAllowedNonAnchorChannelRemoteFee: 107, @@ -57,6 +56,8 @@ describe('getFees', () => { nonAnchorChannelFee: 110, channelCloseMinimum: 108, outputSpendingFee: 111, + maximumFeeEstimate: 111, + urgentOnChainSweep: 111, }); expect(fetch).toHaveBeenCalledTimes(2); expect(fetch).toHaveBeenCalledWith(MEMPOOL_URL); @@ -79,7 +80,6 @@ describe('getFees', () => { const result = await getFees(); expect(result).toEqual({ - onChainSweep: 999, maxAllowedNonAnchorChannelRemoteFee: Math.max(25, 999 * 10), minAllowedAnchorChannelRemoteFee: 997, minAllowedNonAnchorChannelRemoteFee: 996, @@ -87,6 +87,8 @@ describe('getFees', () => { nonAnchorChannelFee: 998, channelCloseMinimum: 997, outputSpendingFee: 999, + maximumFeeEstimate: 999, + urgentOnChainSweep: 999, }); expect(fetch).toHaveBeenCalledTimes(3); }); @@ -110,7 +112,7 @@ describe('getFees', () => { }); const result = await getFees(); - expect(result.onChainSweep).toBe(111); + expect(result.urgentOnChainSweep).toBe(111); expect(fetch).toHaveBeenCalledTimes(4); expect(fetch).toHaveBeenCalledWith(MEMPOOL_URL); expect(fetch).toHaveBeenCalledWith(BLOCKTANK_URL); @@ -146,7 +148,7 @@ describe('getFees', () => { }); const result = await getFees(); - expect(result.onChainSweep).toBe(999); + expect(result.urgentOnChainSweep).toBe(999); }); it('should handle invalid blocktank response', async () => { @@ -167,7 +169,7 @@ describe('getFees', () => { }); const result = await getFees(); - expect(result.onChainSweep).toBe(111); + expect(result.urgentOnChainSweep).toBe(111); }); it('should handle timeout errors gracefully', async () => { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4c3e9c2b3..ceb4c843e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1331,7 +1331,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-ldk (0.0.155): + - react-native-ldk (0.0.158): - React - react-native-mmkv (2.12.2): - DoubleConversion @@ -2405,7 +2405,7 @@ SPEC CHECKSUMS: react-native-biometrics: 43ed5b828646a7862dbc7945556446be00798e7d react-native-blur: b06c3fe88680beac622d8d13b8c36ec15c50383b react-native-image-picker: 037a6ccde76aa165446e1eaeb8866cb00f461916 - react-native-ldk: 6f12cfcabb910cb88478768d02d7345775289c21 + react-native-ldk: 2b77f83c7ca5809d1221288dfc4ee9ffef13f1a3 react-native-mmkv: a6e08ad1b51b84af075f91798f8a92c878472265 react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187 react-native-pubky: 54d37810f35d9da11f8c199a6036e5729081951b diff --git a/package.json b/package.json index ef480ffba..b4e87ebf8 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@reduxjs/toolkit": "2.2.6", "@shopify/react-native-skia": "next", "@synonymdev/blocktank-lsp-http-client": "2.2.0", - "@synonymdev/react-native-ldk": "0.0.155", + "@synonymdev/react-native-ldk": "0.0.158", "@synonymdev/react-native-lnurl": "0.0.10", "@synonymdev/react-native-pubky": "^0.3.0", "@synonymdev/result": "0.0.2", diff --git a/patches/@synonymdev+react-native-ldk+0.0.155.patch b/patches/@synonymdev+react-native-ldk+0.0.155.patch deleted file mode 100644 index 639e7048a..000000000 --- a/patches/@synonymdev+react-native-ldk+0.0.155.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/node_modules/@synonymdev/react-native-ldk/android/src/main/java/com/reactnativeldk/Helpers.kt b/node_modules/@synonymdev/react-native-ldk/android/src/main/java/com/reactnativeldk/Helpers.kt -index 8d2e618..8c374ab 100644 ---- a/node_modules/@synonymdev/react-native-ldk/android/src/main/java/com/reactnativeldk/Helpers.kt -+++ b/node_modules/@synonymdev/react-native-ldk/android/src/main/java/com/reactnativeldk/Helpers.kt -@@ -530,8 +530,8 @@ fun currencyString(currency: Currency): String { - } - } - --fun mergeObj(obj1: JSONObject, obj2: HashMap): HashMap { -- val newObj = HashMap() -+fun mergeObj(obj1: JSONObject, obj2: HashMap): HashMap { -+ val newObj = HashMap() - - obj1.keys().forEach { key -> - newObj[key] = obj1[key] -diff --git a/node_modules/@synonymdev/react-native-ldk/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt b/node_modules/@synonymdev/react-native-ldk/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt -index 71ecb7a..2dc12b6 100644 ---- a/node_modules/@synonymdev/react-native-ldk/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt -+++ b/node_modules/@synonymdev/react-native-ldk/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt -@@ -254,7 +254,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler { - return - } - -- var payments: Array> = arrayOf() -+ var payments: Array> = arrayOf() - var paymentReplaced = false - - try { -@@ -275,7 +275,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler { - continue - } - -- val map = HashMap() -+ val map = HashMap() - for (key in existingPayment.keys()) { - map[key] = existingPayments.getJSONObject(i).get(key) - } -@@ -296,13 +296,13 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler { - File(LdkModule.accountStoragePath + "/" + LdkFileNames.PaymentsClaimed.fileName).writeText(JSONArray(payments).toString()) - } - -- fun persistPaymentSent(payment: HashMap) { -+ fun persistPaymentSent(payment: HashMap) { - if (LdkModule.accountStoragePath == "") { - LdkEventEmitter.send(EventTypes.native_log, "Error. Failed to persist sent payment to disk (No set storage)") - return - } - -- var payments: Array> = arrayOf() -+ var payments: Array> = arrayOf() - var paymentReplaced = false - - try { -@@ -319,7 +319,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler { - continue - } - -- val map = HashMap() -+ val map = HashMap() - for (key in existingPayment.keys()) { - map[key] = existingPayment.get(key) - } diff --git a/src/utils/lightning/index.ts b/src/utils/lightning/index.ts index 9357cd8e9..91343a3f3 100644 --- a/src/utils/lightning/index.ts +++ b/src/utils/lightning/index.ts @@ -348,7 +348,6 @@ export const getFees: TGetFees = async () => { return { //https://github.com/lightningdevkit/rust-lightning/blob/main/CHANGELOG.md#api-updates - onChainSweep: fees.fast, maxAllowedNonAnchorChannelRemoteFee: Math.max(25, fees.fast * 10), minAllowedAnchorChannelRemoteFee: fees.minimum, minAllowedNonAnchorChannelRemoteFee: Math.max(fees.minimum - 1, 0), @@ -356,6 +355,8 @@ export const getFees: TGetFees = async () => { nonAnchorChannelFee: fees.normal, channelCloseMinimum: fees.minimum, outputSpendingFee: fees.fast, + maximumFeeEstimate: fees.fast, + urgentOnChainSweep: fees.fast, }; }; diff --git a/yarn.lock b/yarn.lock index 0c0a382ce..7e97503e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4585,16 +4585,16 @@ __metadata: languageName: node linkType: hard -"@synonymdev/react-native-ldk@npm:0.0.155": - version: 0.0.155 - resolution: "@synonymdev/react-native-ldk@npm:0.0.155" +"@synonymdev/react-native-ldk@npm:0.0.158": + version: 0.0.158 + resolution: "@synonymdev/react-native-ldk@npm:0.0.158" dependencies: "@synonymdev/raw-transaction-decoder": 1.1.0 bech32: ^2.0.0 bitcoinjs-lib: ^6.0.2 peerDependencies: react-native: "*" - checksum: a5dc76dcb138d0b293a24759415988a277c7226bb8631b3cf87fd0d961330f795dcf5c6bac2277744a7dd034303bd74e9d682a0689c9c03181e3060ff7053399 + checksum: e93fccadea4def04e9b1232070af0019ebfc0996cee1595738e83b8d9e3e00a64491b5366116a57f65b053732efe6903ff8df61c9fe4c5891f82bf17abaefed5 languageName: node linkType: hard @@ -5826,7 +5826,7 @@ __metadata: "@reduxjs/toolkit": 2.2.6 "@shopify/react-native-skia": next "@synonymdev/blocktank-lsp-http-client": 2.2.0 - "@synonymdev/react-native-ldk": 0.0.155 + "@synonymdev/react-native-ldk": 0.0.158 "@synonymdev/react-native-lnurl": 0.0.10 "@synonymdev/react-native-pubky": ^0.3.0 "@synonymdev/result": 0.0.2