Skip to content

Commit

Permalink
Provide an ordering for PseudoExtendedKeys.
Browse files Browse the repository at this point in the history
  • Loading branch information
murisi committed Sep 24, 2024
1 parent a35f73b commit 87c2419
Showing 1 changed file with 61 additions and 0 deletions.
61 changes: 61 additions & 0 deletions masp_primitives/src/zip32/sapling.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use borsh::schema::Fields;
use borsh::BorshSchema;
use borsh::{BorshDeserialize, BorshSerialize};
use byteorder::{ByteOrder, LittleEndian, ReadBytesExt, WriteBytesExt};
use ff::PrimeField;
use fpe::ff1::{BinaryNumeralString, FF1};
use std::collections::BTreeMap;
use std::{
Expand Down Expand Up @@ -1095,6 +1096,66 @@ impl From<ExtendedFullViewingKey> for PseudoExtendedKey {
}
}

impl BorshDeserialize for PseudoExtendedKey {
fn deserialize_reader<R: Read>(reader: &mut R) -> io::Result<Self> {
let xfvk = ExtendedFullViewingKey::deserialize_reader(reader)?;
let ask = Option::<[u8; 32]>::deserialize_reader(reader)?
.map(|x| {
Option::from(jubjub::Fr::from_repr(x))
.ok_or_else(|| io::Error::new(io::ErrorKind::InvalidData, "ask not in field"))
})
.transpose()?;
let nsk = Option::<[u8; 32]>::deserialize_reader(reader)?
.map(|x| {
Option::from(jubjub::Fr::from_repr(x))
.ok_or_else(|| io::Error::new(io::ErrorKind::InvalidData, "nsk not in field"))
})
.transpose()?;
Ok(Self { xfvk, ask, nsk })
}
}

impl BorshSerialize for PseudoExtendedKey {
fn serialize<W: Write>(&self, writer: &mut W) -> io::Result<()> {
self.xfvk.serialize(writer)?;
self.ask.map(|x| x.to_bytes()).serialize(writer)?;
self.nsk.map(|x| x.to_bytes()).serialize(writer)
}
}

impl BorshSchema for PseudoExtendedKey {
fn add_definitions_recursively(definitions: &mut BTreeMap<Declaration, Definition>) {
let definition = Definition::Struct {
fields: Fields::NamedFields(vec![
("xfvk".into(), ExtendedFullViewingKey::declaration()),
("ask".into(), Option::<[u8; 32]>::declaration()),
("nsk".into(), Option::<[u8; 32]>::declaration()),
]),
};
add_definition(Self::declaration(), definition, definitions);
ExtendedFullViewingKey::add_definitions_recursively(definitions);
Option::<[u8; 32]>::add_definitions_recursively(definitions);
}

fn declaration() -> Declaration {
"PseudoExtendedKey".into()
}
}

impl PartialOrd for PseudoExtendedKey {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(other))
}
}

impl Ord for PseudoExtendedKey {
fn cmp(&self, other: &Self) -> Ordering {
let a = borsh::to_vec(self).expect("unable to canonicalize PseudoExtendedKey");
let b = borsh::to_vec(other).expect("unable to canonicalize PseudoExtendedKey");
a.cmp(&b)
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down

0 comments on commit 87c2419

Please sign in to comment.