fix: fee types update

Author: Jasonvdb

example/ldk/index.ts

@@ -132,9 +132,10 @@ export const setupLdk = async (
 					channelCloseMinimum: 10,
 					minAllowedAnchorChannelRemoteFee: 10,
 					maxAllowedNonAnchorChannelRemoteFee: 10,
-					onChainSweep: 10,
 					minAllowedNonAnchorChannelRemoteFee: 10,
 					outputSpendingFee: 10,
+					maximumFeeEstimate: 10,
+					urgentOnChainSweep: 10,
 				}),
 			getTransactionData,
 			getTransactionPosition,

example/tests/eclair.ts

@@ -105,14 +105,15 @@ describe('Eclair', function () {
 			...profile.getStartParams(),
 			getFees: () => {
 				return Promise.resolve({
-					onChainSweep: 30,
 					maxAllowedNonAnchorChannelRemoteFee: Math.max(25, 30 * 10),
 					minAllowedAnchorChannelRemoteFee: 5,
 					minAllowedNonAnchorChannelRemoteFee: Math.max(5 - 1, 0),
 					anchorChannelFee: 10,
 					nonAnchorChannelFee: 20,
 					channelCloseMinimum: 5,
 					outputSpendingFee: 10,
+					urgentOnChainSweep: 30,
+					maximumFeeEstimate: 30
 				});
 			},
 		});

example/tests/unit.ts

@@ -70,8 +70,9 @@ describe('Unit', function () {
 					channelCloseMinimum: 5,
 					minAllowedAnchorChannelRemoteFee: 5,
 					minAllowedNonAnchorChannelRemoteFee: 5,
-					onChainSweep: 5,
 					outputSpendingFee: 5,
+					urgentOnChainSweep: 5,
+					maximumFeeEstimate: 5,
 				});
 			},
 			getTransactionData: async () => ({
@@ -214,8 +215,9 @@ describe('Unit', function () {
 					channelCloseMinimum: 5,
 					minAllowedAnchorChannelRemoteFee: 5,
 					minAllowedNonAnchorChannelRemoteFee: 5,
-					onChainSweep: 5,
 					outputSpendingFee: 5,
+					urgentOnChainSweep: 5,
+					maximumFeeEstimate: 5,
 				});
 			},
 			getTransactionData: async () => ({

example/tests/utils/test-profile.ts

@@ -75,14 +75,15 @@ export default class TestProfile {
 			getScriptPubKeyHistory: this.getScriptPubKeyHistory,
 			getFees: () =>
 				Promise.resolve({
-					onChainSweep: 4,
 					maxAllowedNonAnchorChannelRemoteFee: Math.max(25, 4 * 10),
 					minAllowedAnchorChannelRemoteFee: 1,
 					minAllowedNonAnchorChannelRemoteFee: Math.max(1 - 1, 0),
 					anchorChannelFee: 2,
 					nonAnchorChannelFee: 3,
 					channelCloseMinimum: 1,
 					outputSpendingFee: 5,
+					urgentOnChainSweep: 5,
+					maximumFeeEstimate: 5,
 				}),
 			getTransactionData: this.getTransactionData,
 			getTransactionPosition: this.getTransactionPosition,

lib/ios/Classes/LdkFeeEstimator.swift

@@ -13,7 +13,6 @@ class LdkFeeEstimator: FeeEstimator {
     private var nonAnchorChannelFee: UInt32 = 0
     private var channelCloseMinimum: UInt32 = 0
     private var minAllowedAnchorChannelRemoteFee: UInt32 = 0
-    private var onChainSweep: UInt32 = 0
     private var minAllowedNonAnchorChannelRemoteFee: UInt32 = 0
     private var outputSpendingFee: UInt32 = 0
     private var maximumFeeEstimate: UInt32 = 0
@@ -24,7 +23,6 @@ class LdkFeeEstimator: FeeEstimator {
         nonAnchorChannelFee: UInt32,
         channelCloseMinimum: UInt32,
         minAllowedAnchorChannelRemoteFee: UInt32,
-        onChainSweep: UInt32,
         minAllowedNonAnchorChannelRemoteFee: UInt32,
         outputSpendingFee: UInt32,
         maximumFeeEstimate: UInt32,
@@ -34,7 +32,6 @@ class LdkFeeEstimator: FeeEstimator {
         self.nonAnchorChannelFee = nonAnchorChannelFee
         self.channelCloseMinimum = channelCloseMinimum
         self.minAllowedAnchorChannelRemoteFee = minAllowedAnchorChannelRemoteFee
-        self.onChainSweep = onChainSweep
         self.minAllowedNonAnchorChannelRemoteFee = minAllowedNonAnchorChannelRemoteFee
         self.outputSpendingFee = outputSpendingFee
         self.maximumFeeEstimate = maximumFeeEstimate

lib/ios/Ldk.m

@@ -49,7 +49,6 @@ @interface RCT_EXTERN_MODULE(Ldk, NSObject)
                   nonAnchorChannelFee:(NSInteger *)nonAnchorChannelFee
                   channelCloseMinimum:(NSInteger *)channelCloseMinimum
                   minAllowedAnchorChannelRemoteFee:(NSInteger *)minAllowedAnchorChannelRemoteFee
-                  onChainSweep:(NSInteger *)onChainSweep
                   minAllowedNonAnchorChannelRemoteFee:(NSInteger *)minAllowedNonAnchorChannelRemoteFee
                   outputSpendingFee:(NSInteger *)outputSpendingFee
                   maximumFeeEstimate:(NSInteger *)maximumFeeEstimate

lib/ios/Ldk.swift

@@ -623,7 +623,6 @@ class Ldk: NSObject {
         nonAnchorChannelFee: NSInteger,
         channelCloseMinimum: NSInteger,
         minAllowedAnchorChannelRemoteFee: NSInteger,
-        onChainSweep: NSInteger,
         minAllowedNonAnchorChannelRemoteFee: NSInteger,
         outputSpendingFee: NSInteger,
         maximumFeeEstimate: NSInteger,
@@ -636,7 +635,6 @@ class Ldk: NSObject {
             nonAnchorChannelFee: UInt32(nonAnchorChannelFee),
             channelCloseMinimum: UInt32(channelCloseMinimum),
             minAllowedAnchorChannelRemoteFee: UInt32(minAllowedAnchorChannelRemoteFee),
-            onChainSweep: UInt32(onChainSweep),
             minAllowedNonAnchorChannelRemoteFee: UInt32(minAllowedNonAnchorChannelRemoteFee),
             outputSpendingFee: UInt32(outputSpendingFee),
             maximumFeeEstimate: UInt32(maximumFeeEstimate),

lib/src/ldk.ts

@@ -344,7 +344,6 @@ class LDK {
 			nonAnchorChannelFee,
 			channelCloseMinimum,
 			minAllowedAnchorChannelRemoteFee,
-			onChainSweep,
 			minAllowedNonAnchorChannelRemoteFee,
 			outputSpendingFee,
 			maximumFeeEstimate,
@@ -357,7 +356,6 @@ class LDK {
 				nonAnchorChannelFee * satsPerKw,
 				channelCloseMinimum * satsPerKw,
 				minAllowedAnchorChannelRemoteFee * satsPerKw,
-				onChainSweep * satsPerKw,
 				minAllowedNonAnchorChannelRemoteFee * satsPerKw,
 				outputSpendingFee * satsPerKw,
 				maximumFeeEstimate * satsPerKw,

lib/src/lightning-manager.ts

@@ -139,7 +139,6 @@ class LightningManager {
 		channelCloseMinimum: 5,
 		minAllowedAnchorChannelRemoteFee: 5,
 		minAllowedNonAnchorChannelRemoteFee: 5,
-		onChainSweep: 5,
 		outputSpendingFee: 5,
 		maximumFeeEstimate: 5,
 		urgentOnChainSweep: 5,
@@ -2209,7 +2208,7 @@ class LightningManager {
 	 */
 	private async getOnChainSweepFeeRate(): Promise<number> {
 		try {
-			let satsPerVByte = (await this.getFees()).onChainSweep;
+			let satsPerVByte = (await this.getFees()).urgentOnChainSweep;
 			// Multiply by 250 because https://docs.rs/lightning/latest/lightning/chain/chaininterface/trait.FeeEstimator.html#tymethod.get_est_sat_per_1000_weight
 			return satsPerVByte * 250;
 		} catch (error) {

lib/src/utils/types.ts

@@ -250,7 +250,6 @@ export type TFeeUpdateReq = {
 	nonAnchorChannelFee: number;
 	channelCloseMinimum: number;
 	minAllowedAnchorChannelRemoteFee: number;
-	onChainSweep: number;
 	minAllowedNonAnchorChannelRemoteFee: number;
 	outputSpendingFee: number;
 	maximumFeeEstimate: number;