diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index b8e1b31..bef4e04 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" anyhow = "1" async-trait = "0.1.51" atty = "0.2" -bdk = { version = "0.14", default-features = false, features = ["sqlite", "electrum"] } +bdk = { version = "0.14", default-features = false, features = ["electrum"] } bytes = "1" chrono = { version = "0.4", features = ["serde"] } clap = "3.0.0-beta.5" diff --git a/daemon/src/maker.rs b/daemon/src/maker.rs index 40bf22f..086b3dc 100644 --- a/daemon/src/maker.rs +++ b/daemon/src/maker.rs @@ -159,11 +159,7 @@ async fn main() -> Result<()> { let mut tasks = Tasks::default(); - let (wallet, wallet_feed_receiver) = wallet::Actor::new( - opts.network.electrum(), - &data_dir.join("maker_wallet.sqlite"), - ext_priv_key, - )?; + let (wallet, wallet_feed_receiver) = wallet::Actor::new(opts.network.electrum(), ext_priv_key)?; let (wallet, wallet_fut) = wallet.create(None).run(); tasks.add(wallet_fut); diff --git a/daemon/src/taker.rs b/daemon/src/taker.rs index 635de2d..467d376 100644 --- a/daemon/src/taker.rs +++ b/daemon/src/taker.rs @@ -170,11 +170,7 @@ async fn main() -> Result<()> { let mut tasks = Tasks::default(); - let (wallet, wallet_feed_receiver) = wallet::Actor::new( - opts.network.electrum(), - &data_dir.join("taker_wallet.sqlite"), - ext_priv_key, - )?; + let (wallet, wallet_feed_receiver) = wallet::Actor::new(opts.network.electrum(), ext_priv_key)?; let (wallet, wallet_fut) = wallet.create(None).run(); tasks.add(wallet_fut); diff --git a/daemon/src/wallet.rs b/daemon/src/wallet.rs index dbd1ea0..13ad71c 100644 --- a/daemon/src/wallet.rs +++ b/daemon/src/wallet.rs @@ -14,7 +14,6 @@ use bdk::{electrum_client, FeeRate, KeychainKind, SignOptions}; use maia::{PartyParams, TxBuilderExt}; use rocket::serde::json::Value; use std::collections::HashSet; -use std::path::Path; use std::time::Duration; use tokio::sync::watch; use xtra_productivity::xtra_productivity; @@ -22,7 +21,7 @@ use xtra_productivity::xtra_productivity; const DUST_AMOUNT: u64 = 546; pub struct Actor { - wallet: bdk::Wallet, + wallet: bdk::Wallet, used_utxos: HashSet, tasks: Tasks, sender: watch::Sender>, @@ -35,13 +34,12 @@ pub struct TransactionAlreadyInBlockchain; impl Actor { pub fn new( electrum_rpc_url: &str, - wallet_dir: &Path, ext_priv_key: ExtendedPrivKey, ) -> Result<(Self, watch::Receiver>)> { let client = bdk::electrum_client::Client::new(electrum_rpc_url) .context("Failed to initialize Electrum RPC client")?; - let db = bdk::database::SqliteDatabase::new(wallet_dir.display().to_string()); + let db = bdk::database::MemoryDatabase::new(); let wallet = bdk::Wallet::new( bdk::template::Bip84(ext_priv_key, KeychainKind::External),