Skip to content

Commit 54e1953

Browse files
authored
Merge pull request #603 from tnull/2025-08-fix-electrum-breakage-0.1
Bump `electrum-client` to v0.24.0 (0.6 release branch)
2 parents 93858b3 + ca3cc1e commit 54e1953

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ esplora-client = { version = "0.12", default-features = false, features = ["toki
8282
# `lightning-transaction-sync` APIs. We should drop it as part of the upgrade
8383
# to LDK 0.2.
8484
esplora-client_0_11 = { package = "esplora-client", version = "0.11", default-features = false, features = ["tokio", "async-https-rustls"] }
85-
electrum-client = { version = "0.23.1", default-features = true }
85+
electrum-client = { version = "0.24.0", default-features = true }
8686
libc = "0.2"
8787
uniffi = { version = "0.27.3", features = ["build"], optional = true }
8888
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
@@ -103,11 +103,11 @@ proptest = "1.0.0"
103103
regex = "1.5.6"
104104

105105
[target.'cfg(not(no_download))'.dev-dependencies]
106-
electrsd = { version = "0.34.0", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
106+
electrsd = { version = "0.35.0", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
107107

108108
[target.'cfg(no_download)'.dev-dependencies]
109-
electrsd = { version = "0.34.0", default-features = false, features = ["legacy"] }
110-
corepc-node = { version = "0.7.0", default-features = false, features = ["27_2"] }
109+
electrsd = { version = "0.35.0", default-features = false, features = ["legacy"] }
110+
corepc-node = { version = "0.8.0", default-features = false, features = ["27_2"] }
111111

112112
[target.'cfg(cln_test)'.dev-dependencies]
113113
clightningrpc = { version = "0.3.0-beta.8", default-features = false }

src/chain/bitcoind_rpc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ impl BlockSource for BitcoindRpcClient {
296296
Box::pin(async move { self.rpc_client.get_block(header_hash).await })
297297
}
298298

299-
fn get_best_block(&self) -> AsyncBlockSourceResult<(BlockHash, Option<u32>)> {
299+
fn get_best_block(&self) -> AsyncBlockSourceResult<'_, (BlockHash, Option<u32>)> {
300300
Box::pin(async move { self.rpc_client.get_best_block().await })
301301
}
302302
}

src/tx_broadcaster.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ where
3636
Self { queue_sender, queue_receiver: Mutex::new(queue_receiver), logger }
3737
}
3838

39-
pub(crate) async fn get_broadcast_queue(&self) -> MutexGuard<mpsc::Receiver<Vec<Transaction>>> {
39+
pub(crate) async fn get_broadcast_queue(
40+
&self,
41+
) -> MutexGuard<'_, mpsc::Receiver<Vec<Transaction>>> {
4042
self.queue_receiver.lock().await
4143
}
4244
}

0 commit comments

Comments
 (0)