Merge remote-tracking branch 'origin/main' into feature/cdk-common

CHANGELOG.md

@@ -35,6 +35,10 @@
 
 ### Removed
 
+#[0.6.1]
+### Added
+cdk-mintd: Get work-dir from env var ([thesimplekid])
+
 #[0.6.0]
 
 ### Changed

README.md

@@ -65,6 +65,7 @@ For a guide to settings up a development environment see [DEVELOPMENT.md](./DEVE
 | [17][17] | WebSocket subscriptions  | :heavy_check_mark: |
 | [18][18] | Payment Requests  | :heavy_check_mark: |
 | [19][19] | Cached responses  | :heavy_check_mark: |
+| [20][20] | Signature on Mint Quote  | :heavy_check_mark: |
 
 
 ## Bindings
@@ -104,3 +105,4 @@ Please see the [development guide](DEVELOPMENT.md).
 [17]: https://github.com/cashubtc/nuts/blob/main/17.md
 [18]: https://github.com/cashubtc/nuts/blob/main/18.md
 [19]: https://github.com/cashubtc/nuts/blob/main/19.md
+[20]: https://github.com/cashubtc/nuts/blob/main/20.md

crates/cdk-mintd/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cdk-mintd"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 authors = ["CDK Developers"]
 license = "MIT"

crates/cdk-mintd/src/env_vars.rs

@@ -10,6 +10,8 @@ use crate::config::{
     Phoenixd, Settings, Strike,
 };
 
+pub const ENV_WORK_DIR: &str = "CDK_MINTD_WORK_DIR";
+
 pub const DATABASE_ENV_VAR: &str = "CDK_MINTD_DATABASE";
 pub const ENV_URL: &str = "CDK_MINTD_URL";
 pub const ENV_LISTEN_HOST: &str = "CDK_MINTD_LISTEN_HOST";

crates/cdk-mintd/src/main.rs

@@ -4,6 +4,7 @@
 #![warn(rustdoc::bare_urls)]
 
 use std::collections::HashMap;
+use std::env;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
@@ -25,6 +26,7 @@ use cdk::types::LnKey;
 use cdk_axum::cache::HttpCache;
 use cdk_mintd::cli::CLIArgs;
 use cdk_mintd::config::{self, DatabaseEngine, LnBackend};
+use cdk_mintd::env_vars::ENV_WORK_DIR;
 use cdk_mintd::setup::LnBackendSetup;
 use cdk_redb::MintRedbDatabase;
 use cdk_sqlite::MintSqliteDatabase;
@@ -54,19 +56,24 @@ async fn main() -> anyhow::Result<()> {
 
     let args = CLIArgs::parse();
 
-    let work_dir = match args.work_dir {
-        Some(w) => w,
-        None => work_dir()?,
+    let work_dir = if let Some(work_dir) = args.work_dir {
+        tracing::info!("Using work dir from cmd arg");
+        work_dir
+    } else if let Ok(env_work_dir) = env::var(ENV_WORK_DIR) {
+        tracing::info!("Using work dir from env var");
+        env_work_dir.into()
+    } else {
+        work_dir()?
     };
 
+    tracing::info!("Using work dir: {}", work_dir.display());
+
     // get config file name from args
     let config_file_arg = match args.config {
         Some(c) => c,
         None => work_dir.join("config.toml"),
     };
 
-    tracing::info!("Using work dir: {}", work_dir.display());
-
     let mut mint_builder = MintBuilder::new();
 
     let mut settings = if config_file_arg.exists() {