Add the `OutPoint` type for the `ChannelMonitor`'s funding_txo field.

[rust-lightning] / src / util / events.rs

diff --git a/src/util/events.rs b/src/util/events.rs
index 9cf25ec38e15b23439d82a8f18c6c446352cb846..1608d087370bd5fce0a6420a16ba5400a88d95cd 100644 (file)
--- a/src/util/events.rs
+++ b/src/util/events.rs
@@ -1,8 +1,8 @@
 use ln::msgs;
+use chain::transaction::OutPoint;
 
 use bitcoin::blockdata::script::Script;
 use bitcoin::util::uint::Uint256;
-use bitcoin::util::hash::Sha256dHash;
 
 use secp256k1::key::PublicKey;
 
@@ -24,7 +24,7 @@ pub enum Event {
        /// channel. Broadcasting such a transaction prior to this event may lead to our counterparty
        /// trivially stealing all funds in the funding transaction!
        FundingBroadcastSafe {
-               funding_txo: (Sha256dHash, u16),
+               funding_txo: OutPoint,
                /// The value passed in to ChannelManager::create_channel
                user_channel_id: u64,
        },
@@ -76,11 +76,13 @@ pub enum Event {
        SendFulfillHTLC {
                node_id: PublicKey,
                msg: msgs::UpdateFulfillHTLC,
+               commitment_msg: msgs::CommitmentSigned,
        },
        /// Used to indicate that we need to fail an htlc from the peer with the given node_id.
        SendFailHTLC {
                node_id: PublicKey,
                msg: msgs::UpdateFailHTLC,
+               commitment_msg: msgs::CommitmentSigned,
        },
        /// 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).
@@ -88,6 +90,10 @@ pub enum Event {
                msg: msgs::ChannelAnnouncement,
                update_msg: msgs::ChannelUpdate,
        },
+       /// Used to indicate that a channel_update should be broadcast to all peers.
+       BroadcastChannelUpdate {
+               msg: msgs::ChannelUpdate,
+       },
 }
 
 pub trait EventsProvider {