wait for confirmation

Author: CAGS295

romeo/tests/tests/bitcoin_client.rs

@@ -1,5 +1,9 @@
-use reqwest::blocking::Client;
-use serde_json::json;
+use std::{str::FromStr, thread::sleep, time::Duration};
+
+use bdk::{
+	bitcoin::{hash_types::Txid, Address, BlockHash},
+	bitcoincore_rpc::{Auth, Client as BClient, RpcApi},
+};
 use url::Url;
 
 pub fn bitcoin_url() -> Url {
@@ -10,38 +14,38 @@ pub fn electrs_url() -> Url {
 	Url::parse("tcp://electrs:60401").unwrap()
 }
 
-pub fn generate_blocks(
+pub fn client_new(url: &str, user: &str, pass: &str) -> BClient {
+	BClient::new(url, Auth::UserPass(user.into(), pass.into())).unwrap()
+}
+
+pub fn mine_blocks(
+	client: &BClient,
 	blocks: u64,
-	ctx: &Client,
 	address: &str,
-) -> Vec<String> {
-	let endpoint = bitcoin_url();
-	let user = "devnet";
-	let password = "devnet";
-	let body = json!({
-		"jsonrpc": "1.0",
-		"id": "1",
-		"method": "generatetoaddress",
-		//developer's
-		"params": [blocks,address]
-	});
-
-	let response_json: serde_json::Value = ctx
-		.post(endpoint)
-		.basic_auth(user, Some(password))
-		.header(reqwest::header::CONTENT_TYPE, "application/json")
-		.json(&body)
-		.send()
+) -> Vec<BlockHash> {
+	client
+		.generate_to_address(blocks, &Address::from_str(address).unwrap())
 		.unwrap()
-		.json()
-		.unwrap();
-
-	assert_eq!(response_json["error"], serde_json::Value::Null);
-	serde_json::from_value(response_json["result"].clone()).expect("block_ids")
 }
 
-#[test]
-fn mine_empty_block() {
-	let client = Client::new();
-	generate_blocks(10, &client, "mqVnk6NPRdhntvfm4hh9vvjiRkFDUuSYsH");
+pub fn wait_for_tx_confirmation(
+	b_client: &BClient,
+	txid: &Txid,
+	confirmations: i32,
+) {
+	loop {
+		match b_client.get_transaction(txid, None) {
+			Ok(tx) if tx.info.confirmations >= confirmations => {
+				break;
+			}
+			Ok(ok) => {
+				println!("Waiting confirmation on {txid}:{ok:?}")
+			}
+			Err(e) => {
+				println!("Waiting confirmation on {txid}:{e:?}")
+			}
+		}
+
+		sleep(Duration::from_secs(1));
+	}
 }

romeo/tests/tests/deposit.rs

@@ -1,40 +1,53 @@
-use std::{thread::sleep, time::Duration};
+use std::{str::FromStr, thread::sleep, time::Duration};
 
 use anyhow::Result;
 use bdk::{
-	bitcoin::{psbt::serialize::Serialize, PrivateKey},
+	bitcoin::{psbt::serialize::Serialize, Address, PrivateKey},
+	bitcoincore_rpc::RpcApi,
 	blockchain::{
 		ConfigurableBlockchain, ElectrumBlockchain, ElectrumBlockchainConfig,
 	},
 	database::MemoryDatabase,
 	template::P2Wpkh,
 	SyncOptions, Wallet,
 };
-use reqwest::blocking::Client;
 use sbtc_cli::commands::{
 	broadcast::{broadcast_tx, BroadcastArgs},
 	deposit::{build_deposit_tx, DepositArgs},
 };
 
 use super::{
-	bitcoin_client::{electrs_url, generate_blocks},
+	bitcoin_client::{
+		bitcoin_url, client_new, electrs_url, mine_blocks,
+		wait_for_tx_confirmation,
+	},
 	KeyType::*,
 	WALLETS,
 };
 
 #[test]
 fn broadcast_deposit() -> Result<()> {
-	let client = Client::new();
+	let b_client = client_new(bitcoin_url().as_str(), "devnet", "devnet");
+
+	b_client
+		.import_address(
+			&Address::from_str(WALLETS[1][P2wpkh].address).unwrap(),
+			None,
+			Some(false),
+		)
+		.unwrap();
+
 	{
-		generate_blocks(1, &client, WALLETS[0][P2wpkh].address);
-		generate_blocks(1, &client, WALLETS[1][P2wpkh].address);
+		mine_blocks(&b_client, 1, WALLETS[0][P2wpkh].address);
+		mine_blocks(&b_client, 1, WALLETS[1][P2wpkh].address);
 		// pads blocks to get rewards.
-		generate_blocks(100, &client, WALLETS[0][P2wpkh].address);
+		mine_blocks(&b_client, 100, WALLETS[0][P2wpkh].address);
 	};
 
 	let electrum_url = electrs_url();
 
 	// suboptimal, replace once we have better events.
+	// replace with b_client balance?
 	{
 		let blockchain =
 			ElectrumBlockchain::from_config(&ElectrumBlockchainConfig {
@@ -88,5 +101,9 @@ fn broadcast_deposit() -> Result<()> {
 	})
 	.unwrap();
 
+	let txid = tx.txid();
+
+	wait_for_tx_confirmation(&b_client, &txid, 1);
+
 	Ok(())
 }