projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2414 from TheBlueMatt/2023-07-cut-116-rc
[rust-lightning]
/
lightning
/
src
/
chain
/
mod.rs
diff --git
a/lightning/src/chain/mod.rs
b/lightning/src/chain/mod.rs
index a6ed856ae4a0091124e68b78f928f7fb1c41650e..a32bcb29901fc1182c21b8e3e02ce9c6f92b3bb7 100644
(file)
--- a/
lightning/src/chain/mod.rs
+++ b/
lightning/src/chain/mod.rs
@@
-17,7
+17,7
@@
use bitcoin::network::constants::Network;
use bitcoin::secp256k1::PublicKey;
use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, MonitorEvent};
use bitcoin::secp256k1::PublicKey;
use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, MonitorEvent};
-use crate::
chain::keysinterface
::WriteableEcdsaChannelSigner;
+use crate::
sign
::WriteableEcdsaChannelSigner;
use crate::chain::transaction::{OutPoint, TransactionData};
use crate::prelude::*;
use crate::chain::transaction::{OutPoint, TransactionData};
use crate::prelude::*;
@@
-26,7
+26,6
@@
pub mod chaininterface;
pub mod chainmonitor;
pub mod channelmonitor;
pub mod transaction;
pub mod chainmonitor;
pub mod channelmonitor;
pub mod transaction;
-pub mod keysinterface;
pub(crate) mod onchaintx;
pub(crate) mod package;
pub(crate) mod onchaintx;
pub(crate) mod package;
@@
-390,3
+389,7
@@
where
self.1.block_disconnected(header, height);
}
}
self.1.block_disconnected(header, height);
}
}
+
+/// A unique identifier to track each pending output claim within a [`ChannelMonitor`].
+#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
+pub struct ClaimId(pub [u8; 32]);