diff --git a/src/event.rs b/src/event.rs index 3f6a9294f..bd455ecb7 100644 --- a/src/event.rs +++ b/src/event.rs @@ -347,7 +347,7 @@ where let confirmation_target = ConfirmationTarget::NonAnchorChannelFee; // We set nLockTime to the current height to discourage fee sniping. - let cur_height = self.channel_manager.current_best_block().height(); + let cur_height = self.channel_manager.current_best_block().height; let locktime = LockTime::from_height(cur_height).unwrap_or(LockTime::ZERO); // Sign the final funding transaction and broadcast it. diff --git a/src/lib.rs b/src/lib.rs index dff5346bb..cddce125f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -107,7 +107,7 @@ pub use error::Error as NodeError; use error::Error; pub use event::Event; -pub use types::{BestBlock, ChannelConfig}; +pub use types::ChannelConfig; pub use io::utils::generate_entropy_mnemonic; @@ -138,7 +138,7 @@ pub use types::{ChannelDetails, PeerDetails, UserChannelId}; use logger::{log_error, log_info, log_trace, FilesystemLogger, Logger}; -use lightning::chain::Confirm; +use lightning::chain::{BestBlock, Confirm}; use lightning::ln::channelmanager::{self, PaymentId, RecipientOnionFields, Retry}; use lightning::ln::msgs::SocketAddress; use lightning::ln::{PaymentHash, PaymentPreimage}; diff --git a/src/sweep.rs b/src/sweep.rs index 93dac19fa..0c81c9e31 100644 --- a/src/sweep.rs +++ b/src/sweep.rs @@ -199,7 +199,7 @@ where fn rebroadcast_if_necessary(&self) { let (cur_height, cur_hash) = { let best_block = self.best_block.lock().unwrap(); - (best_block.height(), best_block.block_hash()) + (best_block.height, best_block.block_hash) }; let mut respend_descriptors = Vec::new(); @@ -277,7 +277,7 @@ where } fn prune_confirmed_outputs(&self) { - let cur_height = self.best_block.lock().unwrap().height(); + let cur_height = self.best_block.lock().unwrap().height; let mut locked_outputs = self.outputs.lock().unwrap(); // Prune all outputs that have sufficient depth by now. @@ -370,9 +370,9 @@ where ) { { let best_block = self.best_block.lock().unwrap(); - assert_eq!(best_block.block_hash(), header.prev_blockhash, + assert_eq!(best_block.block_hash, header.prev_blockhash, "Blocks must be connected in chain-order - the connected header must build on the last connected header"); - assert_eq!(best_block.height(), height - 1, + assert_eq!(best_block.height, height - 1, "Blocks must be connected in chain-order - the connected block height must be one greater than the previous height"); } @@ -384,9 +384,9 @@ where let new_height = height - 1; { let mut best_block = self.best_block.lock().unwrap(); - assert_eq!(best_block.block_hash(), header.block_hash(), + assert_eq!(best_block.block_hash, header.block_hash(), "Blocks must be disconnected in chain-order - the disconnected header must be the last connected header"); - assert_eq!(best_block.height(), height, + assert_eq!(best_block.height, height, "Blocks must be disconnected in chain-order - the disconnected block must have the correct height"); *best_block = BestBlock::new(header.prev_blockhash, new_height) } diff --git a/src/types.rs b/src/types.rs index d7cedda87..d3929fb87 100644 --- a/src/types.rs +++ b/src/types.rs @@ -4,7 +4,6 @@ use crate::sweep::OutputSweeper; use lightning::blinded_path::BlindedPath; use lightning::chain::chainmonitor; -use lightning::chain::BestBlock as LdkBestBlock; use lightning::ln::channelmanager::ChannelDetails as LdkChannelDetails; use lightning::ln::msgs::RoutingMessageHandler; use lightning::ln::msgs::SocketAddress; @@ -21,7 +20,7 @@ use lightning_net_tokio::SocketDescriptor; use lightning_transaction_sync::EsploraSyncClient; use bitcoin::secp256k1::{self, PublicKey, Secp256k1}; -use bitcoin::{BlockHash, OutPoint}; +use bitcoin::OutPoint; use std::sync::{Arc, Mutex, RwLock}; @@ -454,20 +453,3 @@ impl Default for ChannelConfig { LdkChannelConfig::default().into() } } - -/// The best known block as identified by its hash and height. -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct BestBlock { - /// The block's hash - pub block_hash: BlockHash, - /// The height at which the block was confirmed. - pub height: u32, -} - -impl From for BestBlock { - fn from(value: LdkBestBlock) -> Self { - let block_hash = value.block_hash(); - let height = value.height(); - Self { block_hash, height } - } -}