@@ -9220,6 +9220,56 @@ fn test_onchain_htlc_settlement_after_close() {
9220
9220
do_test_onchain_htlc_settlement_after_close(false, false);
9221
9221
}
9222
9222
9223
+ #[test]
9224
+ fn test_duplicate_temporary_channel_id_from_different_peers() {
9225
+ // Tests that we can accept two different `OpenChannel` requests with the same
9226
+ // `temporary_channel_id`, as long as they are from different peers.
9227
+ let chanmon_cfgs = create_chanmon_cfgs(3);
9228
+ let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
9229
+ let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
9230
+ let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
9231
+
9232
+ // Create an first channel channel
9233
+ nodes[1].node.create_channel(nodes[0].node.get_our_node_id(), 100000, 10001, 42, None).unwrap();
9234
+ let mut open_chan_msg_chan_1_0 = get_event_msg!(nodes[1], MessageSendEvent::SendOpenChannel, nodes[0].node.get_our_node_id());
9235
+
9236
+ // Create an second channel
9237
+ nodes[2].node.create_channel(nodes[0].node.get_our_node_id(), 100000, 10001, 43, None).unwrap();
9238
+ let mut open_chan_msg_chan_2_0 = get_event_msg!(nodes[2], MessageSendEvent::SendOpenChannel, nodes[0].node.get_our_node_id());
9239
+
9240
+ // Modify the `OpenChannel` from `nodes[2]` to `nodes[0]` to ensure that it uses the same
9241
+ // `temporary_channel_id` as the `OpenChannel` from nodes[1] to nodes[0].
9242
+ open_chan_msg_chan_2_0.temporary_channel_id = open_chan_msg_chan_1_0.temporary_channel_id;
9243
+
9244
+ // Assert that `nodes[0]` can accept both `OpenChannel` requests, even though they use the same
9245
+ // `temporary_channel_id` as they are from different peers.
9246
+ nodes[0].node.handle_open_channel(&nodes[1].node.get_our_node_id(), InitFeatures::known(), &open_chan_msg_chan_1_0);
9247
+ {
9248
+ let events = nodes[0].node.get_and_clear_pending_msg_events();
9249
+ assert_eq!(events.len(), 1);
9250
+ match &events[0] {
9251
+ MessageSendEvent::SendAcceptChannel { node_id, msg } => {
9252
+ assert_eq!(node_id, &nodes[1].node.get_our_node_id());
9253
+ assert_eq!(msg.temporary_channel_id, open_chan_msg_chan_1_0.temporary_channel_id);
9254
+ },
9255
+ _ => panic!("Unexpected event"),
9256
+ }
9257
+ }
9258
+
9259
+ nodes[0].node.handle_open_channel(&nodes[2].node.get_our_node_id(), InitFeatures::known(), &open_chan_msg_chan_2_0);
9260
+ {
9261
+ let events = nodes[0].node.get_and_clear_pending_msg_events();
9262
+ assert_eq!(events.len(), 1);
9263
+ match &events[0] {
9264
+ MessageSendEvent::SendAcceptChannel { node_id, msg } => {
9265
+ assert_eq!(node_id, &nodes[2].node.get_our_node_id());
9266
+ assert_eq!(msg.temporary_channel_id, open_chan_msg_chan_1_0.temporary_channel_id);
9267
+ },
9268
+ _ => panic!("Unexpected event"),
9269
+ }
9270
+ }
9271
+ }
9272
+
9223
9273
#[test]
9224
9274
fn test_duplicate_chan_id() {
9225
9275
// Test that if a given peer tries to open a channel with the same channel_id as one that is
0 commit comments