Skip to content

Commit 4f6f15d

Browse files
authored
Merge pull request lightningdevkit#4606 from tnull/2026-05-update-tx-sync-clients
Bump electrum-client to v0.25
2 parents 5e8c2fc + 8882edd commit 4f6f15d

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

lightning-transaction-sync/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ lightning-macros = { version = "0.2", path = "../lightning-macros", default-feat
3838
bitcoin = { version = "0.32.2", default-features = false }
3939
futures = { version = "0.3", optional = true }
4040
esplora-client = { version = "0.12", default-features = false, optional = true }
41-
electrum-client = { version = "0.24.0", optional = true, default-features = false, features = ["proxy"] }
41+
electrum-client = { version = "0.25", optional = true, default-features = false, features = ["proxy"] }
4242

4343
[dev-dependencies]
4444
lightning = { version = "0.3.0", path = "../lightning", default-features = false, features = ["std", "_test_utils"] }
4545
tokio = { version = "1.35.0", features = ["macros"] }
4646

4747
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
48-
electrsd = { version = "0.36.0", default-features = false, features = ["legacy"] }
49-
corepc-node = { version = "0.10.0", default-features = false, features = ["28_0"] }
48+
electrsd = { version = "0.38", default-features = false, features = ["legacy"] }
49+
bitcoind = { version = "0.38", default-features = false, features = ["28_1"] }
5050

5151
[lints.rust.unexpected_cfgs]
5252
level = "forbid"

lightning-transaction-sync/tests/integration_tests.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use bitcoin::constants::genesis_block;
1818
use bitcoin::network::Network;
1919
use bitcoin::{Amount, BlockHash, Txid};
2020

21-
use electrsd::corepc_node::Node as BitcoinD;
22-
use electrsd::{corepc_node, ElectrsD};
21+
use bitcoind::BitcoinD;
22+
use electrsd::ElectrsD;
2323

2424
use std::collections::{HashMap, HashSet};
2525
use std::env;
@@ -28,10 +28,10 @@ use std::time::Duration;
2828

2929
pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
3030
let bitcoind_exe =
31-
env::var("BITCOIND_EXE").ok().or_else(|| corepc_node::downloaded_exe_path().ok()).expect(
31+
env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
3232
"you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
3333
);
34-
let mut bitcoind_conf = corepc_node::Conf::default();
34+
let mut bitcoind_conf = bitcoind::Conf::default();
3535
bitcoind_conf.network = "regtest";
3636
let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();
3737

0 commit comments

Comments
 (0)