Bump electrum_client dependency to v0.22

.. which is the newest version and also aligns with recent BDK releases.

Author: tnull

lightning-transaction-sync/Cargo.toml

@@ -28,14 +28,16 @@ lightning-macros = { version = "0.2", path = "../lightning-macros", default-feat
 bitcoin = { version = "0.32.2", default-features = false }
 futures = { version = "0.3", optional = true }
 esplora-client = { version = "0.11", default-features = false, optional = true }
-electrum-client = { version = "0.21.0", optional = true }
+electrum-client = { version = "0.22.0", optional = true }
 
 [dev-dependencies]
 lightning = { version = "0.2.0", path = "../lightning", default-features = false, features = ["std", "_test_utils"] }
 tokio = { version = "1.35.0", features = ["macros"] }
 
 [target.'cfg(not(target_os = "windows"))'.dev-dependencies]
-electrsd = { version = "0.28.0", default-features = false, features = ["legacy"] }
+#electrsd = { version = "0.31.0", default-features = false, features = ["legacy"] }
+electrsd = { git = "https://github.com/tnull/electrsd.git", branch = "2025-03-upgrade-corepc", default-features = false, features = ["legacy"] }
+corepc-node = { version = "0.6.0", default-features = false, features = ["28_0"] }
 
 [lints.rust.unexpected_cfgs]
 level = "forbid"

lightning-transaction-sync/tests/integration_tests.rs

@@ -17,9 +17,9 @@ use bitcoin::block::Header;
 use bitcoin::constants::genesis_block;
 use bitcoin::network::Network;
 use bitcoin::{Amount, BlockHash, Txid};
-use bitcoind::bitcoincore_rpc::RpcApi;
-use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
-use electrsd::{bitcoind, bitcoind::BitcoinD, ElectrsD};
+
+use electrsd::corepc_node::Node as BitcoinD;
+use electrsd::{corepc_node, ElectrsD};
 
 use std::collections::{HashMap, HashSet};
 use std::env;
@@ -28,10 +28,10 @@ use std::time::Duration;
 
 pub fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
 	let bitcoind_exe =
-		env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
+		env::var("BITCOIND_EXE").ok().or_else(|| corepc_node::downloaded_exe_path().ok()).expect(
 			"you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 		);
-	let mut bitcoind_conf = bitcoind::Conf::default();
+	let mut bitcoind_conf = corepc_node::Conf::default();
 	bitcoind_conf.network = "regtest";
 	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();