mirror of
https://github.com/lightningdevkit/rust-lightning.git
synced 2025-02-24 15:02:20 +01:00
Merge pull request #794 from galderz/t_opt_shutdown_anysegwit_780
Add support for `opt_shutdown_anysegwit` feature #780
This commit is contained in:
Matt Corallo
GitHub
commit
ad09a2f004
9 changed files with 215 additions and 48 deletions
|
|
@ -551,7 +551,7 @@ mod tests {
|
|||
fn handle_funding_created(&self, _their_node_id: &PublicKey, _msg: &FundingCreated) {}
|
||||
fn handle_funding_signed(&self, _their_node_id: &PublicKey, _msg: &FundingSigned) {}
|
||||
fn handle_funding_locked(&self, _their_node_id: &PublicKey, _msg: &FundingLocked) {}
|
||||
fn handle_shutdown(&self, _their_node_id: &PublicKey, _msg: &Shutdown) {}
|
||||
fn handle_shutdown(&self, _their_node_id: &PublicKey, _their_features: &InitFeatures, _msg: &Shutdown) {}
|
||||
fn handle_closing_signed(&self, _their_node_id: &PublicKey, _msg: &ClosingSigned) {}
|
||||
fn handle_update_add_htlc(&self, _their_node_id: &PublicKey, _msg: &UpdateAddHTLC) {}
|
||||
fn handle_update_fulfill_htlc(&self, _their_node_id: &PublicKey, _msg: &UpdateFulfillHTLC) {}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ use std::ops::Deref;
|
|||
#[cfg(any(test, feature = "fuzztarget"))]
|
||||
use std::sync::Mutex;
|
||||
use bitcoin::hashes::hex::ToHex;
|
||||
use bitcoin::blockdata::opcodes::all::OP_PUSHBYTES_0;
|
||||
|
||||
#[cfg(test)]
|
||||
pub struct ChannelValueStat {
|
||||
|
|
@ -737,15 +738,14 @@ impl<Signer: Sign> Channel<Signer> {
|
|||
let counterparty_shutdown_scriptpubkey = if their_features.supports_upfront_shutdown_script() {
|
||||
match &msg.shutdown_scriptpubkey {
|
||||
&OptionalField::Present(ref script) => {
|
||||
// Peer is signaling upfront_shutdown and has provided a non-accepted scriptpubkey format. We enforce it while receiving shutdown msg
|
||||
if script.is_p2pkh() || script.is_p2sh() || script.is_v0_p2wsh() || script.is_v0_p2wpkh() {
|
||||
Some(script.clone())
|
||||
// Peer is signaling upfront_shutdown and has opt-out with a 0-length script. We don't enforce anything
|
||||
} else if script.len() == 0 {
|
||||
if script.len() == 0 {
|
||||
None
|
||||
// Peer is signaling upfront_shutdown and has provided a non-accepted scriptpubkey format. Fail the channel
|
||||
} else {
|
||||
} else if is_unsupported_shutdown_script(&their_features, script) {
|
||||
return Err(ChannelError::Close(format!("Peer is signaling upfront_shutdown but has provided a non-accepted scriptpubkey format. script: ({})", script.to_bytes().to_hex())));
|
||||
} else {
|
||||
Some(script.clone())
|
||||
}
|
||||
},
|
||||
// Peer is signaling upfront shutdown but don't opt-out with correct mechanism (a.k.a 0-length script). Peer looks buggy, we fail the channel
|
||||
|
|
@ -1439,15 +1439,14 @@ impl<Signer: Sign> Channel<Signer> {
|
|||
let counterparty_shutdown_scriptpubkey = if their_features.supports_upfront_shutdown_script() {
|
||||
match &msg.shutdown_scriptpubkey {
|
||||
&OptionalField::Present(ref script) => {
|
||||
// Peer is signaling upfront_shutdown and has provided a non-accepted scriptpubkey format. We enforce it while receiving shutdown msg
|
||||
if script.is_p2pkh() || script.is_p2sh() || script.is_v0_p2wsh() || script.is_v0_p2wpkh() {
|
||||
Some(script.clone())
|
||||
// Peer is signaling upfront_shutdown and has opt-out with a 0-length script. We don't enforce anything
|
||||
} else if script.len() == 0 {
|
||||
if script.len() == 0 {
|
||||
None
|
||||
// Peer is signaling upfront_shutdown and has provided a non-accepted scriptpubkey format. Fail the channel
|
||||
} else if is_unsupported_shutdown_script(&their_features, script) {
|
||||
return Err(ChannelError::Close(format!("Peer is signaling upfront_shutdown but has provided a non-accepted scriptpubkey format. script: ({})", script.to_bytes().to_hex())));
|
||||
} else {
|
||||
return Err(ChannelError::Close(format!("Peer is signaling upfront_shutdown but has provided a non-accepted scriptpubkey format. scriptpubkey: ({})", script.to_bytes().to_hex())));
|
||||
Some(script.clone())
|
||||
}
|
||||
},
|
||||
// Peer is signaling upfront shutdown but don't opt-out with correct mechanism (a.k.a 0-length script). Peer looks buggy, we fail the channel
|
||||
|
|
@ -3066,7 +3065,7 @@ impl<Signer: Sign> Channel<Signer> {
|
|||
})
|
||||
}
|
||||
|
||||
pub fn shutdown<F: Deref>(&mut self, fee_estimator: &F, msg: &msgs::Shutdown) -> Result<(Option<msgs::Shutdown>, Option<msgs::ClosingSigned>, Vec<(HTLCSource, PaymentHash)>), ChannelError>
|
||||
pub fn shutdown<F: Deref>(&mut self, fee_estimator: &F, their_features: &InitFeatures, msg: &msgs::Shutdown) -> Result<(Option<msgs::Shutdown>, Option<msgs::ClosingSigned>, Vec<(HTLCSource, PaymentHash)>), ChannelError>
|
||||
where F::Target: FeeEstimator
|
||||
{
|
||||
if self.channel_state & (ChannelState::PeerDisconnected as u32) == ChannelState::PeerDisconnected as u32 {
|
||||
|
|
@ -3085,14 +3084,7 @@ impl<Signer: Sign> Channel<Signer> {
|
|||
}
|
||||
assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
|
||||
|
||||
// BOLT 2 says we must only send a scriptpubkey of certain standard forms, which are up to
|
||||
// 34 bytes in length, so don't let the remote peer feed us some super fee-heavy script.
|
||||
if self.is_outbound() && msg.scriptpubkey.len() > 34 {
|
||||
return Err(ChannelError::Close(format!("Got counterparty shutdown_scriptpubkey ({}) of absurd length from remote peer", msg.scriptpubkey.to_bytes().to_hex())));
|
||||
}
|
||||
|
||||
//Check counterparty_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() {
|
||||
if is_unsupported_shutdown_script(&their_features, &msg.scriptpubkey) {
|
||||
return Err(ChannelError::Close(format!("Got a nonstandard scriptpubkey ({}) from remote peer", msg.scriptpubkey.to_bytes().to_hex())));
|
||||
}
|
||||
|
||||
|
|
@ -4217,6 +4209,24 @@ impl<Signer: Sign> Channel<Signer> {
|
|||
}
|
||||
}
|
||||
|
||||
fn is_unsupported_shutdown_script(their_features: &InitFeatures, script: &Script) -> bool {
|
||||
// We restrain shutdown scripts to standards forms to avoid transactions not propagating on the p2p tx-relay network
|
||||
|
||||
// BOLT 2 says we must only send a scriptpubkey of certain standard forms,
|
||||
// which for a a BIP-141-compliant witness program is at max 42 bytes in length.
|
||||
// So don't let the remote peer feed us some super fee-heavy script.
|
||||
let is_script_too_long = script.len() > 42;
|
||||
if is_script_too_long {
|
||||
return true;
|
||||
}
|
||||
|
||||
if their_features.supports_shutdown_anysegwit() && script.is_witness_program() && script.as_bytes()[0] != OP_PUSHBYTES_0.into_u8() {
|
||||
return false;
|
||||
}
|
||||
|
||||
return !script.is_p2pkh() && !script.is_p2sh() && !script.is_v0_p2wpkh() && !script.is_v0_p2wsh()
|
||||
}
|
||||
|
||||
const SERIALIZATION_VERSION: u8 = 1;
|
||||
const MIN_SERIALIZATION_VERSION: u8 = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -2507,7 +2507,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
|
|||
}
|
||||
}
|
||||
|
||||
fn internal_shutdown(&self, counterparty_node_id: &PublicKey, msg: &msgs::Shutdown) -> Result<(), MsgHandleErrInternal> {
|
||||
fn internal_shutdown(&self, counterparty_node_id: &PublicKey, their_features: &InitFeatures, msg: &msgs::Shutdown) -> Result<(), MsgHandleErrInternal> {
|
||||
let (mut dropped_htlcs, chan_option) = {
|
||||
let mut channel_state_lock = self.channel_state.lock().unwrap();
|
||||
let channel_state = &mut *channel_state_lock;
|
||||
|
|
@ -2517,7 +2517,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
|
|||
if chan_entry.get().get_counterparty_node_id() != *counterparty_node_id {
|
||||
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
|
||||
}
|
||||
let (shutdown, closing_signed, dropped_htlcs) = try_chan_entry!(self, chan_entry.get_mut().shutdown(&self.fee_estimator, &msg), channel_state, chan_entry);
|
||||
let (shutdown, closing_signed, dropped_htlcs) = try_chan_entry!(self, chan_entry.get_mut().shutdown(&self.fee_estimator, &their_features, &msg), channel_state, chan_entry);
|
||||
if let Some(msg) = shutdown {
|
||||
channel_state.pending_msg_events.push(events::MessageSendEvent::SendShutdown {
|
||||
node_id: counterparty_node_id.clone(),
|
||||
|
|
@ -3351,9 +3351,9 @@ impl<Signer: Sign, M: Deref + Sync + Send, T: Deref + Sync + Send, K: Deref + Sy
|
|||
let _ = handle_error!(self, self.internal_funding_locked(counterparty_node_id, msg), *counterparty_node_id);
|
||||
}
|
||||
|
||||
fn handle_shutdown(&self, counterparty_node_id: &PublicKey, msg: &msgs::Shutdown) {
|
||||
fn handle_shutdown(&self, counterparty_node_id: &PublicKey, their_features: &InitFeatures, msg: &msgs::Shutdown) {
|
||||
let _persistence_guard = PersistenceNotifierGuard::new(&self.total_consistency_lock, &self.persistence_notifier);
|
||||
let _ = handle_error!(self, self.internal_shutdown(counterparty_node_id, msg), *counterparty_node_id);
|
||||
let _ = handle_error!(self, self.internal_shutdown(counterparty_node_id, their_features, msg), *counterparty_node_id);
|
||||
}
|
||||
|
||||
fn handle_closing_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::ClosingSigned) {
|
||||
|
|
|
|||
|
|
@ -100,6 +100,8 @@ mod sealed {
|
|||
StaticRemoteKey,
|
||||
// Byte 2
|
||||
,
|
||||
// Byte 3
|
||||
,
|
||||
],
|
||||
optional_features: [
|
||||
// Byte 0
|
||||
|
|
@ -108,6 +110,8 @@ mod sealed {
|
|||
VariableLengthOnion | PaymentSecret,
|
||||
// Byte 2
|
||||
BasicMPP,
|
||||
// Byte 3
|
||||
ShutdownAnySegwit,
|
||||
],
|
||||
});
|
||||
define_context!(NodeContext {
|
||||
|
|
@ -118,6 +122,8 @@ mod sealed {
|
|||
StaticRemoteKey,
|
||||
// Byte 2
|
||||
,
|
||||
// Byte 3
|
||||
,
|
||||
],
|
||||
optional_features: [
|
||||
// Byte 0
|
||||
|
|
@ -126,6 +132,8 @@ mod sealed {
|
|||
VariableLengthOnion | PaymentSecret,
|
||||
// Byte 2
|
||||
BasicMPP,
|
||||
// Byte 3
|
||||
ShutdownAnySegwit,
|
||||
],
|
||||
});
|
||||
define_context!(ChannelContext {
|
||||
|
|
@ -252,6 +260,8 @@ mod sealed {
|
|||
"Feature flags for `payment_secret`.");
|
||||
define_feature!(17, BasicMPP, [InitContext, NodeContext],
|
||||
"Feature flags for `basic_mpp`.");
|
||||
define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
|
||||
"Feature flags for `opt_shutdown_anysegwit`.");
|
||||
|
||||
#[cfg(test)]
|
||||
define_context!(TestingContext {
|
||||
|
|
@ -549,6 +559,17 @@ impl<T: sealed::BasicMPP> Features<T> {
|
|||
}
|
||||
}
|
||||
|
||||
impl<T: sealed::ShutdownAnySegwit> Features<T> {
|
||||
pub(crate) fn supports_shutdown_anysegwit(&self) -> bool {
|
||||
<T as sealed::ShutdownAnySegwit>::supports_feature(&self.flags)
|
||||
}
|
||||
#[cfg(test)]
|
||||
pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
|
||||
<T as sealed::ShutdownAnySegwit>::clear_bits(&mut self.flags);
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: sealed::Context> Writeable for Features<T> {
|
||||
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
|
||||
w.size_hint(self.flags.len() + 2);
|
||||
|
|
@ -619,6 +640,9 @@ mod tests {
|
|||
assert!(!InitFeatures::known().requires_basic_mpp());
|
||||
assert!(!NodeFeatures::known().requires_basic_mpp());
|
||||
|
||||
assert!(InitFeatures::known().supports_shutdown_anysegwit());
|
||||
assert!(NodeFeatures::known().supports_shutdown_anysegwit());
|
||||
|
||||
let mut init_features = InitFeatures::known();
|
||||
assert!(init_features.initial_routing_sync());
|
||||
init_features.clear_initial_routing_sync();
|
||||
|
|
@ -657,10 +681,12 @@ mod tests {
|
|||
// - option_data_loss_protect
|
||||
// - var_onion_optin | static_remote_key (req) | payment_secret
|
||||
// - basic_mpp
|
||||
assert_eq!(node_features.flags.len(), 3);
|
||||
// - opt_shutdown_anysegwit
|
||||
assert_eq!(node_features.flags.len(), 4);
|
||||
assert_eq!(node_features.flags[0], 0b00000010);
|
||||
assert_eq!(node_features.flags[1], 0b10010010);
|
||||
assert_eq!(node_features.flags[2], 0b00000010);
|
||||
assert_eq!(node_features.flags[3], 0b00001000);
|
||||
}
|
||||
|
||||
// Check that cleared flags are kept blank when converting back:
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@ pub fn close_channel<'a, 'b, 'c>(outbound_node: &Node<'a, 'b, 'c>, inbound_node:
|
|||
let (tx_a, tx_b);
|
||||
|
||||
node_a.close_channel(channel_id).unwrap();
|
||||
node_b.handle_shutdown(&node_a.get_our_node_id(), &get_event_msg!(struct_a, MessageSendEvent::SendShutdown, node_b.get_our_node_id()));
|
||||
node_b.handle_shutdown(&node_a.get_our_node_id(), &InitFeatures::known(), &get_event_msg!(struct_a, MessageSendEvent::SendShutdown, node_b.get_our_node_id()));
|
||||
|
||||
let events_1 = node_b.get_and_clear_pending_msg_events();
|
||||
assert!(events_1.len() >= 1);
|
||||
|
|
@ -629,7 +629,7 @@ pub fn close_channel<'a, 'b, 'c>(outbound_node: &Node<'a, 'b, 'c>, inbound_node:
|
|||
})
|
||||
};
|
||||
|
||||
node_a.handle_shutdown(&node_b.get_our_node_id(), &shutdown_b);
|
||||
node_a.handle_shutdown(&node_b.get_our_node_id(), &InitFeatures::known(), &shutdown_b);
|
||||
let (as_update, bs_update) = if close_inbound_first {
|
||||
assert!(node_a.get_and_clear_pending_msg_events().is_empty());
|
||||
node_a.handle_closing_signed(&node_b.get_our_node_id(), &closing_signed_b.unwrap());
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ use std::mem;
|
|||
|
||||
use ln::functional_test_utils::*;
|
||||
use ln::chan_utils::CommitmentTransaction;
|
||||
use ln::msgs::OptionalField::Present;
|
||||
|
||||
#[test]
|
||||
fn test_insane_channel_opens() {
|
||||
|
|
@ -832,9 +833,9 @@ fn pre_funding_lock_shutdown_test() {
|
|||
|
||||
nodes[0].node.close_channel(&OutPoint { txid: tx.txid(), index: 0 }.to_channel_id()).unwrap();
|
||||
let node_0_shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id());
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_0_shutdown);
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
let node_1_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_1_shutdown);
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_1_shutdown);
|
||||
|
||||
let node_0_closing_signed = get_event_msg!(nodes[0], MessageSendEvent::SendClosingSigned, nodes[1].node.get_our_node_id());
|
||||
nodes[1].node.handle_closing_signed(&nodes[0].node.get_our_node_id(), &node_0_closing_signed);
|
||||
|
|
@ -862,9 +863,9 @@ fn updates_shutdown_wait() {
|
|||
|
||||
nodes[0].node.close_channel(&chan_1.2).unwrap();
|
||||
let node_0_shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id());
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_0_shutdown);
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
let node_1_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_1_shutdown);
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_1_shutdown);
|
||||
|
||||
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
|
||||
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
|
||||
|
|
@ -949,13 +950,13 @@ fn htlc_fail_async_shutdown() {
|
|||
|
||||
nodes[1].node.close_channel(&chan_1.2).unwrap();
|
||||
let node_1_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_1_shutdown);
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_1_shutdown);
|
||||
let node_0_shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id());
|
||||
|
||||
nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &updates.update_add_htlcs[0]);
|
||||
nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &updates.commitment_signed);
|
||||
check_added_monitors!(nodes[1], 1);
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_0_shutdown);
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
|
||||
|
||||
let updates_2 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
|
||||
|
|
@ -1017,10 +1018,10 @@ fn do_test_shutdown_rebroadcast(recv_count: u8) {
|
|||
nodes[1].node.close_channel(&chan_1.2).unwrap();
|
||||
let node_1_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
if recv_count > 0 {
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_1_shutdown);
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_1_shutdown);
|
||||
let node_0_shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id());
|
||||
if recv_count > 1 {
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_0_shutdown);
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1039,14 +1040,14 @@ fn do_test_shutdown_rebroadcast(recv_count: u8) {
|
|||
nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &node_1_reestablish);
|
||||
let node_0_2nd_shutdown = if recv_count > 0 {
|
||||
let node_0_2nd_shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id());
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_1_2nd_shutdown);
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_1_2nd_shutdown);
|
||||
node_0_2nd_shutdown
|
||||
} else {
|
||||
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_1_2nd_shutdown);
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_1_2nd_shutdown);
|
||||
get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id())
|
||||
};
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_0_2nd_shutdown);
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_0_2nd_shutdown);
|
||||
|
||||
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
|
||||
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
|
||||
|
|
@ -1106,10 +1107,10 @@ fn do_test_shutdown_rebroadcast(recv_count: u8) {
|
|||
let node_1_3rd_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
assert!(node_1_3rd_shutdown == node_1_2nd_shutdown);
|
||||
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_0_3rd_shutdown);
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_0_3rd_shutdown);
|
||||
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
|
||||
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_1_3rd_shutdown);
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_1_3rd_shutdown);
|
||||
let node_0_2nd_closing_signed = get_event_msg!(nodes[0], MessageSendEvent::SendClosingSigned, nodes[1].node.get_our_node_id());
|
||||
assert!(node_0_closing_signed == node_0_2nd_closing_signed);
|
||||
|
||||
|
|
@ -7195,7 +7196,7 @@ fn test_upfront_shutdown_script() {
|
|||
let mut node_0_shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[2].node.get_our_node_id());
|
||||
node_0_shutdown.scriptpubkey = Builder::new().push_opcode(opcodes::all::OP_RETURN).into_script().to_p2sh();
|
||||
// Test we enforce upfront_scriptpbukey if by providing a diffrent one at closing that we disconnect peer
|
||||
nodes[2].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_0_shutdown);
|
||||
nodes[2].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
assert!(regex::Regex::new(r"Got shutdown request with a scriptpubkey \([A-Fa-f0-9]+\) which did not match their previous scriptpubkey.").unwrap().is_match(check_closed_broadcast!(nodes[2], true).unwrap().data.as_str()));
|
||||
check_added_monitors!(nodes[2], 1);
|
||||
|
||||
|
|
@ -7204,7 +7205,7 @@ fn test_upfront_shutdown_script() {
|
|||
nodes[0].node.close_channel(&OutPoint { txid: chan.3.txid(), index: 0 }.to_channel_id()).unwrap();
|
||||
let node_0_shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[2].node.get_our_node_id());
|
||||
// We test that in case of peer committing upfront to a script, if it oesn't change at closing, we sign
|
||||
nodes[2].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_0_shutdown);
|
||||
nodes[2].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
let events = nodes[2].node.get_and_clear_pending_msg_events();
|
||||
assert_eq!(events.len(), 1);
|
||||
match events[0] {
|
||||
|
|
@ -7218,7 +7219,7 @@ fn test_upfront_shutdown_script() {
|
|||
nodes[0].node.close_channel(&OutPoint { txid: chan.3.txid(), index: 0 }.to_channel_id()).unwrap();
|
||||
let mut node_1_shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id());
|
||||
node_1_shutdown.scriptpubkey = Builder::new().push_opcode(opcodes::all::OP_RETURN).into_script().to_p2sh();
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &node_1_shutdown);
|
||||
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &InitFeatures::known(), &node_1_shutdown);
|
||||
let events = nodes[1].node.get_and_clear_pending_msg_events();
|
||||
assert_eq!(events.len(), 1);
|
||||
match events[0] {
|
||||
|
|
@ -7232,7 +7233,7 @@ fn test_upfront_shutdown_script() {
|
|||
nodes[1].node.close_channel(&OutPoint { txid: chan.3.txid(), index: 0 }.to_channel_id()).unwrap();
|
||||
let mut node_0_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
node_0_shutdown.scriptpubkey = Builder::new().push_opcode(opcodes::all::OP_RETURN).into_script().to_p2sh();
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_0_shutdown);
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
let events = nodes[0].node.get_and_clear_pending_msg_events();
|
||||
assert_eq!(events.len(), 1);
|
||||
match events[0] {
|
||||
|
|
@ -7246,7 +7247,7 @@ fn test_upfront_shutdown_script() {
|
|||
nodes[1].node.close_channel(&OutPoint { txid: chan.3.txid(), index: 0 }.to_channel_id()).unwrap();
|
||||
let mut node_0_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
node_0_shutdown.scriptpubkey = Builder::new().push_opcode(opcodes::all::OP_RETURN).into_script().to_p2sh();
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_0_shutdown);
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
let events = nodes[0].node.get_and_clear_pending_msg_events();
|
||||
assert_eq!(events.len(), 2);
|
||||
match events[0] {
|
||||
|
|
@ -7259,6 +7260,136 @@ fn test_upfront_shutdown_script() {
|
|||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_upfront_shutdown_script_unsupport_segwit() {
|
||||
// We test that channel is closed early
|
||||
// if a segwit program is passed as upfront shutdown script,
|
||||
// but the peer does not support segwit.
|
||||
let chanmon_cfgs = create_chanmon_cfgs(2);
|
||||
let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
|
||||
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
|
||||
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
|
||||
|
||||
nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 42, None).unwrap();
|
||||
|
||||
let mut open_channel = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
|
||||
open_channel.shutdown_scriptpubkey = Present(Builder::new().push_int(16)
|
||||
.push_slice(&[0, 0])
|
||||
.into_script());
|
||||
|
||||
let features = InitFeatures::known().clear_shutdown_anysegwit();
|
||||
nodes[0].node.handle_open_channel(&nodes[0].node.get_our_node_id(), features, &open_channel);
|
||||
|
||||
let events = nodes[0].node.get_and_clear_pending_msg_events();
|
||||
assert_eq!(events.len(), 1);
|
||||
match events[0] {
|
||||
MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { ref msg }, node_id } => {
|
||||
assert_eq!(node_id, nodes[0].node.get_our_node_id());
|
||||
assert!(regex::Regex::new(r"Peer is signaling upfront_shutdown but has provided a non-accepted scriptpubkey format. script: (\([A-Fa-f0-9]+\))").unwrap().is_match(&*msg.data));
|
||||
},
|
||||
_ => panic!("Unexpected event"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_shutdown_script_any_segwit_allowed() {
|
||||
let mut config = UserConfig::default();
|
||||
config.channel_options.announced_channel = true;
|
||||
config.peer_channel_config_limits.force_announced_channel_preference = false;
|
||||
config.channel_options.commit_upfront_shutdown_pubkey = false;
|
||||
let user_cfgs = [None, Some(config), None];
|
||||
let chanmon_cfgs = create_chanmon_cfgs(3);
|
||||
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
|
||||
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &user_cfgs);
|
||||
let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
|
||||
|
||||
//// We test if the remote peer accepts opt_shutdown_anysegwit, a witness program can be used on shutdown
|
||||
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 1000000, InitFeatures::known(), InitFeatures::known());
|
||||
nodes[1].node.close_channel(&OutPoint { txid: chan.3.txid(), index: 0 }.to_channel_id()).unwrap();
|
||||
let mut node_0_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
node_0_shutdown.scriptpubkey = Builder::new().push_int(16)
|
||||
.push_slice(&[0, 0])
|
||||
.into_script();
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
let events = nodes[0].node.get_and_clear_pending_msg_events();
|
||||
assert_eq!(events.len(), 2);
|
||||
match events[0] {
|
||||
MessageSendEvent::SendShutdown { node_id, .. } => { assert_eq!(node_id, nodes[1].node.get_our_node_id()) }
|
||||
_ => panic!("Unexpected event"),
|
||||
}
|
||||
match events[1] {
|
||||
MessageSendEvent::SendClosingSigned { node_id, .. } => { assert_eq!(node_id, nodes[1].node.get_our_node_id()) }
|
||||
_ => panic!("Unexpected event"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_shutdown_script_any_segwit_not_allowed() {
|
||||
let mut config = UserConfig::default();
|
||||
config.channel_options.announced_channel = true;
|
||||
config.peer_channel_config_limits.force_announced_channel_preference = false;
|
||||
config.channel_options.commit_upfront_shutdown_pubkey = false;
|
||||
let user_cfgs = [None, Some(config), None];
|
||||
let chanmon_cfgs = create_chanmon_cfgs(3);
|
||||
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
|
||||
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &user_cfgs);
|
||||
let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
|
||||
|
||||
//// We test that if the remote peer does not accept opt_shutdown_anysegwit, the witness program cannot be used on shutdown
|
||||
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 1000000, InitFeatures::known(), InitFeatures::known());
|
||||
nodes[1].node.close_channel(&OutPoint { txid: chan.3.txid(), index: 0 }.to_channel_id()).unwrap();
|
||||
let mut node_0_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
// Make an any segwit version script
|
||||
node_0_shutdown.scriptpubkey = Builder::new().push_int(16)
|
||||
.push_slice(&[0, 0])
|
||||
.into_script();
|
||||
let flags_no = InitFeatures::known().clear_shutdown_anysegwit();
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &flags_no, &node_0_shutdown);
|
||||
let events = nodes[0].node.get_and_clear_pending_msg_events();
|
||||
assert_eq!(events.len(), 2);
|
||||
match events[1] {
|
||||
MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { ref msg }, node_id } => {
|
||||
assert_eq!(node_id, nodes[1].node.get_our_node_id());
|
||||
assert_eq!(msg.data, "Got a nonstandard scriptpubkey (60020000) from remote peer".to_owned())
|
||||
},
|
||||
_ => panic!("Unexpected event"),
|
||||
}
|
||||
check_added_monitors!(nodes[0], 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_shutdown_script_segwit_but_not_anysegwit() {
|
||||
let mut config = UserConfig::default();
|
||||
config.channel_options.announced_channel = true;
|
||||
config.peer_channel_config_limits.force_announced_channel_preference = false;
|
||||
config.channel_options.commit_upfront_shutdown_pubkey = false;
|
||||
let user_cfgs = [None, Some(config), None];
|
||||
let chanmon_cfgs = create_chanmon_cfgs(3);
|
||||
let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
|
||||
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &user_cfgs);
|
||||
let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
|
||||
|
||||
//// We test that if shutdown any segwit is supported and we send a witness script with 0 version, this is not accepted
|
||||
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 1000000, InitFeatures::known(), InitFeatures::known());
|
||||
nodes[1].node.close_channel(&OutPoint { txid: chan.3.txid(), index: 0 }.to_channel_id()).unwrap();
|
||||
let mut node_0_shutdown = get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id());
|
||||
// Make a segwit script that is not a valid as any segwit
|
||||
node_0_shutdown.scriptpubkey = Builder::new().push_int(0)
|
||||
.push_slice(&[0, 0])
|
||||
.into_script();
|
||||
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &InitFeatures::known(), &node_0_shutdown);
|
||||
let events = nodes[0].node.get_and_clear_pending_msg_events();
|
||||
assert_eq!(events.len(), 2);
|
||||
match events[1] {
|
||||
MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { ref msg }, node_id } => {
|
||||
assert_eq!(node_id, nodes[1].node.get_our_node_id());
|
||||
assert_eq!(msg.data, "Got a nonstandard scriptpubkey (00020000) from remote peer".to_owned())
|
||||
},
|
||||
_ => panic!("Unexpected event"),
|
||||
}
|
||||
check_added_monitors!(nodes[0], 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_user_configurable_csv_delay() {
|
||||
// We test our channel constructors yield errors when we pass them absurd csv delay
|
||||
|
|
|
|||
|
|
@ -752,7 +752,7 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider + Send + Sync {
|
|||
|
||||
// Channl close:
|
||||
/// Handle an incoming shutdown message from the given peer.
|
||||
fn handle_shutdown(&self, their_node_id: &PublicKey, msg: &Shutdown);
|
||||
fn handle_shutdown(&self, their_node_id: &PublicKey, their_features: &InitFeatures, msg: &Shutdown);
|
||||
/// Handle an incoming closing_signed message from the given peer.
|
||||
fn handle_closing_signed(&self, their_node_id: &PublicKey, msg: &ClosingSigned);
|
||||
|
||||
|
|
|
|||
|
|
@ -763,7 +763,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref> PeerManager<D
|
|||
},
|
||||
|
||||
wire::Message::Shutdown(msg) => {
|
||||
self.message_handler.chan_handler.handle_shutdown(&peer.their_node_id.unwrap(), &msg);
|
||||
self.message_handler.chan_handler.handle_shutdown(&peer.their_node_id.unwrap(), peer.their_features.as_ref().unwrap(), &msg);
|
||||
},
|
||||
wire::Message::ClosingSigned(msg) => {
|
||||
self.message_handler.chan_handler.handle_closing_signed(&peer.their_node_id.unwrap(), &msg);
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ impl msgs::ChannelMessageHandler for TestChannelMessageHandler {
|
|||
fn handle_funding_created(&self, _their_node_id: &PublicKey, _msg: &msgs::FundingCreated) {}
|
||||
fn handle_funding_signed(&self, _their_node_id: &PublicKey, _msg: &msgs::FundingSigned) {}
|
||||
fn handle_funding_locked(&self, _their_node_id: &PublicKey, _msg: &msgs::FundingLocked) {}
|
||||
fn handle_shutdown(&self, _their_node_id: &PublicKey, _msg: &msgs::Shutdown) {}
|
||||
fn handle_shutdown(&self, _their_node_id: &PublicKey, _their_features: &InitFeatures, _msg: &msgs::Shutdown) {}
|
||||
fn handle_closing_signed(&self, _their_node_id: &PublicKey, _msg: &msgs::ClosingSigned) {}
|
||||
fn handle_update_add_htlc(&self, _their_node_id: &PublicKey, _msg: &msgs::UpdateAddHTLC) {}
|
||||
fn handle_update_fulfill_htlc(&self, _their_node_id: &PublicKey, _msg: &msgs::UpdateFulfillHTLC) {}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue