Add WalletDb to CashierService

src/bin/cashierd.rs

@@ -9,6 +9,7 @@ use toml;
 
 use drk::blockchain::{rocks::columns, Rocks, RocksColumn};
 use drk::cli::{CashierdCli, CashierdConfig};
+use drk::wallet::{WalletDb, WalletPtr};
 use drk::service::CashierService;
 
 use drk::util::join_config_path;
@@ -36,8 +37,9 @@ async fn start(executor: Arc<Executor<'_>>, config: Arc<&CashierdConfig>) -> Res
     let rocks_cashierstore_column = RocksColumn::<columns::CashierKeys>::new(rocks);
     // Use pw: PASSWORD for now
     //let cashier_wallet = Arc::new(WalletDB::new("cashier.db", "PASSWORD")?);
+    let wallet = Arc::new(WalletDb::new("cashier.db", config.password.clone())?);
 
-    let cashier = CashierService::new(accept_addr, rocks_cashierstore_column)?;
+    let cashier = CashierService::new(accept_addr, rocks_cashierstore_column, wallet)?;
 
     cashier.start(executor.clone()).await?;
     Ok(())

src/cli/cli_config.rs

@@ -174,6 +174,10 @@ pub struct CashierdConfig {
     #[serde(default)]
     #[serde(rename = "log_path")]
     pub log_path: String,
+
+    #[serde(default)]
+    #[serde(rename = "password")]
+    pub password: String,
 }
 
 impl CashierdConfig {
@@ -197,6 +201,7 @@ impl Default for CashierdConfig {
         let accept_url = String::from("127.0.0.1:7777");
         let database_path = String::from("cashierd.db");
         let log_path = String::from("/tmp/cashierd.log");
-        Self { accept_url, database_path, log_path }
+        let password = String::new();
+        Self { accept_url, database_path, log_path, password }
     }
 }

src/service/bitcoin_bridge.rs

@@ -9,6 +9,7 @@ use bitcoin::network::constants::Network;
 use super::reqrep::{PeerId, RepProtocol, Reply, ReqProtocol, Request};
 use crate::blockchain::{rocks::columns, RocksColumn, CashierKeypair, CashierStore};
 use crate::{serial::deserialize, serial::serialize, Error, Result};
+use crate::wallet::{WalletDb, WalletPtr};
 use std::net::SocketAddr;
 use async_std::sync::Arc;
 use async_executor::Executor;
@@ -77,18 +78,21 @@ impl BitcoinKeys {
 pub struct CashierService {
     addr: SocketAddr,
     cashierstore: Arc<CashierStore>,
+    wallet: Arc<WalletDb>,
 }
 
 impl CashierService {
     pub fn new(
         addr: SocketAddr,
         rocks: RocksColumn<columns::CashierKeys>,
+        wallet: Arc<WalletDb>,
     )-> Result<Arc<CashierService>> {
         let cashierstore = CashierStore::new(rocks)?;
 
         Ok(Arc::new(CashierService {
             cashierstore,
             addr,
+            wallet,
         }))
     }
     pub async fn start(self: Arc<Self>, executor: Arc<Executor<'_>>) -> Result<()> {