mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-26 07:32:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added test for testing sciptpubkey of closing message per bolt 2 spec

Browse source
This commit is contained in:
Schalk van Heerden 2018-09-20 10:16:20 +02:00
parent 92ff499bdb
commit b58bab0700
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ln/channel.rs
View file

@ -2012,7 +2012,12 @@ impl Channel {
if self.channel_outbound && msg.scriptpubkey.len() > 34 { if self.channel_outbound && msg.scriptpubkey.len() > 34 {
return Err(HandleError{err: "Got shutdown_scriptpubkey of absurd length from remote peer", action: None}); return Err(HandleError{err: "Got shutdown_scriptpubkey of absurd length from remote peer", action: None});
} }
//TODO: Check shutdown_scriptpubkey form as BOLT says we must? WHYYY
//Check shutdown_scriptpubkey form as BOLT says we must
if !(msg.scriptpubkey.is_p2pkh()) && !(msg.scriptpubkey.is_p2sh())
&& !(msg.scriptpubkey.is_v0_p2wpkh()) && !(msg.scriptpubkey.is_v0_p2wsh()){
return Err(HandleError{err: "Got an invalid scriptpubkey from remote peer", action: Some(msgs::ErrorAction::DisconnectPeer{ msg: None })});
}
if self.their_shutdown_scriptpubkey.is_some() { if self.their_shutdown_scriptpubkey.is_some() {
if Some(&msg.scriptpubkey) != self.their_shutdown_scriptpubkey.as_ref() { if Some(&msg.scriptpubkey) != self.their_shutdown_scriptpubkey.as_ref() {
@ -2098,7 +2103,7 @@ impl Channel {
if !self.pending_inbound_htlcs.is_empty() || !self.pending_outbound_htlcs.is_empty() { if !self.pending_inbound_htlcs.is_empty() || !self.pending_outbound_htlcs.is_empty() {
return Err(HandleError{err: "Remote end sent us a closing_signed while there were still pending HTLCs", action: None}); return Err(HandleError{err: "Remote end sent us a closing_signed while there were still pending HTLCs", action: None});
} }
if msg.fee_satoshis > 21000000 * 10000000 { if msg.fee_satoshis > 21000000 * 10000000 { //this is required to stop potential overflow in build_closing_transaction
return Err(HandleError{err: "Remote tried to send us a closing tx with > 21 million BTC fee", action: None}); return Err(HandleError{err: "Remote tried to send us a closing tx with > 21 million BTC fee", action: None});
} }