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

Clean up error messages and conditionals in reestablish handling

Browse source 
When we reestablish there are generally always 4 conditions for
both local and remote commitment transactions:
 * we're stale and have possibly lost data
 * we're ahead and the peer has lost data
 * we're caught up
 * we're nearly caught up and need to retransmit one update.

In especially the local commitment case we had a mess of different
comparisons, which is improved here. Further, the error messages
are clarified and include more information.
This commit is contained in:
Matt Corallo 2023-11-09 03:28:45 +00:00
parent 589a88e749
commit f24830719a
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lightning/src/ln/channel.rs
View file

@ -4181,9 +4181,11 @@ impl<SP: Deref> Channel<SP> where
// commitment transaction number, if yes we send a warning message. // commitment transaction number, if yes we send a warning message.
let our_commitment_transaction = INITIAL_COMMITMENT_NUMBER - self.context.cur_holder_commitment_transaction_number - 1; let our_commitment_transaction = INITIAL_COMMITMENT_NUMBER - self.context.cur_holder_commitment_transaction_number - 1;
if msg.next_remote_commitment_number + 1 < our_commitment_transaction { if msg.next_remote_commitment_number + 1 < our_commitment_transaction {
return Err( return Err(ChannelError::Warn(format!(
ChannelError::Warn(format!("Peer attempted to reestablish channel with a very old local commitment transaction: {} (received) vs {} (expected)", msg.next_remote_commitment_number, our_commitment_transaction)) "Peer attempted to reestablish channel with a very old local commitment transaction: {} (received) vs {} (expected)",
); msg.next_remote_commitment_number,
our_commitment_transaction
)));
} }
// Go ahead and unmark PeerDisconnected as various calls we may make check for it (and all // Go ahead and unmark PeerDisconnected as various calls we may make check for it (and all
@ -4225,11 +4227,11 @@ impl<SP: Deref> Channel<SP> where
}); });
} }
let required_revoke = if msg.next_remote_commitment_number + 1 == INITIAL_COMMITMENT_NUMBER - self.context.cur_holder_commitment_transaction_number { let required_revoke = if msg.next_remote_commitment_number == our_commitment_transaction {
// Remote isn't waiting on any RevokeAndACK from us! // Remote isn't waiting on any RevokeAndACK from us!
// Note that if we need to repeat our ChannelReady we'll do that in the next if block. // Note that if we need to repeat our ChannelReady we'll do that in the next if block.
None None
} else if msg.next_remote_commitment_number + 1 == (INITIAL_COMMITMENT_NUMBER - 1) - self.context.cur_holder_commitment_transaction_number { } else if msg.next_remote_commitment_number + 1 == our_commitment_transaction {
if self.context.channel_state & (ChannelState::MonitorUpdateInProgress as u32) != 0 { if self.context.channel_state & (ChannelState::MonitorUpdateInProgress as u32) != 0 {
self.context.monitor_pending_revoke_and_ack = true; self.context.monitor_pending_revoke_and_ack = true;
None None
@ -4237,7 +4239,11 @@ impl<SP: Deref> Channel<SP> where
Some(self.get_last_revoke_and_ack()) Some(self.get_last_revoke_and_ack())
} }
} else { } else {
return Err(ChannelError::Close("Peer attempted to reestablish channel with a very old local commitment transaction".to_owned())); return Err(ChannelError::Close(format!(
"Peer attempted to reestablish channel expecting a future local commitment transaction: {} (received) vs {} (expected)",
msg.next_remote_commitment_number,
our_commitment_transaction
)));
}; };
// We increment cur_counterparty_commitment_transaction_number only upon receipt of // We increment cur_counterparty_commitment_transaction_number only upon receipt of
@ -4295,8 +4301,18 @@ impl<SP: Deref> Channel<SP> where
order: self.context.resend_order.clone(), order: self.context.resend_order.clone(),
}) })
} }
} else if msg.next_local_commitment_number < next_counterparty_commitment_number {
Err(ChannelError::Close(format!(
"Peer attempted to reestablish channel with a very old remote commitment transaction: {} (received) vs {} (expected)",
msg.next_local_commitment_number,
next_counterparty_commitment_number,
)))
} else { } else {
Err(ChannelError::Close("Peer attempted to reestablish channel with a very old remote commitment transaction".to_owned())) Err(ChannelError::Close(format!(
"Peer attempted to reestablish channel with a future remote commitment transaction: {} (received) vs {} (expected)",
msg.next_local_commitment_number,
next_counterparty_commitment_number,
)))
} }
} }