X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannel.rs;h=11f0261d677a3df37b2fa36f94ea142e5ce8f16c;hb=17a74fcfc74936b48923bba5a416be73a01d2367;hp=4fd612a4b91e33c99659c46e592bf6b22d70a3ec;hpb=e94647ca4ebc63be4a8164804d08cf37e4655d6c;p=rust-lightning

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 4fd612a4..11f0261d 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -4092,7 +4092,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 
 		if msg.next_local_commitment_number >= INITIAL_COMMITMENT_NUMBER || msg.next_remote_commitment_number >= INITIAL_COMMITMENT_NUMBER ||
 			msg.next_local_commitment_number == 0 {
-			return Err(ChannelError::Close("Peer sent a garbage channel_reestablish".to_owned()));
+			return Err(ChannelError::Close("Peer sent a garbage channel_reestablish (usually an lnd node with lost state asking us to force-close for them)".to_owned()));
 		}
 
 		if msg.next_remote_commitment_number > 0 {
@@ -5774,6 +5774,10 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 			next_remote_commitment_number: INITIAL_COMMITMENT_NUMBER - self.cur_counterparty_commitment_transaction_number - 1,
 			your_last_per_commitment_secret: remote_last_secret,
 			my_current_per_commitment_point: dummy_pubkey,
+			// TODO(dual_funding): If we've sent `commtiment_signed` for an interactive transaction
+			// construction but have not received `tx_signatures` we MUST set `next_funding_txid` to the
+			// txid of that interactive transaction, else we MUST NOT set it.
+			next_funding_txid: None,
 		}
 	}