aljaz/cdk
1
0
Fork 0
mirror of https://github.com/aljazceru/cdk.git synced 2026-02-02 11:45:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #943 from crodas/fix/avoid-empty-proofs-query

Browse Source 
Fixed bug to avoid empty calls `get_proofs_states`
This commit is contained in:
thesimplekid
2025-08-08 11:01:58 +03:00
committed by GitHub
parent 5521a377e8 2e1099adbe
commit d24a968bd4
3 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,7 @@ where
y: &PublicKey,
proofs_state: State,
) -> Result<Option<State>, Self::Err> {
let current_state = query(r#"SELECT state FROM proof WHERE y = :y"#)?
let current_state = query(r#"SELECT state FROM proof WHERE y = :y FOR UPDATE"#)?
.bind("y", y.to_bytes().to_vec())
.pluck(&self.inner)
.await?
@@ -320,6 +320,9 @@ where
}
async fn get_proofs_states(&self, ys: &[PublicKey]) -> Result<Vec<Option<State>>, Self::Err> {
if ys.is_empty() {
return Ok(vec![]);
}
let conn = self.pool.get().map_err(|e| Error::Database(Box::new(e)))?;
let mut current_states = query(r#"SELECT y, state FROM proof WHERE y IN (:ys)"#)?
.bind_vec("ys", ys.iter().map(|y| y.to_bytes().to_vec()).collect())

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

@@ -82,6 +82,9 @@ async fn get_current_states<C>(
where
C: DatabaseExecutor + Send + Sync,
{
if ys.is_empty() {
return Ok(Default::default());
}
query(r#"SELECT y, state FROM proof WHERE y IN (:ys)"#)?
.bind_vec("ys", ys.iter().map(|y| y.to_bytes().to_vec()).collect())
.fetch_all(conn)

75
crates/cdk/src/mint/subscription/on_subscription.rs
View File

@@ -57,41 +57,48 @@ impl OnNewSubscription for OnSubscription {
}
}
to_return.extend(
futures::future::try_join_all(melt_queries)
.await
.map(|quotes| {
quotes
.into_iter()
.filter_map(|quote| quote.map(|x| x.into()))
.map(|x: MeltQuoteBolt11Response<Uuid>| x.into())
.collect::<Vec<_>>()
})
.map_err(|e| e.to_string())?,
);
to_return.extend(
futures::future::try_join_all(mint_queries)
.await
.map(|quotes| {
quotes
.into_iter()
.filter_map(|quote| quote.map(|x| x.into()))
.map(|x: MintQuoteBolt11Response<Uuid>| x.into())
.collect::<Vec<_>>()
})
.map_err(|e| e.to_string())?,
);
if !melt_queries.is_empty() {
to_return.extend(
futures::future::try_join_all(melt_queries)
.await
.map(|quotes| {
quotes
.into_iter()
.filter_map(|quote| quote.map(|x| x.into()))
.map(|x: MeltQuoteBolt11Response<Uuid>| x.into())
.collect::<Vec<_>>()
})
.map_err(|e| e.to_string())?,
);
}
to_return.extend(
datastore
.get_proofs_states(public_keys.as_slice())
.await
.map_err(|e| e.to_string())?
.into_iter()
.enumerate()
.filter_map(|(idx, state)| state.map(|state| (public_keys[idx], state).into()))
.map(|state: ProofState| state.into()),
);
if !mint_queries.is_empty() {
to_return.extend(
futures::future::try_join_all(mint_queries)
.await
.map(|quotes| {
quotes
.into_iter()
.filter_map(|quote| quote.map(|x| x.into()))
.map(|x: MintQuoteBolt11Response<Uuid>| x.into())
.collect::<Vec<_>>()
})
.map_err(|e| e.to_string())?,
);
}
if !public_keys.is_empty() {
to_return.extend(
datastore
.get_proofs_states(public_keys.as_slice())
.await
.map_err(|e| e.to_string())?
.into_iter()
.enumerate()
.filter_map(|(idx, state)| state.map(|state| (public_keys[idx], state).into()))
.map(|state: ProofState| state.into()),
);
}
Ok(to_return)
}