mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 15:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Delay closing_signed until update_fee exchanges complete

Browse source 
See https://github.com/lightningnetwork/lightning-rfc/issues/499
for a bit more about the ambiguity we're addressing here.

Also drop holding cell update_fee the same way we drop holding
cell update_add_htlcs when sending shutdown, resolving a bug.
This commit is contained in:
Matt Corallo 2018-11-01 17:12:20 -04:00
parent 78232f2aed
commit 527d036c1b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ln/channel.rs
View file

@ -2382,7 +2382,8 @@ impl Channel {
fn maybe_propose_first_closing_signed(&mut self, fee_estimator: &FeeEstimator) -> Option<msgs::ClosingSigned> { fn maybe_propose_first_closing_signed(&mut self, fee_estimator: &FeeEstimator) -> Option<msgs::ClosingSigned> {
if !self.channel_outbound || !self.pending_inbound_htlcs.is_empty() || !self.pending_outbound_htlcs.is_empty() || if !self.channel_outbound || !self.pending_inbound_htlcs.is_empty() || !self.pending_outbound_htlcs.is_empty() ||
self.channel_state & (BOTH_SIDES_SHUTDOWN_MASK | ChannelState::AwaitingRemoteRevoke as u32) != BOTH_SIDES_SHUTDOWN_MASK || self.channel_state & (BOTH_SIDES_SHUTDOWN_MASK | ChannelState::AwaitingRemoteRevoke as u32) != BOTH_SIDES_SHUTDOWN_MASK ||
self.last_sent_closing_fee.is_some() { self.last_sent_closing_fee.is_some() ||
self.cur_remote_commitment_transaction_number != self.cur_local_commitment_transaction_number{
return None; return None;
} }
@ -2452,6 +2453,7 @@ impl Channel {
// We can't send our shutdown until we've committed all of our pending HTLCs, but the // We can't send our shutdown until we've committed all of our pending HTLCs, but the
// remote side is unlikely to accept any new HTLCs, so we go ahead and "free" any holding // remote side is unlikely to accept any new HTLCs, so we go ahead and "free" any holding
// cell HTLCs and return them to fail the payment. // cell HTLCs and return them to fail the payment.
self.holding_cell_update_fee = None;
let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len()); let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len());
self.holding_cell_htlc_updates.retain(|htlc_update| { self.holding_cell_htlc_updates.retain(|htlc_update| {
match htlc_update { match htlc_update {
@ -3260,9 +3262,9 @@ impl Channel {
} }
self.channel_update_count += 1; self.channel_update_count += 1;
// We can't send our shutdown until we've committed all of our pending HTLCs, but the // Go ahead and drop holding cell updates as we'd rather fail payments than wait to send
// remote side is unlikely to accept any new HTLCs, so we go ahead and "free" any holding // our shutdown until we've committed all of the pending changes.
// cell HTLCs and return them to fail the payment. self.holding_cell_update_fee = None;
let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len()); let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlc_updates.len());
self.holding_cell_htlc_updates.retain(|htlc_update| { self.holding_cell_htlc_updates.retain(|htlc_update| {
match htlc_update { match htlc_update {