Skip to content

Commit 955bb1d

Browse files
committed
Add message structs required for dual-funded channels
This is the first of a set of PRs to enable the experimental dual-funded channels feature using interactive transaction construction. This allows both the channel initiator and channel acceptor to contribute funds towards the channel.
1 parent c182567 commit 955bb1d

File tree

6 files changed

+834
-19
lines changed

6 files changed

+834
-19
lines changed

fuzz/src/msg_targets/gen_target.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ GEN_TEST lightning::ln::msgs::UpdateFailHTLC test_msg_simple ""
3333
GEN_TEST lightning::ln::msgs::UpdateFailMalformedHTLC test_msg_simple ""
3434
GEN_TEST lightning::ln::msgs::UpdateFee test_msg_simple ""
3535
GEN_TEST lightning::ln::msgs::UpdateFulfillHTLC test_msg_simple ""
36+
GEN_TEST lightning::ln::msgs::ChannelReestablish test_msg_simple ""
3637

37-
GEN_TEST lightning::ln::msgs::ChannelReestablish test_msg ""
3838
GEN_TEST lightning::ln::msgs::DecodedOnionErrorPacket test_msg ""
3939

4040
GEN_TEST lightning::ln::msgs::ChannelAnnouncement test_msg_exact ""

fuzz/src/msg_targets/msg_channel_reestablish.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_channel_reestablish_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
18-
test_msg!(lightning::ln::msgs::ChannelReestablish, data);
18+
test_msg_simple!(lightning::ln::msgs::ChannelReestablish, data);
1919
}
2020

2121
#[no_mangle]
2222
pub extern "C" fn msg_channel_reestablish_run(data: *const u8, datalen: usize) {
2323
let data = unsafe { std::slice::from_raw_parts(data, datalen) };
24-
test_msg!(lightning::ln::msgs::ChannelReestablish, data);
24+
test_msg_simple!(lightning::ln::msgs::ChannelReestablish, data);
2525
}

lightning/src/ln/channel.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5686,6 +5686,9 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
56865686
// overflow here.
56875687
next_remote_commitment_number: INITIAL_COMMITMENT_NUMBER - self.cur_counterparty_commitment_transaction_number - 1,
56885688
data_loss_protect,
5689+
// TODO: If we've sent `commtiment_signed` for an interactive transaction construction but have not received `tx_signatures`
5690+
// we MUST set `next_funding_txid` to the txid of that interactive transaction, else we MUST NOT set it.
5691+
next_funding_txid: None,
56895692
}
56905693
}
56915694

0 commit comments

Comments
 (0)