Bump electrum/esplora versions

Author: wpaulino

lightning-transaction-sync/Cargo.toml

@@ -25,11 +25,11 @@ lightning = { version = "0.0.118", path = "../lightning", default-features = fal
 bitcoin = { version = "0.30.2", default-features = false }
 bdk-macros = "0.6"
 futures = { version = "0.3", optional = true }
-esplora-client = { version = "0.4", default-features = false, optional = true }
+esplora-client = { version = "0.6", default-features = false, optional = true }
 reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }
 
 [dev-dependencies]
 lightning = { version = "0.0.118", path = "../lightning", features = ["std"] }
-electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
-electrum-client = "0.12.0"
+electrsd = { version = "0.26.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_25_0"] }
+electrum-client = "0.18.0"
 tokio = { version = "1.14.0", features = ["full"] }

lightning-transaction-sync/tests/integration_tests.rs

@@ -11,7 +11,7 @@ use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::network::constants::Network;
 use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
 use bitcoind::bitcoincore_rpc::RpcApi;
-use electrum_client::ElectrumApi;
+use electrsd::electrum_client::ElectrumApi;
 
 use std::env;
 use std::sync::Mutex;
@@ -43,21 +43,22 @@ pub fn generate_blocks_and_wait(bitcoind: &BitcoinD, electrsd: &ElectrsD, num: u
 	let address = bitcoind
 		.client
 		.get_new_address(Some("test"), Some(AddressType::Legacy))
-		.expect("failed to get new address");
+		.expect("failed to get new address")
+		.assume_checked();
 	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
 	let _block_hashes_res = bitcoind.client.generate_to_address(num as u64, &address);
 	wait_for_block(electrsd, cur_height as usize + num);
 }
 
 pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
-	let mut header = match electrsd.client.block_headers_subscribe() {
+	let mut header = match electrsd.client.block_headers_subscribe_raw() {
 		Ok(header) => header,
 		Err(_) => {
 			// While subscribing should succeed the first time around, we ran into some cases where
 			// it didn't. Since we can't proceed without subscribing, we try again after a delay
 			// and panic if it still fails.
 			std::thread::sleep(Duration::from_secs(1));
-			electrsd.client.block_headers_subscribe().expect("failed to subscribe to block headers")
+			electrsd.client.block_headers_subscribe_raw().expect("failed to subscribe to block headers")
 		}
 	};
 	loop {
@@ -67,7 +68,7 @@ pub fn wait_for_block(electrsd: &ElectrsD, min_height: usize) {
 		header = exponential_backoff_poll(|| {
 			electrsd.trigger().expect("failed to trigger electrsd");
 			electrsd.client.ping().expect("failed to ping electrsd");
-			electrsd.client.block_headers_pop().expect("failed to pop block header")
+			electrsd.client.block_headers_pop_raw().expect("failed to pop block header")
 		});
 	}
 }
@@ -177,7 +178,7 @@ fn test_esplora_syncs() {
 	assert_eq!(events.len(), 1);
 
 	// Check registered confirmed transactions are marked confirmed
-	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
+	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap().assume_checked();
 	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
 	tx_sync.register_tx(&txid, &new_address.payload.script_pubkey());
 
@@ -260,7 +261,7 @@ async fn test_esplora_syncs() {
 	assert_eq!(events.len(), 1);
 
 	// Check registered confirmed transactions are marked confirmed
-	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
+	let new_address = bitcoind.client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap().assume_checked();
 	let txid = bitcoind.client.send_to_address(&new_address, Amount::from_sat(5000), None, None, None, None, None, None).unwrap();
 	tx_sync.register_tx(&txid, &new_address.payload.script_pubkey());