Merge pull request cashubtc#626 from thesimplekid/remove_phd

Remove phd

Author: thesimplekid

.github/workflows/ci.yml

@@ -101,7 +101,6 @@ jobs:
             -p cdk-axum,
             -p cdk-cln,
             -p cdk-lnd,
-            -p cdk-phoenixd,
             -p cdk-lnbits,
             -p cdk-fake-wallet,
             --bin cdk-cli,
@@ -217,7 +216,6 @@ jobs:
             -p cdk-axum,
             -p cdk-axum --no-default-features --features redis,
             -p cdk-lnbits,
-            -p cdk-phoenixd,
             -p cdk-fake-wallet,
             -p cdk-cln,
             -p cdk-lnd,

Cargo.toml

@@ -24,7 +24,6 @@ cdk-axum = { path = "./crates/cdk-axum", default-features = false, version = "=0
 cdk-cln = { path = "./crates/cdk-cln", version = "=0.7.1" }
 cdk-lnbits = { path = "./crates/cdk-lnbits", version = "=0.7.1" }
 cdk-lnd = { path = "./crates/cdk-lnd", version = "=0.7.1" }
-cdk-phoenixd = { path = "./crates/cdk-phoenixd", version = "=0.7.1" }
 cdk-fake-wallet = { path = "./crates/cdk-fake-wallet", version = "=0.7.1" }
 cdk-mint-rpc = { path = "./crates/cdk-mint-rpc", version = "=0.7.1" }
 cdk-redb = { path = "./crates/cdk-redb", default-features = true, version = "=0.7.1" }

README.md

@@ -23,7 +23,6 @@ The project is split up into several crates in the `crates/` directory:
     * [**cdk-cln**](./crates/cdk-cln/): CLN Lightning backend for mint.
     * [**cdk-lnd**](./crates/cdk-lnd/): Lnd Lightning backend for mint.
     * [**cdk-lnbits**](./crates/cdk-lnbits/): [LNbits](https://lnbits.com/) Lightning backend for mint.
-    * [**cdk-phoenixd**](./crates/cdk-phoenixd/): Phoenixd Lightning backend for mint.
     * [**cdk-fake-wallet**](./crates/cdk-fake-wallet/): Fake Lightning backend for mint. To be used only for testing, quotes are automatically filled.
     * [**cdk-mint-rpc**](./crates/cdk-mint-rpc/): Mint management gRPC server and cli.
 * Binaries:

crates/cdk-mintd/Cargo.toml

@@ -32,7 +32,6 @@ cdk-sqlite = { workspace = true, features = [
 ] }
 cdk-cln.workspace = true
 cdk-lnbits.workspace = true
-cdk-phoenixd.workspace = true
 cdk-lnd.workspace = true
 cdk-fake-wallet.workspace = true
 cdk-axum.workspace = true

crates/cdk-mintd/src/config.rs

@@ -49,7 +49,6 @@ pub enum LnBackend {
     Cln,
     LNbits,
     FakeWallet,
-    Phoenixd,
     Lnd,
 }
 
@@ -61,7 +60,6 @@ impl std::str::FromStr for LnBackend {
             "cln" => Ok(LnBackend::Cln),
             "lnbits" => Ok(LnBackend::LNbits),
             "fakewallet" => Ok(LnBackend::FakeWallet),
-            "phoenixd" => Ok(LnBackend::Phoenixd),
             "lnd" => Ok(LnBackend::Lnd),
             _ => Err(format!("Unknown Lightning backend: {}", s)),
         }
@@ -118,15 +116,6 @@ pub struct Lnd {
     pub reserve_fee_min: Amount,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
-pub struct Phoenixd {
-    pub api_password: String,
-    pub api_url: String,
-    pub bolt12: bool,
-    pub fee_percent: f32,
-    pub reserve_fee_min: Amount,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct FakeWallet {
     pub supported_units: Vec<CurrencyUnit>,
@@ -194,7 +183,6 @@ pub struct Settings {
     pub ln: Ln,
     pub cln: Option<Cln>,
     pub lnbits: Option<LNbits>,
-    pub phoenixd: Option<Phoenixd>,
     pub lnd: Option<Lnd>,
     pub fake_wallet: Option<FakeWallet>,
     pub database: Database,
@@ -288,10 +276,6 @@ impl Settings {
                 settings.lnbits.is_some(),
                 "LNbits backend requires a valid config"
             ),
-            LnBackend::Phoenixd => assert!(
-                settings.phoenixd.is_some(),
-                "Phoenixd backend requires a valid config"
-            ),
             LnBackend::Lnd => {
                 assert!(
                     settings.lnd.is_some(),

crates/cdk-mintd/src/env_vars.rs

@@ -8,8 +8,7 @@ use cdk::nuts::CurrencyUnit;
 #[cfg(feature = "management-rpc")]
 use crate::config::MintManagementRpc;
 use crate::config::{
-    Cln, Database, DatabaseEngine, FakeWallet, Info, LNbits, Ln, LnBackend, Lnd, MintInfo,
-    Phoenixd, Settings,
+    Cln, Database, DatabaseEngine, FakeWallet, Info, LNbits, Ln, LnBackend, Lnd, MintInfo, Settings,
 };
 
 pub const ENV_WORK_DIR: &str = "CDK_MINTD_WORK_DIR";
@@ -51,12 +50,6 @@ pub const ENV_LND_CERT_FILE: &str = "CDK_MINTD_LND_CERT_FILE";
 pub const ENV_LND_MACAROON_FILE: &str = "CDK_MINTD_LND_MACAROON_FILE";
 pub const ENV_LND_FEE_PERCENT: &str = "CDK_MINTD_LND_FEE_PERCENT";
 pub const ENV_LND_RESERVE_FEE_MIN: &str = "CDK_MINTD_LND_RESERVE_FEE_MIN";
-// Phoenixd environment variables
-pub const ENV_PHOENIXD_API_PASSWORD: &str = "CDK_MINTD_PHOENIXD_API_PASSWORD";
-pub const ENV_PHOENIXD_API_URL: &str = "CDK_MINTD_PHOENIXD_API_URL";
-pub const ENV_PHOENIXD_BOLT12: &str = "CDK_MINTD_PHOENIXD_BOLT12";
-pub const ENV_PHOENIXD_FEE_PERCENT: &str = "CDK_MINTD_PHOENIXD_FEE_PERCENT";
-pub const ENV_PHOENIXD_RESERVE_FEE_MIN: &str = "CDK_MINTD_PHOENIXD_RESERVE_FEE_MIN";
 // LNBits
 pub const ENV_LNBITS_ADMIN_API_KEY: &str = "CDK_MINTD_LNBITS_ADMIN_API_KEY";
 pub const ENV_LNBITS_INVOICE_API_KEY: &str = "CDK_MINTD_LNBITS_INVOICE_API_KEY";
@@ -110,9 +103,6 @@ impl Settings {
             LnBackend::FakeWallet => {
                 self.fake_wallet = Some(self.fake_wallet.clone().unwrap_or_default().from_env());
             }
-            LnBackend::Phoenixd => {
-                self.phoenixd = Some(self.phoenixd.clone().unwrap_or_default().from_env());
-            }
             LnBackend::Lnd => {
                 self.lnd = Some(self.lnd.clone().unwrap_or_default().from_env());
             }
@@ -322,38 +312,6 @@ impl Lnd {
     }
 }
 
-impl Phoenixd {
-    pub fn from_env(mut self) -> Self {
-        if let Ok(password) = env::var(ENV_PHOENIXD_API_PASSWORD) {
-            self.api_password = password;
-        }
-
-        if let Ok(url) = env::var(ENV_PHOENIXD_API_URL) {
-            self.api_url = url;
-        }
-
-        if let Ok(bolt12_str) = env::var(ENV_PHOENIXD_BOLT12) {
-            if let Ok(bolt12) = bolt12_str.parse() {
-                self.bolt12 = bolt12;
-            }
-        }
-
-        if let Ok(fee_str) = env::var(ENV_PHOENIXD_FEE_PERCENT) {
-            if let Ok(fee) = fee_str.parse() {
-                self.fee_percent = fee;
-            }
-        }
-
-        if let Ok(reserve_fee_str) = env::var(ENV_PHOENIXD_RESERVE_FEE_MIN) {
-            if let Ok(reserve_fee) = reserve_fee_str.parse::<u64>() {
-                self.reserve_fee_min = reserve_fee.into();
-            }
-        }
-
-        self
-    }
-}
-
 impl LNbits {
     pub fn from_env(mut self) -> Self {
         if let Ok(admin_key) = env::var(ENV_LNBITS_ADMIN_API_KEY) {

crates/cdk-mintd/src/main.rs

@@ -199,23 +199,6 @@ async fn main() -> anyhow::Result<()> {
 
             mint_builder = mint_builder.add_supported_websockets(nut17_supported);
         }
-        LnBackend::Phoenixd => {
-            let phd_settings = settings.clone().phoenixd.expect("Checked at config load");
-            let phd = phd_settings
-                .setup(&mut ln_routers, &settings, CurrencyUnit::Sat)
-                .await?;
-
-            mint_builder = mint_builder.add_ln_backend(
-                CurrencyUnit::Sat,
-                PaymentMethod::Bolt11,
-                mint_melt_limits,
-                Arc::new(phd),
-            );
-
-            let nut17_supported = SupportedMethods::new(PaymentMethod::Bolt11, CurrencyUnit::Sat);
-
-            mint_builder = mint_builder.add_supported_websockets(nut17_supported);
-        }
         LnBackend::Lnd => {
             let lnd_settings = settings.clone().lnd.expect("Checked at config load");
             let lnd = lnd_settings

crates/cdk-mintd/src/setup.rs

@@ -1,7 +1,7 @@
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
-use anyhow::{anyhow, bail};
+use anyhow::anyhow;
 use async_trait::async_trait;
 use axum::Router;
 use bip39::rand::{thread_rng, Rng};
@@ -10,7 +10,6 @@ use cdk::mint::FeeReserve;
 use cdk::mint_url::MintUrl;
 use cdk::nuts::CurrencyUnit;
 use tokio::sync::Mutex;
-use url::Url;
 
 use crate::config::{self, Settings};
 use crate::expand_path;
@@ -94,53 +93,6 @@ impl LnBackendSetup for config::LNbits {
     }
 }
 
-#[async_trait]
-impl LnBackendSetup for config::Phoenixd {
-    async fn setup(
-        &self,
-        routers: &mut Vec<Router>,
-        settings: &Settings,
-        _unit: CurrencyUnit,
-    ) -> anyhow::Result<cdk_phoenixd::Phoenixd> {
-        let api_password = &self.api_password;
-
-        let api_url = &self.api_url;
-
-        let fee_reserve = FeeReserve {
-            min_fee_reserve: self.reserve_fee_min,
-            percent_fee_reserve: self.fee_percent,
-        };
-
-        if fee_reserve.percent_fee_reserve < 0.04 {
-            bail!("Fee reserve is too low needs to be at least 0.02");
-        }
-
-        let webhook_endpoint = "/webhook/phoenixd";
-
-        let mint_url = Url::parse(&settings.info.url)?;
-
-        let webhook_url = mint_url.join(webhook_endpoint)?.to_string();
-
-        let (sender, receiver) = tokio::sync::mpsc::channel(8);
-
-        let phoenixd = cdk_phoenixd::Phoenixd::new(
-            api_password.to_string(),
-            api_url.to_string(),
-            fee_reserve,
-            Arc::new(Mutex::new(Some(receiver))),
-            webhook_url,
-        )?;
-
-        let router = phoenixd
-            .create_invoice_webhook(webhook_endpoint, sender)
-            .await?;
-
-        routers.push(router);
-
-        Ok(phoenixd)
-    }
-}
-
 #[async_trait]
 impl LnBackendSetup for config::Lnd {
     async fn setup(