chore: add min-confirmations to info-endpoint

fixes #312
ngutech21 · Jul 29, 2024 · e1a57b2 · e1a57b2
1 parent 285d895
commit e1a57b2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/moksha-core/src/primitives.rs b/moksha-core/src/primitives.rs
@@ -554,7 +554,7 @@ pub struct Nut17 {
 pub struct Nut18 {
     pub supported: bool,
     #[serde(rename = "methods")]
-    pub payment_methods: Vec<PaymentMethodConfigBtcOnchain>,
+    pub payment_methods: Vec<PaymentMethodConfigBtcOnchainMint>,
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone, PartialEq, Eq, ToSchema)]
@@ -567,7 +567,17 @@ pub struct PaymentMethodConfig {
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone, PartialEq, Eq, ToSchema)]
-pub struct PaymentMethodConfigBtcOnchain {
+pub struct PaymentMethodConfigBtcOnchainMint {
+    #[serde(rename = "method")]
+    pub payment_method: PaymentMethod,
+    pub unit: CurrencyUnit,
+    pub min_amount: u64,
+    pub max_amount: u64,
+    pub min_confirmations: u8,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone, PartialEq, Eq, ToSchema)]
+pub struct PaymentMethodConfigBtcOnchainMelt {
     #[serde(rename = "method")]
     pub payment_method: PaymentMethod,
     pub unit: CurrencyUnit,
@@ -579,11 +589,12 @@ impl Default for Nut18 {
     fn default() -> Self {
         Self {
             supported: true,
-            payment_methods: vec![PaymentMethodConfigBtcOnchain {
+            payment_methods: vec![PaymentMethodConfigBtcOnchainMint {
                 payment_method: PaymentMethod::BtcOnchain,
                 unit: CurrencyUnit::Sat,
                 min_amount: 10_000,
                 max_amount: 1_000_000,
+                min_confirmations: 3,
             }],
         }
     }
@@ -593,14 +604,14 @@ impl Default for Nut18 {
 pub struct Nut19 {
     pub supported: bool,
     #[serde(rename = "methods")]
-    pub payment_methods: Vec<PaymentMethodConfigBtcOnchain>,
+    pub payment_methods: Vec<PaymentMethodConfigBtcOnchainMelt>,
 }
 
 impl Default for Nut19 {
     fn default() -> Self {
         Self {
             supported: true,
-            payment_methods: vec![PaymentMethodConfigBtcOnchain {
+            payment_methods: vec![PaymentMethodConfigBtcOnchainMelt {
                 payment_method: PaymentMethod::BtcOnchain,
                 unit: CurrencyUnit::Sat,
                 min_amount: 10_000,

diff --git a/moksha-mint/src/config.rs b/moksha-mint/src/config.rs
@@ -2,7 +2,7 @@ use std::{env, net::SocketAddr, path::PathBuf, str::FromStr};
 
 use clap::Parser;
 use moksha_core::primitives::{
-    ContactInfoResponse, CurrencyUnit, Nut18, Nut19, PaymentMethod, PaymentMethodConfigBtcOnchain,
+    ContactInfoResponse, CurrencyUnit, Nut18, Nut19, PaymentMethod, PaymentMethodConfigBtcOnchainMelt, PaymentMethodConfigBtcOnchainMint
 };
 use serde::{Deserialize, Serialize};
 
@@ -213,11 +213,12 @@ impl From<BtcOnchainConfig> for Nut18 {
     fn from(settings: BtcOnchainConfig) -> Self {
         Self {
             supported: true,
-            payment_methods: vec![PaymentMethodConfigBtcOnchain {
+            payment_methods: vec![PaymentMethodConfigBtcOnchainMint {
                 payment_method: PaymentMethod::BtcOnchain,
                 unit: CurrencyUnit::Sat,
                 min_amount: settings.min_amount,
                 max_amount: settings.max_amount,
+                min_confirmations: settings.min_confirmations,
             }],
         }
     }
@@ -227,7 +228,7 @@ impl From<BtcOnchainConfig> for Nut19 {
     fn from(settings: BtcOnchainConfig) -> Self {
         Self {
             supported: true,
-            payment_methods: vec![PaymentMethodConfigBtcOnchain {
+            payment_methods: vec![PaymentMethodConfigBtcOnchainMelt {
                 payment_method: PaymentMethod::BtcOnchain,
                 unit: CurrencyUnit::Sat,
                 min_amount: settings.min_amount,

diff --git a/moksha-mint/src/server.rs b/moksha-mint/src/server.rs
@@ -25,13 +25,7 @@ use crate::mint::Mint;
 use moksha_core::blind::BlindedMessage;
 use moksha_core::blind::BlindedSignature;
 use moksha_core::primitives::{
-    CurrencyUnit, GetMeltBtcOnchainResponse, KeyResponse, KeysResponse, MintInfoResponse, Nut10,
-    Nut11, Nut12, Nut18, Nut19, Nut4, Nut5, Nut7, Nut8, Nut9, Nuts, PaymentMethod,
-    PostMeltBolt11Request, PostMeltBolt11Response, PostMeltQuoteBolt11Request,
-    PostMeltQuoteBolt11Response, PostMeltQuoteBtcOnchainRequest, PostMeltQuoteBtcOnchainResponse,
-    PostMintBolt11Request, PostMintBolt11Response, PostMintQuoteBolt11Request,
-    PostMintQuoteBolt11Response, PostMintQuoteBtcOnchainRequest, PostMintQuoteBtcOnchainResponse,
-    PostSwapRequest, PostSwapResponse,
+    ContactInfoResponse, CurrencyUnit, GetMeltBtcOnchainResponse, KeyResponse, KeysResponse, MintInfoResponse, Nut10, Nut11, Nut12, Nut13, Nut14, Nut15, Nut16, Nut17, Nut18, Nut19, Nut4, Nut5, Nut7, Nut8, Nut9, Nuts, PaymentMethod, PaymentMethodConfig, PaymentMethodConfigBtcOnchainMelt, PaymentMethodConfigBtcOnchainMint, PostMeltBolt11Request, PostMeltBolt11Response, PostMeltQuoteBolt11Request, PostMeltQuoteBolt11Response, PostMeltQuoteBtcOnchainRequest, PostMeltQuoteBtcOnchainResponse, PostMintBolt11Request, PostMintBolt11Response, PostMintQuoteBolt11Request, PostMintQuoteBolt11Response, PostMintQuoteBtcOnchainRequest, PostMintQuoteBtcOnchainResponse, PostSwapRequest, PostSwapResponse
 };
 
 use tower_http::services::ServeDir;
@@ -123,6 +117,11 @@ pub async fn run_server(mint: Mint) -> anyhow::Result<()> {
         Nut10,
         Nut11,
         Nut12,
+        Nut13,
+        Nut14,
+        Nut15,
+        Nut16,
+        Nut17,
         CurrencyUnit,
         PaymentMethod,
         KeysResponse,
@@ -150,7 +149,12 @@ pub async fn run_server(mint: Mint) -> anyhow::Result<()> {
         PostMintQuoteBtcOnchainResponse,
         PostMeltQuoteBtcOnchainRequest,
         PostMeltQuoteBtcOnchainResponse,
-        GetMeltBtcOnchainResponse
+        GetMeltBtcOnchainResponse,
+        ContactInfoResponse,
+        PaymentMethodConfig,
+        PaymentMethodConfigBtcOnchainMint,
+        PaymentMethodConfigBtcOnchainMelt
+
     ))
 )]
 struct ApiDoc;