Merge pull request #472 from sander2/fix/save-rescanning-progress

fix: save rescanning progress
interlay · Jun 5, 2023 · d8826bb · d8826bb
2 parents e6b5f20 + c8538f1
commit d8826bb
Show file tree

Hide file tree

Showing 8 changed files with 425 additions and 51 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/service/src/lib.rs b/service/src/lib.rs
@@ -33,6 +33,7 @@ pub trait Service<Config, InnerError> {
         monitoring_config: MonitoringConfig,
         shutdown: ShutdownSender,
         constructor: Box<dyn Fn(VaultId) -> Result<DynBitcoinCoreApi, BitcoinError> + Send + Sync>,
+        keyname: String,
     ) -> Self;
     async fn start(&self) -> Result<(), Error<InnerError>>;
 }
@@ -46,6 +47,7 @@ pub struct ConnectionManager<Config: Clone, F: Fn()> {
     monitoring_config: MonitoringConfig,
     config: Config,
     increment_restart_counter: F,
+    db_path: String,
 }
 
 impl<Config: Clone + Send + 'static, F: Fn()> ConnectionManager<Config, F> {
@@ -59,6 +61,7 @@ impl<Config: Clone + Send + 'static, F: Fn()> ConnectionManager<Config, F> {
         monitoring_config: MonitoringConfig,
         config: Config,
         increment_restart_counter: F,
+        db_path: String,
     ) -> Self {
         Self {
             signer,
@@ -69,6 +72,7 @@ impl<Config: Clone + Send + 'static, F: Fn()> ConnectionManager<Config, F> {
             monitoring_config,
             config,
             increment_restart_counter,
+            db_path,
         }
     }
 
@@ -122,6 +126,7 @@ impl<Config: Clone + Send + 'static, F: Fn()> ConnectionManager<Config, F> {
                 self.monitoring_config.clone(),
                 shutdown_tx.clone(),
                 Box::new(constructor),
+                self.db_path.clone(),
             );
             match service.start().await {
                 Err(err @ Error::Abort(_)) => {

diff --git a/vault/Cargo.toml b/vault/Cargo.toml
@@ -35,6 +35,8 @@ lazy_static = "1.4"
 governor = "0.5.0"
 nonzero_ext = "0.3.0"
 
+rocksdb = { version = "0.19.0", features = ["snappy"], default-features = false }
+
 tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.2.12", features = ["registry", "env-filter", "fmt"] }
 tracing-futures = { version = "0.2.5" }

diff --git a/vault/src/error.rs b/vault/src/error.rs
@@ -1,7 +1,11 @@
+use std::string::FromUtf8Error;
+
 use bitcoin::Error as BitcoinError;
 use jsonrpc_core_client::RpcError;
 use parity_scale_codec::Error as CodecError;
+use rocksdb::Error as RocksDbError;
 use runtime::Error as RuntimeError;
+use serde_json::Error as SerdeJsonError;
 use thiserror::Error;
 use tokio_stream::wrappers::errors::BroadcastStreamRecvError;
 
@@ -32,6 +36,12 @@ pub enum Error {
     RuntimeError(#[from] RuntimeError),
     #[error("CodecError: {0}")]
     CodecError(#[from] CodecError),
+    #[error("DatabaseError: {0}")]
+    DatabaseError(#[from] RocksDbError),
+    #[error("SerdeJsonError: {0}")]
+    SerdeJsonError(#[from] SerdeJsonError),
+    #[error("FromUtf8Error: {0}")]
+    FromUtf8Error(#[from] FromUtf8Error),
     #[error("BroadcastStreamRecvError: {0}")]
     BroadcastStreamRecvError(#[from] BroadcastStreamRecvError),
 }