From 7be903ba006d45d95298d991f687affdee2c978f Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 9 Dec 2019 17:22:02 -0500 Subject: [PATCH] Dont forget RBF previous-feerate info if tx size changed. While our fee may change wildly (or even go down), the previous fee *rate* is still valid, and we should use that as the basis for our RBF. --- lightning/src/ln/channelmonitor.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lightning/src/ln/channelmonitor.rs b/lightning/src/ln/channelmonitor.rs index e1711125..ed532e1f 100644 --- a/lightning/src/ln/channelmonitor.rs +++ b/lightning/src/ln/channelmonitor.rs @@ -2421,8 +2421,6 @@ impl ChannelMonitor { claimed_input_material.push(input_material); } } - // Avoid bump engine using inaccurate feerate due to new transaction size - claim_material.feerate_previous = 0; //TODO: recompute soonest_timelock to avoid wasting a bit on fees bump_candidates.push((ancestor_claimable_txid.0.clone(), claim_material.clone())); } @@ -2519,8 +2517,6 @@ impl ChannelMonitor { OnchainEvent::ContentiousOutpoint { outpoint, input_material } => { if let Some(ancestor_claimable_txid) = self.claimable_outpoints.get(&outpoint) { if let Some(claim_material) = self.pending_claim_requests.get_mut(&ancestor_claimable_txid.0) { - // Avoid bump engine using inaccurate feerate due to new transaction size - claim_material.feerate_previous = 0; claim_material.per_input_material.insert(outpoint, input_material); // Using a HashMap guarantee us than if we have multiple outpoints getting // resurrected only one bump claim tx is going to be broadcast -- 2.30.2