Skip to content

Commit 14e52cd

Browse files
ViktorTigerstromViktorTigerstrom
committed
Pass counterparty_node_id to force_close_channel 
1 parent 84a6e7b commit 14e52cd

File tree

7 files changed

+37
-33
lines changed

7 files changed

+37
-33
lines changed

‎fuzz/src/full_stack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
624624
let channel_id = get_slice!(1)[0] as usize;
625625
if channel_id >= channels.len() { return; }
626626
channels.sort_by(|a, b| { a.channel_id.cmp(&b.channel_id) });
627-
channelmanager.force_close_channel(&channels[channel_id].channel_id).unwrap();
627+
channelmanager.force_close_channel(&channels[channel_id].channel_id, &channels[channel_id].counterparty.node_id).unwrap();
628628
},
629629
// 15 is above
630630
_ => return,

‎lightning-background-processor/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ mod tests {
637637
}
638638

639639
// Force-close the channel.
640-
nodes[0].node.force_close_channel(&OutPoint { txid: tx.txid(), index: 0 }.to_channel_id()).unwrap();
640+
nodes[0].node.force_close_channel(&OutPoint { txid: tx.txid(), index: 0 }.to_channel_id(), &nodes[1].node.get_our_node_id()).unwrap();
641641

642642
// Check that the force-close updates are persisted.
643643
check_persisted_data!(nodes[0].node, filepath.clone());
@@ -776,7 +776,7 @@ mod tests {
776776
let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone(), Some(nodes[0].scorer.clone()));
777777

778778
// Force close the channel and check that the SpendableOutputs event was handled.
779-
nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
779+
nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id, &nodes[1].node.get_our_node_id()).unwrap();
780780
let commitment_tx = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
781781
confirm_transaction_depth(&mut nodes[0], &commitment_tx, BREAKDOWN_TIMEOUT as u32);
782782
let event = receiver

‎lightning-persister/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ mod tests {
213213

214214
// Force close because cooperative close doesn't result in any persisted
215215
// updates.
216-
nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
216+
nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id, &nodes[1].node.get_our_node_id()).unwrap();
217217
check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
218218
check_closed_broadcast!(nodes[0], true);
219219
check_added_monitors!(nodes[0], 1);
@@ -247,7 +247,7 @@ mod tests {
247247
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
248248
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
249249
let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
250-
nodes[1].node.force_close_channel(&chan.2).unwrap();
250+
nodes[1].node.force_close_channel(&chan.2, &nodes[0].node.get_our_node_id()).unwrap();
251251
check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
252252
let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
253253
let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
@@ -286,7 +286,7 @@ mod tests {
286286
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
287287
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
288288
let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
289-
nodes[1].node.force_close_channel(&chan.2).unwrap();
289+
nodes[1].node.force_close_channel(&chan.2, &nodes[0].node.get_our_node_id()).unwrap();
290290
check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
291291
let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
292292
let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();

‎lightning/src/ln/chanmon_update_fail_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
224224
}
225225

226226
// ...and make sure we can force-close a frozen channel
227-
nodes[0].node.force_close_channel(&channel_id).unwrap();
227+
nodes[0].node.force_close_channel(&channel_id, &nodes[1].node.get_our_node_id()).unwrap();
228228
check_added_monitors!(nodes[0], 1);
229229
check_closed_broadcast!(nodes[0], true);
230230

‎lightning/src/ln/channelmanager.rs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,22 +1892,18 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
18921892
}
18931893
}
18941894

1895-
/// `peer_node_id` should be set when we receive a message from a peer, but not set when the
1895+
/// `peer_msg` should be set when we receive a message from a peer, but not set when the
18961896
/// user closes, which will be re-exposed as the `ChannelClosed` reason.
1897-
fn force_close_channel_with_peer(&self, channel_id: &[u8; 32], peer_node_id: Option<&PublicKey>, peer_msg: Option<&String>) -> Result<PublicKey, APIError> {
1897+
fn force_close_channel_with_peer(&self, channel_id: &[u8; 32], peer_node_id: &PublicKey, peer_msg: Option<&String>) -> Result<PublicKey, APIError> {
18981898
let mut chan = {
18991899
let mut channel_state_lock = self.channel_state.lock().unwrap();
19001900
let channel_state = &mut *channel_state_lock;
19011901
if let hash_map::Entry::Occupied(chan) = channel_state.by_id.entry(channel_id.clone()) {
1902-
if let Some(node_id) = peer_node_id {
1903-
if chan.get().get_counterparty_node_id() != *node_id {
1904-
return Err(APIError::ChannelUnavailable{err: "No such channel".to_owned()});
1905-
}
1902+
if chan.get().get_counterparty_node_id() != *peer_node_id {
1903+
return Err(APIError::ChannelUnavailable{err: "No such channel".to_owned()});
19061904
}
1907-
if peer_node_id.is_some() {
1908-
if let Some(peer_msg) = peer_msg {
1909-
self.issue_channel_close_events(chan.get(),ClosureReason::CounterpartyForceClosed { peer_msg: peer_msg.to_string() });
1910-
}
1905+
if let Some(peer_msg) = peer_msg {
1906+
self.issue_channel_close_events(chan.get(),ClosureReason::CounterpartyForceClosed { peer_msg: peer_msg.to_string() });
19111907
} else {
19121908
self.issue_channel_close_events(chan.get(),ClosureReason::HolderForceClosed);
19131909
}
@@ -1929,10 +1925,12 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
19291925
}
19301926

19311927
/// Force closes a channel, immediately broadcasting the latest local commitment transaction to
1932-
/// the chain and rejecting new HTLCs on the given channel. Fails if channel_id is unknown to the manager.
1933-
pub fn force_close_channel(&self, channel_id: &[u8; 32]) -> Result<(), APIError> {
1928+
/// the chain and rejecting new HTLCs on the given channel. Fails if `channel_id` is unknown to
1929+
/// the manager, or if the `counterparty_node_id` isn't the counterparty of the corresponding
1930+
/// channel.
1931+
pub fn force_close_channel(&self, channel_id: &[u8; 32], counterparty_node_id: &PublicKey) -> Result<(), APIError> {
19341932
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
1935-
match self.force_close_channel_with_peer(channel_id, None, None) {
1933+
match self.force_close_channel_with_peer(channel_id, counterparty_node_id, None) {
19361934
Ok(counterparty_node_id) => {
19371935
self.channel_state.lock().unwrap().pending_msg_events.push(
19381936
events::MessageSendEvent::HandleError {
@@ -1952,7 +1950,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
19521950
/// for each to the chain and rejecting new HTLCs on each.
19531951
pub fn force_close_all_channels(&self) {
19541952
for chan in self.list_channels() {
1955-
let _ = self.force_close_channel(&chan.channel_id);
1953+
let _ = self.force_close_channel(&chan.channel_id, &chan.counterparty.node_id);
19561954
}
19571955
}
19581956

@@ -5816,7 +5814,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
58165814
for chan in self.list_channels() {
58175815
if chan.counterparty.node_id == *counterparty_node_id {
58185816
// Untrusted messages from peer, we throw away the error if id points to a non-existent channel
5819-
let _ = self.force_close_channel_with_peer(&chan.channel_id, Some(counterparty_node_id), Some(&msg.data));
5817+
let _ = self.force_close_channel_with_peer(&chan.channel_id, counterparty_node_id, Some(&msg.data));
58205818
}
58215819
}
58225820
} else {
@@ -5838,7 +5836,7 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
58385836
}
58395837

58405838
// Untrusted messages from peer, we throw away the error if id points to a non-existent channel
5841-
let _ = self.force_close_channel_with_peer(&msg.channel_id, Some(counterparty_node_id), Some(&msg.data));
5839+
let _ = self.force_close_channel_with_peer(&msg.channel_id, counterparty_node_id, Some(&msg.data));
58425840
}
58435841
}
58445842
}

‎lightning/src/ln/functional_tests.rs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3362,7 +3362,7 @@ fn test_htlc_ignore_latest_remote_commitment() {
33623362
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
33633363

33643364
route_payment(&nodes[0], &[&nodes[1]], 10000000);
3365-
nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
3365+
nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id, &nodes[1].node.get_our_node_id()).unwrap();
33663366
connect_blocks(&nodes[0], TEST_FINAL_CLTV + LATENCY_GRACE_PERIOD_BLOCKS + 1);
33673367
check_closed_broadcast!(nodes[0], true);
33683368
check_added_monitors!(nodes[0], 1);
@@ -3425,7 +3425,7 @@ fn test_force_close_fail_back() {
34253425
// state or updated nodes[1]' state. Now force-close and broadcast that commitment/HTLC
34263426
// transaction and ensure nodes[1] doesn't fail-backwards (this was originally a bug!).
34273427

3428-
nodes[2].node.force_close_channel(&payment_event.commitment_msg.channel_id).unwrap();
3428+
nodes[2].node.force_close_channel(&payment_event.commitment_msg.channel_id, &nodes[1].node.get_our_node_id()).unwrap();
34293429
check_closed_broadcast!(nodes[2], true);
34303430
check_added_monitors!(nodes[2], 1);
34313431
check_closed_event!(nodes[2], 1, ClosureReason::HolderForceClosed);
@@ -4749,7 +4749,7 @@ fn test_claim_sizeable_push_msat() {
47494749
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
47504750

47514751
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100_000, 98_000_000, InitFeatures::known(), InitFeatures::known());
4752-
nodes[1].node.force_close_channel(&chan.2).unwrap();
4752+
nodes[1].node.force_close_channel(&chan.2, &nodes[0].node.get_our_node_id()).unwrap();
47534753
check_closed_broadcast!(nodes[1], true);
47544754
check_added_monitors!(nodes[1], 1);
47554755
check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
@@ -4778,7 +4778,7 @@ fn test_claim_on_remote_sizeable_push_msat() {
47784778
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
47794779

47804780
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100_000, 98_000_000, InitFeatures::known(), InitFeatures::known());
4781-
nodes[0].node.force_close_channel(&chan.2).unwrap();
4781+
nodes[0].node.force_close_channel(&chan.2, &nodes[1].node.get_our_node_id()).unwrap();
47824782
check_closed_broadcast!(nodes[0], true);
47834783
check_added_monitors!(nodes[0], 1);
47844784
check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
@@ -8298,7 +8298,7 @@ fn test_manually_accept_inbound_channel_request() {
82988298
_ => panic!("Unexpected event"),
82998299
}
83008300

8301-
nodes[1].node.force_close_channel(&temp_channel_id).unwrap();
8301+
nodes[1].node.force_close_channel(&temp_channel_id, &nodes[0].node.get_our_node_id()).unwrap();
83028302

83038303
let close_msg_ev = nodes[1].node.get_and_clear_pending_msg_events();
83048304
assert_eq!(close_msg_ev.len(), 1);
@@ -8333,7 +8333,7 @@ fn test_manually_reject_inbound_channel_request() {
83338333
let events = nodes[1].node.get_and_clear_pending_events();
83348334
match events[0] {
83358335
Event::OpenChannelRequest { temporary_channel_id, .. } => {
8336-
nodes[1].node.force_close_channel(&temporary_channel_id).unwrap();
8336+
nodes[1].node.force_close_channel(&temporary_channel_id, &nodes[0].node.get_our_node_id()).unwrap();
83378337
}
83388338
_ => panic!("Unexpected event"),
83398339
}
@@ -8975,8 +8975,14 @@ fn do_test_onchain_htlc_settlement_after_close(broadcast_alice: bool, go_onchain
89758975
// If `go_onchain_before_fufill`, broadcast the relevant commitment transaction and check that Bob
89768976
// responds by (1) broadcasting a channel update and (2) adding a new ChannelMonitor.
89778977
let mut force_closing_node = 0; // Alice force-closes
8978-
if !broadcast_alice { force_closing_node = 1; } // Bob force-closes
8979-
nodes[force_closing_node].node.force_close_channel(&chan_ab.2).unwrap();
8978+
let mut counterparty_node = 1; // Bob if Alice force-closes
8979+
8980+
// Bob force-closes
8981+
if !broadcast_alice {
8982+
force_closing_node = 1;
8983+
counterparty_node = 0;
8984+
}
8985+
nodes[force_closing_node].node.force_close_channel(&chan_ab.2, &nodes[counterparty_node].node.get_our_node_id()).unwrap();
89808986
check_closed_broadcast!(nodes[force_closing_node], true);
89818987
check_added_monitors!(nodes[force_closing_node], 1);
89828988
check_closed_event!(nodes[force_closing_node], 1, ClosureReason::HolderForceClosed);
@@ -9406,7 +9412,7 @@ fn do_test_tx_confirmed_skipping_blocks_immediate_broadcast(test_height_before_t
94069412
nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
94079413
nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
94089414

9409-
nodes[1].node.force_close_channel(&channel_id).unwrap();
9415+
nodes[1].node.force_close_channel(&channel_id, &nodes[2].node.get_our_node_id()).unwrap();
94109416
check_closed_broadcast!(nodes[1], true);
94119417
check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
94129418
check_added_monitors!(nodes[1], 1);

‎lightning/src/ln/payment_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ fn do_test_dup_htlc_onchain_fails_on_reload(persist_manager_post_event: bool, co
565565
// Route a payment, but force-close the channel before the HTLC fulfill message arrives at
566566
// nodes[0].
567567
let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1]], 10000000);
568-
nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id).unwrap();
568+
nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id, &nodes[1].node.get_our_node_id()).unwrap();
569569
check_closed_broadcast!(nodes[0], true);
570570
check_added_monitors!(nodes[0], 1);
571571
check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);

0 commit comments

Comments
 (0)