Merge #115: Use async with esplora-reqwest

8d876ef Use async with esplora-reqwest (Daniela Brozzoni)
a9dffc3 Remove wrong 'cfg()' (Daniela Brozzoni)

Pull request description:

  ### Description

  We previously had the esplora-reqwest feature, but it would use
  sync reqwest, as the "async-interface" feature in BDK wasn't set.
  This commit sets this feature so that using `esplora-reqwest` always
  uses async mode.

  ### Notes to the reviewers

  ### Checklists

  #### All Submissions:

  * [x] I've signed all my commits
  * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk-cli/blob/master/CONTRIBUTING.md)
  * [x] I ran `cargo fmt` and `cargo clippy` before committing

  #### New Features:

  * [x] I've added tests for the new feature
  * [ ] I've added docs for the new feature
  * [x] I've updated `CHANGELOG.md`

ACKs for top commit:
  afilini:
    reACK 8d876ef

Tree-SHA512: 3e6c8ebc0c9ac772f28a6282b7478b436d519fdd081e98f282c00d520cc2ed400636407be2e4ba9f9203bd7141cc35bdc85430f9689c300f01945b76d411cf68

Author: afilini

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Rewrite relevant doc comments as `structopt` help document.
 - Update `bdk` and `bdk-reserves` to v0.19.0.
 - Change default database to `sqlite`.
+- Change the `esplora-reqwest` feature to always use async mode
 
 ## [0.5.0]
 

Cargo.lock

@@ -27,6 +27,7 @@ fd-lock = { version = "=3.0.2", optional = true }
 regex = { version = "1", optional = true }
 bdk-reserves = { version = "0.19", optional = true}
 electrsd = { version= "0.12", features = ["trigger", "bitcoind_22_0"], optional = true}
+tokio = { version = "1", features = ["rt", "macros", "rt-multi-thread"], optional = true }
 
 [features]
 default = ["repl", "sqlite-db"]
@@ -44,7 +45,8 @@ electrum = ["bdk/electrum"]
 compact_filters = ["bdk/compact_filters"]
 esplora = []
 esplora-ureq = ["esplora", "bdk/use-esplora-ureq"]
-esplora-reqwest = ["esplora", "bdk/use-esplora-reqwest"]
+async-interface = ["bdk/async-interface", "tokio"]
+esplora-reqwest = ["esplora", "bdk/use-esplora-reqwest", "bdk/reqwest-default-tls", "async-interface"]
 
 # Use this to consensus verify transactions at sync time
 verify = ["bdk/verify"]
@@ -65,4 +67,4 @@ regtest-node = []
 regtest-bitcoin = ["regtest-node" , "rpc", "electrsd"]
 regtest-electrum = ["regtest-node", "electrum", "electrsd/electrs_0_8_10"]
 regtest-esplora-ureq = ["regtest-node", "esplora-ureq", "electrsd/esplora_a33e97e1"]
-regtest-esplora-reqwest = ["regtest-node", "esplora-reqwest", "electrsd/esplora_a33e97e1"]
+regtest-esplora-reqwest = ["regtest-node", "esplora-reqwest", "electrsd/esplora_a33e97e1"]

Cargo.toml

@@ -65,13 +65,14 @@ use bdk::{
     bitcoin::{Address, OutPoint, TxOut},
     blockchain::Capability,
 };
+use bdk_macros::maybe_async;
 #[cfg(any(
     feature = "electrum",
     feature = "esplora",
     feature = "compact_filters",
     feature = "rpc"
 ))]
-use bdk_macros::{maybe_async, maybe_await};
+use bdk_macros::maybe_await;
 #[cfg(feature = "reserves")]
 use bdk_reserves::reserves::verify_proof;
 #[cfg(feature = "reserves")]
@@ -556,6 +557,7 @@ pub fn get_outpoints_for_address(
         .collect()
 }
 
+#[maybe_async]
 pub fn handle_command(
     cli_opts: CliOpts,
     network: Network,
@@ -576,7 +578,11 @@ pub fn handle_command(
             let database = open_database(&wallet_opts)?;
             let blockchain = new_blockchain(network, &wallet_opts, &_backend)?;
             let wallet = new_wallet(network, &wallet_opts, database)?;
-            let result = handle_online_wallet_subcommand(&wallet, &blockchain, online_subcommand)?;
+            let result = maybe_await!(handle_online_wallet_subcommand(
+                &wallet,
+                &blockchain,
+                online_subcommand
+            ))?;
             serde_json::to_string_pretty(&result)?
         }
         CliSubCommand::Wallet {
@@ -656,11 +662,11 @@ pub fn handle_command(
                             ))]
                             ReplSubCommand::OnlineWalletSubCommand(online_subcommand) => {
                                 let blockchain = new_blockchain(network, &wallet_opts, &_backend)?;
-                                handle_online_wallet_subcommand(
+                                maybe_await!(handle_online_wallet_subcommand(
                                     &wallet,
                                     &blockchain,
                                     online_subcommand,
-                                )
+                                ))
                             }
                             ReplSubCommand::OfflineWalletSubCommand(offline_subcommand) => {
                                 handle_offline_wallet_subcommand(

src/handlers.rs

@@ -24,11 +24,14 @@ use log::{debug, error, warn};
 use crate::commands::CliOpts;
 use crate::handlers::*;
 use bdk::{bitcoin, Error};
+use bdk_macros::{maybe_async, maybe_await};
 use structopt::StructOpt;
 
 #[cfg(feature = "repl")]
 const REPL_LINE_SPLIT_REGEX: &str = r#""([^"]*)"|'([^']*)'|([\w\-]+)"#;
 
+#[maybe_async]
+#[cfg_attr(feature = "async-interface", tokio::main)]
 fn main() {
     env_logger::init();
 
@@ -96,7 +99,7 @@ fn main() {
     #[cfg(not(feature = "regtest-node"))]
     let backend = Nodes::None;
 
-    match handle_command(cli_opts, network, backend) {
+    match maybe_await!(handle_command(cli_opts, network, backend)) {
         Ok(result) => println!("{}", result),
         Err(e) => {
             match e {