X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fchannelmanager.rs;h=c3d39d8f85498508468c771d21a690a26891a351;hb=e67d8c6314c4fce465e41652b539f83d0a8c4887;hp=e1975c08d6712ea5a1e358a581bc5f4a69bab6dc;hpb=4a697dbdf2ff4f14075ca4fb214ab4bdb0cf7610;p=rust-lightning

diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index e1975c08..c3d39d8f 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -12,8 +12,7 @@ use bitcoin::blockdata::block::BlockHeader;
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::network::constants::Network;
-use bitcoin::network::serialize::BitcoinHash;
-use bitcoin::util::hash::Sha256dHash;
+use bitcoin::util::hash::{BitcoinHash, Sha256dHash};
 
 use secp256k1::key::{SecretKey,PublicKey};
 use secp256k1::{Secp256k1,Message};
@@ -1943,10 +1942,20 @@ impl ChannelManager {
 					// but if we've sent a shutdown and they haven't acknowledged it yet, we just
 					// want to reject the new HTLC and fail it backwards instead of forwarding.
 					if let PendingHTLCStatus::Forward(PendingForwardHTLCInfo { incoming_shared_secret, .. }) = pending_forward_info {
+						let chan_update = self.get_channel_update(chan);
 						pending_forward_info = PendingHTLCStatus::Fail(HTLCFailureMsg::Relay(msgs::UpdateFailHTLC {
 							channel_id: msg.channel_id,
 							htlc_id: msg.htlc_id,
-							reason: ChannelManager::build_first_hop_failure_packet(&incoming_shared_secret, 0x1000|20, &self.get_channel_update(chan).unwrap().encode_with_len()[..]),
+							reason: if let Ok(update) = chan_update {
+								ChannelManager::build_first_hop_failure_packet(&incoming_shared_secret, 0x1000|20, &update.encode_with_len()[..])
+							} else {
+								// This can only happen if the channel isn't in the fully-funded
+								// state yet, implying our counterparty is trying to route payments
+								// over the channel back to themselves (cause no one else should
+								// know the short_id is a lightning channel yet). We should have no
+								// problem just calling this unknown_next_peer
+								ChannelManager::build_first_hop_failure_packet(&incoming_shared_secret, 0x4000|10, &[])
+							},
 						}));
 					}
 				}
@@ -3224,13 +3233,11 @@ mod tests {
 	use util::ser::{Writeable, Writer, ReadableArgs};
 	use util::config::UserConfig;
 
-	use bitcoin::util::hash::Sha256dHash;
+	use bitcoin::util::hash::{BitcoinHash, Sha256dHash};
 	use bitcoin::blockdata::block::{Block, BlockHeader};
 	use bitcoin::blockdata::transaction::{Transaction, TxOut};
 	use bitcoin::blockdata::constants::genesis_block;
 	use bitcoin::network::constants::Network;
-	use bitcoin::network::serialize::serialize;
-	use bitcoin::network::serialize::BitcoinHash;
 
 	use hex;
 
@@ -3520,7 +3527,7 @@ mod tests {
 				tx = Transaction { version: chan_id as u32, lock_time: 0, input: Vec::new(), output: vec![TxOut {
 					value: *channel_value_satoshis, script_pubkey: output_script.clone(),
 				}]};
-				funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
+				funding_output = OutPoint::new(tx.txid(), 0);
 
 				node_a.node.funding_transaction_generated(&temporary_channel_id, funding_output);
 				let mut added_monitors = node_a.chan_monitor.added_monitors.lock().unwrap();