X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fevents.rs;h=e11e4e82c1ccbf2b735c804ab288c4ea215bc13e;hb=c662dd3e946749f2c4a4c7e3169963d4e7906048;hp=a33644d06114967108aa61d10ad1984622e57315;hpb=3aeec96470cc681bf6bf50baa5ce1b533762c479;p=rust-lightning

diff --git a/src/util/events.rs b/src/util/events.rs
index a33644d0..e11e4e82 100644
--- a/src/util/events.rs
+++ b/src/util/events.rs
@@ -1,5 +1,6 @@
 //! Events are returned from various bits in the library which indicate some action must be taken
 //! by the client.
+//!
 //! Because we don't have a built-in runtime, its up to the client to call events at a time in the
 //! future, as well as generate and broadcast funding transactions handle payment preimages and a
 //! few other things.
@@ -59,6 +60,8 @@ pub enum Event {
 	},
 	/// Indicates an outbound payment we made succeeded (ie it made it all the way to its target
 	/// and we got back the payment preimage for it).
+	/// Note that duplicative PaymentSent Events may be generated - it is your responsibility to
+	/// deduplicate them by payment_preimage (which MUST be unique)!
 	PaymentSent {
 		/// The preimage to the hash given to ChannelManager::send_payment.
 		/// Note that this serves as a payment receipt, if you wish to have such a thing, you must
@@ -67,9 +70,15 @@ pub enum Event {
 	},
 	/// Indicates an outbound payment we made failed. Probably some intermediary node dropped
 	/// something. You may wish to retry with a different route.
+	/// Note that duplicative PaymentFailed Events may be generated - it is your responsibility to
+	/// deduplicate them by payment_hash (which MUST be unique)!
 	PaymentFailed {
 		/// The hash which was given to ChannelManager::send_payment.
 		payment_hash: [u8; 32],
+		/// Indicates the payment was rejected for some reason by the recipient. This implies that
+		/// the payment has failed, not just the route in question. If this is not set, you may
+		/// retry the payment via a different route.
+		rejected_by_dest: bool,
 	},
 	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
 	/// time in the future.
@@ -82,6 +91,7 @@ pub enum Event {
 	// TODO: Move these into a separate struct and make a top-level enum
 	/// Used to indicate that we've initialted a channel open and should send the open_channel
 	/// message provided to the given peer.
+	///
 	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
 	SendOpenChannel {
 		/// The node_id of the node which should receive this message
@@ -90,6 +100,7 @@ pub enum Event {
 		msg: msgs::OpenChannel,
 	},
 	/// Used to indicate that a funding_created message should be sent to the peer with the given node_id.
+	///
 	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
 	SendFundingCreated {
 		/// The node_id of the node which should receive this message
@@ -98,6 +109,7 @@ pub enum Event {
 		msg: msgs::FundingCreated,
 	},
 	/// Used to indicate that a funding_locked message should be sent to the peer with the given node_id.
+	///
 	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
 	SendFundingLocked {
 		/// The node_id of the node which should receive these message(s)
@@ -109,6 +121,7 @@ pub enum Event {
 	},
 	/// 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.
+	///
 	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
 	UpdateHTLCs {
 		/// The node_id of the node which should receive these message(s)
@@ -116,7 +129,17 @@ pub enum Event {
 		/// The update messages which should be sent. ALL messages in the struct should be sent!
 		updates: msgs::CommitmentUpdate,
 	},
+	/// Used to indicate that a revoke_and_ack message should be sent to the peer with the given node_id.
+	///
+	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
+	SendRevokeAndACK {
+		/// The node_id of the node which should receive this message
+		node_id: PublicKey,
+		/// The message which should be sent.
+		msg: msgs::RevokeAndACK,
+	},
 	/// Used to indicate that a shutdown message should be sent to the peer with the given node_id.
+	///
 	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
 	SendShutdown {
 		/// The node_id of the node which should receive this message
@@ -126,6 +149,7 @@ pub enum Event {
 	},
 	/// 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).
+	///
 	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
 	BroadcastChannelAnnouncement {
 		/// The channel_announcement which should be sent.
@@ -134,6 +158,7 @@ pub enum Event {
 		update_msg: msgs::ChannelUpdate,
 	},
 	/// Used to indicate that a channel_update should be broadcast to all peers.
+	///
 	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
 	BroadcastChannelUpdate {
 		/// The channel_update which should be sent.
@@ -142,12 +167,21 @@ pub enum Event {
 
 	//Error handling
 	/// Broadcast an error downstream to be handled
+	///
 	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
 	HandleError {
 		/// The node_id of the node which should receive this message
 		node_id: PublicKey,
 		/// The action which should be taken.
 		action: Option<msgs::ErrorAction>
+	},
+	/// When a payment fails we may receive updates back from the hop where it failed. In such
+	/// cases this event is generated so that we can inform the router of this information.
+	///
+	/// This event is handled by PeerManager::process_events if you are using a PeerManager.
+	PaymentFailureNetworkUpdate {
+		/// The channel/node update which should be sent to router
+		update: msgs::HTLCFailChannelUpdate,
 	}
 }