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

fix(mint): reset proofs in swap to unspent if error

Browse Source
This commit is contained in:
thesimplekid
2024-08-01 08:15:39 -05:00
parent f5e106d873
commit e0cd4a38d7
2 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -53,6 +53,7 @@
- cdk(mint): On `swap` verify correct number of sigs on outputs when `SigAll` ([thesimplekid]).
- cdk(mint): Use amount in payment_quote response from ln backend ([thesimplekid]).
- cdk(mint): Create new keysets for added supported units ([thesimplekid]).
- cdk(mint): If there is an error in swap proofs should be reset to unspent ([thesimplekid]).
### Removed
- cdk(wallet): Remove unused argument `SplitTarget` on `melt` ([thesimplekid]).

57
crates/cdk/src/mint/mod.rs
View File

@@ -655,11 +655,20 @@ impl Mint {
.len()
.ne(&proof_count)
{
self.localstore
.update_proofs_states(&input_ys, State::Unspent)
.await?;
return Err(Error::DuplicateProofs);
}
for proof in &swap_request.inputs {
self.verify_proof(proof).await?
if let Err(err) = self.verify_proof(proof).await {
tracing::info!("Error verifying proof in swap");
self.localstore
.update_proofs_states(&input_ys, State::Unspent)
.await?;
return Err(err);
}
}
let input_keyset_ids: HashSet<Id> =
@@ -668,25 +677,34 @@ impl Mint {
let mut keyset_units = HashSet::with_capacity(input_keyset_ids.capacity());
for id in input_keyset_ids {
let keyset = self
.localstore
.get_keyset_info(&id)
.await?
.ok_or(Error::UnknownKeySet)?;
keyset_units.insert(keyset.unit);
match self.localstore.get_keyset_info(&id).await? {
Some(keyset) => {
keyset_units.insert(keyset.unit);
}
None => {
tracing::info!("Swap request with unknown keyset in inputs");
self.localstore
.update_proofs_states(&input_ys, State::Unspent)
.await?;
}
}
}
let output_keyset_ids: HashSet<Id> =
swap_request.outputs.iter().map(|p| p.keyset_id).collect();
for id in &output_keyset_ids {
let keyset = self
.localstore
.get_keyset_info(id)
.await?
.ok_or(Error::UnknownKeySet)?;
keyset_units.insert(keyset.unit);
match self.localstore.get_keyset_info(id).await? {
Some(keyset) => {
keyset_units.insert(keyset.unit);
}
None => {
tracing::info!("Swap request with unknown keyset in outputs");
self.localstore
.update_proofs_states(&input_ys, State::Unspent)
.await?;
}
}
}
// Check that all proofs are the same unit
@@ -694,6 +712,9 @@ impl Mint {
// now
if keyset_units.len().gt(&1) {
tracing::error!("Only one unit is allowed in request: {:?}", keyset_units);
self.localstore
.update_proofs_states(&input_ys, State::Unspent)
.await?;
return Err(Error::MultipleUnits);
}
@@ -706,7 +727,13 @@ impl Mint {
if sig_flag.eq(&SigFlag::SigAll) {
let pubkeys = pubkeys.into_iter().collect();
for blinded_message in &swap_request.outputs {
blinded_message.verify_p2pk(&pubkeys, sigs_required)?;
if let Err(err) = blinded_message.verify_p2pk(&pubkeys, sigs_required) {
tracing::info!("Could not verify p2pk in swap request");
self.localstore
.update_proofs_states(&input_ys, State::Unspent)
.await?;
return Err(err.into());
}
}
}