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