octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that invalid JoinSplitDatas are unrepresentable. 

All JoinSplitDatas must contain at least one JoinSplit.
This commit is contained in:
Henry de Valence 2019-12-20 15:33:45 -08:00 committed by Deirdre Connolly
parent c26304d983
commit fa1e168fb5
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zebra-chain/src/transaction/joinsplit.rs
View File

@ -52,8 +52,13 @@ pub struct JoinSplit<P: ZkSnarkProof> {
/// A bundle of JoinSplit descriptions and signature data. /// A bundle of JoinSplit descriptions and signature data.
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, PartialEq, Eq)]
pub struct JoinSplitData<P: ZkSnarkProof> { pub struct JoinSplitData<P: ZkSnarkProof> {
/// A sequence of JoinSplit descriptions using proofs of type `P`. /// The first JoinSplit description, using proofs of type `P`.
pub joinsplits: Vec<JoinSplit<P>>, ///
/// Storing this separately from `rest` ensures that it is impossible
/// to construct an invalid `JoinSplitData` with no `JoinSplit`s.
pub first: JoinSplit<P>,
/// The rest of the JoinSplit descriptions, using proofs of type `P`.
pub rest: Vec<JoinSplit<P>>,
/// The public key for the JoinSplit signature. /// The public key for the JoinSplit signature.
// XXX refine to a Zcash-flavored Ed25519 pubkey. // XXX refine to a Zcash-flavored Ed25519 pubkey.
pub pub_key: [u8; 32], pub pub_key: [u8; 32],
@ -62,3 +67,10 @@ pub struct JoinSplitData<P: ZkSnarkProof> {
// for now it's [u64; 8] rather than [u8; 64] to get trait impls // for now it's [u64; 8] rather than [u8; 64] to get trait impls
pub sig: [u64; 8], pub sig: [u64; 8],
} }
impl<P: ZkSnarkProof> JoinSplitData<P> {
/// Iterate over the [`JoinSplit`]s in `self`.
pub fn joinsplits(&self) -> impl Iterator<Item = &JoinSplit<P>> {
std::iter::once(&self.first).chain(self.rest.iter())
}
}