zec
/
sapling-crypto
mirror of https://github.com/zcash/sapling-crypto.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust cases in `pczt::Spend::vk_for_validation` 

Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
This commit is contained in:
Jack Grigg 2024-12-13 07:50:04 +00:00
parent 231f819116
commit 94ad2b356e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pczt/verify.rs
View File

@ -34,21 +34,15 @@ impl super::Spend {
.map(|proof_generation_key| proof_generation_key.to_viewing_key());
match (expected_fvk, vk, self.value.as_ref()) {
// Dummy notes use random keys, which must be provided.
(_, Some(vk), Some(value)) if value.inner() == 0 => Ok(vk),
(_, None, Some(value)) if value.inner() == 0 => {
Err(VerifyError::MissingProofGenerationKey)
}
// If the `proof_generation_key` field has been pruned, assume the caller
// provided the correct FVK.
(Some(expected_fvk), None, _) => Ok(expected_fvk.vk.clone()),
// This is not a dummy note; if the FVK field is present, it must match.
(Some(expected_fvk), Some(vk), _)
if vk.ak == expected_fvk.vk.ak && vk.nk == expected_fvk.vk.nk =>
{
Ok(vk)
}
// `expected_fvk` is ignored if the spent note is a dummy note.
(Some(_), Some(vk), Some(value)) if value.inner() == 0 => Ok(vk),
(Some(_), Some(_), _) => Err(VerifyError::MismatchedFullViewingKey),
(Some(expected_fvk), None, _) => Ok(expected_fvk.vk.clone()),
(None, Some(vk), _) => Ok(vk),
(None, None, _) => Err(VerifyError::MissingProofGenerationKey),
}