Skip to content

Commit a5306b3

Browse files
committed
Implement support for accepting V2 channels
1 parent ad55b0e commit a5306b3

File tree

4 files changed

+903
-138
lines changed

4 files changed

+903
-138
lines changed

lightning/src/events/mod.rs

+20-4
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,17 @@ impl_writeable_tlv_based_enum!(PaymentFailureReason,
538538
(10, UnexpectedError) => {}, ;
539539
);
540540

541+
/// Used to indicate the kind of funding for this channel by the channel acceptor (us).
542+
///
543+
/// Allows the differentiation between a request for a dual-funded and non-dual-funded channel.
544+
#[derive(Clone, Debug, PartialEq, Eq)]
545+
pub enum InboundChannelFunds {
546+
/// For a non-dual-funded channel, the `push_msat` value from the channel initiator to us.
547+
PushMsat(u64),
548+
/// Indicates the open request is for a dual funded channel.
549+
DualFunded,
550+
}
551+
541552
/// An Event which you should probably take some action in response to.
542553
///
543554
/// Note that while Writeable and Readable are implemented for Event, you probably shouldn't use
@@ -1143,9 +1154,14 @@ pub enum Event {
11431154
},
11441155
/// Indicates a request to open a new channel by a peer.
11451156
///
1146-
/// To accept the request, call [`ChannelManager::accept_inbound_channel`]. To reject the request,
1147-
/// call [`ChannelManager::force_close_without_broadcasting_txn`]. Note that a ['ChannelClosed`]
1148-
/// event will _not_ be triggered if the channel is rejected.
1157+
/// If `acceptor_funds` is `InboundChannelFunds::DualFunded`, this indicates that the peer wishes to
1158+
/// open a dual-funded channel. Otherwise, `acceptor_funds` will be `InboundChannelFunds::PushMsats`,
1159+
/// indicating the `push_msats` value for a non-dual-funded channel.
1160+
///
1161+
/// To accept the request (and in the case of a dual-funded channel, not contribute funds),
1162+
/// call [`ChannelManager::accept_inbound_channel`].
1163+
/// To reject the request, call [`ChannelManager::force_close_without_broadcasting_txn`].
1164+
/// Note that a ['ChannelClosed`] event will _not_ be triggered if the channel is rejected.
11491165
///
11501166
/// The event is only triggered when a new open channel request is received and the
11511167
/// [`UserConfig::manually_accept_inbound_channels`] config flag is set to true.
@@ -1176,7 +1192,7 @@ pub enum Event {
11761192
/// The channel value of the requested channel.
11771193
funding_satoshis: u64,
11781194
/// Our starting balance in the channel if the request is accepted, in milli-satoshi.
1179-
push_msat: u64,
1195+
acceptor_funds: InboundChannelFunds,
11801196
/// The features that this channel will operate with. If you reject the channel, a
11811197
/// well-behaved counterparty may automatically re-attempt the channel with a new set of
11821198
/// feature flags.

0 commit comments

Comments
 (0)