Skip to content

Move ChainListener from chain::bitcoind to chain #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 1 commit into from
Oct 14, 2026
Merged

Move ChainListener from chain::bitcoind to chain #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 1 addition & 58 deletions src/chain/bitcoind.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use lightning_block_sync::{
};
use serde::Serialize;

use super::{WalletSyncGuard, WalletSyncStatus};
use super::{ChainListener, WalletSyncGuard, WalletSyncStatus};
use crate::config::{
BitcoindRestClientConfig, Config, DEFAULT_FEE_RATE_CACHE_UPDATE_TIMEOUT_SECS,
DEFAULT_TX_BROADCAST_TIMEOUT_SECS,
Expand Down Expand Up @@ -1534,63 +1534,6 @@ pub(crate) enum FeeRateEstimationMode {
Conservative,
}

pub(crate) struct ChainListener {
pub(crate) onchain_wallet: std::sync::Weak<Wallet>,
pub(crate) channel_manager: std::sync::Weak<ChannelManager>,
pub(crate) chain_monitor: std::sync::Weak<ChainMonitor>,
pub(crate) output_sweeper: std::sync::Weak<Sweeper>,
}

impl ChainListener {
fn upgrade(
&self,
) -> Option<(Arc<Wallet>, Arc<ChannelManager>, Arc<ChainMonitor>, Arc<Sweeper>)> {
Some((
self.onchain_wallet.upgrade()?,
self.channel_manager.upgrade()?,
self.chain_monitor.upgrade()?,
self.output_sweeper.upgrade()?,
))
}
}

impl Listen for ChainListener {
fn filtered_block_connected(
&self, header: &bitcoin::block::Header,
txdata: &lightning::chain::transaction::TransactionData, height: u32,
) {
if let Some((onchain_wallet, channel_manager, chain_monitor, output_sweeper)) =
self.upgrade()
{
onchain_wallet.filtered_block_connected(header, txdata, height);
channel_manager.filtered_block_connected(header, txdata, height);
chain_monitor.filtered_block_connected(header, txdata, height);
output_sweeper.filtered_block_connected(header, txdata, height);
}
}
fn block_connected(&self, block: &bitcoin::Block, height: u32) {
if let Some((onchain_wallet, channel_manager, chain_monitor, output_sweeper)) =
self.upgrade()
{
onchain_wallet.block_connected(block, height);
channel_manager.block_connected(block, height);
chain_monitor.block_connected(block, height);
output_sweeper.block_connected(block, height);
}
}

fn blocks_disconnected(&self, fork_point_block: lightning::chain::BlockLocator) {
if let Some((onchain_wallet, channel_manager, chain_monitor, output_sweeper)) =
self.upgrade()
{
onchain_wallet.blocks_disconnected(fork_point_block);
channel_manager.blocks_disconnected(fork_point_block);
chain_monitor.blocks_disconnected(fork_point_block);
output_sweeper.blocks_disconnected(fork_point_block);
}
}
}

pub(crate) fn rpc_credentials(rpc_user: String, rpc_password: String) -> String {
BASE64_STANDARD.encode(format!("{}:{}", rpc_user, rpc_password))
}
Expand Down
62 changes: 62 additions & 0 deletions src/chain/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ use std::sync::{Arc, Mutex};
use std::time::Duration;

use bitcoin::{Script, Txid};
#[cfg(feature = "chain-bitcoind")]
use lightning::chain::Listen;
use lightning::chain::{BlockLocator, Filter};

#[cfg(feature = "chain-bitcoind")]
Expand Down Expand Up @@ -159,6 +161,66 @@ enum ChainSourceKind {
Bitcoind(BitcoindChainSource),
}

#[cfg(feature = "chain-bitcoind")]
pub(crate) struct ChainListener {
pub(crate) onchain_wallet: std::sync::Weak<Wallet>,
pub(crate) channel_manager: std::sync::Weak<ChannelManager>,
pub(crate) chain_monitor: std::sync::Weak<ChainMonitor>,
pub(crate) output_sweeper: std::sync::Weak<Sweeper>,
}

#[cfg(feature = "chain-bitcoind")]
impl ChainListener {
fn upgrade(
&self,
) -> Option<(Arc<Wallet>, Arc<ChannelManager>, Arc<ChainMonitor>, Arc<Sweeper>)> {
Some((
self.onchain_wallet.upgrade()?,
self.channel_manager.upgrade()?,
self.chain_monitor.upgrade()?,
self.output_sweeper.upgrade()?,
))
}
}

#[cfg(feature = "chain-bitcoind")]
impl Listen for ChainListener {
fn filtered_block_connected(
&self, header: &bitcoin::block::Header,
txdata: &lightning::chain::transaction::TransactionData, height: u32,
) {
if let Some((onchain_wallet, channel_manager, chain_monitor, output_sweeper)) =
self.upgrade()
{
onchain_wallet.filtered_block_connected(header, txdata, height);
channel_manager.filtered_block_connected(header, txdata, height);
chain_monitor.filtered_block_connected(header, txdata, height);
output_sweeper.filtered_block_connected(header, txdata, height);
}
}
fn block_connected(&self, block: &bitcoin::Block, height: u32) {
if let Some((onchain_wallet, channel_manager, chain_monitor, output_sweeper)) =
self.upgrade()
{
onchain_wallet.block_connected(block, height);
channel_manager.block_connected(block, height);
chain_monitor.block_connected(block, height);
output_sweeper.block_connected(block, height);
}
}

fn blocks_disconnected(&self, fork_point_block: lightning::chain::BlockLocator) {
if let Some((onchain_wallet, channel_manager, chain_monitor, output_sweeper)) =
self.upgrade()
{
onchain_wallet.blocks_disconnected(fork_point_block);
channel_manager.blocks_disconnected(fork_point_block);
chain_monitor.blocks_disconnected(fork_point_block);
output_sweeper.blocks_disconnected(fork_point_block);
}
}
}

impl ChainSource {
#[cfg(feature = "chain-esplora")]
pub(crate) fn new_esplora(
Expand Down
Loading