X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fevents.rs;h=a113217943f9d268cea2cc3e8cf8a3056b3f6be6;hb=182affc03b0c86f1e3d09d9fdea612481d374ce6;hp=261ee57ccc08fca9ca413416d6317ad5d150f9fc;hpb=e397cb99601e9d2849bbc3aad2b0df8bc8b7f522;p=rust-lightning

diff --git a/src/util/events.rs b/src/util/events.rs
index 261ee57c..a1132179 100644
--- a/src/util/events.rs
+++ b/src/util/events.rs
@@ -27,6 +27,8 @@ pub enum Event {
 	/// Used to indicate that the client should generate a funding transaction with the given
 	/// parameters and then call ChannelManager::funding_transaction_generated.
 	/// Generated in ChannelManager message handling.
+	/// Note that *all inputs* in the funding transaction must spend SegWit outputs or your
+	/// counterparty can steal your funds!
 	FundingGenerationReady {
 		/// The random channel_id we picked which you'll need to pass into
 		/// ChannelManager::funding_transaction_generated.
@@ -101,8 +103,17 @@ pub enum Event {
 /// An event generated by ChannelManager which indicates a message should be sent to a peer (or
 /// broadcast to most peers).
 /// These events are handled by PeerManager::process_events if you are using a PeerManager.
+#[derive(Clone)]
 pub enum MessageSendEvent {
-	/// Used to indicate that we've initialted a channel open and should send the open_channel
+	/// Used to indicate that we've accepted a channel open and should send the accept_channel
+	/// message provided to the given peer.
+	SendAcceptChannel {
+		/// The node_id of the node which should receive this message
+		node_id: PublicKey,
+		/// The message which should be sent.
+		msg: msgs::AcceptChannel,
+	},
+	/// Used to indicate that we've initiated a channel open and should send the open_channel
 	/// message provided to the given peer.
 	SendOpenChannel {
 		/// The node_id of the node which should receive this message
@@ -117,14 +128,26 @@ pub enum MessageSendEvent {
 		/// The message which should be sent.
 		msg: msgs::FundingCreated,
 	},
+	/// Used to indicate that a funding_signed message should be sent to the peer with the given node_id.
+	SendFundingSigned {
+		/// The node_id of the node which should receive this message
+		node_id: PublicKey,
+		/// The message which should be sent.
+		msg: msgs::FundingSigned,
+	},
 	/// Used to indicate that a funding_locked message should be sent to the peer with the given node_id.
 	SendFundingLocked {
 		/// The node_id of the node which should receive these message(s)
 		node_id: PublicKey,
 		/// The funding_locked message which should be sent.
 		msg: msgs::FundingLocked,
-		/// An optional additional announcement_signatures message which should be sent.
-		announcement_sigs: Option<msgs::AnnouncementSignatures>,
+	},
+	/// Used to indicate that an announcement_signatures message should be sent to the peer with the given node_id.
+	SendAnnouncementSignatures {
+		/// The node_id of the node which should receive these message(s)
+		node_id: PublicKey,
+		/// The announcement_signatures message which should be sent.
+		msg: msgs::AnnouncementSignatures,
 	},
 	/// Used to indicate that a series of HTLC update messages, as well as a commitment_signed
 	/// message should be sent to the peer with the given node_id.
@@ -141,6 +164,13 @@ pub enum MessageSendEvent {
 		/// The message which should be sent.
 		msg: msgs::RevokeAndACK,
 	},
+	/// Used to indicate that a closing_signed message should be sent to the peer with the given node_id.
+	SendClosingSigned {
+		/// The node_id of the node which should receive this message
+		node_id: PublicKey,
+		/// The message which should be sent.
+		msg: msgs::ClosingSigned,
+	},
 	/// Used to indicate that a shutdown message should be sent to the peer with the given node_id.
 	SendShutdown {
 		/// The node_id of the node which should receive this message
@@ -148,6 +178,13 @@ pub enum MessageSendEvent {
 		/// The message which should be sent.
 		msg: msgs::Shutdown,
 	},
+	/// Used to indicate that a channel_reestablish message should be sent to the peer with the given node_id.
+	SendChannelReestablish {
+		/// The node_id of the node which should receive this message
+		node_id: PublicKey,
+		/// The message which should be sent.
+		msg: msgs::ChannelReestablish,
+	},
 	/// Used to indicate that a channel_announcement and channel_update should be broadcast to all
 	/// peers (except the peer with node_id either msg.contents.node_id_1 or msg.contents.node_id_2).
 	BroadcastChannelAnnouncement {