X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fchannelmanager.rs;h=a6e5575b425b8b58112a9c580db68751d2b74126;hb=9a015236d0523af15ea42e78663c3fb144e8ede3;hp=a957a96df73be073d6b4e9fd32aabdd8f80b2b74;hpb=2afd53148f42eb9b7319d3e8841578aacdc31e6e;p=rust-lightning

diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index a957a96d..a6e5575b 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -585,7 +585,10 @@ impl ChannelManager {
 	/// Non-proportional fees are fixed according to our risk using the provided fee estimator.
 	///
 	/// panics if channel_value_satoshis is >= `MAX_FUNDING_SATOSHIS`!
-	pub fn new(network: Network, feeest: Arc<FeeEstimator>, monitor: Arc<ManyChannelMonitor>, chain_monitor: Arc<ChainWatchInterface>, tx_broadcaster: Arc<BroadcasterInterface>, logger: Arc<Logger>,keys_manager: Arc<KeysInterface>, config: UserConfig) -> Result<Arc<ChannelManager>, secp256k1::Error> {
+	///
+	/// User must provide the current blockchain height from which to track onchain channel
+	/// funding outpoints and send payments with reliable timelocks.
+	pub fn new(network: Network, feeest: Arc<FeeEstimator>, monitor: Arc<ManyChannelMonitor>, chain_monitor: Arc<ChainWatchInterface>, tx_broadcaster: Arc<BroadcasterInterface>, logger: Arc<Logger>,keys_manager: Arc<KeysInterface>, config: UserConfig, current_blockchain_height: usize) -> Result<Arc<ChannelManager>, secp256k1::Error> {
 		let secp_ctx = Secp256k1::new();
 
 		let res = Arc::new(ChannelManager {
@@ -596,7 +599,7 @@ impl ChannelManager {
 			chain_monitor,
 			tx_broadcaster,
 
-			latest_block_height: AtomicUsize::new(0), //TODO: Get an init value
+			latest_block_height: AtomicUsize::new(current_blockchain_height),
 			last_block_hash: Mutex::new(Default::default()),
 			secp_ctx,