X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fevents.rs;h=e0f0a63dbb341d8507a80ecd07b4a94f3cb91699;hb=c0bbd4d91877b3f7eca5b6aba877257acf4eec0b;hp=e9f456cfe69750743fc21b787272ddf41814ee87;hpb=2d102a3065d7a438d5c88fffcad36545a0822bfa;p=rust-lightning

diff --git a/lightning/src/util/events.rs b/lightning/src/util/events.rs
index e9f456cf..e0f0a63d 100644
--- a/lightning/src/util/events.rs
+++ b/lightning/src/util/events.rs
@@ -23,6 +23,7 @@ use routing::network_graph::NetworkUpdate;
 use util::ser::{BigSize, FixedLengthReader, Writeable, Writer, MaybeReadable, Readable, VecReadWrapper, VecWriteWrapper};
 use routing::router::{RouteHop, RouteParameters};
 
+use bitcoin::Transaction;
 use bitcoin::blockdata::script::Script;
 use bitcoin::hashes::Hash;
 use bitcoin::hashes::sha256::Hash as Sha256;
@@ -32,7 +33,7 @@ use io;
 use prelude::*;
 use core::time::Duration;
 use core::ops::Deref;
-use bitcoin::Transaction;
+use sync::Arc;
 
 /// Some information provided on receipt of payment depends on whether the payment received is a
 /// spontaneous payment or a "conventional" lightning payment that's paying an invoice.
@@ -193,6 +194,16 @@ pub enum Event {
 		///
 		/// [`ChannelManager::send_payment`]: crate::ln::channelmanager::ChannelManager::send_payment
 		payment_hash: PaymentHash,
+		/// The total fee which was spent at intermediate hops in this payment, across all paths.
+		///
+		/// Note that, like [`Route::get_total_fees`] this does *not* include any potential
+		/// overpayment to the recipient node.
+		///
+		/// If the recipient or an intermediate node misbehaves and gives us free money, this may
+		/// overstate the amount paid, though this is unlikely.
+		///
+		/// [`Route::get_total_fees`]: crate::routing::router::Route::get_total_fees
+		fee_paid_msat: Option<u64>,
 	},
 	/// Indicates an outbound payment we made failed. Probably some intermediary node dropped
 	/// something. You may wish to retry with a different route.
@@ -335,12 +346,13 @@ impl Writeable for Event {
 					(8, payment_preimage, option),
 				});
 			},
-			&Event::PaymentSent { ref payment_id, ref payment_preimage, ref payment_hash} => {
+			&Event::PaymentSent { ref payment_id, ref payment_preimage, ref payment_hash, ref fee_paid_msat } => {
 				2u8.write(writer)?;
 				write_tlv_fields!(writer, {
 					(0, payment_preimage, required),
 					(1, payment_hash, required),
 					(3, payment_id, option),
+					(5, fee_paid_msat, option),
 				});
 			},
 			&Event::PaymentPathFailed {
@@ -451,10 +463,12 @@ impl MaybeReadable for Event {
 					let mut payment_preimage = PaymentPreimage([0; 32]);
 					let mut payment_hash = None;
 					let mut payment_id = None;
+					let mut fee_paid_msat = None;
 					read_tlv_fields!(reader, {
 						(0, payment_preimage, required),
 						(1, payment_hash, option),
 						(3, payment_id, option),
+						(5, fee_paid_msat, option),
 					});
 					if payment_hash.is_none() {
 						payment_hash = Some(PaymentHash(Sha256::hash(&payment_preimage.0[..]).into_inner()));
@@ -463,6 +477,7 @@ impl MaybeReadable for Event {
 						payment_id,
 						payment_preimage,
 						payment_hash: payment_hash.unwrap(),
+						fee_paid_msat,
 					}))
 				};
 				f()
@@ -781,3 +796,9 @@ impl<F> EventHandler for F where F: Fn(&Event) {
 		self(event)
 	}
 }
+
+impl<T: EventHandler> EventHandler for Arc<T> {
+	fn handle_event(&self, event: &Event) {
+		self.deref().handle_event(event)
+	}
+}