aljaz/cdk
1
0
Fork 0
mirror of https://github.com/aljazceru/cdk.git synced 2025-12-18 13:14:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: config overwrite on start up (#1081)

Browse Source 
* fix: config overwrite on start up
This commit is contained in:
thesimplekid
2025-09-20 16:49:37 +01:00
committed by GitHub
parent f4c5de7f36
commit aeafab9a10
19 changed files with 279 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/cdk-sql-common/src/mint/migrations.rs
View File

@@ -6,6 +6,7 @@ pub static MIGRATIONS: &[(&str, &str, &str)] = &[
("postgres", "20250901090000_add_kv_store.sql", include_str!(r#"./migrations/postgres/20250901090000_add_kv_store.sql"#)),
("postgres", "20250902140000_add_melt_request_and_blinded_messages.sql", include_str!(r#"./migrations/postgres/20250902140000_add_melt_request_and_blinded_messages.sql"#)),
("postgres", "20250903200000_add_signatory_amounts.sql", include_str!(r#"./migrations/postgres/20250903200000_add_signatory_amounts.sql"#)),
("postgres", "20250916221000_drop_config_table.sql", include_str!(r#"./migrations/postgres/20250916221000_drop_config_table.sql"#)),
("sqlite", "1_fix_sqlx_migration.sql", include_str!(r#"./migrations/sqlite/1_fix_sqlx_migration.sql"#)),
("sqlite", "20240612124932_init.sql", include_str!(r#"./migrations/sqlite/20240612124932_init.sql"#)),
("sqlite", "20240618195700_quote_state.sql", include_str!(r#"./migrations/sqlite/20240618195700_quote_state.sql"#)),
@@ -33,4 +34,5 @@ pub static MIGRATIONS: &[(&str, &str, &str)] = &[
("sqlite", "20250901090000_add_kv_store.sql", include_str!(r#"./migrations/sqlite/20250901090000_add_kv_store.sql"#)),
("sqlite", "20250902140000_add_melt_request_and_blinded_messages.sql", include_str!(r#"./migrations/sqlite/20250902140000_add_melt_request_and_blinded_messages.sql"#)),
("sqlite", "20250903200000_add_signatory_amounts.sql", include_str!(r#"./migrations/sqlite/20250903200000_add_signatory_amounts.sql"#)),
("sqlite", "20250916221000_drop_config_table.sql", include_str!(r#"./migrations/sqlite/20250916221000_drop_config_table.sql"#)),
];

1
crates/cdk-sql-common/src/mint/migrations/postgres/20250916221000_drop_config_table.sql Normal file
View File

@@ -0,0 +1 @@
DROP TABLE IF EXISTS config;

1
crates/cdk-sql-common/src/mint/migrations/sqlite/20250916221000_drop_config_table.sql Normal file
View File

@@ -0,0 +1 @@
DROP TABLE IF EXISTS config;

102
crates/cdk-sql-common/src/mint/mod.rs
View File

@@ -15,7 +15,6 @@ use std::sync::Arc;
use async_trait::async_trait;
use bitcoin::bip32::DerivationPath;
use cdk_common::common::QuoteTTL;
use cdk_common::database::mint::validate_kvstore_params;
use cdk_common::database::{
self, ConversionError, Error, MintDatabase, MintDbWriterFinalizer, MintKeyDatabaseTransaction,
@@ -33,7 +32,7 @@ use cdk_common::state::check_state_transition;
use cdk_common::util::unix_time;
use cdk_common::{
Amount, BlindSignature, BlindSignatureDleq, BlindedMessage, CurrencyUnit, Id, MeltQuoteState,
MintInfo, PaymentMethod, Proof, Proofs, PublicKey, SecretKey, State,
PaymentMethod, Proof, Proofs, PublicKey, SecretKey, State,
};
use lightning_invoice::Bolt11Invoice;
use migrations::MIGRATIONS;
@@ -102,26 +101,6 @@ where
.collect::<Result<HashMap<_, _>, _>>()
}
#[inline(always)]
async fn set_to_config<C, V>(conn: &C, id: &str, value: &V) -> Result<(), Error>
where
C: DatabaseExecutor + Send + Sync,
V: ?Sized + serde::Serialize,
{
query(
r#"
INSERT INTO config (id, value) VALUES (:id, :value)
ON CONFLICT(id) DO UPDATE SET value = excluded.value
"#,
)?
.bind("id", id.to_owned())
.bind("value", serde_json::to_string(&value)?)
.execute(conn)
.await?;
Ok(())
}
impl<RM> SQLMintDatabase<RM>
where
RM: DatabasePool + 'static,
@@ -145,21 +124,6 @@ where
tx.commit().await?;
Ok(())
}
#[inline(always)]
async fn fetch_from_config<R>(&self, id: &str) -> Result<R, Error>
where
R: serde::de::DeserializeOwned,
{
let conn = self.pool.get().map_err(|e| Error::Database(Box::new(e)))?;
let value = column_as_string!(query(r#"SELECT value FROM config WHERE id = :id LIMIT 1"#)?
.bind("id", id.to_owned())
.pluck(&*conn)
.await?
.ok_or(Error::UnknownQuoteTTL)?);
Ok(serde_json::from_str(&value)?)
}
}
#[async_trait]
@@ -307,18 +271,8 @@ where
}
#[async_trait]
impl<RM> database::MintTransaction<'_, Error> for SQLTransaction<RM>
where
RM: DatabasePool + 'static,
{
async fn set_mint_info(&mut self, mint_info: MintInfo) -> Result<(), Error> {
Ok(set_to_config(&self.inner, "mint_info", &mint_info).await?)
}
async fn set_quote_ttl(&mut self, quote_ttl: QuoteTTL) -> Result<(), Error> {
Ok(set_to_config(&self.inner, "quote_ttl", &quote_ttl).await?)
}
}
impl<RM> database::MintTransaction<'_, Error> for SQLTransaction<RM> where RM: DatabasePool + 'static
{}
#[async_trait]
impl<RM> MintDbWriterFinalizer for SQLTransaction<RM>
@@ -2048,56 +2002,6 @@ where
Ok(Box::new(tx))
}
async fn get_mint_info(&self) -> Result<MintInfo, Error> {
#[cfg(feature = "prometheus")]
METRICS.inc_in_flight_requests("get_mint_info");
#[cfg(feature = "prometheus")]
let start_time = std::time::Instant::now();
let result = self.fetch_from_config("mint_info").await;
#[cfg(feature = "prometheus")]
{
let success = result.is_ok();
METRICS.record_mint_operation("get_mint_info", success);
METRICS.record_mint_operation_histogram(
"get_mint_info",
success,
start_time.elapsed().as_secs_f64(),
);
METRICS.dec_in_flight_requests("get_mint_info");
}
Ok(result?)
}
async fn get_quote_ttl(&self) -> Result<QuoteTTL, Error> {
#[cfg(feature = "prometheus")]
METRICS.inc_in_flight_requests("get_quote_ttl");
#[cfg(feature = "prometheus")]
let start_time = std::time::Instant::now();
let result = self.fetch_from_config("quote_ttl").await;
#[cfg(feature = "prometheus")]
{
let success = result.is_ok();
METRICS.record_mint_operation("get_quote_ttl", success);
METRICS.record_mint_operation_histogram(
"get_quote_ttl",
success,
start_time.elapsed().as_secs_f64(),
);
METRICS.dec_in_flight_requests("get_quote_ttl");
}
Ok(result?)
}
}
fn sql_row_to_keyset_info(row: Vec<Column>) -> Result<MintKeySetInfo, Error> {