serde = { version = "^1.0", features = ["derive"] }
serde_json = { version = "^1.0" }
base64 = "^0.11"
-async-trait = "0.1"
# Optional dependencies
sled = { version = "0.31.0", optional = true }
-electrum-client = { git = "https://github.com/MagicalBitcoin/rust-electrum-client.git", optional = true }
+electrum-client = { version = "0.2.0-beta.1", optional = true }
reqwest = { version = "0.10", optional = true, features = ["json"] }
+tokio = { version = "0.2", optional = true, features = ["rt-core"] }
futures = { version = "0.3", optional = true }
clap = { version = "2.33", optional = true }
compiler = ["miniscript/compiler"]
default = ["key-value-db", "electrum"]
electrum = ["electrum-client"]
-esplora = ["reqwest", "futures"]
+esplora = ["reqwest", "futures", "tokio"]
key-value-db = ["sled"]
cli-utils = ["clap"]
[dev-dependencies]
-tokio = { version = "0.2", features = ["macros"] }
lazy_static = "1.4"
rustyline = "6.0"
dirs = "2.0"
dir
}
-#[tokio::main]
-async fn main() {
+fn main() {
env_logger::init();
let app = cli::make_cli_subcommands();
.unwrap();
debug!("database opened successfully");
- let client = Client::new(matches.value_of("server").unwrap())
- .await
- .unwrap();
+ let client = Client::new(
+ matches.value_of("server").unwrap(),
+ matches.value_of("proxy"),
+ )
+ .unwrap();
let wallet = Wallet::new(
descriptor,
change_descriptor,
tree,
ElectrumBlockchain::from(client),
)
- .await
.unwrap();
let wallet = Arc::new(wallet);
continue;
}
- if let Some(s) = cli::handle_matches(&Arc::clone(&wallet), matches.unwrap())
- .await
- .unwrap()
+ if let Some(s) =
+ cli::handle_matches(&Arc::clone(&wallet), matches.unwrap()).unwrap()
{
println!("{}", s);
}
// rl.save_history("history.txt").unwrap();
} else {
- if let Some(s) = cli::handle_matches(&wallet, matches).await.unwrap() {
+ if let Some(s) = cli::handle_matches(&wallet, matches).unwrap() {
println!("{}", s);
}
}
use bitcoin::{Script, Transaction, Txid};
-use electrum_client::tokio::io::{AsyncRead, AsyncWrite};
-use electrum_client::Client;
+use electrum_client::{Client, ElectrumApi};
use self::utils::{ELSGetHistoryRes, ELSListUnspentRes, ElectrumLikeSync};
use super::*;
use crate::database::{BatchDatabase, DatabaseUtils};
use crate::error::Error;
-pub struct ElectrumBlockchain<T: AsyncRead + AsyncWrite + Send>(Option<Client<T>>);
+pub struct ElectrumBlockchain(Option<Client>);
-impl<T: AsyncRead + AsyncWrite + Send> std::convert::From<Client<T>> for ElectrumBlockchain<T> {
- fn from(client: Client<T>) -> Self {
+impl std::convert::From<Client> for ElectrumBlockchain {
+ fn from(client: Client) -> Self {
ElectrumBlockchain(Some(client))
}
}
-impl<T: AsyncRead + AsyncWrite + Send> Blockchain for ElectrumBlockchain<T> {
+impl Blockchain for ElectrumBlockchain {
fn offline() -> Self {
ElectrumBlockchain(None)
}
}
}
-#[async_trait(?Send)]
-impl<T: AsyncRead + AsyncWrite + Send> OnlineBlockchain for ElectrumBlockchain<T> {
- async fn get_capabilities(&self) -> HashSet<Capability> {
+impl OnlineBlockchain for ElectrumBlockchain {
+ fn get_capabilities(&self) -> HashSet<Capability> {
vec![Capability::FullHistory, Capability::GetAnyTx]
.into_iter()
.collect()
}
- async fn setup<D: BatchDatabase + DatabaseUtils, P: Progress>(
+ fn setup<D: BatchDatabase + DatabaseUtils, P: Progress>(
&mut self,
stop_gap: Option<usize>,
database: &mut D,
.as_mut()
.ok_or(Error::OfflineClient)?
.electrum_like_setup(stop_gap, database, progress_update)
- .await
}
- async fn get_tx(&mut self, txid: &Txid) -> Result<Option<Transaction>, Error> {
+ fn get_tx(&mut self, txid: &Txid) -> Result<Option<Transaction>, Error> {
Ok(self
.0
.as_mut()
.ok_or(Error::OfflineClient)?
.transaction_get(txid)
- .await
.map(Option::Some)?)
}
- async fn broadcast(&mut self, tx: &Transaction) -> Result<(), Error> {
+ fn broadcast(&mut self, tx: &Transaction) -> Result<(), Error> {
Ok(self
.0
.as_mut()
.ok_or(Error::OfflineClient)?
.transaction_broadcast(tx)
- .await
.map(|_| ())?)
}
- async fn get_height(&mut self) -> Result<usize, Error> {
+ fn get_height(&mut self) -> Result<usize, Error> {
// TODO: unsubscribe when added to the client, or is there a better call to use here?
Ok(self
.as_mut()
.ok_or(Error::OfflineClient)?
.block_headers_subscribe()
- .await
.map(|data| data.height)?)
}
}
-#[async_trait(?Send)]
-impl<T: AsyncRead + AsyncWrite + Send> ElectrumLikeSync for Client<T> {
- async fn els_batch_script_get_history<'s, I: IntoIterator<Item = &'s Script>>(
+impl ElectrumLikeSync for Client {
+ fn els_batch_script_get_history<'s, I: IntoIterator<Item = &'s Script>>(
&mut self,
scripts: I,
) -> Result<Vec<Vec<ELSGetHistoryRes>>, Error> {
self.batch_script_get_history(scripts)
- .await
.map(|v| {
v.into_iter()
.map(|v| {
.map_err(Error::Electrum)
}
- async fn els_batch_script_list_unspent<'s, I: IntoIterator<Item = &'s Script>>(
+ fn els_batch_script_list_unspent<'s, I: IntoIterator<Item = &'s Script>>(
&mut self,
scripts: I,
) -> Result<Vec<Vec<ELSListUnspentRes>>, Error> {
self.batch_script_list_unspent(scripts)
- .await
.map(|v| {
v.into_iter()
.map(|v| {
.map_err(Error::Electrum)
}
- async fn els_transaction_get(&mut self, txid: &Txid) -> Result<Transaction, Error> {
- self.transaction_get(txid).await.map_err(Error::Electrum)
+ fn els_transaction_get(&mut self, txid: &Txid) -> Result<Transaction, Error> {
+ self.transaction_get(txid).map_err(Error::Electrum)
}
}
use std::collections::HashSet;
+use std::sync::Mutex;
use futures::stream::{self, StreamExt, TryStreamExt};
+use tokio::runtime::Runtime;
+
#[allow(unused_imports)]
use log::{debug, error, info, trace};
use serde::Deserialize;
-use reqwest::Client;
-use reqwest::StatusCode;
+use reqwest::{Client, StatusCode};
use bitcoin::consensus::{deserialize, serialize};
use bitcoin::hashes::hex::ToHex;
#[derive(Debug)]
pub struct UrlClient {
url: String,
+ // We use the async client instead of the blocking one because it automatically uses `fetch`
+ // when the target platform is wasm32. For some reason the blocking client doesn't, so we are
+ // stuck with this
client: Client,
+
+ runtime: Mutex<Runtime>,
}
#[derive(Debug)]
EsploraBlockchain(Some(UrlClient {
url: base_url.to_string(),
client: Client::new(),
+
+ runtime: Mutex::new(Runtime::new().unwrap()),
}))
}
}
}
}
-#[async_trait(?Send)]
impl OnlineBlockchain for EsploraBlockchain {
- async fn get_capabilities(&self) -> HashSet<Capability> {
+ fn get_capabilities(&self) -> HashSet<Capability> {
vec![Capability::FullHistory, Capability::GetAnyTx]
.into_iter()
.collect()
}
- async fn setup<D: BatchDatabase + DatabaseUtils, P: Progress>(
+ fn setup<D: BatchDatabase + DatabaseUtils, P: Progress>(
&mut self,
stop_gap: Option<usize>,
database: &mut D,
.as_mut()
.ok_or(Error::OfflineClient)?
.electrum_like_setup(stop_gap, database, progress_update)
- .await
}
- async fn get_tx(&mut self, txid: &Txid) -> Result<Option<Transaction>, Error> {
- Ok(self
- .0
- .as_mut()
- .ok_or(Error::OfflineClient)?
- ._get_tx(txid)
- .await?)
+ fn get_tx(&mut self, txid: &Txid) -> Result<Option<Transaction>, Error> {
+ Ok(self.0.as_mut().ok_or(Error::OfflineClient)?._get_tx(txid)?)
}
- async fn broadcast(&mut self, tx: &Transaction) -> Result<(), Error> {
+ fn broadcast(&mut self, tx: &Transaction) -> Result<(), Error> {
Ok(self
.0
.as_mut()
.ok_or(Error::OfflineClient)?
- ._broadcast(tx)
- .await?)
+ ._broadcast(tx)?)
}
- async fn get_height(&mut self) -> Result<usize, Error> {
- Ok(self
- .0
- .as_mut()
- .ok_or(Error::OfflineClient)?
- ._get_height()
- .await?)
+ fn get_height(&mut self) -> Result<usize, Error> {
+ Ok(self.0.as_mut().ok_or(Error::OfflineClient)?._get_height()?)
}
}
sha256::Hash::hash(script.as_bytes()).into_inner().to_hex()
}
- async fn _get_tx(&self, txid: &Txid) -> Result<Option<Transaction>, EsploraError> {
- let resp = self
- .client
- .get(&format!("{}/api/tx/{}/raw", self.url, txid))
- .send()
- .await?;
+ fn _get_tx(&self, txid: &Txid) -> Result<Option<Transaction>, EsploraError> {
+ let resp = self.runtime.lock().unwrap().block_on(
+ self.client
+ .get(&format!("{}/api/tx/{}/raw", self.url, txid))
+ .send(),
+ )?;
if let StatusCode::NOT_FOUND = resp.status() {
return Ok(None);
}
- Ok(Some(deserialize(&resp.error_for_status()?.bytes().await?)?))
+ Ok(Some(deserialize(
+ &self
+ .runtime
+ .lock()
+ .unwrap()
+ .block_on(resp.error_for_status()?.bytes())?,
+ )?))
}
- async fn _broadcast(&self, transaction: &Transaction) -> Result<(), EsploraError> {
- self.client
- .post(&format!("{}/api/tx", self.url))
- .body(serialize(transaction).to_hex())
- .send()
- .await?
+ fn _broadcast(&self, transaction: &Transaction) -> Result<(), EsploraError> {
+ self.runtime
+ .lock()
+ .unwrap()
+ .block_on(
+ self.client
+ .post(&format!("{}/api/tx", self.url))
+ .body(serialize(transaction).to_hex())
+ .send(),
+ )?
.error_for_status()?;
Ok(())
}
- async fn _get_height(&self) -> Result<usize, EsploraError> {
+ fn _get_height(&self) -> Result<usize, EsploraError> {
+ let req = self.runtime.lock().unwrap().block_on(
+ self.client
+ .get(&format!("{}/api/blocks/tip/height", self.url))
+ .send(),
+ )?;
+
Ok(self
- .client
- .get(&format!("{}/api/blocks/tip/height", self.url))
- .send()
- .await?
- .error_for_status()?
- .text()
- .await?
+ .runtime
+ .lock()
+ .unwrap()
+ .block_on(req.error_for_status()?.text())?
.parse()?)
}
}
}
-#[async_trait(?Send)]
impl ElectrumLikeSync for UrlClient {
- async fn els_batch_script_get_history<'s, I: IntoIterator<Item = &'s Script>>(
+ fn els_batch_script_get_history<'s, I: IntoIterator<Item = &'s Script>>(
&mut self,
scripts: I,
) -> Result<Vec<Vec<ELSGetHistoryRes>>, Error> {
- Ok(stream::iter(scripts)
- .then(|script| self._script_get_history(&script))
- .try_collect()
- .await?)
+ self.runtime.lock().unwrap().block_on(async {
+ Ok(stream::iter(scripts)
+ .then(|script| self._script_get_history(&script))
+ .try_collect()
+ .await?)
+ })
}
- async fn els_batch_script_list_unspent<'s, I: IntoIterator<Item = &'s Script>>(
+ fn els_batch_script_list_unspent<'s, I: IntoIterator<Item = &'s Script>>(
&mut self,
scripts: I,
) -> Result<Vec<Vec<ELSListUnspentRes>>, Error> {
- Ok(stream::iter(scripts)
- .then(|script| self._script_list_unspent(&script))
- .try_collect()
- .await?)
+ self.runtime.lock().unwrap().block_on(async {
+ Ok(stream::iter(scripts)
+ .then(|script| self._script_list_unspent(&script))
+ .try_collect()
+ .await?)
+ })
}
- async fn els_transaction_get(&mut self, txid: &Txid) -> Result<Transaction, Error> {
+ fn els_transaction_get(&mut self, txid: &Txid) -> Result<Transaction, Error> {
Ok(self
- ._get_tx(txid)
- .await?
+ ._get_tx(txid)?
.ok_or_else(|| EsploraError::TransactionNotFound(*txid))?)
}
}
}
}
-#[async_trait(?Send)]
pub trait OnlineBlockchain: Blockchain {
- async fn get_capabilities(&self) -> HashSet<Capability>;
+ fn get_capabilities(&self) -> HashSet<Capability>;
- async fn setup<D: BatchDatabase + DatabaseUtils, P: Progress>(
+ fn setup<D: BatchDatabase + DatabaseUtils, P: Progress>(
&mut self,
stop_gap: Option<usize>,
database: &mut D,
progress_update: P,
) -> Result<(), Error>;
- async fn sync<D: BatchDatabase + DatabaseUtils, P: Progress>(
+ fn sync<D: BatchDatabase + DatabaseUtils, P: Progress>(
&mut self,
stop_gap: Option<usize>,
database: &mut D,
progress_update: P,
) -> Result<(), Error> {
- self.setup(stop_gap, database, progress_update).await
+ self.setup(stop_gap, database, progress_update)
}
- async fn get_tx(&mut self, txid: &Txid) -> Result<Option<Transaction>, Error>;
- async fn broadcast(&mut self, tx: &Transaction) -> Result<(), Error>;
+ fn get_tx(&mut self, txid: &Txid) -> Result<Option<Transaction>, Error>;
+ fn broadcast(&mut self, tx: &Transaction) -> Result<(), Error>;
- async fn get_height(&mut self) -> Result<usize, Error>;
+ fn get_height(&mut self) -> Result<usize, Error>;
}
pub type ProgressData = (f32, Option<String>);
}
/// Implements the synchronization logic for an Electrum-like client.
-#[async_trait(?Send)]
pub trait ElectrumLikeSync {
- async fn els_batch_script_get_history<'s, I: IntoIterator<Item = &'s Script>>(
+ fn els_batch_script_get_history<'s, I: IntoIterator<Item = &'s Script>>(
&mut self,
scripts: I,
) -> Result<Vec<Vec<ELSGetHistoryRes>>, Error>;
- async fn els_batch_script_list_unspent<'s, I: IntoIterator<Item = &'s Script>>(
+ fn els_batch_script_list_unspent<'s, I: IntoIterator<Item = &'s Script>>(
&mut self,
scripts: I,
) -> Result<Vec<Vec<ELSListUnspentRes>>, Error>;
- async fn els_transaction_get(&mut self, txid: &Txid) -> Result<Transaction, Error>;
+ fn els_transaction_get(&mut self, txid: &Txid) -> Result<Transaction, Error>;
// Provided methods down here...
- async fn electrum_like_setup<D: BatchDatabase + DatabaseUtils, P: Progress>(
+ fn electrum_like_setup<D: BatchDatabase + DatabaseUtils, P: Progress>(
&mut self,
stop_gap: Option<usize>,
database: &mut D,
let until = cmp::min(to_check_later.len(), batch_query_size);
let chunk: Vec<Script> = to_check_later.drain(..until).collect();
- let call_result = self.els_batch_script_get_history(chunk.iter()).await?;
+ let call_result = self.els_batch_script_get_history(chunk.iter())?;
for (script, history) in chunk.into_iter().zip(call_result.into_iter()) {
trace!("received history for {:?}, size {}", script, history.len());
last_found = index;
let mut check_later_scripts = self
- .check_history(database, script, history, &mut change_max_deriv)
- .await?
+ .check_history(database, script, history, &mut change_max_deriv)?
.into_iter()
.filter(|x| already_checked.insert(x.clone()))
.collect();
let mut batch = database.begin_batch();
for chunk in ChunksIterator::new(database.iter_utxos()?.into_iter(), batch_query_size) {
let scripts: Vec<_> = chunk.iter().map(|u| &u.txout.script_pubkey).collect();
- let call_result = self.els_batch_script_list_unspent(scripts).await?;
+ let call_result = self.els_batch_script_list_unspent(scripts)?;
// check which utxos are actually still unspent
for (utxo, list_unspent) in chunk.into_iter().zip(call_result.iter()) {
Ok(())
}
- async fn check_tx_and_descendant<D: DatabaseUtils + BatchDatabase>(
+ fn check_tx_and_descendant<D: DatabaseUtils + BatchDatabase>(
&mut self,
database: &mut D,
txid: &Txid,
// went wrong
saved_tx.transaction.unwrap()
}
- None => self.els_transaction_get(&txid).await?,
+ None => self.els_transaction_get(&txid)?,
};
let mut incoming: u64 = 0;
Ok(to_check_later)
}
- async fn check_history<D: DatabaseUtils + BatchDatabase>(
+ fn check_history<D: DatabaseUtils + BatchDatabase>(
&mut self,
database: &mut D,
script_pubkey: Script,
x => u32::try_from(x).ok(),
};
- to_check_later.extend_from_slice(
- &self
- .check_tx_and_descendant(
- database,
- &tx.tx_hash,
- height,
- &script_pubkey,
- change_max_deriv,
- )
- .await?,
- );
+ to_check_later.extend_from_slice(&self.check_tx_and_descendant(
+ database,
+ &tx.tx_hash,
+ height,
+ &script_pubkey,
+ change_max_deriv,
+ )?);
}
Ok(to_check_later)
.takes_value(true)
.default_value("tn.not.fyi:55001"),
)
+ .arg(
+ Arg::with_name("proxy")
+ .short("p")
+ .long("proxy")
+ .value_name("SERVER:PORT")
+ .help("Sets the SOCKS5 proxy for the Electrum client")
+ .takes_value(true),
+ )
.arg(
Arg::with_name("descriptor")
.short("d")
.subcommand(SubCommand::with_name("repl").about("Opens an interactive shell"))
}
-pub async fn handle_matches<C, D>(
+pub fn handle_matches<C, D>(
wallet: &Wallet<C, D>,
matches: ArgMatches<'_>,
) -> Result<Option<String>, Error>
if let Some(_sub_matches) = matches.subcommand_matches("get_new_address") {
Ok(Some(format!("{}", wallet.get_new_address()?)))
} else if let Some(_sub_matches) = matches.subcommand_matches("sync") {
- wallet.sync(None, None).await?;
+ wallet.sync(None, None)?;
Ok(None)
} else if let Some(_sub_matches) = matches.subcommand_matches("list_unspent") {
let mut res = String::new();
panic!("Missing `psbt` and `tx` option");
};
- let txid = wallet.broadcast(tx).await?;
+ let txid = wallet.broadcast(tx)?;
Ok(Some(format!("TXID: {}", txid)))
} else if let Some(sub_matches) = matches.subcommand_matches("extract_psbt") {
#[macro_use]
extern crate lazy_static;
-#[macro_use]
-extern crate async_trait;
-
#[cfg(feature = "electrum")]
pub extern crate electrum_client;
#[cfg(feature = "electrum")]
B: OnlineBlockchain,
D: BatchDatabase,
{
- pub async fn new(
+ pub fn new(
descriptor: &str,
change_descriptor: Option<&str>,
network: Network,
None => None,
};
- let current_height = Some(client.get_height().await? as u32);
+ let current_height = Some(client.get_height()? as u32);
Ok(Wallet {
descriptor,
})
}
- pub async fn sync(
+ pub fn sync(
&self,
max_address: Option<u32>,
_batch_query_size: Option<usize>,
self.database.borrow_mut().commit_batch(address_batch)?;
}
- self.client
- .borrow_mut()
- .sync(
- None,
- self.database.borrow_mut().deref_mut(),
- noop_progress(),
- )
- .await
+ self.client.borrow_mut().sync(
+ None,
+ self.database.borrow_mut().deref_mut(),
+ noop_progress(),
+ )
}
- pub async fn broadcast(&self, tx: Transaction) -> Result<Txid, Error> {
- self.client.borrow_mut().broadcast(&tx).await?;
+ pub fn broadcast(&self, tx: Transaction) -> Result<Txid, Error> {
+ self.client.borrow_mut().broadcast(&tx)?;
Ok(tx.txid())
}
projects / bdk / commitdiff